review comments

Signed-off-by: Flurb <[email protected]>

Author: Flurb

repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java

@@ -157,10 +157,10 @@ public String findByUUID(SclFileType type, UUID id, Version version) {
 
     @Override
     public boolean hasDuplicateSclName(SclFileType type, String name) {
-        var sql = "SELECT DISTINCT ON (id) m.* "
-                + FROM_CLAUSE + "m "
-                + "WHERE m.type=? "
-                + "ORDER BY m.id, m.major_version desc, m.minor_version desc, m.patch_version desc";
+        var sql = "SELECT DISTINCT ON (id) * "
+                + FROM_CLAUSE
+                + "WHERE type=? "
+                + "ORDER BY id, major_version desc, minor_version desc, patch_version desc";
 
         try (var connection = dataSource.getConnection();
              var stmt = connection.prepareStatement(sql)) {

service/src/test/java/org/lfenergy/compas/scl/data/service/impl/CompasSclDataServiceImplTest.java

@@ -127,6 +127,7 @@ void create_WhenCalledWithOutCompasExtension_ThenSCLReturnedWithCorrectCompasExt
         assertCompasExtenions(scl, name);
         assertHistoryItem(scl, INITIAL_VERSION, comment);
         verify(compasSclDataRepository, times(1)).create(eq(SCL_TYPE), any(UUID.class), eq(name), anyString(), eq(INITIAL_VERSION), eq(who));
+        verify(compasSclDataRepository, times(1)).hasDuplicateSclName(SCL_TYPE, name);
     }
 
     @Test
@@ -147,6 +148,7 @@ void create_WhenCalledWithCompasExtension_ThenSCLReturnedWithCorrectCompasExtens
         assertCompasExtenions(scl, name);
         assertHistoryItem(scl, INITIAL_VERSION, comment);
         verify(compasSclDataRepository, times(1)).create(eq(SCL_TYPE), any(UUID.class), eq(name), anyString(), eq(INITIAL_VERSION), eq(who));
+        verify(compasSclDataRepository, times(1)).hasDuplicateSclName(SCL_TYPE, name);
     }
 
     @Test
@@ -200,6 +202,7 @@ void update_WhenCalledWithoutCompasElements_ThenSCLReturnedWithCorrectCompasExte
         assertHistoryItem(scl, nextVersion, null);
         verify(compasSclDataRepository, times(1)).create(eq(SCL_TYPE), eq(uuid), eq(previousName), anyString(), eq(nextVersion), eq(who));
         verify(compasSclDataRepository, times(1)).findMetaInfoByUUID(SCL_TYPE, uuid);
+        verify(compasSclDataRepository, never()).hasDuplicateSclName(SCL_TYPE, previousName);
     }
 
     @Test
@@ -217,6 +220,7 @@ void update_WhenCalledWithCompasElementsAndNewName_ThenSCLReturnedWithCorrectCom
         var sclMetaInfo = new SclMetaInfo(uuid.toString(), previousName, INITIAL_VERSION.toString());
         when(compasSclDataRepository.findMetaInfoByUUID(SCL_TYPE, uuid)).thenReturn(sclMetaInfo);
         doNothing().when(compasSclDataRepository).create(eq(SCL_TYPE), eq(uuid), eq(newName), anyString(), eq(nextVersion), eq(who));
+        when(compasSclDataRepository.hasDuplicateSclName(SCL_TYPE, newName)).thenReturn(false);
 
         scl = compasSclDataService.update(SCL_TYPE, uuid, changeSet, who, null, scl);
 
@@ -225,6 +229,30 @@ void update_WhenCalledWithCompasElementsAndNewName_ThenSCLReturnedWithCorrectCom
         assertHistoryItem(scl, nextVersion, null);
         verify(compasSclDataRepository, times(1)).create(eq(SCL_TYPE), eq(uuid), eq(newName), anyString(), eq(nextVersion), eq(who));
         verify(compasSclDataRepository, times(1)).findMetaInfoByUUID(SCL_TYPE, uuid);
+        verify(compasSclDataRepository, times(1)).hasDuplicateSclName(SCL_TYPE, newName);
+    }
+
+    @Test
+    void update_WhenCalledWithCompasElementsAndDuplicateNewName_ThenCompasExceptionThrown() throws IOException {
+        var previousName = "Previous SCL Filename";
+        var newName = "New SCL Filename";
+        var uuid = UUID.randomUUID();
+        var changeSet = ChangeSetType.MAJOR;
+        var who = "User A";
+        var nextVersion = INITIAL_VERSION.getNextVersion(changeSet);
+
+        var scl = createCompasPrivate(readSCL(), newName);
+
+        var sclMetaInfo = new SclMetaInfo(uuid.toString(), previousName, INITIAL_VERSION.toString());
+        when(compasSclDataRepository.findMetaInfoByUUID(SCL_TYPE, uuid)).thenReturn(sclMetaInfo);
+        when(compasSclDataRepository.hasDuplicateSclName(SCL_TYPE, newName)).thenReturn(true);
+
+        var exception = assertThrows(CompasException.class, () -> {
+            compasSclDataService.update(SCL_TYPE, uuid, changeSet, who, null, scl);
+        });
+        assertEquals(DUPLICATE_SCL_NAME_ERROR_CODE, exception.getErrorCode());
+        verify(compasSclDataRepository, times(1)).findMetaInfoByUUID(SCL_TYPE, uuid);
+        verify(compasSclDataRepository, times(1)).hasDuplicateSclName(SCL_TYPE, newName);
     }
 
     @Test
@@ -249,6 +277,7 @@ void update_WhenCalledWithCompasElementsAndSameName_ThenSCLReturnedWithCorrectCo
         assertHistoryItem(scl, nextVersion, null);
         verify(compasSclDataRepository, times(1)).create(eq(SCL_TYPE), eq(uuid), eq(previousName), anyString(), eq(nextVersion), eq(who));
         verify(compasSclDataRepository, times(1)).findMetaInfoByUUID(SCL_TYPE, uuid);
+        verify(compasSclDataRepository, never()).hasDuplicateSclName(SCL_TYPE, previousName);
     }
 
     @Test