feat: promote to main (#376)

Author: and-mora

erogazione/README.md

@@ -85,16 +85,17 @@ I seguenti campi vengono recuperati automaticamente tramite API SelfCare usando
 ```
 
 ### Generazione del File CSV di Esempio
-Per generare il file `dati.csv`, è necessario aggiornare la tabella CosmosDB `selfcare_export`, ed eseguire la seguente query:
+Per generare il file `dati.csv` è necessario eseguire la seguente query (opt. aggiunta nella where del filtro month == "yyyy-MM"):
 
 ```query
 merchant
 | join kind=inner rewards_batch on $left._id == $right.merchantId
-| where status == "APPROVING"
+| where status == "APPROVED" and approvedAmountCents > 0
 | project id=_id1 ,
     partitaIvaCliente=iff(strlen(vatNumber)==16, "00000000000", vatNumber), 
     codiceFiscaleCliente=fiscalCode, 
-    ragioneSocialeIntestatario=businessName, 
+// Tagliamo a 140 caratteri per compatibilità con le api di erogazione
+    ragioneSocialeIntestatario = substring(businessName, 0, 140),
     ibanBeneficiario=iban, 
     intestatarioContoCorrente=ibanHolder,
     importo=tostring(approvedAmountCents),

erogazione/erogazioni.py

@@ -1,12 +1,13 @@
 import csv
 import json
 import requests
-from datetime import datetime
+from datetime import datetime, timezone
 
 # --- CONFIGURAZIONE ---
 CLIENT_ID = "IL_TUO_CLIENT_ID"
 CLIENT_SECRET = "IL_TUO_CLIENT_SECRET"
-BASE_URL = "https://dev-apim-misure.azure-api.net/pagopa/ce/v1"
+#BASE_URL_UAT = "https://dev-apim-misure.azure-api.net/pagopa/ce/v1"
+BASE_URL = "https://prod-apim-misure.azure-api.net/pagopa/ce/v1"
 TOKEN_URL = "https://login.microsoftonline.com/afd0a75c-8671-4cce-9061-2ca0d92e422f/oauth2/v2.0/token"
 SELFCARE_URL = "https://api.selfcare.pagopa.it/external/v2/institutions"
 SELFCARE_API_KEY = "SELFCARE-MERCHANT-API-KEY"
@@ -25,16 +26,18 @@ def get_bearer_token():
     'client_secret': CLIENT_SECRET,
     'scope': f'{CLIENT_ID}/.default'
   }
+  response = None
   try:
     response = requests.post(TOKEN_URL, data=payload)
     response.raise_for_status()
     return response.json().get('access_token')
   except requests.exceptions.RequestException as e:
     print(f"Errore recupero Token: {e}")
-    try:
-      print(response.text)
-    except:
-      pass
+    if response is not None:
+      try:
+        print(response.text)
+      except Exception:
+        pass
     exit(1)
 
 
@@ -139,6 +142,14 @@ def process_csv():
   # Lista per accumulare tutte le risposte
   all_responses_log = []
 
+  # Nome file output univoco con timestamp UTC
+  output_json_file = OUTPUT_JSON_FILE
+  if output_json_file.lower().endswith('.json'):
+    output_json_file = output_json_file[:-5]
+
+  timestamp = datetime.now(timezone.utc).strftime('%Y%m%dT%H%M%SZ')
+  output_json_file = f"{output_json_file}_{timestamp}.json"
+
   try:
     with open(CSV_FILE, mode='r', encoding='utf-8-sig') as f:
       reader = csv.DictReader(f)
@@ -224,10 +235,10 @@ def process_csv():
     return
 
   # Salvataggio unico file JSON finale
-  with open(OUTPUT_JSON_FILE, 'w', encoding='utf-8') as f_out:
+  with open(output_json_file, 'w', encoding='utf-8') as f_out:
     json.dump(all_responses_log, f_out, indent=4, ensure_ascii=False)
 
-  print(f"\nElaborazione completata. Risposte salvate in '{OUTPUT_JSON_FILE}'")
+  print(f"\nElaborazione completata. Risposte salvate in '{output_json_file}'")
 
 
 if __name__ == "__main__":

src/main/java/it/gov/pagopa/common/web/exception/InvalidChecksErrorException.java

@@ -0,0 +1,19 @@
+package it.gov.pagopa.common.web.exception;
+
+import static it.gov.pagopa.idpay.transactions.utils.ExceptionConstants.ExceptionCode.INVALID_CHECKS_ERROR;
+
+public class InvalidChecksErrorException extends ServiceException {
+
+    public InvalidChecksErrorException(String message) {
+        this(INVALID_CHECKS_ERROR, message, false, null);
+    }
+
+    public InvalidChecksErrorException(
+            String code,
+            String message,
+            boolean printStackTrace,
+            Throwable ex
+    ) {
+        super(code, message, printStackTrace, ex);
+    }
+}

src/main/java/it/gov/pagopa/idpay/transactions/config/ServiceExceptionConfig.java

@@ -26,6 +26,7 @@ public Map<Class<? extends ServiceException>, HttpStatus> serviceExceptionMapper
         exceptionMap.put(BatchNotElaborated15PercentException.class, HttpStatus.BAD_REQUEST);
         exceptionMap.put(InvalidBatchStateForPromotionException.class, HttpStatus.BAD_REQUEST);
         exceptionMap.put(RewardBatchInvalidRequestException.class, HttpStatus.BAD_REQUEST);
+        exceptionMap.put(InvalidChecksErrorException.class, HttpStatus.BAD_REQUEST);
 
         return exceptionMap;
     }

src/main/java/it/gov/pagopa/idpay/transactions/controller/MerchantTransactionController.java

@@ -19,6 +19,7 @@ Mono<MerchantTransactionsListDTO> getMerchantTransactions(@RequestHeader("x-merc
                                                               @RequestParam(required = false) String rewardBatchId,
                                                               @RequestParam(required = false) String rewardBatchTrxStatus,
                                                               @RequestParam(required = false) String pointOfSaleId,
+                                                              @RequestParam(required = false) String trxCode,
                                                               @PageableDefault Pageable pageable);
 
     @GetMapping("/initiatives/{initiativeId}/transactions/processed/statuses")

src/main/java/it/gov/pagopa/idpay/transactions/controller/MerchantTransactionControllerImpl.java

@@ -20,10 +20,19 @@ public MerchantTransactionControllerImpl(MerchantTransactionService merchantTran
 
 
     @Override
-    public Mono<MerchantTransactionsListDTO> getMerchantTransactions(String merchantId, String organizationRole, String initiativeId, String fiscalCode, String status, String rewardBatchId, String rewardBatchTrxStatus, String pointOfSaleId, Pageable pageable) {
+    public Mono<MerchantTransactionsListDTO> getMerchantTransactions(String merchantId,
+                                                                     String organizationRole,
+                                                                     String initiativeId,
+                                                                     String fiscalCode,
+                                                                     String status,
+                                                                     String rewardBatchId,
+                                                                     String rewardBatchTrxStatus,
+                                                                     String pointOfSaleId,
+                                                                     String trxCode,
+                                                                     Pageable pageable) {
 
       log.info("[GET_MERCHANT_TRANSACTIONS] Merchant {} requested to retrieve transactions", Utilities.sanitizeString(merchantId));
-        return merchantTransactionService.getMerchantTransactions(merchantId, organizationRole, initiativeId, fiscalCode, status, rewardBatchId, rewardBatchTrxStatus, pointOfSaleId, pageable);
+        return merchantTransactionService.getMerchantTransactions(merchantId, organizationRole, initiativeId, fiscalCode, status, rewardBatchId, rewardBatchTrxStatus, pointOfSaleId, trxCode, pageable);
     }
 
     @Override

src/main/java/it/gov/pagopa/idpay/transactions/controller/PointOfSaleTransactionController.java

@@ -32,6 +32,7 @@ Mono<PointOfSaleTransactionsListDTO> getPointOfSaleTransactions(
       @RequestParam(required = false) String productGtin,
       @RequestParam(required = false) String fiscalCode,
       @RequestParam(required = false) String status,
+      @RequestParam(required = false) String trxCode,
       @PageableDefault(sort = "trxChargeDate", direction = Sort.Direction.DESC) Pageable pageable);
 
   /**

src/main/java/it/gov/pagopa/idpay/transactions/controller/PointOfSaleTransactionControllerImpl.java

@@ -4,6 +4,7 @@
 import it.gov.pagopa.idpay.transactions.dto.DownloadInvoiceResponseDTO;
 import it.gov.pagopa.idpay.transactions.dto.FranchisePointOfSaleDTO;
 import it.gov.pagopa.idpay.transactions.dto.PointOfSaleTransactionsListDTO;
+import it.gov.pagopa.idpay.transactions.dto.TrxFiltersDTO;
 import it.gov.pagopa.idpay.transactions.dto.mapper.PointOfSaleTransactionMapper;
 import it.gov.pagopa.idpay.transactions.service.PointOfSaleTransactionService;
 import it.gov.pagopa.idpay.transactions.utils.ExceptionConstants;
@@ -32,7 +33,15 @@ public PointOfSaleTransactionControllerImpl(PointOfSaleTransactionService pointO
   }
 
   @Override
-  public Mono<PointOfSaleTransactionsListDTO> getPointOfSaleTransactions(String merchantId, String tokenPointOfSaleId, String initiativeId, String pointOfSaleId, String productGtin, String fiscalCode, String status, Pageable pageable) {
+  public Mono<PointOfSaleTransactionsListDTO> getPointOfSaleTransactions(String merchantId,
+                                                                         String tokenPointOfSaleId,
+                                                                         String initiativeId,
+                                                                         String pointOfSaleId,
+                                                                         String productGtin,
+                                                                         String fiscalCode,
+                                                                         String status,
+                                                                         String trxCode,
+                                                                         Pageable pageable) {
     log.info("[GET_POINT-OF-SALE_TRANSACTIONS] Point Of Sale {} requested to retrieve transactions", Utilities.sanitizeString(pointOfSaleId));
 
     if (tokenPointOfSaleId != null && (!Utilities.sanitizeString(tokenPointOfSaleId)
@@ -47,7 +56,12 @@ public Mono<PointOfSaleTransactionsListDTO> getPointOfSaleTransactions(String me
       ));
     }
 
-    return pointOfSaleTransactionService.getPointOfSaleTransactions(merchantId, initiativeId, pointOfSaleId, productGtin, fiscalCode, status, pageable)
+    TrxFiltersDTO filters = new TrxFiltersDTO();
+    filters.setFiscalCode(fiscalCode);
+    filters.setStatus(status);
+    filters.setTrxCode(trxCode);
+
+    return pointOfSaleTransactionService.getPointOfSaleTransactions(merchantId, initiativeId, pointOfSaleId, productGtin, filters, pageable)
         .flatMap(page ->
             Flux.fromIterable(page.getContent())
                 .flatMapSequential(trx -> mapper.toDTO(trx, initiativeId, fiscalCode))

src/main/java/it/gov/pagopa/idpay/transactions/dto/ChecksErrorDTO.java

@@ -0,0 +1,20 @@
+package it.gov.pagopa.idpay.transactions.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChecksErrorDTO {
+
+    private boolean cfError;
+    private boolean productEligibilityError;
+    private boolean disposalRaeeError;
+    private boolean priceError;
+    private boolean bonusError;
+    private boolean sellerReferenceError;
+    private boolean accountingDocumentError;
+    private boolean genericError;
+}

src/main/java/it/gov/pagopa/idpay/transactions/dto/MerchantTransactionDTO.java

@@ -9,6 +9,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 @Data
@@ -35,6 +36,7 @@ public class MerchantTransactionDTO {
     Long authorizedAmountCents;
     InvoiceData invoiceData;
     RewardBatchTrxStatus rewardBatchTrxStatus;
-    String rewardBatchRejectionReason;
+    List<ReasonDTO> rewardBatchRejectionReason;
+    ChecksErrorDTO checksError;
     String franchiseName;
 }