fix: Promote to Main (#219)

Co-authored-by: skymoronigu <50320390+skymoronigu@users.noreply.github.com>
Co-authored-by: Andrea Morabito <78792023+and-mora@users.noreply.github.com>
Co-authored-by: fedcurciorubertini <federico.curciorubertini@nttdata.com>
Co-authored-by: angelosca24 <angelo.scagliola@nttdata.com>
Co-authored-by: dariopelliccioli <105275365+dariopelliccioli@users.noreply.github.com>

Author: 5 people

pom.xml

@@ -50,6 +50,10 @@
 			<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
 			<version>2.8.13</version>
 		</dependency>
+		<dependency>
+			<groupId>com.azure.spring</groupId>
+			<artifactId>spring-cloud-azure-starter-storage-blob</artifactId>
+		</dependency>
 
 		<!--3rd party library-->
 		<dependency>
@@ -136,7 +140,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-
+			<dependency>
+				<groupId>com.azure.spring</groupId>
+				<artifactId>spring-cloud-azure-dependencies</artifactId>
+				<version>5.23.0</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

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

@@ -8,6 +8,7 @@
 import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.server.MissingRequestValueException;
 import org.springframework.web.server.ServerWebExchange;
 
 import java.util.Optional;
@@ -22,6 +23,14 @@ public ErrorManager(@Nullable ErrorDTO defaultErrorDTO) {
         this.defaultErrorDTO = Optional.ofNullable(defaultErrorDTO)
                 .orElse(new ErrorDTO("Error", "Something gone wrong"));
     }
+
+    @ExceptionHandler(MissingRequestValueException.class)
+    protected ResponseEntity<ErrorDTO> handleRequestValueException(
+            MissingRequestValueException error, ServerWebExchange exchange) {
+        logClientException(error, exchange);
+        return ResponseEntity.badRequest().body(new ErrorDTO("INVALID_REQUEST",  error.getMessage()));
+    }
+
     @ExceptionHandler(RuntimeException.class)
     protected ResponseEntity<ErrorDTO> handleException(RuntimeException error, ServerWebExchange exchange) {
         logClientException(error, exchange);

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

@@ -1,9 +1,17 @@
 package it.gov.pagopa.idpay.transactions.controller;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import it.gov.pagopa.common.web.dto.ErrorDTO;
+import it.gov.pagopa.idpay.transactions.dto.DownloadInvoiceResponseDTO;
 import it.gov.pagopa.idpay.transactions.dto.PointOfSaleTransactionsListDTO;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.web.PageableDefault;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Mono;
 
@@ -19,4 +27,44 @@ Mono<PointOfSaleTransactionsListDTO> getPointOfSaleTransactions(
       @RequestParam(required = false) String fiscalCode,
       @RequestParam(required = false) String status,
       @PageableDefault(sort = "elaborationDateTime", direction = Sort.Direction.DESC) Pageable pageable);
+
+  /**
+   * Provides method to download an invoice file of a rewarded transaction
+   * @param merchantId obtained through a header parameter, used to check if the transaction required is referred to the same merchant
+   * @param pointOfSaleId obtained through a header parameter, used to check if the transaction required is referred to the same point of sale
+   * @param transactionId
+   * @return Mono containing an instance of DownloadInvoiceResponseDTO, containing the invoice url
+   */
+  @Operation(summary = "downloadInvoiceFile",
+          description = "Return invoice file download URL")
+  @ApiResponses(value = {
+          @ApiResponse(responseCode = "200", description = "Return file signed url",
+                  content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                          schema = @Schema(implementation = DownloadInvoiceResponseDTO.class)
+                  )),
+          @ApiResponse(responseCode = "400", description = "Bad Request",
+                  content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                          schema = @Schema(implementation = ErrorDTO.class))),
+          @ApiResponse(responseCode = "401",
+                  description = "Unauthorized", content = @Content(schema = @Schema())),
+          @ApiResponse(responseCode = "403",
+                  description = "Forbidden", content = @Content(schema = @Schema())),
+          @ApiResponse(responseCode = "404", description = "Invoice not found",
+                  content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                          schema = @Schema(implementation = ErrorDTO.class))),
+          @ApiResponse(responseCode = "429",
+                  description = "Too many requests", content = @Content(schema = @Schema())),
+          @ApiResponse(responseCode = "500",
+                  description = "Service error", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                  schema = @Schema(implementation = ErrorDTO.class))),
+          @ApiResponse(responseCode = "503",
+                  description = "Service unavailable",
+                  content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                          schema = @Schema(implementation = ErrorDTO.class)))
+  })
+  @GetMapping("/{pointOfSaleId}/transactions/{transactionId}/download")
+  Mono<DownloadInvoiceResponseDTO> downloadInvoiceFile(
+      @RequestHeader("x-merchant-id") String merchantId,
+      @PathVariable("pointOfSaleId") String pointOfSaleId,
+      @PathVariable("transactionId") String transactionId);
 }

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

@@ -1,5 +1,6 @@
 package it.gov.pagopa.idpay.transactions.controller;
 
+import it.gov.pagopa.idpay.transactions.dto.DownloadInvoiceResponseDTO;
 import it.gov.pagopa.idpay.transactions.dto.PointOfSaleTransactionsListDTO;
 import it.gov.pagopa.idpay.transactions.dto.mapper.PointOfSaleTransactionMapper;
 import it.gov.pagopa.idpay.transactions.service.PointOfSaleTransactionService;
@@ -40,4 +41,12 @@ public Mono<PointOfSaleTransactionsListDTO> getPointOfSaleTransactions(String me
                     page.getTotalPages()))
         );
   }
+
+  @Override
+  public Mono<DownloadInvoiceResponseDTO> downloadInvoiceFile(
+          String merchantId, String pointOfSaleId, String transactionId) {
+    log.info("[DOWNLOAD_TRANSACTION] Requested to download invoice for transaction {}",
+            Utilities.sanitizeString(transactionId));
+    return pointOfSaleTransactionService.downloadTransactionInvoice(merchantId, pointOfSaleId, transactionId);
+  }
 }

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

@@ -0,0 +1,14 @@
+package it.gov.pagopa.idpay.transactions.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DownloadInvoiceResponseDTO {
+  private String invoiceUrl;
+}

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

@@ -0,0 +1,20 @@
+package it.gov.pagopa.idpay.transactions.dto;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder(toBuilder = true)
+@FieldNameConstants()
+public class InvoiceFile {
+
+    private String filename;
+
+}

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

@@ -20,6 +20,7 @@ public class PointOfSaleTransactionDTO {
   String fiscalCode;
   Long effectiveAmountCents;
   Long rewardAmountCents;
+  Long authorizedAmountCents;
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   LocalDateTime trxDate;
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
@@ -28,4 +29,5 @@ public class PointOfSaleTransactionDTO {
   String status;
   String channel;
   Map<String, String> additionalProperties;
+  InvoiceFile invoiceFile;
 }

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

@@ -66,4 +66,5 @@ public class RewardTransactionDTO {
     private LocalDateTime elaborationDateTime;
     private String channel;
     private Map<String, String> additionalProperties;
+    private InvoiceFile invoiceFile;
 }

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

@@ -18,16 +18,29 @@ public PointOfSaleTransactionMapper(UserRestClient userRestClient) {
   }
 
   public Mono<PointOfSaleTransactionDTO> toDTO(RewardTransaction trx, String initiativeId, String fiscalCode) {
+
+    Long totalAmount = trx.getAmountCents();
+
+    Long rewardAmount = 0L;
+
+    if (trx.getRewards() != null && trx.getRewards().get(initiativeId) != null) {
+      rewardAmount = Math.abs(trx.getRewards().get(initiativeId).getAccruedRewardCents());
+    }
+
+    Long authorizedAmount = totalAmount - rewardAmount;
+
     PointOfSaleTransactionDTO dto = PointOfSaleTransactionDTO.builder()
         .trxId(trx.getId())
         .effectiveAmountCents(trx.getAmountCents())
-        .rewardAmountCents(trx.getRewards().get(initiativeId).getAccruedRewardCents())
+        .rewardAmountCents(rewardAmount)
+        .authorizedAmountCents(authorizedAmount)
         .trxDate(trx.getTrxDate())
         .elaborationDateTime(trx.getElaborationDateTime())
         .status(trx.getStatus())
         .channel(trx.getChannel())
         .fiscalCode(fiscalCode)
         .additionalProperties(trx.getAdditionalProperties())
+        .invoiceFile(trx.getInvoiceFile())
         .build();
 
     if (StringUtils.isNotBlank(fiscalCode)){

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

@@ -63,6 +63,7 @@ public RewardTransaction mapFromDTO(RewardTransactionDTO rewardTrxDto) {
             rewardTrx.setElaborationDateTime(rewardTrxDto.getElaborationDateTime());
             rewardTrx.setChannel(rewardTrxDto.getChannel());
             rewardTrx.setAdditionalProperties(rewardTrxDto.getAdditionalProperties());
+            rewardTrx.setInvoiceFile(rewardTrxDto.getInvoiceFile());
         }
 
         return rewardTrx;