feat: [UPBE-591] Report Generation API Creation

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,6 +1,7 @@
 package it.gov.pagopa.idpay.transactions.connector.rest;
 
 import it.gov.pagopa.common.reactive.utils.PerformanceLogger;
+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;
@@ -22,6 +23,7 @@
 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 +83,44 @@
           return Mono.empty();
         });
   }
+
+    @Override
+    public Mono<MerchantDetailDTO> getMerchantDetail(String merchantId, String initiativeId) {
+        log.info("Sending request to merchant {} to get merchant details", merchantId);
+
+        return PerformanceLogger.logTimingOnNext(
+                        "MERCHANT_INTEGRATION",
+                        webClient
+                                .get()
+                                .uri(URI_MERCHANT_DETAIL, Map.of("initiativeId", initiativeId))
+                                .header("x-merchant-id", merchantId)
+                                .retrieve()
+                                .bodyToMono(MerchantDetailDTO.class),
+                        x -> "received merchant detail"
+                )
+                .retryWhen(
+                        Retry.fixedDelay(maxAttempts, Duration.ofMillis(retryDelay))
+                                .filter(ex -> {
+                                    boolean retry =
+                                            ex instanceof WebClientResponseException.TooManyRequests ||
+                                                    ex.getMessage().startsWith("Connection refused");
+
+                                    if (retry) {
+                                        log.info("[MERCHANT_INTEGRATION] Retrying invocation due to exception: {}: {}",
+                                                ex.getClass().getSimpleName(), ex.getMessage());
+                                    }
+                                    return retry;
+                                })
+                )
+                .onErrorResume(WebClientResponseException.NotFound.class, ex -> {
+                    log.warn("Merchant detail not found for merchant {}", merchantId);
+                    return Mono.empty();
+                })
+                .onErrorResume(WebClientResponseException.BadRequest.class, ex -> {
+                    log.warn("Invalid request for merchant {}", 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,33 @@
+package it.gov.pagopa.idpay.transactions.controller;
+
+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.dto.TransactionsRequest;
+import it.gov.pagopa.idpay.transactions.enums.RewardBatchAssignee;
+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;
+
+import java.time.LocalDateTime;
+
+@RequestMapping("/idpay/merchant/portal")
+public interface ReportController {
+
+    @GetMapping("/initiatives/{initiativeId}/transactions/reports")
+    Mono<ReportListDTO> getTransactionsReports(
+            @RequestHeader(value = "x-merchant-id", required = false) String merchantId,
+            @RequestHeader(value = "x-organization-role", required = false) String organizationRole,
+            @RequestParam(value = "rewardBatchAssignee", required = false) String rewardBatchAssignee,
+            @PathVariable("initiativeId") String initiativeId,
+            @PageableDefault Pageable pageable
+    );
+
+    @PostMapping("/initiatives/{initiativeId}/transactions/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);
+}

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

@@ -0,0 +1,53 @@
+package it.gov.pagopa.idpay.transactions.controller;
+
+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.enums.ReportType;
+import it.gov.pagopa.idpay.transactions.enums.RewardBatchAssignee;
+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;
+
+import java.time.LocalDateTime;
+
+@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 rewardBatchAssignee,
+            String initiativeId,
+            Pageable pageable
+    ) {
+        log.info("[GET_TRANSACTIONS_REPORTS] Request received for initiative: {}", Utilities.sanitizeString(initiativeId));
+
+        return reportService.getTransactionsReports(merchantId, organizationRole, rewardBatchAssignee, 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);
+    }
+}

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;
+
+}

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

@@ -0,0 +1,20 @@
+package it.gov.pagopa.idpay.transactions.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReportListDTO {
+    private List<ReportDTO> reports;
+    private int page;
+    private int size;
+    private int totalElements;
+    private int totalPages;
+}

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

@@ -0,0 +1,35 @@
+package it.gov.pagopa.idpay.transactions.dto;
+
+import it.gov.pagopa.idpay.transactions.enums.ReportType;
+import it.gov.pagopa.idpay.transactions.enums.RewardBatchAssignee;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReportRequest {
+
+    @NotNull
+    private LocalDateTime startPeriod;
+    @NotNull
+    private LocalDateTime endPeriod;
+    @NotNull
+    private ReportType reportType;
+
+    private RewardBatchAssignee operatorLevel;
+}
+

src/main/java/it/gov/pagopa/idpay/transactions/dto/mapper/ReportMapper.java

@@ -0,0 +1,50 @@
+package it.gov.pagopa.idpay.transactions.dto.mapper;
+
+import it.gov.pagopa.idpay.transactions.dto.ReportDTO;
+import it.gov.pagopa.idpay.transactions.dto.ReportListDTO;
+import it.gov.pagopa.idpay.transactions.model.Report;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class ReportMapper {
+
+    public ReportDTO toDTO(Report report) {
+        if (report == null) {
+            return null;
+        }
+
+        return ReportDTO.builder()
+                .id(report.getId())
+                .initiativeId(report.getInitiativeId())
+                .reportStatus(report.getReportStatus())
+                .startPeriod(report.getStartPeriod())
+                .endPeriod(report.getEndPeriod())
+                .merchantId(report.getMerchantId())
+                .businessName(report.getBusinessName())
+                .requestDate(report.getRequestDate())
+                .elaborationDate(report.getElaborationDate())
+                .operatorLevel(report.getOperatorLevel())
+                .fileName(report.getFileName())
+                .reportType(report.getReportType())
+                .build();
+    }
+
+    public ReportListDTO toListDTO(Page<Report> page) {
+        List<ReportDTO> dtoList = page.getContent()
+                .stream()
+                .map(this::toDTO)
+                .collect(Collectors.toList());
+
+        return ReportListDTO.builder()
+                .reports(dtoList)
+                .page(page.getNumber())
+                .size(page.getSize())
+                .totalElements((int) page.getTotalElements())
+                .totalPages(page.getTotalPages())
+                .build();
+    }
+}

src/main/java/it/gov/pagopa/idpay/transactions/enums/ReportStatus.java

@@ -0,0 +1,8 @@
+package it.gov.pagopa.idpay.transactions.enums;
+
+public enum ReportStatus {
+    INSERTED,
+    FAILED,
+    IN_PROGRESS,
+    GENERATED
+}

src/main/java/it/gov/pagopa/idpay/transactions/enums/ReportType.java

@@ -0,0 +1,5 @@
+package it.gov.pagopa.idpay.transactions.enums;
+
+public enum ReportType {
+    MERCHANT_TRANSACTIONS
+}

src/main/java/it/gov/pagopa/idpay/transactions/model/Report.java

@@ -0,0 +1,40 @@
+package it.gov.pagopa.idpay.transactions.model;
+
+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 lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldNameConstants;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.MongoId;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@FieldNameConstants
+@EqualsAndHashCode(of = {"id"}, callSuper = false)
+@Document(collection = "reports")
+public class Report {
+
+    @MongoId
+    private String id;
+    private String initiativeId;
+    private ReportStatus reportStatus;
+    private LocalDateTime startPeriod;
+    private LocalDateTime endPeriod;
+    private String merchantId;
+    private String businessName;
+    private LocalDateTime requestDate;
+    private LocalDateTime elaborationDate;
+    private RewardBatchAssignee operatorLevel;
+    private String fileName;
+    private ReportType reportType;
+}