CSPACE-5727: Exclude non-active (e.g. soft-deleted, versioned) Movement records when...

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java
index 8a08140d6e7f35cb563c76bc5d20a24f030eafb5..3ba9e9a85ad7032eadad9554cfb88dc1d4aed49c 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java
@@ -371,6 +371,12 @@ public class UpdateObjectLocationOnMove implements EventListener {
                 csid = (String) relatedDocModel.getProperty(RELATIONS_COMMON_SCHEMA, OBJECT_CSID_PROPERTY);
             }
             movementDocModel = getDocModelFromCsid(session, csid);
+            // Verify that the Movement record is active. This will also exclude
+            // versioned Movement records from the computation of the current
+            // location, for tenants that are versioning such records.
+            if (!isActiveDocument(movementDocModel)) {
+                continue;
+            }
             GregorianCalendar locationDate =
                     (GregorianCalendar) movementDocModel.getProperty(MOVEMENTS_COMMON_SCHEMA, LOCATION_DATE_PROPERTY);
             if (locationDate == null) {