From 4e50ce44e421a9bde3161461a5ee17d3866317b0 Mon Sep 17 00:00:00 2001 From: unknown <2019ucp1494@mnit.ac.in> Date: Sun, 10 Mar 2024 20:44:59 +0530 Subject: [PATCH 1/3] Initial merge --- .../HIUFacadeDiscoveryController.java | 39 ++++++++ .../HIUFacadeControllerInterface.java | 20 ++++ .../discovery/HIUFacadeControllerService.java | 96 +++++++++++++++++++ .../discovery/requests/HIUConfirmRequest.java | 16 ++++ .../requests/HIUDiscoverRequest.java | 20 ++++ .../discovery/requests/HIUInitRequest.java | 18 ++++ .../CareContextWithReferenceNumber.java | 6 ++ .../hrp/discovery/requests/helpers/HIPId.java | 15 +++ .../HIUPatientUnverifiedIdentifiers.java | 16 ++++ .../helpers/PatientWithReferenceNumber.java | 9 ++ .../discovery/responses/ConfirmResponse.java | 8 ++ .../discovery/responses/DiscoverResponse.java | 18 ++++ .../hrp/discovery/responses/InitResponse.java | 9 ++ .../responses/helpers/CareContextRequest.java | 6 ++ .../responses/helpers/HIUPatient.java | 19 ++++ .../helpers/LinkWithReferenceNumber.java | 8 ++ .../hrp/discovery/responses/helpers/Meta.java | 8 ++ .../responses/helpers/PatientResponse.java | 10 ++ 18 files changed, 341 insertions(+) create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUConfirmRequest.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUDiscoverRequest.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUInitRequest.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/CareContextWithReferenceNumber.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/HIPId.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/HIUPatientUnverifiedIdentifiers.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/PatientWithReferenceNumber.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/ConfirmResponse.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/DiscoverResponse.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/InitResponse.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/CareContextRequest.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/HIUPatient.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/LinkWithReferenceNumber.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/Meta.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/PatientResponse.java diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java b/src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java new file mode 100644 index 00000000..6f41596a --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java @@ -0,0 +1,39 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.facade.discovery; + +import com.nha.abdm.wrapper.hiu.hrp.discovery.HIUFacadeControllerInterface; +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUConfirmRequest; +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUInitRequest; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.ConfirmResponse; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.InitResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping(path = "/v1/care-contexts") +public class HIUFacadeDiscoveryController { + @Autowired HIUFacadeControllerInterface hiuFacadeControllerInterface; + + @PostMapping("/discover") + public ResponseEntity hiuDiscoverResponse( + @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, + @RequestBody HIUDiscoverRequest discoverRequest) { + return hiuFacadeControllerInterface.initiateDiscover(discoverRequest, xAuthToken); + } + + @PostMapping("/link/init") + public ResponseEntity hiuInitResponse( + @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, HIUInitRequest hiuInitRequest) { + return hiuFacadeControllerInterface.initiateLinkInit(hiuInitRequest, xAuthToken); + } + + @PostMapping("/link/confirm") + public ResponseEntity hiuConfirmResponse( + @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, + HIUConfirmRequest hiuConfirmRequest) { + return hiuFacadeControllerInterface.initiateLinkConfirm(hiuConfirmRequest, xAuthToken); + } +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java new file mode 100644 index 00000000..2dd2bdf4 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java @@ -0,0 +1,20 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery; + +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUConfirmRequest; +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUInitRequest; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.ConfirmResponse; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.InitResponse; +import org.springframework.http.ResponseEntity; + +public interface HIUFacadeControllerInterface { + ResponseEntity initiateDiscover( + HIUDiscoverRequest hiuDiscoverRequest, String xAuthToken); + + ResponseEntity initiateLinkInit(HIUInitRequest hiuInitRequest, String xAuthToken); + + ResponseEntity initiateLinkConfirm( + HIUConfirmRequest hiuConfirmRequest, String xAuthToken); +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java new file mode 100644 index 00000000..4c2a87cb --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java @@ -0,0 +1,96 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery; + +import com.nha.abdm.wrapper.common.RequestManager; +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUConfirmRequest; +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUInitRequest; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.ConfirmResponse; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.InitResponse; +import java.util.Objects; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + +@Service +public class HIUFacadeControllerService implements HIUFacadeControllerInterface { + @Value("${hiuDiscoverPath}") + public String hiuDiscoverPath; + + RequestManager requestManager; + + @Value("${hiuInitPath}") + public String hiuInitPath; + + @Value("${hiuLinkConfirmPath}") + public String hiuLinkConfirmPath; + + private static final Logger log = LogManager.getLogger(HIUFacadeControllerService.class); + + @Override + public ResponseEntity initiateDiscover( + HIUDiscoverRequest hiuDiscoverRequest, String xAuthToken) { + log.info(hiuDiscoverRequest.toString()); + if (Objects.nonNull(hiuDiscoverRequest) + && Objects.nonNull(hiuDiscoverRequest.getHip()) + && Objects.nonNull(hiuDiscoverRequest.getRequestId()) + && Objects.nonNull(xAuthToken)) { + try { + ResponseEntity response = + requestManager.bhaijan(hiuDiscoverPath, hiuDiscoverRequest, xAuthToken); + + log.info(response.getBody().toString()); + return response; + + } catch (Exception e) { + throw new RuntimeException("unable to make post request from discover " + e); + } + } + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new DiscoverResponse()); + } + + @Override + public ResponseEntity initiateLinkInit( + HIUInitRequest hiuInitRequest, String xAuthToken) { + + if (Objects.nonNull(hiuInitRequest) + && Objects.nonNull(hiuInitRequest.getRequestId()) + && Objects.nonNull(hiuInitRequest.getTransactionId()) + && Objects.nonNull(hiuInitRequest.getPatient()) + && Objects.nonNull(xAuthToken)) { + try { + ResponseEntity response = + requestManager.bhaijan2(hiuInitPath, hiuInitRequest, xAuthToken); + return response; + + } catch (Exception e) { + throw new RuntimeException("unable to make post request from linkint " + e); + } + } + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new InitResponse()); + } + + @Override + public ResponseEntity initiateLinkConfirm( + HIUConfirmRequest hiuConfirmRequest, String xAuthToken) { + + if (Objects.nonNull(hiuConfirmRequest) + && Objects.nonNull(hiuConfirmRequest.getReferenceNumber()) + && Objects.nonNull(hiuConfirmRequest.getToken()) + && Objects.nonNull(xAuthToken)) { + try { + ResponseEntity response = + requestManager.bhaijan3(hiuLinkConfirmPath, hiuConfirmRequest, xAuthToken); + return response; + + } catch (Exception e) { + throw new RuntimeException("unable to make post request from linkconfirm " + e); + } + } + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ConfirmResponse()); + } +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUConfirmRequest.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUConfirmRequest.java new file mode 100644 index 00000000..c39c7712 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUConfirmRequest.java @@ -0,0 +1,16 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.requests; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class HIUConfirmRequest { + public String token; + public String referenceNumber; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUDiscoverRequest.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUDiscoverRequest.java new file mode 100644 index 00000000..f551858d --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUDiscoverRequest.java @@ -0,0 +1,20 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.requests; + +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.helpers.HIPId; +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.helpers.HIUPatientUnverifiedIdentifiers; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class HIUDiscoverRequest { + public HIPId hip; + public String requestId; + public List unverifiedIdentifiers; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUInitRequest.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUInitRequest.java new file mode 100644 index 00000000..14516448 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUInitRequest.java @@ -0,0 +1,18 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.requests; + +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.helpers.PatientWithReferenceNumber; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class HIUInitRequest { + public String requestId; + public String transactionId; + public PatientWithReferenceNumber patient; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/CareContextWithReferenceNumber.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/CareContextWithReferenceNumber.java new file mode 100644 index 00000000..6c0087eb --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/CareContextWithReferenceNumber.java @@ -0,0 +1,6 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.requests.helpers; + +public class CareContextWithReferenceNumber { + public String referenceNumber; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/HIPId.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/HIPId.java new file mode 100644 index 00000000..7ada2bdc --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/HIPId.java @@ -0,0 +1,15 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.requests.helpers; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class HIPId { + public String id; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/HIUPatientUnverifiedIdentifiers.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/HIUPatientUnverifiedIdentifiers.java new file mode 100644 index 00000000..1fec537c --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/HIUPatientUnverifiedIdentifiers.java @@ -0,0 +1,16 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.requests.helpers; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class HIUPatientUnverifiedIdentifiers { + public String type; + public String value; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/PatientWithReferenceNumber.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/PatientWithReferenceNumber.java new file mode 100644 index 00000000..bf0c5481 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/PatientWithReferenceNumber.java @@ -0,0 +1,9 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.requests.helpers; + +import java.util.List; + +public class PatientWithReferenceNumber { + public String referenceNumber; + public List careContext; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/ConfirmResponse.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/ConfirmResponse.java new file mode 100644 index 00000000..fc89bd63 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/ConfirmResponse.java @@ -0,0 +1,8 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.responses; + +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers.PatientResponse; + +public class ConfirmResponse { + public PatientResponse patientResponse; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/DiscoverResponse.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/DiscoverResponse.java new file mode 100644 index 00000000..04826270 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/DiscoverResponse.java @@ -0,0 +1,18 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.responses; + +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers.HIUPatient; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DiscoverResponse { + public String transactionId; + public HIUPatient patient; + public String createdAt; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/InitResponse.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/InitResponse.java new file mode 100644 index 00000000..7357f6a7 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/InitResponse.java @@ -0,0 +1,9 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.responses; + +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers.LinkWithReferenceNumber; + +public class InitResponse { + public String transactionId; + public LinkWithReferenceNumber referenceNumber; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/CareContextRequest.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/CareContextRequest.java new file mode 100644 index 00000000..33b5499f --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/CareContextRequest.java @@ -0,0 +1,6 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers; + +public class CareContextRequest { + private String referenceNumber; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/HIUPatient.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/HIUPatient.java new file mode 100644 index 00000000..48dc9fd4 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/HIUPatient.java @@ -0,0 +1,19 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers; + +import com.nha.abdm.wrapper.common.models.CareContext; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class HIUPatient { + public String referenceNumber; + public String display; + public List careContexts; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/LinkWithReferenceNumber.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/LinkWithReferenceNumber.java new file mode 100644 index 00000000..797cbc4c --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/LinkWithReferenceNumber.java @@ -0,0 +1,8 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers; + +public class LinkWithReferenceNumber { + public String referenceNumber; + public String authenticationType; + public Meta meta; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/Meta.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/Meta.java new file mode 100644 index 00000000..d7bb15ec --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/Meta.java @@ -0,0 +1,8 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers; + +public class Meta { + public String communicationMedium; + public String communicationHint; + public String communicationExpiry; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/PatientResponse.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/PatientResponse.java new file mode 100644 index 00000000..da6cfa35 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/PatientResponse.java @@ -0,0 +1,10 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers; + +import java.util.List; + +public class PatientResponse { + private String referenceNumber; + private String display; + private List careContextsResponses; +} From 724aedb981e2c057937271c09ad8f9822baffd74 Mon Sep 17 00:00:00 2001 From: unknown <2019ucp1494@mnit.ac.in> Date: Sun, 10 Mar 2024 21:59:28 +0530 Subject: [PATCH 2/3] Second commit --- .../abdm/wrapper/common/RequestManager.java | 17 +++ .../encryption/EncryptionResponse.java | 3 +- .../mongo/services/PatientService.java | 9 +- .../HIUFacadeDiscoveryController.java | 28 ++--- .../HIUFacadeControllerInterface.java | 14 +-- .../discovery/HIUFacadeControllerService.java | 117 +++++++++--------- .../discovery/responses/DiscoverResponse.java | 3 + .../wrapper/patient/PatientController.java | 3 +- src/main/resources/application.properties | 7 +- 9 files changed, 105 insertions(+), 96 deletions(-) diff --git a/src/main/java/com/nha/abdm/wrapper/common/RequestManager.java b/src/main/java/com/nha/abdm/wrapper/common/RequestManager.java index eb03b32b..72079207 100644 --- a/src/main/java/com/nha/abdm/wrapper/common/RequestManager.java +++ b/src/main/java/com/nha/abdm/wrapper/common/RequestManager.java @@ -3,10 +3,13 @@ import com.nha.abdm.wrapper.common.requests.SessionManager; import com.nha.abdm.wrapper.common.responses.GenericResponse; +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.web.reactive.function.BodyInserters; @@ -45,4 +48,18 @@ public ResponseEntity fetchResponseFromGateway(String uri, .toEntity(GenericResponse.class) .block(); } + + public ResponseEntity bhaijan( + String uri, HIUDiscoverRequest request, String xAuthToken) { + return hiuWebClient + .post() + .uri(uri) + .headers(headers -> headers.setBasicAuth(xAuthToken)) + .accept(MediaType.ALL) + .contentType(MediaType.APPLICATION_JSON) + .body(BodyInserters.fromValue(request)) + .retrieve() + .toEntity(DiscoverResponse.class) + .block(); + } } diff --git a/src/main/java/com/nha/abdm/wrapper/hip/hrp/dataTransfer/encryption/EncryptionResponse.java b/src/main/java/com/nha/abdm/wrapper/hip/hrp/dataTransfer/encryption/EncryptionResponse.java index 8d1aa17d..e6663d7c 100644 --- a/src/main/java/com/nha/abdm/wrapper/hip/hrp/dataTransfer/encryption/EncryptionResponse.java +++ b/src/main/java/com/nha/abdm/wrapper/hip/hrp/dataTransfer/encryption/EncryptionResponse.java @@ -2,13 +2,12 @@ package com.nha.abdm.wrapper.hip.hrp.dataTransfer.encryption; import com.nha.abdm.wrapper.hip.hrp.dataTransfer.requests.helpers.HealthInformationBundle; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @Builder @AllArgsConstructor diff --git a/src/main/java/com/nha/abdm/wrapper/hip/hrp/database/mongo/services/PatientService.java b/src/main/java/com/nha/abdm/wrapper/hip/hrp/database/mongo/services/PatientService.java index b1529c22..ddd9435e 100644 --- a/src/main/java/com/nha/abdm/wrapper/hip/hrp/database/mongo/services/PatientService.java +++ b/src/main/java/com/nha/abdm/wrapper/hip/hrp/database/mongo/services/PatientService.java @@ -16,6 +16,10 @@ import com.nha.abdm.wrapper.hip.hrp.link.hipInitiated.requests.LinkRecordsRequest; import com.nha.abdm.wrapper.hip.hrp.link.userInitiated.responses.InitResponse; import com.nha.abdm.wrapper.hiu.hrp.consent.requests.ConsentCareContexts; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bson.Document; @@ -28,11 +32,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - @Service public class PatientService { private static final Logger log = LogManager.getLogger(PatientService.class); diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java b/src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java index 6f41596a..c6f0d524 100644 --- a/src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java +++ b/src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java @@ -2,12 +2,8 @@ package com.nha.abdm.wrapper.hiu.facade.discovery; import com.nha.abdm.wrapper.hiu.hrp.discovery.HIUFacadeControllerInterface; -import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUConfirmRequest; import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; -import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUInitRequest; -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.ConfirmResponse; import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.InitResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -24,16 +20,16 @@ public ResponseEntity hiuDiscoverResponse( return hiuFacadeControllerInterface.initiateDiscover(discoverRequest, xAuthToken); } - @PostMapping("/link/init") - public ResponseEntity hiuInitResponse( - @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, HIUInitRequest hiuInitRequest) { - return hiuFacadeControllerInterface.initiateLinkInit(hiuInitRequest, xAuthToken); - } - - @PostMapping("/link/confirm") - public ResponseEntity hiuConfirmResponse( - @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, - HIUConfirmRequest hiuConfirmRequest) { - return hiuFacadeControllerInterface.initiateLinkConfirm(hiuConfirmRequest, xAuthToken); - } + // @PostMapping("/link/init") + // public ResponseEntity hiuInitResponse( + // @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, HIUInitRequest hiuInitRequest) { + // return hiuFacadeControllerInterface.initiateLinkInit(hiuInitRequest, xAuthToken); + // } + // + // @PostMapping("/link/confirm") + // public ResponseEntity hiuConfirmResponse( + // @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, + // HIUConfirmRequest hiuConfirmRequest) { + // return hiuFacadeControllerInterface.initiateLinkConfirm(hiuConfirmRequest, xAuthToken); + // } } diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java index 2dd2bdf4..33cbb9a3 100644 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java @@ -1,20 +1,18 @@ /* (C) 2024 */ package com.nha.abdm.wrapper.hiu.hrp.discovery; -import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUConfirmRequest; import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; -import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUInitRequest; -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.ConfirmResponse; import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.InitResponse; import org.springframework.http.ResponseEntity; public interface HIUFacadeControllerInterface { + ResponseEntity initiateDiscover( HIUDiscoverRequest hiuDiscoverRequest, String xAuthToken); - ResponseEntity initiateLinkInit(HIUInitRequest hiuInitRequest, String xAuthToken); - - ResponseEntity initiateLinkConfirm( - HIUConfirmRequest hiuConfirmRequest, String xAuthToken); + // ResponseEntity initiateLinkInit(HIUInitRequest hiuInitRequest, String + // xAuthToken); + // + // ResponseEntity initiateLinkConfirm( + // HIUConfirmRequest hiuConfirmRequest, String xAuthToken); } diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java index 4c2a87cb..452b1836 100644 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java @@ -2,17 +2,12 @@ package com.nha.abdm.wrapper.hiu.hrp.discovery; import com.nha.abdm.wrapper.common.RequestManager; -import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUConfirmRequest; import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; -import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUInitRequest; -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.ConfirmResponse; import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.InitResponse; import java.util.Objects; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -21,76 +16,76 @@ public class HIUFacadeControllerService implements HIUFacadeControllerInterface @Value("${hiuDiscoverPath}") public String hiuDiscoverPath; - RequestManager requestManager; + private final RequestManager requestManager; - @Value("${hiuInitPath}") - public String hiuInitPath; - - @Value("${hiuLinkConfirmPath}") - public String hiuLinkConfirmPath; + // @Value("${hiuInitPath}") + // public String hiuInitPath; + // + // @Value("${hiuLinkConfirmPath}") + // public String hiuLinkConfirmPath; private static final Logger log = LogManager.getLogger(HIUFacadeControllerService.class); + public HIUFacadeControllerService(RequestManager requestManager) { + this.requestManager = requestManager; + } + @Override public ResponseEntity initiateDiscover( HIUDiscoverRequest hiuDiscoverRequest, String xAuthToken) { log.info(hiuDiscoverRequest.toString()); + log.info(xAuthToken); if (Objects.nonNull(hiuDiscoverRequest) && Objects.nonNull(hiuDiscoverRequest.getHip()) && Objects.nonNull(hiuDiscoverRequest.getRequestId()) && Objects.nonNull(xAuthToken)) { - try { - ResponseEntity response = - requestManager.bhaijan(hiuDiscoverPath, hiuDiscoverRequest, xAuthToken); + ResponseEntity response = + requestManager.bhaijan(hiuDiscoverPath, hiuDiscoverRequest, xAuthToken); - log.info(response.getBody().toString()); - return response; - - } catch (Exception e) { - throw new RuntimeException("unable to make post request from discover " + e); - } + log.info(response.getBody().toString()); + return response; } - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new DiscoverResponse()); + return null; } - @Override - public ResponseEntity initiateLinkInit( - HIUInitRequest hiuInitRequest, String xAuthToken) { - - if (Objects.nonNull(hiuInitRequest) - && Objects.nonNull(hiuInitRequest.getRequestId()) - && Objects.nonNull(hiuInitRequest.getTransactionId()) - && Objects.nonNull(hiuInitRequest.getPatient()) - && Objects.nonNull(xAuthToken)) { - try { - ResponseEntity response = - requestManager.bhaijan2(hiuInitPath, hiuInitRequest, xAuthToken); - return response; - - } catch (Exception e) { - throw new RuntimeException("unable to make post request from linkint " + e); - } - } - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new InitResponse()); - } - - @Override - public ResponseEntity initiateLinkConfirm( - HIUConfirmRequest hiuConfirmRequest, String xAuthToken) { - - if (Objects.nonNull(hiuConfirmRequest) - && Objects.nonNull(hiuConfirmRequest.getReferenceNumber()) - && Objects.nonNull(hiuConfirmRequest.getToken()) - && Objects.nonNull(xAuthToken)) { - try { - ResponseEntity response = - requestManager.bhaijan3(hiuLinkConfirmPath, hiuConfirmRequest, xAuthToken); - return response; - - } catch (Exception e) { - throw new RuntimeException("unable to make post request from linkconfirm " + e); - } - } - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ConfirmResponse()); - } + // @Override + // public ResponseEntity initiateLinkInit( + // HIUInitRequest hiuInitRequest, String xAuthToken) { + // + // if (Objects.nonNull(hiuInitRequest) + // && Objects.nonNull(hiuInitRequest.getRequestId()) + // && Objects.nonNull(hiuInitRequest.getTransactionId()) + // && Objects.nonNull(hiuInitRequest.getPatient()) + // && Objects.nonNull(xAuthToken)) { + // try { + // ResponseEntity response = + // requestManager.bhaijan2(hiuInitPath, hiuInitRequest, xAuthToken); + // return response; + // + // } catch (Exception e) { + // throw new RuntimeException("unable to make post request from linkint " + e); + // } + // } + // return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new InitResponse()); + // } + // + // @Override + // public ResponseEntity initiateLinkConfirm( + // HIUConfirmRequest hiuConfirmRequest, String xAuthToken) { + // + // if (Objects.nonNull(hiuConfirmRequest) + // && Objects.nonNull(hiuConfirmRequest.getReferenceNumber()) + // && Objects.nonNull(hiuConfirmRequest.getToken()) + // && Objects.nonNull(xAuthToken)) { + // try { + // ResponseEntity response = + // requestManager.bhaijan3(hiuLinkConfirmPath, hiuConfirmRequest, xAuthToken); + // return response; + // + // } catch (Exception e) { + // throw new RuntimeException("unable to make post request from linkconfirm " + e); + // } + // } + // return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ConfirmResponse()); + // } } diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/DiscoverResponse.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/DiscoverResponse.java index 04826270..e305db54 100644 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/DiscoverResponse.java +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/DiscoverResponse.java @@ -1,6 +1,7 @@ /* (C) 2024 */ package com.nha.abdm.wrapper.hiu.hrp.discovery.responses; +import com.nha.abdm.wrapper.common.responses.ErrorResponse; import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers.HIUPatient; import lombok.AllArgsConstructor; import lombok.Builder; @@ -12,7 +13,9 @@ @NoArgsConstructor @AllArgsConstructor public class DiscoverResponse { + private static final long serialVersionUID = 165269402517398406L; public String transactionId; public HIUPatient patient; public String createdAt; + public ErrorResponse error; } diff --git a/src/main/java/com/nha/abdm/wrapper/patient/PatientController.java b/src/main/java/com/nha/abdm/wrapper/patient/PatientController.java index 8a69f3a6..c1fea4e5 100644 --- a/src/main/java/com/nha/abdm/wrapper/patient/PatientController.java +++ b/src/main/java/com/nha/abdm/wrapper/patient/PatientController.java @@ -3,6 +3,7 @@ import com.nha.abdm.wrapper.hip.hrp.database.mongo.services.PatientService; import com.nha.abdm.wrapper.hip.hrp.database.mongo.tables.Patient; +import java.util.Objects; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -11,8 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Objects; - @RestController @RequestMapping(path = "/v1/patient") public class PatientController { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6e1ac2a3..d61d6d96 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -25,6 +25,9 @@ healthInformationConsentManagerPath=/v0.5/health-information/cm/request healthInformationOnRequestPath=/v0.5/health-information/hip/on-request healthInformationPushNotificationPath=/v0.5/health-information/notify +# HIU Discover paths +hiuDiscoverPath=https://dev.abdm.gov.in/cm/v1/care-contexts/discover + dataPushUrl=http://localhost:8082/v1/transfer/ #URLS @@ -39,8 +42,8 @@ spring.data.mongodb.database=abdm_wrapper #Credentials -clientId= -clientSecret= +clientId=YEP_TEST +clientSecret=44f2f4fb-7d90-4397-82d1-7dbccd032e6b #HIP hipBaseUrl=http://host.docker.internal:8081 From 1c39eb9c853e5cb482dfb219b4df1b99252039cf Mon Sep 17 00:00:00 2001 From: Vijay Kumar Date: Mon, 11 Mar 2024 01:03:06 +0530 Subject: [PATCH 3/3] Implemented HIU Discovery --- .../abdm/wrapper/common/RequestManager.java | 15 +-- .../HIUFacadeDiscoveryController.java | 22 +---- .../facade/link/HIUFacadeLinkController.java | 29 ++++++ .../HIUFacadeControllerInterface.java | 18 ---- .../discovery/HIUFacadeControllerService.java | 91 ------------------- .../HIUFacadeDiscoverControllerInterface.java | 10 ++ .../HIUFacadeDiscoverControllerService.java | 49 ++++++++++ .../helpers/PatientWithReferenceNumber.java | 9 -- .../discovery/responses/ConfirmResponse.java | 8 -- .../hrp/discovery/responses/InitResponse.java | 9 -- .../HIUFacadeLinkControllerInterface.java | 13 +++ .../link/HIUFacadeLinkControllerService.java | 77 ++++++++++++++++ .../requests/HIUConfirmRequest.java | 2 +- .../requests/HIUInitRequest.java | 4 +- .../CareContextWithReferenceNumber.java | 2 +- .../helpers/PatientWithReferenceNumber.java | 9 ++ .../hrp/link/responses/ConfirmResponse.java | 8 ++ .../hiu/hrp/link/responses/InitResponse.java | 9 ++ .../helpers/LinkWithReferenceNumber.java | 2 +- .../responses/helpers/Meta.java | 2 +- .../responses/helpers/PatientResponse.java | 3 +- src/main/resources/application.properties | 6 +- 22 files changed, 225 insertions(+), 172 deletions(-) create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/facade/link/HIUFacadeLinkController.java delete mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java delete mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeDiscoverControllerInterface.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeDiscoverControllerService.java delete mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/PatientWithReferenceNumber.java delete mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/ConfirmResponse.java delete mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/InitResponse.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/HIUFacadeLinkControllerInterface.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/HIUFacadeLinkControllerService.java rename src/main/java/com/nha/abdm/wrapper/hiu/hrp/{discovery => link}/requests/HIUConfirmRequest.java (82%) rename src/main/java/com/nha/abdm/wrapper/hiu/hrp/{discovery => link}/requests/HIUInitRequest.java (68%) rename src/main/java/com/nha/abdm/wrapper/hiu/hrp/{discovery => link}/requests/helpers/CareContextWithReferenceNumber.java (59%) create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/helpers/PatientWithReferenceNumber.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/ConfirmResponse.java create mode 100644 src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/InitResponse.java rename src/main/java/com/nha/abdm/wrapper/hiu/hrp/{discovery => link}/responses/helpers/LinkWithReferenceNumber.java (68%) rename src/main/java/com/nha/abdm/wrapper/hiu/hrp/{discovery => link}/responses/helpers/Meta.java (69%) rename src/main/java/com/nha/abdm/wrapper/hiu/hrp/{discovery => link}/responses/helpers/PatientResponse.java (56%) diff --git a/src/main/java/com/nha/abdm/wrapper/common/RequestManager.java b/src/main/java/com/nha/abdm/wrapper/common/RequestManager.java index 72079207..6614c8f0 100644 --- a/src/main/java/com/nha/abdm/wrapper/common/RequestManager.java +++ b/src/main/java/com/nha/abdm/wrapper/common/RequestManager.java @@ -3,13 +3,10 @@ import com.nha.abdm.wrapper.common.requests.SessionManager; import com.nha.abdm.wrapper.common.responses.GenericResponse; -import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.web.reactive.function.BodyInserters; @@ -49,17 +46,15 @@ public ResponseEntity fetchResponseFromGateway(String uri, .block(); } - public ResponseEntity bhaijan( - String uri, HIUDiscoverRequest request, String xAuthToken) { + public ResponseEntity fetchResponseForPHR( + String uri, Object request, String xAuthToken, String path) { return hiuWebClient .post() - .uri(uri) - .headers(headers -> headers.setBasicAuth(xAuthToken)) - .accept(MediaType.ALL) - .contentType(MediaType.APPLICATION_JSON) + .uri(uri + path) + .headers(headers -> headers.add("X-AUTH-TOKEN", xAuthToken)) .body(BodyInserters.fromValue(request)) .retrieve() - .toEntity(DiscoverResponse.class) + .toEntity(Object.class) .block(); } } diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java b/src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java index c6f0d524..dabb44a6 100644 --- a/src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java +++ b/src/main/java/com/nha/abdm/wrapper/hiu/facade/discovery/HIUFacadeDiscoveryController.java @@ -1,9 +1,8 @@ /* (C) 2024 */ package com.nha.abdm.wrapper.hiu.facade.discovery; -import com.nha.abdm.wrapper.hiu.hrp.discovery.HIUFacadeControllerInterface; +import com.nha.abdm.wrapper.hiu.hrp.discovery.HIUFacadeDiscoverControllerInterface; import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -11,25 +10,12 @@ @RestController @RequestMapping(path = "/v1/care-contexts") public class HIUFacadeDiscoveryController { - @Autowired HIUFacadeControllerInterface hiuFacadeControllerInterface; + @Autowired HIUFacadeDiscoverControllerInterface hiuFacadeDiscoverControllerInterface; @PostMapping("/discover") - public ResponseEntity hiuDiscoverResponse( + public ResponseEntity hiuDiscoverResponse( @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, @RequestBody HIUDiscoverRequest discoverRequest) { - return hiuFacadeControllerInterface.initiateDiscover(discoverRequest, xAuthToken); + return hiuFacadeDiscoverControllerInterface.initiateDiscover(discoverRequest, xAuthToken); } - - // @PostMapping("/link/init") - // public ResponseEntity hiuInitResponse( - // @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, HIUInitRequest hiuInitRequest) { - // return hiuFacadeControllerInterface.initiateLinkInit(hiuInitRequest, xAuthToken); - // } - // - // @PostMapping("/link/confirm") - // public ResponseEntity hiuConfirmResponse( - // @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, - // HIUConfirmRequest hiuConfirmRequest) { - // return hiuFacadeControllerInterface.initiateLinkConfirm(hiuConfirmRequest, xAuthToken); - // } } diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/facade/link/HIUFacadeLinkController.java b/src/main/java/com/nha/abdm/wrapper/hiu/facade/link/HIUFacadeLinkController.java new file mode 100644 index 00000000..b292fea8 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/facade/link/HIUFacadeLinkController.java @@ -0,0 +1,29 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.facade.link; + +import com.nha.abdm.wrapper.hiu.hrp.link.HIUFacadeLinkControllerInterface; +import com.nha.abdm.wrapper.hiu.hrp.link.requests.HIUConfirmRequest; +import com.nha.abdm.wrapper.hiu.hrp.link.requests.HIUInitRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping(path = "/v1/care-contexts/link") +public class HIUFacadeLinkController { + @Autowired HIUFacadeLinkControllerInterface hiuFacadeLinkControllerInterface; + + @PostMapping("/init") + public ResponseEntity hiuInitResponse( + @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, + @RequestBody HIUInitRequest hiuInitRequest) { + return hiuFacadeLinkControllerInterface.initiateLinkInit(hiuInitRequest, xAuthToken); + } + + @PostMapping("/confirm") + public ResponseEntity hiuConfirmResponse( + @RequestHeader(value = "X-AUTH-TOKEN") String xAuthToken, + @RequestBody HIUConfirmRequest hiuConfirmRequest) { + return hiuFacadeLinkControllerInterface.initiateLinkConfirm(hiuConfirmRequest, xAuthToken); + } +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java deleted file mode 100644 index 33cbb9a3..00000000 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerInterface.java +++ /dev/null @@ -1,18 +0,0 @@ -/* (C) 2024 */ -package com.nha.abdm.wrapper.hiu.hrp.discovery; - -import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; -import org.springframework.http.ResponseEntity; - -public interface HIUFacadeControllerInterface { - - ResponseEntity initiateDiscover( - HIUDiscoverRequest hiuDiscoverRequest, String xAuthToken); - - // ResponseEntity initiateLinkInit(HIUInitRequest hiuInitRequest, String - // xAuthToken); - // - // ResponseEntity initiateLinkConfirm( - // HIUConfirmRequest hiuConfirmRequest, String xAuthToken); -} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java deleted file mode 100644 index 452b1836..00000000 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeControllerService.java +++ /dev/null @@ -1,91 +0,0 @@ -/* (C) 2024 */ -package com.nha.abdm.wrapper.hiu.hrp.discovery; - -import com.nha.abdm.wrapper.common.RequestManager; -import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; -import java.util.Objects; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; - -@Service -public class HIUFacadeControllerService implements HIUFacadeControllerInterface { - @Value("${hiuDiscoverPath}") - public String hiuDiscoverPath; - - private final RequestManager requestManager; - - // @Value("${hiuInitPath}") - // public String hiuInitPath; - // - // @Value("${hiuLinkConfirmPath}") - // public String hiuLinkConfirmPath; - - private static final Logger log = LogManager.getLogger(HIUFacadeControllerService.class); - - public HIUFacadeControllerService(RequestManager requestManager) { - this.requestManager = requestManager; - } - - @Override - public ResponseEntity initiateDiscover( - HIUDiscoverRequest hiuDiscoverRequest, String xAuthToken) { - log.info(hiuDiscoverRequest.toString()); - log.info(xAuthToken); - if (Objects.nonNull(hiuDiscoverRequest) - && Objects.nonNull(hiuDiscoverRequest.getHip()) - && Objects.nonNull(hiuDiscoverRequest.getRequestId()) - && Objects.nonNull(xAuthToken)) { - ResponseEntity response = - requestManager.bhaijan(hiuDiscoverPath, hiuDiscoverRequest, xAuthToken); - - log.info(response.getBody().toString()); - return response; - } - return null; - } - - // @Override - // public ResponseEntity initiateLinkInit( - // HIUInitRequest hiuInitRequest, String xAuthToken) { - // - // if (Objects.nonNull(hiuInitRequest) - // && Objects.nonNull(hiuInitRequest.getRequestId()) - // && Objects.nonNull(hiuInitRequest.getTransactionId()) - // && Objects.nonNull(hiuInitRequest.getPatient()) - // && Objects.nonNull(xAuthToken)) { - // try { - // ResponseEntity response = - // requestManager.bhaijan2(hiuInitPath, hiuInitRequest, xAuthToken); - // return response; - // - // } catch (Exception e) { - // throw new RuntimeException("unable to make post request from linkint " + e); - // } - // } - // return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new InitResponse()); - // } - // - // @Override - // public ResponseEntity initiateLinkConfirm( - // HIUConfirmRequest hiuConfirmRequest, String xAuthToken) { - // - // if (Objects.nonNull(hiuConfirmRequest) - // && Objects.nonNull(hiuConfirmRequest.getReferenceNumber()) - // && Objects.nonNull(hiuConfirmRequest.getToken()) - // && Objects.nonNull(xAuthToken)) { - // try { - // ResponseEntity response = - // requestManager.bhaijan3(hiuLinkConfirmPath, hiuConfirmRequest, xAuthToken); - // return response; - // - // } catch (Exception e) { - // throw new RuntimeException("unable to make post request from linkconfirm " + e); - // } - // } - // return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ConfirmResponse()); - // } -} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeDiscoverControllerInterface.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeDiscoverControllerInterface.java new file mode 100644 index 00000000..63f21451 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeDiscoverControllerInterface.java @@ -0,0 +1,10 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery; + +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; +import org.springframework.http.ResponseEntity; + +public interface HIUFacadeDiscoverControllerInterface { + + ResponseEntity initiateDiscover(HIUDiscoverRequest hiuDiscoverRequest, String xAuthToken); +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeDiscoverControllerService.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeDiscoverControllerService.java new file mode 100644 index 00000000..cedec159 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/HIUFacadeDiscoverControllerService.java @@ -0,0 +1,49 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.discovery; + +import com.nha.abdm.wrapper.common.RequestManager; +import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.HIUDiscoverRequest; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.DiscoverResponse; +import java.util.Objects; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + +@Service +public class HIUFacadeDiscoverControllerService implements HIUFacadeDiscoverControllerInterface { + @Value("${hiuDiscoverPath}") + public String hiuDiscoverPath; + + private final RequestManager requestManager; + + private static final Logger log = LogManager.getLogger(HIUFacadeDiscoverControllerService.class); + + public HIUFacadeDiscoverControllerService(RequestManager requestManager) { + this.requestManager = requestManager; + } + + @Override + public ResponseEntity initiateDiscover( + HIUDiscoverRequest hiuDiscoverRequest, String xAuthToken) { + log.info(hiuDiscoverRequest.toString()); + if (Objects.nonNull(hiuDiscoverRequest) + && Objects.nonNull(hiuDiscoverRequest.getHip()) + && Objects.nonNull(hiuDiscoverRequest.getRequestId()) + && Objects.nonNull(xAuthToken)) { + try { + ResponseEntity response = + requestManager.fetchResponseForPHR(hiuDiscoverPath, hiuDiscoverRequest, xAuthToken, ""); + + log.info(response.getBody().toString()); + return response; + + } catch (Exception e) { + throw new RuntimeException("unable to make post request from discover " + e); + } + } + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new DiscoverResponse()); + } +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/PatientWithReferenceNumber.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/PatientWithReferenceNumber.java deleted file mode 100644 index bf0c5481..00000000 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/PatientWithReferenceNumber.java +++ /dev/null @@ -1,9 +0,0 @@ -/* (C) 2024 */ -package com.nha.abdm.wrapper.hiu.hrp.discovery.requests.helpers; - -import java.util.List; - -public class PatientWithReferenceNumber { - public String referenceNumber; - public List careContext; -} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/ConfirmResponse.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/ConfirmResponse.java deleted file mode 100644 index fc89bd63..00000000 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/ConfirmResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -/* (C) 2024 */ -package com.nha.abdm.wrapper.hiu.hrp.discovery.responses; - -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers.PatientResponse; - -public class ConfirmResponse { - public PatientResponse patientResponse; -} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/InitResponse.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/InitResponse.java deleted file mode 100644 index 7357f6a7..00000000 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/InitResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -/* (C) 2024 */ -package com.nha.abdm.wrapper.hiu.hrp.discovery.responses; - -import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers.LinkWithReferenceNumber; - -public class InitResponse { - public String transactionId; - public LinkWithReferenceNumber referenceNumber; -} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/HIUFacadeLinkControllerInterface.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/HIUFacadeLinkControllerInterface.java new file mode 100644 index 00000000..87980811 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/HIUFacadeLinkControllerInterface.java @@ -0,0 +1,13 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.link; + +import com.nha.abdm.wrapper.hiu.hrp.link.requests.HIUConfirmRequest; +import com.nha.abdm.wrapper.hiu.hrp.link.requests.HIUInitRequest; +import org.springframework.http.ResponseEntity; + +public interface HIUFacadeLinkControllerInterface { + ResponseEntity initiateLinkInit(HIUInitRequest hiuInitRequest, String xAuthToken); + + ResponseEntity initiateLinkConfirm( + HIUConfirmRequest hiuConfirmRequest, String xAuthToken); +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/HIUFacadeLinkControllerService.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/HIUFacadeLinkControllerService.java new file mode 100644 index 00000000..6495a04d --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/HIUFacadeLinkControllerService.java @@ -0,0 +1,77 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.link; + +import com.nha.abdm.wrapper.common.RequestManager; +import com.nha.abdm.wrapper.hiu.hrp.link.requests.HIUConfirmRequest; +import com.nha.abdm.wrapper.hiu.hrp.link.requests.HIUInitRequest; +import com.nha.abdm.wrapper.hiu.hrp.link.responses.ConfirmResponse; +import com.nha.abdm.wrapper.hiu.hrp.link.responses.InitResponse; +import java.util.Objects; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + +@Service +public class HIUFacadeLinkControllerService implements HIUFacadeLinkControllerInterface { + private static final Logger log = LogManager.getLogger(HIUFacadeLinkControllerInterface.class); + + private final RequestManager requestManager; + + @Value("${hiuInitPath}") + public String hiuInitPath; + + @Value("${hiuLinkConfirmPath}") + public String hiuLinkConfirmPath; + + public HIUFacadeLinkControllerService(RequestManager requestManager) { + this.requestManager = requestManager; + } + + @Override + public ResponseEntity initiateLinkInit(HIUInitRequest hiuInitRequest, String xAuthToken) { + log.info(hiuInitRequest.toString()); + + if (Objects.nonNull(hiuInitRequest) + && Objects.nonNull(hiuInitRequest.getRequestId()) + && Objects.nonNull(hiuInitRequest.getTransactionId()) + && Objects.nonNull(hiuInitRequest.getPatient()) + && Objects.nonNull(xAuthToken)) { + try { + ResponseEntity response = + requestManager.fetchResponseForPHR(hiuInitPath, hiuInitRequest, xAuthToken, ""); + return response; + + } catch (Exception e) { + throw new RuntimeException("unable to make post request from linkint " + e); + } + } + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new InitResponse()); + } + + @Override + public ResponseEntity initiateLinkConfirm( + HIUConfirmRequest hiuConfirmRequest, String xAuthToken) { + log.info(hiuConfirmRequest.toString()); + if (Objects.nonNull(hiuConfirmRequest) + && Objects.nonNull(hiuConfirmRequest.getReferenceNumber()) + && Objects.nonNull(hiuConfirmRequest.getToken()) + && Objects.nonNull(xAuthToken)) { + try { + ResponseEntity response = + requestManager.fetchResponseForPHR( + hiuLinkConfirmPath, + hiuConfirmRequest, + xAuthToken, + "/" + hiuConfirmRequest.getReferenceNumber()); + return response; + + } catch (Exception e) { + throw new RuntimeException("unable to make post request from linkconfirm " + e); + } + } + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ConfirmResponse()); + } +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUConfirmRequest.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/HIUConfirmRequest.java similarity index 82% rename from src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUConfirmRequest.java rename to src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/HIUConfirmRequest.java index c39c7712..6aa05ffa 100644 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUConfirmRequest.java +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/HIUConfirmRequest.java @@ -1,5 +1,5 @@ /* (C) 2024 */ -package com.nha.abdm.wrapper.hiu.hrp.discovery.requests; +package com.nha.abdm.wrapper.hiu.hrp.link.requests; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUInitRequest.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/HIUInitRequest.java similarity index 68% rename from src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUInitRequest.java rename to src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/HIUInitRequest.java index 14516448..69366521 100644 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/HIUInitRequest.java +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/HIUInitRequest.java @@ -1,7 +1,7 @@ /* (C) 2024 */ -package com.nha.abdm.wrapper.hiu.hrp.discovery.requests; +package com.nha.abdm.wrapper.hiu.hrp.link.requests; -import com.nha.abdm.wrapper.hiu.hrp.discovery.requests.helpers.PatientWithReferenceNumber; +import com.nha.abdm.wrapper.hiu.hrp.link.requests.helpers.PatientWithReferenceNumber; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/CareContextWithReferenceNumber.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/helpers/CareContextWithReferenceNumber.java similarity index 59% rename from src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/CareContextWithReferenceNumber.java rename to src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/helpers/CareContextWithReferenceNumber.java index 6c0087eb..047275d6 100644 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/requests/helpers/CareContextWithReferenceNumber.java +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/helpers/CareContextWithReferenceNumber.java @@ -1,5 +1,5 @@ /* (C) 2024 */ -package com.nha.abdm.wrapper.hiu.hrp.discovery.requests.helpers; +package com.nha.abdm.wrapper.hiu.hrp.link.requests.helpers; public class CareContextWithReferenceNumber { public String referenceNumber; diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/helpers/PatientWithReferenceNumber.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/helpers/PatientWithReferenceNumber.java new file mode 100644 index 00000000..5d1907e0 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/requests/helpers/PatientWithReferenceNumber.java @@ -0,0 +1,9 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.link.requests.helpers; + +import java.util.List; + +public class PatientWithReferenceNumber { + public String referenceNumber; + public List careContexts; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/ConfirmResponse.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/ConfirmResponse.java new file mode 100644 index 00000000..ef23cf5a --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/ConfirmResponse.java @@ -0,0 +1,8 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.link.responses; + +import com.nha.abdm.wrapper.hiu.hrp.link.responses.helpers.PatientResponse; + +public class ConfirmResponse { + public PatientResponse patientResponse; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/InitResponse.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/InitResponse.java new file mode 100644 index 00000000..0a401500 --- /dev/null +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/InitResponse.java @@ -0,0 +1,9 @@ +/* (C) 2024 */ +package com.nha.abdm.wrapper.hiu.hrp.link.responses; + +import com.nha.abdm.wrapper.hiu.hrp.link.responses.helpers.LinkWithReferenceNumber; + +public class InitResponse { + public String transactionId; + public LinkWithReferenceNumber referenceNumber; +} diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/LinkWithReferenceNumber.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/helpers/LinkWithReferenceNumber.java similarity index 68% rename from src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/LinkWithReferenceNumber.java rename to src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/helpers/LinkWithReferenceNumber.java index 797cbc4c..8c40f93f 100644 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/LinkWithReferenceNumber.java +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/helpers/LinkWithReferenceNumber.java @@ -1,5 +1,5 @@ /* (C) 2024 */ -package com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers; +package com.nha.abdm.wrapper.hiu.hrp.link.responses.helpers; public class LinkWithReferenceNumber { public String referenceNumber; diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/Meta.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/helpers/Meta.java similarity index 69% rename from src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/Meta.java rename to src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/helpers/Meta.java index d7bb15ec..91152fff 100644 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/Meta.java +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/helpers/Meta.java @@ -1,5 +1,5 @@ /* (C) 2024 */ -package com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers; +package com.nha.abdm.wrapper.hiu.hrp.link.responses.helpers; public class Meta { public String communicationMedium; diff --git a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/PatientResponse.java b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/helpers/PatientResponse.java similarity index 56% rename from src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/PatientResponse.java rename to src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/helpers/PatientResponse.java index da6cfa35..6dbfc4b1 100644 --- a/src/main/java/com/nha/abdm/wrapper/hiu/hrp/discovery/responses/helpers/PatientResponse.java +++ b/src/main/java/com/nha/abdm/wrapper/hiu/hrp/link/responses/helpers/PatientResponse.java @@ -1,6 +1,7 @@ /* (C) 2024 */ -package com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers; +package com.nha.abdm.wrapper.hiu.hrp.link.responses.helpers; +import com.nha.abdm.wrapper.hiu.hrp.discovery.responses.helpers.CareContextRequest; import java.util.List; public class PatientResponse { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d61d6d96..638346c8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -27,6 +27,8 @@ healthInformationPushNotificationPath=/v0.5/health-information/notify # HIU Discover paths hiuDiscoverPath=https://dev.abdm.gov.in/cm/v1/care-contexts/discover +hiuInitPath=https://dev.abdm.gov.in/cm/v1/links/link/init +hiuLinkConfirmPath=https://dev.abdm.gov.in/cm/v1/links/link/confirm dataPushUrl=http://localhost:8082/v1/transfer/ @@ -42,8 +44,8 @@ spring.data.mongodb.database=abdm_wrapper #Credentials -clientId=YEP_TEST -clientSecret=44f2f4fb-7d90-4397-82d1-7dbccd032e6b +clientId= +clientSecret= #HIP hipBaseUrl=http://host.docker.internal:8081