retry

pagopa · Dec 6, 2024 · f98cb08 · f98cb08
1 parent abd397b
commit f98cb08
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 177 deletions.
diff --git a/src/main/java/it/gov/pagopa/bizpmingestion/config/LoggingAspect.java b/src/main/java/it/gov/pagopa/bizpmingestion/config/LoggingAspect.java
diff --git a/src/main/java/it/gov/pagopa/bizpmingestion/entity/pm/PPTransaction.java b/src/main/java/it/gov/pagopa/bizpmingestion/entity/pm/PPTransaction.java
@@ -25,7 +25,7 @@
                         name = "ppWallet-subgraph",
                         attributeNodes = {
                                 @NamedAttributeNode("ppCreditCard"),
-//                                @NamedAttributeNode("ppPsp"),
+                                @NamedAttributeNode("ppPsp"),
 //                                @NamedAttributeNode("ppPayPal"),
                         }
                 )

diff --git a/src/main/java/it/gov/pagopa/bizpmingestion/service/impl/MapperComponent.java b/src/main/java/it/gov/pagopa/bizpmingestion/service/impl/MapperComponent.java
@@ -1,5 +1,6 @@
 package it.gov.pagopa.bizpmingestion.service.impl;
 
+import com.microsoft.azure.functions.annotation.ExponentialBackoffRetry;
 import it.gov.pagopa.bizpmingestion.entity.pm.*;
 import it.gov.pagopa.bizpmingestion.enumeration.PaymentMethodType;
 import it.gov.pagopa.bizpmingestion.model.pm.PMEvent;
@@ -18,6 +19,10 @@
 @Component
 public class MapperComponent {
 
+  @ExponentialBackoffRetry(
+          maxRetryCount = 3,
+          maximumInterval = "00:00:30",
+          minimumInterval = "00:00:05")
   public PMEvent convert(PPTransaction ppTransaction) {
 
     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'");

diff --git a/src/main/java/it/gov/pagopa/bizpmingestion/service/impl/SliceService.java b/src/main/java/it/gov/pagopa/bizpmingestion/service/impl/SliceService.java
@@ -3,15 +3,13 @@
 import com.azure.spring.data.cosmos.repository.CosmosRepository;
 import com.microsoft.azure.functions.annotation.ExponentialBackoffRetry;
 import it.gov.pagopa.bizpmingestion.entity.cosmos.execution.BizEventsPMIngestionExecution;
-import it.gov.pagopa.bizpmingestion.entity.cosmos.execution.SkippedTransaction;
 import it.gov.pagopa.bizpmingestion.entity.pm.PPTransaction;
 import it.gov.pagopa.bizpmingestion.model.WrapperObject;
 import it.gov.pagopa.bizpmingestion.model.pm.PMEvent;
 import it.gov.pagopa.bizpmingestion.model.pm.PMEventPaymentDetail;
 import it.gov.pagopa.bizpmingestion.model.pm.PMEventToViewResult;
 import it.gov.pagopa.bizpmingestion.repository.*;
 import it.gov.pagopa.bizpmingestion.service.IPMEventToViewService;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -64,7 +62,7 @@ public BizEventsPMIngestionExecution computeSlice(
       int sliceNumber) {
     try {
       pmIngestionExec.setId(UUID.randomUUID().toString());
-      List<PPTransaction> ppTrList = ppTransactionRepository.findAll(spec);
+      List<PPTransaction> ppTrList = getPpTransactions(spec);
 
       List<PMEvent> pmEventList =
           ppTrList.stream().map(elem -> mapperComponent.convert(elem)).toList();
@@ -90,11 +88,19 @@ public BizEventsPMIngestionExecution computeSlice(
           pmIngestionExec.getStatus(),
           pmIngestionExec.getNumRecordIngested(),
           pmIngestionExec.getNumRecordFound(),
-          LocalDate.parse(pmIngestionExec.getDateFrom()));
+          LocalDateTime.parse(pmIngestionExec.getDateFrom()).toLocalDate());
     }
     return pmIngestionExec;
   }
 
+  @ExponentialBackoffRetry(
+      maxRetryCount = 3,
+      maximumInterval = "00:00:30",
+      minimumInterval = "00:00:05")
+  private List<PPTransaction> getPpTransactions(Specification<PPTransaction> spec) {
+    return ppTransactionRepository.findAll(spec);
+  }
+
   private void handleEventList(
       List<PMEvent> pmEventList, BizEventsPMIngestionExecution pmIngestionExec, int sliceNumber) {
     pmIngestionExec.setStatus("ALL_COMPLETED");
@@ -171,13 +177,13 @@ private void handleEventList(
   @ExponentialBackoffRetry(
       maxRetryCount = 3,
       maximumInterval = "00:00:30",
-      minimumInterval = "00:00:5")
+      minimumInterval = "00:00:05")
   private <T> void bulkSave(List<T> generals, CosmosRepository<T, String> repository) {
-    int bulkSize = 500;
-    for (int i = 0; i < generals.size(); i += bulkSize) {
-      int endIndex = Math.min(i + bulkSize, generals.size());
-      List<T> bulk = generals.subList(i, endIndex);
-      repository.saveAll(bulk);
-    }
+        int bulkSize = 500;
+        for (int i = 0; i < generals.size(); i += bulkSize) {
+          int endIndex = Math.min(i + bulkSize, generals.size());
+          List<T> bulk = generals.subList(i, endIndex);
+          repository.saveAll(bulk);
+        }
   }
 }