Remove cross

src/main/java/com/iemr/common/CommonApplication.java

@@ -29,6 +29,7 @@
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.client.RestTemplate;
 
@@ -40,6 +41,7 @@
 
 @SpringBootApplication
 @EnableScheduling
+@EnableAsync
 public class CommonApplication extends SpringBootServletInitializer {
 
 	@Bean

src/main/java/com/iemr/common/config/encryption/SecurePassword.java

@@ -26,10 +26,8 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.spec.InvalidKeySpecException;
-
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
-
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java

@@ -106,9 +106,7 @@ public class BeneficiaryRegistrationController {
 	private BeneficiaryOccupationService beneficiaryOccupationService;
 	private GovtIdentityTypeService govtIdentityTypeService;
 
-
-
-   	@Autowired
+	@Autowired
 	private JwtUtil jwtUtil;
 
 	@Autowired
@@ -351,54 +349,51 @@ public String searchUserByPhone(
 
 	@Operation(summary = "Provide the list of beneficiaries using Elasticsearch")
 	@RequestMapping(value = "/searchUser", method = RequestMethod.POST, headers = "Authorization")
-	public String searchUser(
-			@RequestBody String request,
-			@RequestHeader(value = "Authorization", required = false) String auth, HttpServletRequest httpRequest) {
-
+	public String searchUser(@RequestBody String request, HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
-
 		try {
 			logger.info("Universal search request received");
-			
+
 			JsonParser parser = new JsonParser();
 			JsonObject requestObj = parser.parse(request).getAsJsonObject();
-			
+
 			String searchQuery = null;
 			if (requestObj.has("search") && !requestObj.get("search").isJsonNull()) {
 				searchQuery = requestObj.get("search").getAsString();
 			}
-			
+
 			if (searchQuery == null || searchQuery.trim().isEmpty()) {
 				response.setError(400, "Search query is required");
 				return response.toString();
 			}
-
-		   	String jwtToken = CookieUtil.getJwtTokenFromCookie(httpRequest);
-			String userId = jwtUtil.getUserIdFromToken(jwtToken);
-            int userID=Integer.parseInt(userId);
-
+
+			String auth = httpRequest.getHeader("Authorization");
+
+			Integer userID = jwtUtil.getUserIdFromRequest(httpRequest);
+
+			logger.info("ES search for userId: {}", userID);
+
 			Boolean is1097 = false;
 			if (requestObj.has("is1097") && !requestObj.get("is1097").isJsonNull()) {
 				is1097 = requestObj.get("is1097").getAsBoolean();
 			}
-			
+
 			logger.info("Searching with query: {}, userId: {}, is1097: {}", searchQuery, userID, is1097);
-
 			String result = iemrSearchUserService.searchUser(searchQuery, userID, auth, is1097);
-			
+
 			if (result == null || result.trim().isEmpty()) {
 				response.setError(200, "No beneficiaries found");
 				return response.toString();
 			}
-			
+
 			return result;
-			
+
 		} catch (Exception e) {
 			logger.error("Error in universal search: {}", e.getMessage(), e);
 			response.setError(400, "Error searching beneficiaries: " + e.getMessage());
 			return response.toString();
 		}
-			}
+	}
 
 	@Operation(summary = "Provide the list of beneficiaries based on search criteria")
 	@RequestMapping(value = "/searchBeneficiary", method = RequestMethod.POST, headers = "Authorization")
@@ -422,6 +417,41 @@ public String searchBeneficiary(
 		return output.toString();
 	}
 
+	/**
+	 * Elasticsearch-based advanced search endpoint
+	 */
+	@Operation(summary = "Advanced search beneficiaries using Elasticsearch")
+	@RequestMapping(value = "/searchBeneficiaryES", method = RequestMethod.POST, headers = "Authorization")
+	public String searchBeneficiaryES(
+			@RequestBody BeneficiaryModel request,
+			HttpServletRequest httpRequest) {
+
+		logger.info("searchBeneficiaryES request: {}", request);
+		OutputResponse output = new OutputResponse();
+
+		try {
+
+			String auth = httpRequest.getHeader("Authorization");
+
+			Integer userID = jwtUtil.getUserIdFromRequest(httpRequest);
+
+			logger.info("ES Advanced search for userId: {}", userID);
+
+			String result = iemrSearchUserService.findBeneficiaryES(request, userID, auth);
+
+			return result;
+
+		} catch (NumberFormatException ne) {
+			logger.error("searchBeneficiaryES failed with number format error: {}", ne.getMessage(), ne);
+			output.setError(400, "Invalid number format in search criteria");
+			return output.toString();
+		} catch (Exception e) {
+			logger.error("searchBeneficiaryES failed with error: {}", e.getMessage(), e);
+			output.setError(500, "Error searching beneficiaries: " + e.getMessage());
+			return output.toString();
+		}
+	}
+
 	@Operation(summary = "Provide all common data list needed for beneficiary registration")
 	@RequestMapping(value = "/getRegistrationData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getRegistrationData() {

src/main/java/com/iemr/common/controller/dynamicForm/DynamicFormController.java

@@ -84,9 +84,9 @@ public ResponseEntity<ApiResponse<?>> deleteField(@PathVariable Long fieldId) {
     }
 
     @GetMapping(value = "form/{formId}/fields")
-    public ResponseEntity<ApiResponse<?>> getStructuredForm(@PathVariable String formId, @RequestParam(name = "lang", defaultValue = "en") String lang) {
+    public ResponseEntity<ApiResponse<?>> getStructuredForm(@PathVariable String formId, @RequestParam(name = "lang", defaultValue = "en") String lang,@RequestHeader(value = "jwttoken") String token) {
         try {
-            Object result = formMasterService.getStructuredFormByFormId(formId,lang);
+            Object result = formMasterService.getStructuredFormByFormId(formId,lang,token);
             return ResponseEntity.status(HttpStatus.OK)
                     .body(ApiResponse.success("Form structure fetched successfully", HttpStatus.OK.value(), result));
         } catch (Exception e) {
@@ -97,4 +97,6 @@ public ResponseEntity<ApiResponse<?>> getStructuredForm(@PathVariable String for
     }
 
 
+
+
 }

src/main/java/com/iemr/common/controller/users/IEMRAdminController.java

@@ -1224,7 +1224,25 @@ public ResponseEntity<?> getUserDetails(@PathVariable("userName") String userNam
 				return new ResponseEntity<>(Map.of("error", "UserName Not Found"), HttpStatus.NOT_FOUND);
 			}
 			User user = users.get(0);
-			return new ResponseEntity<>(Map.of("userName", user.getUserName(), "userId", user.getUserID()), HttpStatus.OK);
+			return new ResponseEntity<>(Map.of("userName", user.getUserName(), "userId", user.getUserID()),
+					HttpStatus.OK);
+		} catch (Exception e) {
+			return new ResponseEntity<>(Map.of("error", "Internal server error"), HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+	}
+
+	@Operation(summary = "Get UserId based on userName")
+	@GetMapping(value = "/checkUserName/{userName}", produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public ResponseEntity<?> checkUserDetails(@PathVariable("userName") String userName) {
+		try {
+			List<User> users = iemrAdminUserServiceImpl.findUserIdByUserName(userName);
+			if (users.isEmpty()) {
+				return new ResponseEntity<>(Map.of("error", "UserName Not Found"), HttpStatus.NOT_FOUND);
+			}
+			User user = users.get(0);
+			return new ResponseEntity<>(Map.of("userName", user.getUserName(), "userId", user.getUserID()),
+					HttpStatus.OK);
 		} catch (Exception e) {
 			return new ResponseEntity<>(Map.of("error", "Internal server error"), HttpStatus.INTERNAL_SERVER_ERROR);
 		}

src/main/java/com/iemr/common/data/dynamic_from/FormField.java

@@ -53,6 +53,12 @@ public class FormField {
     @Column(name = "sequence")
     private Integer sequence;
 
+    @Column(name = "is_editable")
+    private Boolean isEditable;
+
+    @Column(name = "state_code")
+    private Integer stateCode;
+
     @Column(name = "created_at")
     private LocalDateTime createdAt = LocalDateTime.now();
 

src/main/java/com/iemr/common/data/translation/Translation.java

@@ -18,6 +18,9 @@ public class Translation {
     private String english;
     @Column(name = "hindi_translation")
     private String hindiTranslation;
+    @Column(name = "assamese_translation")
+    private String assameseTranslation;
     @Column(name = "is_active")
     private Boolean isActive;
+
 }