Skip to content

Commit 6db17a4

Browse files
committed
Fix id typing
1 parent 3c49d4a commit 6db17a4

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
group 'pl.simpay'
6-
version '1.0'
6+
version '2.1'
77
sourceCompatibility = '17'
88

99
repositories {

src/main/java/pl/simpay/api/model/directBilling/transaction/DirectBillingTransactionDetailsDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import java.time.LocalDateTime;
66

7-
public record DirectBillingTransactionDetailsDTO(int id, TransactionStatus status, String phoneNumber, double value,
7+
public record DirectBillingTransactionDetailsDTO(String id, TransactionStatus status, String phoneNumber, double value,
88
@Json(name = "value_netto") double netValue, Operator operator,
99
@Json(name = "notify") Notification notification,
1010
@Json(name = "created_at") LocalDateTime createdAt,

src/main/java/pl/simpay/api/model/directBilling/transaction/DirectBillingTransactionNotificationDTO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import pl.simpay.api.model.request.RedirectURL;
55

66
public record DirectBillingTransactionNotificationDTO(
7-
int id,
7+
String id,
88
@Json(name = "service_id") int serviceId,
99
TransactionStatus status,
1010
Values values,
1111
RedirectURL returns,
1212
String control,
13-
String number,
13+
@Json(name = "number_from") String numberFrom,
1414
int provider,
1515
String signature
1616
) {

src/main/java/pl/simpay/api/model/directBilling/transaction/DirectBillingTransactionsDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.time.LocalDateTime;
66

77
public record DirectBillingTransactionsDTO(
8-
int id,
8+
String id,
99
TransactionStatus status,
1010
double value,
1111
@Json(name = "value_netto") double netValue,

src/main/java/pl/simpay/api/payments/DirectBilling.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public PaginatedResponse<Set<DirectBillingTransactionsDTO>> getTransactions(int
6464
return (PaginatedResponse<Set<DirectBillingTransactionsDTO>>) restService.sendGetRequest(endpoint, parameterizedType);
6565
}
6666

67-
public Response<DirectBillingTransactionDetailsDTO> getTransactionDetails(int serviceId, int transactionId) {
68-
var endpoint = String.format("/directbilling/%d/transactions/%d", serviceId, transactionId);
67+
public Response<DirectBillingTransactionDetailsDTO> getTransactionDetails(int serviceId, String transactionId) {
68+
var endpoint = String.format("/directbilling/%d/transactions/%s", serviceId, transactionId);
6969
var parameterizedType = Types.newParameterizedType(Response.class, DirectBillingTransactionDetailsDTO.class);
7070
return (Response<DirectBillingTransactionDetailsDTO>) restService.sendGetRequest(endpoint, parameterizedType);
7171
}
@@ -85,7 +85,7 @@ public boolean checkSignature(String key, String transactionJson) {
8585

8686
private String generateSignature(String key, DirectBillingTransactionNotificationDTO notification) {
8787
var pipe = "|";
88-
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);
88+
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);
8989
return Hashing.sha256().hashString(String.join(pipe, fields), StandardCharsets.UTF_8).toString();
9090
}
9191

0 commit comments

Comments
 (0)