Merge pull request #299 from pagopa/develop

fix: promotion to master

api/batch/pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter-api</artifactId>
         <groupId>it.gov.pagopa.rtd.ms.transaction_filter.api</groupId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
     </parent>
 
     <artifactId>rtd-ms-transaction-filter-api-batch</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
 
     <dependencies>
         <dependency>

api/batch/src/main/java/it/gov/pagopa/rtd/transaction_filter/batch/model/InboundTransaction.java

@@ -1,5 +1,7 @@
 package it.gov.pagopa.rtd.transaction_filter.batch.model;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import lombok.*;
 
 import javax.validation.constraints.NotBlank;
@@ -84,8 +86,11 @@
 
     /**
      * Transaction amount
+     * max value: 999.999.999,99€
      */
     @NotNull
+    @Min(value = 0)
+    @Max(value = 99999999999L)
     Long amount;
 
     /**

api/batch/src/main/java/it/gov/pagopa/rtd/transaction_filter/batch/step/processor/TransactionAggregationReaderProcessor.java

@@ -51,7 +51,7 @@ public InboundTransaction process(InboundTransaction inboundTransaction) {
         }
         key.setAccountingDate(storeService.flyweightAccountingDate(
             inboundTransaction.getTrxDate().substring(0, 10)));
-        boolean dirtyDataFound = storeService.storeAggregate(key, Math.toIntExact(inboundTransaction.getAmount()), inboundTransaction.getVat(),
+        boolean dirtyDataFound = storeService.storeAggregate(key, inboundTransaction.getAmount(), inboundTransaction.getVat(),
             inboundTransaction.getPosType());
 
         if (dirtyDataFound) {

api/batch/src/main/java/it/gov/pagopa/rtd/transaction_filter/batch/step/tasklet/FileManagementTasklet.java

@@ -2,6 +2,7 @@
 
 import it.gov.pagopa.rtd.transaction_filter.service.TransactionWriterService;
 import java.security.SecureRandom;
+import java.util.UUID;
 import lombok.Data;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -226,7 +227,7 @@ private File getDestionationFileByStatus(String sourceFilePath, boolean isComple
         if (isCompleted) {
             String archivalPath = resolver.getResources(successPath)[0].getFile().getAbsolutePath();
             DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");
-            destinationPath = archivalPath + File.separator + SecureRandom.getInstanceStrong().nextLong() +
+            destinationPath = archivalPath + File.separator + UUID.randomUUID().toString().replace("-", "").substring(0, 20) +
                 "_" + OffsetDateTime.now().format(fmt) + "_" + filename;
         } else {
             String archivalPath = resolver.getResources(uploadPendingPath)[0].getFile().getAbsolutePath();

api/batch/src/test/java/it/gov/pagopa/rtd/transaction_filter/batch/step/processor/InboundTransactionItemProcessorValidatorTest.java

@@ -229,7 +229,7 @@ void processTransactionWithValidCorrelationId(String correlationId) {
     }
 
     @ParameterizedTest
-    @ValueSource(longs = {1000, 200000})
+    @ValueSource(longs = {0, 1000, 200000, Integer.MAX_VALUE + 1L, 3000000000L, 99999999999L})
     void processTransactionWithValidAmount(Long amount) {
         BDDMockito.doReturn(true).when(storeServiceMock).hasHpan(FAKE_ENROLLED_PAN);
         BDDMockito.doReturn(FAKE_SALT).when(storeServiceMock).getSalt();
@@ -241,6 +241,17 @@ void processTransactionWithValidAmount(Long amount) {
         Assertions.assertEquals(amount, outbound.getAmount());
     }
 
+    @ParameterizedTest
+    @ValueSource(longs = {-100L, 100000000000L})
+    void processTransactionWithInvalidAmount(Long amount) {
+        BDDMockito.doReturn(true).when(storeServiceMock).hasHpan(FAKE_ENROLLED_PAN);
+        BDDMockito.doReturn(FAKE_SALT).when(storeServiceMock).getSalt();
+        InboundTransaction transaction = fakeInboundTransaction();
+        transaction.setAmount(amount);
+        InboundTransactionItemProcessor processor = new InboundTransactionItemProcessor(storeServiceMock, false);
+        Assertions.assertThrows(ConstraintViolationException.class, () -> processor.process(transaction));
+    }
+
     @ParameterizedTest
     @ValueSource(strings = {"1234", "412", "15", ""})
     void processTransactionWithInvalidAmountCurrencyThrowsException(String amountCurrency) {

api/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter.api</groupId>
     <artifactId>rtd-ms-transaction-filter-api</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
 
     <packaging>pom</packaging>
 

app/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
     <artifactId>transaction-filter-app</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
 
     <dependencies>
         <dependency>

app/src/main/resources/config/application.yml

@@ -110,7 +110,7 @@ batchConfiguration:
 rest-client:
   user-agent:
     prefix: BatchService
-    version: 1.3.2
+    version: 1.3.3
   hpan:
     serviceCode: hpan-service
     base-url: ${HPAN_SERVICE_URL:https://bpd-dev.azure-api.net:${HPAN_SERVICE_PORT:443}}

app/src/main/resources/logback-spring.xml

@@ -14,8 +14,17 @@
   </appender>
 
   <!--  file appender-->
-  <appender name="fileMask" class="ch.qos.logback.core.FileAppender">
+  <appender name="fileMask" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${LOG_FILE}</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <!-- daily rollover -->
+      <fileNamePattern>${LOG_FILE}.%d.gz</fileNamePattern>
+
+      <!-- keep 15 days' worth of history capped at 100MB total size -->
+      <maxHistory>15</maxHistory>
+      <totalSizeCap>100MB</totalSizeCap>
+    </rollingPolicy>
+
     <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
       <layout class="it.gov.pagopa.rtd.transaction_filter.logger.MaskingPatternLayout">
         <maskPattern>Ocp-Apim-Subscription-Key\s*:\s*(.*)</maskPattern> <!-- apikey pattern -->

core/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
      </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
     <artifactId>rtd-ms-transaction-filter-core</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
 
     <dependencies>
         <dependency>

core/src/main/java/it/gov/pagopa/rtd/transaction_filter/service/StoreService.java

@@ -75,7 +75,7 @@ public interface StoreService {
      * @param posType the transaction POS type
      * @return boolean true if dirty data has been found during aggregation
      */
-    boolean storeAggregate(AggregationKey key, int amount, String vat, String posType);
+    boolean storeAggregate(AggregationKey key, long amount, String vat, String posType);
 
     /**
      * Get the aggregate computed over a single aggregation key.

core/src/main/java/it/gov/pagopa/rtd/transaction_filter/service/StoreServiceImpl.java

@@ -66,7 +66,7 @@ public boolean hasHpan(String hpan) {
     }
 
     @Override
-    public synchronized boolean storeAggregate(AggregationKey key, int amount, String vat, String posType) {
+    public synchronized boolean storeAggregate(AggregationKey key, long amount, String vat, String posType) {
         aggregates.putIfAbsent(key, new AggregationData());
         AggregationData data = aggregates.get(key);
         data.incNumTrx();

core/src/main/java/it/gov/pagopa/rtd/transaction_filter/service/store/AggregationData.java

@@ -15,16 +15,16 @@ public class AggregationData {
   private int numTrx;
   // Integer should be fine until we aggregate on daily basis.
   // Remember to re-evaluate the data type in case the aggregation period would be increased.
-  private int totalAmount;
+  private long totalAmount;
   private String vat = INIT_VAT;
   private byte posType = INIT_POS_TYPE;
 
   public void incNumTrx() {
     this.numTrx += 1;
   }
 
-  public void incTotalAmount(int amount) {
-    this.totalAmount += amount;
+  public void incTotalAmount(long amount) {
+    this.totalAmount = Math.addExact(this.totalAmount, amount);
   }
 
   public boolean updateVatOrMarkAsDirty(String vat) {

core/src/test/java/it/gov/pagopa/rtd/transaction_filter/service/StoreServiceTest.java

@@ -1,5 +1,6 @@
 package it.gov.pagopa.rtd.transaction_filter.service;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import ch.qos.logback.classic.Level;
@@ -120,7 +121,7 @@ public void getAggregateAfterStoreReturnsData() {
         storeService.storeAggregate(key, 1000, null, "01");
         AggregationData expectedData = new AggregationData();
         expectedData.setNumTrx(1);
-        expectedData.setTotalAmount(1000);
+        expectedData.setTotalAmount(1000L);
         expectedData.setPosType((byte)1);
         expectedData.setVat(null);
         Assert.assertEquals(expectedData, storeService.getAggregate(key));
@@ -140,7 +141,7 @@ public void getAggregateAfterMultipleStoreReturnsData() {
         storeService.storeAggregate(key, 2500, null, "01");
         AggregationData expectedData = new AggregationData();
         expectedData.setNumTrx(2);
-        expectedData.setTotalAmount(3500);
+        expectedData.setTotalAmount(3500L);
         expectedData.setPosType((byte)1);
         expectedData.setVat(null);
         Assert.assertEquals(expectedData, storeService.getAggregate(key));
@@ -260,4 +261,39 @@ public void clearAllEmptiesDataStructures() {
         Assert.assertNull(storeService.getTargetInputFile());
     }
 
+    @Test
+    public void testTotalAmountIntegerLimit() {
+        AggregationKey key = new AggregationKey();
+        key.setTerminalId("1");
+        key.setMerchantId("1");
+        key.setAcquirerId(storeService.flyweightAcquirerId("1"));
+        key.setSenderCode(storeService.flyweightSenderCode("code"));
+        key.setFiscalCode("FC");
+        key.setAccountingDate(storeService.flyweightAccountingDate("2022-04-07"));
+        key.setOperationType((byte)0);
+
+        storeService.storeAggregate(key, Integer.MAX_VALUE - 1, "vat", "00");
+        storeService.storeAggregate(key, Integer.MAX_VALUE - 1, "vat", "00");
+
+        assertThat(storeService.getAggregate(key).getTotalAmount())
+            .isNotNegative()
+            .isEqualTo((Integer.MAX_VALUE - 1) * 2L);
+    }
+
+    @Test
+    public void whenSumOverflowLongThenThrowArithmeticException() {
+        AggregationKey key = new AggregationKey();
+        key.setTerminalId("1");
+        key.setMerchantId("1");
+        key.setAcquirerId(storeService.flyweightAcquirerId("1"));
+        key.setSenderCode(storeService.flyweightSenderCode("code"));
+        key.setFiscalCode("FC");
+        key.setAccountingDate(storeService.flyweightAccountingDate("2022-04-07"));
+        key.setOperationType((byte)0);
+
+        storeService.storeAggregate(key, Long.MAX_VALUE - 1, "vat", "00");
+
+        assertThatThrownBy(() -> storeService.storeAggregate(key, Integer.MAX_VALUE - 1, "vat", "00"))
+            .isInstanceOf(ArithmeticException.class);
+    }
 }

integration/jpa/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter-integration</artifactId>
         <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
     <artifactId>rtd-ms-transaction-filter-integration-jpa</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
 
     <dependencies>
         <dependency>

integration/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
     <artifactId>rtd-ms-transaction-filter-integration</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
 
     <packaging>pom</packaging>
 

integration/rest/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
         <artifactId>rtd-ms-transaction-filter-integration</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
     <artifactId>rtd-ms-transaction-filter-integration-rest</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
 
     <dependencies>
         <dependency>

integration/rest/src/test/java/it/gov/pagopa/rtd/transaction_filter/logger/MaskingPatternLayoutTest.java

@@ -38,7 +38,7 @@ void whenLogContainsSaltThenAnonymizeIt(CapturedOutput output) {
     String stringWithSalt =
         "[HpanRestConnector#getSalt] ---> GET https://api.dev.cstar.pagopa.it/rtd/payment-instrument-manager/v2/salt HTTP/1.1\n"
             + "[HpanRestConnector#getSalt] Ocp-Apim-Subscription-Key: ciao\n"
-            + "[HpanRestConnector#getSalt] User-Agent: BatchService/1.3.2\n"
+            + "[HpanRestConnector#getSalt] User-Agent: BatchService/1.3.3\n"
             + "[HpanRestConnector#getSalt] ---> END HTTP (0-byte body)\n"
             + "[HpanRestConnector#getSalt] <--- HTTP/1.1 200 OK (57ms)\n"
             + "[HpanRestConnector#getSalt] connection: keep-alive\n"

ops_resources/example_config/application.yml

@@ -109,7 +109,7 @@ batchConfiguration:
 rest-client:
   user-agent:
     prefix: BatchService
-    version: 1.3.2
+    version: 1.3.3
   hpan:
     serviceCode: hpan-service
     base-url: ${HPAN_SERVICE_URL:https://bpd-dev.azure-api.net:${HPAN_SERVICE_PORT:443}}

ops_resources/example_config/application_hbsql.yml

@@ -87,7 +87,7 @@ batchConfiguration:
 rest-client:
   user-agent:
     prefix: BatchService
-    version: 1.3.2
+    version: 1.3.3
   hpan:
     serviceCode: hpan-service
     base-url: ${HPAN_SERVICE_URL:https://bpd-dev.azure-api.net:${HPAN_SERVICE_PORT:443}}

pom.xml

@@ -10,14 +10,14 @@
 
     <groupId>it.gov.pagopa.rtd.ms</groupId>
     <artifactId>rtd-ms-transaction-filter</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
 
     <packaging>pom</packaging>
 
     <properties>
         <java.version>1.8</java.version>
         <spring-boot.version>2.7.4</spring-boot.version>
-        <postgresql.version>42.5.0</postgresql.version>
+        <postgresql.version>42.5.1</postgresql.version>
         <springframework-cloud.version>3.1.4</springframework-cloud.version>
         <snakeyaml.version>1.33</snakeyaml.version>
         <common-io.version>2.11.0</common-io.version>
@@ -33,7 +33,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sonar.exclusions>**/enums/**,**/model/**,**/Constants*.java,**/*Config.java,**/*Application.java
         </sonar.exclusions>
-        <transaction-filter.version>1.3.2</transaction-filter.version>
+        <transaction-filter.version>1.3.3</transaction-filter.version>
     </properties>
 
     <dependencyManagement>