From 9eb5401966548a8d59c4b0641017418dc567b73f Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <marcoslg@gmail.com>
Date: Thu, 31 Aug 2023 14:15:21 +0200
Subject: [PATCH] #514 setting collection active field when transformed from an
 institution

---
 .../collections/service/merge/InstitutionMergeServiceIT.java   | 3 +++
 .../service/collections/merge/InstitutionMergeService.java     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/merge/InstitutionMergeServiceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/merge/InstitutionMergeServiceIT.java
index 1925cb53bf..251598d616 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/merge/InstitutionMergeServiceIT.java
+++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/merge/InstitutionMergeServiceIT.java
@@ -36,6 +36,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /** Tests the {@link InstitutionMergeService}. */
 public class InstitutionMergeServiceIT extends BaseMergeServiceIT<Institution> {
@@ -130,6 +131,7 @@ public void convertToCollectionWithExistingInstitutionTest() {
     toConvert.setCode("tco");
     toConvert.setName("to convert");
     toConvert.setDescription("desc");
+    toConvert.setActive(true);
     institutionService.create(toConvert);
 
     Institution another = new Institution();
@@ -146,6 +148,7 @@ public void convertToCollectionWithExistingInstitutionTest() {
 
     Collection newCollection = collectionService.get(newCollectionKey);
     assertEquals(another.getKey(), newCollection.getInstitutionKey());
+    assertTrue(newCollection.isActive());
   }
 
   @Test
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/merge/InstitutionMergeService.java b/registry-service/src/main/java/org/gbif/registry/service/collections/merge/InstitutionMergeService.java
index cad95f961b..e48a7192d9 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/merge/InstitutionMergeService.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/merge/InstitutionMergeService.java
@@ -89,6 +89,7 @@ public UUID convertToCollection(
     newCollection.setHomepage(institutionToConvert.getHomepage());
     newCollection.setCatalogUrl(institutionToConvert.getCatalogUrl());
     newCollection.setApiUrl(institutionToConvert.getApiUrl());
+    newCollection.setActive(institutionToConvert.isActive());
 
     if (institutionToConvert.getAddress() != null) {
       Address address = institutionToConvert.getAddress();