feat: return deleted resources object from submitChanges

SAP · Apr 24, 2024 · d4f361d · d4f361d
1 parent b6fc4e2
commit d4f361d
Show file tree

Hide file tree

Showing 6 changed files with 137 additions and 0 deletions.
diff --git a/src/sap/fhir/model/r4/FHIRModel.js b/src/sap/fhir/model/r4/FHIRModel.js
@@ -650,6 +650,7 @@ sap.ui.define([
 	 */
 	FHIRModel.prototype.submitChanges =
 			function(sGroupId, fnSuccessCallback, fnErrorCallback) {
+				var removedResources = this.getRemovedResourcesObject();
 				if (typeof sGroupId === "function") {
 					fnErrorCallback = fnSuccessCallback;
 					fnSuccessCallback = FHIRUtils.deepClone(sGroupId);
@@ -693,9 +694,17 @@ sap.ui.define([
 							);
 							aPromises.push(oPromise);
 							oPromise.then(function (aFHIRResource) {
+								if (aFHIRResource.length == 0) {
+									aFHIRResource = removedResources;
+								}
 								fnSuccessCallback(aFHIRResource);
 							}).catch(function (oError) {
 								if (fnErrorCallback && oError.requestHandle) {
+									var sIds = FHIRUtils.getsIdFromOperationOutcome(oError.operationOutcomes);
+									removedResources = removedResources.filter(obj => !sIds.includes(obj.id));
+									if (oError.resources.length == 0) {
+										oError.resources = removedResources;
+									}
 									var mParameters = {
 										message: oError.requestHandle.getRequest().statusText,
 										description: oError.requestHandle.getRequest().responseText,
@@ -806,6 +815,28 @@ sap.ui.define([
 				return mRequestHandles;
 			};
 
+	/**
+     * Retrieves an array of resources that have been removed from the FHIR model.
+     * Iterates through the removed resources,
+     * retrieves corresponding resources from the model, and returns them.
+     * @returns {Array} An array containing the removed resources.
+     */
+	FHIRModel.prototype.getRemovedResourcesObject = function () {
+		var resources = [];
+		for (var type in this.mRemovedResources) {
+			if (this.mRemovedResources.hasOwnProperty(type)) {
+				var removedResources = this.mRemovedResources[type];
+				for (var key in removedResources) {
+					var resource = this.getProperty("/" + removedResources[key]);
+					if (resource) {
+						resources.push(resource);
+					}
+				}
+			}
+		}
+		return resources;
+	};
+
 	/**
 	 * Checks if an update for the existing bindings is necessary due to the <code>mChangedResources</code>
 	 *

diff --git a/src/sap/fhir/model/r4/FHIRUtils.js b/src/sap/fhir/model/r4/FHIRUtils.js
@@ -717,6 +717,20 @@ sap.ui.define([
 		return sFullUrl;
 	};
 
+	FHIRUtils.getsIdFromOperationOutcome = function(operationOutcomes){
+		var sIds = [];
+		for (var key in operationOutcomes) {
+			if (operationOutcomes.hasOwnProperty(key)) {
+				var operationOutcome = operationOutcomes[key];
+			    var text = operationOutcome._aIssue[0].details.text;
+				var sId = text.match(/[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}/);
+				sIds.push(sId[0]);
+			}
+		}
+		return sIds;
+
+	};
+
 	return FHIRUtils;
 
 });
diff --git a/test/localService/BundleWithDeleteSuccessAndFailureEntries.json b/test/localService/BundleWithDeleteSuccessAndFailureEntries.json
@@ -0,0 +1,43 @@
+{
+    "resourceType": "Bundle",
+    "id": "934953d3-35a3-477d-8c9e-0948a7e553ec",
+    "links": [],
+    "type": "batch-response",
+    "entry": [
+        {
+            "response": {
+                "status": "409 CONFLICT",
+                "outcome": {
+                    "issue": [
+                        {
+                            "severity": "error",
+                            "code": "conflict",
+                            "details": {
+                                "text": "Referenced resource exist 'e1692049-4bdc-4e40-abb5-4eae27ce0b8b' for resource 'RolePermission}'"
+                            },
+                            "diagnostics": "Referenced resource exist 'e1692049-4bdc-4e40-abb5-4eae27ce0b8b' for resource 'RolePermission}'"
+                        }
+                    ],
+                    "resourceType": "OperationOutcome",
+                    "meta": {
+                        "profile": [
+                            "http://hl7.org/fhir/StructureDefinition/OperationOutcome"
+                        ]
+                    }
+                }
+            }
+        },
+        {
+            "response": {
+                "status": "204 NO_CONTENT"
+            },
+            "fullUrl": "urn:uuid:cb62c497-ee6c-4c26-9721-2668f797e6c8"
+        }
+    ],
+    "total": 2,
+    "meta": {
+        "profile": [
+            "http://hl7.org/fhir/StructureDefinition/Bundle"
+        ]
+    }
+ }
diff --git a/test/qunit/model/FHIRModel.integration.js b/test/qunit/model/FHIRModel.integration.js
@@ -920,4 +920,22 @@ sap.ui.define([
 		oListBinding.attachDataReceived(fnDataReceivedCheck);
 	});
 
+	QUnit.test("Test delete containing successful entry and operation outcome", function (assert) {
+		var oJSONData = TestUtils.loadJSONFile("BundleWithDeleteSuccessAndFailureEntries");
+		var done = assert.async();
+		var sResId = this.oFhirModel.create("RolePermission", {
+			resourceType: "RolePermission",
+			version: "1.0.0",
+			name: "PersonaRead"
+		}, "bundle");
+		this.oFhirModel.mChangedResources = {};
+		this.oFhirModel.remove(["/RolePermission/" + sResId], undefined, "bundle");
+		var fnErrorCallback = function (oMessage, aFHIRResource, aOperationOutcome) {
+			assert.strictEqual(aOperationOutcome.length, 1, "Bundle error callback contains the opertion outcome of the failed entry ");
+			done();
+		};
+		TestUtilsIntegration.manipulateResponse("http://localhost:8080/fhir/R4", this.oFhirModel, TestUtilsIntegration.setResponseJSON, undefined, oJSONData);
+		this.oFhirModel.submitChanges("bundle", undefined, fnErrorCallback);
+	});
+
 });
diff --git a/test/qunit/model/FHIRModel.unit.js b/test/qunit/model/FHIRModel.unit.js
@@ -1503,4 +1503,11 @@ sap.ui.define([
 
 	});
 
+	QUnit.test("Test getRemovedResourcesObject returning the correct value", function (assert) {
+		this.oFhirModel1.mRemovedResources = { RolePermission: ["RolePermission/123"] };
+		this.oFhirModel1.setProperty("/RolePermission/123", { id: 123, description: "this is a test object", resourceType: "RolePermission" });
+		var resources = this.oFhirModel1.getRemovedResourcesObject();
+		assert.deepEqual(resources, [{ id: 123, description: "this is a test object", resourceType: "RolePermission" }], "Correct resources returned");
+	});
+
 });
diff --git a/test/qunit/model/FHIRUtils.unit.js b/test/qunit/model/FHIRUtils.unit.js
@@ -516,4 +516,28 @@ sap.ui.define(["../utils/TestUtils", "sap/fhir/model/r4/FHIRUtils"], function(Te
 		sFullUrl = FHIRUtils.generateFullUrl(TestUtils.createUri("url"), "/Patient/123", "123", "http://example.com");
 		assert.strictEqual(sFullUrl, "http://example.com/Patient/123");
 	});
+
+	QUnit.test("Test getIDsFromOperationOutcomes", function(assert) {
+		var operationOutcomes = {
+			"0": {
+				"_sResourceType": "OperationOutcome",
+				"_aIssue": [
+					{
+						"severity": "error",
+						"code": "conflict",
+						"details": {
+							"text": "Referenced resource exist '7b4abf15-8a93-4e11-8d85-96c945530d05' for resource 'RolePermission}'"
+						},
+						"diagnostics": "Referenced resource exist '7b4abf15-8a93-4e11-8d85-96c945530d05' for resource 'RolePermission}'"
+					}
+				]
+			}
+		};
+		var expectedIds = ["7b4abf15-8a93-4e11-8d85-96c945530d05"];
+
+		var actualIds = FHIRUtils.getsIdFromOperationOutcome(operationOutcomes);
+
+		assert.deepEqual(actualIds, expectedIds, "IDs extracted correctly from operationOutcomes");
+	});
+
 });