Improve validation and error messages in NetworkResource

gbif · Nov 24, 2021 · 6bcce6d · 6bcce6d
1 parent 7f4fb1c
commit 6bcce6d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/NetworkMapper.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/NetworkMapper.java
@@ -29,6 +29,9 @@ public interface NetworkMapper extends BaseNetworkEntityMapper<Network> {
 
   int countDatasetsInNetwork(@Param("networkKey") UUID networkKey);
 
+  boolean constituentExists(
+      @Param("networkKey") UUID networkKey, @Param("datasetKey") UUID datasetKey);
+
   void addDatasetConstituent(
       @Param("networkKey") UUID networkKey, @Param("datasetKey") UUID datasetKey);
 

diff --git a/...try-persistence/src/main/resources/org/gbif/registry/persistence/mapper/NetworkMapper.xml b/...try-persistence/src/main/resources/org/gbif/registry/persistence/mapper/NetworkMapper.xml
@@ -370,6 +370,13 @@
           network_key = #{targetEntityKey,jdbcType=OTHER} AND comment_key = #{commentKey,jdbcType=INTEGER}
   </delete>
 
+  <select id="constituentExists" resultType="java.lang.Boolean">
+    SELECT EXISTS (
+               SELECT *
+               FROM dataset_network
+               WHERE dataset_key = #{datasetKey,jdbcType=OTHER} AND network_key = #{networkKey,jdbcType=OTHER}
+             )
+  </select>
 
   <!-- DATASET CONSTITUENTS -->
   <insert id="addDatasetConstituent">

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
@@ -147,6 +147,10 @@ private void existNetworkCheck(UUID networkKey) {
   @Secured({ADMIN_ROLE, EDITOR_ROLE, IPT_ROLE})
   @Override
   public void addConstituent(@PathVariable("key") UUID networkKey, @PathVariable UUID datasetKey) {
+    if (networkMapper.constituentExists(networkKey, datasetKey)) {
+      throw new WebApplicationException(
+          "Dataset " + datasetKey + " is already connected to the network " + networkKey, HttpStatus.BAD_REQUEST);
+    }
     existDatasetCheck(datasetKey);
     existNetworkCheck(networkKey);
     networkMapper.addDatasetConstituent(networkKey, datasetKey);
@@ -158,8 +162,10 @@ public void addConstituent(@PathVariable("key") UUID networkKey, @PathVariable U
   @Override
   public void removeConstituent(
       @PathVariable("key") UUID networkKey, @PathVariable UUID datasetKey) {
-    existDatasetCheck(datasetKey);
-    existNetworkCheck(networkKey);
+    if (!networkMapper.constituentExists(networkKey, datasetKey)) {
+      throw new WebApplicationException(
+          "Dataset " + datasetKey + " is not connected to the network " + networkKey, HttpStatus.BAD_REQUEST);
+    }
     networkMapper.deleteDatasetConstituent(networkKey, datasetKey);
     eventManager.post(ChangedComponentEvent.newInstance(datasetKey, Network.class, Dataset.class));
   }