Merge remote-tracking branch 'origin/dev' into dev

gbif · Apr 29, 2021 · de459b9 · de459b9
2 parents c24ad11 + 85582b8
commit de459b9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/registry-events/src/main/java/org/gbif/registry/search/DatasetIndexUpdateListener.java b/registry-events/src/main/java/org/gbif/registry/search/DatasetIndexUpdateListener.java
@@ -19,7 +19,6 @@
 import org.gbif.api.model.registry.Installation;
 import org.gbif.api.model.registry.Network;
 import org.gbif.api.model.registry.Organization;
-import org.gbif.api.model.registry.Tag;
 import org.gbif.api.service.registry.DatasetService;
 import org.gbif.registry.events.ChangedComponentEvent;
 import org.gbif.registry.events.CreateEvent;
@@ -100,14 +99,17 @@ public final <T> void updated(UpdateEvent<T> event) {
   public final <T> void deleted(DeleteEvent<T> event) {
     if (event.getObjectClass().equals(Dataset.class)) {
       indexService.delete((Dataset) event.getOldObject());
+    } else if (event.getObjectClass().equals(Organization.class)) {
+      indexService.index((Organization) event.getOldObject());
+    } else if (event.getObjectClass().equals(Network.class)) {
+      indexService.index((Network) event.getOldObject());
     }
   }
 
   @Subscribe
   public final void updatedComponent(ChangedComponentEvent event) {
     // only fire in case of tagged datasets
-    if (event.getTargetClass().equals(Dataset.class)
-        && event.getComponentClass().equals(Tag.class)) {
+    if (event.getTargetClass().equals(Dataset.class)) {
       // we only put tagged datasets onto the queue for this event type!
       UUID key = event.getTargetEntityKey();
       try {

diff --git a/...try-persistence/src/main/resources/org/gbif/registry/persistence/mapper/DatasetMapper.xml b/...try-persistence/src/main/resources/org/gbif/registry/persistence/mapper/DatasetMapper.xml
@@ -443,9 +443,10 @@
   </select>
 
   <select id="listNetworks" resultType="java.util.UUID">
-    SELECT network_key
-    FROM dataset_network
-    WHERE dataset_key = #{targetEntityKey,jdbcType=OTHER}
+    SELECT nk.network_key
+    FROM dataset_network AS nk
+    JOIN network n ON n.key = nk.network_key AND n.deleted IS NULL
+    WHERE nk.dataset_key = #{targetEntityKey,jdbcType=OTHER}
   </select>
 
   <!-- Joined delete of comment to trigger cascade delete of the join table -->

diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/NetworkResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/NetworkResource.java
@@ -63,6 +63,7 @@ public class NetworkResource extends BaseNetworkEntityResource<Network> implemen
   private final DatasetMapper datasetMapper;
   private final NetworkMapper networkMapper;
   private final OrganizationMapper organizationMapper;
+  private final EventManager eventManager;
 
   public NetworkResource(
       MapperServiceLocator mapperServiceLocator,
@@ -74,6 +75,7 @@ public NetworkResource(
         Network.class,
         eventManager,
         withMyBatis);
+    this.eventManager = eventManager;
     this.datasetMapper = mapperServiceLocator.getDatasetMapper();
     this.networkMapper = mapperServiceLocator.getNetworkMapper();
     this.organizationMapper = mapperServiceLocator.getOrganizationMapper();
@@ -125,7 +127,7 @@ public PagingResponse<Dataset> listConstituents(
   @Override
   public void addConstituent(@PathVariable("key") UUID networkKey, @PathVariable UUID datasetKey) {
     networkMapper.addDatasetConstituent(networkKey, datasetKey);
-    ChangedComponentEvent.newInstance(datasetKey, Dataset.class, Network.class);
+    eventManager.post(ChangedComponentEvent.newInstance(datasetKey, Dataset.class, Network.class));
   }
 
   @DeleteMapping("{key}/constituents/{datasetKey}")
@@ -134,7 +136,7 @@ public void addConstituent(@PathVariable("key") UUID networkKey, @PathVariable U
   public void removeConstituent(
       @PathVariable("key") UUID networkKey, @PathVariable UUID datasetKey) {
     networkMapper.deleteDatasetConstituent(networkKey, datasetKey);
-    ChangedComponentEvent.newInstance(datasetKey, Dataset.class, Network.class);
+    eventManager.post(ChangedComponentEvent.newInstance(datasetKey, Dataset.class, Network.class));
   }
 
   @GetMapping("suggest")