CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

FINERACT-2169: Apply dto for payment type api and upgrade swagger doc;

Browse Source
This commit is contained in:
viktorpavlenko
2025-03-14 18:17:41 +00:00
committed by Adam Saghy
parent 707fe3d0e5
commit e1aa632ccc
20 changed files with 108 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/paymenttype/PaymentTypeResolver.java
+4 -4
View File
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.fineract.client.models.GetPaymentTypesResponse;
import org.apache.fineract.client.models.PaymentTypeData;
import org.apache.fineract.client.services.PaymentTypeApi;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Component;
@@ -40,13 +40,13 @@ public class PaymentTypeResolver {
try {
String paymentTypeName = paymentType.getName();
log.debug("Resolving payment type by name [{}]", paymentTypeName);
Response<List<GetPaymentTypesResponse>> response = paymentTypeApi.getAllPaymentTypes(false).execute();
Response<List<PaymentTypeData>> response = paymentTypeApi.getAllPaymentTypes(false).execute();
if (!response.isSuccessful()) {
throw new IllegalStateException("Unable to get payment types. Status code was HTTP " + response.code());
}
List<GetPaymentTypesResponse> paymentTypesResponses = response.body();
GetPaymentTypesResponse foundPtr = paymentTypesResponses.stream().filter(ptr -> paymentTypeName.equals(ptr.getName())).findAny()
List<PaymentTypeData> paymentTypesResponses = response.body();
PaymentTypeData foundPtr = paymentTypesResponses.stream().filter(ptr -> paymentTypeName.equals(ptr.getName())).findAny()
.orElseThrow(() -> new IllegalArgumentException("Payment type [%s] not found".formatted(paymentTypeName)));
return foundPtr.getId();
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/PaymentTypesRequestFactory.java
+3 -4
View File
@@ -18,15 +18,14 @@
*/
package org.apache.fineract.test.factory;
import org.apache.fineract.client.models.PostPaymentTypesRequest;
import org.apache.fineract.client.models.PaymentTypeRequest;
public final class PaymentTypesRequestFactory {
private PaymentTypesRequestFactory() {}
public static PostPaymentTypesRequest defaultPaymentTypeRequest(String name, String description, Boolean isCashPayment,
Integer position) {
PostPaymentTypesRequest request = new PostPaymentTypesRequest();
public static PaymentTypeRequest defaultPaymentTypeRequest(String name, String description, Boolean isCashPayment, Integer position) {
PaymentTypeRequest request = new PaymentTypeRequest();
request.name(name).description(description).isCashPayment(isCashPayment).position(position);
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/PaymentTypeGlobalInitializerStep.java
+2 -2
View File
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.apache.fineract.client.models.PostPaymentTypesRequest;
import org.apache.fineract.client.models.PaymentTypeRequest;
import org.apache.fineract.client.services.PaymentTypeApi;
import org.apache.fineract.test.factory.PaymentTypesRequestFactory;
import org.springframework.core.Ordered;
@@ -59,7 +59,7 @@ public class PaymentTypeGlobalInitializerStep implements FineractGlobalInitializ
paymentTypes.forEach(paymentType -> {
Integer position = paymentTypes.indexOf(paymentType) + 2;
PostPaymentTypesRequest postPaymentTypesRequest = PaymentTypesRequestFactory.defaultPaymentTypeRequest(paymentType, paymentType,
PaymentTypeRequest postPaymentTypesRequest = PaymentTypesRequestFactory.defaultPaymentTypeRequest(paymentType, paymentType,
false, position);
try {