Merge pull request #7 from 7SOATSquad30/fix/payments-integration

fix: payments integration
7SOATSquad30 · Dec 4, 2024 · 7096444 · 7096444
2 parents 8af60d3 + 7153356
commit 7096444
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/src/main/java/br/com/fiap/grupo30/fastfood/order_api/domain/PaymentStatus.java b/src/main/java/br/com/fiap/grupo30/fastfood/order_api/domain/PaymentStatus.java
@@ -1,8 +1,7 @@
 package br.com.fiap.grupo30.fastfood.order_api.domain;
 
 public enum PaymentStatus {
-    NOT_SUBMITTED,
-    PROCESSING,
+    PENDING,
     REJECTED,
     COLLECTED,
 }
diff --git a/src/main/java/br/com/fiap/grupo30/fastfood/order_api/domain/entities/Payment.java b/src/main/java/br/com/fiap/grupo30/fastfood/order_api/domain/entities/Payment.java
@@ -14,7 +14,7 @@ public class Payment {
     private Double amount;
 
     public static Payment create() {
-        return new Payment(PaymentStatus.NOT_SUBMITTED, 0.0);
+        return new Payment(PaymentStatus.PENDING, 0.0);
     }
 
     public static Payment create(PaymentStatus status, Double amount) {

diff --git a/...n/java/br/com/fiap/grupo30/fastfood/order_api/domain/usecases/payment/PaymentUseCase.java b/...n/java/br/com/fiap/grupo30/fastfood/order_api/domain/usecases/payment/PaymentUseCase.java
@@ -14,7 +14,7 @@ public class PaymentUseCase {
     private String paymentsApiEndpoint;
 
     public Payment findPaymentStateByOrderId(Long orderId) {
-        String uri = this.paymentsApiEndpoint + "/paytments/" + orderId;
+        String uri = this.paymentsApiEndpoint + "/payments/" + orderId;
         RestTemplate restTemplate = new RestTemplate();
         ResponseEntity<PaymentDTO> response = restTemplate.getForEntity(uri, PaymentDTO.class);
         PaymentDTO result = response.getBody();

diff --git a/...po30/fastfood/order_api/presentation/controllers/exceptions/ResourceExceptionHandler.java b/...po30/fastfood/order_api/presentation/controllers/exceptions/ResourceExceptionHandler.java
@@ -8,6 +8,7 @@
 import br.com.fiap.grupo30.fastfood.order_api.presentation.presenters.exceptions.DatabaseException;
 import br.com.fiap.grupo30.fastfood.order_api.presentation.presenters.exceptions.InvalidCpfException;
 import br.com.fiap.grupo30.fastfood.order_api.presentation.presenters.exceptions.InvalidOrderStatusException;
+import br.com.fiap.grupo30.fastfood.order_api.presentation.presenters.exceptions.OrderPaymentIsStillPendingException;
 import br.com.fiap.grupo30.fastfood.order_api.presentation.presenters.exceptions.ResourceNotFoundException;
 import jakarta.servlet.http.HttpServletRequest;
 import java.time.Instant;
@@ -155,4 +156,17 @@ public ResponseEntity<StandardError> invalidCpf(
         err.setPath(request.getRequestURI());
         return ResponseEntity.status(status).body(err);
     }
+
+    @ExceptionHandler(OrderPaymentIsStillPendingException.class)
+    public ResponseEntity<StandardError> invalidCpf(
+            OrderPaymentIsStillPendingException e, HttpServletRequest request) {
+        HttpStatus status = HttpStatus.BAD_REQUEST;
+        StandardError err = new StandardError();
+        err.setTimestamp(Instant.now());
+        err.setStatus(status.value());
+        err.setError("Order payment is still pending");
+        err.setMessage(e.getMessage());
+        err.setPath(request.getRequestURI());
+        return ResponseEntity.status(status).body(err);
+    }
 }