Merge pull request #252 from mercadopago/feature/fine-discount-and-3ds

Improvements for boleto (fees, fines and discount) and credit card payments (3DS 2.0)

.pre-commit-config.yaml

@@ -10,4 +10,4 @@ repos:
       - id: checkstyle
         args:
           - -c
-          - .code_quality/checkstyle_rules.xml
+          - .code_quality/checkstyle_rules.xml

README.md

@@ -21,7 +21,7 @@ already.
 <dependency>
     <groupId>com.mercadopago</groupId>
     <artifactId>sdk-java</artifactId>
-    <version>2.1.5</version>
+    <version>2.1.6</version>
 </dependency>
   ```
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.mercadopago</groupId>
     <artifactId>sdk-java</artifactId>
-    <version>2.1.5</version>
+    <version>2.1.6</version>
     <packaging>jar</packaging>
 
     <name>Mercadopago SDK</name>

src/main/java/com/mercadopago/MercadoPagoConfig.java

@@ -15,7 +15,7 @@
 /** Mercado Pago configuration class. */
 public class MercadoPagoConfig {
 
-  public static final String CURRENT_VERSION = "2.1.5";
+  public static final String CURRENT_VERSION = "2.1.6";
 
   public static final String PRODUCT_ID = "BC32A7VTRPP001U8NHJ0";
 

src/main/java/com/mercadopago/client/payment/PaymentCreateRequest.java

@@ -109,4 +109,10 @@ public class PaymentCreateRequest {
 
   /** Taxes for payments. */
   private final List<PaymentTaxRequest> taxes;
+
+  /** Payment Method. */
+  private final PaymentMethodRequest paymentMethod;
+
+  /** 3DS. */
+  private final String threeDSecureMode;
 }

src/main/java/com/mercadopago/client/payment/PaymentDataRequest.java

@@ -0,0 +1,13 @@
+package com.mercadopago.client.payment;
+
+import lombok.Builder;
+import lombok.Getter;
+
+/** PaymentDataRequest class. */
+@Getter
+@Builder
+public class PaymentDataRequest {
+
+  /** Rules. */
+  private final PaymentRulesRequest rules;
+}

src/main/java/com/mercadopago/client/payment/PaymentDiscountRequest.java

@@ -0,0 +1,21 @@
+package com.mercadopago.client.payment;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Builder;
+import lombok.Getter;
+
+/** PaymentDiscountRequest class. */
+@Getter
+@Builder
+public class PaymentDiscountRequest {
+
+  /** Discount type. */
+  private String type;
+
+  /** Discount value. */
+  private BigDecimal value;
+
+  /** Discount Limit Date. */
+  private LocalDate limitDate;
+}

src/main/java/com/mercadopago/client/payment/PaymentFeeRequest.java

@@ -0,0 +1,17 @@
+package com.mercadopago.client.payment;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+
+/** PaymentFeeRequest class. */
+@Getter
+@Builder
+public class PaymentFeeRequest {
+
+  /** Fee type. */
+  private String type;
+
+  /** Fee value. */
+  private BigDecimal value;
+}

src/main/java/com/mercadopago/client/payment/PaymentMethodRequest.java

@@ -0,0 +1,13 @@
+package com.mercadopago.client.payment;
+
+import lombok.Builder;
+import lombok.Getter;
+
+/** PaymentMethodRequest class. */
+@Getter
+@Builder
+public class PaymentMethodRequest {
+
+  /** Data. */
+  private final PaymentDataRequest data;
+}

src/main/java/com/mercadopago/client/payment/PaymentPointOfInteractionRequest.java

@@ -7,6 +7,10 @@
 @Getter
 @Builder
 public class PaymentPointOfInteractionRequest {
+
   /** Linked to information. */
   private final String linkedTo;
+
+  /** Type. */
+  private final String type;
 }

src/main/java/com/mercadopago/client/payment/PaymentRulesRequest.java

@@ -0,0 +1,20 @@
+package com.mercadopago.client.payment;
+
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+/** PaymentRulesRequest class. */
+@Getter
+@Builder
+public class PaymentRulesRequest {
+
+  /** Discounts. */
+  private List<PaymentDiscountRequest> discounts;
+
+  /** Fine. */
+  private PaymentFeeRequest fine;
+
+  /** Interest. */
+  private PaymentFeeRequest interest;
+}

src/main/java/com/mercadopago/resources/payment/Payment.java

@@ -1,5 +1,6 @@
 package com.mercadopago.resources.payment;
 
+import com.google.gson.annotations.SerializedName;
 import com.mercadopago.net.MPResource;
 import java.math.BigDecimal;
 import java.time.OffsetDateTime;
@@ -185,4 +186,17 @@ public class Payment extends MPResource {
 
   /** Point of interaction. */
   private PaymentPointOfInteraction pointOfInteraction;
+
+  /** PaymentMethod. */
+  private PaymentMethod paymentMethod;
+
+  /** 3DS Info. */
+  @SerializedName("three_dsinfo")
+  private PaymentThreeDSInfo threeDSInfo;
+
+  /**
+   * Internal data that can be attached to the payment to record additional attributes of the
+   * merchant.
+   */
+  private Map<String, Object> internalMetadata;
 }

src/main/java/com/mercadopago/resources/payment/PaymentData.java

@@ -0,0 +1,11 @@
+package com.mercadopago.resources.payment;
+
+import lombok.Getter;
+
+/** PaymentData class. */
+@Getter
+public class PaymentData {
+
+  /** PaymentRules. */
+  private PaymentRules rules;
+}

src/main/java/com/mercadopago/resources/payment/PaymentDiscount.java

@@ -0,0 +1,19 @@
+package com.mercadopago.resources.payment;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+
+/** PaymentDiscount class. */
+@Getter
+public class PaymentDiscount {
+
+  /** Discount type. */
+  private String type;
+
+  /** Discount value. */
+  private BigDecimal value;
+
+  /** Discount Limit Date. */
+  private LocalDate limitDate;
+}

src/main/java/com/mercadopago/resources/payment/PaymentFee.java

@@ -0,0 +1,15 @@
+package com.mercadopago.resources.payment;
+
+import java.math.BigDecimal;
+import lombok.Getter;
+
+/** PaymentFee class. */
+@Getter
+public class PaymentFee {
+
+  /** Fee type. */
+  private String type;
+
+  /** Fee value. */
+  private BigDecimal value;
+}

src/main/java/com/mercadopago/resources/payment/PaymentMethod.java

@@ -0,0 +1,11 @@
+package com.mercadopago.resources.payment;
+
+import lombok.Getter;
+
+/** PaymentMethod class. */
+@Getter
+public class PaymentMethod {
+
+  /** PaymentData. */
+  private PaymentData data;
+}

src/main/java/com/mercadopago/resources/payment/PaymentRules.java

@@ -0,0 +1,18 @@
+package com.mercadopago.resources.payment;
+
+import java.util.List;
+import lombok.Getter;
+
+/** PaymentRules class. */
+@Getter
+public class PaymentRules {
+
+  /** Discounts. */
+  private List<PaymentDiscount> discounts;
+
+  /** Fine. */
+  private PaymentFee fine;
+
+  /** Interest. */
+  private PaymentFee interest;
+}

src/main/java/com/mercadopago/resources/payment/PaymentThreeDSInfo.java

@@ -0,0 +1,13 @@
+package com.mercadopago.resources.payment;
+
+import lombok.Getter;
+
+/** 3DS Info. */
+@Getter
+public class PaymentThreeDSInfo {
+  /** External Resource Url. */
+  private String externalResourceUrl;
+
+  /** creq. */
+  private String creq;
+}

src/main/java/com/mercadopago/serialization/Serializer.java

@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.Type;
+import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -73,6 +74,15 @@ private static OffsetDateTime parseDateTime(JsonElement json) {
                       new JsonPrimitive(
                           DateTimeFormatter.ofPattern(SERIALIZE_DATE_FORMAT_ISO8601)
                               .format(offsetDateTime)))
+          .registerTypeAdapter(
+              LocalDate.class,
+              (JsonSerializer<LocalDate>)
+                  (localDate, type, context) ->
+                      new JsonPrimitive(localDate.format(DateTimeFormatter.ISO_LOCAL_DATE)))
+          .registerTypeAdapter(
+              LocalDate.class,
+              (JsonDeserializer<LocalDate>)
+                  (localDate, type, context) -> LocalDate.parse(localDate.getAsString()))
           .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
           .create();
 

src/test/java/com/mercadopago/client/payment/PaymentClientIT.java

@@ -22,6 +22,7 @@
 import com.mercadopago.resources.payment.Payment;
 import com.mercadopago.resources.payment.PaymentRefund;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
@@ -430,6 +431,32 @@ private PaymentCreateRequest newPayment(String paymentStatus) throws MPException
             .ipAddress("127.0.0.1")
             .build();
 
+    PaymentFeeRequest fine =
+        PaymentFeeRequest.builder().type("percentage").value(new BigDecimal(2)).build();
+
+    PaymentFeeRequest interest =
+        PaymentFeeRequest.builder().type("percentage").value(new BigDecimal("0.03")).build();
+
+    PaymentDiscountRequest discount =
+        PaymentDiscountRequest.builder()
+            .type("fixed")
+            .value(new BigDecimal(5))
+            .limitDate(LocalDate.of(2022, 10, 25))
+            .build();
+
+    List<PaymentDiscountRequest> discounts = new ArrayList<>();
+    discounts.add(discount);
+
+    PaymentRulesRequest rules =
+        PaymentRulesRequest.builder().fine(fine).interest(interest).discounts(discounts).build();
+
+    PaymentDataRequest data = PaymentDataRequest.builder().rules(rules).build();
+
+    PaymentMethodRequest paymentMethod = PaymentMethodRequest.builder().data(data).build();
+
+    PaymentPointOfInteractionRequest pointOfInteraction =
+        PaymentPointOfInteractionRequest.builder().type("TYPE").build();
+
     return PaymentCreateRequest.builder()
         .transactionAmount(new BigDecimal("100"))
         .token(cardToken.getId())
@@ -439,6 +466,8 @@ private PaymentCreateRequest newPayment(String paymentStatus) throws MPException
         .metadata(new HashMap<>())
         .paymentMethodId("master")
         .additionalInfo(additionalInfo)
+        .pointOfInteraction(pointOfInteraction)
+        .paymentMethod(paymentMethod)
         .build();
   }
 }