Dev (#199)

Co-authored-by: LuciaM1 <[email protected]> Co-authored-by: GitHub Action <[email protected]> Co-authored-by: LuciaM1 <[email protected]> Co-authored-by: ElisKina-dev <[email protected]> Co-authored-by: Gabriele Maiocchi <[email protected]> Co-authored-by: Giacomo Brancazi <[email protected]>
pagopa · Oct 15, 2024 · f642e44 · f642e44
1 parent 670e249
commit f642e44
Show file tree

Hide file tree

Showing 12 changed files with 16,150 additions and 15,991 deletions.
diff --git a/_TMP/coverage-results.md b/_TMP/coverage-results.md
@@ -1,15 +1,15 @@
 
 # Coverage Report: JaCoCo
 
-* S3PreSignerLocalTest (QuarkusTest)
+* IntegrationTest (QuarkusTest)
 
 
 | Outcome                 | Value                                                               |
 |-------------------------|---------------------------------------------------------------------|
-| Code Coverage %         | 91.36%               |
-| :heavy_check_mark: Number of Lines Covered | 2315    |
-| :x: Number of Lines Missed  | 219     |
-| Total Number of Lines   | 2534     |
+| Code Coverage %         | 91.32%               |
+| :heavy_check_mark: Number of Lines Covered | 2325    |
+| :x: Number of Lines Missed  | 221     |
+| Total Number of Lines   | 2546     |
 
 
 ## Details:
@@ -600,7 +600,7 @@
         
 #### Lines Missed:
         
-- Line #180
+- Line #190
 ```
                     } catch (AtmLayerException ex) {
 ```
@@ -616,11 +616,11 @@
         
 #### Lines Missed:
         
-- Line #96
+- Line #97
 ```
                                 .recoverWithUni(failure -> {
 ```
-- Line #257
+- Line #259
 ```
                                                         .recoverWithUni(failure -> {
 ```

diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v1.34.0
+version: v1.34.0-dev.8
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>it.gov.pagopa</groupId>
     <artifactId>atm-layer-model</artifactId>
-    <version>1.34.0</version>
+    <version>1.34.0-dev.8</version>
     <name>atm-layer-model</name>
     <properties>
         <compiler-plugin.version>3.11.0</compiler-plugin.version>

diff --git a/src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/AppErrorCodeEnum.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/AppErrorCodeEnum.java
@@ -64,7 +64,8 @@ public enum AppErrorCodeEnum {
     FILE_DECODE_ERROR("ATMLM_4000063", "Errore nella decodifica del file", GENERIC ),
     DATABASE_SAVE_FILE_ERROR("ATMLM_4000064", "Errore nella persistenza del file sul database", INTERNAL),
     OBJECT_STORE_COPY_FILE_ERROR("ATMLM_4000065", "Errore nella copia del file nella cartella DELETE su Object Store", INTERNAL),
-    INVALID_FILE_EXTENSION("ATMLM_4000066", "Estensione del file non valida", INVALID_EXTENSION);
+    INVALID_FILE_EXTENSION("ATMLM_4000066", "Estensione del file non valida", INVALID_EXTENSION),
+    BPMN_FILE_SIZE_EXCEEDS_LIMIT("ATMLM_4000066", "La dimensione del file supera quella consentita", FILE_SIZE_EXCEEDED);
     private final String errorCode;
     private final String errorMessage;
     private final AppErrorType type;

diff --git a/src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/AppErrorType.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/AppErrorType.java
@@ -27,5 +27,6 @@ public enum AppErrorType {
     NOT_EXISTING_USER_ID,
     NOT_EXISTING_USER_PROFILE, CANNOT_REPLACE_ASSOCIATION,
     BLANK_FIELDS,
-    INVALID_EXTENSION
+    INVALID_EXTENSION,
+    FILE_SIZE_EXCEEDED,
 }
diff --git a/src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/BpmnVersionServiceImpl.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/BpmnVersionServiceImpl.java
@@ -30,6 +30,7 @@
 import java.util.regex.Pattern;
 
 import static it.gov.pagopa.atmlayer.service.model.enumeration.AppErrorCodeEnum.*;
+import static it.gov.pagopa.atmlayer.service.model.utils.BpmnUtils.checkFileSize;
 import static it.gov.pagopa.atmlayer.service.model.utils.BpmnUtils.getSingleConfig;
 import static it.gov.pagopa.atmlayer.service.model.utils.FileUtilities.extractIdValue;
 
@@ -215,6 +216,7 @@ public Uni<BpmnVersion> saveAndUpload(BpmnVersion bpmnVersion, File file, String
 
     @Override
     public Uni<BpmnVersion> createBPMN(BpmnVersion bpmnVersion, File file, String filename) {
+        checkFileSize(file);
         String definitionKey = extractIdValue(file, resourceType);
         bpmnVersion.setDefinitionKey(definitionKey);
         return findByDefinitionKey(definitionKey)
@@ -442,8 +444,9 @@ public Uni<BpmnVersion> getLatestVersion(UUID uuid, String functionType) {
                 });
     }
 
-    @Override
     public Uni<BpmnDTO> upgrade(BpmnUpgradeDto bpmnUpgradeDto) {
+        checkFileSize(bpmnUpgradeDto.getFile());
+
         String definitionKey = extractIdValue(bpmnUpgradeDto.getFile(), resourceType);
         return this.getLatestVersion(bpmnUpgradeDto.getUuid(), bpmnUpgradeDto.getFunctionType())
                 .onItem()

diff --git a/...ain/java/it/gov/pagopa/atmlayer/service/model/service/impl/ResourceEntityServiceImpl.java b/...ain/java/it/gov/pagopa/atmlayer/service/model/service/impl/ResourceEntityServiceImpl.java
@@ -169,6 +169,16 @@ private void validateFileExtension(String filename, List<String> validExtensions
     public Uni<List<String>> createResourceMultiple(List<ResourceEntity> resourceEntityList, List<ResourceCreationDto> resourceCreationDtoList) {
         List<String> errors = new ArrayList<>();
         List<String> uploadedFiles = new ArrayList<>();
+
+        long totalFileSize = resourceCreationDtoList.stream()
+                .mapToLong(dto -> dto.getFile().length())  // ottieni la dimensione del file in byte
+                .sum();
+
+        // Se la somma delle dimensioni dei file supera 10MB, solleva un'eccezione
+        if (totalFileSize > 10 * 1024 * 1024) {
+            throw new AtmLayerException("La dimensione totale dei file supera il limite di 10MB", Response.Status.INTERNAL_SERVER_ERROR, ATMLM_500);
+        }
+
         return Multi.createFrom().items(resourceEntityList.stream())
                 .onItem().transformToUniAndConcatenate(resourceEntity -> {
                     int index = resourceEntityList.indexOf(resourceEntity);

diff --git a/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/BpmnUtils.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/BpmnUtils.java
@@ -13,11 +13,11 @@
 import jakarta.ws.rs.core.Response;
 import org.apache.commons.lang3.StringUtils;
 
+import java.io.File;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static it.gov.pagopa.atmlayer.service.model.enumeration.AppErrorCodeEnum.DUPLICATE_ASSOCIATION_CONFIGS;
-import static it.gov.pagopa.atmlayer.service.model.enumeration.AppErrorCodeEnum.ILLEGAL_CONFIGURATION_TRIPLET;
+import static it.gov.pagopa.atmlayer.service.model.enumeration.AppErrorCodeEnum.*;
 
 @ApplicationScoped
 public class BpmnUtils {
@@ -129,4 +129,10 @@ public static BpmnBankConfig getSingleConfig(BpmnVersionPK bpmnVersionPK, String
         bpmnBankConfig.setFunctionType(functionType);
         return bpmnBankConfig;
     }
+
+    public static void checkFileSize(File file) {
+        if (file.length() > 1024 * 1024) {
+            throw new AtmLayerException("La dimensione del file supera 1MB", Response.Status.BAD_REQUEST, BPMN_FILE_SIZE_EXCEEDS_LIMIT);
+        }
+    }
 }
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
@@ -16,6 +16,7 @@ quarkus.devservices.enabled=false
 quarkus.log.category."software.amazon.awssdk.services.s3".level=DEBUG
 quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy
 quarkus.rest-client.process-deploy.url=http://localhost:3001
+quarkus.http.limits.max-body-size=15M
 ###################
 # OBJECT STORE
 ###################

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -81,5 +81,5 @@ quarkus.otel.traces.enabled=${TRACING_ENABLED:false}
 quarkus.otel.exporter.otlp.traces.endpoint=${TRACING_ENDPOINT_BASE_PATH:http://jaeger-collector.default.svc.cluster.local:4317}
 quarkus.datasource.jdbc.telemetry=${TRACING_ENABLE_JDBC_MONITORING:true}
 
-
-
+# Client config
+quarkus.http.limits.max-body-size=15M