[#464] reduced code duplication for PR

Signed-off-by: David Monichi <[email protected]>

Author: david-monichi

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

@@ -38,6 +38,21 @@ public class CompasSclDataPostgreSQLRepository implements CompasSclDataRepositor
 
     protected final DataSource dataSource;
 
+    protected static String DELETE_SCL_FILE_SQL = """
+        delete from scl_file
+         where scl_file.id   = ?
+         and   scl_file.type = ?
+        """;
+
+    protected static String DELETE_SCL_FILE_SQL_BY_VERSION = """
+        delete from scl_file
+         where scl_file.id   = ?
+         and   scl_file.type = ?
+         and   scl_file.major_version = ?
+         and   scl_file.minor_version = ?
+         and   scl_file.patch_version = ?
+        """;
+
     public CompasSclDataPostgreSQLRepository(DataSource dataSource) {
         this.dataSource = dataSource;
     }
@@ -305,14 +320,9 @@ insert into scl_label(scl_id, major_version, minor_version, patch_version, label
     @Override
     @Transactional(REQUIRED)
     public void delete(SclFileType type, UUID id) {
-        var sql = """
-                delete from scl_file
-                 where scl_file.id   = ?
-                 and   scl_file.type = ?
-                """;
 
         try (var connection = dataSource.getConnection();
-             var stmt = connection.prepareStatement(sql)) {
+             var stmt = connection.prepareStatement(DELETE_SCL_FILE_SQL)) {
             stmt.setObject(1, id);
             stmt.setString(2, type.name());
             stmt.executeUpdate();
@@ -324,17 +334,9 @@ public void delete(SclFileType type, UUID id) {
     @Override
     @Transactional(REQUIRED)
     public void delete(SclFileType type, UUID id, Version version) {
-        var sql = """
-                delete from scl_file
-                 where scl_file.id   = ?
-                 and   scl_file.type = ?
-                 and   scl_file.major_version = ?
-                 and   scl_file.minor_version = ?
-                 and   scl_file.patch_version = ?
-                """;
 
         try (var connection = dataSource.getConnection();
-             var stmt = connection.prepareStatement(sql)) {
+             var stmt = connection.prepareStatement(DELETE_SCL_FILE_SQL_BY_VERSION)) {
             stmt.setObject(1, id);
             stmt.setString(2, type.name());
             stmt.setInt(3, version.getMajorVersion());

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

@@ -4,67 +4,29 @@
 
 package org.lfenergy.compas.scl.data.repository.postgresql;
 
-import jakarta.transaction.Transactional;
-import org.lfenergy.compas.scl.data.exception.CompasSclDataServiceException;
-import org.lfenergy.compas.scl.data.model.*;
-import org.lfenergy.compas.scl.extensions.model.SclFileType;
-
 import javax.sql.DataSource;
-import java.sql.SQLException;
-import java.util.UUID;
-
-import static jakarta.transaction.Transactional.TxType.REQUIRED;
-import static org.lfenergy.compas.scl.data.exception.CompasSclDataServiceErrorCode.*;
 
 public class SoftDeleteCompasSclDataPostgreSQLRepository extends CompasSclDataPostgreSQLRepository {
 
+    private static final String SOFT_DELETE_SCL_FILE_SQL = """
+        UPDATE scl_file
+         SET is_deleted = true
+         where scl_file.id   = ?
+         and   scl_file.type = ?
+        """;
+
+    private static final String SOFT_DELETE_SCL_FILE_SQL_BY_VERSION = """
+        delete from scl_file
+         where scl_file.id   = ?
+         and   scl_file.type = ?
+         and   scl_file.major_version = ?
+         and   scl_file.minor_version = ?
+         and   scl_file.patch_version = ?
+        """;
+
     public SoftDeleteCompasSclDataPostgreSQLRepository(DataSource dataSource) {
         super(dataSource);
-    }
-
-    @Override
-    @Transactional(REQUIRED)
-    public void delete(SclFileType type, UUID id) {
-        var sql = """
-                UPDATE scl_file
-                 SET is_deleted = true
-                 where scl_file.id   = ?
-                 and   scl_file.type = ?
-                """;
-
-        try (var connection = dataSource.getConnection();
-             var stmt = connection.prepareStatement(sql)) {
-            stmt.setObject(1, id);
-            stmt.setString(2, type.name());
-            stmt.executeUpdate();
-        } catch (SQLException exp) {
-            throw new CompasSclDataServiceException(POSTGRES_DELETE_ERROR_CODE, "Error removing SCL from database!", exp);
-        }
-    }
-
-    @Override
-    @Transactional(REQUIRED)
-    public void delete(SclFileType type, UUID id, Version version) {
-        var sql = """
-                UPDATE scl_file
-                 SET is_deleted = true
-                 where scl_file.id   = ?
-                 and   scl_file.type = ?
-                 and   scl_file.major_version = ?
-                 and   scl_file.minor_version = ?
-                 and   scl_file.patch_version = ?
-                """;
-
-        try (var connection = dataSource.getConnection();
-             var stmt = connection.prepareStatement(sql)) {
-            stmt.setObject(1, id);
-            stmt.setString(2, type.name());
-            stmt.setInt(3, version.getMajorVersion());
-            stmt.setInt(4, version.getMinorVersion());
-            stmt.setInt(5, version.getPatchVersion());
-            stmt.executeUpdate();
-        } catch (SQLException exp) {
-            throw new CompasSclDataServiceException(POSTGRES_DELETE_ERROR_CODE, "Error removing SCL (version) from database!", exp);
-        }
+        DELETE_SCL_FILE_SQL = SOFT_DELETE_SCL_FILE_SQL;
+        DELETE_SCL_FILE_SQL_BY_VERSION = SOFT_DELETE_SCL_FILE_SQL_BY_VERSION;
     }
 }