diff --git a/src/main/java/io/craftgate/adapter/BkmExpressPaymentAdapter.java b/src/main/java/io/craftgate/adapter/BkmExpressPaymentAdapter.java index 0e472483..653a0db7 100644 --- a/src/main/java/io/craftgate/adapter/BkmExpressPaymentAdapter.java +++ b/src/main/java/io/craftgate/adapter/BkmExpressPaymentAdapter.java @@ -11,26 +11,9 @@ public BkmExpressPaymentAdapter(RequestOptions requestOptions) { super(requestOptions); } - public InitBkmExpressResponse init(InitBkmExpressRequest initBkmExpressRequest) { - String path = "/payment/v1/bkm-express/init"; - return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(initBkmExpressRequest, path, requestOptions), - initBkmExpressRequest, InitBkmExpressResponse.class); - } - - public PaymentResponse complete(CompleteBkmExpressRequest completeRequest) { - String path = "/payment/v1/bkm-express/complete"; - return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(completeRequest, path, requestOptions), - completeRequest, PaymentResponse.class); - } - - public PaymentResponse retrievePaymentByToken(String token) { - String path = "/payment/v1/bkm-express/" + token; - return HttpClient.get(requestOptions.getBaseUrl() + path, createHeaders(path, requestOptions), PaymentResponse.class); - } - public BkmExpressGenerateTokenResponse generateToken(BkmExpressGenerateTokenRequest bkmExpressGenerateTokenRequest) { String path = "/payment/v2/bkm-express/generate-token"; return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(bkmExpressGenerateTokenRequest, path, requestOptions), bkmExpressGenerateTokenRequest, BkmExpressGenerateTokenResponse.class); } -} \ No newline at end of file +} diff --git a/src/main/java/io/craftgate/model/PaymentAuthenticationType.java b/src/main/java/io/craftgate/model/PaymentAuthenticationType.java index ef4c3c14..f7502e6a 100644 --- a/src/main/java/io/craftgate/model/PaymentAuthenticationType.java +++ b/src/main/java/io/craftgate/model/PaymentAuthenticationType.java @@ -4,7 +4,6 @@ public enum PaymentAuthenticationType { THREE_DS, NON_THREE_DS, - BKM_EXPRESS, THREE_DS_FALLBACK_TO_NON_THREE_DS, GOOGLEPAY, APPLEPAY, diff --git a/src/main/java/io/craftgate/request/CompleteBkmExpressRequest.java b/src/main/java/io/craftgate/request/CompleteBkmExpressRequest.java deleted file mode 100644 index e8aade32..00000000 --- a/src/main/java/io/craftgate/request/CompleteBkmExpressRequest.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.craftgate.request; - -import lombok.*; -import lombok.experimental.SuperBuilder; -import lombok.EqualsAndHashCode; -import io.craftgate.request.common.BaseRequest; - -@Data -@SuperBuilder -@EqualsAndHashCode(callSuper = false) -public class CompleteBkmExpressRequest extends BaseRequest { - - private boolean status; - private String message; - private String ticketId; - private String bkmExpressPaymentToken; -} diff --git a/src/main/java/io/craftgate/request/InitBkmExpressRequest.java b/src/main/java/io/craftgate/request/InitBkmExpressRequest.java deleted file mode 100644 index 7a9fcc84..00000000 --- a/src/main/java/io/craftgate/request/InitBkmExpressRequest.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.craftgate.request; - -import io.craftgate.model.Currency; -import io.craftgate.model.PaymentGroup; -import io.craftgate.model.PaymentPhase; -import io.craftgate.request.common.BaseRequest; -import io.craftgate.request.dto.PaymentItem; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; -import java.util.List; - -@Data -@SuperBuilder -@EqualsAndHashCode(callSuper = false) -public class InitBkmExpressRequest extends BaseRequest { - - private BigDecimal price; - private BigDecimal paidPrice; - private PaymentGroup paymentGroup; - private String conversationId; - private PaymentPhase paymentPhase; - private List items; - private List enabledInstallments; - private Long buyerMemberId; - private Currency currency; - private String bankOrderId; -} diff --git a/src/main/java/io/craftgate/response/InitBkmExpressResponse.java b/src/main/java/io/craftgate/response/InitBkmExpressResponse.java deleted file mode 100644 index fdb5c8d2..00000000 --- a/src/main/java/io/craftgate/response/InitBkmExpressResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.craftgate.response; - -import lombok.Builder; -import lombok.Data; - -@Data -@Builder -public class InitBkmExpressResponse { - - private String id; - private String path; - private String token; -} diff --git a/src/main/java/io/craftgate/response/dto/BkmExpressToken.java b/src/main/java/io/craftgate/response/dto/BkmExpressToken.java deleted file mode 100644 index b38395af..00000000 --- a/src/main/java/io/craftgate/response/dto/BkmExpressToken.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.craftgate.response.dto; - -import lombok.Builder; -import lombok.Getter; - -@Getter -@Builder -public class BkmExpressToken { - - private String id; - private String path; - private String token; -} diff --git a/src/test/java/io/craftgate/sample/BkmExpressSample.java b/src/test/java/io/craftgate/sample/BkmExpressSample.java index abc6ce0a..3622bdf7 100644 --- a/src/test/java/io/craftgate/sample/BkmExpressSample.java +++ b/src/test/java/io/craftgate/sample/BkmExpressSample.java @@ -26,83 +26,6 @@ public class BkmExpressSample { private final Craftgate craftgate = new Craftgate("api-key", "secret-key", "https://sandbox-api.craftgate.io"); - @Test - void init_bkm_express() { - List items = new ArrayList<>(); - - items.add(PaymentItem.builder() - .name("item 1") - .externalId(UUID.randomUUID().toString()) - .price(BigDecimal.valueOf(0.3)) - .build()); - - items.add(PaymentItem.builder() - .name("item 2") - .externalId(UUID.randomUUID().toString()) - .price(BigDecimal.valueOf(0.5)) - .build()); - - items.add(PaymentItem.builder() - .name("item 3") - .externalId(UUID.randomUUID().toString()) - .price(BigDecimal.valueOf(0.2)) - .build()); - - InitBkmExpressRequest request = InitBkmExpressRequest.builder() - .price(BigDecimal.ONE) - .paidPrice(BigDecimal.ONE) - .paymentGroup(PaymentGroup.LISTING_OR_SUBSCRIPTION) - .conversationId("d1811bb0-25a2-40c7-ba71-c8b605259611") - .currency(Currency.TRY) - .items(items) - .paymentPhase(PaymentPhase.AUTH) - .build(); - - InitBkmExpressResponse response = craftgate.bkmExpressPaymentAdapter().init(request); - assertNotNull(response); - assertNotNull(response.getToken()); - assertNotNull(response.getPath()); - assertNotNull(response.getId()); - } - - @Test - void complete_bkm_express() { - - CompleteBkmExpressRequest completeBkmExpressRequest = CompleteBkmExpressRequest.builder() - .message("İşlem Başarılı") - .status(true) - .ticketId("dcfdc163-0545-46d7-8f86-5a11718e56ec") - .build(); - - PaymentResponse response = craftgate.bkmExpressPaymentAdapter().complete(completeBkmExpressRequest); - assertNotNull(response); - assertNotNull(response.getOrderId()); - } - - @Test - void complete_bkm_express_by_token() { - - CompleteBkmExpressRequest completeBkmExpressRequest = CompleteBkmExpressRequest.builder() - .message("İşlem Başarılı") - .status(true) - .ticketId("7c0f7c89-e954-46d5-ad37-2a5c0b5f0356") - .bkmExpressPaymentToken("23f4e147-2c4e-4a2c-8a67-9c783d813b79") - .build(); - - PaymentResponse response = craftgate.bkmExpressPaymentAdapter().complete(completeBkmExpressRequest); - assertNotNull(response); - assertNotNull(response.getOrderId()); - } - - @Test - void retrieve_bkm_express_payment_by_token() { - - String bkmExpressPaymentToken = "23f4e147-2c4e-4a2c-8a67-9c783d813b79"; - - PaymentResponse response = craftgate.bkmExpressPaymentAdapter().retrievePaymentByToken(bkmExpressPaymentToken); - assertNotNull(response); - } - @Test void generate_bkm_express_token() { BkmExpressGenerateTokenRequest request = BkmExpressGenerateTokenRequest.builder()