Merge remote-tracking branch 'origin/uat'

# Conflicts:
#	src/main/java/it/gov/pagopa/idpay/transactions/controller/PointOfSaleTransactionControllerImpl.java
#	src/main/java/it/gov/pagopa/idpay/transactions/dto/RewardTransactionDTO.java
#	src/main/java/it/gov/pagopa/idpay/transactions/dto/mapper/RewardTransactionMapper.java
#	src/main/java/it/gov/pagopa/idpay/transactions/model/RewardTransaction.java
#	src/main/java/it/gov/pagopa/idpay/transactions/service/PointOfSaleTransactionServiceImpl.java
#	src/main/java/it/gov/pagopa/idpay/transactions/storage/InvoiceStorageClient.java
#	src/test/java/it/gov/pagopa/idpay/transactions/dto/mapper/RewardTransactionMapperTest.java
#	src/test/java/it/gov/pagopa/idpay/transactions/service/PointOfSaleTransactionServiceImplTest.java

Author: and-mora

pom.xml

@@ -54,6 +54,26 @@
 			<groupId>com.azure.spring</groupId>
 			<artifactId>spring-cloud-azure-starter-storage-blob</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-cache</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>it.ozimov</groupId>
+			<artifactId>embedded-redis</artifactId>
+			<version>0.7.3</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-simple</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
 		<!--3rd party library-->
 		<dependency>
@@ -126,6 +146,12 @@
 			<groupId>net.minidev</groupId>
 			<artifactId>json-smart</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>33.5.0-jre</version>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>

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

@@ -35,24 +35,22 @@ protected ResponseEntity<ErrorDTO> handleRequestValueException(
     protected ResponseEntity<ErrorDTO> handleException(RuntimeException error, ServerWebExchange exchange) {
         logClientException(error, exchange);
 
-        if(error instanceof ClientExceptionNoBody clientExceptionNoBody){
-            return ResponseEntity.status(clientExceptionNoBody.getHttpStatus()).build();
-        }
-        else {
-            ErrorDTO errorDTO;
-            HttpStatus httpStatus;
-            if (error instanceof ClientExceptionWithBody clientExceptionWithBody){
-                httpStatus=clientExceptionWithBody.getHttpStatus();
-                errorDTO = new ErrorDTO(clientExceptionWithBody.getCode(),  error.getMessage());
-            }
-            else {
-                httpStatus=HttpStatus.INTERNAL_SERVER_ERROR;
-                errorDTO = defaultErrorDTO;
-            }
-            return ResponseEntity.status(httpStatus)
-                    .contentType(MediaType.APPLICATION_JSON)
-                    .body(errorDTO);
-        }
+        return switch (error) {
+            case ClientExceptionNoBody clientExceptionNoBody ->
+                    buildResponseEntity(clientExceptionNoBody.getHttpStatus(), null);
+            case RewardBatchException rewardBatchException -> buildResponseEntity(rewardBatchException.getHttpStatus(),
+                    new ErrorDTO(rewardBatchException.getMessage(), rewardBatchException.getMessage()));
+            case ClientExceptionWithBody clientExceptionWithBody ->
+                    buildResponseEntity(clientExceptionWithBody.getHttpStatus(),
+                            new ErrorDTO(clientExceptionWithBody.getCode(), error.getMessage()));
+            case null, default -> buildResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR, defaultErrorDTO);
+        };
+    }
+
+    private ResponseEntity<ErrorDTO> buildResponseEntity(HttpStatus status, ErrorDTO errorDTO) {
+        return ResponseEntity.status(status)
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(errorDTO);
     }
 
     public static void logClientException(RuntimeException error, ServerWebExchange exchange) {

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

@@ -0,0 +1,24 @@
+package it.gov.pagopa.common.web.exception;
+
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+public class RewardBatchException extends RuntimeException{
+    private final HttpStatus httpStatus;
+    private final boolean printStackTrace;
+
+    public RewardBatchException(HttpStatus httpStatus, String message){
+        this(httpStatus, message, null);
+    }
+
+    public RewardBatchException(HttpStatus httpStatus, String message, Throwable ex){
+        this(httpStatus, message, false, ex);
+    }
+
+    public RewardBatchException(HttpStatus httpStatus, String message, boolean printStackTrace, Throwable ex){
+        super(message, ex);
+        this.httpStatus=httpStatus;
+        this.printStackTrace=printStackTrace;
+    }
+}

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

@@ -0,0 +1,12 @@
+package it.gov.pagopa.common.web.exception;
+
+public class RewardBatchNotFound extends ServiceException {
+
+  public RewardBatchNotFound(String code, String message) {
+    this(code, message, false, null);
+  }
+
+  public RewardBatchNotFound(String code, String message, boolean printStackTrace, Throwable ex) {
+    super(code, message, printStackTrace, ex);
+  }
+}

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

@@ -0,0 +1,19 @@
+package it.gov.pagopa.common.web.exception;
+
+import lombok.Getter;
+
+@Getter
+public class ServiceException extends RuntimeException {
+  private final String code;
+  private final boolean printStackTrace;
+
+  public ServiceException(String code, String message) {
+    this(code, message, false, null);
+  }
+
+  public ServiceException(String code, String message, boolean printStackTrace, Throwable ex) {
+    super(message, ex);
+    this.code = code;
+    this.printStackTrace = printStackTrace;
+  }
+}

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

@@ -0,0 +1,42 @@
+package it.gov.pagopa.common.web.exception;
+
+import it.gov.pagopa.common.web.dto.ErrorDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.server.ServerWebExchange;
+
+import java.util.Map;
+
+@RestControllerAdvice
+@Slf4j
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class ServiceExceptionHandler {
+  private final ErrorManager errorManager;
+  private final Map<Class<? extends ServiceException>, HttpStatus> transcodeMap;
+
+  public ServiceExceptionHandler(ErrorManager errorManager, Map<Class<? extends ServiceException>, HttpStatus> transcodeMap) {
+    this.errorManager = errorManager;
+    this.transcodeMap = transcodeMap;
+  }
+
+  @ExceptionHandler(ServiceException.class)
+  protected ResponseEntity<ErrorDTO> handleException(ServiceException error, ServerWebExchange request) {
+    return errorManager.handleException(transcodeException(error), request);
+  }
+
+  private ClientException transcodeException(ServiceException error) {
+    HttpStatus httpStatus = transcodeMap.get(error.getClass());
+
+    if (httpStatus == null) {
+      log.warn("Unhandled exception: {}", error.getClass().getName());
+      httpStatus = HttpStatus.INTERNAL_SERVER_ERROR;
+    }
+
+    return new ClientExceptionWithBody(httpStatus, error.getCode(), error.getMessage(), error.isPrintStackTrace(), error);
+  }
+}

src/main/java/it/gov/pagopa/idpay/transactions/IdpayTransactionsApplication.java

@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 
 @SpringBootApplication(scanBasePackages = "it.gov.pagopa")
+@EnableCaching
 public class IdpayTransactionsApplication {
 
 	public static void main(String[] args) {

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

@@ -0,0 +1,29 @@
+package it.gov.pagopa.idpay.transactions.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import it.gov.pagopa.idpay.transactions.connector.rest.dto.PointOfSaleDTO;
+import java.time.Duration;
+import org.springframework.boot.autoconfigure.cache.RedisCacheManagerBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair;
+
+@Configuration
+public class RedisConfig {
+  @Bean
+  public RedisCacheManagerBuilderCustomizer redisCacheManagerBuilderCustomizer() {
+
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.findAndRegisterModules();
+
+    Jackson2JsonRedisSerializer<PointOfSaleDTO> serializer = new Jackson2JsonRedisSerializer<>(mapper, PointOfSaleDTO.class);
+
+    return builder -> builder
+        .withCacheConfiguration("getPointOfSale",
+            RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofDays(1))
+                .serializeValuesWith(
+                    SerializationPair.fromSerializer(serializer)));
+  }
+}

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

@@ -0,0 +1,23 @@
+package it.gov.pagopa.idpay.transactions.config;
+
+import it.gov.pagopa.common.web.exception.RewardBatchNotFound;
+import it.gov.pagopa.common.web.exception.ServiceException;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+public class ServiceExceptionConfig {
+    @Bean
+    public Map<Class<? extends ServiceException>, HttpStatus> serviceExceptionMapper() {
+        Map<Class<? extends ServiceException>, HttpStatus> exceptionMap = new HashMap<>();
+
+        // BadRequest
+        exceptionMap.put(RewardBatchNotFound.class, HttpStatus.BAD_REQUEST);
+
+        return exceptionMap;
+    }
+}

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

@@ -0,0 +1,10 @@
+package it.gov.pagopa.idpay.transactions.connector.rest;
+
+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);
+
+}