Merge pull request #120 from onaio/feature/fix_stream_close

🐛 Fix the stream close bug caused by the REL fetch check
onaio · Feb 12, 2025 · ec516bf · ec516bf
2 parents 6fe8901 + c943ae1
commit ec516bf
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/exec/pom.xml b/exec/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.smartregister</groupId>
     <artifactId>opensrp-gateway-plugin</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
   </parent>
 
   <artifactId>exec</artifactId>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.smartregister</groupId>
       <artifactId>plugins</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.1</version>
     </dependency>
 
     <dependency>

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.smartregister</groupId>
     <artifactId>opensrp-gateway-plugin</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
   </parent>
 
   <artifactId>plugins</artifactId>

diff --git a/plugins/src/main/java/org/smartregister/fhir/gateway/plugins/Constants.java b/plugins/src/main/java/org/smartregister/fhir/gateway/plugins/Constants.java
@@ -71,6 +71,17 @@ public interface SyncStrategy {
         String CARE_TEAM = "CareTeam";
     }
 
+    public interface ResourceType {
+        String LOCATION = "Location";
+    }
+
+    public interface HttpMethods {
+        String POST = "POST";
+        String GET = "GET";
+        String PUT = "PUT";
+        String PATCH = "PATCH";
+    }
+
     public interface Header {
         @Deprecated String FHIR_GATEWAY_MODE = "fhir-gateway-mode";
         String MODE = "mode";

diff --git a/plugins/src/main/java/org/smartregister/fhir/gateway/plugins/SyncAccessDecision.java b/plugins/src/main/java/org/smartregister/fhir/gateway/plugins/SyncAccessDecision.java
@@ -239,7 +239,9 @@ public String postProcess(RequestDetailsReader request, HttpResponse response)
 
             resultContent = this.fhirR4JsonParser.encodeResourceToString(resultContentBundle);
 
-        } else if (Constants.SyncStrategy.RELATED_ENTITY_LOCATION.equals(syncStrategy)) {
+        } else if (Constants.SyncStrategy.RELATED_ENTITY_LOCATION.equals(syncStrategy)
+                && (Constants.HttpMethods.GET.equals(request.getRequestType().name())
+                        || Constants.HttpMethods.PATCH.equals(request.getRequestType().name()))) {
 
             IBaseResource responseResource =
                     processRelatedEntityLocationSyncStrategy(request, response);
@@ -253,9 +255,10 @@ public String postProcess(RequestDetailsReader request, HttpResponse response)
             resultContent = this.fhirR4JsonParser.encodeResourceToString(practitionerDetailsBundle);
         }
 
-        if (Constants.SyncStrategy.LOCATION.equals(request.getResourceName())
-                && ("POST".equals(request.getRequestType().name())
-                        || "PUT".equals(request.getRequestType().name()))) {
+        if (Constants.ResourceType.LOCATION.equals(request.getResourceName())
+                && (Constants.HttpMethods.POST.equals(request.getRequestType().name())
+                        || Constants.HttpMethods.PUT.equals(request.getRequestType().name()))) {
+
             resultContent = new BasicResponseHandler().handleResponse(response);
             String requestPath = request.getRequestPath();
             String locationId = getLocationId(requestPath, resultContent);

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.smartregister</groupId>
   <artifactId>opensrp-gateway-plugin</artifactId>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <packaging>pom</packaging>
 
   <modules>