From 8b6890300ad4ae159d8df49af68b0e82d9f48576 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 8 Jan 2013 15:00:54 -0800
Subject: [PATCH] CSPACE-5728: Relations in the reverse direction are now also
 reflected when computing current location.

---
 .../batch/batch-update-object-loc.xml         | 20 +++++++++++--------
 .../nuxeo/UpdateObjectLocationBatchJob.java   | 20 +++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
index 3f1308041..3b1fb8eaf 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
@@ -8,6 +8,8 @@
     <!-- This tests the UpdateObjectLocationBatchJob -->
         
     <testGroup ID="testSingleRecordBatchUpdate" autoDeletePOSTS="true">
+        
+        <!-- Tests with CollectionObject->Movement relations -->
             
         <test ID="createBatchRecord">
             <method>POST</method>
@@ -60,7 +62,7 @@
             <expectedCodes>201</expectedCodes>
         </test>
         
-        <test ID="relateMovement1ToCollectionObject">
+        <test ID="relateCollectionObjectToMovement1">
             <method>POST</method>
             <uri>/cspace-services/relations</uri>
             <filename>batch/relation.xml</filename>
@@ -73,7 +75,7 @@
             <expectedCodes>201</expectedCodes>
         </test>
         
-        <test ID="relateMovement2ToCollectionObject">
+        <test ID="relateCollectionObjectToMovement2">
             <method>POST</method>
             <uri>/cspace-services/relations</uri>
             <filename>batch/relation.xml</filename>
@@ -86,7 +88,7 @@
             <expectedCodes>201</expectedCodes>
         </test>
         
-        <test ID="relateMovement3ToCollectionObject">
+        <test ID="relateCollectionObjectToMovement3">
             <method>POST</method>
             <uri>/cspace-services/relations</uri>
             <filename>batch/relation.xml</filename>
@@ -115,7 +117,7 @@
         <!-- computedCurrentLocation field in the CollectionObject record has -->
         <!-- been updated to the appropriate value, reflecting the most recent -->
         <!-- movement (e.g. the Movement record with the most recent locationDate). -->
-        <test ID="readUpdatedCollectionObjectRecord1">
+        <test ID="readUpdatedCollectionObjectRecord">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${createCollectionObject.CSID}</uri>
             <filename>batch/updateobjloc.xml</filename>
@@ -129,6 +131,8 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
+        <!-- Tests with Movement->CollectionObject relations -->
+        
         <!-- The currentLocation value of this new Movement record, which now -->
         <!-- has the most recent locationDate value, should thus be -->
         <!-- reflected in the computedCurrentLocation value in the -->
@@ -144,8 +148,10 @@
             <expectedCodes>201</expectedCodes>
         </test>
         
-        <!-- Represents a reversal of the (subject-object) direction of the relationship -->
-        <test ID="relateCollectionObjectToMovement4">
+        <!-- Note that this payload reflects a reversal of the subject-object directionality -->
+        <!-- of the relationship: this is a Movement->CollectionObject relationship, -->
+        <!-- rather than a CollectionObject->Movement relationship. -->
+        <test ID="relateMovement4ToCollectionObject">
             <method>POST</method>
             <uri>/cspace-services/relations</uri>
             <filename>batch/relation.xml</filename>
@@ -168,7 +174,6 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-        <!--
         <test ID="readUpdatedCollectionObjectRecordAfterAddingReverseRelation">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${createCollectionObject.CSID}</uri>
@@ -182,7 +187,6 @@
             </response>
             <expectedCodes>200</expectedCodes>
         </test>
-        -->
         
     </testGroup>
     
diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java
index f454ef9e2..3787d2e3a 100644
--- a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java
+++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java
@@ -212,26 +212,26 @@ public class UpdateObjectLocationBatchJob extends AbstractBatchInvocable {
                     logger.info("Identified " + relatedMovements.getTotalItems()
                             + " movement records related to CollectionObject record " + csid);
                 }
-                if (relatedMovements.getTotalItems() == 0) {
-                    // continue;
-                }
 
-                // FIXME: Get the reciprocal relation records, via rtSbj=, as well,
-                // and remove duplicates
+                // FIXME: Get relation records in the reverse direction as well,
+                // via rtSbj=, merge with records obtained above, and remove duplicates
 
-                // FIXME Temporary for testing, until we integrate the two list results
                 queryString = "rtSbj=" + csid;
                 uri = new URI(null, null, null, queryString, null);
                 uriInfo = createUriInfo(uri.getRawQuery());
 
-                relatedMovements = movementResource.getList(uriInfo);
+                AbstractCommonList reverseRelatedMovements = movementResource.getList(uriInfo);
                 if (logger.isInfoEnabled()) {
-                    logger.info("Identified " + relatedMovements.getTotalItems()
-                            + " movement records related to CollectionObject record " + csid);
+                    logger.info("Identified " + reverseRelatedMovements.getTotalItems()
+                            + " movement records related in the reverse  to CollectionObject record " + csid);
                 }
-                if (relatedMovements.getTotalItems() == 0) {
+                
+                if ((relatedMovements.getTotalItems() == 0) && reverseRelatedMovements.getTotalItems() == 0) {
                     continue;
                 }
+                
+                // Merge the two lists
+                relatedMovements.getListItem().addAll(reverseRelatedMovements.getListItem());
 
                 // Get the latest movement record from among those, and extract
                 // its current location value
-- 
2.47.3