Explicit index updating with onStatusChange interface.

geonetwork · Jan 15, 2024 · 71368be · 71368be
1 parent 8a49652
commit 71368be
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/core/src/main/java/org/fao/geonet/kernel/datamanager/draft/DraftMetadataUtils.java b/core/src/main/java/org/fao/geonet/kernel/datamanager/draft/DraftMetadataUtils.java
@@ -589,7 +589,7 @@ protected String createDraft(ServiceContext context, String templateId, String g
 
                     List<MetadataStatus> listOfStatusChange = new ArrayList<>(1);
                     listOfStatusChange.add(metadataStatus);
-                    sa.onStatusChange(listOfStatusChange);
+                    sa.onStatusChange(listOfStatusChange, true);
                 }
             }
 

diff --git a/core/src/main/java/org/fao/geonet/kernel/metadata/DefaultStatusActions.java b/core/src/main/java/org/fao/geonet/kernel/metadata/DefaultStatusActions.java
@@ -136,7 +136,7 @@ public void onEdit(int id, boolean minorEdit) throws Exception {
      * @return
      * @throws Exception
      */
-    public Map<Integer, StatusChangeType> onStatusChange(List<MetadataStatus> listOfStatus) throws Exception {
+    public Map<Integer, StatusChangeType> onStatusChange(List<MetadataStatus> listOfStatus, boolean updateIndex) throws Exception {
 
         if (listOfStatus.stream().map(MetadataStatus::getMetadataId).distinct().count() != listOfStatus.size()) {
             throw new IllegalArgumentException("Multiple status update received on the same metadata");
@@ -179,7 +179,7 @@ public Map<Integer, StatusChangeType> onStatusChange(List<MetadataStatus> listOf
                 context.debug("Change status of metadata with id " + status.getMetadataId() + " from " + currentStatusId + " to " + statusId);
 
             // we know we are allowed to do the change, apply any side effects
-            boolean deleted = applyStatusChange(status.getMetadataId(), status, statusId);
+            boolean deleted = applyStatusChange(status.getMetadataId(), status, statusId, updateIndex);
 
             // inform content reviewers if the status is submitted
             try {
@@ -218,10 +218,10 @@ public Map<Integer, StatusChangeType> onStatusChange(List<MetadataStatus> listOf
      * eg. if APPROVED, publish a record,
      * if RETIRED, unpublish or delete the record.
      */
-    private boolean applyStatusChange(int metadataId, MetadataStatus status, String toStatusId) throws Exception {
+    private boolean applyStatusChange(int metadataId, MetadataStatus status, String toStatusId, boolean updateIndex) throws Exception {
         boolean deleted = false;
-        if (!deleted) {
-            metadataStatusManager.setStatusExt(status, false);
+        if (!deleted && updateIndex) {
+            metadataStatusManager.setStatusExt(status, true);
         }
         return deleted;
     }

diff --git a/core/src/main/java/org/fao/geonet/kernel/metadata/StatusActions.java b/core/src/main/java/org/fao/geonet/kernel/metadata/StatusActions.java
@@ -38,6 +38,6 @@ public interface StatusActions {
 
     public void onEdit(int id, boolean minorEdit) throws Exception;
 
-    public Map<Integer, StatusChangeType> onStatusChange(List<MetadataStatus> status) throws Exception;
+    public Map<Integer, StatusChangeType> onStatusChange(List<MetadataStatus> status, boolean updateIndex) throws Exception;
 
 }
diff --git a/services/src/main/java/org/fao/geonet/api/records/MetadataWorkflowApi.java b/services/src/main/java/org/fao/geonet/api/records/MetadataWorkflowApi.java
@@ -499,7 +499,7 @@ public Map<Integer, StatusChangeType> setStatus(@Parameter(description = API_PAR
 
         List<MetadataStatus> listOfStatusChange = new ArrayList<>(1);
         listOfStatusChange.add(metadataStatusValue);
-        Map<Integer, StatusChangeType> statusUpdate = sa.onStatusChange(listOfStatusChange);
+        Map<Integer, StatusChangeType> statusUpdate = sa.onStatusChange(listOfStatusChange, false);
 
         int metadataIdApproved = metadata.getId();
 
@@ -1308,6 +1308,6 @@ private void changeMetadataStatus(ServiceContext context, AbstractMetadata metad
         metadataStatusValue.setPreviousState(previousStatus);
         List<MetadataStatus> listOfStatusChange = new ArrayList<>(1);
         listOfStatusChange.add(metadataStatusValue);
-        sa.onStatusChange(listOfStatusChange);
+        sa.onStatusChange(listOfStatusChange, true);
     }
 }
diff --git a/services/src/main/java/org/fao/geonet/api/records/editing/MetadataEditingApi.java b/services/src/main/java/org/fao/geonet/api/records/editing/MetadataEditingApi.java
@@ -420,7 +420,7 @@ public void saveEdits(
 
                         List<MetadataStatus> listOfStatusChange = new ArrayList<>(1);
                         listOfStatusChange.add(metadataStatus);
-                        sa.onStatusChange(listOfStatusChange);
+                        sa.onStatusChange(listOfStatusChange, true);
                     } else {
                         throw new SecurityException(String.format("Only users with editor profile can submit."));
                     }
@@ -442,7 +442,7 @@ public void saveEdits(
 
                         List<MetadataStatus> listOfStatusChange = new ArrayList<>(1);
                         listOfStatusChange.add(metadataStatus);
-                        sa.onStatusChange(listOfStatusChange);
+                        sa.onStatusChange(listOfStatusChange, true);
                     } else {
                         throw new SecurityException(String.format("Only users with review profile can approve."));
                     }