Skip to content

Fix the Search Response Limit issue and Age Issue #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vanitha1822 wants to merge 2 commits into from
Closed

Fix the Search Response Limit issue and Age Issue #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e626b09
fix: add pagination and fix age issue
vanitha1822 Jan 8, 2026
3669673
fix: remove unused method
vanitha1822 Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
258 changes: 125 additions & 133 deletions src/main/java/com/iemr/common/identity/controller/IdentityESController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.iemr.common.identity.controller;


import java.text.SimpleDateFormat;
import java.util.*;

Expand Down Expand Up @@ -32,170 +31,163 @@ public class IdentityESController {
@Autowired
private ElasticsearchService elasticsearchService;

@Autowired
private JwtUtil jwtUtil;
@Autowired
private JwtUtil jwtUtil;

@Autowired
private IdentityService idService;

/**
* MAIN UNIVERSAL SEARCH ENDPOINT
* Searches across all fields - name, phone, ID, etc.
*
* Usage: GET /beneficiary/search?query=vani
* Usage: GET /beneficiary/search?query=9876543210
*/
@GetMapping("/search")
public ResponseEntity<Map<String, Object>> search(@RequestParam String query, HttpServletRequest request) {
@GetMapping("/search")
public ResponseEntity<Map<String, Object>> search(@RequestParam String query, HttpServletRequest request,
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "100") int size) {
try {
String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
String userId = jwtUtil.getUserIdFromToken(jwtToken);
int userID=Integer.parseInt(userId);
List<Map<String, Object>> results = elasticsearchService.universalSearch(query, userID);

Map<String, Object> response = new HashMap<>();
response.put("data", results);
response.put("statusCode", 200);
response.put("errorMessage", "Success");
response.put("status", "Success");

return ResponseEntity.ok(response);

String userId = jwtUtil.getUserIdFromToken(jwtToken);
int userID = Integer.parseInt(userId);
Map<String, Object> results = elasticsearchService.universalSearch(query, userID, page, size);
return ResponseEntity.ok(results);

} catch (Exception e) {
Map<String, Object> errorResponse = new HashMap<>();
errorResponse.put("data", new ArrayList<>());
errorResponse.put("statusCode", 500);
errorResponse.put("errorMessage", e.getMessage());
errorResponse.put("status", "Error");

return ResponseEntity.status(500).body(errorResponse);
}
}

/**
* NEW Elasticsearch-based advance search
*/

@Operation(summary = "Get beneficiaries by advance search using Elasticsearch")
@PostMapping(path = "/advancedSearchES", headers = "Authorization")
public ResponseEntity<Map<String, Object>> advanceSearchBeneficiariesES(
/**
* NEW Elasticsearch-based advance search
*/

@Operation(summary = "Get beneficiaries by advance search using Elasticsearch")
@PostMapping(path = "/advancedSearchES", headers = "Authorization")
public ResponseEntity<Map<String, Object>> advanceSearchBeneficiariesES(
@RequestBody String searchFilter,
HttpServletRequest request) {

logger.info("IdentityESController.advanceSearchBeneficiariesES - start {}", searchFilter);
Map<String, Object> response = new HashMap<>();

try {
JsonObject searchParams = JsonParser.parseString(searchFilter).getAsJsonObject();
logger.info("Search params = {}", searchParams);

String firstName = getString(searchParams, "firstName");
String lastName = getString(searchParams, "lastName");
Integer genderId = getInteger(searchParams, "genderId");
Date dob = getDate(searchParams, "dob");
String fatherName = getString(searchParams, "fatherName");
String spouseName = getString(searchParams, "spouseName");
String phoneNumber = getString(searchParams, "phoneNumber");
String beneficiaryId = getString(searchParams, "beneficiaryId");
String healthId = getString(searchParams, "healthId");
String aadharNo = getString(searchParams, "aadharNo");
Boolean is1097 = getBoolean(searchParams, "is1097");

Integer stateId = getLocationInt(searchParams, "stateId");
Integer districtId = getLocationInt(searchParams, "districtId");
Integer blockId = getLocationInt(searchParams, "blockId");
Integer villageId = getLocationInt(searchParams, "villageId");

String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
Integer userID = Integer.parseInt(jwtUtil.getUserIdFromToken(jwtToken));

logger.info(
"ES Advance search - firstName={}, genderId={}, stateId={}, districtId={}, userId={}",
firstName, genderId, stateId, districtId, userID
);

Map<String, Object> searchResults =
idService.advancedSearchBeneficiariesES(
firstName, lastName, genderId, dob,
stateId, districtId, blockId, villageId,
fatherName, spouseName, phoneNumber,
beneficiaryId, healthId, aadharNo,
userID, null, is1097
);

response.put("data", searchResults.get("data"));
response.put("count", searchResults.get("count"));
response.put("source", searchResults.get("source"));
response.put("statusCode", 200);
response.put("errorMessage", "Success");
response.put("status", "Success");

return ResponseEntity.ok(response);

} catch (Exception e) {
logger.error("Error in beneficiary ES advance search", e);
response.put("data", Collections.emptyList());
response.put("count", 0);
response.put("source", "error");
response.put("statusCode", 500);
response.put("errorMessage", e.getMessage());
response.put("status", "Error");
return ResponseEntity.status(500).body(response);
}
}

// Helper methods to extract values from JsonObject

private String getString(JsonObject json, String key) {
return json.has(key) && !json.get(key).isJsonNull()
? json.get(key).getAsString()
: null;
}

private Integer getInteger(JsonObject json, String key) {
return json.has(key) && !json.get(key).isJsonNull()
? json.get(key).getAsInt()
: null;
}

private Boolean getBoolean(JsonObject json, String key) {
return json.has(key) && !json.get(key).isJsonNull()
? json.get(key).getAsBoolean()
: null;
}

private Date getDate(JsonObject json, String key) {
if (json.has(key) && !json.get(key).isJsonNull()) {
HttpServletRequest request) {

logger.info("IdentityESController.advanceSearchBeneficiariesES - start {}", searchFilter);
Map<String, Object> response = new HashMap<>();

try {
return new SimpleDateFormat("yyyy-MM-dd")
.parse(json.get(key).getAsString());
JsonObject searchParams = JsonParser.parseString(searchFilter).getAsJsonObject();
logger.info("Search params = {}", searchParams);

String firstName = getString(searchParams, "firstName");
String lastName = getString(searchParams, "lastName");
Integer genderId = getInteger(searchParams, "genderId");
Date dob = getDate(searchParams, "dob");
String fatherName = getString(searchParams, "fatherName");
String spouseName = getString(searchParams, "spouseName");
String phoneNumber = getString(searchParams, "phoneNumber");
String beneficiaryId = getString(searchParams, "beneficiaryId");
String healthId = getString(searchParams, "healthId");
String aadharNo = getString(searchParams, "aadharNo");
Boolean is1097 = getBoolean(searchParams, "is1097");

Integer stateId = getLocationInt(searchParams, "stateId");
Integer districtId = getLocationInt(searchParams, "districtId");
Integer blockId = getLocationInt(searchParams, "blockId");
Integer villageId = getLocationInt(searchParams, "villageId");

String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
Integer userID = Integer.parseInt(jwtUtil.getUserIdFromToken(jwtToken));

logger.info(
"ES Advance search - firstName={}, genderId={}, stateId={}, districtId={}, userId={}",
firstName, genderId, stateId, districtId, userID);

Map<String, Object> searchResults = idService.advancedSearchBeneficiariesES(
firstName, lastName, genderId, dob,
stateId, districtId, blockId, villageId,
fatherName, spouseName, phoneNumber,
beneficiaryId, healthId, aadharNo,
userID, null, is1097);

response.put("data", searchResults.get("data"));
response.put("count", searchResults.get("count"));
response.put("source", searchResults.get("source"));
response.put("statusCode", 200);
response.put("errorMessage", "Success");
response.put("status", "Success");

return ResponseEntity.ok(response);

} catch (Exception e) {
logger.error("Invalid date format for {} ", key, e);
logger.error("Error in beneficiary ES advance search", e);
response.put("data", Collections.emptyList());
response.put("count", 0);
response.put("source", "error");
response.put("statusCode", 500);
response.put("errorMessage", e.getMessage());
response.put("status", "Error");
return ResponseEntity.status(500).body(response);
}
}
return null;
}

private Integer getLocationInt(JsonObject root, String field) {
// Helper methods to extract values from JsonObject

private String getString(JsonObject json, String key) {
return json.has(key) && !json.get(key).isJsonNull()
? json.get(key).getAsString()
: null;
}

private Integer getInteger(JsonObject json, String key) {
return json.has(key) && !json.get(key).isJsonNull()
? json.get(key).getAsInt()
: null;
}

if (root.has(field) && !root.get(field).isJsonNull()) {
return root.get(field).getAsInt();
private Boolean getBoolean(JsonObject json, String key) {
return json.has(key) && !json.get(key).isJsonNull()
? json.get(key).getAsBoolean()
: null;
}

String[] addressKeys = {
"currentAddress",
"permanentAddress",
"emergencyAddress"
};

for (String addressKey : addressKeys) {
if (root.has(addressKey) && root.get(addressKey).isJsonObject()) {
JsonObject addr = root.getAsJsonObject(addressKey);
if (addr.has(field) && !addr.get(field).isJsonNull()) {
return addr.get(field).getAsInt();
private Date getDate(JsonObject json, String key) {
if (json.has(key) && !json.get(key).isJsonNull()) {
try {
return new SimpleDateFormat("yyyy-MM-dd")
.parse(json.get(key).getAsString());
} catch (Exception e) {
logger.error("Invalid date format for {} ", key, e);
}
}
return null;
}
return null;
}


private Integer getLocationInt(JsonObject root, String field) {

if (root.has(field) && !root.get(field).isJsonNull()) {
return root.get(field).getAsInt();
}

String[] addressKeys = {
"currentAddress",
"permanentAddress",
"emergencyAddress"
};

for (String addressKey : addressKeys) {
if (root.has(addressKey) && root.get(addressKey).isJsonObject()) {
JsonObject addr = root.getAsJsonObject(addressKey);
if (addr.has(field) && !addr.get(field).isJsonNull()) {
return addr.get(field).getAsInt();
}
}
}
return null;
}

}
Loading