map = existingLog.getRequestDetails();
- if (Objects.isNull(map)) {
- map = new HashMap<>();
+
+ if (Objects.nonNull(errors)) {
+ update.set(FieldIdentifiers.ERROR, errors);
}
- map.replace(FieldIdentifiers.LINK_RECORDS_REQUEST, linkRecordsV3Request);
- Update update = new Update();
- update.set(FieldIdentifiers.REQUEST_DETAILS, map);
- update.set(FieldIdentifiers.STATUS, status);
- update.set(FieldIdentifiers.LAST_UPDATED, Utils.getCurrentDateTime());
- mongoTemplate.updateFirst(query, update, RequestLog.class);
+
+ mongoTemplate.upsert(query, update, RequestLog.class);
}
/**
@@ -602,38 +616,57 @@ public void saveLinkTokenRequest(
*
* Adding linkOnAddCareContextsResponse dump into db.
*
- * @param linkOnAddCareContextsV3Response Acknowledgement from ABDM gateway for HipLinking.
+ * @param response Acknowledgement from ABDM gateway for HipLinking.
*/
- public void setHipOnAddCareContextResponse(
- LinkOnAddCareContextsV3Response linkOnAddCareContextsV3Response)
+ public void setHipOnAddCareContextResponse(LinkOnAddCareContextsV3Response response)
throws IllegalDataStateException {
- RequestLog RequestLog =
- logsRepo.findByGatewayRequestId(
- linkOnAddCareContextsV3Response.getResponse().getRequestId());
- if (RequestLog == null) {
- throw new IllegalDataStateException(
- "Request not found in database for: "
- + linkOnAddCareContextsV3Response.getResponse().getRequestId());
- }
- HashMap map = RequestLog.getRequestDetails();
- map.put(FieldIdentifiers.HIP_ON_ADD_CARE_CONTEXT_RESPONSE, linkOnAddCareContextsV3Response);
- Query query =
- new Query(
- Criteria.where(FieldIdentifiers.GATEWAY_REQUEST_ID)
- .is(linkOnAddCareContextsV3Response.getResponse().getRequestId()));
- Update update = new Update();
- if ((Objects.nonNull(linkOnAddCareContextsV3Response.getError()))) {
- update.set(FieldIdentifiers.ERROR, linkOnAddCareContextsV3Response.getError());
+ String requestId = response.getResponse().getRequestId();
+ log.info("Processing HIP OnAddCareContext response for requestId: {}", requestId);
+
+ Query query = Query.query(Criteria.where(FieldIdentifiers.GATEWAY_REQUEST_ID).is(requestId));
+ Update update =
+ new Update()
+ .set(
+ FieldIdentifiers.REQUEST_DETAILS
+ + "."
+ + FieldIdentifiers.HIP_ON_ADD_CARE_CONTEXT_RESPONSE,
+ response)
+ .set(FieldIdentifiers.LAST_UPDATED, Utils.getCurrentDateTime());
+
+ if (response.getError() != null) {
+ update.set(FieldIdentifiers.ERROR, response.getError());
} else {
update.set(FieldIdentifiers.STATUS, RequestStatus.CARE_CONTEXT_LINKED);
- LinkRecordsV3Request linkRecordsV3Request =
- (LinkRecordsV3Request)
- RequestLog.getRequestDetails().get(FieldIdentifiers.LINK_RECORDS_REQUEST);
- patientService.addPatientCareContexts(linkRecordsV3Request);
}
- update.set(FieldIdentifiers.REQUEST_DETAILS, map);
- mongoTemplate.updateFirst(query, update, RequestLog.class);
+ log.info("Querying gatewayRequestId = {}", requestId);
+ log.info("Query for requestId: {} {}", query, requestId);
+ log.info("Update for requestId: {} {}", update, requestId);
+ RequestLog updatedLog =
+ mongoTemplate.findAndModify(
+ query, update, FindAndModifyOptions.options().returnNew(true), RequestLog.class);
+
+ if (updatedLog == null) {
+ log.warn(
+ "findAndModify returned null, fallback to fetch manually for requestId: {}", requestId);
+ updatedLog = logsRepo.findByGatewayRequestId(requestId);
+
+ if (updatedLog == null) {
+ throw new IllegalDataStateException("Request not found in database for: " + requestId);
+ }
+ }
+
+ if (response.getError() == null) {
+ Object raw = updatedLog.getRequestDetails().get(FieldIdentifiers.LINK_RECORDS_REQUEST);
+ if (raw instanceof LinkRecordsV3Request) {
+ patientService.addPatientCareContexts((LinkRecordsV3Request) raw);
+ } else {
+ log.warn(
+ "Expected LinkRecordsV3Request but got: {}",
+ raw == null ? "null" : raw.getClass().getName());
+ }
+ }
+ log.info("Successfully updated requestId: {}", requestId);
}
public RequestLog getLogsByAbhaAddress(String abhaAddress, String hipId) {
diff --git a/src/main/java/in/nha/abdm/wrapper/v3/hip/hrp/dataTransfer/HIPHealthInformationV3Service.java b/src/main/java/in/nha/abdm/wrapper/v3/hip/hrp/dataTransfer/HIPHealthInformationV3Service.java
index ebf522e2..f2fec9d1 100644
--- a/src/main/java/in/nha/abdm/wrapper/v3/hip/hrp/dataTransfer/HIPHealthInformationV3Service.java
+++ b/src/main/java/in/nha/abdm/wrapper/v3/hip/hrp/dataTransfer/HIPHealthInformationV3Service.java
@@ -7,6 +7,7 @@
import in.nha.abdm.wrapper.v1.common.models.RespRequest;
import in.nha.abdm.wrapper.v1.common.requests.*;
import in.nha.abdm.wrapper.v1.common.responses.ErrorResponse;
+import in.nha.abdm.wrapper.v1.common.responses.ErrorV3Response;
import in.nha.abdm.wrapper.v1.common.responses.GenericResponse;
import in.nha.abdm.wrapper.v1.hip.hrp.consent.requests.HIPNotifyRequest;
import in.nha.abdm.wrapper.v1.hip.hrp.dataTransfer.callback.HIPHealthInformationRequest;
@@ -27,6 +28,7 @@
import in.nha.abdm.wrapper.v3.common.RequestV3Manager;
import in.nha.abdm.wrapper.v3.common.exceptions.BadRequestHandler;
import in.nha.abdm.wrapper.v3.common.models.GenericV3Response;
+import in.nha.abdm.wrapper.v3.config.ErrorHandler;
import in.nha.abdm.wrapper.v3.database.mongo.services.ConsentPatientV3Service;
import in.nha.abdm.wrapper.v3.database.mongo.services.PatientV3Service;
import in.nha.abdm.wrapper.v3.database.mongo.services.RequestLogV3Service;
@@ -146,20 +148,32 @@ public void healthInformation(
// Acknowledge to gateway that health information request has been received.
healthInformationAcknowledgementRequest(
hipHealthInformationRequest, onHealthInformationRequest, headers);
+ try {
+ // Sending the data to HIU only if there is no errors
+ if (Objects.isNull(onHealthInformationRequest.getError())) {
+ // Prepare health information bundle request which needs to be sent to HIU.
+ HealthInformationBundleResponse healthInformationBundleResponse =
+ fetchHealthInformationBundle(hipHealthInformationRequest, headers);
+ // Push the health information to HIU.
+ List> pushHealthInformationResponse =
+ pushHealthInformation(healthInformationBundleResponse, consentId, headers);
+ // Notify Gateway that health information was pushed to HIU.
+ healthInformationPushNotify(
+ hipHealthInformationRequest, consentId, pushHealthInformationResponse, headers);
+ } else {
+ // Sending BAD_REQUEST since there are some errors earlier
+ healthInformationPushNotify(
+ hipHealthInformationRequest,
+ consentId,
+ Collections.singletonList(new ResponseEntity<>(HttpStatus.BAD_REQUEST)),
+ headers);
+ }
+ } catch (Exception e) {
+ List errors = ErrorHandler.getErrors(e.getMessage());
+ log.debug(errors);
+ requestLogV3Service.updateConsentStatus(consentId, errors, RequestStatus.DATA_TRANSFER_ERROR);
- // Sending the data to HIU only if there is no errors
- if (Objects.isNull(onHealthInformationRequest.getError())) {
- // Prepare health information bundle request which needs to be sent to HIU.
- HealthInformationBundleResponse healthInformationBundleResponse =
- fetchHealthInformationBundle(hipHealthInformationRequest, headers);
- // Push the health information to HIU.
- List> pushHealthInformationResponse =
- pushHealthInformation(healthInformationBundleResponse, consentId, headers);
- // Notify Gateway that health information was pushed to HIU.
- healthInformationPushNotify(
- hipHealthInformationRequest, consentId, pushHealthInformationResponse, headers);
- } else {
- // Sending BAD_REQUEST since there are some errors earlier
+ // Notify Gateway that health information was pushed to HIU with BAD_REQUEST status.
healthInformationPushNotify(
hipHealthInformationRequest,
consentId,
@@ -212,27 +226,30 @@ private void healthInformationAcknowledgementRequest(
private HealthInformationBundleResponse fetchHealthInformationBundle(
HIPHealthInformationRequest hipHealthInformationRequest, HttpHeaders headers)
throws IllegalDataStateException {
- ConsentCareContextMapping existingLog =
+ ConsentCareContextMapping existingConsentLog =
consentCareContextsService.findMappingByConsentId(
hipHealthInformationRequest.getHiRequest().getConsent().getId());
+ RequestLog existingLog =
+ requestLogV3Service.findByConsentId(
+ hipHealthInformationRequest.getHiRequest().getConsent().getId(),
+ GatewayConstants.HIP,
+ headers.getFirst(GatewayConstants.X_HIP_ID));
+ if (existingLog == null) {
+ throw new IllegalDataStateException("Request log not found for consent id");
+ }
HIPNotifyRequest hipNotifyRequest =
- (HIPNotifyRequest)
- requestLogV3Service
- .findByConsentId(
- hipHealthInformationRequest.getHiRequest().getConsent().getId(),
- GatewayConstants.HIP,
- headers.getFirst(GatewayConstants.X_HIP_ID))
- .getRequestDetails()
- .get(FieldIdentifiers.HIP_NOTIFY_REQUEST);
+ (HIPNotifyRequest) existingLog.getRequestDetails().get(FieldIdentifiers.HIP_NOTIFY_REQUEST);
String hipId = hipNotifyRequest.getNotification().getConsentDetail().getHip().getId();
- if (existingLog == null) {
+ if (existingConsentLog == null) {
throw new IllegalDataStateException("consent id not found in db");
}
HealthInformationBundleRequest healthInformationBundleRequest =
HealthInformationBundleRequest.builder()
.hipId(hipId)
- .careContextsWithPatientReferences(existingLog.getCareContexts())
+ .careContextsWithPatientReferences(existingConsentLog.getCareContexts())
.build();
+ requestLogV3Service.updateConsentStatus(
+ existingConsentLog.getConsentId(), null, RequestStatus.FETCHING_BUNDLE);
log.debug(
"Health information bundle request HIP : " + healthInformationBundleRequest.toString());
return hipClient.healthInformationBundleRequest(healthInformationBundleRequest).getBody();
@@ -298,6 +315,9 @@ private List fetchHealthInformationPushRequest(
EncryptionResponse encryptedData =
encryptionService.encrypt(hipHealthInformationRequest, healthInformationBundleResponse);
+ requestLogV3Service.updateConsentStatus(
+ hipNotifyRequest.getNotification().getConsentId(), null, RequestStatus.ENCRYPTION_SUCCESS);
+
HealthInformationDhPublicKey receiverDhPublicKey =
hipHealthInformationRequest.getHiRequest().getKeyMaterial().getDhPublicKey();
@@ -362,7 +382,8 @@ private void healthInformationPushNotify(
HIPHealthInformationRequest hipHealthInformationRequest,
String consentId,
List> pushHealthInformationResponse,
- HttpHeaders headers) {
+ HttpHeaders headers)
+ throws IllegalDataStateException {
boolean allSuccess =
pushHealthInformationResponse.stream()
.allMatch(response -> response.getStatusCode().is2xxSuccessful());
@@ -370,13 +391,14 @@ private void healthInformationPushNotify(
String healthInformationStatus = allSuccess ? "DELIVERED" : "ERRORED";
String sessionStatus = allSuccess ? "TRANSFERRED" : "FAILED";
+ RequestLog existingLog =
+ requestLogV3Service.findByConsentId(
+ consentId, GatewayConstants.HIP, headers.getFirst(GatewayConstants.X_HIP_ID));
+ if (existingLog == null) {
+ throw new IllegalDataStateException("Request log not found for consent id: " + consentId);
+ }
HIPNotifyRequest hipNotifyRequest =
- (HIPNotifyRequest)
- requestLogV3Service
- .findByConsentId(
- consentId, GatewayConstants.HIP, headers.getFirst(GatewayConstants.X_HIP_ID))
- .getRequestDetails()
- .get(FieldIdentifiers.HIP_NOTIFY_REQUEST);
+ (HIPNotifyRequest) existingLog.getRequestDetails().get(FieldIdentifiers.HIP_NOTIFY_REQUEST);
List listOfCareContexts =
hipNotifyRequest.getNotification().getConsentDetail().getCareContexts();
List healthInformationStatusResponseList = new ArrayList<>();
@@ -415,6 +437,12 @@ private void healthInformationPushNotify(
.notification(healthInformationNotificationStatus)
.build();
log.info(healthInformationPushNotification.toString());
+ if (allSuccess) {
+ requestLogV3Service.updateConsentStatus(consentId, null, RequestStatus.DATA_TRANSFER_SUCCESS);
+ } else {
+ requestLogV3Service.updateConsentStatus(consentId, null, RequestStatus.DATA_TRANSFER_ERROR);
+ log.error("Data transfer failed for consent id: " + consentId);
+ }
try {
ResponseEntity response =
requestV3Manager.fetchResponseFromGateway(
diff --git a/src/main/java/in/nha/abdm/wrapper/v3/hip/hrp/link/hipInitiated/HIPLinkV3Service.java b/src/main/java/in/nha/abdm/wrapper/v3/hip/hrp/link/hipInitiated/HIPLinkV3Service.java
index 1c7ecc85..889bfcad 100644
--- a/src/main/java/in/nha/abdm/wrapper/v3/hip/hrp/link/hipInitiated/HIPLinkV3Service.java
+++ b/src/main/java/in/nha/abdm/wrapper/v3/hip/hrp/link/hipInitiated/HIPLinkV3Service.java
@@ -99,7 +99,7 @@ public FacadeV3Response addCareContexts(LinkRecordsV3Request linkRecordsV3Reques
linkRecordsV3Request.getRequesterId(),
linkRecordsV3Request.getCareContexts());
- if (sameCareContexts != null && !sameCareContexts.isEmpty()) {
+ if (Objects.nonNull(sameCareContexts) && !sameCareContexts.isEmpty()) {
return hipContextNotify(linkRecordsV3Request, patient, sameCareContexts);
}
@@ -153,6 +153,7 @@ private List buildPatientCareContextHIType(
private FacadeV3Response sendAddCareContextsRequest(
LinkRecordsV3Request request, AddCareContexts addCareContexts, String linkToken) {
try {
+ requestLogV3Service.persistHipLinkRequest(request, RequestStatus.INITIATING, null);
ResponseEntity response =
requestV3Manager.fetchResponseFromGateway(
addCareContextsPath,
@@ -210,6 +211,15 @@ private FacadeV3Response buildErrorResponse(
.build();
}
+ private FacadeV3Response buildErrorResponse(
+ LinkRecordsV3Request request, List errors) {
+ return FacadeV3Response.builder()
+ .clientRequestId(request.getRequestId())
+ .httpStatusCode(HttpStatus.BAD_REQUEST)
+ .errors(errors)
+ .build();
+ }
+
private FacadeV3Response handleAddCareContextError(LinkRecordsV3Request request) {
ErrorResponse errorResponse =
ErrorResponse.builder()
@@ -228,8 +238,10 @@ private FacadeV3Response handleAddCareContextError(LinkRecordsV3Request request)
private FacadeV3Response handleWebClientBadRequest(
LinkRecordsV3Request request, WebClientResponseException.BadRequest ex) {
Object error = BadRequestHandler.getError(ex);
- requestLogV3Service.persistHipLinkRequest(request, RequestStatus.ADD_CARE_CONTEXT_ERROR, error);
- return buildErrorResponse(request, "Wrapper-1001", ex.getMessage());
+ List errorList = ErrorHandler.getErrors(error);
+ requestLogV3Service.persistHipLinkRequest(
+ request, RequestStatus.ADD_CARE_CONTEXT_ERROR, errorList);
+ return buildErrorResponse(request, errorList);
}
private FacadeV3Response handleGeneralException(LinkRecordsV3Request request, Exception ex) {
@@ -351,25 +363,24 @@ public void handleAddCareContexts(
RequestStatus.LINK_TOKEN_REQUEST_ERROR);
return;
}
+
linkTokenService.saveLinkToken(
onGenerateTokenResponse.getAbhaAddress(),
onGenerateTokenResponse.getLinkToken(),
Objects.requireNonNull(headers.getFirst(GatewayConstants.X_HIP_ID)));
// Fetching the GenerateLinkToken request
- RequestLog requestLog =
+ RequestLog RequestLog =
requestLogV3Service.getLogsByAbhaAddress(
onGenerateTokenResponse.getAbhaAddress(),
Objects.requireNonNull(headers.get(GatewayConstants.X_HIP_ID)).toString());
- if (Objects.isNull(requestLog)) {
- log.error("Request log not found for on-linkToken generation to initiate linking");
+ if (Objects.isNull(RequestLog)) {
return;
}
- log.info("RequestLog: " + requestLog);
LinkRecordsV3Request linkRecordsV3Request =
(LinkRecordsV3Request)
- requestLog.getRequestDetails().get(FieldIdentifiers.LINK_RECORDS_REQUEST);
- log.info("Initiating careContext Linking");
+ RequestLog.getRequestDetails().get(FieldIdentifiers.LINK_RECORDS_REQUEST);
+
FacadeV3Response facadeV3Response = addCareContexts(linkRecordsV3Request);
} catch (WebClientResponseException.BadRequest ex) {
Object error = BadRequestHandler.getError(ex);