Merge pull request #26 from icanbwell/updates_loading_resource_json

HHRE-726 updated loadResourceFromString method
icanbwell · Mar 17, 2022 · fac2985 · fac2985
2 parents 60068ad + 1f97a42
commit fac2985
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -34,6 +34,6 @@ COPY ./src/ /helix.pipelines/src/
 
 ## skip running tests since it requires a fhir server
 RUN mvn -Dmaven.test.skip package && \
-    cp ./target/bsights-engine-spark-1.0.2.jar /opt/spark/jars/
+    cp ./target/bsights-engine-spark-1.0.3.jar /opt/spark/jars/
 
 # USER 1001
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.bwell</groupId>
     <artifactId>bsights-engine-spark</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/src/main/java/com/bwell/services/domain/ResourceLoader.java b/src/main/java/com/bwell/services/domain/ResourceLoader.java
@@ -53,6 +53,8 @@ public IBaseBundle loadResourceFromString(String resourceJson) {
                     // get the contained array
                     List<Resource> contained = ((Patient) resource).getContained();
 
+                    resourceJson = resourceJson.trim();
+
                     // separate contained resources
                     String separatedRawResources = separateContainedResources(resourceJson, contained.size());
 
@@ -102,12 +104,12 @@ private String separateContainedResources(String rawContainedJson, int numberOfC
                 }
             }
             else {
-                resourceStr = rawContainedJson.substring(indexLocations[i], rawContainedJson.length() - 3);
+                resourceStr = rawContainedJson.substring(indexLocations[i], rawContainedJson.length() - 2);
                 // trim
                 resourceStr = resourceStr.trim();
             }
 
-            separatedContainedResourcesJson += (resourceStr+"\r\n");
+            separatedContainedResourcesJson += ("\r\n" + resourceStr);
         }
 
         return separatedContainedResourcesJson;
@@ -123,7 +125,8 @@ private String bundleSeparateResourcesJson(String rawSeparatedJson) {
         }
 
         // wrap in a bundle
-        separatedResourcesBundleJson = "{\"resourceType\":\"Bundle\", \"id\":\"" + UUID.randomUUID().toString() + "\", \"entry\":[" + separatedResourcesBundleJson + "]}";
+        separatedResourcesBundleJson = "{\"resourceType\":\"Bundle\", \"entry\":[" + separatedResourcesBundleJson + "]}";
+
         return separatedResourcesBundleJson;
     }
 }