Merge remote-tracking branch 'origin/EBE-549-refactoring-II' into EBE-549-refactoring-II

Author: dalilaacqua

helm/values.yaml

@@ -81,6 +81,7 @@ microservice-chart:
 
     rest-client:
       PDV_BASE_URL: pdv_decrypt_base_url
+      MERCHANT_BASE_URL: idpay_merchant_host
 
   envSecret:
     MONGODB_URI: mongodb-connection-string

src/main/java/it/gov/pagopa/idpay/transactions/connector/rest/MerchantRestClient.java

@@ -1,10 +1,14 @@
 package it.gov.pagopa.idpay.transactions.connector.rest;
 
+import it.gov.pagopa.idpay.transactions.connector.rest.dto.MerchantDetailDTO;
 import it.gov.pagopa.idpay.transactions.connector.rest.dto.PointOfSaleDTO;
 import reactor.core.publisher.Mono;
 
 public interface MerchantRestClient {
 
   Mono<PointOfSaleDTO> getPointOfSale(String merchantId, String pointOfSaleId);
 
+  Mono<MerchantDetailDTO> getMerchantDetail(String merchantId, String initiativeId);
+
+
 }

src/main/java/it/gov/pagopa/idpay/transactions/connector/rest/MerchantRestClientImpl.java

@@ -1,27 +1,36 @@
 package it.gov.pagopa.idpay.transactions.connector.rest;
 
 import it.gov.pagopa.common.reactive.utils.PerformanceLogger;
+import it.gov.pagopa.common.web.exception.ClientExceptionWithBody;
+import it.gov.pagopa.idpay.transactions.connector.rest.dto.MerchantDetailDTO;
 import it.gov.pagopa.idpay.transactions.connector.rest.dto.PointOfSaleDTO;
 import java.time.Duration;
 import java.util.Map;
+
+import it.gov.pagopa.idpay.transactions.utils.Utilities;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Mono;
 import reactor.util.retry.Retry;
 
+import static it.gov.pagopa.idpay.transactions.utils.ExceptionConstants.ExceptionCode.MERCHANT_NOT_FOUND;
+import static it.gov.pagopa.idpay.transactions.utils.ExceptionConstants.ExceptionMessage.ERROR_MESSAGE_MERCHANT_NOT_FOUND;
+
 @Service
 @Slf4j
 @CacheConfig
 public class MerchantRestClientImpl implements MerchantRestClient {
 
   private static final String URI_POS_DETAIL = "/idpay/merchant/portal/{merchantId}/point-of-sales/{pointOfSaleId}";
+  private static final String URI_MERCHANT_DETAIL = "/idpay/merchant/portal/initiatives/{initiativeId}";
   private final WebClient webClient;
   private final int retryDelay;
   private final long maxAttempts;
@@ -81,4 +90,41 @@ public Mono<PointOfSaleDTO> getPointOfSale(String merchantId, String pointOfSale
           return Mono.empty();
         });
   }
+
+    @Override
+    public Mono<MerchantDetailDTO> getMerchantDetail(String merchantId, String initiativeId) {
+        log.info("Sending request to merchant {} to get merchant details", Utilities.sanitizeString(merchantId));
+
+        return webClient
+                .get()
+                .uri(URI_MERCHANT_DETAIL, Map.of("initiativeId", initiativeId))
+                .header("x-merchant-id", merchantId)
+                .retrieve()
+                .onStatus(HttpStatus.NOT_FOUND::equals, response ->
+                        response.bodyToMono(String.class)
+                                .flatMap(body -> {
+                                    log.warn("Merchant not found for merchantId {}", Utilities.sanitizeString(merchantId));
+                                    return Mono.error(new ClientExceptionWithBody(
+                                            HttpStatus.NOT_FOUND,
+                                            MERCHANT_NOT_FOUND,
+                                            ERROR_MESSAGE_MERCHANT_NOT_FOUND.formatted(merchantId, initiativeId)
+                                    ));
+                                })
+                )
+                .bodyToMono(MerchantDetailDTO.class)
+                .retryWhen(
+                        Retry.fixedDelay(maxAttempts, Duration.ofMillis(retryDelay))
+                                .filter(ex ->
+                                        ex instanceof WebClientResponseException.TooManyRequests ||
+                                                ex.getMessage().startsWith("Connection refused")
+                                )
+                )
+                .onErrorResume(WebClientResponseException.BadRequest.class, ex -> {
+                    log.warn("Invalid request for merchant {}", Utilities.sanitizeString(merchantId));
+                    return Mono.empty();
+                });
+    }
+
+
+
 }

src/main/java/it/gov/pagopa/idpay/transactions/connector/rest/dto/MerchantDetailDTO.java

@@ -0,0 +1,16 @@
+package it.gov.pagopa.idpay.transactions.connector.rest.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class MerchantDetailDTO {
+
+  private String businessName;
+
+}

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

@@ -26,4 +26,7 @@ Mono<MerchantTransactionsListDTO> getMerchantTransactions(@RequestHeader("x-merc
     Mono<List<String>> getProcessedTransactionStatuses(
             @RequestHeader(value = "x-organization-role", required = false) String organizationRole);
 
+
+
+
 }

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

@@ -42,4 +42,5 @@ public Mono<List<String>> getProcessedTransactionStatuses(
         return merchantTransactionService.getProcessedTransactionStatuses(
                 organizationRole);
     }
+
 }

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

@@ -0,0 +1,35 @@
+package it.gov.pagopa.idpay.transactions.controller;
+
+import it.gov.pagopa.idpay.transactions.dto.PatchReportRequest;
+import it.gov.pagopa.idpay.transactions.dto.ReportDTO;
+import it.gov.pagopa.idpay.transactions.dto.ReportListDTO;
+import it.gov.pagopa.idpay.transactions.dto.ReportRequest;
+import jakarta.validation.Valid;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Mono;
+
+@RequestMapping("/idpay/merchant/portal")
+public interface ReportController {
+
+    @GetMapping("/initiatives/{initiativeId}/reports")
+    Mono<ReportListDTO> getTransactionsReports(
+            @RequestHeader(value = "x-merchant-id", required = false) String merchantId,
+            @RequestHeader(value = "x-organization-role", required = false) String organizationRole,
+            @PathVariable("initiativeId") String initiativeId,
+            @PageableDefault Pageable pageable
+    );
+
+    @PostMapping("/initiatives/{initiativeId}/reports")
+    Mono<ReportDTO> generateReport(@RequestHeader("x-merchant-id") String merchantId,
+                                                       @RequestHeader(value = "x-organization-role", required = false) String organizationRole,
+                                                       @PathVariable("initiativeId") String initiativeId,
+                                                       @RequestBody @Valid ReportRequest request);
+
+
+    @PatchMapping("/initiatives/{initiativeId}/reports/{reportId}")
+    Mono<ReportDTO> patchReport(@PathVariable("initiativeId") String initiativeId,
+                                @PathVariable("reportId") String reportId,
+                                @RequestBody PatchReportRequest request);
+}

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

@@ -0,0 +1,58 @@
+package it.gov.pagopa.idpay.transactions.controller;
+
+import it.gov.pagopa.idpay.transactions.dto.PatchReportRequest;
+import it.gov.pagopa.idpay.transactions.dto.ReportDTO;
+import it.gov.pagopa.idpay.transactions.dto.ReportListDTO;
+import it.gov.pagopa.idpay.transactions.dto.ReportRequest;
+import it.gov.pagopa.idpay.transactions.service.ReportService;
+import it.gov.pagopa.idpay.transactions.dto.mapper.ReportMapper;
+import it.gov.pagopa.idpay.transactions.utils.Utilities;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
+
+@RestController
+@Slf4j
+public class ReportControllerImpl implements ReportController {
+
+    private final ReportService reportService;
+    private final ReportMapper reportMapper;
+
+    public ReportControllerImpl(ReportService reportService, ReportMapper reportMapper) {
+        this.reportService = reportService;
+        this.reportMapper = reportMapper;
+    }
+
+    @Override
+    public Mono<ReportListDTO> getTransactionsReports(
+            String merchantId,
+            String organizationRole,
+            String initiativeId,
+            Pageable pageable
+    ) {
+        log.info("[GET_TRANSACTIONS_REPORTS] Request received for initiative: {}", Utilities.sanitizeString(initiativeId));
+
+        return reportService.getTransactionsReports(merchantId, organizationRole, initiativeId, pageable)
+                .flatMap(page -> Mono.just(reportMapper.toListDTO(page)));
+    }
+
+
+    @Override
+    public Mono<ReportDTO> generateReport(String merchantId,
+                                          String organizationRole,
+                                          String initiativeId,
+                                          ReportRequest request
+    ) {
+            return reportService.generateReport(merchantId, organizationRole, initiativeId, request);
+    }
+
+
+    @Override
+    public Mono<ReportDTO> patchReport(String initiativeId,
+                                       String reportId,
+                                       PatchReportRequest request
+    ) {
+        return reportService.patchReport(initiativeId, reportId, request);
+    }
+}

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

@@ -0,0 +1,19 @@
+package it.gov.pagopa.idpay.transactions.dto;
+
+import it.gov.pagopa.idpay.transactions.enums.ReportStatus;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class PatchReportRequest {
+
+    private ReportStatus reportStatus;
+
+}
+

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

@@ -0,0 +1,32 @@
+package it.gov.pagopa.idpay.transactions.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import it.gov.pagopa.idpay.transactions.enums.ReportStatus;
+import it.gov.pagopa.idpay.transactions.enums.ReportType;
+import it.gov.pagopa.idpay.transactions.enums.RewardBatchAssignee;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ReportDTO {
+
+    String id;
+    String initiativeId;
+    ReportStatus reportStatus;
+    LocalDateTime startPeriod;
+    LocalDateTime endPeriod;
+    String merchantId;
+    String businessName;
+    LocalDateTime requestDate;
+    LocalDateTime elaborationDate;
+    RewardBatchAssignee operatorLevel;
+    String fileName;
+    ReportType reportType;
+
+}