PSMRI
diff --git a/‎.factorypath‎
Lines changed: 1 addition & 1 deletion b/‎.factorypath‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pom.xml‎
Lines changed: 45 additions & 9 deletions b/‎pom.xml‎
Lines changed: 45 additions & 9 deletions
diff --git a/‎src/main/environment/common_ci.properties‎
Lines changed: 6 additions & 0 deletions b/‎src/main/environment/common_ci.properties‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/main/environment/common_docker.properties‎
Lines changed: 8 additions & 1 deletion b/‎src/main/environment/common_docker.properties‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎src/main/environment/common_example.properties‎
Lines changed: 7 additions & 1 deletion b/‎src/main/environment/common_example.properties‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎src/main/java/com/wipro/fhir/controller/generateresource/ResourceRequestGateway.java‎
Lines changed: 9 additions & 9 deletions b/‎src/main/java/com/wipro/fhir/controller/generateresource/ResourceRequestGateway.java‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎src/main/java/com/wipro/fhir/controller/test/Test.java‎
Lines changed: 3 additions & 5 deletions b/‎src/main/java/com/wipro/fhir/controller/test/Test.java‎
Lines changed: 3 additions & 5 deletions
diff --git a/‎src/main/java/com/wipro/fhir/controller/v3/abha/CreateAbhaV3Controller.java‎
Lines changed: 3 additions & 1 deletion b/‎src/main/java/com/wipro/fhir/controller/v3/abha/CreateAbhaV3Controller.java‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/main/java/com/wipro/fhir/controller/v3/careContext/CareContextLinkingController.java‎
Lines changed: 63 additions & 0 deletions b/‎src/main/java/com/wipro/fhir/controller/v3/careContext/CareContextLinkingController.java‎
Lines changed: 63 additions & 0 deletions
diff --git a/‎src/main/java/com/wipro/fhir/data/mongo/care_context/GenerateTokenAbdmResponses.java‎
Lines changed: 39 additions & 0 deletions b/‎src/main/java/com/wipro/fhir/data/mongo/care_context/GenerateTokenAbdmResponses.java‎
Lines changed: 39 additions & 0 deletions
@@ -1,4 +1,4 @@
 <factorypath>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.36/lombok-1.18.36.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.30/lombok-1.18.30.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/mapstruct/mapstruct-processor/1.2.0.Final/mapstruct-processor-1.2.0.Final.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>com.wipro.fhir.r4</groupId>
 	<artifactId>fhir-api</artifactId>
-	<version>3.6.0</version>
+	<version>3.6.1</version>
 	<packaging>war</packaging>
 	<name>FHIR-API</name>
 	<description>FHIR_NDHM standard integration in AMRIT</description>
@@ -186,39 +186,74 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.14.2</version>
+			<version>2.15.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.14.2</version>
+			<version>2.15.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.14.2</version>
+			<version>2.15.2</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/hapi-fhir-structures-r4 -->
+		<!--
+		https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/hapi-fhir-structures-r4 -->
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-r4</artifactId>
-			<version>6.10.0</version>
+			<version>8.4.0</version>
 		</dependency>
-		
+
+		<!--
+		https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/hapi-fhir-validation -->
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-validation</artifactId>
+			<version>8.4.0</version>
+		</dependency>
+
+		<!--
+		https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/hapi-fhir-structures-r4 -->
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-r4</artifactId>
+			<version>8.4.0</version>
+		</dependency>
+
+
+		<!-- Choose a HAPI version that matches the rest of your modules -->
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-caching-caffeine</artifactId>
+			<version>8.4.0</version> <!-- example; align with your HAPI version -->
+		</dependency>
+
+
 		<dependency>
 			<groupId>ca.uhn.hapi</groupId>
 			<artifactId>hapi-base</artifactId>
 			<version>2.6.0</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/org.hl7.fhir.utilities -->
+		<!--
+		https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/org.hl7.fhir.utilities -->
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>org.hl7.fhir.utilities</artifactId>
 			<version>6.5.18</version>
 		</dependency>
 
+		<!--
+		https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/hapi-fhir-validation-resources-r4 -->
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-validation-resources-r4</artifactId>
+			<version>8.4.0</version>
+		</dependency>
+
 		<!-- lombok -->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -363,7 +398,8 @@
 									${target-properties} and
 									${source-properties}
 								</echo>
-								<concat destfile="${target-properties}" append="yes"
+								<concat destfile="${target-properties}"
+									append="yes"
 									force="yes">
 									<fileset file="${source-properties}">
 									</fileset>
 
@@ -98,6 +98,10 @@ webLoginAbhaRequestOtp = @env.ABDM_PHR_URL@/login/abha/request/otp
 webLoginAbhaVerify = @env.ABDM_PHR_URL@/login/abha/verify
 webLoginPhrCard = @env.ABDM_PHR_URL@/login/profile/abha/phr-card
 
+## ABDM V3 M2 APIs 
+generateTokenForLinkCareContext = @env.ABDM_HIECM_BASE_URL@/api/hiecm/v3/token/generate-token
+linkCareContext = @env.ABDM_HIECM_BASE_URL@/api/hiecm/hip/v3/link/carecontext
+
 x-CM-ID=@env.X_CM_ID@
 abhaMode=@env.ABHA_MODE@
 
@@ -120,3 +124,5 @@ springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
 spring.redis.host=@env.REDIS_HOST@
 
 cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@
+
+hipSystemUrl= @env.HIP_SYSTEM_URL@
@@ -98,6 +98,10 @@ webLoginAbhaRequestOtp = ${ABDM_PHR_URL}/login/abha/request/otp
 webLoginAbhaVerify = ${ABDM_PHR_URL}/login/abha/verify
 webLoginPhrCard = ${ABDM_PHR_URL}/login/profile/abha/phr-card
 
+## ABDM V3 M2 APIs 
+generateTokenForLinkCareContext = @env.ABDM_HIECM_BASE_URL@/api/hiecm/v3/token/generate-token
+linkCareContext = @env.ABDM_HIECM_BASE_URL@/api/hiecm/hip/v3/link/carecontext
+
 x-CM-ID=${X_CM_ID}
 abhaMode=${ABHA_MODE}
 
@@ -117,4 +121,7 @@ springdoc.api-docs.enabled=${SWAGGER_DOC_ENABLED}
 springdoc.swagger-ui.enabled=${SWAGGER_DOC_ENABLED}
 
 # Redis IP
-spring.redis.host=${REDIS_HOST}
+spring.redis.host=${REDIS_HOST}
+
+
+hipSystemUrl= ${HIP_SYSTEM_URL}
@@ -100,6 +100,10 @@ requestAuthByAbdm = https://abhasbx.abdm.gov.in/abha/api/v3/enrollment/auth/byAb
 webLoginAbhaVerify = https://abhasbx.abdm.gov.in/abha/api/v3/phr/web/login/abha/verify
 webLoginPhrCard = https://abhasbx.abdm.gov.in/abha/api/v3/phr/web/login/profile/abha/phr-card
 
+## ABDM V3 M2 APIs 
+generateTokenForLinkCareContext = https://dev.abdm.gov.in/api/hiecm/v3/token/generate-token
+linkCareContext = https://dev.abdm.gov.in/api/hiecm/hip/v3/link/carecontext
+
 x-CM-ID= sbx
 abhaMode=sbx
 
@@ -113,4 +117,6 @@ jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
 logging.path=logs/
 logging.file.name=logs/fhir-api.log
 
-cors.allowed-origins=http://localhost:*
+cors.allowed-origins=http://localhost:*
+
+hipSystemUrl= <Enter HIP request URL>
@@ -33,9 +33,9 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.wipro.fhir.data.request_handler.ResourceRequestHandler;
-import com.wipro.fhir.service.resource_gateway.DiagnosticReportRecord;
-import com.wipro.fhir.service.resource_gateway.OPConsultRecordBundle;
-import com.wipro.fhir.service.resource_gateway.PrescriptionRecordBundle;
+import com.wipro.fhir.service.bundle_creation.DiagnosticRecordResourceBundle;
+import com.wipro.fhir.service.bundle_creation.OPConsultResourceBundle;
+import com.wipro.fhir.service.bundle_creation.PrescriptionResourceBundle;
 import com.wipro.fhir.utils.exception.FHIRException;
 import com.wipro.fhir.utils.response.OutputResponse;
 
@@ -55,11 +55,11 @@ public class ResourceRequestGateway {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@Autowired
-	private OPConsultRecordBundle opConsultRecordBundle;
+	private OPConsultResourceBundle opConsultRecordBundle;
 	@Autowired
-	private PrescriptionRecordBundle prescriptionRecordBundle;
+	private PrescriptionResourceBundle prescriptionRecordBundle;
 	@Autowired
-	private DiagnosticReportRecord diagnosticReportRecord;
+	private DiagnosticRecordResourceBundle diagnosticReportRecord;
 
 	/***
 	 * 
@@ -78,7 +78,7 @@ public String getPatientResource(@RequestBody ResourceRequestHandler patientReso
 
 		OutputResponse response = new OutputResponse();
 		try {
-			String s = opConsultRecordBundle.getOPConsultRecordBundle(patientResourceRequest, null);
+			String s = opConsultRecordBundle.populateOPConsultRecordResourceBundle(patientResourceRequest, null);
 
 			response.setResponse(s);
 		} catch (FHIRException e) {
@@ -104,7 +104,7 @@ public String getDiagnosticReportRecord(@RequestBody ResourceRequestHandler pati
 
 		OutputResponse response = new OutputResponse();
 		try {
-			String s = diagnosticReportRecord.getDiagnosticReportRecordBundle(patientResourceRequest, null);
+			String s = diagnosticReportRecord.populateDiagnosticReportResourceBundle(patientResourceRequest, null);
 
 			response.setResponse(s);
 		} catch (FHIRException e) {
@@ -129,7 +129,7 @@ public String getPrescriptionRecord(@RequestBody ResourceRequestHandler patientR
 
 		OutputResponse response = new OutputResponse();
 		try {
-			String s = prescriptionRecordBundle.getPrescriptionRecordBundle(patientResourceRequest, null);
+			String s = prescriptionRecordBundle.populatePrescriptionResourceBundle(patientResourceRequest, null);
 
 			response.setResponse(s);
 		} catch (FHIRException e) {
 
@@ -34,9 +34,7 @@
 
 import com.wipro.fhir.data.request_handler.ResourceRequestHandler;
 import com.wipro.fhir.service.atoms.feed.bahmni.ClinicalFeedWorker;
-import com.wipro.fhir.service.resource_gateway.OPConsultRecordBundle;
-import com.wipro.fhir.service.resource_gateway.OPConsultRecordBundleImpl;
-import com.wipro.fhir.service.resource_gateway.PrescriptionRecordBundleImpl;
+import com.wipro.fhir.service.bundle_creation.OPConsultResourceBundleImpl;
 import com.wipro.fhir.utils.http.HttpUtils;
 import com.wipro.fhir.utils.response.OutputResponse;
 
@@ -50,7 +48,7 @@ public class Test {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@Autowired
-	private OPConsultRecordBundleImpl oPConsultRecordBundleImpl;
+	private OPConsultResourceBundleImpl oPConsultRecordBundleImpl;
 
 	@Operation(summary = "Test parse ATOM Feeds")
 	@PostMapping(value = { "/parse/feed/ATOM" })
@@ -59,7 +57,7 @@ public String parseFeeds(@RequestBody ResourceRequestHandler resourceRequestHand
 		OutputResponse response = new OutputResponse();
 		String s = null;
 		try {
-			s = oPConsultRecordBundleImpl.getOPConsultRecordBundle(resourceRequestHandler, null);
+			s = oPConsultRecordBundleImpl.populateOPConsultRecordResourceBundle(resourceRequestHandler, null);
 			response.setResponse(s);
 		} catch (Exception e) {
 			logger.error("Unexpected error:" , e);
 
@@ -3,7 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -60,6 +60,8 @@ public String abhaEnrollmentByAadhaar(@RequestBody String request) {
 		logger.info("NDHM_FHIR generate OTP for ABHA card API response " + response.toString());
 		return response.toString();
 	}
+	
+	@CrossOrigin
 	@Operation(summary = "Verify Auth By ABDM for ABHA enrollment")
 	@PostMapping(value = { "/verifyAuthByAbdm" })
 	public String verifyMobileForAuth(@RequestBody String request) {
 
@@ -0,0 +1,63 @@
+package com.wipro.fhir.controller.v3.careContext;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.wipro.fhir.service.v3.careContext.CareContextLinkingService;
+import com.wipro.fhir.utils.exception.FHIRException;
+import com.wipro.fhir.utils.response.OutputResponse;
+
+import io.swagger.v3.oas.annotations.Operation;
+
+@RestController
+@RequestMapping(value = "/careContext", headers = "Authorization")
+public class CareContextLinkingController {
+
+	@Autowired
+	private CareContextLinkingService careContextLinkingService;
+
+	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+	@Operation(summary = "Generate token for care context linking")
+	@PostMapping(value = { "/generateCareContextToken" })
+	public String requestOtpForEnrollment(@RequestBody String request) {
+		logger.info("Generate token for care context API request " + request);
+		OutputResponse response = new OutputResponse();
+		try {
+			if (request != null) {
+				String s = careContextLinkingService.generateTokenForCareContext(request);
+				response.setResponse(s);
+			} else
+				throw new FHIRException("NDHM_FHIR Empty request object");
+		} catch (FHIRException e) {
+			response.setError(5000, e.getMessage());
+			logger.error(e.toString());
+		}
+		logger.info("NDHM_FHIR generate token for care context API response " + response.toString());
+		return response.toString();
+	}
+
+	@Operation(summary = "link care context")
+	@PostMapping(value = { "/linkCareContext" })
+	public String add(@RequestBody String request) {
+		logger.info("link care context API request " + request);
+		OutputResponse response = new OutputResponse();
+		try {
+			if (request != null) {
+				String s = careContextLinkingService.linkCareContext(request);
+				response.setResponse(s);
+			} else
+				throw new FHIRException("NDHM_FHIR Empty request object");
+		} catch (FHIRException e) {
+			response.setError(5000, e.getMessage());
+			logger.error(e.toString());
+		}
+		logger.info("link care context API response " + response.toString());
+		return response.toString();
+	}
+}
@@ -0,0 +1,39 @@
+package com.wipro.fhir.data.mongo.care_context;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Field;
+
+import com.google.gson.annotations.Expose;
+
+import lombok.Data;
+
+@Data
+@Document(collection = "GenerateTokenAbdmResponses")
+public class GenerateTokenAbdmResponses {
+	
+	@Id
+	@Expose
+	@Field(value = "id")
+	private String id;
+	
+	@Expose
+	@Field(value = "abhaAddress")
+	private String abhaAddress;
+	
+	@Expose
+	@Field(value = "requestId")
+	private String requestId;
+
+	@Expose
+	@Field(value = "response")
+	private String response;
+	
+	@Expose
+	@Field(value = "createdDate")
+	private Date createdDate;
+
+}