Upgrade common utils library

opensrp · Jul 25, 2023 · 637c8ca · 637c8ca
1 parent 8e8805c
commit 637c8ca
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/configuration/pom.xml b/configuration/pom.xml
@@ -5,7 +5,7 @@
 <parent>
 	<groupId>org.smartregister</groupId>
 	<artifactId>hapi-fhir-opensrp-extensions</artifactId>
-	<version>0.0.20-SNAPSHOT</version>
+	<version>0.0.21-SNAPSHOT</version>
 </parent>
 <groupId>org.smartregister.hapi-fhir-opensrp-extensions</groupId>
 <artifactId>configuration</artifactId>

diff --git a/location/pom.xml b/location/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi-fhir-opensrp-extensions</artifactId>
 		<groupId>org.smartregister</groupId>
-		<version>0.0.20-SNAPSHOT</version>
+		<version>0.0.21-SNAPSHOT</version>
 	</parent>
 
 	<description>The repository holds the location extensions on the HAPI server</description>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.smartregister</groupId>
 	<artifactId>hapi-fhir-opensrp-extensions</artifactId>
 	<packaging>pom</packaging>
-	<version>0.0.20-SNAPSHOT</version>
+	<version>0.0.21-SNAPSHOT</version>
 	<name>HAPI FHIR OpenSRP Extensions</name>
 	<description>This repository holds all the code extensions on top of Hapi-FHIR</description>
 	<url>https://github.com/opensrp/hapi-fhir-opensrp-extensions</url>
@@ -99,7 +99,7 @@
 		<dependency>
 			<groupId>org.smartregister</groupId>
 			<artifactId>fhir-common-utils</artifactId>
-			<version>0.0.6-SNAPSHOT</version>
+			<version>0.0.7-SNAPSHOT</version>
 		</dependency>
 
 		<!--        Test Dependencies-->

diff --git a/practitioner/pom.xml b/practitioner/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi-fhir-opensrp-extensions</artifactId>
 		<groupId>org.smartregister</groupId>
-		<version>0.0.20-SNAPSHOT</version>
+		<version>0.0.21-SNAPSHOT</version>
 	</parent>
 
 	<description>The repository holds the practitioner details extensions on the HAPI server</description>

diff --git a/...r/src/main/java/org/smartregister/extension/rest/PractitionerDetailsResourceProvider.java b/...r/src/main/java/org/smartregister/extension/rest/PractitionerDetailsResourceProvider.java
@@ -100,9 +100,7 @@ public PractitionerDetails getPractitionerDetails(
             List<IBaseResource> careTeams = getCareTeams(practitionerId);
             List<CareTeam> careTeamsList = mapToCareTeams(careTeams);
             fhirPractitionerDetails.setCareTeams(careTeamsList);
-            StringType practitionerIdString = new StringType();
-            practitionerIdString.setValue(practitionerId);
-            fhirPractitionerDetails.setPractitionerId(practitionerIdString);
+            fhirPractitionerDetails.setPractitioner((Practitioner) practitioner);
 
             logger.info("Searching for Organizations tied with CareTeams: ");
             List<IBaseResource> managingOrganizationsOfCareTeams =
@@ -135,7 +133,7 @@ public PractitionerDetails getPractitionerDetails(
             logger.info("Groups are fetched");
             List<Group> groupsList = mapToGroups(groups);
             fhirPractitionerDetails.setGroups(groupsList);
-            fhirPractitionerDetails.setId(practitionerIdString.getValue());
+            fhirPractitionerDetails.setId(practitionerId);
 
             logger.info("Searching for locations by organizations");
             List<String> locationsIdReferences =