diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/DelinquencyGlobalInitializerStep.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/DelinquencyGlobalInitializerStep.java index 82cf60d6b..9231bee60 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/DelinquencyGlobalInitializerStep.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/DelinquencyGlobalInitializerStep.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import lombok.RequiredArgsConstructor; -import org.apache.fineract.client.models.PostDelinquencyBucketRequest; -import org.apache.fineract.client.models.PostDelinquencyRangeRequest; +import org.apache.fineract.client.models.DelinquencyBucketRequest; +import org.apache.fineract.client.models.DelinquencyRangeRequest; import org.apache.fineract.client.services.DelinquencyRangeAndBucketsManagementApi; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; @@ -49,7 +49,7 @@ public class DelinquencyGlobalInitializerStep implements FineractGlobalInitializ public void setDefaultDelinquencyRanges() throws IOException { for (int i = 0; i < DEFAULT_DELINQUENCY_RANGES.size() - 1; i++) { - PostDelinquencyRangeRequest postDelinquencyRangeRequest = new PostDelinquencyRangeRequest(); + DelinquencyRangeRequest postDelinquencyRangeRequest = new DelinquencyRangeRequest(); postDelinquencyRangeRequest.classification("Delinquency range " + DEFAULT_DELINQUENCY_RANGES.get(i).toString()); postDelinquencyRangeRequest.locale(DEFAULT_LOCALE); if (DEFAULT_DELINQUENCY_RANGES.get(i) == 1) { @@ -63,7 +63,7 @@ public class DelinquencyGlobalInitializerStep implements FineractGlobalInitializ delinquencyApi.createDelinquencyRange(postDelinquencyRangeRequest).execute(); } - PostDelinquencyRangeRequest lastRange = new PostDelinquencyRangeRequest(); + DelinquencyRangeRequest lastRange = new DelinquencyRangeRequest(); lastRange.classification("Delinquency range " + DEFAULT_DELINQUENCY_RANGES.get(DEFAULT_DELINQUENCY_RANGES.size() - 1).toString()); lastRange.locale(DEFAULT_LOCALE); lastRange.minimumAgeDays(DEFAULT_DELINQUENCY_RANGES.get(DEFAULT_DELINQUENCY_RANGES.size() - 1) + 1); @@ -80,7 +80,7 @@ public class DelinquencyGlobalInitializerStep implements FineractGlobalInitializ } rangesNr.add((long) DEFAULT_DELINQUENCY_RANGES.size()); - PostDelinquencyBucketRequest postDelinquencyBucketRequest = new PostDelinquencyBucketRequest(); + DelinquencyBucketRequest postDelinquencyBucketRequest = new DelinquencyBucketRequest(); postDelinquencyBucketRequest.name(DEFAULT_DELINQUENCY_BUCKET_NAME); postDelinquencyBucketRequest.ranges(rangesNr); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanDelinquencyStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanDelinquencyStepDef.java index 3da1be530..f69c0dfe4 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanDelinquencyStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanDelinquencyStepDef.java @@ -39,8 +39,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; import org.apache.fineract.avro.loan.v1.LoanAccountDelinquencyRangeDataV1; import org.apache.fineract.avro.loan.v1.LoanInstallmentDelinquencyBucketDataV1; +import org.apache.fineract.client.models.DelinquencyRangeData; import org.apache.fineract.client.models.GetDelinquencyActionsResponse; -import org.apache.fineract.client.models.GetDelinquencyRangesResponse; import org.apache.fineract.client.models.GetDelinquencyTagHistoryResponse; import org.apache.fineract.client.models.GetLoansLoanIdDelinquencyPausePeriod; import org.apache.fineract.client.models.GetLoansLoanIdDelinquencySummary; @@ -108,7 +108,7 @@ public class LoanDelinquencyStepDef extends AbstractStepDef { String expectedDelinquencyRangeValue = expectedDelinquencyRange.getValue(); String actualDelinquencyRangeValue = DelinquencyRange.NO_DELINQUENCY.value; - GetDelinquencyRangesResponse actualDelinquencyRange = loanDetails.body().getDelinquencyRange(); + DelinquencyRangeData actualDelinquencyRange = loanDetails.body().getDelinquencyRange(); if (actualDelinquencyRange != null) { actualDelinquencyRangeValue = actualDelinquencyRange.getClassification(); } @@ -640,7 +640,7 @@ public class LoanDelinquencyStepDef extends AbstractStepDef { long loanId = loanResponse.body().getLoanId(); Response loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); - GetDelinquencyRangesResponse delinquencyRange = loanDetails.body().getDelinquencyRange(); + DelinquencyRangeData delinquencyRange = loanDetails.body().getDelinquencyRange(); GetLoansLoanIdDelinquencySummary delinquent = loanDetails.body().getDelinquent(); eventAssertion.assertEvent(LoanDelinquencyRangeChangeEvent.class, loanId)// diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResource.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResource.java index ba5da5ca6..42a087aa9 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResource.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResource.java @@ -20,7 +20,6 @@ package org.apache.fineract.portfolio.delinquency.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.ArraySchema; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.parameters.RequestBody; @@ -35,17 +34,13 @@ import jakarta.ws.rs.PUT; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.UriInfo; -import java.util.Collection; +import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.domain.CommandWrapper; import org.apache.fineract.commands.service.CommandWrapperBuilder; import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService; -import org.apache.fineract.infrastructure.core.api.ApiRequestParameterHelper; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.delinquency.data.DelinquencyBucketData; @@ -59,7 +54,6 @@ import org.springframework.stereotype.Component; @Tag(name = "Delinquency Range and Buckets Management", description = "Delinquency Range and Buckets management enables you to set up, fetch and adjust Delinquency overdue ranges") public class DelinquencyApiResource { - private final ApiRequestParameterHelper parameterHelper; private final PlatformSecurityContext securityContext; private final DefaultToApiJsonSerializer jsonSerializerBucket; private final DefaultToApiJsonSerializer jsonSerializerRange; @@ -71,13 +65,9 @@ public class DelinquencyApiResource { @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON }) @Produces(MediaType.APPLICATION_JSON) @Operation(summary = "List all Delinquency Ranges", description = "") - @ApiResponses({ - @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = DelinquencyApiResourceSwagger.GetDelinquencyRangesResponse.class)))) }) - public String getDelinquencyRanges(@Context final UriInfo uriInfo) { + public List getDelinquencyRanges() { securityContext.authenticatedUser().validateHasReadPermission("DELINQUENCY_BUCKET"); - final Collection delinquencyRangeData = this.readPlatformService.retrieveAllDelinquencyRanges(); - ApiRequestJsonSerializationSettings settings = parameterHelper.process(uriInfo.getQueryParameters()); - return this.jsonSerializerRange.serialize(settings, delinquencyRangeData); + return this.readPlatformService.retrieveAllDelinquencyRanges(); } @GET @@ -85,15 +75,10 @@ public class DelinquencyApiResource { @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON }) @Produces(MediaType.APPLICATION_JSON) @Operation(summary = "Retrieve a specific Delinquency Range based on the Id", description = "") - @ApiResponses({ - @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.GetDelinquencyRangesResponse.class))) }) - public String getDelinquencyRange( - @PathParam("delinquencyRangeId") @Parameter(description = "delinquencyRangeId") final Long delinquencyRangeId, - @Context final UriInfo uriInfo) { + public DelinquencyRangeData getDelinquencyRange( + @PathParam("delinquencyRangeId") @Parameter(description = "delinquencyRangeId") final Long delinquencyRangeId) { securityContext.authenticatedUser().validateHasReadPermission("DELINQUENCY_BUCKET"); - final DelinquencyRangeData delinquencyRangeData = this.readPlatformService.retrieveDelinquencyRange(delinquencyRangeId); - ApiRequestJsonSerializationSettings settings = parameterHelper.process(uriInfo.getQueryParameters()); - return this.jsonSerializerRange.serialize(settings, delinquencyRangeData); + return this.readPlatformService.retrieveDelinquencyRange(delinquencyRangeId); } @POST @@ -101,15 +86,15 @@ public class DelinquencyApiResource { @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) @Operation(summary = "Create Delinquency Range", description = "") - @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PostDelinquencyRangeRequest.class))) + @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DelinquencyRangeRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PostDelinquencyRangeResponse.class))) }) - public String createDelinquencyRange(final String jsonRequestBody, @Context UriInfo uriInfo) { + public CommandProcessingResult createDelinquencyRange(final DelinquencyRangeRequest delinquencyRangeRequest) { securityContext.authenticatedUser().validateHasCreatePermission("DELINQUENCY_BUCKET"); - final CommandWrapper commandRequest = new CommandWrapperBuilder().createDelinquencyRange().withJson(jsonRequestBody).build(); + final CommandWrapper commandRequest = new CommandWrapperBuilder().createDelinquencyRange() + .withJson(jsonSerializerRange.serialize(delinquencyRangeRequest)).build(); - CommandProcessingResult result = commandWritePlatformService.logCommandSource(commandRequest); - return jsonSerializerRange.serialize(result); + return commandWritePlatformService.logCommandSource(commandRequest); } @PUT @@ -117,18 +102,17 @@ public class DelinquencyApiResource { @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) @Operation(summary = "Update Delinquency Range based on the Id", description = "") - @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PostDelinquencyRangeRequest.class))) + @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DelinquencyRangeRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PutDelinquencyRangeResponse.class))) }) - public String updateDelinquencyRange( + public CommandProcessingResult updateDelinquencyRange( @PathParam("delinquencyRangeId") @Parameter(description = "delinquencyRangeId") final Long delinquencyRangeId, - final String jsonRequestBody, @Context UriInfo uriInfo) { + final DelinquencyRangeRequest delinquencyRangeRequest) { securityContext.authenticatedUser().validateHasUpdatePermission("DELINQUENCY_BUCKET"); final CommandWrapper commandRequest = new CommandWrapperBuilder().updateDelinquencyRange(delinquencyRangeId) - .withJson(jsonRequestBody).build(); + .withJson(jsonSerializerRange.serialize(delinquencyRangeRequest)).build(); - CommandProcessingResult result = commandWritePlatformService.logCommandSource(commandRequest); - return jsonSerializerRange.serialize(result); + return commandWritePlatformService.logCommandSource(commandRequest); } @DELETE @@ -138,14 +122,12 @@ public class DelinquencyApiResource { @Operation(summary = "Update Delinquency Range based on the Id", description = "") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.DeleteDelinquencyRangeResponse.class))) }) - public String deleteDelinquencyRange( - @PathParam("delinquencyRangeId") @Parameter(description = "delinquencyRangeId") final Long delinquencyRangeId, - @Context UriInfo uriInfo) { + public CommandProcessingResult deleteDelinquencyRange( + @PathParam("delinquencyRangeId") @Parameter(description = "delinquencyRangeId") final Long delinquencyRangeId) { securityContext.authenticatedUser().validateHasDeletePermission("DELINQUENCY_BUCKET"); final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteDelinquencyRange(delinquencyRangeId).build(); - CommandProcessingResult result = commandWritePlatformService.logCommandSource(commandRequest); - return jsonSerializerRange.serialize(result); + return commandWritePlatformService.logCommandSource(commandRequest); } @GET @@ -153,13 +135,9 @@ public class DelinquencyApiResource { @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON }) @Produces(MediaType.APPLICATION_JSON) @Operation(summary = "List all Delinquency Buckets", description = "") - @ApiResponses({ - @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = DelinquencyApiResourceSwagger.GetDelinquencyBucketsResponse.class)))) }) - public String getDelinquencyBuckets(@Context final UriInfo uriInfo) { + public List getDelinquencyBuckets() { securityContext.authenticatedUser().validateHasReadPermission("DELINQUENCY_BUCKET"); - final Collection delinquencyBucketData = this.readPlatformService.retrieveAllDelinquencyBuckets(); - ApiRequestJsonSerializationSettings settings = parameterHelper.process(uriInfo.getQueryParameters()); - return this.jsonSerializerBucket.serialize(settings, delinquencyBucketData); + return this.readPlatformService.retrieveAllDelinquencyBuckets(); } @GET @@ -167,15 +145,10 @@ public class DelinquencyApiResource { @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON }) @Produces(MediaType.APPLICATION_JSON) @Operation(summary = "Retrieve a specific Delinquency Bucket based on the Id", description = "") - @ApiResponses({ - @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.GetDelinquencyBucketsResponse.class))) }) - public String getDelinquencyBucket( - @PathParam("delinquencyBucketId") @Parameter(description = "delinquencyBucketId") final Long delinquencyBucketId, - @Context final UriInfo uriInfo) { + public DelinquencyBucketData getDelinquencyBucket( + @PathParam("delinquencyBucketId") @Parameter(description = "delinquencyBucketId") final Long delinquencyBucketId) { securityContext.authenticatedUser().validateHasReadPermission("DELINQUENCY_BUCKET"); - final DelinquencyBucketData delinquencyBucketData = this.readPlatformService.retrieveDelinquencyBucket(delinquencyBucketId); - ApiRequestJsonSerializationSettings settings = parameterHelper.process(uriInfo.getQueryParameters()); - return this.jsonSerializerBucket.serialize(settings, delinquencyBucketData); + return this.readPlatformService.retrieveDelinquencyBucket(delinquencyBucketId); } @POST @@ -183,15 +156,15 @@ public class DelinquencyApiResource { @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) @Operation(summary = "Create Delinquency Bucket", description = "") - @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PostDelinquencyBucketRequest.class))) + @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DelinquencyBucketRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PostDelinquencyBucketResponse.class))) }) - public String createDelinquencyBucket(final String jsonRequestBody, @Context UriInfo uriInfo) { + public CommandProcessingResult createDelinquencyBucket(final DelinquencyBucketRequest delinquencyBucketRequest) { securityContext.authenticatedUser().validateHasCreatePermission("DELINQUENCY_BUCKET"); - final CommandWrapper commandRequest = new CommandWrapperBuilder().createDelinquencyBucket().withJson(jsonRequestBody).build(); + final CommandWrapper commandRequest = new CommandWrapperBuilder().createDelinquencyBucket() + .withJson(jsonSerializerBucket.serialize(delinquencyBucketRequest)).build(); - CommandProcessingResult result = commandWritePlatformService.logCommandSource(commandRequest); - return jsonSerializerRange.serialize(result); + return commandWritePlatformService.logCommandSource(commandRequest); } @PUT @@ -199,18 +172,17 @@ public class DelinquencyApiResource { @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) @Operation(summary = "Update Delinquency Bucket based on the Id", description = "") - @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PostDelinquencyBucketRequest.class))) + @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DelinquencyBucketRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PutDelinquencyBucketResponse.class))) }) - public String updateDelinquencyBucket( + public CommandProcessingResult updateDelinquencyBucket( @PathParam("delinquencyBucketId") @Parameter(description = "delinquencyBucketId") final Long delinquencyBucketId, - final String jsonRequestBody, @Context UriInfo uriInfo) { + final DelinquencyBucketRequest delinquencyBucketRequest) { securityContext.authenticatedUser().validateHasUpdatePermission("DELINQUENCY_BUCKET"); final CommandWrapper commandRequest = new CommandWrapperBuilder().updateDelinquencyBucket(delinquencyBucketId) - .withJson(jsonRequestBody).build(); + .withJson(jsonSerializerBucket.serialize(delinquencyBucketRequest)).build(); - CommandProcessingResult result = commandWritePlatformService.logCommandSource(commandRequest); - return jsonSerializerRange.serialize(result); + return commandWritePlatformService.logCommandSource(commandRequest); } @DELETE @@ -220,14 +192,12 @@ public class DelinquencyApiResource { @Operation(summary = "Delete Delinquency Bucket based on the Id", description = "") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.DeleteDelinquencyBucketResponse.class))) }) - public String deleteDelinquencyBucket( - @PathParam("delinquencyBucketId") @Parameter(description = "delinquencyBucketId") final Long delinquencyBucketId, - @Context UriInfo uriInfo) { + public CommandProcessingResult deleteDelinquencyBucket( + @PathParam("delinquencyBucketId") @Parameter(description = "delinquencyBucketId") final Long delinquencyBucketId) { securityContext.authenticatedUser().validateHasDeletePermission("DELINQUENCY_BUCKET"); final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteDelinquencyBucket(delinquencyBucketId).build(); - CommandProcessingResult result = commandWritePlatformService.logCommandSource(commandRequest); - return jsonSerializerRange.serialize(result); + return commandWritePlatformService.logCommandSource(commandRequest); } } diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResourceSwagger.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResourceSwagger.java index 48413f8d1..70e4b1f2d 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResourceSwagger.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResourceSwagger.java @@ -21,54 +21,12 @@ package org.apache.fineract.portfolio.delinquency.api; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; import java.time.OffsetDateTime; +import org.apache.fineract.portfolio.delinquency.data.DelinquencyRangeData; public final class DelinquencyApiResourceSwagger { private DelinquencyApiResourceSwagger() {} - @Schema(description = "GetDelinquencyRangesResponse") - public static final class GetDelinquencyRangesResponse { - - private GetDelinquencyRangesResponse() {} - - @Schema(example = "1") - public Long id; - @Schema(example = "Delinquent 1") - public String classification; - @Schema(example = "1") - public Integer minimumAgeDays; - @Schema(example = "3") - public Integer maximumAgeDays; - } - - @Schema(description = "GetDelinquencyBucketsResponse") - public static final class GetDelinquencyBucketsResponse { - - private GetDelinquencyBucketsResponse() {} - - @Schema(example = "1") - public Long id; - @Schema(example = "Delinquent Bucket Set 1") - public String name; - - public GetDelinquencyRangesResponse[] ranges; - } - - @Schema(description = "PostDelinquencyRangeRequest") - public static final class PostDelinquencyRangeRequest { - - private PostDelinquencyRangeRequest() {} - - @Schema(example = "Delinquent 1") - public String classification; - @Schema(example = "1") - public Integer minimumAgeDays; - @Schema(example = "3") - public Integer maximumAgeDays; - @Schema(example = "en") - public String locale; - } - @Schema(description = "PostDelinquencyRangeResponse") public static final class PostDelinquencyRangeResponse { @@ -85,7 +43,7 @@ public final class DelinquencyApiResourceSwagger { @Schema(example = "1") public Integer resourceId; - public PostDelinquencyRangeRequest changes; + public DelinquencyRangeRequest changes; } @Schema(description = "DeleteDelinquencyRangeResponse") @@ -97,17 +55,6 @@ public final class DelinquencyApiResourceSwagger { public Integer resourceId; } - @Schema(description = "PostDelinquencyBucketRequest") - public static final class PostDelinquencyBucketRequest { - - private PostDelinquencyBucketRequest() {} - - @Schema(example = "Delinquent 1") - public String name; - @Schema(example = "[1,2,3]") - public Long[] ranges; - } - @Schema(description = "PostDelinquencyBucketResponse") public static final class PostDelinquencyBucketResponse { @@ -144,7 +91,7 @@ public final class DelinquencyApiResourceSwagger { public Long id; @Schema(example = "10") public Long loanId; - public GetDelinquencyRangesResponse delinquencyRange; + public DelinquencyRangeData delinquencyRange; @Schema(example = "2013,1,2") public LocalDate addedOnDate; @Schema(example = "2013,2,20") diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyBucketRequest.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyBucketRequest.java new file mode 100644 index 000000000..ed50e9170 --- /dev/null +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyBucketRequest.java @@ -0,0 +1,38 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.delinquency.api; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Setter +@Getter +@NoArgsConstructor +public class DelinquencyBucketRequest implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private String name; + private List ranges; +} diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyRangeRequest.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyRangeRequest.java new file mode 100644 index 000000000..c5426b9e6 --- /dev/null +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyRangeRequest.java @@ -0,0 +1,39 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.delinquency.api; + +import java.io.Serial; +import java.io.Serializable; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Setter +@Getter +@NoArgsConstructor +public class DelinquencyRangeRequest implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private String classification; + private Integer minimumAgeDays; + private Integer maximumAgeDays; + private String locale; +} diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformService.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformService.java index f54a45d4f..87b64a52a 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformService.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformService.java @@ -29,11 +29,11 @@ import org.apache.fineract.portfolio.loanaccount.data.CollectionData; public interface DelinquencyReadPlatformService { - Collection retrieveAllDelinquencyRanges(); + List retrieveAllDelinquencyRanges(); DelinquencyRangeData retrieveDelinquencyRange(Long delinquencyRangeId); - Collection retrieveAllDelinquencyBuckets(); + List retrieveAllDelinquencyBuckets(); DelinquencyBucketData retrieveDelinquencyBucket(Long delinquencyBucketId); diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformServiceImpl.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformServiceImpl.java index 103152965..e99319a62 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformServiceImpl.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformServiceImpl.java @@ -74,7 +74,7 @@ public class DelinquencyReadPlatformServiceImpl implements DelinquencyReadPlatfo private final ConfigurationDomainService configurationDomainService; @Override - public Collection retrieveAllDelinquencyRanges() { + public List retrieveAllDelinquencyRanges() { final List delinquencyRangeList = repositoryRange.findAll(); return mapperRange.map(delinquencyRangeList); } @@ -86,7 +86,7 @@ public class DelinquencyReadPlatformServiceImpl implements DelinquencyReadPlatfo } @Override - public Collection retrieveAllDelinquencyBuckets() { + public List retrieveAllDelinquencyBuckets() { final List delinquencyRangeList = repositoryBucket.findAll(); return mapperBucket.map(delinquencyRangeList); } diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java index 64fcb0d3c..6238977b1 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java @@ -26,7 +26,7 @@ import java.util.Set; import org.apache.fineract.accounting.glaccount.data.GLAccountData; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.data.StringEnumOptionData; -import org.apache.fineract.portfolio.delinquency.api.DelinquencyApiResourceSwagger.GetDelinquencyBucketsResponse; +import org.apache.fineract.portfolio.delinquency.data.DelinquencyBucketData; /** * Created by Chirag Gupta on 12/27/17. @@ -1404,8 +1404,8 @@ final class LoanProductsApiResourceSwagger { public Integer overdueDaysForNPA; @Schema(example = "50") public Integer principalThresholdForLastInstalment; - public GetDelinquencyBucketsResponse delinquencyBucket; - public List delinquencyBucketOptions; + public DelinquencyBucketData delinquencyBucket; + public List delinquencyBucketOptions; @Schema(example = "false") public Boolean enableInstallmentLevelDelinquency; @Schema(example = "3") diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java index 8fdf8c460..b6a6ddf29 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Set; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.data.StringEnumOptionData; -import org.apache.fineract.portfolio.delinquency.api.DelinquencyApiResourceSwagger.GetDelinquencyRangesResponse; +import org.apache.fineract.portfolio.delinquency.data.DelinquencyRangeData; /** * Created by Chirag Gupta on 12/09/17. @@ -1175,7 +1175,7 @@ final class LoansApiResourceSwagger { public GetLoansLoanIdDelinquencySummary delinquent; @Schema(description = "Set of charges") public List charges; - public GetDelinquencyRangesResponse delinquencyRange; + public DelinquencyRangeData delinquencyRange; @Schema(example = "false") public Boolean fraud; @Schema(example = "false") diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyAndChargebackIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyAndChargebackIntegrationTest.java index 24f416832..cbaebb639 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyAndChargebackIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyAndChargebackIntegrationTest.java @@ -36,8 +36,8 @@ import java.util.List; import java.util.stream.Stream; import lombok.extern.slf4j.Slf4j; import org.apache.fineract.client.models.AdvancedPaymentData; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; -import org.apache.fineract.client.models.GetDelinquencyRangesResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; +import org.apache.fineract.client.models.DelinquencyRangeData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdRepaymentPeriod; import org.apache.fineract.client.models.GetLoansLoanIdRepaymentSchedule; @@ -100,7 +100,7 @@ public class DelinquencyAndChargebackIntegrationTest extends BaseLoanIntegration final SchedulerJobHelper schedulerJobHelper = new SchedulerJobHelper(requestSpec); // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation @@ -223,7 +223,7 @@ public class DelinquencyAndChargebackIntegrationTest extends BaseLoanIntegration final SchedulerJobHelper schedulerJobHelper = new SchedulerJobHelper(requestSpec); // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation @@ -364,10 +364,10 @@ public class DelinquencyAndChargebackIntegrationTest extends BaseLoanIntegration return loanId; } - private GetDelinquencyRangesResponse validateLoanAccount(GetLoansLoanIdResponse getLoansLoanIdResponse, final String adjustments, + private DelinquencyRangeData validateLoanAccount(GetLoansLoanIdResponse getLoansLoanIdResponse, final String adjustments, final String outstanding, Integer pastDueDays, Double delinquentAmount) { assertNotNull(getLoansLoanIdResponse); - final GetDelinquencyRangesResponse delinquencyRange = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData delinquencyRange = getLoansLoanIdResponse.getDelinquencyRange(); log.info("Loan Delinquency Range is null {}", (delinquencyRange == null)); if (delinquencyRange != null) { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyBucketsIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyBucketsIntegrationTest.java index 098ff63dc..5aa5106be 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyBucketsIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyBucketsIntegrationTest.java @@ -44,8 +44,8 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.fineract.client.models.BusinessDateData; import org.apache.fineract.client.models.DeleteDelinquencyBucketResponse; import org.apache.fineract.client.models.DeleteDelinquencyRangeResponse; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; -import org.apache.fineract.client.models.GetDelinquencyRangesResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; +import org.apache.fineract.client.models.DelinquencyRangeData; import org.apache.fineract.client.models.GetDelinquencyTagHistoryResponse; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdDelinquencySummary; @@ -114,13 +114,13 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { // when final PostDelinquencyRangeResponse delinquencyRangeResponse01 = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange); - final ArrayList ranges = DelinquencyRangesHelper.getDelinquencyRanges(requestSpec, responseSpec); + final ArrayList ranges = DelinquencyRangesHelper.getDelinquencyRanges(requestSpec, responseSpec); // then assertNotNull(delinquencyRangeResponse01); assertNotNull(ranges); assertFalse(ranges.isEmpty()); - GetDelinquencyRangesResponse range = ranges.get(ranges.size() - 1); + DelinquencyRangeData range = ranges.get(ranges.size() - 1); assertEquals(1, range.getMinimumAgeDays(), "Expected Min Age Days to 1"); assertEquals(3, range.getMaximumAgeDays(), "Expected Max Age Days to 3"); } @@ -137,7 +137,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { // when final PutDelinquencyRangeResponse delinquencyRangeResponse02 = DelinquencyRangesHelper.updateDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse01.getResourceId(), jsonRange); - final GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + final DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse01.getResourceId()); final DeleteDelinquencyRangeResponse deleteDelinquencyRangeResponse = DelinquencyRangesHelper.deleteDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse01.getResourceId()); @@ -175,12 +175,11 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange); rangeIds.add(delinquencyRangeResponse.getResourceId()); // Read - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // when - final ArrayList bucketList = DelinquencyBucketsHelper.getDelinquencyBuckets(requestSpec, - responseSpec); + final ArrayList bucketList = DelinquencyBucketsHelper.getDelinquencyBuckets(requestSpec, responseSpec); // then assertNotNull(bucketList); @@ -210,8 +209,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { responseSpec, delinquencyBucketResponse.getResourceId()); // when - final ArrayList bucketList = DelinquencyBucketsHelper.getDelinquencyBuckets(requestSpec, - responseSpec); + final ArrayList bucketList = DelinquencyBucketsHelper.getDelinquencyBuckets(requestSpec, responseSpec); // then assertNotNull(bucketList); @@ -273,7 +271,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { rangeIds.add(delinquencyRangeResponse.getResourceId()); jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60); - GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); // Second Range @@ -288,7 +286,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); assertNotNull(delinquencyBucketResponse); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Loan product creation without Delinquency bucket @@ -332,7 +330,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { rangeIds.add(delinquencyRangeResponse.getResourceId()); jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60); - GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); // Second Range @@ -347,7 +345,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); assertNotNull(delinquencyBucketResponse); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Client and Loan account creation @@ -430,7 +428,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { rangeIds.add(delinquencyRangeResponse.getResourceId()); jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60); - GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); // Second Range @@ -445,7 +443,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); assertNotNull(delinquencyBucketResponse); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Client and Loan account creation @@ -518,7 +516,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange); rangeIds.add(delinquencyRangeResponse.getResourceId()); - GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); final String classificationExpected02 = range.getClassification(); log.info("Expected Delinquency Range classification after first repayment {}", classificationExpected02); @@ -543,7 +541,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); assertNotNull(delinquencyBucketResponse); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Client and Loan account creation @@ -627,7 +625,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange); rangeIds.add(delinquencyRangeResponse.getResourceId()); - GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); final String classificationExpected = range.getClassification(); log.info("Expected Delinquency Range classification after first repayment {}", classificationExpected); @@ -636,7 +634,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); assertNotNull(delinquencyBucketResponse); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Client and Loan account creation @@ -737,7 +735,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange); rangeIds.add(delinquencyRangeResponse.getResourceId()); - final GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + final DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); final String classificationExpected = range.getClassification(); log.info("Expected Delinquency Range classification {}", classificationExpected); @@ -745,7 +743,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds); PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Client and Loan account creation @@ -772,7 +770,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { // Get loan details expecting to have not a delinquency classification GetLoansLoanIdResponse getLoansLoanIdResponse = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanId); loanTransactionHelper.printDelinquencyData(getLoansLoanIdResponse); - final GetDelinquencyRangesResponse firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); log.info("Loan Delinquency Range is null {}", (firstTestCase == null)); loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse); @@ -788,7 +786,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse); loanTransactionHelper.printDelinquencyData(getLoansLoanIdResponse); - final GetDelinquencyRangesResponse secondTestCase = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData secondTestCase = getLoansLoanIdResponse.getDelinquencyRange(); assertNotNull(secondTestCase); log.info("Loan Delinquency Range is {}", secondTestCase.getClassification()); @@ -824,7 +822,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange); rangeIds.add(delinquencyRangeResponse.getResourceId()); - final GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + final DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); final String classificationExpected = range.getClassification(); log.info("Expected Delinquency Range classification {}", classificationExpected); @@ -836,7 +834,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds); PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Client and Loan account creation @@ -870,7 +868,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { // Get loan details expecting to have not a delinquency classification GetLoansLoanIdResponse getLoansLoanIdResponse = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanId); - final GetDelinquencyRangesResponse firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); log.info("Loan Delinquency Range is null {}", (firstTestCase == null)); GetLoansLoanIdRepaymentSchedule getLoanRepaymentSchedule = getLoansLoanIdResponse.getRepaymentSchedule(); if (getLoanRepaymentSchedule != null) { @@ -893,7 +891,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { // Get loan details expecting to have a delinquency classification getLoansLoanIdResponse = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanId); loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse); - final GetDelinquencyRangesResponse secondTestCase = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData secondTestCase = getLoansLoanIdResponse.getDelinquencyRange(); assertNotNull(secondTestCase); log.info("Loan Delinquency Range is {}", secondTestCase.getClassification()); @@ -928,7 +926,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange); rangeIds.add(delinquencyRangeResponse.getResourceId()); - final GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + final DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); final String classificationExpected = range.getClassification(); log.info("Expected Delinquency Range classification {}", classificationExpected); @@ -940,7 +938,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds); PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Client and Loan account creation @@ -961,7 +959,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { // Get loan details expecting to have a delinquency classification GetLoansLoanIdResponse getLoansLoanIdResponse = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanId); - final GetDelinquencyRangesResponse firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); log.info("Loan Delinquency Range is null {}", (firstTestCase == null)); loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse); @@ -1009,7 +1007,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange); rangeIds.add(delinquencyRangeResponse.getResourceId()); - final GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + final DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); final String classificationExpected = range.getClassification(); log.info("Expected Delinquency Range classification {}", classificationExpected); @@ -1021,7 +1019,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds); PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Client and Loan account creation @@ -1042,7 +1040,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { // Get loan details expecting to have a delinquency classification GetLoansLoanIdResponse getLoansLoanIdResponse = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanId); - final GetDelinquencyRangesResponse firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); log.info("Loan Delinquency Range is null {}", (firstTestCase == null)); loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse); log.info("Loan Account Arrears {}", getLoansLoanIdResponse.getInArrearsTolerance()); @@ -1105,7 +1103,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { getLoanProductsProductResponse.getId().toString(), operationDate, "3"); GetLoansLoanIdResponse getLoansLoanIdResponse = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanId); - final GetDelinquencyRangesResponse firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); log.info("Loan Delinquency Range is null {}", (firstTestCase == null)); loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse); log.info("Loan Account Arrears {}", getLoansLoanIdResponse.getInArrearsTolerance()); @@ -1156,7 +1154,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { getLoanProductsProductResponse.getId().toString(), operationDate, "3"); GetLoansLoanIdResponse getLoansLoanIdResponse = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanId); - final GetDelinquencyRangesResponse firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); log.info("Loan Delinquency Range is null {}", (firstTestCase == null)); loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse); log.info("Loan Account Arrears {}", getLoansLoanIdResponse.getInArrearsTolerance()); @@ -1208,7 +1206,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { getLoanProductsProductResponse.getId().toString(), "01 January 2012", "3"); GetLoansLoanIdResponse getLoansLoanIdResponse = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanId); - final GetDelinquencyRangesResponse firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); log.info("Loan Delinquency Range is null {}", (firstTestCase == null)); loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse); log.info("Loan Account Arrears {}", getLoansLoanIdResponse.getInArrearsTolerance()); @@ -1290,7 +1288,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { getLoanProductsProductResponse.getId().toString(), "01 January 2012", "3"); GetLoansLoanIdResponse getLoansLoanIdResponse = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanId); - final GetDelinquencyRangesResponse firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData firstTestCase = getLoansLoanIdResponse.getDelinquencyRange(); log.info("Loan Delinquency Range is null {}", (firstTestCase == null)); loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse); log.info("Loan Account Arrears {}", getLoansLoanIdResponse.getInArrearsTolerance()); @@ -1369,7 +1367,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); assertNotNull(delinquencyBucketResponse); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Client and Loan account creation @@ -1430,7 +1428,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); assertNotNull(delinquencyBucketResponse); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Client creation @@ -1475,14 +1473,14 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest { PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange); rangeIds.add(delinquencyRangeResponse.getResourceId()); - GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds); PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); assertNotNull(delinquencyBucketResponse); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalIdSupportIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalIdSupportIntegrationTest.java index 8ddcf75b6..c0955d6df 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalIdSupportIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalIdSupportIntegrationTest.java @@ -34,7 +34,7 @@ import java.util.UUID; import org.apache.fineract.client.models.BusinessDateRequest; import org.apache.fineract.client.models.DeleteLoansLoanIdChargesChargeIdResponse; import org.apache.fineract.client.models.DeleteLoansLoanIdResponse; -import org.apache.fineract.client.models.GetDelinquencyRangesResponse; +import org.apache.fineract.client.models.DelinquencyRangeData; import org.apache.fineract.client.models.GetDelinquencyTagHistoryResponse; import org.apache.fineract.client.models.GetLoansApprovalTemplateResponse; import org.apache.fineract.client.models.GetLoansLoanIdChargesChargeIdResponse; @@ -843,7 +843,7 @@ public class ExternalIdSupportIntegrationTest extends BaseLoanIntegrationTest { rangeIds.add(delinquencyRangeResponse.getResourceId()); jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60); - GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); // Second Range diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountArrearsAgeingCOBBusinessStepTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountArrearsAgeingCOBBusinessStepTest.java index 380382a29..bfe675fd5 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountArrearsAgeingCOBBusinessStepTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountArrearsAgeingCOBBusinessStepTest.java @@ -30,7 +30,7 @@ import io.restassured.specification.ResponseSpecification; import java.time.LocalDate; import java.util.HashMap; import java.util.UUID; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdSummary; @@ -88,7 +88,7 @@ public class LoanAccountArrearsAgeingCOBBusinessStepTest extends BaseLoanIntegra // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); final GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper, diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountCreditRefundPayoutWithChargebackTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountCreditRefundPayoutWithChargebackTest.java index 202b2ed98..cf694e502 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountCreditRefundPayoutWithChargebackTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountCreditRefundPayoutWithChargebackTest.java @@ -30,7 +30,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.util.HashMap; import java.util.UUID; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse; import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest; @@ -77,7 +77,7 @@ public class LoanAccountCreditRefundPayoutWithChargebackTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountOverpaidDateStatusTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountOverpaidDateStatusTest.java index 232ca5d51..44d2d6234 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountOverpaidDateStatusTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountOverpaidDateStatusTest.java @@ -32,7 +32,7 @@ import io.restassured.specification.ResponseSpecification; import java.time.LocalDate; import java.util.HashMap; import java.util.UUID; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest; @@ -82,7 +82,7 @@ public class LoanAccountOverpaidDateStatusTest extends BaseLoanIntegrationTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccrualTransactionReversalTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccrualTransactionReversalTest.java index 1f9f4b5d2..14c806393 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccrualTransactionReversalTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccrualTransactionReversalTest.java @@ -33,7 +33,7 @@ import java.time.format.DateTimeFormatterBuilder; import java.util.ArrayList; import java.util.HashMap; import java.util.UUID; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest; import org.apache.fineract.client.models.PostLoansLoanIdTransactionsResponse; @@ -91,7 +91,7 @@ public class LoanAccrualTransactionReversalTest extends BaseLoanIntegrationTest // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargebackOnPaymentTypeRepaymentTransactionsTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargebackOnPaymentTypeRepaymentTransactionsTest.java index 0abb77ab7..5933a970a 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargebackOnPaymentTypeRepaymentTransactionsTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargebackOnPaymentTypeRepaymentTransactionsTest.java @@ -36,7 +36,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; import org.apache.fineract.client.models.AdvancedPaymentData; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse; @@ -88,7 +88,7 @@ public class LoanChargebackOnPaymentTypeRepaymentTransactionsTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation @@ -224,7 +224,7 @@ public class LoanChargebackOnPaymentTypeRepaymentTransactionsTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanDownPaymentTransactionTypeTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanDownPaymentTransactionTypeTest.java index 61c9ff3af..cda74573a 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanDownPaymentTransactionTypeTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanDownPaymentTransactionTypeTest.java @@ -31,7 +31,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.util.HashMap; import java.util.UUID; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse; import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest; @@ -75,7 +75,7 @@ public class LoanDownPaymentTransactionTypeTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // client creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanLastRepaymentDetailsTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanLastRepaymentDetailsTest.java index 25c29187f..793406a81 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanLastRepaymentDetailsTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanLastRepaymentDetailsTest.java @@ -32,7 +32,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.util.HashMap; import java.util.UUID; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest; @@ -75,7 +75,7 @@ public class LoanLastRepaymentDetailsTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation @@ -130,7 +130,7 @@ public class LoanLastRepaymentDetailsTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPayOffAddChargeWithRefundTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPayOffAddChargeWithRefundTest.java index 77bcfed14..bd7c1e0d4 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPayOffAddChargeWithRefundTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPayOffAddChargeWithRefundTest.java @@ -32,7 +32,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.util.HashMap; import java.util.UUID; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest; @@ -79,7 +79,7 @@ public class LoanPayOffAddChargeWithRefundTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductRepaymentStartDateConfigurationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductRepaymentStartDateConfigurationTest.java index ae25f0f42..e99193949 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductRepaymentStartDateConfigurationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductRepaymentStartDateConfigurationTest.java @@ -29,7 +29,7 @@ import io.restassured.specification.ResponseSpecification; import java.time.LocalDate; import java.util.HashMap; import java.util.UUID; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.PutGlobalConfigurationsRequest; @@ -73,7 +73,7 @@ public class LoanProductRepaymentStartDateConfigurationTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); final Integer repaymentStartDateType = 2; @@ -106,7 +106,7 @@ public class LoanProductRepaymentStartDateConfigurationTest { // default // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); final Integer repaymentStartDateType = null; diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductWithDownPaymentConfigurationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductWithDownPaymentConfigurationTest.java index 3dc8891ab..b5e7b8e59 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductWithDownPaymentConfigurationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductWithDownPaymentConfigurationTest.java @@ -29,7 +29,7 @@ import io.restassured.specification.ResponseSpecification; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.PutLoanProductsProductIdRequest; import org.apache.fineract.client.models.PutLoanProductsProductIdResponse; @@ -60,7 +60,7 @@ public class LoanProductWithDownPaymentConfigurationTest { public void loanProductCreationWithDownPaymentConfigurationTest() { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // down-payment configuration @@ -83,7 +83,7 @@ public class LoanProductWithDownPaymentConfigurationTest { public void loanProductUpdateWithEnableDownPaymentConfigurationTest() { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Loan Product without enable down payment configuration GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper, delinquencyBucketId); @@ -108,7 +108,7 @@ public class LoanProductWithDownPaymentConfigurationTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // down-payment configuration diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductWithRepaymentDueEventConfigurationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductWithRepaymentDueEventConfigurationTest.java index 54b3c08ac..d2502ccf9 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductWithRepaymentDueEventConfigurationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductWithRepaymentDueEventConfigurationTest.java @@ -28,7 +28,7 @@ import io.restassured.specification.RequestSpecification; import io.restassured.specification.ResponseSpecification; import java.util.HashMap; import java.util.UUID; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.PutLoanProductsProductIdRequest; import org.apache.fineract.client.models.PutLoanProductsProductIdResponse; @@ -64,7 +64,7 @@ public class LoanProductWithRepaymentDueEventConfigurationTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // event days configuration @@ -91,7 +91,7 @@ public class LoanProductWithRepaymentDueEventConfigurationTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanRepaymentScheduleWithDownPaymentTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanRepaymentScheduleWithDownPaymentTest.java index e6a8deba9..a0cc2f162 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanRepaymentScheduleWithDownPaymentTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanRepaymentScheduleWithDownPaymentTest.java @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.UUID; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdRepaymentPeriod; import org.apache.fineract.client.models.GetLoansLoanIdResponse; @@ -75,7 +75,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -121,7 +121,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -170,7 +170,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -216,7 +216,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -267,7 +267,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -322,7 +322,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -394,7 +394,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -480,7 +480,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -544,7 +544,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -645,7 +645,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -711,7 +711,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -825,7 +825,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; @@ -885,7 +885,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // down-payment configuration @@ -927,7 +927,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // down-payment configuration @@ -1009,7 +1009,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // down-payment configuration @@ -1130,7 +1130,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // down-payment configuration @@ -1623,7 +1623,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest extends BaseLoanIntegratio String loanExternalIdStr = UUID.randomUUID().toString(); final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); Boolean enableDownPayment = true; diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionChargebackTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionChargebackTest.java index 3727b75fc..205f88c0c 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionChargebackTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionChargebackTest.java @@ -41,8 +41,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.fineract.client.models.AdvancedPaymentData; import org.apache.fineract.client.models.CreditAllocationData; import org.apache.fineract.client.models.CreditAllocationOrder; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; -import org.apache.fineract.client.models.GetDelinquencyRangesResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; +import org.apache.fineract.client.models.DelinquencyRangeData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdRepaymentPeriod; import org.apache.fineract.client.models.GetLoansLoanIdRepaymentSchedule; @@ -308,7 +308,7 @@ public class LoanTransactionChargebackTest extends BaseLoanIntegrationTest { loanTransactionHelper.printRepaymentSchedule(getLoansLoanIdResponse); - GetDelinquencyRangesResponse delinquencyRange = getLoansLoanIdResponse.getDelinquencyRange(); + DelinquencyRangeData delinquencyRange = getLoansLoanIdResponse.getDelinquencyRange(); assertNotNull(delinquencyRange); log.info("Loan Delinquency Range is {}", delinquencyRange.getClassification()); @@ -448,7 +448,7 @@ public class LoanTransactionChargebackTest extends BaseLoanIntegrationTest { debit(overpaymentAccount, 100.0) // ); - final GetDelinquencyRangesResponse delinquencyRange = getLoansLoanIdResponse.getDelinquencyRange(); + final DelinquencyRangeData delinquencyRange = getLoansLoanIdResponse.getDelinquencyRange(); assertNull(delinquencyRange); log.info("Loan Delinquency Range is null {}", (delinquencyRange == null)); } @@ -512,7 +512,7 @@ public class LoanTransactionChargebackTest extends BaseLoanIntegrationTest { reviewLoanTransactionRelations(loanId, transactionId, 0, Double.valueOf("0.00")); - GetDelinquencyRangesResponse delinquencyRange = getLoansLoanIdResponse.getDelinquencyRange(); + DelinquencyRangeData delinquencyRange = getLoansLoanIdResponse.getDelinquencyRange(); assertNull(delinquencyRange); log.info("Loan Delinquency Range is null {}", (delinquencyRange == null)); final Long chargebackTransactionId = loanTransactionHelper.applyChargebackTransaction(loanId, transactionId, "50.00", 0, @@ -1395,7 +1395,7 @@ public class LoanTransactionChargebackTest extends BaseLoanIntegrationTest { LoanProductTestBuilder loanProductTestBuilder) { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionFullAmountChargebackForOverpaidLoanTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionFullAmountChargebackForOverpaidLoanTest.java index f76f0f9f4..1e2eae92b 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionFullAmountChargebackForOverpaidLoanTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionFullAmountChargebackForOverpaidLoanTest.java @@ -36,7 +36,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; import org.apache.fineract.client.models.AdvancedPaymentData; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse; @@ -90,7 +90,7 @@ public class LoanTransactionFullAmountChargebackForOverpaidLoanTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionReverseReplayRelationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionReverseReplayRelationTest.java index c7464bbf2..e5a867410 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionReverseReplayRelationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionReverseReplayRelationTest.java @@ -31,7 +31,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.util.HashMap; import java.util.UUID; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoanTransactionRelation; import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse; @@ -79,7 +79,7 @@ public class LoanTransactionReverseReplayRelationTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionSummaryTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionSummaryTest.java index d15f5e4a3..fab157b09 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionSummaryTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionSummaryTest.java @@ -32,7 +32,7 @@ import java.time.format.DateTimeFormatterBuilder; import java.util.HashMap; import java.util.UUID; import lombok.extern.slf4j.Slf4j; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; import org.apache.fineract.client.models.GetLoanProductsProductIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdSummary; @@ -80,7 +80,7 @@ public class LoanTransactionSummaryTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation @@ -208,7 +208,7 @@ public class LoanTransactionSummaryTest { // Delinquency Bucket final Integer delinquencyBucketId = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketId); // Client and Loan account creation diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/products/DelinquencyBucketsHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/products/DelinquencyBucketsHelper.java index 03937b2ea..fd6894c1e 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/products/DelinquencyBucketsHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/products/DelinquencyBucketsHelper.java @@ -33,8 +33,8 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.Pair; import org.apache.fineract.client.models.DeleteDelinquencyBucketResponse; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; -import org.apache.fineract.client.models.GetDelinquencyRangesResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; +import org.apache.fineract.client.models.DelinquencyRangeData; import org.apache.fineract.client.models.GetLoansLoanIdDelinquencySummary; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.PostDelinquencyBucketResponse; @@ -55,11 +55,11 @@ public class DelinquencyBucketsHelper { // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long, // org.apache.fineract.client.models.PostLoansLoanIdRequest) @Deprecated(forRemoval = true) - public static ArrayList getDelinquencyBuckets(final RequestSpecification requestSpec, + public static ArrayList getDelinquencyBuckets(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { String response = Utils.performServerGet(requestSpec, responseSpec, DELINQUENCY_BUCKETS_URL + "?" + Utils.TENANT_IDENTIFIER); - Type delinquencyBucketListType = new TypeToken>() {}.getType(); + Type delinquencyBucketListType = new TypeToken>() {}.getType(); return GSON.fromJson(response, delinquencyBucketListType); } @@ -67,11 +67,11 @@ public class DelinquencyBucketsHelper { // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long, // org.apache.fineract.client.models.PostLoansLoanIdRequest) @Deprecated(forRemoval = true) - public static GetDelinquencyBucketsResponse getDelinquencyBucket(final RequestSpecification requestSpec, + public static DelinquencyBucketData getDelinquencyBucket(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final Integer resourceId) { String response = Utils.performServerGet(requestSpec, responseSpec, DELINQUENCY_BUCKETS_URL + "/" + resourceId + "?" + Utils.TENANT_IDENTIFIER); - return GSON.fromJson(response, GetDelinquencyBucketsResponse.class); + return GSON.fromJson(response, DelinquencyBucketData.class); } // TODO: Rewrite to use fineract-client instead! @@ -159,7 +159,7 @@ public class DelinquencyBucketsHelper { jsonRange); rangeIds.add(delinquencyRangeResponse.getResourceId()); jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60); - GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); // Second Range @@ -187,7 +187,7 @@ public class DelinquencyBucketsHelper { log.info("Loan Delinquency Data is null"); } - GetDelinquencyRangesResponse delinquencyRange = getLoansLoanIdResponse.getDelinquencyRange(); + DelinquencyRangeData delinquencyRange = getLoansLoanIdResponse.getDelinquencyRange(); if (delinquencyRange != null) { log.info("Loan Delinquency Classification is {} : ({} - {}) {}", delinquencyRange.getClassification(), delinquencyRange.getMinimumAgeDays(), delinquencyRange.getMaximumAgeDays(), pastDueDays); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/products/DelinquencyRangesHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/products/DelinquencyRangesHelper.java index c02240942..db48ebe09 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/products/DelinquencyRangesHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/products/DelinquencyRangesHelper.java @@ -26,7 +26,7 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.HashMap; import org.apache.fineract.client.models.DeleteDelinquencyRangeResponse; -import org.apache.fineract.client.models.GetDelinquencyRangesResponse; +import org.apache.fineract.client.models.DelinquencyRangeData; import org.apache.fineract.client.models.PostDelinquencyRangeResponse; import org.apache.fineract.client.models.PutDelinquencyRangeResponse; import org.apache.fineract.client.util.JSON; @@ -47,11 +47,11 @@ public class DelinquencyRangesHelper { // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long, // org.apache.fineract.client.models.PostLoansLoanIdRequest) @Deprecated(forRemoval = true) - public static ArrayList getDelinquencyRanges(final RequestSpecification requestSpec, + public static ArrayList getDelinquencyRanges(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { String response = Utils.performServerGet(requestSpec, responseSpec, DELINQUENCY_RANGES_URL + "?" + Utils.TENANT_IDENTIFIER); - Type delinquencyRangeListType = new TypeToken>() {}.getType(); + Type delinquencyRangeListType = new TypeToken>() {}.getType(); return GSON.fromJson(response, delinquencyRangeListType); } @@ -59,12 +59,12 @@ public class DelinquencyRangesHelper { // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long, // org.apache.fineract.client.models.PostLoansLoanIdRequest) @Deprecated(forRemoval = true) - public static GetDelinquencyRangesResponse getDelinquencyRange(final RequestSpecification requestSpec, - final ResponseSpecification responseSpec, final Integer resourceId) { + public static DelinquencyRangeData getDelinquencyRange(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, + final Integer resourceId) { String response = Utils.performServerGet(requestSpec, responseSpec, DELINQUENCY_RANGES_URL + "/" + resourceId + "?" + Utils.TENANT_IDENTIFIER); LOG.info("----- {}", response); - return GSON.fromJson(response, GetDelinquencyRangesResponse.class); + return GSON.fromJson(response, DelinquencyRangeData.class); } // TODO: Rewrite to use fineract-client instead! diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/inlinecob/InlineLoanCOBTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/inlinecob/InlineLoanCOBTest.java index 3de729848..67b5fb04e 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/inlinecob/InlineLoanCOBTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/inlinecob/InlineLoanCOBTest.java @@ -36,8 +36,8 @@ import java.util.stream.LongStream; import lombok.extern.slf4j.Slf4j; import org.apache.fineract.batch.domain.BatchRequest; import org.apache.fineract.batch.domain.BatchResponse; -import org.apache.fineract.client.models.GetDelinquencyBucketsResponse; -import org.apache.fineract.client.models.GetDelinquencyRangesResponse; +import org.apache.fineract.client.models.DelinquencyBucketData; +import org.apache.fineract.client.models.DelinquencyRangeData; import org.apache.fineract.client.models.GetDelinquencyTagHistoryResponse; import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.PostDelinquencyBucketResponse; @@ -170,7 +170,7 @@ public class InlineLoanCOBTest extends BaseLoanIntegrationTest { rangeIds.add(delinquencyRangeResponse.getResourceId()); jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60); - GetDelinquencyRangesResponse range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, + DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId()); // Second Range @@ -185,7 +185,7 @@ public class InlineLoanCOBTest extends BaseLoanIntegrationTest { PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec, responseSpec, jsonBucket); assertNotNull(delinquencyBucketResponse); - final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, + final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec, delinquencyBucketResponse.getResourceId()); final Integer loanProductID = createLoanProduct(loanTransactionHelper, Math.toIntExact(delinquencyBucket.getId()));