Allow modification of change suggestions created by ih-sync

gbif · Sep 26, 2024 · c520106 · c520106
1 parent 283e33a
commit c520106
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/...ain/resources/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.xml b/...ain/resources/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.xml
@@ -53,7 +53,8 @@
     discarded_by = #{discardedBy,jdbcType=INTEGER},
     applied = #{applied,jdbcType=OTHER},
     applied_by = #{appliedBy,jdbcType=INTEGER},
-    entity_key = #{entityKey,jdbcType=INTEGER}
+    entity_key = #{entityKey,jdbcType=INTEGER},
+    create_institution = #{createInstitution,jdbcType=BOOLEAN}
   </sql>
 
   <insert id="create" parameterType="ChangeSuggestionDto" useGeneratedKeys="true" keyProperty="key">

diff --git a/...n/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java b/...n/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java
@@ -66,6 +66,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.gbif.registry.security.UserRoles.*;
+import static org.gbif.registry.service.collections.utils.MasterSourceUtils.IH_SYNC_USER;
 import static org.gbif.registry.service.collections.utils.MasterSourceUtils.hasExternalMasterSource;
 
 public abstract class BaseChangeSuggestionService<
@@ -304,9 +305,9 @@ protected ChangeSuggestionDto createMergeSuggestionDto(R changeSuggestion) {
   public void updateChangeSuggestion(R updatedChangeSuggestion) {
     ChangeSuggestionDto dto = changeSuggestionMapper.get(updatedChangeSuggestion.getKey());
 
-    checkArgument(
-        updatedChangeSuggestion.getComments().size() > dto.getComments().size(),
-        "A comment is required");
+    //checkArgument(
+    //updatedChangeSuggestion.getComments().size() > dto.getComments().size(),
+        //"A comment is required");
 
     if (dto.getType() == Type.CREATE || dto.getType() == Type.UPDATE) {
       // we get the current entity from the DB to update the suggested entity with the current state
@@ -324,7 +325,12 @@ public void updateChangeSuggestion(R updatedChangeSuggestion) {
             .forEach(c -> c.setOverwritten(true));
         dto.getChanges().add(newChange);
       }
-
+      if (updatedChangeSuggestion.getSuggestedEntity() instanceof Collection && updatedChangeSuggestion.getProposedBy().equals(IH_SYNC_USER)) {
+        Collection collection = (Collection) updatedChangeSuggestion.getSuggestedEntity();
+        if (collection.getInstitutionKey() != null) {
+          dto.setCreateInstitution(false);
+        }
+      }
       dto.setSuggestedEntity(toJson(updatedChangeSuggestion.getSuggestedEntity()));
     }