Prevented duplicated tags

doc/sql/migration/h2/h2-migration-from-v.2.1.0-to-v2.3.0.sql

@@ -4,7 +4,8 @@ CREATE TABLE gs_tag (
     color VARCHAR(255) NOT NULL,
     description VARCHAR(255),
     name VARCHAR(255) NOT NULL,
-    CONSTRAINT gs_tag_pkey PRIMARY KEY (id)
+    CONSTRAINT gs_tag_pkey PRIMARY KEY (id),
+    CONSTRAINT gs_tag_name_unique UNIQUE (name)
 );
 
 CREATE TABLE gs_resource_tags (

doc/sql/migration/oracle/oracle-migration-from-v.2.1.0-to-v2.3.0.sql

@@ -4,7 +4,8 @@ create table gs_tag (
     color varchar2(255 char) not null,
     description varchar2(255 char),
     "name" varchar2(255 char) not null,
-    primary key (id)
+    primary key (id),
+    constraint gs_tag_name_unique unique (name)
 );
 
 create table gs_resource_tags (

doc/sql/migration/postgresql/postgresql-migration-from-v.2.1.0-to-v2.3.0.sql

@@ -4,7 +4,8 @@ create table gs_tag (
     color varchar(255) not null,
     description varchar(255) null,
     "name" varchar(255) not null,
-    constraint gs_tag_pkey primary key (id)
+    constraint gs_tag_pkey primary key (id),
+    constraint gs_tag_name_unique unique (name)
 );
 
 create table gs_resource_tags (

src/core/model/src/main/java/it/geosolutions/geostore/core/model/Tag.java

@@ -51,7 +51,7 @@ public class Tag implements Serializable {
 
     @Id @GeneratedValue private Long id;
 
-    @Column(name = "name", nullable = false)
+    @Column(name = "name", nullable = false, unique = true)
     private String name;
 
     @Column(name = "color", nullable = false)

src/core/services-api/src/main/java/it/geosolutions/geostore/services/TagService.java

@@ -30,6 +30,7 @@
 
 import it.geosolutions.geostore.core.model.Tag;
 import it.geosolutions.geostore.services.exception.BadRequestServiceEx;
+import it.geosolutions.geostore.services.exception.DuplicatedTagNameServiceException;
 import it.geosolutions.geostore.services.exception.NotFoundServiceEx;
 import java.util.List;
 
@@ -39,8 +40,9 @@ public interface TagService {
      * @param tag
      * @return long
      * @throws BadRequestServiceEx
+     * @throws DuplicatedTagNameServiceException
      */
-    long insert(Tag tag) throws BadRequestServiceEx;
+    long insert(Tag tag) throws BadRequestServiceEx, DuplicatedTagNameServiceException;
 
     /**
      * @param page
@@ -63,8 +65,10 @@ public interface TagService {
      * @return long
      * @throws NotFoundServiceEx
      * @throws BadRequestServiceEx
+     * @throws DuplicatedTagNameServiceException
      */
-    long update(long id, Tag tag) throws BadRequestServiceEx, NotFoundServiceEx;
+    long update(long id, Tag tag)
+            throws BadRequestServiceEx, NotFoundServiceEx, DuplicatedTagNameServiceException;
 
     /**
      * @param id

src/core/services-api/src/main/java/it/geosolutions/geostore/services/exception/DuplicatedTagNameServiceException.java

@@ -0,0 +1,8 @@
+package it.geosolutions.geostore.services.exception;
+
+public class DuplicatedTagNameServiceException extends GeoStoreServiceException {
+
+    public DuplicatedTagNameServiceException(String message) {
+        super(message);
+    }
+}

src/core/services-impl/src/main/java/it/geosolutions/geostore/services/TagServiceImpl.java

@@ -25,6 +25,7 @@
 import it.geosolutions.geostore.core.model.Resource;
 import it.geosolutions.geostore.core.model.Tag;
 import it.geosolutions.geostore.services.exception.BadRequestServiceEx;
+import it.geosolutions.geostore.services.exception.DuplicatedTagNameServiceException;
 import it.geosolutions.geostore.services.exception.NotFoundServiceEx;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
@@ -47,7 +48,7 @@ public void setResourceDAO(ResourceDAO resourceDAO) {
     }
 
     @Override
-    public long insert(Tag tag) throws BadRequestServiceEx {
+    public long insert(Tag tag) throws BadRequestServiceEx, DuplicatedTagNameServiceException {
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug("Persisting Tag ... ");
         }
@@ -56,6 +57,8 @@ public long insert(Tag tag) throws BadRequestServiceEx {
             throw new BadRequestServiceEx("Tag must be specified");
         }
 
+        checkForDuplicates(tag, false);
+
         tagDAO.persist(tag);
 
         return tag.getId();
@@ -90,12 +93,15 @@ public Tag get(long id) {
     }
 
     @Override
-    public long update(long id, Tag tag) throws BadRequestServiceEx, NotFoundServiceEx {
+    public long update(long id, Tag tag)
+            throws BadRequestServiceEx, NotFoundServiceEx, DuplicatedTagNameServiceException {
         Tag original = get(id);
         if (original == null) {
             throw new NotFoundServiceEx("Tag not found");
         }
 
+        checkForDuplicates(tag, true);
+
         tag.setId(id);
         tag.setResources(original.getResources());
 
@@ -104,6 +110,17 @@ public long update(long id, Tag tag) throws BadRequestServiceEx, NotFoundService
         return id;
     }
 
+    private void checkForDuplicates(Tag tag, boolean isUpdate) throws DuplicatedTagNameServiceException {
+        int duplicatesCount =
+                tagDAO.count(new Search().addFilterEqual("name", tag.getName()).setMaxResults(1));
+        if (duplicatesCount > 0) {
+            throw new DuplicatedTagNameServiceException(
+                    String.format(
+                            "Cannot %s the tag: a tag with the same name already exists.",
+                            isUpdate ? "update" : "create"));
+        }
+    }
+
     @Override
     public void delete(long id) throws NotFoundServiceEx {
         if (get(id) == null || !tagDAO.removeById(id)) {

src/core/services-impl/src/test/java/it/geosolutions/geostore/services/TagServiceImplTest.java

@@ -24,6 +24,7 @@
 import it.geosolutions.geostore.core.model.Resource;
 import it.geosolutions.geostore.core.model.Tag;
 import it.geosolutions.geostore.services.exception.BadRequestServiceEx;
+import it.geosolutions.geostore.services.exception.DuplicatedTagNameServiceException;
 import it.geosolutions.geostore.services.exception.NotFoundServiceEx;
 import java.util.Collections;
 import java.util.List;
@@ -49,6 +50,19 @@ public void testInsert() throws Exception {
         assertTrue(foundTagsIds.stream().noneMatch(Objects::isNull));
     }
 
+    public void testInsertDuplicate() throws Exception {
+
+        Tag tag = new Tag("tag-A", "#4561aa", "dusky");
+        Tag duplicateTag = new Tag(tag.getName(), "black", null);
+
+        tagService.insert(tag);
+
+        DuplicatedTagNameServiceException ex =
+                assertThrows(
+                        DuplicatedTagNameServiceException.class, () -> tagService.insert(duplicateTag));
+        assertTrue(ex.getMessage().contains("create"));
+    }
+
     public void testInsertNull() throws Exception {
         assertThrows(BadRequestServiceEx.class, () -> tagService.insert(null));
     }
@@ -114,6 +128,22 @@ public void testUpdate() throws Exception {
         assertEquals(expected_tag, updatedTag);
     }
 
+    public void testUpdateWithDuplicate() throws Exception {
+
+        Tag tagA = new Tag("tag-A", "#4561aa", "dusky");
+        Tag tagB = new Tag("tag-B", "black", null);
+
+        tagDAO.persist(tagA, tagB);
+
+        tagB.setName(tagA.getName());
+
+        DuplicatedTagNameServiceException ex =
+                assertThrows(
+                        DuplicatedTagNameServiceException.class,
+                        () -> tagService.update(tagB.getId(), tagB));
+        assertTrue(ex.getMessage().contains("update"));
+    }
+
     public void testUpdateWithResource() throws Exception {
 
         Tag update_tag = new Tag("updated name", "black", null);

src/modules/rest/impl/src/main/java/it/geosolutions/geostore/services/rest/impl/RESTTagServiceImpl.java

@@ -29,9 +29,11 @@
 import it.geosolutions.geostore.core.model.Tag;
 import it.geosolutions.geostore.services.TagService;
 import it.geosolutions.geostore.services.exception.BadRequestServiceEx;
+import it.geosolutions.geostore.services.exception.DuplicatedTagNameServiceException;
 import it.geosolutions.geostore.services.exception.NotFoundServiceEx;
 import it.geosolutions.geostore.services.rest.RESTTagService;
 import it.geosolutions.geostore.services.rest.exception.BadRequestWebEx;
+import it.geosolutions.geostore.services.rest.exception.ConflictWebEx;
 import it.geosolutions.geostore.services.rest.exception.NotFoundWebEx;
 import it.geosolutions.geostore.services.rest.model.TagList;
 import java.util.List;
@@ -59,6 +61,8 @@ public long insert(SecurityContext sc, Tag tag) {
         } catch (BadRequestServiceEx e) {
             LOGGER.error(e.getMessage(), e);
             throw new BadRequestWebEx(e.getMessage());
+        } catch (DuplicatedTagNameServiceException e) {
+            throw new ConflictWebEx(e.getMessage());
         }
     }
 
@@ -101,6 +105,8 @@ public long update(SecurityContext sc, long id, Tag tag) {
             throw new BadRequestWebEx(e.getMessage());
         } catch (NotFoundServiceEx e) {
             throw new NotFoundWebEx(e.getMessage());
+        } catch (DuplicatedTagNameServiceException e) {
+            throw new ConflictWebEx(e.getMessage());
         }
     }