Merge pull request #222 from Open-MBEE/develop

release 4.0.13
Open-MBEE · Nov 7, 2022 · 1347ffd · 1347ffd
2 parents df54e9a + 40ee3e7
commit 1347ffd
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 3 deletions.
diff --git a/crud/src/main/java/org/openmbee/mms/crud/services/NodeGetHelper.java b/crud/src/main/java/org/openmbee/mms/crud/services/NodeGetHelper.java
@@ -4,6 +4,8 @@
 import java.util.*;
 
 import java.util.stream.Collectors;
+
+import org.openmbee.mms.core.config.ContextHolder;
 import org.openmbee.mms.core.objects.Rejection;
 import org.openmbee.mms.core.services.NodeGetInfo;
 import org.openmbee.mms.core.exceptions.BadRequestException;
@@ -100,14 +102,15 @@ private NodeGetInfo processCommit(NodeGetInfo info, String commitId, NodeService
             }
             Instant modified = Instant.from(formatter.parse(indexElement.getModified()));
             Instant created = Instant.from(formatter.parse(indexElement.getCreated()));
-
+            indexElement.setRefId(ContextHolder.getContext().getBranchId());
             if (commitId.equals(indexElement.getCommitId())) { //exact match
                 info.getActiveElementMap().put(nodeId, indexElement);
             } else if (created.isAfter(time)) { // element created after commit
                 rejectNotFound(info, nodeId);
             } else if (modified.isAfter(time)) { // latest element is after commit
                 Optional<ElementJson> tryExact = nodeIndex.getByCommitId(commitId, nodeId);
                 if (tryExact.isPresent()) {
+                    tryExact.get().setRefId(ContextHolder.getContext().getBranchId());
                     info.getActiveElementMap().put(nodeId, tryExact.get());
                     continue; // found exact match at commit
                 }
@@ -118,6 +121,7 @@ private NodeGetInfo processCommit(NodeGetInfo info, String commitId, NodeService
                     formatter.format(time), refCommitIds);
                 if (e.isPresent()) { // found version of element at commit time
                     //TODO determine if element was deleted at the time?
+                    e.get().setRefId(ContextHolder.getContext().getBranchId());
                     info.getActiveElementMap().put(nodeId, e.get());
                 } else {
                     rejectNotFound(info, nodeId); // element not found at commit time
@@ -150,7 +154,12 @@ public List<ElementJson> processGetAll() {
         for (Node node : existingNodes) {
             indexIds.add(node.getDocId());
         }
-        return nodeIndex.findAllById(indexIds);
+        List<ElementJson> els = nodeIndex.findAllById(indexIds);
+        String ref = ContextHolder.getContext().getBranchId();
+        for (ElementJson el: els) {
+            el.setRefId(ref);
+        }
+        return els;
     }
 
     public List<ElementJson> processGetAll(String commitId, NodeService service) {

diff --git a/crud/src/main/java/org/openmbee/mms/crud/services/NodeOperation.java b/crud/src/main/java/org/openmbee/mms/crud/services/NodeOperation.java
@@ -12,6 +12,7 @@
 import java.util.Set;
 import java.util.UUID;
 
+import org.openmbee.mms.core.config.ContextHolder;
 import org.openmbee.mms.core.objects.Rejection;
 import org.openmbee.mms.core.services.NodeChangeInfo;
 import org.openmbee.mms.core.services.NodeGetInfo;
@@ -90,6 +91,11 @@ public NodeChangeInfo initInfoFromNodes(List<Node> existingNodes, CommitJson cmj
         }
         // bulk read existing elements in elastic
         List<ElementJson> existingElements = nodeIndex.findAllById(indexIds);
+        // set the _refId of the element json to be the ref it's 'found/requested' in,
+        String ref = ContextHolder.getContext().getBranchId();
+        for (ElementJson e: existingElements) {
+            e.setRefId(ref);
+        }
         Map<String, ElementJson> existingElementMap = convertJsonToMap(existingElements);
 
         Instant now = Instant.now();

diff --git a/example/crud.postman_collection.json b/example/crud.postman_collection.json
@@ -1074,6 +1074,7 @@
 							"    var jsonData = pm.response.json();",
 							"    jsonData.elements.forEach(function(e) {",
 							"        pm.expect(e._inRefIds).to.include('refa');",
+                            "        pm.expect(e._refId).to.equal('refa');",
 							"    })",
 							"});"
 						],
@@ -1100,6 +1101,44 @@
 			},
 			"response": []
 		},
+        {
+            "name": "check response element _refId matches request",
+            "event": [
+                {
+                    "listen": "test",
+                    "script": {
+                        "exec": [
+                            "pm.test(\"return element in new ref have right _refId\", function () {",
+                            "    var jsonData = pm.response.json();",
+                            "    jsonData.elements.forEach(function(e) {",
+                            "        pm.expect(e._refId).to.equal('refa');",
+                            "    })",
+                            "});"
+                        ],
+                        "type": "text/javascript"
+                    }
+                }
+            ],
+            "request": {
+                "method": "GET",
+                "header": [],
+                "url": {
+                    "raw": "{{host}}/projects/aa/refs/refa/elements/x",
+                    "host": [
+                        "{{host}}"
+                    ],
+                    "path": [
+                        "projects",
+                        "aa",
+                        "refs",
+                        "refa",
+                        "elements",
+                        "x"
+                    ]
+                }
+            },
+            "response": []
+        },
 		{
 			"name": "update x and y on refa",
 			"event": [

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=4.0.13
+version=4.0.14
 group=org.openmbee.mms
 
 springBootVersion=2.6.7