Merge pull request #17 from FIAP-3SOAT-G15/adjust-to-orders

Adjust orders
FIAP-3SOAT-G15 · May 20, 2024 · 1c6e27a · 1c6e27a
2 parents 1c5ae1c + d47633e
commit 1c6e27a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build, tag, and push docker image to Amazon ECR
-        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+        #if: github.ref == 'refs/heads/main' && github.event_name == 'push'
         env:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           ECR_REPOSITORY: ${{ vars.AWS_ECR_REPO_NAME }}

diff --git a/src/main/kotlin/com/fiap/payments/driver/database/provider/MercadoPagoPaymentProvider.kt b/src/main/kotlin/com/fiap/payments/driver/database/provider/MercadoPagoPaymentProvider.kt
@@ -25,14 +25,14 @@ class MercadoPagoPaymentProvider(
                         "by ${ paymentHTTPRequest.orderInfo.orderedBy }",
                     externalReference = paymentHTTPRequest.orderInfo.number.toString(),
                     notificationUrl = notificationUrl,
-                    totalAmount = paymentHTTPRequest.orderInfo.totalAmount,
+                    totalAmount = paymentHTTPRequest.orderInfo.total,
                     items = paymentHTTPRequest.orderInfo.lines.map { orderLine ->
                             MercadoPagoQRCodeOrderRequestItem(
                                 title = orderLine.name,
                                 unitPrice = orderLine.unitPrice,
                                 quantity = orderLine.quantity,
-                                unitMeasure = orderLine.unitOfMeasurement,
-                                totalAmount = orderLine.totalAmount,
+                                unitMeasure = DEFAULT_UNIT_OF_MEASUREMENT,
+                                totalAmount = orderLine.total,
                             )
                         },
                 ),
@@ -74,4 +74,8 @@ class MercadoPagoPaymentProvider(
         PAYMENT_IN_PROCESS("payment_in_process"),
         PAYMENT_REQUIRED("payment_required"),
     }
+
+    companion object {
+        const val DEFAULT_UNIT_OF_MEASUREMENT = "UNIT"
+    }
 }
diff --git a/src/main/kotlin/com/fiap/payments/driver/web/request/PaymentHTTPRequest.kt b/src/main/kotlin/com/fiap/payments/driver/web/request/PaymentHTTPRequest.kt
@@ -13,31 +13,36 @@ data class PaymentHTTPRequest(
 data class OrderInfo(
     @Schema(title = "Número de pedido", example = "1", required = true)
     val number: Long,
+
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @Schema(title = "Valor total", example = "10.00", required = true)
-    val totalAmount: BigDecimal,
+    val total: BigDecimal,
+
     @ArraySchema(
         schema = Schema(implementation = OrderLine::class, required = true),
         minItems = 1
     )
     val lines: List<OrderLine>,
+
     @Schema(title = "Data do pedido", example = "2024-05-19T11:00:00", required = true)
     val orderedAt: LocalDateTime,
+
     @Schema(title = "Solicitante", example = "John Doe", required = true)
     val orderedBy: String,
 )
 
 data class OrderLine(
     @Schema(title = "Nome do item de pedido", example = "Big Mac", required = true)
     val name: String,
+
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @Schema(title = "Valor unitário", example = "10.00", required = true)
     val unitPrice: BigDecimal,
+
     @Schema(title = "Quantidade", example = "1", required = true)
     val quantity: Long,
-    @Schema(title = "Unidade de medida", example = "UND", required = true)
-    val unitOfMeasurement: String,
+
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @Schema(title = "Valor total", example = "10.00", required = true)
-    val totalAmount: BigDecimal,
+    val total: BigDecimal,
 )
diff --git a/src/test/kotlin/com/fiap/payments/TestFixtures.kt b/src/test/kotlin/com/fiap/payments/TestFixtures.kt
@@ -30,13 +30,12 @@ fun createOrderInfo(
     number = number,
     orderedAt = orderedAt,
     orderedBy = orderedBy,
-    totalAmount = totalAmount,
+    total = totalAmount,
     lines = listOf(
         OrderLine(
             name = "Item 1",
             quantity = 1,
-            totalAmount = BigDecimal.valueOf(10),
-            unitOfMeasurement = "unit",
+            total = BigDecimal.valueOf(10),
             unitPrice = BigDecimal.valueOf(10),
         )
     )

diff --git a/src/test/kotlin/com/fiap/payments/adapter/gateway/impl/PaymentGatewayImplTest.kt b/src/test/kotlin/com/fiap/payments/adapter/gateway/impl/PaymentGatewayImplTest.kt
@@ -41,7 +41,7 @@ class PaymentGatewayImplTest {
 
         assertThat(result).containsExactlyInAnyOrderElementsOf(paymentEntities)
     }
-    
+
     @Test
     fun `should return existent payment`() {
         val paymentId = UUID.randomUUID().toString()
@@ -67,7 +67,7 @@ class PaymentGatewayImplTest {
     }
 
     @Nested
-    inner class Upsert {
+    inner class UpsertPayment {
 
         @Test
         fun `should insert new payment`() {
@@ -85,7 +85,7 @@ class PaymentGatewayImplTest {
 
         @Test
         fun `should update payment`() {
-            val oldPayment = createPayment(status = PaymentStatus.PENDING)
+            val oldPayment = createPayment(id = UUID.randomUUID().toString(), status = PaymentStatus.PENDING)
             val newPayment = oldPayment.copy(status = PaymentStatus.CONFIRMED)
             val oldPaymentDocument = oldPayment.toDocument()
             val newPaymentDocument = newPayment.toDocument()