Merge branch 'ipt-2002-subtype' into dev

gbif · Aug 22, 2023 · 0f0b6cd · 0f0b6cd
2 parents d5e0e8e + 1d1a482
commit 0f0b6cd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/registry-domain/src/main/java/org/gbif/registry/domain/ws/LegacyDataset.java b/registry-domain/src/main/java/org/gbif/registry/domain/ws/LegacyDataset.java
@@ -859,6 +859,7 @@ public Dataset toApiDataset() {
     dataset.setLogoUrl(getLogoUrl());
     dataset.setHomepage(getHomepage());
     dataset.setType(getType());
+    dataset.setSubtype(getSubtype());
     dataset.setDoi(datasetDoi);
     return dataset;
   }
@@ -882,7 +883,8 @@ public boolean equals(Object o) {
         && Objects.equal(primaryContact, that.primaryContact)
         && Objects.equal(emlEndpoint, that.emlEndpoint)
         && Objects.equal(archiveEndpoint, that.archiveEndpoint)
-        && Objects.equal(dataPackageEndpoint, that.dataPackageEndpoint);
+        && Objects.equal(dataPackageEndpoint, that.dataPackageEndpoint)
+        && Objects.equal(rawSubtype, that.rawSubtype);
   }
 
   @Generated
@@ -902,7 +904,8 @@ public int hashCode() {
         primaryContact,
         emlEndpoint,
         archiveEndpoint,
-        dataPackageEndpoint);
+        dataPackageEndpoint,
+        rawSubtype);
   }
 
   @Generated
@@ -922,6 +925,7 @@ public String toString() {
         .add("emlEndpoint", emlEndpoint)
         .add("archiveEndpoint", archiveEndpoint)
         .add("dataPackageEndpoint", dataPackageEndpoint)
+        .add("rawSubtype", rawSubtype)
         .toString();
   }
 }
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/IptResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/IptResource.java
@@ -361,6 +361,7 @@ else if (dataset.getInstallationKey() != existing.getInstallationKey()) {
         // (A crawl will be triggered and EML read, unless the EML is not modified.)
         existing.setModifiedBy(user);
         existing.setType(dataset.getType());
+        existing.setSubtype(dataset.getSubtype());
         existing.setInstallationKey(dataset.getInstallationKey());
         existing.setPublishingOrganizationKey(dataset.getPublishingOrganizationKey());
 

diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/LegacyDatasetResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/LegacyDatasetResource.java
@@ -181,6 +181,7 @@ else if (dataset.getInstallationKey() != existing.getInstallationKey()) {
       existing.setLogoUrl(dataset.getLogoUrl());
       existing.setLanguage(dataset.getLanguage());
       existing.setInstallationKey(dataset.getInstallationKey());
+      existing.setSubtype(dataset.getSubtype());
 
       existing.setPublishingOrganizationKey(dataset.getPublishingOrganizationKey());