Skip to content

Add VanID in BeneficiaryRegID import for Local Server #115

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

Merged
vanitha1822 merged 2 commits into from
Oct 7, 2025
+71 −32
Merged

Add VanID in BeneficiaryRegID import for Local Server #115

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
cf5c883
fix: add van Id while import to local
vanitha1822 Oct 7, 2025
ce175d0
fix: removed unwanted code
vanitha1822 Oct 7, 2025
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
82 changes: 55 additions & 27 deletions src/main/java/com/iemr/common/identity/controller/IdentityController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.lang.reflect.Type;
import java.math.BigInteger;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
Expand All @@ -44,11 +45,13 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSyntaxException;
import com.iemr.common.identity.dto.BenIdImportDTO;
import com.iemr.common.identity.dto.BeneficiariesDTO;
import com.iemr.common.identity.dto.BeneficiariesPartialDTO;
Expand Down Expand Up @@ -951,32 +954,57 @@ public String checkAvailablBenIDLocalServer() {
return response.toString();
}

@Operation(summary = "Save server generated beneficiary ID & beneficiary registration ID to local server")
@PostMapping(path = "/saveGeneratedBenIDToLocalServer", headers = "Authorization", consumes = "application/json", produces = "application/json")
public String saveGeneratedBenIDToLocalServer(
@Param(value = "{\r\n" + " \"vanID\": \"Integer\",\r\n"
+ " \"benIDRequired\": \"Integer\"\r\n" + " }") @RequestBody String regIDList) {
com.iemr.common.identity.utils.response.OutputResponse response = new com.iemr.common.identity.utils.response.OutputResponse();
logger.info("Test: inside saveGeneratedBenIDToLocalServer method with regIDList: " + regIDList);
try {
BenIdImportDTO[] benIdImportDTOArr = InputMapper.getInstance().gson().fromJson(regIDList,
BenIdImportDTO[].class);

List<BenIdImportDTO> benIdImportDTOList = Arrays.asList(benIdImportDTOArr);

int i = svc.importBenIdToLocalServer(benIdImportDTOList);
logger.info("Number of unique benid imported to local server: " + i);
if (i > 0)
response.setResponse(i + " Unique benid imported to local server");
else {
response.setResponse("Empty or invalid data");
logger.error("Empty or invalid data. Data Size is : " + benIdImportDTOList.size());
}
} catch (Exception e) {
logger.error("Exception in importing benID to local server : " + e);
response.setError(5000, "error while importing benid to local server : " + e);
}
return response.toString();
}
@Operation(summary = "Save server generated beneficiary ID & beneficiary registration ID to local server")
@PostMapping(path = "/saveGeneratedBenIDToLocalServer", headers = "Authorization", consumes = "application/json", produces = "application/json")
public String saveGeneratedBenIDToLocalServer(@RequestBody String regIDList) {
com.iemr.common.identity.utils.response.OutputResponse response = new com.iemr.common.identity.utils.response.OutputResponse();
logger.info("Test: inside saveGeneratedBenIDToLocalServer method with regIDList: " + regIDList);
try {
JsonObject jsonObject = JsonParser.parseString(regIDList).getAsJsonObject();

// Extract vanID from request body
if (!jsonObject.has("vanID")) {
logger.error("vanID is missing in the request body");
response.setError(5000, "vanID is required in the request");
return response.toString();
}
BigInteger vanID = jsonObject.get("vanID").getAsBigInteger();
logger.info("Extracted vanID: " + vanID);

// Extract benIDList array from request body
if (!jsonObject.has("benIDList")) {
logger.error("benIDList is missing in the request body");
response.setError(5000, "benIDList is required in the request");
return response.toString();
}
JsonArray benIDArray = jsonObject.getAsJsonArray("benIDList");
BenIdImportDTO[] benIdImportDTOArr = InputMapper.getInstance().gson().fromJson(benIDArray, BenIdImportDTO[].class);
List<BenIdImportDTO> benIdImportDTOList = Arrays.asList(benIdImportDTOArr);

logger.info("Parsed {} BenIdImportDTO records", benIdImportDTOList.size());

// Set vanID for each DTO
for (BenIdImportDTO dto : benIdImportDTOList) {
dto.setVanID(vanID);
}

int i = svc.importBenIdToLocalServer(benIdImportDTOList);
logger.info("Number of unique benid imported to local server: " + i);

if (i > 0)
response.setResponse(i + " Unique benid imported to local server");
else {
response.setResponse("Empty or invalid data");
logger.error("Empty or invalid data. Data Size is : " + benIdImportDTOList.size());
}
} catch (JsonSyntaxException e) {
logger.error("Invalid JSON format in request: " + e.getMessage(), e);
response.setError(5000, "Invalid JSON format: " + e.getMessage());
} catch (Exception e) {
logger.error("Exception in importing benID to local server : " + e.getMessage(), e);
response.setError(5000, "error while importing benid to local server : " + e.getMessage());
}
return response.toString();
}

}
8 changes: 8 additions & 0 deletions src/main/java/com/iemr/common/identity/dto/BenIdImportDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public class BenIdImportDTO {
private BigInteger beneficiaryId;
private String createdBy;
private Timestamp createdDate;
private BigInteger vanID;

public BigInteger getBenRegId() {
return benRegId;
Expand Down Expand Up @@ -63,4 +64,11 @@ public void setCreatedDate(Timestamp createdDate) {
this.createdDate = createdDate;
}

public void setVanID(BigInteger vanID) {
this.vanID = vanID;
}

public BigInteger getVanID() {
return vanID;
}
}
1 change: 1 addition & 0 deletions src/main/java/com/iemr/common/identity/mapper/BenIdImportMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public interface BenIdImportMapper {
@Mapping(source = "beneficiaryId", target = "beneficiaryID")
@Mapping(source = "createdBy", target = "createdBy")
@Mapping(source = "createdDate", target = "createdDate")
@Mapping(source = "vanID", target = "vanID")
MBeneficiaryregidmapping benIdImportDTOToMBeneficiaryregidmapping(BenIdImportDTO dto);

ArrayList<MBeneficiaryregidmapping> benIdImportDTOToMBeneficiaryregidmappings(List<BenIdImportDTO> dto);
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/com/iemr/common/identity/service/IdentityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1738,27 +1738,29 @@ public void editIdentityEducationOrCommunity(IdentityEditDTO identity) throws Mi

public int importBenIdToLocalServer(List<BenIdImportDTO> benIdImportDTOList) {
logger.info("IdentityService.importBenIdToLocalServer - start");
logger.info("IdentityService.importBenIdToLocalServer - benIdImportDTOList size : "
+ (benIdImportDTOList == null ? "size:0" : benIdImportDTOList.size()));
if (!benIdImportDTOList.isEmpty()) {
ArrayList<MBeneficiaryregidmapping> mBeneficiaryregidmappingList = benIdImportMapper
.benIdImportDTOToMBeneficiaryregidmappings(benIdImportDTOList);
logger.info("Inside if block of importBenIdToLocalServer");
jdbcTemplate = getJdbcTemplate();
List<Object[]> dataList = new ArrayList<>();
Object[] objArr;
String query = " INSERT INTO m_beneficiaryregidmapping(BenRegId, BeneficiaryID, "
+ " Provisioned, CreatedDate, CreatedBy, Reserved) VALUES (?,?,?,?,?,?) ";
String query = " INSERT INTO db_identity.m_beneficiaryregidmapping(BenRegId, BeneficiaryID,"
+ " Provisioned, CreatedDate, CreatedBy, Reserved, VanId) VALUES (?,?,?,?,?,?,?) ";
logger.info("query : " + query);
for (MBeneficiaryregidmapping obj : mBeneficiaryregidmappingList) {
objArr = new Object[6];
logger.info("inside for check->",obj);

logger.info("In for loop of importBenIdToLocalServer"+obj.getVanID());
objArr = new Object[7];

objArr[0] = obj.getBenRegId();
objArr[1] = obj.getBeneficiaryID();
objArr[2] = false;
objArr[3] = obj.getCreatedDate();
objArr[4] = obj.getCreatedBy();
objArr[5] = false;
objArr[6] = obj.getVanID();

dataList.add(objArr);
logger.info("regid :" + obj.getBenRegId() + " - benid :" + obj.getBeneficiaryID());
Expand Down