Fix id typing

SimPaypl · Mar 24, 2022 · 6db17a4 · 6db17a4
1 parent 3c49d4a
commit 6db17a4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'pl.simpay'
-version '1.0'
+version '2.1'
 sourceCompatibility = '17'
 
 repositories {

diff --git a/...ava/pl/simpay/api/model/directBilling/transaction/DirectBillingTransactionDetailsDTO.java b/...ava/pl/simpay/api/model/directBilling/transaction/DirectBillingTransactionDetailsDTO.java
@@ -4,7 +4,7 @@
 
 import java.time.LocalDateTime;
 
-public record DirectBillingTransactionDetailsDTO(int id, TransactionStatus status, String phoneNumber, double value,
+public record DirectBillingTransactionDetailsDTO(String id, TransactionStatus status, String phoneNumber, double value,
                                                  @Json(name = "value_netto") double netValue, Operator operator,
                                                  @Json(name = "notify") Notification notification,
                                                  @Json(name = "created_at") LocalDateTime createdAt,

diff --git a/...l/simpay/api/model/directBilling/transaction/DirectBillingTransactionNotificationDTO.java b/...l/simpay/api/model/directBilling/transaction/DirectBillingTransactionNotificationDTO.java
@@ -4,13 +4,13 @@
 import pl.simpay.api.model.request.RedirectURL;
 
 public record DirectBillingTransactionNotificationDTO(
-        int id,
+        String id,
         @Json(name = "service_id") int serviceId,
         TransactionStatus status,
         Values values,
         RedirectURL returns,
         String control,
-        String number,
+        @Json(name = "number_from") String numberFrom,
         int provider,
         String signature
 ) {

diff --git a/...main/java/pl/simpay/api/model/directBilling/transaction/DirectBillingTransactionsDTO.java b/...main/java/pl/simpay/api/model/directBilling/transaction/DirectBillingTransactionsDTO.java
@@ -5,7 +5,7 @@
 import java.time.LocalDateTime;
 
 public record DirectBillingTransactionsDTO(
-        int id,
+        String id,
         TransactionStatus status,
         double value,
         @Json(name = "value_netto") double netValue,

diff --git a/src/main/java/pl/simpay/api/payments/DirectBilling.java b/src/main/java/pl/simpay/api/payments/DirectBilling.java
@@ -64,8 +64,8 @@ public PaginatedResponse<Set<DirectBillingTransactionsDTO>> getTransactions(int
         return (PaginatedResponse<Set<DirectBillingTransactionsDTO>>) restService.sendGetRequest(endpoint, parameterizedType);
     }
 
-    public Response<DirectBillingTransactionDetailsDTO> getTransactionDetails(int serviceId, int transactionId) {
-        var endpoint = String.format("/directbilling/%d/transactions/%d", serviceId, transactionId);
+    public Response<DirectBillingTransactionDetailsDTO> getTransactionDetails(int serviceId, String transactionId) {
+        var endpoint = String.format("/directbilling/%d/transactions/%s", serviceId, transactionId);
         var parameterizedType = Types.newParameterizedType(Response.class, DirectBillingTransactionDetailsDTO.class);
         return (Response<DirectBillingTransactionDetailsDTO>) restService.sendGetRequest(endpoint, parameterizedType);
     }
@@ -85,7 +85,7 @@ public boolean checkSignature(String key, String transactionJson) {
 
     private String generateSignature(String key, DirectBillingTransactionNotificationDTO notification) {
         var pipe = "|";
-        var fields = List.of(String.valueOf(notification.id()), notification.status().getStatusName(), String.valueOf(notification.values().net()), String.valueOf(notification.values().gross()), String.valueOf(notification.values().partner()), notification.returns().success(), notification.returns().failure(), notification.control(), notification.number(), String.valueOf(notification.provider()), notification.signature(), key);
+        var fields = List.of(String.valueOf(notification.id()), notification.status().getStatusName(), String.valueOf(notification.values().net()), String.valueOf(notification.values().gross()), String.valueOf(notification.values().partner()), notification.returns().success(), notification.returns().failure(), notification.control(), notification.numberFrom(), String.valueOf(notification.provider()), notification.signature(), key);
         return Hashing.sha256().hashString(String.join(pipe, fields), StandardCharsets.UTF_8).toString();
     }