Merge branch 'dev' into #343_suggest_change_and_log

gbif · Apr 29, 2021 · 5f0d94a · 5f0d94a
2 parents ff4f526 + 1c4ea2d
commit 5f0d94a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 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,6 +19,7 @@
 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;
@@ -109,7 +110,8 @@ public final <T> void deleted(DeleteEvent<T> event) {
   @Subscribe
   public final void updatedComponent(ChangedComponentEvent event) {
     // only fire in case of tagged datasets
-    if (event.getTargetClass().equals(Dataset.class)) {
+    if ((event.getTargetClass().equals(Dataset.class) && event.getComponentClass().equals(Tag.class)) ||
+        (event.getTargetClass().equals(Network.class) && event.getComponentClass().equals(Dataset.class))) {
       // we only put tagged datasets onto the queue for this event type!
       UUID key = event.getTargetEntityKey();
       try {

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
@@ -127,7 +127,7 @@ public PagingResponse<Dataset> listConstituents(
   @Override
   public void addConstituent(@PathVariable("key") UUID networkKey, @PathVariable UUID datasetKey) {
     networkMapper.addDatasetConstituent(networkKey, datasetKey);
-    eventManager.post(ChangedComponentEvent.newInstance(datasetKey, Dataset.class, Network.class));
+    eventManager.post(ChangedComponentEvent.newInstance(datasetKey, Network.class, Dataset.class));
   }
 
   @DeleteMapping("{key}/constituents/{datasetKey}")
@@ -136,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);
-    eventManager.post(ChangedComponentEvent.newInstance(datasetKey, Dataset.class, Network.class));
+    eventManager.post(ChangedComponentEvent.newInstance(datasetKey, Network.class, Dataset.class));
   }
 
   @GetMapping("suggest")