Merge pull request #30 from PhonePe/create_sdk_order_update

Added Additional Parameter in CreateSdkOrderRequest and StandardCheckoutPayRequest classes

Author: sk4x0r

README.md

@@ -1,6 +1,6 @@
 # PhonePe B2B Payment Gateway SDK for Java
 
-[![Maven Central](https://img.shields.io/badge/Maven%20Central-v2.1.8-blue)](https://maven-badges.herokuapp.com/maven-central/com.phonepe/pg-sdk-java)
+[![Maven Central](https://img.shields.io/badge/Maven%20Central-v2.2.0-blue)](https://maven-badges.herokuapp.com/maven-central/com.phonepe/pg-sdk-java)
 ![Java](https://img.shields.io/badge/Java-17%2B-orange)
 [![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](LICENSE)
 
@@ -36,7 +36,7 @@ Add the dependency to your project's POM file:
 <dependency>
     <groupId>com.phonepe</groupId>
     <artifactId>pg-sdk-java</artifactId>
-    <version>2.1.8</version>
+    <version>2.2.0</version>
 </dependency>
 ```
 
@@ -46,7 +46,7 @@ Add the following to your project's build.gradle file:
 
 ```gradle
 dependencies {
-    implementation 'com.phonepe:pg-sdk-java:2.1.8'
+    implementation 'com.phonepe:pg-sdk-java:2.2.0'
 }
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.phonepe</groupId>
     <artifactId>pg-sdk-java</artifactId>
-    <version>2.1.8</version>
+    <version>2.2.0</version>
     <name>B2B JAVA SDK</name>
     <url>https://github.com/PhonePe/phonepe-pg-sdk-java</url>
     <description>Phonepe PG JAVA SDK</description>

src/main/java/com/phonepe/sdk/pg/payments/v2/models/request/CreateSdkOrderRequest.java

@@ -56,7 +56,8 @@ public CreateSdkOrderRequest(
             String message,
             String redirectUrl,
             Long expireAfter,
-            Boolean disablePaymentRetry) {
+            Boolean disablePaymentRetry,
+            PaymentModeConfig paymentModeConfig) {
         this.merchantOrderId = merchantOrderId;
         this.amount = amount;
         this.metaInfo = metaInfo;
@@ -66,6 +67,7 @@ public CreateSdkOrderRequest(
         this.setPaymentFlow(
                 PgCheckoutPaymentFlow.builder()
                         .message(message)
+                        .paymentModeConfig(paymentModeConfig)
                         .merchantUrls(merchantUrls)
                         .build());
     }

src/main/java/com/phonepe/sdk/pg/payments/v2/models/request/StandardCheckoutPayRequest.java

@@ -31,6 +31,7 @@ public class StandardCheckoutPayRequest {
     private MetaInfo metaInfo;
     private PaymentFlow paymentFlow;
     private Long expireAfter;
+    private Boolean disablePaymentRetry;
 
     /**
      * Builds Standard Checkout Pay Request
@@ -49,7 +50,8 @@ public StandardCheckoutPayRequest(
             MetaInfo metaInfo,
             String message,
             Long expireAfter,
-            PaymentModeConfig paymentModeConfig) {
+            PaymentModeConfig paymentModeConfig,
+            Boolean disablePaymentRetry) {
         this.merchantOrderId = merchantOrderId;
         this.amount = amount;
         this.metaInfo = metaInfo;
@@ -61,5 +63,6 @@ public StandardCheckoutPayRequest(
                         .merchantUrls(merchantUrls)
                         .paymentModeConfig(paymentModeConfig)
                         .build());
+        this.disablePaymentRetry = disablePaymentRetry;
     }
 }

src/test/CreateOrderTest.java

@@ -18,12 +18,19 @@
 import com.google.common.collect.Maps;
 import com.phonepe.sdk.pg.common.exception.PhonePeException;
 import com.phonepe.sdk.pg.common.http.PhonePeResponse;
+import com.phonepe.sdk.pg.common.models.request.paymentmodeconstraints.CardPaymentModeConstraint;
+import com.phonepe.sdk.pg.common.models.request.paymentmodeconstraints.CardType;
+import com.phonepe.sdk.pg.common.models.request.paymentmodeconstraints.UpiIntentPaymentModeConstraint;
 import com.phonepe.sdk.pg.payments.v2.customcheckout.CustomCheckoutConstants;
 import com.phonepe.sdk.pg.payments.v2.models.request.CreateSdkOrderRequest;
+import com.phonepe.sdk.pg.payments.v2.models.request.PaymentModeConfig;
+import com.phonepe.sdk.pg.payments.v2.models.request.PgCheckoutPaymentFlow;
 import com.phonepe.sdk.pg.payments.v2.models.response.CreateSdkOrderResponse;
 import com.phonepe.sdk.pg.payments.v2.standardcheckout.StandardCheckoutConstants;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
@@ -316,4 +323,85 @@ void testCreateOrderCustomCheckoutWithDisablePaymentRetryNull() {
         Assertions.assertEquals(actual, createSdkOrderResponse);
         Assertions.assertNull(createSdkOrderRequest.getDisablePaymentRetry());
     }
+
+    @Test
+    void testCreateOrderWithPaymentModeConfig() {
+        String redirectUrl = "https://google.com";
+        PaymentModeConfig paymentModeConfig =
+                PaymentModeConfig.builder()
+                        .enabledPaymentModes(List.of(
+                                CardPaymentModeConstraint.builder().cardTypes(Set.of(CardType.CREDIT_CARD)).build(),
+                                UpiIntentPaymentModeConstraint.builder().build()))
+                        .build();
+
+        CreateSdkOrderRequest createSdkOrderRequest =
+                CreateSdkOrderRequest.StandardCheckoutBuilder()
+                        .merchantOrderId(merchantOrderId)
+                        .amount(amount)
+                        .redirectUrl(redirectUrl)
+                        .paymentModeConfig(paymentModeConfig)
+                        .build();
+        final String url = StandardCheckoutConstants.CREATE_ORDER_API;
+        CreateSdkOrderResponse createSdkOrderResponse =
+                CreateSdkOrderResponse.builder()
+                        .expireAt(1432423)
+                        .orderId("orderId")
+                        .token("token")
+                        .state("PENDING")
+                        .build();
+
+        addStubForPostRequest(
+                url,
+                getHeaders(),
+                createSdkOrderRequest,
+                HttpStatus.SC_OK,
+                Maps.newHashMap(),
+                createSdkOrderResponse);
+
+        CreateSdkOrderResponse actual =
+                standardCheckoutClient.createSdkOrder(createSdkOrderRequest);
+        Assertions.assertEquals(actual, createSdkOrderResponse);
+        PgCheckoutPaymentFlow pgCheckoutPaymentFlow = (PgCheckoutPaymentFlow)createSdkOrderRequest.getPaymentFlow();
+        Assertions.assertNotNull(pgCheckoutPaymentFlow.getPaymentModeConfig());
+        Assertions.assertEquals(
+                paymentModeConfig.getEnabledPaymentModes(),
+                pgCheckoutPaymentFlow.getPaymentModeConfig().getEnabledPaymentModes());
+        Assertions.assertEquals(
+                paymentModeConfig.getDisabledPaymentModes(),
+                pgCheckoutPaymentFlow.getPaymentModeConfig().getDisabledPaymentModes());
+    }
+
+    @Test
+    void testCreateOrderWithNullPaymentModeConfig() {
+        String redirectUrl = "https://google.com";
+
+        CreateSdkOrderRequest createSdkOrderRequest =
+                CreateSdkOrderRequest.StandardCheckoutBuilder()
+                        .merchantOrderId(merchantOrderId)
+                        .amount(amount)
+                        .redirectUrl(redirectUrl)
+                        .build();
+        final String url = StandardCheckoutConstants.CREATE_ORDER_API;
+        CreateSdkOrderResponse createSdkOrderResponse =
+                CreateSdkOrderResponse.builder()
+                        .expireAt(1432423)
+                        .orderId("orderId")
+                        .token("token")
+                        .state("PENDING")
+                        .build();
+
+        addStubForPostRequest(
+                url,
+                getHeaders(),
+                createSdkOrderRequest,
+                HttpStatus.SC_OK,
+                Maps.newHashMap(),
+                createSdkOrderResponse);
+
+        CreateSdkOrderResponse actual =
+                standardCheckoutClient.createSdkOrder(createSdkOrderRequest);
+        Assertions.assertEquals(actual, createSdkOrderResponse);
+        PgCheckoutPaymentFlow pgCheckoutPaymentFlow = (PgCheckoutPaymentFlow)createSdkOrderRequest.getPaymentFlow();
+        Assertions.assertNull(pgCheckoutPaymentFlow.getPaymentModeConfig());
+    }
 }

src/test/PayTest.java

@@ -162,4 +162,105 @@ void testCustomPay() {
         PgPaymentResponse actual = customCheckoutClient.pay(request);
         Assertions.assertEquals(pgPaymentResponse, actual);
     }
+
+    @SneakyThrows
+    @Test
+    void testStandardCheckoutPayWithDisablePaymentRetryTrue() {
+        final String url = StandardCheckoutConstants.PAY_API;
+        String redirectUrl = "https://redirectUrl.com";
+
+        StandardCheckoutPayRequest standardCheckoutPayRequest =
+                StandardCheckoutPayRequest.builder()
+                        .merchantOrderId(merchantOrderId)
+                        .amount(amount)
+                        .disablePaymentRetry(true)
+                        .redirectUrl(redirectUrl)
+                        .build();
+        StandardCheckoutPayResponse standardCheckoutResponse =
+                StandardCheckoutPayResponse.builder()
+                        .orderId(String.valueOf(java.time.Instant.now().getEpochSecond()))
+                        .state("PENDING")
+                        .expireAt(java.time.Instant.now().getEpochSecond())
+                        .redirectUrl("https://google.com")
+                        .build();
+        Map<String, String> headers = getHeaders();
+
+        addStubForPostRequest(
+                url,
+                headers,
+                standardCheckoutPayRequest,
+                HttpStatus.SC_OK,
+                Maps.newHashMap(),
+                standardCheckoutResponse);
+        StandardCheckoutPayResponse actual = standardCheckoutClient.pay(standardCheckoutPayRequest);
+        Assertions.assertEquals(standardCheckoutResponse, actual);
+        Assertions.assertTrue(standardCheckoutPayRequest.getDisablePaymentRetry());
+    }
+
+    @SneakyThrows
+    @Test
+    void testStandardCheckoutPayWithDisablePaymentRetryFalse() {
+        final String url = StandardCheckoutConstants.PAY_API;
+        String redirectUrl = "https://redirectUrl.com";
+
+        StandardCheckoutPayRequest standardCheckoutPayRequest =
+                StandardCheckoutPayRequest.builder()
+                        .merchantOrderId(merchantOrderId)
+                        .amount(amount)
+                        .disablePaymentRetry(false)
+                        .redirectUrl(redirectUrl)
+                        .build();
+        StandardCheckoutPayResponse standardCheckoutResponse =
+                StandardCheckoutPayResponse.builder()
+                        .orderId(String.valueOf(java.time.Instant.now().getEpochSecond()))
+                        .state("PENDING")
+                        .expireAt(java.time.Instant.now().getEpochSecond())
+                        .redirectUrl("https://google.com")
+                        .build();
+        Map<String, String> headers = getHeaders();
+
+        addStubForPostRequest(
+                url,
+                headers,
+                standardCheckoutPayRequest,
+                HttpStatus.SC_OK,
+                Maps.newHashMap(),
+                standardCheckoutResponse);
+        StandardCheckoutPayResponse actual = standardCheckoutClient.pay(standardCheckoutPayRequest);
+        Assertions.assertEquals(standardCheckoutResponse, actual);
+        Assertions.assertFalse(standardCheckoutPayRequest.getDisablePaymentRetry());
+    }
+
+    @SneakyThrows
+    @Test
+    void testStandardCheckoutPayWithDisablePaymentRetryNull() {
+        final String url = StandardCheckoutConstants.PAY_API;
+        String redirectUrl = "https://redirectUrl.com";
+
+        StandardCheckoutPayRequest standardCheckoutPayRequest =
+                StandardCheckoutPayRequest.builder()
+                        .merchantOrderId(merchantOrderId)
+                        .amount(amount)
+                        .redirectUrl(redirectUrl)
+                        .build();
+        StandardCheckoutPayResponse standardCheckoutResponse =
+                StandardCheckoutPayResponse.builder()
+                        .orderId(String.valueOf(java.time.Instant.now().getEpochSecond()))
+                        .state("PENDING")
+                        .expireAt(java.time.Instant.now().getEpochSecond())
+                        .redirectUrl("https://google.com")
+                        .build();
+        Map<String, String> headers = getHeaders();
+
+        addStubForPostRequest(
+                url,
+                headers,
+                standardCheckoutPayRequest,
+                HttpStatus.SC_OK,
+                Maps.newHashMap(),
+                standardCheckoutResponse);
+        StandardCheckoutPayResponse actual = standardCheckoutClient.pay(standardCheckoutPayRequest);
+        Assertions.assertEquals(standardCheckoutResponse, actual);
+        Assertions.assertNull(standardCheckoutPayRequest.getDisablePaymentRetry());
+    }
 }

src/test/headers/HeadersTest.java

@@ -34,7 +34,7 @@ void testSDKVersionIsLoadedFromProperties() {
     }
 
     /**
-     * Test that SDK_VERSION follows semantic versioning format (e.g., 2.1.8)
+     * Test that SDK_VERSION follows semantic versioning format
      */
     @Test
     void testSDKVersionFormat() {