diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java index 41adc66c32f..889db5dd564 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java @@ -119,7 +119,7 @@ public FinancialActivityAccountData retreive(@PathParam("mappingId") @Parameter( @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create a new Financial Activity to Accounts Mapping", description = """ + @Operation(summary = "Create a new Financial Activity to Accounts Mapping", operationId = "createGLAccountMappingFinancialActivityAccount", description = """ Mandatory Fields financialActivityId, glAccountId""") @RequestBody(content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.PostFinancialActivityAccountsRequest.class))) @@ -135,7 +135,7 @@ public CommandProcessingResult createGLAccount(@Parameter(hidden = true) Financi @Path("{mappingId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Financial Activity to Account Mapping", description = "the API updates the Ledger account linked to a Financial Activity") + @Operation(summary = "Update a Financial Activity to Account Mapping", operationId = "updateGLAccountMappingFinancialActivityAccount", description = "the API updates the Ledger account linked to a Financial Activity") @RequestBody(content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.PostFinancialActivityAccountsRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.PutFinancialActivityAccountsResponse.class))) public CommandProcessingResult updateGLAccount(@PathParam("mappingId") @Parameter(description = "mappingId") final Long mappingId, @@ -150,7 +150,7 @@ public CommandProcessingResult updateGLAccount(@PathParam("mappingId") @Paramete @Path("{mappingId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Financial Activity to Account Mapping") + @Operation(summary = "Delete a Financial Activity to Account Mapping", operationId = "deleteGLAccountMappingFinancialActivityAccount") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.DeleteFinancialActivityAccountsResponse.class))) public CommandProcessingResult deleteGLAccount(@PathParam("mappingId") @Parameter(description = "mappingId") final Long mappingId) { final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteOfficeToGLAccountMapping(mappingId).build(); diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java index 03ec4c66bba..474add0243c 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java @@ -181,11 +181,12 @@ public GLAccountData retreiveAccount(@PathParam("glAccountId") @Parameter(descri @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(tags = { "General Ledger Account" }, summary = "Create a General Ledger Account", description = """ - Note: You may optionally create Hierarchical Chart of Accounts by using the "parentId" property of an Account - Mandatory Fields: - name, glCode, type, usage and manualEntriesAllowed - """) + @Operation(tags = { + "General Ledger Account" }, summary = "Create a General Ledger Account", operationId = "createGLAccount", description = """ + Note: You may optionally create Hierarchical Chart of Accounts by using the "parentId" property of an Account + Mandatory Fields: + name, glCode, type, usage and manualEntriesAllowed + """) @RequestBody(content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.PostGLAccountsRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.PostGLAccountsResponse.class))) public CommandProcessingResult createGLAccount(@Parameter(hidden = true) GLAccountCommand glAccountCommand) { @@ -198,7 +199,8 @@ public CommandProcessingResult createGLAccount(@Parameter(hidden = true) GLAccou @Path("{glAccountId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(tags = { "General Ledger Account" }, summary = "Update a GL Account", description = "Updates a GL Account") + @Operation(tags = { + "General Ledger Account" }, summary = "Update a GL Account", operationId = "updateGLAccount", description = "Updates a GL Account") @RequestBody(content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.PutGLAccountsRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.PutGLAccountsResponse.class))) public CommandProcessingResult updateGLAccount(@PathParam("glAccountId") @Parameter(description = "glAccountId") final Long glAccountId, @@ -212,7 +214,8 @@ public CommandProcessingResult updateGLAccount(@PathParam("glAccountId") @Parame @Path("{glAccountId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(tags = { "General Ledger Account" }, summary = "Delete a GL Account", description = "Deletes a GL Account") + @Operation(tags = { + "General Ledger Account" }, summary = "Delete a GL Account", operationId = "deleteGLAccount", description = "Deletes a GL Account") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.DeleteGLAccountsResponse.class))) public CommandProcessingResult deleteGLAccount( @PathParam("glAccountId") @Parameter(description = "glAccountId") final Long glAccountId) { diff --git a/fineract-client/src/test/java/org/apache/fineract/client/test/FineractClientDemo.java b/fineract-client/src/test/java/org/apache/fineract/client/test/FineractClientDemo.java index 9e4950b56f8..93676262e94 100644 --- a/fineract-client/src/test/java/org/apache/fineract/client/test/FineractClientDemo.java +++ b/fineract-client/src/test/java/org/apache/fineract/client/test/FineractClientDemo.java @@ -41,7 +41,7 @@ void demoClient() { // tag::documentation[] FineractClient fineract = FineractClient.builder().baseURL("https://demo.fineract.dev/fineract-provider/api/v1/").tenant("default") .basicAuth("mifos", "password").build(); - List staff = Calls.ok(fineract.staff.retrieveAll16(1L, true, false, "ACTIVE")); + List staff = Calls.ok(fineract.staff.retrieveAllStaff(1L, true, false, "ACTIVE")); String name = staff.get(0).getDisplayName(); log.info("Display name: {}", name); // end::documentation[] diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java index 4be438b08ea..a0d800c8d8c 100644 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java @@ -112,7 +112,7 @@ public PaymentTypeUpdateResponse updatePaymentType(@PathParam("paymentTypeId") f @Path("{paymentTypeId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Payment Type", description = "Deletes payment type") + @Operation(summary = "Delete a Payment Type", operationId = "deleteCodePaymentType", description = "Deletes payment type") public PaymentTypeDeleteResponse deleteCode(@PathParam("paymentTypeId") final Long paymentTypeId) { final var command = new PaymentTypeDeleteCommand(); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/codevalue/CodeValueResolver.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/codevalue/CodeValueResolver.java index 0c8409d5b57..fdb90f93a05 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/codevalue/CodeValueResolver.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/codevalue/CodeValueResolver.java @@ -53,7 +53,7 @@ public long resolve(Long codeId, CodeValue codeValue) { public long resolve(String codeName, String codeValue) { log.debug("Resolving code value by code id and name [{}]", codeValue); List codeValuesResponses = ok( - () -> fineractClient.codeValues().retrieveAllCodeValues1(codeName, Map.of())); + () -> fineractClient.codeValues().retrieveAllCodeValuesByCodeName(codeName, Map.of())); GetCodeValuesDataResponse foundPtr = codeValuesResponses.stream().filter(ptr -> codeValue.equals(ptr.getName())).findAny() .orElseThrow(() -> new IllegalArgumentException("Code Value [%s] not found for Code [%s]".formatted(codeValue, codeName))); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/helper/GlobalConfigurationHelper.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/helper/GlobalConfigurationHelper.java index 7a2d6a64641..2ca73cfc3c5 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/helper/GlobalConfigurationHelper.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/helper/GlobalConfigurationHelper.java @@ -50,7 +50,7 @@ private void switchAndSetGlobalConfiguration(String configKey, boolean enabled, PutGlobalConfigurationsRequest updateRequest = new PutGlobalConfigurationsRequest().enabled(enabled).value(value); - ok(() -> fineractClient.globalConfiguration().updateConfiguration1(configId, updateRequest, Map.of())); + ok(() -> fineractClient.globalConfiguration().updateGlobalConfiguration(configId, updateRequest, Map.of())); GlobalConfigurationPropertyData updatedConfiguration = ok( () -> fineractClient.globalConfiguration().retrieveOneByName(configKey, Map.of())); boolean isEnabled = BooleanUtils.toBoolean(updatedConfiguration.getEnabled()); @@ -64,7 +64,7 @@ public void setGlobalConfigValueString(String configKey, String value) { PutGlobalConfigurationsRequest updateRequest = new PutGlobalConfigurationsRequest().enabled(true).stringValue(value); - ok(() -> fineractClient.globalConfiguration().updateConfiguration1(configId, updateRequest, Map.of())); + ok(() -> fineractClient.globalConfiguration().updateGlobalConfiguration(configId, updateRequest, Map.of())); GlobalConfigurationPropertyData updatedConfiguration = ok( () -> fineractClient.globalConfiguration().retrieveOneByName(configKey, Map.of())); boolean isEnabled = BooleanUtils.toBoolean(updatedConfiguration.getEnabled()); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/messaging/event/EventCheckHelper.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/messaging/event/EventCheckHelper.java index 3f3bf28f142..0c591332caf 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/messaging/event/EventCheckHelper.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/messaging/event/EventCheckHelper.java @@ -113,7 +113,7 @@ private void waitForTransactionCommit() { public void clientEventCheck(PostClientsResponse clientCreationResponse) { waitForTransactionCommit(); - GetClientsClientIdResponse body = ok(() -> fineractClient.clients().retrieveOne11(clientCreationResponse.getClientId(), + GetClientsClientIdResponse body = ok(() -> fineractClient.clients().retrieveOneClient(clientCreationResponse.getClientId(), Map.of("staffInSelectedOfficeOnly", false))); Long clientId = Long.valueOf(body.getId()); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/service/JobService.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/service/JobService.java index e18f6600988..33a68d3eb87 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/service/JobService.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/service/JobService.java @@ -71,7 +71,7 @@ private void waitUntilJobIsFinished(Job job) { .until(() -> { log.debug("Waiting for job {} to finish", jobName); Long jobId = jobResolver.resolve(job); - GetJobsResponse getJobsResponse = ok(() -> fineractClient.schedulerJob().retrieveOne5(jobId)); + GetJobsResponse getJobsResponse = ok(() -> fineractClient.schedulerJob().retrieveOneSchedulerJob(jobId)); Boolean currentlyRunning = getJobsResponse.getCurrentlyRunning(); return BooleanUtils.isFalse(currentlyRunning); }); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/assetexternalization/AssetExternalizationStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/assetexternalization/AssetExternalizationStepDef.java index e64c3496664..39ae500f533 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/assetexternalization/AssetExternalizationStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/assetexternalization/AssetExternalizationStepDef.java @@ -804,7 +804,7 @@ public void adminTransactionCommandTheWithType(String command, String type) thro String transferExternalId = testContext() .get(TestContextKey.ASSET_EXTERNALIZATION_TRANSFER_EXTERNAL_ID_USER_GENERATED + "_" + type); - externalAssetOwnersApi().transferRequestWithId1(transferExternalId, Map.of("command", command)); + externalAssetOwnersApi().transferRequestWithIdByExternalId(transferExternalId, Map.of("command", command)); } @When("Admin send {string} command to the transaction type {string} will throw error") @@ -813,7 +813,7 @@ public void adminTransactionCommandTheWithTypeThrowError(String command, String .get(TestContextKey.ASSET_EXTERNALIZATION_TRANSFER_EXTERNAL_ID_USER_GENERATED + "_" + type); CallFailedRuntimeException exception = fail( - () -> externalAssetOwnersApi().transferRequestWithId1(transferExternalId, Map.of("command", command))); + () -> externalAssetOwnersApi().transferRequestWithIdByExternalId(transferExternalId, Map.of("command", command))); assertThat(exception.getStatus()).as("Expected status code: 403").isEqualTo(403); } @@ -875,7 +875,7 @@ public void adminSendCommandAndItWillThrowError(String command, String transacti } CallFailedRuntimeException exception = fail( - () -> externalAssetOwnersApi().transferRequestWithId1(transferExternalId, Map.of("command", command))); + () -> externalAssetOwnersApi().transferRequestWithIdByExternalId(transferExternalId, Map.of("command", command))); assertThat(exception.getStatus()).as("Expected status code: 403").isEqualTo(403); } @@ -889,7 +889,7 @@ public void adminSendCommand(String command, String transactionType) throws IOEx transferExternalId = testContext().get(TestContextKey.ASSET_EXTERNALIZATION_SALES_TRANSFER_EXTERNAL_ID_FROM_RESPONSE); } - externalAssetOwnersApi().transferRequestWithId1(transferExternalId, Map.of("command", command)); + externalAssetOwnersApi().transferRequestWithIdByExternalId(transferExternalId, Map.of("command", command)); } @When("Admin set external asset owner loan product attribute {string} value {string} for loan product {string}") diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/BatchApiStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/BatchApiStepDef.java index 0bbec9400f5..7dcfedbfee8 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/BatchApiStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/BatchApiStepDef.java @@ -552,7 +552,7 @@ public void runBatchApiCreateAndApproveLoanRescheduleWithGivenUserLockedByCobErr // Create new user which cannot bypass loan COB execution PostUsersResponse createUserResponse = testContext().get(TestContextKey.CREATED_SIMPLE_USER_RESPONSE); Long createdUserId = createUserResponse.getResourceId(); - GetUsersUserIdResponse user = fineractFeignClient.users().retrieveOne30(createdUserId); + GetUsersUserIdResponse user = fineractFeignClient.users().retrieveOneUser(createdUserId); String authorizationString = user.getUsername() + ":" + PWD_USER_WITH_ROLE; Base64 base64 = new Base64(); headerMap.put("Authorization", @@ -849,7 +849,7 @@ public void givenClientCreated(int nr) throws IOException { Map clientQueryParams = new HashMap<>(); clientQueryParams.put("staffInSelectedOfficeOnly", false); - GetClientsClientIdResponse response = clientApi().retrieveOne12(clientExternalId, clientQueryParams); + GetClientsClientIdResponse response = clientApi().retrieveOneClientByExternalId(clientExternalId, clientQueryParams); assertThat(response.getId()).as(ErrorMessageHelper.idNull()).isNotNull(); } @@ -866,7 +866,7 @@ public void givenLoanCreated(int nr) throws IOException { Map loanQueryParams = new HashMap<>(); loanQueryParams.put("staffInSelectedOfficeOnly", false); - GetLoansLoanIdResponse response = loansApi().retrieveLoan1(loanExternalId, loanQueryParams); + GetLoansLoanIdResponse response = loansApi().retrieveLoanByExternalId(loanExternalId, loanQueryParams); assertThat(response.getId()).as(ErrorMessageHelper.idNull()).isNotNull(); } @@ -883,7 +883,7 @@ public void givenLoanApproved(int nr) throws IOException { Map loanQueryParams = new HashMap<>(); loanQueryParams.put("staffInSelectedOfficeOnly", false); - GetLoansLoanIdResponse response = loansApi().retrieveLoan1(loanExternalId, loanQueryParams); + GetLoansLoanIdResponse response = loansApi().retrieveLoanByExternalId(loanExternalId, loanQueryParams); GetLoansLoanIdStatus status = response.getStatus(); Long statusIdActual = status.getId(); Long statusIdExpected = LoanStatus.APPROVED.value.longValue(); @@ -910,7 +910,7 @@ public void clientNotCreated(int nr) throws IOException { try { Map clientQueryParams = new HashMap<>(); clientQueryParams.put("staffInSelectedOfficeOnly", false); - clientApi().retrieveOne12(clientExternalId, clientQueryParams); + clientApi().retrieveOneClientByExternalId(clientExternalId, clientQueryParams); throw new IllegalStateException("Expected Feign exception but call succeeded"); } catch (org.apache.fineract.client.feign.FeignException e) { errorResponse = fromJson(e.responseBodyAsString(), ErrorResponse.class); @@ -949,7 +949,7 @@ public void loanNotCreated(int nr) throws IOException { // Feign throws exceptions on errors instead of returning error in response body ErrorResponse errorResponse = null; try { - loansApi().retrieveLoan1(loanExternalId, loanQueryParams); + loansApi().retrieveLoanByExternalId(loanExternalId, loanQueryParams); throw new IllegalStateException("Expected Feign exception but call succeeded"); } catch (org.apache.fineract.client.feign.FeignException e) { errorResponse = fromJson(e.responseBodyAsString(), ErrorResponse.class); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/ClientStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/ClientStepDef.java index 4ada2c03041..47d2fea2274 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/ClientStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/ClientStepDef.java @@ -46,7 +46,7 @@ public class ClientStepDef extends AbstractStepDef { public void createClientRandomFirstNameLastName() { PostClientsRequest clientsRequest = clientRequestFactory.defaultClientCreationRequest(); - PostClientsResponse response = ok(() -> fineractClient.clients().create6(clientsRequest)); + PostClientsResponse response = ok(() -> fineractClient.clients().createClient(clientsRequest)); testContext().set(TestContextKey.CLIENT_CREATE_RESPONSE, response); eventCheckHelper.clientEventCheck(response); @@ -59,7 +59,7 @@ public void createClientInLastCreatedOffice() { final PostClientsRequest clientsRequest = clientRequestFactory.defaultClientCreationRequest()// .officeId(officeResponse.getOfficeId()); - final PostClientsResponse response = ok(() -> fineractClient.clients().create6(clientsRequest)); + final PostClientsResponse response = ok(() -> fineractClient.clients().createClient(clientsRequest)); testContext().set(TestContextKey.CLIENT_CREATE_RESPONSE, response); eventCheckHelper.clientEventCheck(response); @@ -69,7 +69,7 @@ public void createClientInLastCreatedOffice() { public void createSecondClientRandomFirstNameLastName() { PostClientsRequest clientsRequest = clientRequestFactory.defaultClientCreationRequest(); - PostClientsResponse response = ok(() -> fineractClient.clients().create6(clientsRequest)); + PostClientsResponse response = ok(() -> fineractClient.clients().createClient(clientsRequest)); testContext().set(TestContextKey.CLIENT_CREATE_SECOND_CLIENT_RESPONSE, response); eventCheckHelper.clientEventCheck(response); @@ -79,7 +79,7 @@ public void createSecondClientRandomFirstNameLastName() { public void createClient(String firstName, String lastName) { PostClientsRequest clientsRequest = clientRequestFactory.defaultClientCreationRequest().firstname(firstName).lastname(lastName); - PostClientsResponse response = ok(() -> fineractClient.clients().create6(clientsRequest)); + PostClientsResponse response = ok(() -> fineractClient.clients().createClient(clientsRequest)); testContext().set(TestContextKey.CLIENT_CREATE_RESPONSE, response); } @@ -98,7 +98,7 @@ public void createClientWithAddress(String firstName, String lastName) { PostClientsRequest clientsRequest = clientRequestFactory.defaultClientCreationRequest().firstname(firstName).lastname(lastName) .address(Collections.singletonList(addressRequest)); - PostClientsResponse response = ok(() -> fineractClient.clients().create6(clientsRequest)); + PostClientsResponse response = ok(() -> fineractClient.clients().createClient(clientsRequest)); testContext().set(TestContextKey.CLIENT_CREATE_RESPONSE, response); } @@ -109,7 +109,7 @@ public void createClientWithSpecifiedDates(String firstName, String lastName, St PostClientsRequest clientsRequest = clientRequestFactory.defaultClientCreationRequest().firstname(firstName).lastname(lastName) .activationDate(activationDate); - PostClientsResponse response = ok(() -> fineractClient.clients().create6(clientsRequest)); + PostClientsResponse response = ok(() -> fineractClient.clients().createClient(clientsRequest)); testContext().set(TestContextKey.CLIENT_CREATE_RESPONSE, response); } diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/GlobalConfigurationStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/GlobalConfigurationStepDef.java index 88ea76f9928..3f2b38a68a8 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/GlobalConfigurationStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/GlobalConfigurationStepDef.java @@ -60,7 +60,7 @@ public void setGlobalConfigValueString(String configKey, String configValue) { @When("Global config {string} value set to {string} through DefaultApi") public void setGlobalConfigValueStringDefaultApi(String configKey, String configValue) { Long configValueLong = Long.valueOf(configValue); - fineractClient.defaultApi().updateGlobalConfiguration(configKey, configValueLong); + fineractClient.defaultApi().updateInternalGlobalConfiguration(configKey, configValueLong); } @When("Update currency with incorrect empty value outcomes with an error") diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/JournalEntriesStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/JournalEntriesStepDef.java index 41c9feb94bd..a8d7ce07bc4 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/JournalEntriesStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/JournalEntriesStepDef.java @@ -172,7 +172,7 @@ public List> getJournalLinesActualList(List journalQueryParams = new HashMap<>(); journalQueryParams.put("transactionId", transactionId); journalQueryParams.put("runningBalance", true); - journalEntryDataResponse = journalEntriesApi().retrieveAll1(journalQueryParams); + journalEntryDataResponse = journalEntriesApi().retrieveAllJournalEntries(journalQueryParams); } catch (Exception e) { log.error("Exception", e); } @@ -222,7 +222,7 @@ public void capitalizedIncomeAmortizationJournalEntryDataCheck(final DataTable t journalQueryParams.put("transactionId", transactionId); journalQueryParams.put("loanId", loanId); journalQueryParams.put("runningBalance", true); - journalEntryDataResponse = journalEntriesApi().retrieveAll1(journalQueryParams); + journalEntryDataResponse = journalEntriesApi().retrieveAllJournalEntries(journalQueryParams); } catch (Exception e) { log.error("Exception", e); } @@ -297,7 +297,7 @@ public void revertedJournalEntryDataCheck(String transactionType, String transac Map journalQueryParams = new HashMap<>(); journalQueryParams.put("transactionId", t); journalQueryParams.put("runningBalance", true); - journalEntryDataResponse = journalEntriesApi().retrieveAll1(journalQueryParams); + journalEntryDataResponse = journalEntriesApi().retrieveAllJournalEntries(journalQueryParams); } catch (Exception e) { log.error("Exception", e); } @@ -364,7 +364,7 @@ public void journalEntryNoDataCheck(String transactionType, String transactionDa Map journalQueryParams = new HashMap<>(); journalQueryParams.put("transactionId", transactionId); journalQueryParams.put("runningBalance", true); - journalEntryDataResponse = journalEntriesApi().retrieveAll1(journalQueryParams); + journalEntryDataResponse = journalEntriesApi().retrieveAllJournalEntries(journalQueryParams); } catch (Exception e) { log.error("Exception", e); } @@ -436,7 +436,7 @@ public void checkManualJournalEntry(String externalAssetOwnerEnabled, DataTable Map journalQueryParams = new HashMap<>(); journalQueryParams.put("transactionId", transactionId); journalQueryParams.put("runningBalance", true); - journalEntryDataResponse = journalEntriesApi().retrieveAll1(journalQueryParams); + journalEntryDataResponse = journalEntriesApi().retrieveAllJournalEntries(journalQueryParams); } catch (Exception e) { log.error("Exception", e); } diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/UserStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/UserStepDef.java index 02075d7dd95..0a2ccacd9a9 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/UserStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/UserStepDef.java @@ -68,7 +68,7 @@ public void createUserWithUsernameAndRoles(String username, String roleName, Lis .repeatPassword(PWD_USER_WITH_ROLE) // .roles(List.of(roleId)); - PostUsersResponse createUserResponse = ok(() -> fineractClient.users().create15(postUsersRequest)); + PostUsersResponse createUserResponse = ok(() -> fineractClient.users().createUser(postUsersRequest)); testContext().set(TestContextKey.CREATED_SIMPLE_USER_RESPONSE, createUserResponse); testContext().set(TestContextKey.CREATED_SIMPLE_USER_USERNAME, generatedUsername); testContext().set(TestContextKey.CREATED_SIMPLE_USER_PASSWORD, PWD_USER_WITH_ROLE); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanChargeAdjustmentStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanChargeAdjustmentStepDef.java index 6d5d4035f01..dda5777b467 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanChargeAdjustmentStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanChargeAdjustmentStepDef.java @@ -92,7 +92,7 @@ public void loanChargeAdjustmentFailedOnWrongAmount(String chargeTypeEnum, Strin String developerMessageExpected = "Transaction amount cannot be higher than the available charge amount for adjustment: 7.000000"; try { - fineractClient.loanCharges().executeLoanCharge2(loanId, transactionId, chargeAdjustmentRequest, + fineractClient.loanCharges().executeLoanChargeOnExistingCharge(loanId, transactionId, chargeAdjustmentRequest, Map.of("command", "adjustment")); throw new AssertionError("Expected FeignException but request succeeded"); } catch (FeignException e) { @@ -165,8 +165,9 @@ private void makeChargeAdjustmentCall(Long loanId, Long transactionId, String ex PostLoansLoanIdChargesChargeIdRequest chargeAdjustmentRequest = LoanRequestFactory.defaultChargeAdjustmentRequest() .amount(transactionAmount).externalId(externalId); - PostLoansLoanIdChargesChargeIdResponse chargeAdjustmentResponse = ok(() -> fineractClient.loanCharges().executeLoanCharge2(loanId, - transactionId, chargeAdjustmentRequest, Map.of("command", "adjustment"))); + PostLoansLoanIdChargesChargeIdResponse chargeAdjustmentResponse = ok( + () -> fineractClient.loanCharges().executeLoanChargeOnExistingCharge(loanId, transactionId, chargeAdjustmentRequest, + Map.of("command", "adjustment"))); testContext().set(TestContextKey.LOAN_CHARGE_ADJUSTMENT_RESPONSE, chargeAdjustmentResponse); eventCheckHelper.loanBalanceChangedEventCheck(loanId); } diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanChargeStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanChargeStepDef.java index 25a161cf12b..385b52ad0df 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanChargeStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanChargeStepDef.java @@ -245,8 +245,8 @@ public void waiveCharge() throws IOException { PostLoansLoanIdChargesChargeIdRequest waiveRequest = new PostLoansLoanIdChargesChargeIdRequest(); - PostLoansLoanIdChargesChargeIdResponse waiveResponse = ok(() -> fineractClient.loanCharges().executeLoanCharge2(loanId, chargeId, - waiveRequest, Map.of("command", "waive"))); + PostLoansLoanIdChargesChargeIdResponse waiveResponse = ok(() -> fineractClient.loanCharges() + .executeLoanChargeOnExistingCharge(loanId, chargeId, waiveRequest, Map.of("command", "waive"))); testContext().set(TestContextKey.WAIVE_CHARGE_RESPONSE, waiveResponse); } @@ -260,8 +260,8 @@ public void waiveDueDateCharge() throws IOException { PostLoansLoanIdChargesChargeIdRequest waiveRequest = new PostLoansLoanIdChargesChargeIdRequest(); - PostLoansLoanIdChargesChargeIdResponse waiveResponse = ok(() -> fineractClient.loanCharges().executeLoanCharge2(loanId, chargeId, - waiveRequest, Map.of("command", "waive"))); + PostLoansLoanIdChargesChargeIdResponse waiveResponse = ok(() -> fineractClient.loanCharges() + .executeLoanChargeOnExistingCharge(loanId, chargeId, waiveRequest, Map.of("command", "waive"))); testContext().set(TestContextKey.WAIVE_CHARGE_RESPONSE, waiveResponse); } 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 7582065fd77..e309ac0a6f1 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 @@ -277,7 +277,7 @@ public void delinquencyPauseByLoanExternalId(String startDate, String endDate) { .locale(DEFAULT_LOCALE);// PostLoansDelinquencyActionResponse response = ok( - () -> fineractClient.loans().createLoanDelinquencyAction1(loanExternalId, request)); + () -> fineractClient.loans().createLoanDelinquencyActionByExternalId(loanExternalId, request)); testContext().set(TestContextKey.LOAN_DELINQUENCY_ACTION_RESPONSE, response); eventCheckHelper.loanAccountDelinquencyPauseChangedBusinessEventCheck(loanId); } @@ -295,7 +295,7 @@ public void delinquencyResumeByLoanExternalId(String startDate) { .locale(DEFAULT_LOCALE);// PostLoansDelinquencyActionResponse response = ok( - () -> fineractClient.loans().createLoanDelinquencyAction1(loanExternalId, request)); + () -> fineractClient.loans().createLoanDelinquencyActionByExternalId(loanExternalId, request)); testContext().set(TestContextKey.LOAN_DELINQUENCY_ACTION_RESPONSE, response); eventCheckHelper.loanAccountDelinquencyPauseChangedBusinessEventCheck(loanId); } diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanOriginationStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanOriginationStepDef.java index 1ade03c99b5..9bab16f1573 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanOriginationStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanOriginationStepDef.java @@ -109,7 +109,7 @@ public void createOriginatorWithAllFields(String name) { PostLoanOriginatorsRequest request = new PostLoanOriginatorsRequest().externalId(externalId).name(name) .originatorTypeId(originatorType.getId()).channelTypeId(channelType.getId()); - PostLoanOriginatorsResponse response = ok(() -> fineractClient.loanOriginators().create11(request)); + PostLoanOriginatorsResponse response = ok(() -> fineractClient.loanOriginators().createLoanOriginator(request)); assertThat(response.getResourceId()).isNotNull(); testContext().set(TestContextKey.ORIGINATOR_CREATE_RESPONSE, response); @@ -131,7 +131,7 @@ public void verifyOriginatorStatus(String expectedStatus) { PostLoanOriginatorsResponse createResponse = testContext().get(TestContextKey.ORIGINATOR_CREATE_RESPONSE); Long originatorId = createResponse.getResourceId(); - GetLoanOriginatorsResponse originator = ok(() -> fineractClient.loanOriginators().retrieveOne18(originatorId)); + GetLoanOriginatorsResponse originator = ok(() -> fineractClient.loanOriginators().retrieveOneLoanOriginator(originatorId)); assertThat(originator.getStatus()).isEqualTo(expectedStatus); assertThat(originator.getExternalId()).isEqualTo(testContext().get(TestContextKey.ORIGINATOR_EXTERNAL_ID)); @@ -145,7 +145,7 @@ public void verifyOriginatorAllFields() { String expectedOriginatorTypeName = testContext().get(TestContextKey.ORIGINATOR_TYPE_NAME); String expectedChannelTypeName = testContext().get(TestContextKey.ORIGINATOR_CHANNEL_TYPE_NAME); - GetLoanOriginatorsResponse originator = ok(() -> fineractClient.loanOriginators().retrieveOne18(originatorId)); + GetLoanOriginatorsResponse originator = ok(() -> fineractClient.loanOriginators().retrieveOneLoanOriginator(originatorId)); assertThat(originator.getId()).as("Originator ID").isNotNull(); assertThat(originator.getExternalId()).as("Originator externalId").isEqualTo(expectedExternalId); @@ -216,7 +216,7 @@ public void verifyOriginatorWithAllFieldsInLoanDetails(String association) { // Verify type fields via direct originator GET (loan details serializes CodeValueData as nested objects // which don't map to the flat fields in the generated client model) - GetLoanOriginatorsResponse originatorDetails = ok(() -> fineractClient.loanOriginators().retrieveOne18(originatorId)); + GetLoanOriginatorsResponse originatorDetails = ok(() -> fineractClient.loanOriginators().retrieveOneLoanOriginator(originatorId)); assertThat(originatorDetails.getOriginatorType()).as("Originator type").isNotNull(); assertThat(originatorDetails.getOriginatorType().getName()).as("Originator type name").isEqualTo(expectedOriginatorTypeName); assertThat(originatorDetails.getChannelType()).as("Channel type").isNotNull(); @@ -335,7 +335,7 @@ public void attachOriginatorToNonExistentLoanShouldFail(int expectedStatus) { public void createOriginatorWithoutNameShouldFail(int expectedStatus) { PostLoanOriginatorsRequest request = new PostLoanOriginatorsRequest().externalId(UUID.randomUUID().toString()); - CallFailedRuntimeException exception = fail(() -> fineractClient.loanOriginators().create11(request)); + CallFailedRuntimeException exception = fail(() -> fineractClient.loanOriginators().createLoanOriginator(request)); assertExpectedStatus(exception, expectedStatus); log.info("Create originator without name failed with expected status {}", expectedStatus); } @@ -344,7 +344,7 @@ public void createOriginatorWithoutNameShouldFail(int expectedStatus) { public void createOriginatorWithoutNameSucceeds() { PostLoanOriginatorsRequest request = new PostLoanOriginatorsRequest().externalId(UUID.randomUUID().toString()); - PostLoanOriginatorsResponse response = ok(() -> fineractClient.loanOriginators().create11(request)); + PostLoanOriginatorsResponse response = ok(() -> fineractClient.loanOriginators().createLoanOriginator(request)); assertThat(response.getResourceId()).as("Originator created without name").isNotNull(); log.info("Created originator without name, resourceId {}", response.getResourceId()); } @@ -382,7 +382,7 @@ public void userWithoutCreatePermissionFails() { PostLoanOriginatorsRequest request = new PostLoanOriginatorsRequest().externalId(UUID.randomUUID().toString()) .name("Should Fail Originator"); - CallFailedRuntimeException exception = fail(() -> userClient.loanOriginators().create11(request)); + CallFailedRuntimeException exception = fail(() -> userClient.loanOriginators().createLoanOriginator(request)); assertExpectedStatus(exception, 403); log.info("User without CREATE_LOAN_ORIGINATOR permission failed to create originator as expected"); } @@ -394,7 +394,7 @@ public void userWithoutUpdatePermissionFails() { PutLoanOriginatorsRequest updateRequest = new PutLoanOriginatorsRequest().name("Should Fail Update"); - CallFailedRuntimeException exception = fail(() -> userClient.loanOriginators().update16(originatorId, updateRequest)); + CallFailedRuntimeException exception = fail(() -> userClient.loanOriginators().updateLoanOriginator(originatorId, updateRequest)); assertExpectedStatus(exception, 403); log.info("User without UPDATE_LOAN_ORIGINATOR permission failed to update originator {} as expected", originatorId); } @@ -404,7 +404,7 @@ public void userWithoutDeletePermissionFails() { long originatorId = getOriginatorId(); FineractFeignClient userClient = createClientForUser(); - CallFailedRuntimeException exception = fail(() -> userClient.loanOriginators().delete14(originatorId)); + CallFailedRuntimeException exception = fail(() -> userClient.loanOriginators().deleteLoanOriginator(originatorId)); assertExpectedStatus(exception, 403); log.info("User without DELETE_LOAN_ORIGINATOR permission failed to delete originator {} as expected", originatorId); } @@ -487,7 +487,7 @@ public void retrieveOriginatorByExternalIdWithAllFields() { public void verifyOriginatorInList() { long expectedId = getOriginatorId(); - List allOriginators = ok(() -> fineractClient.loanOriginators().retrieveAll28()); + List allOriginators = ok(() -> fineractClient.loanOriginators().retrieveAllLoanOriginators()); assertThat(allOriginators).as("Originator list should not be null or empty").isNotNull().isNotEmpty(); @@ -515,7 +515,8 @@ public void updateOriginatorById(String newName, String newStatus) { PutLoanOriginatorsRequest updateRequest = new PutLoanOriginatorsRequest().name(newName).status(newStatus); - PutLoanOriginatorsResponse updateResponse = ok(() -> fineractClient.loanOriginators().update16(originatorId, updateRequest)); + PutLoanOriginatorsResponse updateResponse = ok( + () -> fineractClient.loanOriginators().updateLoanOriginator(originatorId, updateRequest)); assertThat(updateResponse.getResourceId()).as("Updated originator resource ID").isEqualTo(originatorId); log.info("Updated originator {} with name={}, status={}", originatorId, newName, newStatus); @@ -538,7 +539,7 @@ public void updateOriginatorByExternalId(String newName) { public void verifyOriginatorNameAndStatus(String expectedName, String expectedStatus) { long originatorId = getOriginatorId(); - GetLoanOriginatorsResponse originator = ok(() -> fineractClient.loanOriginators().retrieveOne18(originatorId)); + GetLoanOriginatorsResponse originator = ok(() -> fineractClient.loanOriginators().retrieveOneLoanOriginator(originatorId)); assertThat(originator.getName()).as("Originator name").isEqualTo(expectedName); assertThat(originator.getStatus()).as("Originator status").isEqualTo(expectedStatus); @@ -559,7 +560,7 @@ public void verifyOriginatorByExternalIdHasName(String expectedName) { public void deleteOriginatorById() { long originatorId = getOriginatorId(); - DeleteLoanOriginatorsResponse deleteResponse = ok(() -> fineractClient.loanOriginators().delete14(originatorId)); + DeleteLoanOriginatorsResponse deleteResponse = ok(() -> fineractClient.loanOriginators().deleteLoanOriginator(originatorId)); assertThat(deleteResponse.getResourceId()).as("Deleted originator resource ID").isEqualTo(originatorId); log.info("Deleted originator by ID {}", originatorId); @@ -579,7 +580,7 @@ public void deleteOriginatorByExternalId() { public void retrieveDeletedOriginatorByIdShouldFail(int expectedStatus) { long originatorId = getOriginatorId(); - CallFailedRuntimeException exception = fail(() -> fineractClient.loanOriginators().retrieveOne18(originatorId)); + CallFailedRuntimeException exception = fail(() -> fineractClient.loanOriginators().retrieveOneLoanOriginator(originatorId)); assertExpectedStatus(exception, expectedStatus); log.info("Retrieving deleted originator {} failed with expected status {}", originatorId, expectedStatus); } @@ -597,7 +598,7 @@ public void retrieveDeletedOriginatorByExternalIdShouldFail(int expectedStatus) public void deleteOriginatorShouldFailWithStatus(int expectedStatus) { long originatorId = getOriginatorId(); - CallFailedRuntimeException exception = fail(() -> fineractClient.loanOriginators().delete14(originatorId)); + CallFailedRuntimeException exception = fail(() -> fineractClient.loanOriginators().deleteLoanOriginator(originatorId)); assertExpectedStatus(exception, expectedStatus); log.info("Deleting originator {} failed with expected status {}", originatorId, expectedStatus); } @@ -621,7 +622,7 @@ private void createOriginatorAndStore(String name, String status, String respons request.status(status); } - PostLoanOriginatorsResponse response = ok(() -> fineractClient.loanOriginators().create11(request)); + PostLoanOriginatorsResponse response = ok(() -> fineractClient.loanOriginators().createLoanOriginator(request)); assertThat(response.getResourceId()).isNotNull(); testContext().set(responseKey, response); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanReAgingStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanReAgingStepDef.java index eb5f1fc983f..3f46a3f5685 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanReAgingStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanReAgingStepDef.java @@ -92,8 +92,8 @@ public void createReAgingTransactionByLoanExternalId(DataTable table) { table.row(1) // ); - PostLoansLoanIdTransactionsResponse response = ok(() -> fineractClient.loanTransactions().executeLoanTransaction1(loanExternalId, - reAgingRequest, Map.of("command", "reAge"))); + PostLoansLoanIdTransactionsResponse response = ok(() -> fineractClient.loanTransactions() + .executeLoanTransactionByLoanExternalId(loanExternalId, reAgingRequest, Map.of("command", "reAge"))); testContext().set(TestContextKey.LOAN_REAGING_RESPONSE, response); } @@ -171,7 +171,8 @@ public LoanScheduleData reAgingPreviewByLoanExternalId(DataTable table) { String loanExternalId = loanResponse.getResourceExternalId(); Map queryParams = resolveReAgingQueryParams(table); - LoanScheduleData result = ok(() -> fineractClient.loanTransactions().previewReAgeSchedule1(loanExternalId, queryParams)); + LoanScheduleData result = ok( + () -> fineractClient.loanTransactions().previewReAgeScheduleByLoanExternalId(loanExternalId, queryParams)); log.info("Re-aging preview is requested to be created with loan external ID: {} with parameters: {}", loanExternalId, queryParams); return result; } @@ -191,7 +192,7 @@ public void reAgePreviewChargedOffLoanFailure(final DataTable table) { Map queryParams = resolveReAgingQueryParams(table); CallFailedRuntimeException exception = fail( - () -> fineractClient.loanTransactions().previewReAgeSchedule1(loanExternalId, queryParams)); + () -> fineractClient.loanTransactions().previewReAgeScheduleByLoanExternalId(loanExternalId, queryParams)); assertThat(exception.getStatus()).as(ErrorMessageHelper.dateFailureErrorCodeMsg()).isEqualTo(403); assertThat(exception.getDeveloperMessage()).contains(ErrorMessageHelper.reAgeChargedOffLoanFailure()); @@ -205,7 +206,7 @@ public void reAgePreviewContractTerminatedLoanFailure(final DataTable table) { Map queryParams = resolveReAgingQueryParams(table); CallFailedRuntimeException exception = fail( - () -> fineractClient.loanTransactions().previewReAgeSchedule1(loanExternalId, queryParams)); + () -> fineractClient.loanTransactions().previewReAgeScheduleByLoanExternalId(loanExternalId, queryParams)); assertThat(exception.getStatus()).as(ErrorMessageHelper.dateFailureErrorCodeMsg()).isEqualTo(403); assertThat(exception.getDeveloperMessage()).contains(ErrorMessageHelper.reAgeContractTerminatedLoanFailure()); @@ -218,7 +219,7 @@ public void reAgePreviewClosedLoanFailure(final DataTable table) throws IOExcept Map queryParams = resolveReAgingQueryParams(table); CallFailedRuntimeException exception = fail( - () -> fineractClient.loanTransactions().previewReAgeSchedule1(loanExternalId, queryParams)); + () -> fineractClient.loanTransactions().previewReAgeScheduleByLoanExternalId(loanExternalId, queryParams)); assertThat(exception.getStatus()).as(ErrorMessageHelper.dateFailureErrorCodeMsg()).isEqualTo(403); assertThat(exception.getDeveloperMessage()).contains(ErrorMessageHelper.reAgeClosedLoanFailure()); @@ -391,8 +392,8 @@ public void adminCreatesALoanReAgingTransactionByLoanExternalIDWithTheFollowingD table.row(1) // ); - CallFailedRuntimeException response = fail(() -> fineractClient.loanTransactions().executeLoanTransaction1(loanExternalId, - reAgingRequest, Map.of("command", "reAge"))); + CallFailedRuntimeException response = fail(() -> fineractClient.loanTransactions() + .executeLoanTransactionByLoanExternalId(loanExternalId, reAgingRequest, Map.of("command", "reAge"))); assertThat(response.getStatus()).isEqualTo(errorCode); } diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanReAmortizationStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanReAmortizationStepDef.java index 54365c0963a..08540dbe392 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanReAmortizationStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanReAmortizationStepDef.java @@ -102,8 +102,8 @@ public void createLoanReAmortizationByLoanExternalId() { PostLoansLoanIdTransactionsRequest reAmortizationRequest = LoanRequestFactory.defaultLoanReAmortizationRequest(); - PostLoansLoanIdTransactionsResponse response = ok(() -> fineractClient.loanTransactions().executeLoanTransaction1(loanExternalId, - reAmortizationRequest, Map.of("command", "reAmortize"))); + PostLoansLoanIdTransactionsResponse response = ok(() -> fineractClient.loanTransactions() + .executeLoanTransactionByLoanExternalId(loanExternalId, reAmortizationRequest, Map.of("command", "reAmortize"))); testContext().set(TestContextKey.LOAN_REAMORTIZATION_RESPONSE, response); } @@ -222,7 +222,7 @@ public void createReAmortizedPreviewByLoanExternalIdFailsWithErrorCode(int error final Map queryParams = Map.of("reAmortizationInterestHandling", reAmortizationInterestHandling); CallFailedRuntimeException exception = fail( - () -> fineractClient.loanTransactions().previewReAmortizationSchedule1(loanExternalId, queryParams)); + () -> fineractClient.loanTransactions().previewReAmortizationScheduleByLoanExternalId(loanExternalId, queryParams)); assertThat(exception.getStatus()).isEqualTo(errorCode); } @@ -271,7 +271,7 @@ private LoanScheduleData reAmortizedPreviewByLoanExternalId(final DataTable tabl final String reAmortizationInterestHandling = data.getFirst(); final Map queryParams = Map.of("reAmortizationInterestHandling", reAmortizationInterestHandling); - return ok(() -> fineractClient.loanTransactions().previewReAmortizationSchedule1(loanExternalId, queryParams)); + return ok(() -> fineractClient.loanTransactions().previewReAmortizationScheduleByLoanExternalId(loanExternalId, queryParams)); } @SuppressFBWarnings("SF_SWITCH_NO_DEFAULT") diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanRepaymentStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanRepaymentStepDef.java index 2cb69ac4711..fb73fd5402f 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanRepaymentStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanRepaymentStepDef.java @@ -145,7 +145,7 @@ public void makeRepaymentWithGivenUser(String repaymentType, String transactionD PostUsersResponse createUserResponse = testContext().get(TestContextKey.CREATED_SIMPLE_USER_RESPONSE); Long createdUserId = createUserResponse.getResourceId(); - GetUsersUserIdResponse user = ok(() -> fineractClient.users().retrieveOne30(createdUserId)); + GetUsersUserIdResponse user = ok(() -> fineractClient.users().retrieveOneUser(createdUserId)); String apiBaseUrl = apiProperties.getBaseUrl() + "/fineract-provider/api/"; FineractFeignClient userClient = FineractFeignClient.builder().baseUrl(apiBaseUrl) @@ -174,8 +174,9 @@ public void makeRepaymentByExternalId(String repaymentType, String transactionDa String idempotencyKey = UUID.randomUUID().toString(); testContext().set(TestContextKey.TRANSACTION_IDEMPOTENCY_KEY, idempotencyKey); - PostLoansLoanIdTransactionsResponse repaymentResponse = ok(() -> fineractClient.loanTransactions() - .executeLoanTransaction1(resourceExternalId, repaymentRequest, Map.of("command", "repayment"))); + PostLoansLoanIdTransactionsResponse repaymentResponse = ok( + () -> fineractClient.loanTransactions().executeLoanTransactionByLoanExternalId(resourceExternalId, repaymentRequest, + Map.of("command", "repayment"))); testContext().set(TestContextKey.LOAN_REPAYMENT_RESPONSE, repaymentResponse); eventCheckHelper.loanBalanceChangedEventCheck(loanId); @@ -200,15 +201,16 @@ public void makeRepaymentWithGivenUserByExternalId(String repaymentType, String PostUsersResponse createUserResponse = testContext().get(TestContextKey.CREATED_SIMPLE_USER_RESPONSE); Long createdUserId = createUserResponse.getResourceId(); - GetUsersUserIdResponse user = ok(() -> fineractClient.users().retrieveOne30(createdUserId)); + GetUsersUserIdResponse user = ok(() -> fineractClient.users().retrieveOneUser(createdUserId)); String apiBaseUrl = apiProperties.getBaseUrl() + "/fineract-provider/api/"; FineractFeignClient userClient = FineractFeignClient.builder().baseUrl(apiBaseUrl) .credentials(user.getUsername(), PWD_USER_WITH_ROLE).tenantId(apiProperties.getTenantId()).disableSslVerification(true) .readTimeout((int) apiProperties.getReadTimeout(), java.util.concurrent.TimeUnit.SECONDS).build(); - PostLoansLoanIdTransactionsResponse repaymentResponse = ok(() -> userClient.loanTransactions() - .executeLoanTransaction1(resourceExternalId, repaymentRequest, Map.of("command", "repayment"))); + PostLoansLoanIdTransactionsResponse repaymentResponse = ok( + () -> userClient.loanTransactions().executeLoanTransactionByLoanExternalId(resourceExternalId, repaymentRequest, + Map.of("command", "repayment"))); testContext().set(TestContextKey.LOAN_REPAYMENT_RESPONSE, repaymentResponse); eventCheckHelper.loanBalanceChangedEventCheck(loanId); } diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java index 55d8213fd02..db2659b359f 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java @@ -3278,7 +3278,7 @@ public void deleteLoanWithExternalId() { PostLoansResponse loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE); Long loanId = loanCreateResponse.getLoanId(); String loanExternalId = loanCreateResponse.getResourceExternalId(); - DeleteLoansLoanIdResponse deleteLoanResponse = ok(() -> fineractClient.loans().deleteLoanApplication1(loanExternalId)); + DeleteLoansLoanIdResponse deleteLoanResponse = ok(() -> fineractClient.loans().deleteLoanApplicationByExternalId(loanExternalId)); assertThat(deleteLoanResponse.getLoanId()).isEqualTo(loanId); assertThat(deleteLoanResponse.getResourceExternalId()).isEqualTo(loanExternalId); } @@ -3287,7 +3287,8 @@ public void deleteLoanWithExternalId() { public void failedDeleteLoanWithExternalId() { PostLoansResponse loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE); String loanExternalId = loanCreateResponse.getResourceExternalId(); - CallFailedRuntimeException exception = fail(() -> fineractClient.loans().deleteLoanApplication1(loanExternalId.substring(5))); + CallFailedRuntimeException exception = fail( + () -> fineractClient.loans().deleteLoanApplicationByExternalId(loanExternalId.substring(5))); assertThat(exception.getStatus()).as(ErrorMessageHelper.dateFailureErrorCodeMsg()).isEqualTo(404); } @@ -3519,7 +3520,7 @@ public void loanTransactionsRelationshipCheck(String nthTransactionFromStr, Stri @Then("Loan Product Charge-Off reasons options from loan product template have {int} options, with the following data:") public void loanProductTemplateChargeOffReasonOptionsCheck(final int linesExpected, final DataTable table) { final GetLoanProductsTemplateResponse loanProductDetails = ok( - () -> fineractClient.loanProducts().retrieveTemplate11(Map.of("staffInSelectedOfficeOnly", "false"))); + () -> fineractClient.loanProducts().retrieveTemplateLoanProduct(Map.of("staffInSelectedOfficeOnly", "false"))); assertNotNull(loanProductDetails); final List chargeOffReasonOptions = loanProductDetails.getChargeOffReasonOptions(); assertNotNull(chargeOffReasonOptions); @@ -5627,7 +5628,8 @@ public void updateLoanAvailableDisbursementAmountByExternalId(final String amoun final PutLoansAvailableDisbursementAmountRequest modifyLoanAvailableDisbursementAmountRequest = new PutLoansAvailableDisbursementAmountRequest() .locale(LOCALE_EN).amount(new BigDecimal(amount)); - ok(() -> fineractClient.loans().modifyLoanAvailableDisbursementAmount1(externalId, modifyLoanAvailableDisbursementAmountRequest)); + ok(() -> fineractClient.loans().modifyLoanAvailableDisbursementAmountByExternalId(externalId, + modifyLoanAvailableDisbursementAmountRequest)); } @Then("Update loan available disbursement amount is forbidden with amount {string} due to exceed applied amount") @@ -5637,8 +5639,8 @@ public void updateLoanAvailableDisbursementAmountForbiddenExceedAppliedAmount(fi final PutLoansAvailableDisbursementAmountRequest modifyLoanAvailableDisbursementAmountRequest = new PutLoansAvailableDisbursementAmountRequest() .locale(LOCALE_EN).amount(new BigDecimal(amount)); - final CallFailedRuntimeException exception = fail(() -> fineractClient.loans().modifyLoanAvailableDisbursementAmount1(externalId, - modifyLoanAvailableDisbursementAmountRequest)); + final CallFailedRuntimeException exception = fail(() -> fineractClient.loans() + .modifyLoanAvailableDisbursementAmountByExternalId(externalId, modifyLoanAvailableDisbursementAmountRequest)); assertThat(exception.getStatus()).isEqualTo(403); // API returns generic validation error - ideally should contain specific message about exceeding amount @@ -5807,7 +5809,7 @@ public void loanTransactionHasClassification(String transactionType, String expe private Long getClassificationCodeValueId(String codeName, String codeValueName) { // Check if code value already exists - List existingCodeValues = fineractClient.codeValues().retrieveAllCodeValues1(codeName); + List existingCodeValues = fineractClient.codeValues().retrieveAllCodeValuesByCodeName(codeName); // Try to find existing code value with the same name for (GetCodeValuesDataResponse codeValue : existingCodeValues) { if (codeValueName.equals(codeValue.getName())) { diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalStepDef.java index 051d703c36e..f74b8d8163c 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalStepDef.java @@ -286,7 +286,7 @@ public void updateWorkingCapitalLoanProductWithInvalidPaymentAllocationFailed() @Then("Admin failed to retrieve a Working Capital Loan Product with id {int} that doesn't exist") public void retrieveWorkingCapitalLoanProductFailure(Integer productId) { CallFailedRuntimeException exception = fail( - () -> workingCapitalApi().retrieveWorkingCapitalLoanProductDetails(Long.valueOf(productId), Map.of())); + () -> workingCapitalApi().retrieveOneWorkingCapitalLoanProduct(Long.valueOf(productId), Map.of())); assertThat(exception.getStatus()).as(ErrorMessageHelper.dateFailureErrorCodeMsg()).isEqualTo(404); assertThat(exception.getDeveloperMessage()) .contains(ErrorMessageHelper.workingCapitalLoanProductIdentifiedDoesNotExistFailure(String.valueOf(productId))); @@ -338,7 +338,7 @@ public void checkWorkingCapitalLoanProductIsDeletedViaExternalId() { String externalId = workingCapitalLoanProductsUpdateRequest.getExternalId(); CallFailedRuntimeException exception = fail( - () -> workingCapitalApi().retrieveWorkingCapitalLoanProductDetailsByExternalId(externalId, Map.of())); + () -> workingCapitalApi().retrieveOneWorkingCapitalLoanProductByExternalId(externalId, Map.of())); assertThat(exception.getStatus()).as(ErrorMessageHelper.dateFailureErrorCodeMsg()).isEqualTo(404); assertThat(exception.getDeveloperMessage()) .contains(ErrorMessageHelper.workingCapitalLoanProductIdentifiedDoesNotExistFailure(String.valueOf(externalId))); @@ -367,7 +367,7 @@ public void checkWorkingCapitalLoanProductCreate() { .get(TestContextKey.WORKING_CAPITAL_LOAN_PRODUCT_CREATE_RESPONSE); Long resourceId = workingCapitalLoanProductResponse.getResourceId(); GetWorkingCapitalLoanProductsProductIdResponse getWorkingCapitalProductResponse = workingCapitalApi() - .retrieveWorkingCapitalLoanProductDetails(resourceId, Map.of()); + .retrieveOneWorkingCapitalLoanProduct(resourceId, Map.of()); checkWorkingCapitalLoanProductCreate(workingCapitalLoanProductCreateRequest, getWorkingCapitalProductResponse); } @@ -377,7 +377,7 @@ public void checkWorkingCapitalLoanProductWithExternalIdCreate() { String externalId = workingCapitalLoanProductCreateRequest.getExternalId(); GetWorkingCapitalLoanProductsProductIdResponse getWorkingCapitalProductResponse = workingCapitalApi() - .retrieveWorkingCapitalLoanProductDetailsByExternalId(externalId, Map.of()); + .retrieveOneWorkingCapitalLoanProductByExternalId(externalId, Map.of()); checkWorkingCapitalLoanProductCreate(workingCapitalLoanProductCreateRequest, getWorkingCapitalProductResponse); } @@ -478,7 +478,7 @@ public void checkWorkingCapitalLoanProductUpdate() { Long resourceId = workingCapitalLoanProductResponse.getResourceId(); GetWorkingCapitalLoanProductsProductIdResponse getWorkingCapitalProductResponse = workingCapitalApi() - .retrieveWorkingCapitalLoanProductDetails(resourceId, Map.of()); + .retrieveOneWorkingCapitalLoanProduct(resourceId, Map.of()); checkWorkingCapitalLoanProductUpdate(workingCapitalLoanProductsUpdateRequest, getWorkingCapitalProductResponse); } @@ -488,7 +488,7 @@ public void checkWorkingCapitalLoanProductWithExternalIdUpdate() { String externalId = workingCapitalLoanProductsUpdateRequest.getExternalId(); GetWorkingCapitalLoanProductsProductIdResponse getWorkingCapitalProductResponse = workingCapitalApi() - .retrieveWorkingCapitalLoanProductDetailsByExternalId(externalId, Map.of()); + .retrieveOneWorkingCapitalLoanProductByExternalId(externalId, Map.of()); checkWorkingCapitalLoanProductUpdate(workingCapitalLoanProductsUpdateRequest, getWorkingCapitalProductResponse); } @@ -795,8 +795,7 @@ public PutWorkingCapitalLoanProductsProductIdRequest setWorkingCapitalLoanProduc } public void checkWorkingCapitalLoanProductDeleteFailure(Long productId) { - CallFailedRuntimeException exception = fail( - () -> workingCapitalApi().retrieveWorkingCapitalLoanProductDetails(productId, Map.of())); + CallFailedRuntimeException exception = fail(() -> workingCapitalApi().retrieveOneWorkingCapitalLoanProduct(productId, Map.of())); assertThat(exception.getStatus()).as(ErrorMessageHelper.dateFailureErrorCodeMsg()).isEqualTo(404); assertThat(exception.getDeveloperMessage()) .contains(ErrorMessageHelper.workingCapitalLoanProductIdentifiedDoesNotExistFailure(String.valueOf(productId))); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/saving/SavingsAccountStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/saving/SavingsAccountStepDef.java index c52c96e4850..1a2243906fe 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/saving/SavingsAccountStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/saving/SavingsAccountStepDef.java @@ -50,7 +50,7 @@ public void createSavingsAccountEUR(String submittedOnDate) { .clientId(clientId).submittedOnDate(submittedOnDate); PostSavingsAccountsResponse createSavingsAccountResponse = ok( - () -> fineractClient.savingsAccount().submitApplication2(createSavingsAccountRequest)); + () -> fineractClient.savingsAccount().submitSavingsApplication(createSavingsAccountRequest)); testContext().set(TestContextKey.EUR_SAVINGS_ACCOUNT_CREATE_RESPONSE, createSavingsAccountResponse); } @@ -63,7 +63,7 @@ public void createSavingsAccountUSD(String submittedOnDate) { .clientId(clientId).submittedOnDate(submittedOnDate); PostSavingsAccountsResponse createSavingsAccountResponse = ok( - () -> fineractClient.savingsAccount().submitApplication2(createSavingsAccountRequest)); + () -> fineractClient.savingsAccount().submitSavingsApplication(createSavingsAccountRequest)); testContext().set(TestContextKey.USD_SAVINGS_ACCOUNT_CREATE_RESPONSE, createSavingsAccountResponse); } @@ -76,7 +76,7 @@ public void approveEurSavingsAccount(String approvedOnDate) { .approvedOnDate(approvedOnDate); PostSavingsAccountsAccountIdResponse approveSavingsAccountResponse = ok(() -> fineractClient.savingsAccount() - .handleCommands6(savingsAccountID, approveSavingsAccountRequest, Map.of("command", "approve"))); + .handleCommandsSavingsAccount(savingsAccountID, approveSavingsAccountRequest, Map.of("command", "approve"))); testContext().set(TestContextKey.EUR_SAVINGS_ACCOUNT_APPROVE_RESPONSE, approveSavingsAccountResponse); } @@ -89,7 +89,7 @@ public void approveUsdSavingsAccount(String approvedOnDate) { .approvedOnDate(approvedOnDate); PostSavingsAccountsAccountIdResponse approveSavingsAccountResponse = ok(() -> fineractClient.savingsAccount() - .handleCommands6(savingsAccountID, approveSavingsAccountRequest, Map.of("command", "approve"))); + .handleCommandsSavingsAccount(savingsAccountID, approveSavingsAccountRequest, Map.of("command", "approve"))); testContext().set(TestContextKey.USD_SAVINGS_ACCOUNT_APPROVE_RESPONSE, approveSavingsAccountResponse); } @@ -102,7 +102,7 @@ public void activateSavingsAccount(String activatedOnDate) { .activatedOnDate(activatedOnDate); PostSavingsAccountsAccountIdResponse activateSavingsAccountResponse = ok(() -> fineractClient.savingsAccount() - .handleCommands6(savingsAccountID, activateSavingsAccountRequest, Map.of("command", "activate"))); + .handleCommandsSavingsAccount(savingsAccountID, activateSavingsAccountRequest, Map.of("command", "activate"))); testContext().set(TestContextKey.EUR_SAVINGS_ACCOUNT_ACTIVATED_RESPONSE, activateSavingsAccountResponse); } @@ -115,7 +115,7 @@ public void activateUsdSavingsAccount(String activatedOnDate) { .activatedOnDate(activatedOnDate); PostSavingsAccountsAccountIdResponse activateSavingsAccountResponse = ok(() -> fineractClient.savingsAccount() - .handleCommands6(savingsAccountID, activateSavingsAccountRequest, Map.of("command", "activate"))); + .handleCommandsSavingsAccount(savingsAccountID, activateSavingsAccountRequest, Map.of("command", "activate"))); testContext().set(TestContextKey.USD_SAVINGS_ACCOUNT_ACTIVATED_RESPONSE, activateSavingsAccountResponse); } @@ -128,7 +128,7 @@ public void createEurDeposit(double depositAmount, String depositDate) { .transactionDate(depositDate).transactionAmount(BigDecimal.valueOf(depositAmount)); PostSavingsAccountTransactionsResponse depositResponse = ok(() -> fineractClient.savingsAccountTransactions() - .transaction2(savingsAccountID, depositRequest, Map.of("command", "deposit"))); + .createSavingsAccountTransaction(savingsAccountID, depositRequest, Map.of("command", "deposit"))); testContext().set(TestContextKey.EUR_SAVINGS_ACCOUNT_DEPOSIT_RESPONSE, depositResponse); } @@ -141,7 +141,7 @@ public void createUsdDeposit(double depositAmount, String depositDate) { .transactionDate(depositDate).transactionAmount(BigDecimal.valueOf(depositAmount)); PostSavingsAccountTransactionsResponse depositResponse = ok(() -> fineractClient.savingsAccountTransactions() - .transaction2(savingsAccountID, depositRequest, Map.of("command", "deposit"))); + .createSavingsAccountTransaction(savingsAccountID, depositRequest, Map.of("command", "deposit"))); testContext().set(TestContextKey.USD_SAVINGS_ACCOUNT_DEPOSIT_RESPONSE, depositResponse); } @@ -154,7 +154,7 @@ public void createEurWithdraw(double withdrawAmount, String transcationDate) { .transactionDate(transcationDate).transactionAmount(BigDecimal.valueOf(withdrawAmount)); PostSavingsAccountTransactionsResponse withdrawalResponse = ok(() -> fineractClient.savingsAccountTransactions() - .transaction2(savingsAccountID, withdrawRequest, Map.of("command", "withdrawal"))); + .createSavingsAccountTransaction(savingsAccountID, withdrawRequest, Map.of("command", "withdrawal"))); testContext().set(TestContextKey.EUR_SAVINGS_ACCOUNT_WITHDRAW_RESPONSE, withdrawalResponse); } @@ -167,7 +167,7 @@ public void createUsdWithdraw(double withdrawAmount, String transcationDate) { .transactionDate(transcationDate).transactionAmount(BigDecimal.valueOf(withdrawAmount)); PostSavingsAccountTransactionsResponse withdrawalResponse = ok(() -> fineractClient.savingsAccountTransactions() - .transaction2(savingsAccountID, withdrawRequest, Map.of("command", "withdrawal"))); + .createSavingsAccountTransaction(savingsAccountID, withdrawRequest, Map.of("command", "withdrawal"))); testContext().set(TestContextKey.USD_SAVINGS_ACCOUNT_WITHDRAW_RESPONSE, withdrawalResponse); } } diff --git a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/CodeGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/CodeGlobalInitializerStep.java index 24bb9b6994c..8581bbb2645 100644 --- a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/CodeGlobalInitializerStep.java +++ b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/CodeGlobalInitializerStep.java @@ -260,7 +260,7 @@ public void createCodeValues(String codeName, List codeValueNames) { postCodeValuesDataRequest.position(position); try { - executeVoid(() -> fineractClient.codeValues().createCodeValue1(codeName, postCodeValuesDataRequest, Map.of())); + executeVoid(() -> fineractClient.codeValues().createCodeValueByCodeName(codeName, postCodeValuesDataRequest, Map.of())); log.debug("Code value '{}' created successfully", name); } catch (CallFailedRuntimeException e) { if (e.getStatus() == 403 && e.getDeveloperMessage() != null && e.getDeveloperMessage().contains("already exists")) { @@ -280,7 +280,8 @@ public void updateCodeValues(String codeName, List codeValueNames) { putCodeValuesDataRequest.name(name); putCodeValuesDataRequest.position(position); - executeVoid(() -> fineractClient.codeValues().updateCodeValue1(codeName, (long) position, putCodeValuesDataRequest, Map.of())); + executeVoid(() -> fineractClient.codeValues().updateCodeValueByCodeName(codeName, (long) position, putCodeValuesDataRequest, + Map.of())); }); } diff --git a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/FinancialActivityMappingGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/FinancialActivityMappingGlobalInitializerStep.java index a274c6e039a..2f6ca5a493d 100644 --- a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/FinancialActivityMappingGlobalInitializerStep.java +++ b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/FinancialActivityMappingGlobalInitializerStep.java @@ -44,7 +44,8 @@ public void initialize() { .financialActivityId(FINANCIAL_ACTIVITY_ID_ASSET_TRANSFER).glAccountId(GL_ACCOUNT_ID_ASSET_TRANSFER); try { - executeVoid(() -> fineractClient.mappingFinancialActivitiesToAccounts().createGLAccount(request, Map.of())); + executeVoid(() -> fineractClient.mappingFinancialActivitiesToAccounts().createGLAccountMappingFinancialActivityAccount(request, + Map.of())); log.debug("Financial activity mapping created successfully"); } catch (CallFailedRuntimeException e) { if (e.getStatus() == 403 && e.getDeveloperMessage() != null && e.getDeveloperMessage().contains("already exists")) { diff --git a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java index 8be948b3fe5..77399429f28 100644 --- a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java +++ b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java @@ -141,6 +141,6 @@ private void createGLAccountIfNotExists(List existingAcco } PostGLAccountsRequest request = GLAccountRequestFactory.defaultGLAccountRequest(name, glCode, type, GLA_USAGE_DETAIL, true); - executeVoid(() -> fineractClient.generalLedgerAccount().createGLAccount1(request, Map.of())); + executeVoid(() -> fineractClient.generalLedgerAccount().createGLAccount(request, Map.of())); } } diff --git a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/suite/JobSuiteInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/suite/JobSuiteInitializerStep.java index 93ae3321a19..7ffaea59239 100644 --- a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/suite/JobSuiteInitializerStep.java +++ b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/suite/JobSuiteInitializerStep.java @@ -122,7 +122,7 @@ public void resetAfterSuite() { } private Long updateExternalEventJobFrequency(String cronExpression) { - GetJobsResponse externalEventJobResponse = ok(() -> fineractClient.schedulerJob().retrieveAll8()).stream() + GetJobsResponse externalEventJobResponse = ok(() -> fineractClient.schedulerJob().retrieveAllSchedulerJobs()).stream() .filter(r -> r.getDisplayName().equals(SEND_ASYNCHRONOUS_EVENTS_JOB_NAME)).findAny() .orElseThrow(() -> new IllegalStateException(SEND_ASYNCHRONOUS_EVENTS_JOB_NAME + " is not found")); Long jobId = externalEventJobResponse.getJobId(); diff --git a/fineract-investor/src/main/java/org/apache/fineract/investor/api/ExternalAssetOwnersApiResource.java b/fineract-investor/src/main/java/org/apache/fineract/investor/api/ExternalAssetOwnersApiResource.java index 783b3c26dbc..9f0a91564a0 100644 --- a/fineract-investor/src/main/java/org/apache/fineract/investor/api/ExternalAssetOwnersApiResource.java +++ b/fineract-investor/src/main/java/org/apache/fineract/investor/api/ExternalAssetOwnersApiResource.java @@ -131,6 +131,7 @@ public CommandProcessingResult transferRequestWithLoanExternalId(@PathParam("loa @Path("/transfers/{id}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Transfer external asset", operationId = "transferRequestWithId") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ExternalAssetOwnersApiResourceSwagger.PostInitiateTransferResponse.class))) @ApiResponse(responseCode = "403", description = "Transfer cannot be initiated") public CommandProcessingResult transferRequestWithId(@PathParam("id") final Long id, @@ -145,6 +146,7 @@ public CommandProcessingResult transferRequestWithId(@PathParam("id") final Long @Path("/transfers/external-id/{externalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Transfer external asset by external ID", operationId = "transferRequestWithIdByExternalId") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ExternalAssetOwnersApiResourceSwagger.PostInitiateTransferResponse.class))) @ApiResponse(responseCode = "403", description = "Transfer cannot be initiated") public CommandProcessingResult transferRequestWithId(@PathParam("externalId") final String externalId, diff --git a/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/api/LoanOriginatorApiResource.java b/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/api/LoanOriginatorApiResource.java index 76fa0fa416b..f060ca3d1bf 100644 --- a/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/api/LoanOriginatorApiResource.java +++ b/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/api/LoanOriginatorApiResource.java @@ -62,7 +62,7 @@ public class LoanOriginatorApiResource { @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create a new loan originator", description = "Creates a new loan originator record. Requires CREATE_LOAN_ORIGINATOR permission.") + @Operation(summary = "Create a new loan originator", operationId = "createLoanOriginator", description = "Creates a new loan originator record. Requires CREATE_LOAN_ORIGINATOR permission.") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanOriginatorApiResourceSwagger.PostLoanOriginatorsRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanOriginatorApiResourceSwagger.PostLoanOriginatorsResponse.class))) @ApiResponse(responseCode = "400", description = "Required parameter is missing or incorrect format") @@ -75,7 +75,7 @@ public CommandProcessingResult create(@Parameter(hidden = true) final String api @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List all loan originators", description = "Retrieves all loan originator records. Requires READ_LOAN_ORIGINATOR permission.") + @Operation(summary = "List all loan originators", operationId = "retrieveAllLoanOriginators", description = "Retrieves all loan originator records. Requires READ_LOAN_ORIGINATOR permission.") @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = LoanOriginatorApiResourceSwagger.GetLoanOriginatorsResponse.class)))) @ApiResponse(responseCode = "403", description = "Insufficient permissions") public List retrieveAll() { @@ -101,7 +101,7 @@ public LoanOriginatorTemplateData retrieveLoanOriginatorTemplate() { @Path("{originatorId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a loan originator by ID", description = "Retrieves a loan originator by its internal ID. Requires READ_LOAN_ORIGINATOR permission.") + @Operation(summary = "Retrieve a loan originator by ID", operationId = "retrieveOneLoanOriginator", description = "Retrieves a loan originator by its internal ID. Requires READ_LOAN_ORIGINATOR permission.") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanOriginatorApiResourceSwagger.GetLoanOriginatorsResponse.class))) @ApiResponse(responseCode = "403", description = "Insufficient permissions") @ApiResponse(responseCode = "404", description = "Originator not found") @@ -130,7 +130,7 @@ public LoanOriginatorData retrieveByExternalId( @Path("{originatorId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a loan originator by ID", description = "Updates a loan originator by its internal ID. Requires UPDATE_LOAN_ORIGINATOR permission.") + @Operation(summary = "Update a loan originator by ID", operationId = "updateLoanOriginator", description = "Updates a loan originator by its internal ID. Requires UPDATE_LOAN_ORIGINATOR permission.") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanOriginatorApiResourceSwagger.PutLoanOriginatorsRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanOriginatorApiResourceSwagger.PutLoanOriginatorsResponse.class))) @ApiResponse(responseCode = "400", description = "Incorrect format") @@ -167,7 +167,7 @@ public CommandProcessingResult updateByExternalId( @Path("{originatorId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a loan originator by ID", description = "Deletes a loan originator by its internal ID. Requires DELETE_LOAN_ORIGINATOR permission.") + @Operation(summary = "Delete a loan originator by ID", operationId = "deleteLoanOriginator", description = "Deletes a loan originator by its internal ID. Requires DELETE_LOAN_ORIGINATOR permission.") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanOriginatorApiResourceSwagger.DeleteLoanOriginatorsResponse.class))) @ApiResponse(responseCode = "403", description = "Originator is mapped to loans and cannot be deleted, or insufficient permissions") @ApiResponse(responseCode = "404", description = "Originator not found") diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java index ca547efb915..5a94ee78fa8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java @@ -99,7 +99,7 @@ public class JournalEntriesApiResource { @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Journal Entries", description = "The list capability of journal entries can support pagination and sorting.\n\n" + @Operation(summary = "List Journal Entries", operationId = "retrieveAllJournalEntries", description = "The list capability of journal entries can support pagination and sorting.\n\n" + "Example Requests:\n" + "\n" + "journalentries\n" + "\n" + "journalentries?transactionId=PB37X8Y21EQUY4S\n" + "\n" + "journalentries?officeId=1&manualEntriesOnly=true&fromDate=1 July 2013&toDate=15 July 2013&dateFormat=dd MMMM yyyy&locale=en\n" + "\n" + "journalentries?fields=officeName,glAccountName,transactionDate\n" + "\n" + "journalentries?offset=10&limit=50\n" diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResource.java index 3a2e855cf58..a05348d1a51 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResource.java @@ -176,8 +176,8 @@ public String deleteCodeValue(@PathParam("codeId") @Parameter(description = "cod @Path("name/{codeName}/codevalues") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Code Values", description = "Returns the list of Code Values for a given Code\n" + "\n" - + "Example Requests:\n" + "\n" + "codes/1/codevalues", parameters = @Parameter(name = "codeId", description = "co")) + @Operation(summary = "List Code Values", operationId = "retrieveAllCodeValuesByCodeName", description = "Returns the list of Code Values for a given Code\n" + + "\n" + "Example Requests:\n" + "\n" + "codes/1/codevalues", parameters = @Parameter(name = "codeId", description = "co")) @ApiResponse(responseCode = "200", description = "A List of code values for a given code", content = @Content(array = @ArraySchema(schema = @Schema(implementation = CodeValuesApiResourceSwagger.GetCodeValuesDataResponse.class)))) public List retrieveAllCodeValues(@Context final UriInfo uriInfo, @PathParam("codeName") @Parameter(description = "codeName") final String codeName) { @@ -207,7 +207,7 @@ public CodeValueData retrieveCodeValue(@Context final UriInfo uriInfo, @Path("name/{codeName}/codevalues") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create a Code description", description = "") + @Operation(summary = "Create a Code description", operationId = "createCodeValueByCodeName", description = "") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = CodeValuesApiResourceSwagger.PostCodeValuesDataRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = CodeValuesApiResourceSwagger.PostCodeValueDataResponse.class))) public CommandProcessingResult createCodeValue(@PathParam("codeName") @Parameter(description = "codeName") final String codeName, @@ -223,7 +223,7 @@ public CommandProcessingResult createCodeValue(@PathParam("codeName") @Parameter @Path("name/{codeName}/codevalues/{codeValueId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Code description", description = "Updates the details of a code description.") + @Operation(summary = "Update a Code description", operationId = "updateCodeValueByCodeName", description = "Updates the details of a code description.") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = CodeValuesApiResourceSwagger.PutCodeValuesDataRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = CodeValuesApiResourceSwagger.PutCodeValueDataResponse.class))) public CommandProcessingResult updateCodeValue(@PathParam("codeName") @Parameter(description = "codeName") final String codeName, diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResource.java index 2903a37bcc1..4095ea1f430 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResource.java @@ -101,8 +101,8 @@ public String retrieveConfiguration(@Context final UriInfo uriInfo, @Path("{configId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Global Configuration", description = "Returns a global enable/disable configurations.\n" + "\n" - + "Example Requests:\n" + "\n" + "configurations/1") + @Operation(summary = "Retrieve Global Configuration", operationId = "retrieveOneGlobalConfiguration", description = "Returns a global enable/disable configurations.\n" + + "\n" + "Example Requests:\n" + "\n" + "configurations/1") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = GlobalConfigurationPropertyData.class))) public String retrieveOne(@PathParam("configId") @Parameter(description = "configId") final Long configId, @Context final UriInfo uriInfo) { @@ -136,7 +136,7 @@ public String retrieveOneByName(@PathParam("name") @Parameter(description = "nam @Path("{configId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update Global Configuration", description = "Updates an enable/disable global configuration item.") + @Operation(summary = "Update Global Configuration", operationId = "updateGlobalConfiguration", description = "Updates an enable/disable global configuration item.") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = GlobalConfigurationApiResourceSwagger.PutGlobalConfigurationsRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = GlobalConfigurationApiResourceSwagger.PutGlobalConfigurationsResponse.class))) public String updateConfiguration(@PathParam("configId") @Parameter(description = "configId") final Long configId, diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/InternalConfigurationsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/InternalConfigurationsApiResource.java index cec0e3fec89..bd1ca019765 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/InternalConfigurationsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/InternalConfigurationsApiResource.java @@ -19,6 +19,7 @@ package org.apache.fineract.infrastructure.configuration.api; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import io.swagger.v3.oas.annotations.Operation; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.PUT; import jakarta.ws.rs.Path; @@ -65,6 +66,7 @@ public void afterPropertiesSet() throws Exception { @Path("name/{configName}/value/{configValue}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Update internal global configuration", operationId = "updateInternalGlobalConfiguration") @SuppressFBWarnings("SLF4J_SIGN_ONLY_FORMAT") public Response updateGlobalConfiguration(@PathParam("configName") String configName, @PathParam("configValue") Long configValue) { log.warn("------------------------------------------------------------"); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResource.java index 6d302edb969..1ab32cd328a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResource.java @@ -90,8 +90,8 @@ public class SchedulerJobApiResource { private final SqlValidator sqlValidator; @GET - @Operation(summary = "Retrieve Scheduler Jobs", description = "Returns the list of jobs.\n" + "\n" + "Example Requests:\n" + "\n" - + "jobs") + @Operation(summary = "Retrieve Scheduler Jobs", operationId = "retrieveAllSchedulerJobs", description = "Returns the list of jobs.\n" + + "\n" + "Example Requests:\n" + "\n" + "jobs") @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = SchedulerJobApiResourceSwagger.GetJobsResponse.class)))) public String retrieveAll(@Context final UriInfo uriInfo) { this.context.authenticatedUser().validateHasReadPermission(SCHEDULER_RESOURCE_NAME); @@ -102,7 +102,8 @@ public String retrieveAll(@Context final UriInfo uriInfo) { @GET @Path("{" + SchedulerJobApiConstants.JOB_ID + "}") - @Operation(summary = "Retrieve a Job", description = "Returns the details of a Job.\n" + "\n" + "Example Requests:\n" + "\n" + "jobs/5") + @Operation(summary = "Retrieve a Job", operationId = "retrieveOneSchedulerJob", description = "Returns the details of a Job.\n" + "\n" + + "Example Requests:\n" + "\n" + "jobs/5") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SchedulerJobApiResourceSwagger.GetJobsResponse.class))) public String retrieveOne(@PathParam(SchedulerJobApiConstants.JOB_ID) @Parameter(description = "jobId") final Long jobId, @Context final UriInfo uriInfo) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java index 26251e8b41d..8f1cb2e01ea 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java @@ -83,9 +83,10 @@ public class StaffApiResource { @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Staff", description = "Returns the list of staff members.\n" + "\n" + "Example Requests:\n" + "\n" - + "staff\n\n\n\n" + "\n" + "Retrieve a Staff by status\n" + "\n" + "Returns the details of a Staff based on status.\n" + "\n" - + "By default it Returns all the ACTIVE Staff.\n" + "\n" + "If status=INACTIVE, then it returns all INACTIVE Staff.\n" + "\n" + @Operation(summary = "Retrieve Staff", operationId = "retrieveAllStaff", description = "Returns the list of staff members.\n" + "\n" + + "Example Requests:\n" + "\n" + "staff\n\n\n\n" + "\n" + "Retrieve a Staff by status\n" + "\n" + + "Returns the details of a Staff based on status.\n" + "\n" + "By default it Returns all the ACTIVE Staff.\n" + "\n" + + "If status=INACTIVE, then it returns all INACTIVE Staff.\n" + "\n" + "and for status=ALL, it Returns both ACTIVE and INACTIVE Staff.\n" + "\n" + "Example Requests:\n" + "\n" + "staff?status=active") public List retrieveAll(@QueryParam("officeId") @Parameter(description = "officeId") final Long officeId, @@ -100,8 +101,8 @@ public List retrieveAll(@QueryParam("officeId") @Parameter(descriptio @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create a staff member", description = "Creates a staff member.\n" + "\n" + "Mandatory Fields: \n" - + "officeId, firstname, lastname\n" + "\n" + "Optional Fields: \n" + "isLoanOfficer, isActive") + @Operation(summary = "Create a staff member", operationId = "createStaff", description = "Creates a staff member.\n" + "\n" + + "Mandatory Fields: \n" + "officeId, firstname, lastname\n" + "\n" + "Optional Fields: \n" + "isLoanOfficer, isActive") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = StaffRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = StaffApiResourceSwagger.CreateStaffResponse.class))) public CommandProcessingResult create(@Parameter(hidden = true) StaffRequest staffRequest) { @@ -114,8 +115,8 @@ public CommandProcessingResult create(@Parameter(hidden = true) StaffRequest sta @Path("{staffId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Staff Member", description = "Returns the details of a Staff Member.\n" + "\n" + "Example Requests:\n" - + "\n" + "staff/1") + @Operation(summary = "Retrieve a Staff Member", operationId = "retrieveOneStaff", description = "Returns the details of a Staff Member.\n" + + "\n" + "Example Requests:\n" + "\n" + "staff/1") public StaffData retrieveOne(@PathParam("staffId") @Parameter(description = "staffId") final Long staffId, @Context final UriInfo uriInfo) { context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSIONS); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResource.java index 07c137d3e4e..9dd9463692e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResource.java @@ -84,7 +84,7 @@ public AccountTransferData template(@BeanParam AccountTransSearchParam accountTr @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create new Transfer", description = "Ability to create new transfer of monetary funds from one account to another.") + @Operation(summary = "Create new Transfer", operationId = "createAccountTransfer", description = "Ability to create new transfer of monetary funds from one account to another.") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = AccountTransferRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountTransfersApiResourceSwagger.PostAccountTransfersResponse.class))) public CommandProcessingResult create(@Parameter(hidden = true) AccountTransferRequest accountTransferRequest) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResource.java index b6e1d6c711e..6a8de73f91f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResource.java @@ -64,6 +64,7 @@ public class ClientAddressApiResource { @Path("addresses/template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve client address template", operationId = "retrieveTemplateClientAddress") public AddressData getAddressesTemplate() { context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSIONS); return readPlatformService.retrieveTemplate(); @@ -74,7 +75,8 @@ public AddressData getAddressesTemplate() { @Path("/{clientid}/addresses") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create an address for a Client", description = "Mandatory Fields : \n" + "type and clientId") + @Operation(summary = "Create an address for a Client", operationId = "createClientAddress", description = "Mandatory Fields : \n" + + "type and clientId") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ClientAddressRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientAddressApiResourcesSwagger.PostClientClientIdAddressesResponse.class))) public CommandProcessingResult addClientAddress(@QueryParam("type") @Parameter(description = "type") final long addressTypeId, @@ -90,7 +92,7 @@ public CommandProcessingResult addClientAddress(@QueryParam("type") @Parameter(d @Path("/{clientid}/addresses") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List all addresses for a Client", description = """ + @Operation(summary = "List all addresses for a Client", operationId = "retrieveAllClientAddresses", description = """ Example Requests: client/1/addresses @@ -108,7 +110,7 @@ public List getAddresses(@QueryParam("status") @Parameter(descripti @Path("/{clientid}/addresses") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update an address for a Client", description = """ + @Operation(summary = "Update an address for a Client", operationId = "updateClientAddress", description = """ All the address fields can be updated by using update client address API Mandatory Fields diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResource.java index 5f59bc29ccf..5d1b8e75de3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResource.java @@ -82,7 +82,7 @@ public class ClientChargesApiResource { @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Client Charges", description = "The list capability of client charges supports pagination." + @Operation(summary = "List Client Charges", operationId = "retrieveAllClientCharges", description = "The list capability of client charges supports pagination." + "Example Requests:\n" + "clients/1/charges\n" + "\nclients/1/charges?offset=0&limit=5") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientChargesApiResourceSwagger.GetClientsClientIdChargesResponse.class))) public String retrieveAllClientCharges(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @@ -115,6 +115,7 @@ private boolean is(final String commandParam, final String commandValue) { @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve client charge template", operationId = "retrieveTemplateClientCharge") public String retrieveTemplate(@Context final UriInfo uriInfo, @PathParam("clientId") @Parameter(description = "clientId") final Long clientId) { @@ -132,8 +133,8 @@ public String retrieveTemplate(@Context final UriInfo uriInfo, @Path("{chargeId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Client Charge", description = "Example Requests:\n" + "clients/1/charges/1\n" + "\n" + "\n" - + "clients/1/charges/1?fields=name,id") + @Operation(summary = "Retrieve a Client Charge", operationId = "retrieveOneClientCharge", description = "Example Requests:\n" + + "clients/1/charges/1\n" + "\n" + "\n" + "clients/1/charges/1?fields=name,id") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientChargesApiResourceSwagger.GetClientsClientIdChargesResponse.GetClientsChargesPageItems.class))) public String retrieveClientCharge(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @PathParam("chargeId") @Parameter(description = "chargeId") final Long chargeId, @Context final UriInfo uriInfo) { @@ -162,7 +163,7 @@ public String retrieveClientCharge(@PathParam("clientId") @Parameter(description @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Add Client Charge", description = " This API associates a Client charge with an implicit Client account\n" + @Operation(summary = "Add Client Charge", operationId = "createClientCharge", description = " This API associates a Client charge with an implicit Client account\n" + "Mandatory Fields : \n" + "chargeId and dueDate \n" + "Optional Fields : \n" + "amount") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ClientChargesApiResourceSwagger.PostClientsClientIdChargesRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientChargesApiResourceSwagger.PostClientsClientIdChargesResponse.class))) @@ -181,10 +182,10 @@ public String applyClientCharge(@PathParam("clientId") @Parameter(description = @Path("{chargeId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Pay a Client Charge | Waive a Client Charge", description = "Pay a Client Charge:\n\n" + "Mandatory Fields:" - + "transactionDate and amount " + "" + "\"Pay either a part of or the entire due amount for a charge.(command=paycharge)\n" - + "\n" + "Waive a Client Charge:\n" + "\n" + "\n" - + "This API provides the facility of waiving off the remaining amount on a client charge (command=waive)\n\n" + @Operation(summary = "Pay a Client Charge | Waive a Client Charge", operationId = "payOrWaiveClientCharge", description = "Pay a Client Charge:\n\n" + + "Mandatory Fields:" + "transactionDate and amount " + "" + + "\"Pay either a part of or the entire due amount for a charge.(command=paycharge)\n" + "\n" + "Waive a Client Charge:\n" + + "\n" + "\n" + "This API provides the facility of waiving off the remaining amount on a client charge (command=waive)\n\n" + "Showing request/response for 'Pay a Client Charge'") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ClientChargesApiResourceSwagger.PostClientsClientIdChargesChargeIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientChargesApiResourceSwagger.PostClientsClientIdChargesChargeIdResponse.class))) @@ -226,7 +227,7 @@ public String payOrWaiveClientCharge(@PathParam("clientId") @Parameter(descripti @Path("{chargeId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Client Charge", description = "Deletes a Client Charge on which no transactions have taken place (either payments or waivers). ") + @Operation(summary = "Delete a Client Charge", operationId = "deleteClientCharge", description = "Deletes a Client Charge on which no transactions have taken place (either payments or waivers). ") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientChargesApiResourceSwagger.DeleteClientsClientIdChargesChargeIdResponse.class))) public String deleteClientCharge(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @PathParam("chargeId") @Parameter(description = "chargeId") final Long chargeId) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientFamilyMembersApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientFamilyMembersApiResource.java index 11dcf45d0e7..55f7b58787d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientFamilyMembersApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientFamilyMembersApiResource.java @@ -19,6 +19,7 @@ package org.apache.fineract.portfolio.client.api; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.ws.rs.Consumes; @@ -59,6 +60,7 @@ public class ClientFamilyMembersApiResource { @Path("/{familyMemberId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve a client family member", operationId = "retrieveOneClientFamilyMember") public ClientFamilyMembersData getFamilyMember(@PathParam("familyMemberId") final Long familyMemberId, @PathParam("clientId") @Parameter(description = "clientId") final Long clientId) { @@ -70,6 +72,7 @@ public ClientFamilyMembersData getFamilyMember(@PathParam("familyMemberId") fina @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "List all client family members", operationId = "retrieveAllClientFamilyMembers") public List getFamilyMembers(@PathParam("clientId") final long clientId) { this.context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSIONS); return this.readPlatformService.getClientFamilyMembers(clientId); @@ -79,6 +82,7 @@ public List getFamilyMembers(@PathParam("clientId") fin @Path("/template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve client family member template", operationId = "retrieveTemplateClientFamilyMember") public ClientFamilyMembersData getTemplate(@PathParam("clientId") final long clientId) { this.context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSIONS); return this.readPlatformService.retrieveTemplate(); @@ -88,6 +92,7 @@ public ClientFamilyMembersData getTemplate(@PathParam("clientId") final long cli @Path("/{familyMemberId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Update a client family member", operationId = "updateClientFamilyMember") public CommandProcessingResult updateClientFamilyMembers(@PathParam("familyMemberId") final long familyMemberId, ClientFamilyMemberRequest clientFamilyMemberRequest, @PathParam("clientId") @Parameter(description = "clientId") final Long clientId) { @@ -100,6 +105,7 @@ public CommandProcessingResult updateClientFamilyMembers(@PathParam("familyMembe @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Add a client family member", operationId = "createClientFamilyMember") public CommandProcessingResult addClientFamilyMembers(@PathParam("clientId") final long clientid, ClientFamilyMemberRequest clientFamilyMemberRequest) { final CommandWrapper commandRequest = new CommandWrapperBuilder().addFamilyMembers(clientid) @@ -112,6 +118,7 @@ public CommandProcessingResult addClientFamilyMembers(@PathParam("clientId") fin @Path("/{familyMemberId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Delete a client family member", operationId = "deleteClientFamilyMember") public CommandProcessingResult deleteClientFamilyMembers(@PathParam("familyMemberId") final long familyMemberId, @PathParam("clientId") @Parameter(description = "clientId") final Long clientId) { final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteFamilyMembers(familyMemberId).build(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResource.java index f489bb6faf7..d4beef5f3dd 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResource.java @@ -83,8 +83,8 @@ public class ClientIdentifiersApiResource { @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List all Identifiers for a Client", description = "Example Requests:\n" + "clients/1/identifiers\n" + "\n" + "\n" - + "clients/1/identifiers?fields=documentKey,documentType,description") + @Operation(summary = "List all Identifiers for a Client", operationId = "retrieveAllClientIdentifiers", description = "Example Requests:\n" + + "clients/1/identifiers\n" + "\n" + "\n" + "clients/1/identifiers?fields=documentKey,documentType,description") public List retrieveAllClientIdentifiers( @PathParam("clientId") @Parameter(description = "clientId") final Long clientId) { @@ -97,7 +97,7 @@ public List retrieveAllClientIdentifiers( @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Client Identifier Details Template", description = "This is a convenience resource useful for building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve Client Identifier Details Template", operationId = "retrieveTemplateClientIdentifier", description = "This is a convenience resource useful for building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + " Field Defaults\n" + " Allowed description Lists\n" + "\n\nExample Request:\n" + "clients/1/identifiers/template") public ClientIdentifierData newClientIdentifierDetails( @PathParam("clientId") @Parameter(description = "clientId") final Long clientId) { @@ -112,7 +112,8 @@ public ClientIdentifierData newClientIdentifierDetails( @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create an Identifier for a Client", description = "Mandatory Fields\n" + "documentKey, documentTypeId ") + @Operation(summary = "Create an Identifier for a Client", operationId = "createClientIdentifier", description = "Mandatory Fields\n" + + "documentKey, documentTypeId ") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ClientIdentifiersApiResourceSwagger.PostClientsClientIdIdentifiersRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientIdentifiersApiResourceSwagger.PostClientsClientIdIdentifiersResponse.class))) public CommandProcessingResult createClientIdentifier(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @@ -140,8 +141,9 @@ public CommandProcessingResult createClientIdentifier(@PathParam("clientId") @Pa @Path("{identifierId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Client Identifier", description = "Example Requests:\n" + "clients/1/identifier/2\n" + "\n" + "\n" - + "clients/1/identifier/2?template=true\n" + "\n" + "clients/1/identifiers/2?fields=documentKey,documentType,description") + @Operation(summary = "Retrieve a Client Identifier", operationId = "retrieveOneClientIdentifier", description = "Example Requests:\n" + + "clients/1/identifier/2\n" + "\n" + "\n" + "clients/1/identifier/2?template=true\n" + "\n" + + "clients/1/identifiers/2?fields=documentKey,documentType,description") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientIdentifiersApiResourceSwagger.GetClientsClientIdIdentifiersResponse.class))) public String retrieveClientIdentifiers(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @PathParam("identifierId") @Parameter(description = "identifierId") final Long clientIdentifierId, @@ -165,7 +167,7 @@ public String retrieveClientIdentifiers(@PathParam("clientId") @Parameter(descri @Path("{identifierId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Client Identifier", description = "Updates a Client Identifier") + @Operation(summary = "Update a Client Identifier", operationId = "updateClientIdentifier", description = "Updates a Client Identifier") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ClientIdentifierRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientIdentifiersApiResourceSwagger.PutClientsClientIdIdentifiersIdentifierIdResponse.class))) public CommandProcessingResult updateClientIdentifer(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @@ -194,7 +196,7 @@ public CommandProcessingResult updateClientIdentifer(@PathParam("clientId") @Par @Path("{identifierId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Client Identifier", description = "Deletes a Client Identifier") + @Operation(summary = "Delete a Client Identifier", operationId = "deleteClientIdentifier", description = "Deletes a Client Identifier") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientIdentifiersApiResourceSwagger.DeleteClientsClientIdIdentifiersIdentifierIdResponse.class))) public CommandProcessingResult deleteClientIdentifier(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @PathParam("identifierId") @Parameter(description = "identifierId") final Long clientIdentifierId) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResource.java index 3f9a284ec91..d76778a0538 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResource.java @@ -75,7 +75,7 @@ public class ClientTransactionsApiResource { @Path("{clientId}/transactions") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Client Transactions", description = "The list capability of client transaction can support pagination." + @Operation(summary = "List Client Transactions", operationId = "retrieveAllClientTransactions", description = "The list capability of client transaction can support pagination." + "\n\n" + "Example Requests:\n\n" + "clients/189/transactions\n\n" + "clients/189/transactions?offset=10&limit=50") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientTransactionsApiResourceSwagger.GetClientsClientIdTransactionsResponse.class))) public String retrieveAllClientTransactions(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @@ -90,8 +90,8 @@ public String retrieveAllClientTransactions(@PathParam("clientId") @Parameter(de @Path("{clientId}/transactions/{transactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Client Transaction", description = "Example Requests:\n" + "clients/1/transactions/1\n" + "\n" + "\n" - + "clients/1/transactions/1?fields=id,officeName") + @Operation(summary = "Retrieve a Client Transaction", operationId = "retrieveClientTransaction", description = "Example Requests:\n" + + "clients/1/transactions/1\n" + "\n" + "\n" + "clients/1/transactions/1?fields=id,officeName") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientTransactionsApiResourceSwagger.GetClientsClientIdTransactionsTransactionIdResponse.class))) public String retrieveClientTransaction(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @PathParam("transactionId") @Parameter(description = "transactionId") final Long transactionId, @@ -106,7 +106,7 @@ public String retrieveClientTransaction(@PathParam("clientId") @Parameter(descri @Path("{clientId}/transactions/{transactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Undo a Client Transaction", description = "Undoes a Client Transaction") + @Operation(summary = "Undo a Client Transaction", operationId = "undoClientTransaction", description = "Undoes a Client Transaction") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientTransactionsApiResourceSwagger.PostClientsClientIdTransactionsTransactionIdResponse.class))) public String undoClientTransaction(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @PathParam("transactionId") @Parameter(description = "transactionId") final Long transactionId, @@ -120,7 +120,7 @@ public String undoClientTransaction(@PathParam("clientId") @Parameter(descriptio @Path("external-id/{clientExternalId}/transactions") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Client Transactions", description = "The list capability of client transaction can support pagination." + @Operation(summary = "List Client Transactions", operationId = "retrieveAllClientTransactionsByClientExternalId", description = "The list capability of client transaction can support pagination." + "\n\n" + "Example Requests:\n\n" + "clients/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854/transactions\n\n" + "clients/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854/transactions?offset=10&limit=50") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientTransactionsApiResourceSwagger.GetClientsClientIdTransactionsResponse.class))) @@ -144,7 +144,7 @@ public String retrieveAllClientTransactions( @Path("external-id/{clientExternalId}/transactions/{transactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Client Transaction", description = "Example Requests:\n" + @Operation(summary = "Retrieve a Client Transaction", operationId = "retrieveClientTransactionByClientExternalId", description = "Example Requests:\n" + "clients/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854/transactions/1\n" + "\n" + "\n" + "clients/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854/transactions/1?fields=id,officeName") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientTransactionsApiResourceSwagger.GetClientsClientIdTransactionsTransactionIdResponse.class))) @@ -169,7 +169,7 @@ public String retrieveClientTransaction( @Path("external-id/{clientExternalId}/transactions/{transactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Undo a Client Transaction", description = "Undoes a Client Transaction") + @Operation(summary = "Undo a Client Transaction", operationId = "undoClientTransactionByClientExternalId", description = "Undoes a Client Transaction") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientTransactionsApiResourceSwagger.PostClientsClientIdTransactionsTransactionIdResponse.class))) public String undoClientTransaction( @PathParam("clientExternalId") @Parameter(description = "clientExternalId") final String clientExternalId, @@ -191,7 +191,7 @@ public String undoClientTransaction( @Path("{clientId}/transactions/external-id/{transactionExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Client Transaction", description = "Example Requests:\n" + @Operation(summary = "Retrieve a Client Transaction", operationId = "retrieveClientTransactionByTransactionExternalId", description = "Example Requests:\n" + "clients/1/transactions/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854\n" + "\n" + "\n" + "clients/1/transactions/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854?fields=id,officeName") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientTransactionsApiResourceSwagger.GetClientsClientIdTransactionsTransactionIdResponse.class))) @@ -216,7 +216,7 @@ public String retrieveClientTransaction(@PathParam("clientId") @Parameter(descri @Path("external-id/{clientExternalId}/transactions/external-id/{transactionExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Client Transaction", description = "Example Requests:\n" + @Operation(summary = "Retrieve a Client Transaction", operationId = "retrieveClientTransactionByClientAndTransactionExternalId", description = "Example Requests:\n" + "clients/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854/transactions/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854\n" + "\n" + "\n" + "clients/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854/transactions/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854?fields=id,officeName") @@ -247,7 +247,7 @@ public String retrieveClientTransaction( @Path("{clientId}/transactions/external-id/{transactionExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Undo a Client Transaction", description = "Undoes a Client Transaction") + @Operation(summary = "Undo a Client Transaction", operationId = "undoClientTransactionByTransactionExternalId", description = "Undoes a Client Transaction") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientTransactionsApiResourceSwagger.PostClientsClientIdTransactionsTransactionIdResponse.class))) public String undoClientTransaction(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @PathParam("transactionExternalId") @Parameter(description = "transactionExternalId") final String transactionExternalId, @@ -267,7 +267,7 @@ public String undoClientTransaction(@PathParam("clientId") @Parameter(descriptio @Path("external-id/{clientExternalId}/transactions/external-id/{transactionExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Undo a Client Transaction", description = "Undoes a Client Transaction") + @Operation(summary = "Undo a Client Transaction", operationId = "undoClientTransactionByClientAndTransactionExternalId", description = "Undoes a Client Transaction") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientTransactionsApiResourceSwagger.PostClientsClientIdTransactionsTransactionIdResponse.class))) public String undoClientTransaction( @PathParam("clientExternalId") @Parameter(description = "clientExternalId") final String clientExternalId, diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java index e07a2cba4ee..23183fae27d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java @@ -101,7 +101,7 @@ public class ClientsApiResource { @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Client Details Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve Client Details Template", operationId = "retrieveTemplateClient", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed Value Lists\n\n" + "Example Request:\n" + "\n" + "clients/template") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientsTemplateResponse.class))) public String retrieveTemplate(@Context final UriInfo uriInfo, @@ -131,7 +131,7 @@ public String retrieveTemplate(@Context final UriInfo uriInfo, @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Clients", description = "The list capability of clients can support pagination and sorting.\n\n" + @Operation(summary = "List Clients", operationId = "retrieveAllClients", description = "The list capability of clients can support pagination and sorting.\n\n" + "Example Requests:\n" + "\n" + "clients\n" + "\n" + "clients?fields=displayName,officeName,timeline\n" + "\n" + "clients?offset=10&limit=50\n" + "\n" + "clients?orderBy=displayName&sortOrder=DESC") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientsResponse.class))) @@ -158,8 +158,8 @@ public String retrieveAll(@Context final UriInfo uriInfo, @Path("{clientId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Client", description = "Example Requests:\n" + "\n" + "clients/1\n" + "\n" + "\n" - + "clients/1?template=true\n" + "\n" + "\n" + "clients/1?fields=id,displayName,officeName") + @Operation(summary = "Retrieve a Client", operationId = "retrieveOneClient", description = "Example Requests:\n" + "\n" + "clients/1\n" + + "\n" + "\n" + "clients/1?template=true\n" + "\n" + "\n" + "clients/1?fields=id,displayName,officeName") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientsClientIdResponse.class))) public String retrieveOne(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @Context final UriInfo uriInfo, @@ -170,7 +170,7 @@ public String retrieveOne(@PathParam("clientId") @Parameter(description = "clien @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create a Client", description = "Note:\n\n" + @Operation(summary = "Create a Client", operationId = "createClient", description = "Note:\n\n" + "1. You can enter either:firstname/middlename/lastname - for a person (middlename is optional) OR fullname - for a business or organisation (or person known by one name).\n" + "\n" + "2.If address is enable(enable-address=true), then additional field called address has to be passed.\n\n" + "Mandatory Fields: firstname and lastname OR fullname, officeId, active=true and activationDate OR active=false, if(address enabled) address\n\n" @@ -193,7 +193,7 @@ public String create(@Parameter(hidden = true) final String apiRequestBodyAsJson @Path("{clientId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Client", description = "Note: You can update any of the basic attributes of a client (but not its associations) using this API.\n" + @Operation(summary = "Update a Client", operationId = "updateClient", description = "Note: You can update any of the basic attributes of a client (but not its associations) using this API.\n" + "\n" + "Changing the relationship between a client and its office is not supported through this API. An API specific to handling transfers of clients between offices is available for the same.\n" + "\n" + "The relationship between a client and a group must be removed through the Groups API.") @@ -208,7 +208,7 @@ public String update(@Parameter(description = "clientId") @PathParam("clientId") @Path("{clientId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Client", description = "If a client is in Pending state, you are allowed to Delete it. The delete is a 'hard delete' and cannot be recovered from. Once clients become active or have loans or savings associated with them, you cannot delete the client but you may Close the client if they have left the program.") + @Operation(summary = "Delete a Client", operationId = "deleteClient", description = "If a client is in Pending state, you are allowed to Delete it. The delete is a 'hard delete' and cannot be recovered from. Once clients become active or have loans or savings associated with them, you cannot delete the client but you may Close the client if they have left the program.") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.DeleteClientsClientIdResponse.class))) public String delete(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId) { return deleteClient(clientId, null); @@ -218,7 +218,7 @@ public String delete(@PathParam("clientId") @Parameter(description = "clientId") @Path("{clientId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Activate a Client | Close a Client | Reject a Client | Withdraw a Client | Reactivate a Client | UndoReject a Client | UndoWithdraw a Client | Assign a Staff | Unassign a Staff | Update Default Savings Account | Propose a Client Transfer | Withdraw a Client Transfer | Reject a Client Transfer | Accept a Client Transfer | Propose and Accept a Client Transfer", description = "Activate a Client:\n\n" + @Operation(summary = "Activate a Client | Close a Client | Reject a Client | Withdraw a Client | Reactivate a Client | UndoReject a Client | UndoWithdraw a Client | Assign a Staff | Unassign a Staff | Update Default Savings Account | Propose a Client Transfer | Withdraw a Client Transfer | Reject a Client Transfer | Accept a Client Transfer | Propose and Accept a Client Transfer", operationId = "handleCommandClient", description = "Activate a Client:\n\n" + "Clients can be created in a Pending state. This API exists to enable client activation (for when a client becomes an approved member of the financial Institution).\n" + "\n" + "If the client happens to be already active this API will result in an error.\n\n" + "Close a Client:\n\n" + "Clients can be closed if they do not have any non-closed loans/savingsAccount. This API exists to close a client .\n" + "\n" @@ -260,7 +260,7 @@ public String activate(@PathParam("clientId") @Parameter(description = "clientId @Path("{clientId}/accounts") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve client accounts overview", description = "An example of how a loan portfolio summary can be provided. This is requested in a specific use case of the community application.\n" + @Operation(summary = "Retrieve client accounts overview", operationId = "retrieveAllClientAccounts", description = "An example of how a loan portfolio summary can be provided. This is requested in a specific use case of the community application.\n" + "It is quite reasonable to add resources like this to simplify User Interface development.\n" + "\n" + "Example Requests:\n " + "\n" + "clients/1/accounts\n" + "\n" + "clients/1/accounts?fields=loanAccounts,savingsAccounts") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientsClientIdAccountsResponse.class))) @@ -273,6 +273,7 @@ public String retrieveAssociatedAccounts(@PathParam("clientId") @Parameter(descr @GET @Path("downloadtemplate") @Produces("application/vnd.ms-excel") + @Operation(summary = "Download client template for bulk import", operationId = "getClientTemplate") public Response getClientTemplate(@QueryParam("legalFormType") final String legalFormType, @QueryParam("officeId") final Long officeId, @QueryParam("staffId") final Long staffId, @QueryParam("dateFormat") final String dateFormat) { return bulkImportWorkbookPopulatorService.getTemplate(legalFormType, officeId, staffId, dateFormat); @@ -281,6 +282,7 @@ public Response getClientTemplate(@QueryParam("legalFormType") final String lega @POST @Path("uploadtemplate") @Consumes(MediaType.MULTIPART_FORM_DATA) + @Operation(summary = "Upload client template for bulk import", operationId = "postClientTemplate") @RequestBody(description = "Upload client template", content = { @Content(mediaType = MediaType.MULTIPART_FORM_DATA, schema = @Schema(implementation = UploadRequest.class)) }) public String postClientTemplate(@QueryParam("legalFormType") final String legalFormType, @@ -294,7 +296,7 @@ public String postClientTemplate(@QueryParam("legalFormType") final String legal @GET @Path("{clientId}/obligeedetails") @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve client obligee details", description = "Retrieve client obligee details") + @Operation(summary = "Retrieve client obligee details", operationId = "retrieveClientObligeeDetails", description = "Retrieve client obligee details") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientObligeeDetailsResponse.class))) @ApiResponse(responseCode = "400", description = "Bad Request") public String retrieveObligeeDetails(@PathParam("clientId") final Long clientId, @Context final UriInfo uriInfo) { @@ -304,7 +306,7 @@ public String retrieveObligeeDetails(@PathParam("clientId") final Long clientId, @GET @Path("{clientId}/transferproposaldate") @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve client transfer template", description = "Retrieve client transfer template") + @Operation(summary = "Retrieve client transfer template", operationId = "retrieveClientTransferTemplate", description = "Retrieve client transfer template") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientTransferProposalDateResponse.class))) @ApiResponse(responseCode = "400", description = "Bad Request") public String retrieveTransferTemplate(@PathParam("clientId") final Long clientId, @Context final UriInfo uriInfo) { @@ -314,8 +316,9 @@ public String retrieveTransferTemplate(@PathParam("clientId") final Long clientI @GET @Path("/external-id/{externalId}") @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Client by External Id", description = "Example Requests:\n" + "\n" + "clients/123-456\n" + "\n" + "\n" - + "clients/123-456?template=true\n" + "\n" + "\n" + "clients/123-456?fields=id,displayName,officeName") + @Operation(summary = "Retrieve a Client by External Id", operationId = "retrieveOneClientByExternalId", description = "Example Requests:\n" + + "\n" + "clients/123-456\n" + "\n" + "\n" + "clients/123-456?template=true\n" + "\n" + "\n" + + "clients/123-456?fields=id,displayName,officeName") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientsClientIdResponse.class))) public String retrieveOne(@PathParam("externalId") @Parameter(description = "externalId") final String externalId, @Context final UriInfo uriInfo, @@ -326,7 +329,7 @@ public String retrieveOne(@PathParam("externalId") @Parameter(description = "ext @GET @Path("/external-id/{externalId}/accounts") @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve client accounts overview", description = "An example of how a loan portfolio summary can be provided. This is requested in a specific use case of the community application.\n" + @Operation(summary = "Retrieve client accounts overview", operationId = "retrieveAllClientAccountsByExternalId", description = "An example of how a loan portfolio summary can be provided. This is requested in a specific use case of the community application.\n" + "It is quite reasonable to add resources like this to simplify User Interface development.\n" + "\n" + "Example Requests:\n " + "\n" + "clients/123-456/accounts\n" + "\n" + "clients/123-456/accounts?fields=loanAccounts,savingsAccounts") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientsClientIdAccountsResponse.class))) @@ -340,7 +343,7 @@ public String retrieveAssociatedAccounts(@PathParam("externalId") @Parameter(des @Path("/external-id/{externalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Client using the External Id", description = "Note: You can update any of the basic attributes of a client (but not its associations) using this API.\n" + @Operation(summary = "Update a Client using the External Id", operationId = "updateClientByExternalId", description = "Note: You can update any of the basic attributes of a client (but not its associations) using this API.\n" + "\n" + "Changing the relationship between a client and its office is not supported through this API. An API specific to handling transfers of clients between offices is available for the same.\n" + "\n" + "The relationship between a client and a group must be removed through the Groups API.") @@ -355,7 +358,7 @@ public String update(@Parameter(description = "externalId") @PathParam("external @Path("/external-id/{externalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Activate a Client | Close a Client | Reject a Client | Withdraw a Client | Reactivate a Client | UndoReject a Client | UndoWithdraw a Client | Assign a Staff | Unassign a Staff | Update Default Savings Account | Propose a Client Transfer | Withdraw a Client Transfer | Reject a Client Transfer | Accept a Client Transfer | Propose and Accept a Client Transfer", description = "Activate a Client:\n\n" + @Operation(summary = "Activate a Client | Close a Client | Reject a Client | Withdraw a Client | Reactivate a Client | UndoReject a Client | UndoWithdraw a Client | Assign a Staff | Unassign a Staff | Update Default Savings Account | Propose a Client Transfer | Withdraw a Client Transfer | Reject a Client Transfer | Accept a Client Transfer | Propose and Accept a Client Transfer", operationId = "handleCommandClientByExternalId", description = "Activate a Client:\n\n" + "Clients can be created in a Pending state. This API exists to enable client activation (for when a client becomes an approved member of the financial Institution).\n" + "\n" + "If the client happens to be already active this API will result in an error.\n\n" + "Close a Client:\n\n" + "Clients can be closed if they do not have any non-closed loans/savingsAccount. This API exists to close a client .\n" + "\n" @@ -397,7 +400,7 @@ public String applyCommand(@PathParam("externalId") @Parameter(description = "ex @Path("/external-id/{externalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Client", description = "If a client is in Pending state, you are allowed to Delete it. The delete is a 'hard delete' and cannot be recovered from. Once clients become active or have loans or savings associated with them, you cannot delete the client but you may Close the client if they have left the program.") + @Operation(summary = "Delete a Client", operationId = "deleteClientByExternalId", description = "If a client is in Pending state, you are allowed to Delete it. The delete is a 'hard delete' and cannot be recovered from. Once clients become active or have loans or savings associated with them, you cannot delete the client but you may Close the client if they have left the program.") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.DeleteClientsClientIdResponse.class))) public String delete(@PathParam("externalId") @Parameter(description = "externalId") final String externalId) { return deleteClient(null, externalId); @@ -406,7 +409,7 @@ public String delete(@PathParam("externalId") @Parameter(description = "external @GET @Path("/external-id/{externalId}/obligeedetails") @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve client obligee details", description = "Retrieve client obligee details using the client external Id") + @Operation(summary = "Retrieve client obligee details", operationId = "retrieveClientObligeeDetailsByExternalId", description = "Retrieve client obligee details using the client external Id") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientObligeeDetailsResponse.class))) @ApiResponse(responseCode = "400", description = "Bad Request") public String retrieveObligeeDetails(@PathParam("externalId") final String externalId, @Context final UriInfo uriInfo) { @@ -416,7 +419,7 @@ public String retrieveObligeeDetails(@PathParam("externalId") final String exter @GET @Path("/external-id/{externalId}/transferproposaldate") @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve client transfer template", description = "Retrieve client transfer template using the client external Id") + @Operation(summary = "Retrieve client transfer template", operationId = "retrieveClientTransferTemplateByExternalId", description = "Retrieve client transfer template using the client external Id") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.GetClientTransferProposalDateResponse.class))) @ApiResponse(responseCode = "400", description = "Bad Request") public String retrieveTransferTemplate(@PathParam("externalId") final String externalId, @Context final UriInfo uriInfo) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/InternalClientInformationApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/InternalClientInformationApiResource.java index e0e3430f203..a650c1dd633 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/InternalClientInformationApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/InternalClientInformationApiResource.java @@ -24,6 +24,7 @@ import static org.apache.fineract.infrastructure.core.domain.AuditableFieldsConstants.LAST_MODIFIED_DATE; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import io.swagger.v3.oas.annotations.Operation; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; @@ -74,6 +75,7 @@ public void afterPropertiesSet() { @Path("{clientId}/audit") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Get internal client audit fields", operationId = "getInternalClientAuditFields") @SuppressFBWarnings("SLF4J_SIGN_ONLY_FORMAT") public String getClientAuditFields(@Context final UriInfo uriInfo, @PathParam("clientId") Long clientId) { log.warn("------------------------------------------------------------"); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/v2/search/ClientSearchV2ApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/v2/search/ClientSearchV2ApiResource.java index d5fd1ff51d7..5a302e88dd8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/v2/search/ClientSearchV2ApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/v2/search/ClientSearchV2ApiResource.java @@ -46,7 +46,7 @@ public class ClientSearchV2ApiResource implements ClientSearchV2Api { @Path("search") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Search Clients by text") + @Operation(summary = "Search Clients by text", operationId = "searchClientsByText") public Page searchByText(@Parameter PagedRequest request) { return delegate.searchByText(request); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResource.java index 962cefa8800..8fd9da8be13 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResource.java @@ -67,7 +67,7 @@ public class ClientCollateralManagementApiResource { @GET @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Get Clients Collateral Products", description = "Get Collateral Product of a Client") + @Operation(summary = "Get Clients Collateral Products", operationId = "getClientCollateralProducts", description = "Get Collateral Product of a Client") public List getClientCollateral( @PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @Context final UriInfo uriInfo, @QueryParam("prodId") @Parameter(description = "prodId") final Long prodId) { @@ -82,7 +82,7 @@ public List getClientCollateral( @Path("{clientCollateralId}") @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Get Client Collateral Data", description = "Get Client Collateral Data") + @Operation(summary = "Get Client Collateral Data", operationId = "getClientCollateralData", description = "Get Client Collateral Data") public ClientCollateralManagementData getClientCollateralData( @PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @PathParam("clientCollateralId") @Parameter(description = "clientCollateralId") final Long collateralId) { @@ -97,7 +97,7 @@ public ClientCollateralManagementData getClientCollateralData( @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Get Client Collateral Template", description = "Get Client Collateral Template") + @Operation(summary = "Get Client Collateral Template", operationId = "getClientCollateralTemplate", description = "Get Client Collateral Template") public List getClientCollateralTemplate( @PathParam("clientId") @Parameter(description = "clientId") final Long clientId) { return this.clientCollateralManagementReadPlatformService.getLoanCollateralTemplate(clientId); @@ -106,7 +106,7 @@ public List getClientCollateralTemplate( @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Add New Collateral For a Client", description = "Add New Collateral For a Client") + @Operation(summary = "Add New Collateral For a Client", operationId = "addClientCollateral", description = "Add New Collateral For a Client") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ClientCollateralRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientCollateralManagementApiResourceSwagger.PostClientCollateralResponse.class))) public CommandProcessingResult addCollateral(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @@ -121,7 +121,7 @@ public CommandProcessingResult addCollateral(@PathParam("clientId") @Parameter(d @Path("{collateralId}") @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update New Collateral of a Client", description = "Update New Collateral of a Client") + @Operation(summary = "Update New Collateral of a Client", operationId = "updateClientCollateral", description = "Update New Collateral of a Client") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = UpdateClientCollateralRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientCollateralManagementApiResourceSwagger.PutClientCollateralResponse.class))) public CommandProcessingResult updateCollateral(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @@ -138,7 +138,7 @@ public CommandProcessingResult updateCollateral(@PathParam("clientId") @Paramete @Path("{collateralId}") @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete Client Collateral", description = "Delete Client Collateral") + @Operation(summary = "Delete Client Collateral", operationId = "deleteClientCollateral", description = "Delete Client Collateral") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientCollateralManagementApiResourceSwagger.DeleteClientCollateralResponse.class))) public CommandProcessingResult deleteCollateral(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId, diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResource.java index 35821ad6bbf..6afb51e3b1b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResource.java @@ -108,8 +108,8 @@ public String retrieveAllLoanCharges(@PathParam("loanId") @Parameter(description @Path("external-id/{loanExternalId}/charges") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Loan Charges", description = "It lists all the Loan Charges specific to a Loan \n\n" + "Example Requests:\n" - + "\n" + "loans/1/charges\n" + "\n" + "\n" + "loans/1/charges?fields=name,amountOrPercentage") + @Operation(summary = "List Loan Charges", operationId = "retrieveAllLoanChargesByLoanExternalId", description = "It lists all the Loan Charges specific to a Loan \n\n" + + "Example Requests:\n" + "\n" + "loans/1/charges\n" + "\n" + "\n" + "loans/1/charges?fields=name,amountOrPercentage") @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = LoanChargesApiResourceSwagger.GetLoansLoanIdChargesChargeIdResponse.class)))) public String retrieveAllLoanCharges( @PathParam("loanExternalId") @Parameter(description = "loanExternalId") final String loanExternalId, @@ -122,7 +122,7 @@ public String retrieveAllLoanCharges( @Path("{loanId}/charges/template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Loan Charges Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve Loan Charges Template", operationId = "retrieveTemplateLoanCharge", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed description Lists\n" + "Example Request:\n" + "\n" + "loans/1/charges/template\n" + "\n") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.GetLoansLoanIdChargesTemplateResponse.class))) public String retrieveTemplate(@PathParam("loanId") @Parameter(description = "loanId") final Long loanId, @@ -135,7 +135,7 @@ public String retrieveTemplate(@PathParam("loanId") @Parameter(description = "lo @Path("external-id/{loanExternalId}/charges/template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Loan Charges Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve Loan Charges Template", operationId = "retrieveTemplateLoanChargeByLoanExternalId", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed description Lists\n" + "Example Request:\n" + "\n" + "loans/1/charges/template\n" + "\n") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.GetLoansLoanIdChargesTemplateResponse.class))) public String retrieveTemplate(@PathParam("loanExternalId") @Parameter(description = "loanExternalId") final String loanExternalId, @@ -161,7 +161,7 @@ public String retrieveLoanCharge(@PathParam("loanId") @Parameter(description = " @Path("{loanId}/charges/external-id/{loanChargeExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Loan Charge", description = "Retrieves Loan Charge according to the Loan ID and Loan Charge External ID" + @Operation(summary = "Retrieve a Loan Charge", operationId = "retrieveLoanChargeByChargeExternalId", description = "Retrieves Loan Charge according to the Loan ID and Loan Charge External ID" + "Example Requests:\n" + "\n" + "/loans/1/charges/1\n" + "\n" + "\n" + "/loans/1/charges/external-id/1?fields=name,amountOrPercentage") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.GetLoansLoanIdChargesChargeIdResponse.class))) @@ -176,7 +176,7 @@ public String retrieveLoanCharge(@PathParam("loanId") @Parameter(description = " @Path("external-id/{loanExternalId}/charges/{loanChargeId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Loan Charge", description = "Retrieves Loan Charge according to the Loan external ID and Loan Charge ID" + @Operation(summary = "Retrieve a Loan Charge", operationId = "retrieveLoanChargeByLoanExternalId", description = "Retrieves Loan Charge according to the Loan external ID and Loan Charge ID" + "Example Requests:\n" + "\n" + "/loans/1/charges/1\n" + "\n" + "\n" + "/loans/1/charges/1?fields=name,amountOrPercentage") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.GetLoansLoanIdChargesChargeIdResponse.class))) public String retrieveLoanCharge(@PathParam("loanExternalId") @Parameter(description = "loanExternalId") final String loanExternalId, @@ -189,7 +189,7 @@ public String retrieveLoanCharge(@PathParam("loanExternalId") @Parameter(descrip @Path("external-id/{loanExternalId}/charges/external-id/{loanChargeExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Loan Charge", description = "Retrieves Loan Charge according to the Loan External ID and Loan Charge External ID" + @Operation(summary = "Retrieve a Loan Charge", operationId = "retrieveLoanChargeByLoanAndChargeExternalId", description = "Retrieves Loan Charge according to the Loan External ID and Loan Charge External ID" + "Example Requests:\n" + "\n" + "/loans/1/charges/1\n" + "\n" + "\n" + "/loans/1/charges/1?fields=name,amountOrPercentage") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.GetLoansLoanIdChargesChargeIdResponse.class))) public String retrieveLoanCharge(@PathParam("loanExternalId") @Parameter(description = "loanExternalId") final String loanExternalId, @@ -217,7 +217,7 @@ public String executeLoanCharge(@PathParam("loanId") @Parameter(description = "l @Path("external-id/{loanExternalId}/charges") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create a Loan Charge (no command provided) or Pay a charge (command=pay)", description = "Creates a Loan Charge | Pay a Loan Charge") + @Operation(summary = "Create a Loan Charge (no command provided) or Pay a charge (command=pay)", operationId = "executeLoanChargeByLoanExternalId", description = "Creates a Loan Charge | Pay a Loan Charge") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PostLoansLoanIdChargesRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PostLoansLoanIdChargesResponse.class))) public String executeLoanCharge(@PathParam("loanExternalId") @Parameter(description = "loanExternalId") final String loanExternalId, @@ -231,7 +231,7 @@ public String executeLoanCharge(@PathParam("loanExternalId") @Parameter(descript @Path("{loanId}/charges/{loanChargeId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Pay / Waive / Adjustment for Loan Charge", description = "Loan Charge will be paid if the loan is linked with a savings account | Waive Loan Charge | Add Charge Adjustment") + @Operation(summary = "Pay / Waive / Adjustment for Loan Charge", operationId = "executeLoanChargeOnExistingCharge", description = "Loan Charge will be paid if the loan is linked with a savings account | Waive Loan Charge | Add Charge Adjustment") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PostLoansLoanIdChargesChargeIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PostLoansLoanIdChargesChargeIdResponse.class))) public String executeLoanCharge(@PathParam("loanId") @Parameter(description = "loanId") final Long loanId, @@ -246,7 +246,7 @@ public String executeLoanCharge(@PathParam("loanId") @Parameter(description = "l @Path("{loanId}/charges/external-id/{loanChargeExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Pay / Waive / Adjustment for Loan Charge", description = "Loan Charge will be paid if the loan is linked with a savings account | Waive Loan Charge | Add Charge Adjustment") + @Operation(summary = "Pay / Waive / Adjustment for Loan Charge", operationId = "executeLoanChargeByChargeExternalId", description = "Loan Charge will be paid if the loan is linked with a savings account | Waive Loan Charge | Add Charge Adjustment") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PostLoansLoanIdChargesChargeIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PostLoansLoanIdChargesChargeIdResponse.class))) public String executeLoanCharge(@PathParam("loanId") @Parameter(description = "loanId") final Long loanId, @@ -261,7 +261,7 @@ public String executeLoanCharge(@PathParam("loanId") @Parameter(description = "l @Path("external-id/{loanExternalId}/charges/{loanChargeId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Pay / Waive / Adjustment for Loan Charge", description = "Loan Charge will be paid if the loan is linked with a savings account | Waive Loan Charge | Add Charge Adjustment") + @Operation(summary = "Pay / Waive / Adjustment for Loan Charge", operationId = "executeLoanChargeByLoanExternalIdOnExistingCharge", description = "Loan Charge will be paid if the loan is linked with a savings account | Waive Loan Charge | Add Charge Adjustment") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PostLoansLoanIdChargesChargeIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PostLoansLoanIdChargesChargeIdResponse.class))) public String executeLoanCharge(@PathParam("loanExternalId") @Parameter(description = "loanExternalId") final String loanExternalId, @@ -276,7 +276,7 @@ public String executeLoanCharge(@PathParam("loanExternalId") @Parameter(descript @Path("external-id/{loanExternalId}/charges/external-id/{loanChargeExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Pay / Waive / Adjustment for Loan Charge", description = "Loan Charge will be paid if the loan is linked with a savings account | Waive Loan Charge | Add Charge Adjustment") + @Operation(summary = "Pay / Waive / Adjustment for Loan Charge", operationId = "executeLoanChargeByLoanAndChargeExternalId", description = "Loan Charge will be paid if the loan is linked with a savings account | Waive Loan Charge | Add Charge Adjustment") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PostLoansLoanIdChargesChargeIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PostLoansLoanIdChargesChargeIdResponse.class))) public String executeLoanCharge(@PathParam("loanExternalId") @Parameter(description = "loanExternalId") final String loanExternalId, @@ -305,7 +305,7 @@ public String updateLoanCharge(@PathParam("loanId") @Parameter(description = "lo @Path("{loanId}/charges/external-id/{loanChargeExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Loan Charge", description = "Currently Loan Charges may be updated only if the Loan is not yet approved") + @Operation(summary = "Update a Loan Charge", operationId = "updateLoanChargeByChargeExternalId", description = "Currently Loan Charges may be updated only if the Loan is not yet approved") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PutLoansLoanIdChargesChargeIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PutLoansLoanIdChargesChargeIdResponse.class))) public String updateLoanCharge(@PathParam("loanId") @Parameter(description = "loanId") final Long loanId, @@ -319,7 +319,7 @@ public String updateLoanCharge(@PathParam("loanId") @Parameter(description = "lo @Path("external-id/{loanExternalId}/charges/{loanChargeId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Loan Charge", description = "Currently Loan Charges may be updated only if the Loan is not yet approved") + @Operation(summary = "Update a Loan Charge", operationId = "updateLoanChargeByLoanExternalId", description = "Currently Loan Charges may be updated only if the Loan is not yet approved") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PutLoansLoanIdChargesChargeIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PutLoansLoanIdChargesChargeIdResponse.class))) public String updateLoanCharge(@PathParam("loanExternalId") @Parameter(description = "loanExternalId") final String loanExternalId, @@ -333,7 +333,7 @@ public String updateLoanCharge(@PathParam("loanExternalId") @Parameter(descripti @Path("external-id/{loanExternalId}/charges/external-id/{loanChargeExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Loan Charge", description = "Currently Loan Charges may be updated only if the Loan is not yet approved") + @Operation(summary = "Update a Loan Charge", operationId = "updateLoanChargeByLoanAndChargeExternalId", description = "Currently Loan Charges may be updated only if the Loan is not yet approved") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PutLoansLoanIdChargesChargeIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.PutLoansLoanIdChargesChargeIdResponse.class))) public String updateLoanCharge(@PathParam("loanExternalId") @Parameter(description = "loanExternalId") final String loanExternalId, @@ -359,7 +359,7 @@ public String deleteLoanCharge(@PathParam("loanId") @Parameter(description = "lo @Path("{loanId}/charges/external-id/{loanChargeExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Loan Charge", description = "Note: Currently, A Loan Charge may only be removed from Loans that are not yet approved.") + @Operation(summary = "Delete a Loan Charge", operationId = "deleteLoanChargeByChargeExternalId", description = "Note: Currently, A Loan Charge may only be removed from Loans that are not yet approved.") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.DeleteLoansLoanIdChargesChargeIdResponse.class))) public String deleteLoanCharge(@PathParam("loanId") @Parameter(description = "loanId") final Long loanId, @PathParam("loanChargeExternalId") @Parameter(description = "loanChargeExternalId") final String loanChargeExternalId) { @@ -371,7 +371,7 @@ public String deleteLoanCharge(@PathParam("loanId") @Parameter(description = "lo @Path("external-id/{loanExternalId}/charges/{loanChargeId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Loan Charge", description = "Note: Currently, A Loan Charge may only be removed from Loans that are not yet approved.") + @Operation(summary = "Delete a Loan Charge", operationId = "deleteLoanChargeByLoanExternalId", description = "Note: Currently, A Loan Charge may only be removed from Loans that are not yet approved.") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.DeleteLoansLoanIdChargesChargeIdResponse.class))) public String deleteLoanCharge(@PathParam("loanExternalId") @Parameter(description = "loanExternalId") final String loanExternalId, @PathParam("loanChargeId") @Parameter(description = "loanChargeId") final Long loanChargeId) { @@ -383,7 +383,7 @@ public String deleteLoanCharge(@PathParam("loanExternalId") @Parameter(descripti @Path("external-id/{loanExternalId}/charges/external-id/{loanChargeExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Loan Charge", description = "Note: Currently, A Loan Charge may only be removed from Loans that are not yet approved.") + @Operation(summary = "Delete a Loan Charge", operationId = "deleteLoanChargeByLoanAndChargeExternalId", description = "Note: Currently, A Loan Charge may only be removed from Loans that are not yet approved.") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanChargesApiResourceSwagger.DeleteLoansLoanIdChargesChargeIdResponse.class))) public String deleteLoanCharge(@PathParam("loanExternalId") @Parameter(description = "loanExternalId") final String loanExternalId, @PathParam("loanChargeExternalId") @Parameter(description = "loanChargeExternalId") final String loanChargeExternalId) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResource.java index 112c18b6b97..2b5bfb5b0c7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResource.java @@ -150,7 +150,7 @@ public String retrieveTransactionTemplate(@PathParam("loanId") @Parameter(descri @Path("external-id/{loanExternalId}/transactions/template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Loan Transaction Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve Loan Transaction Template", operationId = "retrieveTransactionTemplateByLoanExternalId", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed Value Lists\n\n" + "Example Requests:\n" + "\n" + "loans/1/transactions/template?command=repayment" + "loans/1/transactions/template?command=merchantIssuedRefund" + "loans/1/transactions/template?command=payoutRefund" + "loans/1/transactions/template?command=goodwillCredit" + "\n" @@ -312,7 +312,7 @@ public String executeLoanTransaction(@PathParam("loanId") @Parameter(description @Path("external-id/{loanExternalId}/transactions") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Significant Loan Transactions", description = "This API covers the major loan transaction functionality\n\n" + @Operation(summary = "Significant Loan Transactions", operationId = "executeLoanTransactionByLoanExternalId", description = "This API covers the major loan transaction functionality\n\n" + "Example Requests:\n\n" + "loans/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854/transactions?command=repayment" + " | Make a Repayment | \n" + "loans/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854/transactions?command=merchantIssuedRefund" @@ -365,7 +365,7 @@ public String adjustLoanTransaction(@PathParam("loanId") @Parameter(description @Path("external-id/{loanExternalId}/transactions/{transactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Adjust a Transaction", description = "Note: there is no need to specify command={transactionType} parameter.\n\n" + @Operation(summary = "Adjust a Transaction", operationId = "adjustLoanTransactionByLoanExternalId", description = "Note: there is no need to specify command={transactionType} parameter.\n\n" + "Mandatory Fields: transactionDate, transactionAmount") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanTransactionsApiResourceSwagger.PostLoansLoanIdTransactionsTransactionIdRequest.class))) @ApiResponses({ @@ -383,7 +383,7 @@ public String adjustLoanTransaction( @Path("{loanId}/transactions/external-id/{externalTransactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Adjust a Transaction", description = "Note: there is no need to specify command={transactionType} parameter.\n\n" + @Operation(summary = "Adjust a Transaction", operationId = "adjustLoanTransactionByTransactionExternalId", description = "Note: there is no need to specify command={transactionType} parameter.\n\n" + "Mandatory Fields: transactionDate, transactionAmount") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanTransactionsApiResourceSwagger.PostLoansLoanIdTransactionsTransactionIdRequest.class))) @ApiResponses({ @@ -400,7 +400,7 @@ public String adjustLoanTransaction(@PathParam("loanId") @Parameter(description @Path("external-id/{loanExternalId}/transactions/external-id/{externalTransactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Adjust a Transaction", description = "Note: there is no need to specify command={transactionType} parameter.\n\n" + @Operation(summary = "Adjust a Transaction", operationId = "adjustLoanTransactionByLoanAndTransactionExternalId", description = "Note: there is no need to specify command={transactionType} parameter.\n\n" + "Mandatory Fields: transactionDate, transactionAmount") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanTransactionsApiResourceSwagger.PostLoansLoanIdTransactionsTransactionIdRequest.class))) @ApiResponses({ @@ -432,7 +432,7 @@ public String undoWaiveCharge(@PathParam("loanId") @Parameter(description = "loa @Path("external-id/{loanExternalId}/transactions/{transactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Undo a Waive Charge Transaction", description = "Undo a Waive Charge Transaction") + @Operation(summary = "Undo a Waive Charge Transaction", operationId = "undoWaiveChargeByLoanExternalId", description = "Undo a Waive Charge Transaction") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanTransactionsApiResourceSwagger.PutChargeTransactionChangesRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanTransactionsApiResourceSwagger.PutChargeTransactionChangesResponse.class))) }) @@ -447,7 +447,7 @@ public String undoWaiveCharge( @Path("{loanId}/transactions/external-id/{transactionExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Undo a Waive Charge Transaction", description = "Undo a Waive Charge Transaction") + @Operation(summary = "Undo a Waive Charge Transaction", operationId = "undoWaiveChargeByTransactionExternalId", description = "Undo a Waive Charge Transaction") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanTransactionsApiResourceSwagger.PutChargeTransactionChangesRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanTransactionsApiResourceSwagger.PutChargeTransactionChangesResponse.class))) }) @@ -461,7 +461,7 @@ public String undoWaiveCharge(@PathParam("loanId") @Parameter(description = "loa @Path("external-id/{loanExternalId}/transactions/external-id/{transactionExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Undo a Waive Charge Transaction", description = "Undo a Waive Charge Transaction") + @Operation(summary = "Undo a Waive Charge Transaction", operationId = "undoWaiveChargeByLoanAndTransactionExternalId", description = "Undo a Waive Charge Transaction") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanTransactionsApiResourceSwagger.PutChargeTransactionChangesRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanTransactionsApiResourceSwagger.PutChargeTransactionChangesResponse.class))) }) @@ -801,7 +801,7 @@ public LoanScheduleData previewReAgeSchedule(@PathParam("loanId") @Parameter(des @GET @Path("external-id/{loanExternalId}/transactions/reage-preview") @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Preview Re-Age Schedule", description = "Generates a preview of the re-aged loan schedule based on the provided parameters without creating any transactions or modifying the loan.") + @Operation(summary = "Preview Re-Age Schedule", operationId = "previewReAgeScheduleByLoanExternalId", description = "Generates a preview of the re-aged loan schedule based on the provided parameters without creating any transactions or modifying the loan.") public LoanScheduleData previewReAgeSchedule( @PathParam("loanExternalId") @Parameter(description = "loanExternalId", required = true) final String loanExternalId, @Valid @BeanParam final ReAgePreviewRequest reAgePreviewRequest) { @@ -823,7 +823,7 @@ public LoanScheduleData previewReAmortizationSchedule( @GET @Path("external-id/{loanExternalId}/transactions/reamortization-preview") @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Preview Re-amortized Schedule", description = "Generates a preview of the re-amortized loan schedule based on the provided parameters without creating any transactions or modifying the loan.") + @Operation(summary = "Preview Re-amortized Schedule", operationId = "previewReAmortizationScheduleByLoanExternalId", description = "Generates a preview of the re-amortized loan schedule based on the provided parameters without creating any transactions or modifying the loan.") public LoanScheduleData previewReAmortizationSchedule( @PathParam("loanExternalId") @Parameter(description = "loanExternalId", required = true) final String loanExternalId, @Valid @BeanParam final ReAmortizationPreviewRequest reAmortizationPreviewRequest) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java index bf68bede579..d9a362dfa78 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java @@ -483,7 +483,7 @@ public String retrieveLoan(@PathParam("loanId") @Parameter(description = "loanId @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Loans", description = "The list capability of loans can support pagination and sorting.\n" + @Operation(summary = "List Loans", operationId = "retrieveAllLoans", description = "The list capability of loans can support pagination and sorting.\n" + "Example Requests:\n" + "\n" + "loans\n" + "\n" + "loans?fields=accountNo\n" + "\n" + "loans?offset=10&limit=50\n" + "\n" + "loans?orderBy=accountNo&sortOrder=DESC") @ApiResponses({ @@ -748,6 +748,7 @@ public String getDelinquencyTagHistory(@PathParam("loanId") @Parameter(descripti @Path("external-id/{loanExternalId}/template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve Loan Approval Template", operationId = "retrieveApprovalTemplateByExternalId") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoansApiResourceSwagger.GetLoansApprovalTemplateResponse.class))) }) public String retrieveApprovalTemplate( @@ -761,7 +762,7 @@ public String retrieveApprovalTemplate( @Path("external-id/{loanExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Loan", description = "Note: template=true parameter doesn't apply to this resource." + @Operation(summary = "Retrieve a Loan", operationId = "retrieveLoanByExternalId", description = "Note: template=true parameter doesn't apply to this resource." + "Example Requests:\n" + "\n" + "loans/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854\n" + "\n" + "\n" + "loans/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854?fields=id,principal,annualInterestRate\n" + "\n" + "\n" + "loans/external-id/7dd80a7c-ycba-a446-t378-91eb6f53e854?associations=all\n" + "\n" @@ -784,7 +785,7 @@ public String retrieveLoan( @Path("external-id/{loanExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Modify a loan application", description = "Loan application can only be modified when in 'Submitted and pending approval' state. Once the application is approved, the details cannot be changed using this method.") + @Operation(summary = "Modify a loan application", operationId = "modifyLoanApplicationByExternalId", description = "Loan application can only be modified when in 'Submitted and pending approval' state. Once the application is approved, the details cannot be changed using this method.") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoansApiResourceSwagger.PutLoansLoanIdRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoansApiResourceSwagger.PutLoansLoanIdResponse.class))) }) @@ -799,7 +800,7 @@ public String modifyLoanApplication( @Path("external-id/{loanExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Loan Application", description = "Note: Only loans in \"Submitted and awaiting approval\" status can be deleted.") + @Operation(summary = "Delete a Loan Application", operationId = "deleteLoanApplicationByExternalId", description = "Note: Only loans in \"Submitted and awaiting approval\" status can be deleted.") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoansApiResourceSwagger.DeleteLoansLoanIdResponse.class))) }) public String deleteLoanApplication( @@ -811,7 +812,7 @@ public String deleteLoanApplication( @Path("external-id/{loanExternalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Approve Loan Application | Recover Loan Guarantee | Undo Loan Application Approval | Assign a Loan Officer | Unassign a Loan Officer | Reject Loan Application | Applicant Withdraws from Loan Application | Disburse Loan Disburse Loan To Savings Account | Undo Loan Disbursal", description = "Approve Loan Application:\n" + @Operation(summary = "Approve Loan Application | Recover Loan Guarantee | Undo Loan Application Approval | Assign a Loan Officer | Unassign a Loan Officer | Reject Loan Application | Applicant Withdraws from Loan Application | Disburse Loan Disburse Loan To Savings Account | Undo Loan Disbursal", operationId = "stateTransitionsByExternalId", description = "Approve Loan Application:\n" + "Mandatory Fields: approvedOnDate\n" + "Optional Fields: approvedLoanAmount and expectedDisbursementDate\n" + "Approves the loan application\n\n" + "Recover Loan Guarantee:\n" + "Recovers the loan guarantee\n\n" + "Undo Loan Application Approval:\n" + "Undoes the Loan Application Approval\n\n" + "Assign a Loan Officer:\n" @@ -837,7 +838,7 @@ public String stateTransitions( @Path("external-id/{loanExternalId}/delinquencytags") @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON }) @Produces(MediaType.APPLICATION_JSON) - @Operation(summary = "Retrieve the Loan Delinquency Tag history using the Loan Id", description = "") + @Operation(summary = "Retrieve the Loan Delinquency Tag history using the Loan Id", operationId = "getDelinquencyTagHistoryByExternalId", description = "") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = DelinquencyApiResourceSwagger.GetDelinquencyTagHistoryResponse.class)))) }) public String getDelinquencyTagHistory( @@ -862,7 +863,7 @@ public String getLoanDelinquencyActions(@PathParam("loanId") @Parameter(descript @Path("external-id/{loanExternalId}/delinquency-actions") @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON }) @Produces(MediaType.APPLICATION_JSON) - @Operation(summary = "Retrieve delinquency actions related to the loan", description = "") + @Operation(summary = "Retrieve delinquency actions related to the loan", operationId = "getLoanDelinquencyActionsByExternalId", description = "") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = DelinquencyApiResourceSwagger.GetDelinquencyActionsResponse.class)))) }) public String getLoanDelinquencyActions( @@ -888,7 +889,7 @@ public String createLoanDelinquencyAction(@PathParam("loanId") @Parameter(descri @Path("external-id/{loanExternalId}/delinquency-actions") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - @Operation(summary = "Adds a new delinquency action for a loan", description = "") + @Operation(summary = "Adds a new delinquency action for a loan", operationId = "createLoanDelinquencyActionByExternalId", description = "") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PostLoansDelinquencyActionRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PostLoansDelinquencyActionResponse.class))) }) @@ -965,7 +966,7 @@ public CommandProcessingResult modifyLoanAvailableDisbursementAmount( @Path("external-id/{loanExternalId}/available-disbursement-amount") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - @Operation(summary = "Modifies the available disbursement amount of the loan", description = "Modifies the available disbursement amount of the loan, this indirectly modifies the approved amount that can be disbursed on the loan") + @Operation(summary = "Modifies the available disbursement amount of the loan", operationId = "modifyLoanAvailableDisbursementAmountByExternalId", description = "Modifies the available disbursement amount of the loan, this indirectly modifies the approved amount that can be disbursed on the loan") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoansApiResourceSwagger.PutLoansAvailableDisbursementAmountRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoansApiResourceSwagger.PutLoansAvailableDisbursementAmountResponse.class))) }) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResource.java index bd3f87c4384..1aa3e19ee1a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResource.java @@ -228,7 +228,7 @@ public String retrieveAllLoanProducts(@Context final UriInfo uriInfo) { @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Loan Product Details Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(operationId = "retrieveTemplateLoanProduct", summary = "Retrieve Loan Product Details Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed description Lists\n" + "Example Request:\n" + "\n" + "loanproducts/template") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanProductsApiResourceSwagger.GetLoanProductsTemplateResponse.class))) }) @@ -287,8 +287,8 @@ public String updateLoanProduct(@PathParam("productId") @Parameter(description = @Path("external-id/{externalProductId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Loan Product", description = "Retrieves a Loan Product\n\n" + "Example Requests:\n" + "\n" - + "loanproducts/external-id/2075e308-d4a8-44d9-8203-f5a947b8c2f4\n" + "\n" + "\n" + @Operation(operationId = "retrieveLoanProductDetailsByExternalId", summary = "Retrieve a Loan Product", description = "Retrieves a Loan Product\n\n" + + "Example Requests:\n" + "\n" + "loanproducts/external-id/2075e308-d4a8-44d9-8203-f5a947b8c2f4\n" + "\n" + "\n" + "loanproducts/external-id/2075e308-d4a8-44d9-8203-f5a947b8c2f4?template=true\n" + "\n" + "\n" + "loanproducts/external-id/2075e308-d4a8-44d9-8203-f5a947b8c2f4?fields=name,description,numberOfRepayments") @ApiResponses({ @@ -313,7 +313,7 @@ public String retrieveLoanProductDetails( @Path("external-id/{externalProductId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Loan Product", description = "Updates a Loan Product") + @Operation(operationId = "updateLoanProductByExternalId", summary = "Update a Loan Product", description = "Updates a Loan Product") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = LoanProductsApiResourceSwagger.PutLoanProductsProductIdRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanProductsApiResourceSwagger.PutLoanProductsProductIdResponse.class))) }) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/DepositAccountOnHoldFundTransactionsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/DepositAccountOnHoldFundTransactionsApiResource.java index 72128a994d6..2638dd21686 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/DepositAccountOnHoldFundTransactionsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/DepositAccountOnHoldFundTransactionsApiResource.java @@ -18,6 +18,7 @@ */ package org.apache.fineract.portfolio.savings.api; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -56,6 +57,7 @@ public class DepositAccountOnHoldFundTransactionsApiResource { @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve deposit account on hold fund transactions", operationId = "retrieveAllDepositAccountOnHoldFundTransactions") public String retrieveAll(@PathParam("savingsId") final Long savingsId, @QueryParam("guarantorFundingId") final Long guarantorFundingId, @Context final UriInfo uriInfo, @QueryParam("offset") final Integer offset, @QueryParam("limit") final Integer limit, @QueryParam("orderBy") final String orderBy, @QueryParam("sortOrder") final String sortOrder) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountTransactionsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountTransactionsApiResource.java index ef1e43358f9..a1ae79f17f3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountTransactionsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountTransactionsApiResource.java @@ -18,6 +18,7 @@ */ package org.apache.fineract.portfolio.savings.api; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -78,6 +79,7 @@ private boolean is(final String commandParam, final String commandValue) { @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve Fixed Deposit Account Transaction Template", operationId = "retrieveTemplateFixedDepositAccountTransaction") public String retrieveTemplate(@PathParam("fixedDepositAccountId") final Long fixedDepositAccountId, // @QueryParam("command") final String commandParam, @Context final UriInfo uriInfo) { @@ -99,6 +101,7 @@ public String retrieveTemplate(@PathParam("fixedDepositAccountId") final Long fi @Path("{transactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve a fixed deposit account transaction", operationId = "retrieveOneFixedDepositAccountTransaction") public String retrieveOne(@PathParam("fixedDepositAccountId") final Long fixedDepositAccountId, @PathParam("transactionId") final Long transactionId, @Context final UriInfo uriInfo) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResource.java index 3c538c66fa7..22790ea8d8e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResource.java @@ -111,7 +111,7 @@ public class FixedDepositAccountsApiResource { @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Fixed Deposit Account Template", description = """ + @Operation(summary = "Retrieve Fixed Deposit Account Template", operationId = "retrieveTemplateFixedDepositAccount", description = """ This is a convenience resource. It can be useful when building maintenance user interface screens for fixed deposit applications. The template data returned consists of any or all of: @@ -142,7 +142,7 @@ public String template(@QueryParam("clientId") @Parameter(description = "clientI @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Fixed deposit applications/accounts", description = """ + @Operation(summary = "List Fixed deposit applications/accounts", operationId = "retrieveAllFixedDepositAccounts", description = """ Lists Fixed Deposit Accounts Example Requests: @@ -205,7 +205,7 @@ public String submitApplication(@Parameter(hidden = true) final String apiReques @Path("{accountId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a fixed deposit application/account", description = """ + @Operation(summary = "Retrieve a fixed deposit application/account", operationId = "retrieveOneFixedDepositAccount", description = """ Retrieves a fixed deposit application/account Example Requests : @@ -341,7 +341,7 @@ private FixedDepositAccountData populateTemplateAndAssociations(final Long accou @Path("{accountId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Modify a fixed deposit application", description = "Fixed deposit application can only be modified when in 'Submitted and pending approval' state. Once the application is approved, the details cannot be changed using this method. Specific api endpoints will be created to allow change of interest detail such as rate, compounding period, posting period etc") + @Operation(summary = "Modify a fixed deposit application", operationId = "updateFixedDepositAccount", description = "Fixed deposit application can only be modified when in 'Submitted and pending approval' state. Once the application is approved, the details cannot be changed using this method. Specific api endpoints will be created to allow change of interest detail such as rate, compounding period, posting period etc") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = FixedDepositAccountsApiResourceSwagger.PutFixedDepositAccountsAccountIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = FixedDepositAccountsApiResourceSwagger.PutFixedDepositAccountsAccountIdResponse.class))) public String update(@PathParam("accountId") @Parameter(description = "accountId") final Long accountId, @@ -377,7 +377,7 @@ public String update(@PathParam("accountId") @Parameter(description = "accountId + "Calculates interest earned on a fixed deposit account based on todays date. It does not attempt to post or credit the interest on the account. That is responsibility of the Post Interest API that will likely be called by overnight process.\n\n" + "Post Interest on Fixed Deposit Account:\n\n" + "Calculates and Posts interest earned on a fixed deposit account based on today's date and whether an interest posting or crediting event is due.\n\n" - + "Showing request/response for Calculate Interest on Fixed Deposit Account") + + "Showing request/response for Calculate Interest on Fixed Deposit Account", operationId = "handleCommandsFixedDepositAccount") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = FixedDepositAccountsApiResourceSwagger.PostFixedDepositAccountsAccountIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = FixedDepositAccountsApiResourceSwagger.PostFixedDepositAccountsAccountIdResponse.class))) public String handleCommands(@PathParam("accountId") @Parameter(description = "accountId") final Long accountId, @@ -446,7 +446,7 @@ private boolean is(final String commandParam, final String commandValue) { @Path("{accountId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a fixed deposit application", description = "At present we support hard delete of fixed deposit application so long as its in 'Submitted and pending approval' state. One the application is moves past this state, it is not possible to do a 'hard' delete of the application or the account. An API endpoint will be added to close/de-activate the fixed deposit account.") + @Operation(summary = "Delete a fixed deposit application", operationId = "deleteFixedDepositAccount", description = "At present we support hard delete of fixed deposit application so long as its in 'Submitted and pending approval' state. One the application is moves past this state, it is not possible to do a 'hard' delete of the application or the account. An API endpoint will be added to close/de-activate the fixed deposit account.") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = FixedDepositAccountsApiResourceSwagger.DeleteFixedDepositAccountsAccountIdResponse.class))) public String delete(@PathParam("accountId") @Parameter(description = "accountId") final Long accountId) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResource.java index 4cc92f66918..d34e5499571 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResource.java @@ -114,7 +114,7 @@ public class FixedDepositProductsApiResource { @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create a Fixed Deposit Product", description = """ + @Operation(summary = "Create a Fixed Deposit Product", operationId = "createFixedDepositProduct", description = """ Creates a Fixed Deposit Product Mandatory Fields: name, shortName, description, currencyCode, digitsAfterDecimal,inMultiplesOf, interestCompoundingPeriodType, interestCalculationType, interestCalculationDaysInYearType, minDepositTerm, minDepositTermTypeId, accountingRule @@ -139,7 +139,7 @@ public String create(@Parameter(hidden = true) final String apiRequestBodyAsJson @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Fixed Deposit Product", description = "Updates a Fixed Deposit Product") + @Operation(summary = "Update a Fixed Deposit Product", operationId = "updateFixedDepositProduct", description = "Updates a Fixed Deposit Product") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = FixedDepositProductsApiResourceSwagger.PutFixedDepositProductsProductIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = FixedDepositProductsApiResourceSwagger.PutFixedDepositProductsProductIdResponse.class))) public String update(@PathParam("productId") @Parameter(description = "productId") final Long productId, @@ -157,7 +157,7 @@ public String update(@PathParam("productId") @Parameter(description = "productId @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Fixed Deposit Products", description = """ + @Operation(summary = "List Fixed Deposit Products", operationId = "retrieveAllFixedDepositProducts", description = """ Lists Fixed Deposit Products Example Requests: @@ -184,7 +184,7 @@ public String retrieveAll(@Context final UriInfo uriInfo) { @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Fixed Deposit Product", description = """ + @Operation(summary = "Retrieve a Fixed Deposit Product", operationId = "retrieveOneFixedDepositProduct", description = """ Retrieves a Fixed Deposit Product Example Requests: @@ -238,6 +238,7 @@ public String retrieveOne(@PathParam("productId") @Parameter(description = "prod @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve Fixed Deposit Product Template", operationId = "retrieveTemplateFixedDepositProduct") public String retrieveTemplate(@Context final UriInfo uriInfo) { this.context.authenticatedUser().validateHasReadPermission(DepositsApiConstants.FIXED_DEPOSIT_PRODUCT_RESOURCE_NAME); @@ -338,7 +339,7 @@ private FixedDepositProductData handleTemplateRelatedData(final FixedDepositProd @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Fixed Deposit Product", description = "Deletes a Fixed Deposit Product") + @Operation(summary = "Delete a Fixed Deposit Product", operationId = "deleteFixedDepositProduct", description = "Deletes a Fixed Deposit Product") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = FixedDepositProductsApiResourceSwagger.DeleteFixedDepositProductsProductIdResponse.class))) public String delete(@PathParam("productId") @Parameter(description = "productId") final Long productId) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResource.java index fa071e90b7d..52b0d7b03d9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResource.java @@ -87,7 +87,7 @@ private boolean is(final String commandParam, final String commandValue) { @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Recurring Deposit Account Transaction Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve Recurring Deposit Account Transaction Template", operationId = "retrieveTemplateRecurringDepositAccountTransaction", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed Value Lists\n" + "Example Requests:\n" + "\n" + "recurringdepositaccounts/1/transactions/template?command=deposit\n" + "\n" + "recurringdepositaccounts/1/transactions/template?command=withdrawal") @@ -131,7 +131,7 @@ public String retrieveTemplate( @Path("{transactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Recurring Deposit Account Transaction", description = "Retrieves Recurring Deposit Account Transaction\n\n" + @Operation(summary = "Retrieve Recurring Deposit Account Transaction", operationId = "retrieveOneRecurringDepositAccountTransaction", description = "Retrieves Recurring Deposit Account Transaction\n\n" + "Example Requests:\n" + "\n" + "recurringdepositaccounts/1/transactions/1") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = RecurringDepositAccountTransactionsApiResourceSwagger.GetRecurringDepositAccountsRecurringDepositAccountIdTransactionsTransactionIdResponse.class))) }) @@ -155,7 +155,7 @@ public String retrieveOne( @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Deposit Transaction | Withdrawal Transaction", description = "Deposit Transaction:\n\n" + @Operation(summary = "Deposit Transaction | Withdrawal Transaction", operationId = "transactionRecurringDepositAccountTransaction", description = "Deposit Transaction:\n\n" + "Used for a deposit transaction\n\n" + "Withdrawal Transaction:\n\n" + "Used for a Withdrawal Transaction\n\n" + "Showing request/response for Deposit Transaction") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = RecurringDepositAccountTransactionsApiResourceSwagger.PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsRequest.class))) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResource.java index 25294dcb023..e2f5436d5c7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResource.java @@ -105,7 +105,7 @@ public class RecurringDepositAccountsApiResource { @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve recurring Deposit Account Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for recurring deposit applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve recurring Deposit Account Template", operationId = "retrieveTemplateRecurringDepositAccount", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for recurring deposit applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed Value Lists\n\n" + "Example Requests:\n" + "\n" + "recurringdepositaccounts/template?clientId=1\n" + "\n" + "\n" + "recurringdepositaccounts/template?clientId=1&productId=1") @ApiResponses({ @@ -129,7 +129,7 @@ public String template(@QueryParam("clientId") @Parameter(description = "clientI @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Recurring deposit applications/accounts", description = "Lists Recurring deposit applications/accounts\n\n" + @Operation(summary = "List Recurring deposit applications/accounts", operationId = "retrieveAllRecurringDepositAccounts", description = "Lists Recurring deposit applications/accounts\n\n" + "Example Requests:\n" + "\n" + "recurringdepositaccounts\n" + "\n" + "\n" + "recurringdepositaccounts?fields=name") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = RecurringDepositAccountsApiResourceSwagger.GetRecurringDepositAccountsResponse.class)))) }) @@ -163,7 +163,7 @@ public String retrieveAll(@Context final UriInfo uriInfo, @QueryParam("paged") @ @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Submit new recurring deposit application", description = "Submits new recurring deposit application\n\n" + @Operation(summary = "Submit new recurring deposit application", operationId = "submitApplicationRecurringDepositAccount", description = "Submits new recurring deposit application\n\n" + "Mandatory Fields: clientId or groupId, productId, submittedOnDate, depositAmount, depositPeriod, depositPeriodFrequencyId\n\n" + "Optional Fields: accountNo, externalId, fieldOfficerId,linkAccountId(if provided initial deposit amount will be collected from this account),transferInterestToSavings(By enabling this flag all interest postings will be transferred to linked saving account )\n\n" + "Inherited from Product (if not provided): interestCompoundingPeriodType, interestCalculationType, interestCalculationDaysInYearType, lockinPeriodFrequency, lockinPeriodFrequencyType, preClosurePenalApplicable, preClosurePenalInterest, preClosurePenalInterestOnTypeId, charts, withHoldTax") @@ -184,7 +184,7 @@ public String submitApplication(@Parameter(hidden = true) final String apiReques @Path("{accountId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a recurring deposit application/account", description = "Retrieves a recurring deposit application/account\n\n" + @Operation(summary = "Retrieve a recurring deposit application/account", operationId = "retrieveOneRecurringDepositAccount", description = "Retrieves a recurring deposit application/account\n\n" + "Example Requests :\n" + "\n" + "recurringdepositaccounts/1\n" + "\n" + "\n" + "recurringdepositaccounts/1?associations=all") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = RecurringDepositAccountsApiResourceSwagger.GetRecurringDepositAccountsAccountIdResponse.class))) }) @@ -261,7 +261,7 @@ private RecurringDepositAccountData populateTemplateAndAssociations(final Long a @Path("{accountId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Modify a recurring deposit application", description = "Recurring deposit application can only be modified when in 'Submitted and pending approval' state. Once the application is approved, the details cannot be changed using this method. Specific api endpoints will be created to allow change of interest detail such as rate, compounding period, posting period etc") + @Operation(summary = "Modify a recurring deposit application", operationId = "updateRecurringDepositAccount", description = "Recurring deposit application can only be modified when in 'Submitted and pending approval' state. Once the application is approved, the details cannot be changed using this method. Specific api endpoints will be created to allow change of interest detail such as rate, compounding period, posting period etc") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = RecurringDepositAccountsApiResourceSwagger.PutRecurringDepositAccountsAccountIdRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = RecurringDepositAccountsApiResourceSwagger.PutRecurringDepositAccountsAccountIdResponse.class))) }) @@ -303,7 +303,7 @@ public String update(@PathParam("accountId") @Parameter(description = "accountId + "Calculates interest earned on a recurring deposit account based on todays date. It does not attempt to post or credit the interest on the account. That is responsibility of the Post Interest API that will likely be called by overnight process.\n\n" + "Post Interest on recurring Deposit Account:\n\n" + "Calculates and Posts interest earned on a recurring deposit account based on todays date and whether an interest posting or crediting event is due.\n\n" - + "Showing request/response for 'Post Interest on recurring Deposit Account'") + + "Showing request/response for 'Post Interest on recurring Deposit Account'", operationId = "handleCommandsRecurringDepositAccount") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = RecurringDepositAccountsApiResourceSwagger.PostRecurringDepositAccountsAccountIdRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = RecurringDepositAccountsApiResourceSwagger.PostRecurringDepositAccountsAccountIdResponse.class))) }) @@ -377,7 +377,7 @@ private boolean is(final String commandParam, final String commandValue) { @Path("{accountId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a recurring deposit application", description = "At present we support hard delete of recurring deposit application so long as its in 'Submitted and pending approval' state. One the application is moves past this state, it is not possible to do a 'hard' delete of the application or the account. An API endpoint will be added to close/de-activate the recurring deposit account.") + @Operation(summary = "Delete a recurring deposit application", operationId = "deleteRecurringDepositAccount", description = "At present we support hard delete of recurring deposit application so long as its in 'Submitted and pending approval' state. One the application is moves past this state, it is not possible to do a 'hard' delete of the application or the account. An API endpoint will be added to close/de-activate the recurring deposit account.") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = RecurringDepositAccountsApiResourceSwagger.DeleteRecurringDepositAccountsResponse.class))) }) public String delete(@PathParam("accountId") @Parameter(description = "accountId") final Long accountId) { @@ -393,6 +393,7 @@ public String delete(@PathParam("accountId") @Parameter(description = "accountId @Path("{accountId}/template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve recurring deposit account closure template", operationId = "accountClosureTemplateRecurringDepositAccount") public String accountClosureTemplate(@PathParam("accountId") @Parameter(description = "accountId") final Long accountId, @QueryParam("command") @Parameter(description = "command") final String commandParam, @Context final UriInfo uriInfo) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResource.java index 06ca18b6a25..fa3c6d66bdd 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResource.java @@ -114,7 +114,7 @@ public class RecurringDepositProductsApiResource { @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create a Recurring Deposit Product", description = "Creates a Recurring Deposit Product\n\n" + @Operation(summary = "Create a Recurring Deposit Product", operationId = "createRecurringDepositProduct", description = "Creates a Recurring Deposit Product\n\n" + "Mandatory Fields: name, shortName, description, currencyCode, digitsAfterDecimal,inMultiplesOf, interestCompoundingPeriodType, interestPostingPeriodType, interestCalculationType, interestCalculationDaysInYearType, minDepositTerm, minDepositTermTypeId, accountingRule, depositAmount, charts\n\n" + "Mandatory Fields for Cash based accounting (accountingRule = 2): savingsReferenceAccountId, savingsControlAccountId, interestOnSavingsAccountId, incomeFromFeeAccountId, transfersInSuspenseAccountId, incomeFromPenaltyAccountId\n\n" + "Optional Fields: lockinPeriodFrequency, lockinPeriodFrequencyType, maxDepositTerm, maxDepositTermTypeId, inMultiplesOfDepositTerm, inMultiplesOfDepositTermTypeId, preClosurePenalApplicable, preClosurePenalInterest, preClosurePenalInterestOnTypeId, feeToIncomeAccountMappings, penaltyToIncomeAccountMappings, charges, minDepositAmount, maxDepositAmount, withHoldTax, taxGroupId") @@ -135,7 +135,7 @@ public String create(@Parameter(hidden = true) final String apiRequestBodyAsJson @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Recurring Deposit Product", description = "Updates a Recurring Deposit Product") + @Operation(summary = "Update a Recurring Deposit Product", operationId = "updateRecurringDepositProduct", description = "Updates a Recurring Deposit Product") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = RecurringDepositProductsApiResourceSwagger.PutRecurringDepositProductsRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = RecurringDepositProductsApiResourceSwagger.PutRecurringDepositProductsResponse.class))) }) @@ -154,8 +154,8 @@ public String update(@PathParam("productId") @Parameter(description = "productId @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Recuring Deposit Products", description = "Lists Recuring Deposit Products\n\n" + "Example Requests:\n" - + "\n" + "recurringdepositproducts\n" + "\n" + "\n" + "recurringdepositproducts?fields=name") + @Operation(summary = "List Recuring Deposit Products", operationId = "retrieveAllRecurringDepositProducts", description = "Lists Recuring Deposit Products\n\n" + + "Example Requests:\n" + "\n" + "recurringdepositproducts\n" + "\n" + "\n" + "recurringdepositproducts?fields=name") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = RecurringDepositProductsApiResourceSwagger.GetRecurringDepositProductsResponse.class)))) }) public String retrieveAll(@Context final UriInfo uriInfo) { @@ -175,7 +175,7 @@ public String retrieveAll(@Context final UriInfo uriInfo) { @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Recurring Deposit Product", description = "Retrieves a Recurring Deposit Product\n\n" + @Operation(summary = "Retrieve a Recurring Deposit Product", operationId = "retrieveOneRecurringDepositProduct", description = "Retrieves a Recurring Deposit Product\n\n" + "Example Requests:\n" + "\n" + "recurringdepositproducts/1\n" + "\n" + "\n" + "recurringdepositproducts/1?template=true\n" + "\n" + "\n" + "recurringdepositproducts/1?fields=name,description") @ApiResponses({ @@ -221,6 +221,7 @@ public String retrieveOne(@PathParam("productId") @Parameter(description = "prod @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve Recurring Deposit Product Template", operationId = "retrieveTemplateRecurringDepositProduct") public String retrieveTemplate(@Context final UriInfo uriInfo) { this.context.authenticatedUser().validateHasReadPermission(DepositsApiConstants.RECURRING_DEPOSIT_PRODUCT_RESOURCE_NAME); @@ -317,7 +318,7 @@ private RecurringDepositProductData handleTemplateRelatedData(final RecurringDep @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Recurring Deposit Product", description = "Deletes a Recurring Deposit Product") + @Operation(summary = "Delete a Recurring Deposit Product", operationId = "deleteRecurringDepositProduct", description = "Deletes a Recurring Deposit Product") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = RecurringDepositProductsApiResourceSwagger.DeleteRecurringDepositProductsProductIdResponse.class))) }) public String delete(@PathParam("productId") @Parameter(description = "productId") final Long productId) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResource.java index 40cdaa71562..2e77930d549 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResource.java @@ -114,7 +114,7 @@ public String retrieveAllSavingsAccountCharges( @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Savings Charges Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve Savings Charges Template", operationId = "retrieveTemplateSavingsAccountCharge", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed description Lists\n" + "Example Request:\n" + "\n" + "savingsaccounts/1/charges/template") @ApiResponses({ diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountTransactionsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountTransactionsApiResource.java index 93825b0e5d6..e8409ca27a2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountTransactionsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountTransactionsApiResource.java @@ -85,6 +85,7 @@ public class SavingsAccountTransactionsApiResource { @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve a savings account transaction template", operationId = "retrieveTemplateSavingsAccountTransaction") public String retrieveTemplate(@PathParam("savingsId") final Long savingsId, // @QueryParam("command") final String commandParam, @Context final UriInfo uriInfo) { @@ -107,6 +108,7 @@ public String retrieveTemplate(@PathParam("savingsId") final Long savingsId, @Path("{transactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve a savings account transaction", operationId = "retrieveOneSavingsAccountTransaction") public String retrieveOne(@PathParam("savingsId") final Long savingsId, @PathParam("transactionId") final Long transactionId, @Context final UriInfo uriInfo) { @@ -158,7 +160,7 @@ public String searchTransactions(@PathParam("savingsId") @Parameter(description @Path("query") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Advanced search Savings Account Transactions") + @Operation(summary = "Advanced search Savings Account Transactions", operationId = "advancedQuerySavingsAccountTransactions") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = List.class))) public String advancedQuery(@PathParam("savingsId") @Parameter(description = "savingsId") final Long savingsId, PagedLocalRequest queryRequest, @Context final UriInfo uriInfo) { @@ -169,6 +171,7 @@ public String advancedQuery(@PathParam("savingsId") @Parameter(description = "sa @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Create a savings account transaction", operationId = "createSavingsAccountTransaction") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = SavingsAccountTransactionsApiResourceSwagger.PostSavingsAccountTransactionsRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SavingsAccountTransactionsApiResourceSwagger.PostSavingsAccountTransactionsResponse.class))) public String transaction(@PathParam("savingsId") final Long savingsId, @QueryParam("command") final String commandParam, @@ -194,7 +197,7 @@ public String transaction(@PathParam("savingsId") final Long savingsId, @QueryPa @Path("{transactionId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Undo/Reverse/Modify/Release Amount transaction API", description = "Undo/Reverse/Modify/Release Amount transaction API\n\n" + @Operation(summary = "Undo/Reverse/Modify/Release Amount transaction API", operationId = "adjustSavingsAccountTransaction", description = "Undo/Reverse/Modify/Release Amount transaction API\n\n" + "Example Requests:\n" + "\n" + "\n" + "savingsaccounts/{savingsId}/transactions/{transactionId}?command=reverse\n" + "\n" + "Accepted command = undo, reverse, modify, releaseAmount") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = SavingsAccountTransactionsApiResourceSwagger.PostSavingsAccountBulkReversalTransactionsRequest.class))) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountsApiResource.java index 2630c535199..ec4f02ef6d5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountsApiResource.java @@ -99,7 +99,7 @@ public class SavingsAccountsApiResource { @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Savings Account Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve Savings Account Template", operationId = "retrieveSavingsAccountTemplate", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed Value Lists\n\n" + "Example Requests:\n" + "\n" + "savingsaccounts/template?clientId=1\n" + "\n" + "\n" + "savingsaccounts/template?clientId=1&productId=1") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SavingsAccountsApiResourceSwagger.GetSavingsAccountsTemplateResponse.class))) @@ -121,7 +121,7 @@ public String template(@QueryParam("clientId") @Parameter(description = "clientI @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List savings applications/accounts", description = "Lists savings applications/accounts\n\n" + @Operation(summary = "List savings applications/accounts", operationId = "retrieveAllSavingsAccounts", description = "Lists savings applications/accounts\n\n" + "Example Requests:\n" + "\n" + "savingsaccounts\n" + "\n" + "\n" + "savingsaccounts?fields=name") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SavingsAccountsApiResourceSwagger.GetSavingsAccountsResponse.class))) public String retrieveAll(@Context final UriInfo uriInfo, @@ -149,7 +149,7 @@ public String retrieveAll(@Context final UriInfo uriInfo, @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Submit new savings application", description = "Submits new savings application\n\n" + @Operation(summary = "Submit new savings application", operationId = "submitSavingsApplication", description = "Submits new savings application\n\n" + "Mandatory Fields: clientId or groupId, productId, submittedOnDate\n\n" + "Optional Fields: accountNo, externalId, fieldOfficerId\n\n" + "Inherited from Product (if not provided): nominalAnnualInterestRate, interestCompoundingPeriodType, interestCalculationType, interestCalculationDaysInYearType, minRequiredOpeningBalance, lockinPeriodFrequency, lockinPeriodFrequencyType, withdrawalFeeForTransfers, allowOverdraft, overdraftLimit, withHoldTax\n\n" @@ -182,6 +182,7 @@ public String submitGSIMApplication(final String apiRequestBodyAsJson) { @Path("{accountId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve a savings account", operationId = "retrieveSavingsAccount") public SavingsAccountData retrieveOne(@PathParam("accountId") final Long accountId, @DefaultValue("false") @QueryParam("staffInSelectedOfficeOnly") final boolean staffInSelectedOfficeOnly, @DefaultValue("all") @QueryParam("chargeStatus") final String chargeStatus, @@ -194,6 +195,7 @@ public SavingsAccountData retrieveOne(@PathParam("accountId") final Long account @Path("/external-id/{externalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) + @Operation(summary = "Retrieve a savings account by external ID", operationId = "retrieveSavingsAccountByExternalId") public SavingsAccountData retrieveOne(@PathParam("externalId") final String externalId, @DefaultValue("false") @QueryParam("staffInSelectedOfficeOnly") final boolean staffInSelectedOfficeOnly, @DefaultValue("all") @QueryParam("chargeStatus") final String chargeStatus, @@ -206,7 +208,7 @@ public SavingsAccountData retrieveOne(@PathParam("externalId") final String exte @Path("{accountId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Modify a savings application | Modify savings account withhold tax applicability", description = "Modify a savings application:\n\n" + @Operation(summary = "Modify a savings application | Modify savings account withhold tax applicability", operationId = "updateSavingsAccount", description = "Modify a savings application:\n\n" + "Savings application can only be modified when in 'Submitted and pending approval' state. Once the application is approved, the details cannot be changed using this method. Specific api endpoints will be created to allow change of interest detail such as rate, compounding period, posting period etc\n\n" + "Modify savings account withhold tax applicability:\n\n" + "Savings application's withhold tax can be modified when in 'Active' state. Once the application is activated, can modify the account withhold tax to post tax or vice-versa" @@ -224,7 +226,7 @@ public String update(@PathParam("accountId") @Parameter(description = "accountId @Path("/external-id/{externalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Modify a savings application | Modify savings account withhold tax applicability", description = "Modify a savings application:\n\n" + @Operation(summary = "Modify a savings application | Modify savings account withhold tax applicability by externalId", operationId = "updateSavingsAccountByExternalId", description = "Modify a savings application by externalId:\n\n" + "Savings application can only be modified when in 'Submitted and pending approval' state. Once the application is approved, the details cannot be changed using this method. Specific api endpoints will be created to allow change of interest detail such as rate, compounding period, posting period etc\n\n" + "Modify savings account withhold tax applicability:\n\n" + "Savings application's withhold tax can be modified when in 'Active' state. Once the application is activated, can modify the account withhold tax to post tax or vice-versa" @@ -341,7 +343,7 @@ public String handleGSIMCommands(@PathParam("parentAccountId") final Long parent + "Block Savings Account Debit transactions:\n\n" + "All types of debit operations from Savings account wil be blocked\n\n" + "Unblock Savings Account debit transactions:\n\n" + "It unblocks the Saving account's debit operations. Now all types of debits can be transacted from Savings account\n\n" - + "Showing request/response for 'Unassign Savings Officer'") + + "Showing request/response for 'Unassign Savings Officer'", operationId = "handleCommandsSavingsAccount") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = SavingsAccountsApiResourceSwagger.PostSavingsAccountsAccountIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SavingsAccountsApiResourceSwagger.PostSavingsAccountsAccountIdResponse.class))) public String handleCommands(@PathParam("accountId") @Parameter(description = "accountId") final Long accountId, @@ -386,7 +388,7 @@ public String handleCommands(@PathParam("accountId") @Parameter(description = "a + "Block Savings Account Debit transactions:\n\n" + "All types of debit operations from Savings account wil be blocked\n\n" + "Unblock Savings Account debit transactions:\n\n" + "It unblocks the Saving account's debit operations. Now all types of debits can be transacted from Savings account\n\n" - + "Showing request/response for 'Unassign Savings Officer'") + + "Showing request/response for 'Unassign Savings Officer'", operationId = "handleCommandsSavingsAccountByExternalId") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = SavingsAccountsApiResourceSwagger.PostSavingsAccountsAccountIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SavingsAccountsApiResourceSwagger.PostSavingsAccountsAccountIdResponse.class))) public String handleCommands(@PathParam("externalId") @Parameter(description = "externalId") final String externalId, @@ -404,7 +406,7 @@ private boolean is(final String commandParam, final String commandValue) { @Path("{accountId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a savings application", description = "At present we support hard delete of savings application so long as its in 'Submitted and pending approval' state. One the application is moves past this state, it is not possible to do a 'hard' delete of the application or the account. An API endpoint will be added to close/de-activate the savings account.") + @Operation(summary = "Delete a savings application", operationId = "deleteSavingsAccount", description = "At present we support hard delete of savings application so long as its in 'Submitted and pending approval' state. One the application is moves past this state, it is not possible to do a 'hard' delete of the application or the account. An API endpoint will be added to close/de-activate the savings account.") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SavingsAccountsApiResourceSwagger.DeleteSavingsAccountsAccountIdResponse.class))) public String delete(@PathParam("accountId") @Parameter(description = "accountId") final Long accountId) { @@ -415,7 +417,7 @@ public String delete(@PathParam("accountId") @Parameter(description = "accountId @Path("/external-id/{externalId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a savings application", description = "At present we support hard delete of savings application so long as its in 'Submitted and pending approval' state. One the application is moves past this state, it is not possible to do a 'hard' delete of the application or the account. An API endpoint will be added to close/de-activate the savings account.") + @Operation(summary = "Delete a savings application by externalId", operationId = "deleteSavingsAccountByExternalId", description = "At present we support hard delete of savings application so long as its in 'Submitted and pending approval' state. One the application is moves past this state, it is not possible to do a 'hard' delete of the application or the account. An API endpoint will be added to close/de-activate the savings account.") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SavingsAccountsApiResourceSwagger.DeleteSavingsAccountsAccountIdResponse.class))) public String delete(@PathParam("externalId") @Parameter(description = "externalId") final String externalId) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResource.java index 63800300f27..69c042c4b46 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResource.java @@ -103,7 +103,7 @@ public class SavingsProductsApiResource { @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Create a Savings Product", description = "Creates a Savings Product\n\n" + @Operation(summary = "Create a Savings Product", operationId = "createSavingsProduct", description = "Creates a Savings Product\n\n" + "Mandatory Fields: name, shortName, description, currencyCode, digitsAfterDecimal,inMultiplesOf, nominalAnnualInterestRate, interestCompoundingPeriodType, interestCalculationType, interestCalculationDaysInYearType,accountingRule\n\n" + "Mandatory Fields for Cash based accounting (accountingRule = 2): savingsReferenceAccountId, savingsControlAccountId, interestOnSavingsAccountId, incomeFromFeeAccountId, transfersInSuspenseAccountId, incomeFromPenaltyAccountId\n\n" + "Optional Fields: minRequiredOpeningBalance, lockinPeriodFrequency, lockinPeriodFrequencyType, withdrawalFeeForTransfers, paymentChannelToFundSourceMappings, feeToIncomeAccountMappings, penaltyToIncomeAccountMappings, charges, allowOverdraft, overdraftLimit, minBalanceForInterestCalculation,withHoldTax,taxGroupId,accountMapping, lienAllowed, maxAllowedLienLimit") @@ -122,7 +122,7 @@ public String create(@Parameter(hidden = true) final String apiRequestBodyAsJson @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Update a Savings Product", description = "Updates a Savings Product") + @Operation(summary = "Update a Savings Product", operationId = "updateSavingsProduct", description = "Updates a Savings Product") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = SavingsProductsApiResourceSwagger.PutSavingsProductsProductIdRequest.class))) @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SavingsProductsApiResourceSwagger.PutSavingsProductsProductIdResponse.class))) public String update(@PathParam("productId") @Parameter(description = "productId") final Long productId, @@ -140,8 +140,8 @@ public String update(@PathParam("productId") @Parameter(description = "productId @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "List Savings Products", description = "Lists Savings Products\n\n" + "Example Requests:\n" + "\n" - + "savingsproducts\n" + "\n" + "savingsproducts?fields=name") + @Operation(summary = "List Savings Products", operationId = "retrieveAllSavingsProducts", description = "Lists Savings Products\n\n" + + "Example Requests:\n" + "\n" + "savingsproducts\n" + "\n" + "savingsproducts?fields=name") @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = SavingsProductsApiResourceSwagger.GetSavingsProductsResponse.class)))) public String retrieveAll(@Context final UriInfo uriInfo) { @@ -157,8 +157,9 @@ public String retrieveAll(@Context final UriInfo uriInfo) { @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve a Savings Product", description = "Retrieves a Savings Product\n\n" + "Example Requests:\n" + "\n" - + "savingsproducts/1\n" + "\n" + "savingsproducts/1?template=true\n" + "\n" + "savingsproducts/1?fields=name,description") + @Operation(summary = "Retrieve a Savings Product", operationId = "retrieveOneSavingsProduct", description = "Retrieves a Savings Product\n\n" + + "Example Requests:\n" + "\n" + "savingsproducts/1\n" + "\n" + "savingsproducts/1?template=true\n" + "\n" + + "savingsproducts/1?fields=name,description") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SavingsProductsApiResourceSwagger.GetSavingsProductsProductIdResponse.class))) public String retrieveOne(@PathParam("productId") @Parameter(description = "productId") final Long productId, @Context final UriInfo uriInfo) { @@ -198,7 +199,7 @@ public String retrieveOne(@PathParam("productId") @Parameter(description = "prod @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Retrieve Savings Product Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve Savings Product Template", operationId = "retrieveTemplateSavingsProduct", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed description Lists\n" + "Example Request:\n" + "Account Mapping:\n" + "\n" + "savingsproducts/template") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SavingsProductsApiResourceSwagger.GetSavingsProductsTemplateResponse.class))) @@ -290,7 +291,7 @@ private SavingsProductData handleTemplateRelatedData(final SavingsProductData sa @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(summary = "Delete a Savings Product", description = "Deletes a Savings Product") + @Operation(summary = "Delete a Savings Product", operationId = "deleteSavingsProduct", description = "Deletes a Savings Product") @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = SavingsProductsApiResourceSwagger.DeleteSavingsProductsProductIdResponse.class))) public String delete(@PathParam("productId") @Parameter(description = "productId") final Long productId) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/spm/api/SpmApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/spm/api/SpmApiResource.java index c8c6ff12065..abc98508df4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/spm/api/SpmApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/spm/api/SpmApiResource.java @@ -62,7 +62,7 @@ public class SpmApiResource { @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) @Transactional - @Operation(summary = "List all Surveys", description = "") + @Operation(summary = "List all Surveys", operationId = "fetchAllSurveys", description = "") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = SurveyData.class)))) }) public List fetchAllSurveys(@QueryParam("isActive") final Boolean isActive) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResource.java index d2a40afdd24..34d3bbc6c98 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResource.java @@ -90,8 +90,8 @@ public class UsersApiResource { private final BulkImportWorkbookService bulkImportWorkbookService; @GET - @Operation(summary = "Retrieve list of users", description = "Example Requests:\n" + "\n" + "users\n" + "\n" + "\n" - + "users?fields=id,username,email,officeName") + @Operation(summary = "Retrieve list of users", operationId = "retrieveAllUsers", description = "Example Requests:\n" + "\n" + "users\n" + + "\n" + "\n" + "users?fields=id,username,email,officeName") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = UsersApiResourceSwagger.GetUsersResponse.class)))) }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -108,8 +108,8 @@ public String retrieveAll(@Context final UriInfo uriInfo) { @GET @Path("{userId}") - @Operation(summary = "Retrieve a User", description = "Example Requests:\n" + "\n" + "users/1\n" + "\n" + "\n" - + "users/1?template=true\n" + "\n" + "\n" + "users/1?fields=username,officeName") + @Operation(summary = "Retrieve a User", operationId = "retrieveOneUser", description = "Example Requests:\n" + "\n" + "users/1\n" + "\n" + + "\n" + "users/1?template=true\n" + "\n" + "\n" + "users/1?fields=username,officeName") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = UsersApiResourceSwagger.GetUsersUserIdResponse.class))) }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -131,7 +131,7 @@ public String retrieveOne(@PathParam("userId") @Parameter(description = "userId" @GET @Path("template") - @Operation(summary = "Retrieve User Details Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve User Details Template", operationId = "retrieveTemplateUser", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed description Lists\n" + "Example Request:\n" + "\n" + "users/template") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = UsersApiResourceSwagger.GetUsersTemplateResponse.class))) }) @@ -148,7 +148,7 @@ public String template(@Context final UriInfo uriInfo) { } @POST - @Operation(summary = "Create a User", description = "Adds new application user.\n" + "\n" + @Operation(summary = "Create a User", operationId = "createUser", description = "Adds new application user.\n" + "\n" + "Note: Password information is not required (or processed). Password details at present are auto-generated and then sent to the email account given (which is why it can take a few seconds to complete).\n" + "\n" + "Mandatory Fields: \n" + "username, firstname, lastname, email, officeId, roles, sendPasswordToEmail\n" + "\n" + "Optional Fields: \n" + "staffId,passwordNeverExpires,isLoginRetriesEnabled") @@ -171,7 +171,7 @@ public String create(@Parameter(hidden = true) final String apiRequestBodyAsJson @PUT @Path("{userId}") - @Operation(summary = "Update a User", description = "Updates the user") + @Operation(summary = "Update a User", operationId = "updateUser", description = "Updates the user") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = UsersApiResourceSwagger.PutUsersUserIdRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = UsersApiResourceSwagger.PutUsersUserIdResponse.class))) }) @@ -192,7 +192,7 @@ public String update(@PathParam("userId") @Parameter(description = "userId") fin @POST @Path("{userId}/pwd") - @Operation(summary = "Change the password of a User", description = "When updating a password you must provide the repeatPassword parameter also.") + @Operation(summary = "Change the password of a User", operationId = "changePasswordUser", description = "When updating a password you must provide the repeatPassword parameter also.") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = UsersApiResourceSwagger.ChangePwdUsersUserIdRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = UsersApiResourceSwagger.ChangePwdUsersUserIdResponse.class))) }) @@ -213,7 +213,7 @@ public String changePassword(@PathParam("userId") @Parameter(description = "user @DELETE @Path("{userId}") - @Operation(summary = "Delete a User", description = "Removes the user and the associated roles and permissions.") + @Operation(summary = "Delete a User", operationId = "deleteUser", description = "Removes the user and the associated roles and permissions.") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = UsersApiResourceSwagger.DeleteUsersUserIdResponse.class))) }) @Consumes({ MediaType.APPLICATION_JSON }) diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/api/WorkingCapitalLoanProductApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/api/WorkingCapitalLoanProductApiResource.java index 3a4cf3f3a37..d29fcf4f15b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/api/WorkingCapitalLoanProductApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/api/WorkingCapitalLoanProductApiResource.java @@ -102,7 +102,7 @@ public List retrieveAllWorkingCapitalLoanProducts @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "retrieveWorkingCapitalLoanProductTemplate", summary = "Retrieve Working Capital Loan Product Details Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + @Operation(summary = "Retrieve Working Capital Loan Product Details Template", operationId = "retrieveTemplateWorkingCapitalLoanProduct", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n" + "\n" + "Field Defaults\n" + "Allowed description Lists\n" + "Example Request:\n" + "\n" + "workingcapitalloanproducts/template") @ApiResponses({ @@ -116,7 +116,7 @@ public WorkingCapitalLoanProductData retrieveTemplate() { @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "retrieveWorkingCapitalLoanProductDetails", summary = "Retrieve a Working Capital Loan Product", description = "Retrieves a Working Capital Loan Product\n\n" + @Operation(summary = "Retrieve a Working Capital Loan Product", operationId = "retrieveOneWorkingCapitalLoanProduct", description = "Retrieves a Working Capital Loan Product\n\n" + "Example Requests:\n" + "\n" + "workingcapitalloanproducts/1\n" + "\n" + "\n" + "workingcapitalloanproducts/1?template=true\n" + "\n" + "\n" + "workingcapitalloanproducts/1?fields=name,description,principal") @ApiResponses({ @@ -132,7 +132,7 @@ public WorkingCapitalLoanProductData retrieveWorkingCapitalLoanProductDetails( @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "updateWorkingCapitalLoanProduct", summary = "Update a Working Capital Loan Product", description = "Updates a Working Capital Loan Product") + @Operation(summary = "Update a Working Capital Loan Product", operationId = "updateWorkingCapitalLoanProduct", description = "Updates a Working Capital Loan Product") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = WorkingCapitalLoanProductApiResourceSwagger.PutWorkingCapitalLoanProductsProductIdRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = WorkingCapitalLoanProductApiResourceSwagger.PutWorkingCapitalLoanProductsProductIdResponse.class))) }) @@ -147,7 +147,7 @@ public CommandProcessingResult updateWorkingCapitalLoanProduct( @Path("{productId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "deleteWorkingCapitalLoanProduct", summary = "Delete a Working Capital Loan Product", description = "Deletes a Working Capital Loan Product if it is not in use") + @Operation(summary = "Delete a Working Capital Loan Product", operationId = "deleteWorkingCapitalLoanProduct", description = "Deletes a Working Capital Loan Product if it is not in use") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = WorkingCapitalLoanProductApiResourceSwagger.DeleteWorkingCapitalLoanProductsProductIdResponse.class))) }) public CommandProcessingResult deleteWorkingCapitalLoanProduct( @@ -160,7 +160,7 @@ public CommandProcessingResult deleteWorkingCapitalLoanProduct( @Path("external-id/{externalProductId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "deleteWorkingCapitalLoanProductByExternalId", summary = "Delete a Working Capital Loan Product", description = "Deletes a Working Capital Loan Product by external ID if it is not in use") + @Operation(summary = "Delete a Working Capital Loan Product", operationId = "deleteWorkingCapitalLoanProductByExternalId", description = "Deletes a Working Capital Loan Product by external ID if it is not in use") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = WorkingCapitalLoanProductApiResourceSwagger.DeleteWorkingCapitalLoanProductsProductIdResponse.class))) }) public CommandProcessingResult deleteWorkingCapitalLoanProduct( @@ -181,7 +181,7 @@ public CommandProcessingResult deleteWorkingCapitalLoanProduct( @Path("external-id/{externalProductId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "retrieveWorkingCapitalLoanProductDetailsByExternalId", summary = "Retrieve a Working Capital Loan Product", description = "Retrieves a Working Capital Loan Product by external ID\n\n" + @Operation(summary = "Retrieve a Working Capital Loan Product", operationId = "retrieveOneWorkingCapitalLoanProductByExternalId", description = "Retrieves a Working Capital Loan Product by external ID\n\n" + "Example Requests:\n" + "\n" + "workingcapitalloanproducts/external-id/2075e308-d4a8-44d9-8203-f5a947b8c2f4") @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = WorkingCapitalLoanProductApiResourceSwagger.GetWorkingCapitalLoanProductsProductIdResponse.class))) }) @@ -205,7 +205,7 @@ public WorkingCapitalLoanProductData retrieveWorkingCapitalLoanProductDetails( @Path("external-id/{externalProductId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "updateWorkingCapitalLoanProductByExternalId", summary = "Update a Working Capital Loan Product", description = "Updates a Working Capital Loan Product by external ID") + @Operation(summary = "Update a Working Capital Loan Product", operationId = "updateWorkingCapitalLoanProductByExternalId", description = "Updates a Working Capital Loan Product by external ID") @RequestBody(required = true, content = @Content(schema = @Schema(implementation = WorkingCapitalLoanProductApiResourceSwagger.PutWorkingCapitalLoanProductsProductIdRequest.class))) @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = WorkingCapitalLoanProductApiResourceSwagger.PutWorkingCapitalLoanProductsProductIdResponse.class))) }) diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java index 763f832ed58..9c3dff8fc7d 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java @@ -365,7 +365,7 @@ public T performPermissionTestForRequest(final String permission, Function response = okR(fineractClient().savingsAccounts.submitApplication2(request)); + Response response = okR(fineractClient().savingsAccounts.submitSavingsApplication(request)); assertThat(response.isSuccessful()).isTrue(); assertThat(response.body()).isNotNull(); @@ -74,7 +74,8 @@ void updateSavingsAccountWithExternalId() { PutSavingsAccountsAccountIdRequest request = new PutSavingsAccountsAccountIdRequest(); request.setLocale(locale); request.setNominalAnnualInterestRate(5.999); - Response response = okR(fineractClient().savingsAccounts.update22(EXTERNAL_ID, request, "")); + Response response = okR( + fineractClient().savingsAccounts.updateSavingsAccountByExternalId(EXTERNAL_ID, request, "")); assertThat(response.isSuccessful()).isTrue(); assertThat(response.body()).isNotNull(); @@ -89,7 +90,7 @@ void approveSavingsAccount() { request.setLocale(locale); request.setApprovedOnDate(formattedDate); Response response = okR( - fineractClient().savingsAccounts.handleCommands7(EXTERNAL_ID, request, "approve")); + fineractClient().savingsAccounts.handleCommandsSavingsAccountByExternalId(EXTERNAL_ID, request, "approve")); assertThat(response.isSuccessful()).isTrue(); assertThat(response.body()).isNotNull(); @@ -103,7 +104,8 @@ void retrieveSavingsAccountWithExternalId() { request.dateFormat(dateFormat); request.setLocale(locale); request.setActivatedOnDate(formattedDate); - Response response = okR(fineractClient().savingsAccounts.retrieveOne27(EXTERNAL_ID, false, null, "all")); + Response response = okR( + fineractClient().savingsAccounts.retrieveSavingsAccountByExternalId(EXTERNAL_ID, false, null, "all")); assertThat(response.isSuccessful()).isTrue(); assertThat(response.body()).isNotNull(); @@ -117,7 +119,7 @@ void undoApprovalSavingsAccountWithExternalId() { LOG.info("------------------------------ UNDO APPROVAL SAVINGS ACCOUNT ---------------------------------------"); PostSavingsAccountsAccountIdRequest request = new PostSavingsAccountsAccountIdRequest(); Response response = okR( - fineractClient().savingsAccounts.handleCommands7(EXTERNAL_ID, request, "undoapproval")); + fineractClient().savingsAccounts.handleCommandsSavingsAccountByExternalId(EXTERNAL_ID, request, "undoapproval")); assertThat(response.isSuccessful()).isTrue(); assertThat(response.body()).isNotNull(); @@ -131,7 +133,8 @@ void retrieveSavingsAccountWithExternalIdSecondTime() { request.dateFormat(dateFormat); request.setLocale(locale); request.setActivatedOnDate(formattedDate); - Response response = okR(fineractClient().savingsAccounts.retrieveOne27(EXTERNAL_ID, false, null, "all")); + Response response = okR( + fineractClient().savingsAccounts.retrieveSavingsAccountByExternalId(EXTERNAL_ID, false, null, "all")); assertThat(response.isSuccessful()).isTrue(); assertThat(response.body()).isNotNull(); @@ -146,7 +149,8 @@ void deleteSavingsAccountWithExternalId() { request.dateFormat(dateFormat); request.setLocale(locale); request.setActivatedOnDate(formattedDate); - Response response = okR(fineractClient().savingsAccounts.delete20(EXTERNAL_ID)); + Response response = okR( + fineractClient().savingsAccounts.deleteSavingsAccountByExternalId(EXTERNAL_ID)); assertThat(response.isSuccessful()).isTrue(); assertThat(response.body()).isNotNull(); @@ -161,7 +165,7 @@ void retrieveSavingsAccountWithExternalIdThirdTime() { request.setLocale(locale); request.setActivatedOnDate(formattedDate); Response response = Calls - .executeU(fineractClient().savingsAccounts.retrieveOne27(EXTERNAL_ID, false, null, "all")); + .executeU(fineractClient().savingsAccounts.retrieveSavingsAccountByExternalId(EXTERNAL_ID, false, null, "all")); assertThat(response.raw().code()).isEqualTo(404); } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountsTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountsTest.java index 4beb876bcc2..97b13f652ad 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountsTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountsTest.java @@ -60,7 +60,7 @@ void submitSavingsAccountsApplication() { request.setDateFormat(dateFormat); request.submittedOnDate(formattedDate); - Response response = okR(fineractClient().savingsAccounts.submitApplication2(request)); + Response response = okR(fineractClient().savingsAccounts.submitSavingsApplication(request)); assertThat(response.isSuccessful()).isTrue(); assertThat(response.body()).isNotNull(); @@ -76,7 +76,7 @@ void approveSavingsAccount() { request.setLocale(locale); request.setApprovedOnDate(formattedDate); Response response = okR( - fineractClient().savingsAccounts.handleCommands6((long) savingId, request, "approve")); + fineractClient().savingsAccounts.handleCommandsSavingsAccount((long) savingId, request, "approve")); assertThat(response.isSuccessful()).isTrue(); assertThat(response.body()).isNotNull(); @@ -91,7 +91,7 @@ void activateSavingsAccount() { request.setLocale(locale); request.setActivatedOnDate(formattedDate); Response response = okR( - fineractClient().savingsAccounts.handleCommands6((long) savingId, request, "activate")); + fineractClient().savingsAccounts.handleCommandsSavingsAccount((long) savingId, request, "activate")); assertThat(response.isSuccessful()).isTrue(); assertThat(response.body()).isNotNull(); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/UserAdministrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/UserAdministrationTest.java index 623f267c485..b0db95285a3 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/UserAdministrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/UserAdministrationTest.java @@ -170,19 +170,19 @@ public void testApplicationUserCanUpdateOwnPassword() { // User updates its own password String updatedPassword = "QwE!5rTy#9uP0u"; - PutUsersUserIdResponse putUsersUserIdResponse = ok(newFineractClient(simpleUsername, originalPassword).users.update25(userId, + PutUsersUserIdResponse putUsersUserIdResponse = ok(newFineractClient(simpleUsername, originalPassword).users.updateUser(userId, new PutUsersUserIdRequest().password(updatedPassword).repeatPassword(updatedPassword))); Assertions.assertNotNull(putUsersUserIdResponse.getResourceId()); // From then on the originalPassword is not working anymore CallFailedRuntimeException callFailedRuntimeException = Assertions.assertThrows(CallFailedRuntimeException.class, () -> { - ok(newFineractClient(simpleUsername, originalPassword).users.retrieveOne30(userId)); + ok(newFineractClient(simpleUsername, originalPassword).users.retrieveOneUser(userId)); }); Assertions.assertEquals(401, callFailedRuntimeException.getResponse().raw().code()); Assertions.assertTrue(callFailedRuntimeException.getMessage().contains("Unauthorized")); // The update password is still working perfectly - GetUsersUserIdResponse ok = ok(newFineractClient(simpleUsername, updatedPassword).users.retrieveOne30(userId)); + GetUsersUserIdResponse ok = ok(newFineractClient(simpleUsername, updatedPassword).users.retrieveOneUser(userId)); } @Test @@ -205,18 +205,18 @@ public void testApplicationUserCanChangeOwnPassword() { String updatedPassword = "pX268-4Pfv|kF6"; ChangePwdUsersUserIdResponse changePwdUsersUserIdResponse = ok(newFineractClient(simpleUsername, originalPassword).users - .changePassword(userId, new ChangePwdUsersUserIdRequest().password(updatedPassword).repeatPassword(updatedPassword))); + .changePasswordUser(userId, new ChangePwdUsersUserIdRequest().password(updatedPassword).repeatPassword(updatedPassword))); Assertions.assertNotNull(changePwdUsersUserIdResponse.getResourceId()); // From then on the originalPassword is not working anymore CallFailedRuntimeException callFailedRuntimeException = Assertions.assertThrows(CallFailedRuntimeException.class, () -> { - ok(newFineractClient(simpleUsername, originalPassword).users.retrieveOne30(userId)); + ok(newFineractClient(simpleUsername, originalPassword).users.retrieveOneUser(userId)); }); Assertions.assertEquals(401, callFailedRuntimeException.getResponse().raw().code()); Assertions.assertTrue(callFailedRuntimeException.getMessage().contains("Unauthorized")); // The update password is still working perfectly - GetUsersUserIdResponse ok = ok(newFineractClient(simpleUsername, updatedPassword).users.retrieveOne30(userId)); + GetUsersUserIdResponse ok = ok(newFineractClient(simpleUsername, updatedPassword).users.retrieveOneUser(userId)); } @Test @@ -239,7 +239,7 @@ public void testApplicationUserShallNotBeAbleToChangeItsOwnRoles() { // User tries to update it's own roles CallFailedRuntimeException callFailedRuntimeException = Assertions.assertThrows(CallFailedRuntimeException.class, () -> { - ok(newFineractClient(simpleUsername, password).users.update25(userId, + ok(newFineractClient(simpleUsername, password).users.updateUser(userId, new PutUsersUserIdRequest().roles(List.of(Long.valueOf(roleId2))))); }); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientSearchTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientSearchTest.java index b03fe03924b..197e47f8cbd 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientSearchTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientSearchTest.java @@ -327,10 +327,10 @@ public void testClientSearchByLegalForm() { secondEntityClientRequest.setLegalFormId(2L); PostClientsResponse secondEntityClientResponse = clientHelper.createClient(secondEntityClientRequest); // when - GetClientsResponse individualClients = ok(fineractClient().clients.retrieveAll21(newOffice.getOfficeId(), null, null, null, null, - null, null, null, null, null, null, null, 1)); - GetClientsResponse entityClients = ok(fineractClient().clients.retrieveAll21(newOffice.getOfficeId(), null, null, null, null, null, - null, null, null, "id", null, null, 2)); + GetClientsResponse individualClients = ok(fineractClient().clients.retrieveAllClients(newOffice.getOfficeId(), null, null, null, + null, null, null, null, null, null, null, null, 1)); + GetClientsResponse entityClients = ok(fineractClient().clients.retrieveAllClients(newOffice.getOfficeId(), null, null, null, null, + null, null, null, null, "id", null, null, 2)); // then assertThat(individualClients.getTotalFilteredRecords()).isEqualTo(1); assertThat(individualClients.getPageItems().get(0).getId()).isEqualTo(individualClientResponse.getClientId()); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java index 182646c7af3..6a1bd64c66b 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java @@ -56,14 +56,14 @@ Long create() { // TODO activationDate() why String? https://issues.apache.org/jira/browse/FINERACT-1232 // TODO why dateFormat and locale required even when no activationDate?! // https://issues.apache.org/jira/browse/FINERACT-1233 - return ok(fineractClient().clients.create6( + return ok(fineractClient().clients.createClient( new PostClientsRequest().legalFormId(1L).officeId(1L).fullname("TestClient").dateFormat(Utils.DATE_FORMAT).locale("en_US"))) .getClientId(); } Optional retrieveFirst() { GetClientsResponse clients = ok( - fineractClient().clients.retrieveAll21(null, null, null, null, null, null, null, 0, 1, null, null, false, null)); + fineractClient().clients.retrieveAllClients(null, null, null, null, null, null, null, 0, 1, null, null, false, null)); if (clients.getTotalFilteredRecords() != null && clients.getTotalFilteredRecords() > 0) { return clients.getPageItems().stream().findFirst().map(item -> item.getId()); } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/FeignImageTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/FeignImageTest.java index 22c7c22a0f9..d75d205618e 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/FeignImageTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/FeignImageTest.java @@ -60,7 +60,7 @@ void setupStaff() { request.setDateFormat("yyyy-MM-dd"); request.setLocale("en_US"); - CreateStaffResponse response = ok(() -> fineractClient().staff().create3(request)); + CreateStaffResponse response = ok(() -> fineractClient().staff().createStaff(request)); assertThat(response).isNotNull(); assertThat(response.getResourceId()).isNotNull(); staffId = response.getResourceId(); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ImageTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ImageTest.java index a90947c05d7..c27f0e64e75 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ImageTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ImageTest.java @@ -100,7 +100,7 @@ void getInlineOctetOutput() throws IOException { assertImage(body); } - var staff = ok(fineractClient().staff.retrieveOne8(staffId)); + var staff = ok(fineractClient().staff.retrieveOneStaff(staffId)); assertThat(Parts.fileName(r)).hasValue(staff.getDisplayName()); } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/StaffTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/StaffTest.java index 94f21a103b3..3ada36bfbf4 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/StaffTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/StaffTest.java @@ -52,13 +52,13 @@ public Long getStaffId() { } Long create() { - return ok(fineractClient().staff.create3(new StaffRequest().officeId(1L).firstname(Utils.randomFirstNameGenerator()) + return ok(fineractClient().staff.createStaff(new StaffRequest().officeId(1L).firstname(Utils.randomFirstNameGenerator()) .lastname(Utils.randomLastNameGenerator()).externalId(Utils.randomStringGenerator("", 12)) .joiningDate(LocalDate.now(ZoneId.of("UTC")).toString()).dateFormat("yyyy-MM-dd").locale("en_US"))).getResourceId(); } Optional retrieveFirst() { - var staff = ok(fineractClient().staff.retrieveAll16(1L, true, false, "ACTIVE")); + var staff = ok(fineractClient().staff.retrieveAllStaff(1L, true, false, "ACTIVE")); if (!staff.isEmpty()) { return Optional.of((long) staff.get(0).getId()); } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignAccountHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignAccountHelper.java index 163e968e406..689423f22ef 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignAccountHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignAccountHelper.java @@ -63,7 +63,7 @@ private Account createAccount(String name, String glCode, String type) { .type(getAccountTypeId(type))// .usage(1); - PostGLAccountsResponse response = ok(() -> fineractClient.generalLedgerAccount().createGLAccount1(request)); + PostGLAccountsResponse response = ok(() -> fineractClient.generalLedgerAccount().createGLAccount(request)); GetGLAccountsResponse account = ok( () -> fineractClient.generalLedgerAccount().retreiveAccount(response.getResourceId(), Collections.emptyMap())); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignClientHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignClientHelper.java index 22141276cf7..8e29a92bfd3 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignClientHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignClientHelper.java @@ -58,11 +58,11 @@ public Long createClient(String activationDate) { } public Long createClient(PostClientsRequest request) { - PostClientsResponse response = ok(() -> fineractClient.clients().create6(request)); + PostClientsResponse response = ok(() -> fineractClient.clients().createClient(request)); return response.getClientId(); } public GetClientsClientIdResponse getClient(Long clientId) { - return ok(() -> fineractClient.clients().retrieveOne11(clientId, Collections.emptyMap())); + return ok(() -> fineractClient.clients().retrieveOneClient(clientId, Collections.emptyMap())); } } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignGlobalConfigurationHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignGlobalConfigurationHelper.java index a2ae1f1cc87..4b6cc45e698 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignGlobalConfigurationHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignGlobalConfigurationHelper.java @@ -44,7 +44,7 @@ public void disableOriginatorCreationDuringLoanApplication() { public void updateConfigurationByName(String configName, boolean enabled) { Long configId = getConfigurationIdByName(configName); - ok(() -> fineractClient.globalConfiguration().updateConfiguration1(configId, + ok(() -> fineractClient.globalConfiguration().updateGlobalConfiguration(configId, new PutGlobalConfigurationsRequest().enabled(enabled))); } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignJournalEntryHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignJournalEntryHelper.java index 3f1416006bd..faf7bf77ce3 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignJournalEntryHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignJournalEntryHelper.java @@ -38,7 +38,7 @@ public FeignJournalEntryHelper(FineractFeignClient fineractClient) { } public GetJournalEntriesTransactionIdResponse getJournalEntriesForLoan(Long loanId) { - return ok(() -> fineractClient.journalEntries().retrieveAll1(Map.of("loanId", loanId))); + return ok(() -> fineractClient.journalEntries().retrieveAllJournalEntries(Map.of("loanId", loanId))); } public void verifyJournalEntries(Long loanId, LoanTestData.Journal... expectedEntries) { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignLoanOriginatorHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignLoanOriginatorHelper.java index 59f2089c15d..ba52f07d0a1 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignLoanOriginatorHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignLoanOriginatorHelper.java @@ -49,24 +49,24 @@ public Long createOriginator(String externalId, String name, String status) { } public Long createOriginator(PostLoanOriginatorsRequest request) { - PostLoanOriginatorsResponse response = ok(() -> fineractClient.loanOriginators().create11(request)); + PostLoanOriginatorsResponse response = ok(() -> fineractClient.loanOriginators().createLoanOriginator(request)); return response.getResourceId(); } public CallFailedRuntimeException createOriginatorExpectingError(PostLoanOriginatorsRequest request) { - return fail(() -> fineractClient.loanOriginators().create11(request)); + return fail(() -> fineractClient.loanOriginators().createLoanOriginator(request)); } public List getAllOriginators() { - return ok(() -> fineractClient.loanOriginators().retrieveAll28()); + return ok(() -> fineractClient.loanOriginators().retrieveAllLoanOriginators()); } public GetLoanOriginatorsResponse getOriginatorById(Long originatorId) { - return ok(() -> fineractClient.loanOriginators().retrieveOne18(originatorId)); + return ok(() -> fineractClient.loanOriginators().retrieveOneLoanOriginator(originatorId)); } public CallFailedRuntimeException getOriginatorByIdExpectingError(Long originatorId) { - return fail(() -> fineractClient.loanOriginators().retrieveOne18(originatorId)); + return fail(() -> fineractClient.loanOriginators().retrieveOneLoanOriginator(originatorId)); } public GetLoanOriginatorsResponse getOriginatorByExternalId(String externalId) { @@ -78,7 +78,7 @@ public CallFailedRuntimeException getOriginatorByExternalIdExpectingError(String } public PutLoanOriginatorsResponse updateOriginator(Long originatorId, PutLoanOriginatorsRequest request) { - return ok(() -> fineractClient.loanOriginators().update16(originatorId, request)); + return ok(() -> fineractClient.loanOriginators().updateLoanOriginator(originatorId, request)); } public PutLoanOriginatorsResponse updateOriginatorByExternalId(String externalId, PutLoanOriginatorsRequest request) { @@ -86,11 +86,11 @@ public PutLoanOriginatorsResponse updateOriginatorByExternalId(String externalId } public CallFailedRuntimeException updateOriginatorExpectingError(Long originatorId, PutLoanOriginatorsRequest request) { - return fail(() -> fineractClient.loanOriginators().update16(originatorId, request)); + return fail(() -> fineractClient.loanOriginators().updateLoanOriginator(originatorId, request)); } public Long deleteOriginator(Long originatorId) { - var response = ok(() -> fineractClient.loanOriginators().delete14(originatorId)); + var response = ok(() -> fineractClient.loanOriginators().deleteLoanOriginator(originatorId)); return response.getResourceId(); } @@ -100,7 +100,7 @@ public Long deleteOriginatorByExternalId(String externalId) { } public CallFailedRuntimeException deleteOriginatorExpectingError(Long originatorId) { - return fail(() -> fineractClient.loanOriginators().delete14(originatorId)); + return fail(() -> fineractClient.loanOriginators().deleteLoanOriginator(originatorId)); } public static String generateUniqueExternalId() { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignSchedulerHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignSchedulerHelper.java index 0528639f7ba..25f1beafe0e 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignSchedulerHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignSchedulerHelper.java @@ -51,7 +51,7 @@ public void startScheduler() { public void executeAndAwaitJob(String jobDisplayName) { stopScheduler(); - List allJobs = ok(() -> fineractClient.schedulerJob().retrieveAll8()); + List allJobs = ok(() -> fineractClient.schedulerJob().retrieveAllSchedulerJobs()); GetJobsResponse targetJob = allJobs.stream().filter(j -> jobDisplayName.equals(j.getDisplayName())).findFirst() .orElseThrow(() -> new RuntimeException("Job not found: " + jobDisplayName)); @@ -59,7 +59,7 @@ public void executeAndAwaitJob(String jobDisplayName) { FeignCalls.executeVoid(() -> fineractClient.schedulerJob().executeJob(targetJob.getJobId(), "executeJob", new ExecuteJobRequest())); Awaitility.await().atMost(Duration.ofMinutes(2)).pollInterval(Duration.ofSeconds(1)).pollDelay(Duration.ofSeconds(1)).until(() -> { - GetJobsResponse job = ok(() -> fineractClient.schedulerJob().retrieveOne5(targetJob.getJobId())); + GetJobsResponse job = ok(() -> fineractClient.schedulerJob().retrieveOneSchedulerJob(targetJob.getJobId())); JobDetailHistoryData history = job.getLastRunHistory(); if (history == null || history.getJobRunStartTime() == null) { return false; diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignTrialBalanceSummaryReportTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignTrialBalanceSummaryReportTest.java index 64c4fd93d5f..10cd5730bd1 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignTrialBalanceSummaryReportTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignTrialBalanceSummaryReportTest.java @@ -125,11 +125,12 @@ public void tearDown() { List currentMappings = ok( () -> fineractClient().mappingFinancialActivitiesToAccounts().retrieveAll()); for (GetFinancialActivityAccountsResponse mapping : currentMappings) { - executeVoid(() -> fineractClient().mappingFinancialActivitiesToAccounts().deleteGLAccount(mapping.getId())); + executeVoid(() -> fineractClient().mappingFinancialActivitiesToAccounts() + .deleteGLAccountMappingFinancialActivityAccount(mapping.getId())); } for (GetFinancialActivityAccountsResponse mapping : originalFinancialMappings) { ok(() -> fineractClient().mappingFinancialActivitiesToAccounts() - .createGLAccount(new PostFinancialActivityAccountsRequest() + .createGLAccountMappingFinancialActivityAccount(new PostFinancialActivityAccountsRequest() .financialActivityId(Long.valueOf(mapping.getFinancialActivityData().getId())) .glAccountId(mapping.getGlAccountData().getId()))); } @@ -263,9 +264,10 @@ private void setupFinancialActivityMapping() { List mappings = ok( () -> fineractClient().mappingFinancialActivitiesToAccounts().retrieveAll()); for (GetFinancialActivityAccountsResponse mapping : mappings) { - executeVoid(() -> fineractClient().mappingFinancialActivitiesToAccounts().deleteGLAccount(mapping.getId())); + executeVoid(() -> fineractClient().mappingFinancialActivitiesToAccounts() + .deleteGLAccountMappingFinancialActivityAccount(mapping.getId())); } - ok(() -> fineractClient().mappingFinancialActivitiesToAccounts().createGLAccount( + ok(() -> fineractClient().mappingFinancialActivitiesToAccounts().createGLAccountMappingFinancialActivityAccount( new PostFinancialActivityAccountsRequest().financialActivityId(100L).glAccountId((long) transferAccount.getAccountID()))); } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ClientHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ClientHelper.java index d444e36463c..408b17b78a1 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ClientHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ClientHelper.java @@ -108,7 +108,7 @@ public static Integer createClient(final RequestSpecification requestSpec, final } public static PostClientsResponse createClient(final PostClientsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().clients.create6(request)); + return Calls.ok(FineractClientHelper.getFineractClient().clients.createClient(request)); } public PostClientsClientIdIdentifiersResponse createClientIdentifer(final Long clientId, @@ -144,7 +144,7 @@ public PageClientSearchData searchClients(String text, SortOrder sortOrder) { } public PageClientSearchData searchClients(PagedRequestClientTextSearch request) { - return Calls.ok(FineractClientHelper.getFineractClient().clientSearchV2.searchByText(request)); + return Calls.ok(FineractClientHelper.getFineractClient().clientSearchV2.searchClientsByText(request)); } // TODO: Rewrite to use fineract-client instead! @@ -1140,31 +1140,32 @@ public static Boolean getClientTransactions(final RequestSpecification requestSp } public GetClientsClientIdTransactionsResponse getAllClientTransactionsByExternalId(final String externalId) { - return Calls.ok(FineractClientHelper.getFineractClient().clientTransactions.retrieveAllClientTransactions1(externalId, 0, 100)); + return Calls.ok(FineractClientHelper.getFineractClient().clientTransactions + .retrieveAllClientTransactionsByClientExternalId(externalId, 0, 100)); } public GetClientsClientIdTransactionsTransactionIdResponse getClientTransactionByExternalId(final String externalId, final String transactionId) { - return Calls.ok(FineractClientHelper.getFineractClient().clientTransactions.retrieveClientTransaction2(externalId, + return Calls.ok(FineractClientHelper.getFineractClient().clientTransactions.retrieveClientTransactionByClientExternalId(externalId, Long.parseLong(transactionId))); } public GetClientsClientIdTransactionsTransactionIdResponse getClientTransactionByTransactionExternalId(final Long clientId, final String transactionExternalId) { - return Calls.ok( - FineractClientHelper.getFineractClient().clientTransactions.retrieveClientTransaction1(clientId, transactionExternalId)); + return Calls.ok(FineractClientHelper.getFineractClient().clientTransactions + .retrieveClientTransactionByTransactionExternalId(clientId, transactionExternalId)); } public PostClientsClientIdTransactionsTransactionIdResponse undoClientTransactionByExternalId(final String externalId, final String transactionId) { - return Calls.ok(FineractClientHelper.getFineractClient().clientTransactions.undoClientTransaction2(externalId, + return Calls.ok(FineractClientHelper.getFineractClient().clientTransactions.undoClientTransactionByClientExternalId(externalId, Long.parseLong(transactionId), "undo")); } public PostClientsClientIdTransactionsTransactionIdResponse undoClientTransactionByTransactionExternalId(final Long clientId, final String transactionExternalId) { - return Calls.ok(FineractClientHelper.getFineractClient().clientTransactions.undoClientTransaction1(clientId, transactionExternalId, - "undo")); + return Calls.ok(FineractClientHelper.getFineractClient().clientTransactions.undoClientTransactionByTransactionExternalId(clientId, + transactionExternalId, "undo")); } // TODO: Rewrite to use fineract-client instead! diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ExternalAssetOwnerHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ExternalAssetOwnerHelper.java index 96edda0fa77..ffd1aa05e61 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ExternalAssetOwnerHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ExternalAssetOwnerHelper.java @@ -49,12 +49,14 @@ public PostInitiateTransferResponse initiateTransferByLoanId(Long loanId, String } public void cancelTransferByTransferExternalId(String transferExternalId) { - Calls.ok(FineractClientHelper.getFineractClient().externalAssetOwners.transferRequestWithId1(transferExternalId, "cancel")); + Calls.ok(FineractClientHelper.getFineractClient().externalAssetOwners.transferRequestWithIdByExternalId(transferExternalId, + "cancel")); } public void cancelTransferByTransferExternalIdError(String transferExternalId) { - CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class, () -> Calls - .okR(FineractClientHelper.getFineractClient().externalAssetOwners.transferRequestWithId1(transferExternalId, "cancel"))); + CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class, + () -> Calls.okR(FineractClientHelper.getFineractClient().externalAssetOwners + .transferRequestWithIdByExternalId(transferExternalId, "cancel"))); assertEquals(403, exception.getResponse().code()); } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java index 53e401e3247..e6f4d9672a3 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java @@ -55,7 +55,7 @@ public GlobalConfigurationPropertyData getGlobalConfigurationByName(final String public GlobalConfigurationPropertyData getGlobalConfigurationById(final Long configId) { log.info("------------------------ RETRIEVING GLOBAL CONFIGURATION BY ID -------------------------"); - return Calls.ok(FineractClientHelper.getFineractClient().globalConfigurations.retrieveOne3(configId)); + return Calls.ok(FineractClientHelper.getFineractClient().globalConfigurations.retrieveOneGlobalConfiguration(configId)); } // TODO: This is quite a bad pattern and adds a lot of time to individual test @@ -638,7 +638,7 @@ public PutGlobalConfigurationsResponse updateGlobalConfiguration(final String co public void updateGlobalConfigurationInternal(final String configName, final Long value) { log.info("---------------------------UPDATE VALUE FOR GLOBAL CONFIG (internal) ---------------------------------------"); - Calls.ok(FineractClientHelper.getFineractClient().legacy.updateGlobalConfiguration(configName, value)); + Calls.ok(FineractClientHelper.getFineractClient().legacy.updateInternalGlobalConfiguration(configName, value)); } public void manageConfigurations(final String configurationName, final boolean enabled) { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java index 8a9f3a3a9e5..1c306fde127 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java @@ -89,7 +89,7 @@ public PaymentTypeUpdateResponse updatePaymentType(final Long paymentTypeId, public PaymentTypeDeleteResponse deletePaymentType(final Long paymentTypeId) { log.info("-------------------------------DELETING PAYMENT TYPE-------------------------------------------"); - return Calls.ok(FineractClientHelper.getFineractClient().paymentTypes.deleteCode1(paymentTypeId)); + return Calls.ok(FineractClientHelper.getFineractClient().paymentTypes.deleteCodePaymentType(paymentTypeId)); } public static String randomNameGenerator(final String prefix, final int lenOfRandomSuffix) { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/AccountHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/AccountHelper.java index 42e28206904..5937033e68e 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/AccountHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/AccountHelper.java @@ -150,15 +150,15 @@ public HashMap getAccountingWithRunningBalanceById(final String accountId) { } public static PostGLAccountsResponse createGLAccount(final PostGLAccountsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().glAccounts.createGLAccount1(request)); + return Calls.ok(FineractClientHelper.getFineractClient().glAccounts.createGLAccount(request)); } public static DeleteGLAccountsResponse deleteGLAccount(final Long requestId) { - return Calls.ok(FineractClientHelper.getFineractClient().glAccounts.deleteGLAccount1(requestId)); + return Calls.ok(FineractClientHelper.getFineractClient().glAccounts.deleteGLAccount(requestId)); } public static PutGLAccountsResponse updateGLAccount(final Long requestId, final PutGLAccountsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().glAccounts.updateGLAccount1(requestId, request)); + return Calls.ok(FineractClientHelper.getFineractClient().glAccounts.updateGLAccount(requestId, request)); } public static GetGLAccountsResponse getGLAccount(final Long glAccountId) { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountHelper.java index cf438213d5f..53b6b5c75ab 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountHelper.java @@ -92,7 +92,8 @@ public Integer deleteFinancialActivityAccount(final Integer financialActivityAcc } public PostFinancialActivityAccountsResponse createFinancialActivityAccount(PostFinancialActivityAccountsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().financialActivyAccountMappings.createGLAccount(request)); + return Calls.ok(FineractClientHelper.getFineractClient().financialActivyAccountMappings + .createGLAccountMappingFinancialActivityAccount(request)); } public List getAllFinancialActivityAccounts() { @@ -100,6 +101,7 @@ public List getAllFinancialActivityAccount } public DeleteFinancialActivityAccountsResponse deleteFinancialActivityAccount(Long financialMappingId) { - return Calls.ok(FineractClientHelper.getFineractClient().financialActivyAccountMappings.deleteGLAccount(financialMappingId)); + return Calls.ok(FineractClientHelper.getFineractClient().financialActivyAccountMappings + .deleteGLAccountMappingFinancialActivityAccount(financialMappingId)); } } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java index 62744304c60..db98031e424 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java @@ -194,7 +194,7 @@ public static PostJournalEntriesResponse createJournalEntry(String command, Jour } public static GetJournalEntriesTransactionIdResponse retrieveJournalEntryByTransactionId(final String transactionId) { - return Calls.ok(FineractClientHelper.getFineractClient().journalEntries.retrieveAll1(// + return Calls.ok(FineractClientHelper.getFineractClient().journalEntries.retrieveAllJournalEntries(// null, null, null, null, null, null, null, transactionId, null, // null, null, null, null, null, null, null, null, null, true)); } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanProductHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanProductHelper.java index 031f1c60fd8..473c585bb67 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanProductHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanProductHelper.java @@ -38,7 +38,7 @@ public PostLoanProductsResponse createLoanProduct(PostLoanProductsRequest reques } public GetLoanProductsProductIdResponse retrieveLoanProductByExternalId(String externalId) { - return Calls.ok(FineractClientHelper.getFineractClient().loanProducts.retrieveLoanProductDetails1(externalId)); + return Calls.ok(FineractClientHelper.getFineractClient().loanProducts.retrieveLoanProductDetailsByExternalId(externalId)); } public GetLoanProductsProductIdResponse retrieveLoanProductById(Long loanProductId) { @@ -46,7 +46,7 @@ public GetLoanProductsProductIdResponse retrieveLoanProductById(Long loanProduct } public PutLoanProductsProductIdResponse updateLoanProductByExternalId(String externalId, PutLoanProductsProductIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanProducts.updateLoanProduct1(externalId, request)); + return Calls.ok(FineractClientHelper.getFineractClient().loanProducts.updateLoanProductByExternalId(externalId, request)); } public PutLoanProductsProductIdResponse updateLoanProductById(Long loanProductId, PutLoanProductsProductIdRequest request) { @@ -54,7 +54,7 @@ public PutLoanProductsProductIdResponse updateLoanProductById(Long loanProductId } public GetLoanProductsTemplateResponse getLoanProductTemplate(boolean isProductMixTemplate) { - return Calls.ok(FineractClientHelper.getFineractClient().loanProducts.retrieveTemplate11(isProductMixTemplate)); + return Calls.ok(FineractClientHelper.getFineractClient().loanProducts.retrieveTemplateLoanProduct(isProductMixTemplate)); } public static Collection fetchProductBasicDetailsList() { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java index 897e4ceadc4..5943b78cac1 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java @@ -300,7 +300,7 @@ public PutLoansLoanIdResponse modifyLoanCommand(final Integer loanId, final Stri public PutLoansLoanIdResponse modifyLoanApplication(final String loanExternalId, final String command, final PutLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.modifyLoanApplication1(loanExternalId, request, command)); + return Calls.ok(FineractClientHelper.getFineractClient().loans.modifyLoanApplicationByExternalId(loanExternalId, request, command)); } // TODO: Rewrite to use fineract-client instead! @@ -416,7 +416,7 @@ public List getLoanDelinquencyActions(final Long } public List getLoanDelinquencyActions(String externalId) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.getLoanDelinquencyActions1(externalId)); + return Calls.ok(FineractClientHelper.getFineractClient().loans.getLoanDelinquencyActionsByExternalId(externalId)); } public PostLoansDelinquencyActionResponse createLoanDelinquencyAction(final Long loanid, DelinquencyAction action, String startDate, @@ -430,8 +430,8 @@ public PostLoansDelinquencyActionResponse createLoanDelinquencyAction(String ext String endDate) { PostLoansDelinquencyActionRequest postLoansDelinquencyAction = new PostLoansDelinquencyActionRequest().action(action.name()) .startDate(startDate).endDate(endDate).locale("en").dateFormat("dd MMMM yyyy"); - return Calls - .ok(FineractClientHelper.getFineractClient().loans.createLoanDelinquencyAction1(externalId, postLoansDelinquencyAction)); + return Calls.ok(FineractClientHelper.getFineractClient().loans.createLoanDelinquencyActionByExternalId(externalId, + postLoansDelinquencyAction)); } public PostLoansDelinquencyActionResponse createLoanDelinquencyAction(final Long loanid, DelinquencyAction action, String startDate) { @@ -472,15 +472,15 @@ public List getLoanCharges(final Long loa } public List getLoanCharges(final String loanExternalId) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.retrieveAllLoanCharges1(loanExternalId)); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.retrieveAllLoanChargesByLoanExternalId(loanExternalId)); } public GetLoansLoanIdChargesTemplateResponse getLoanChargeTemplate(final Long loanId) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.retrieveTemplate8(loanId)); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.retrieveTemplateLoanCharge(loanId)); } public GetLoansLoanIdChargesTemplateResponse getLoanChargeTemplate(final String loanExternalId) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.retrieveTemplate9(loanExternalId)); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.retrieveTemplateLoanChargeByLoanExternalId(loanExternalId)); } // TODO: Rewrite to use fineract-client instead! @@ -950,20 +950,20 @@ public PostLoansLoanIdTransactionsResponse capitalizedIncomeAdjustment(final Lon public PostLoansLoanIdTransactionsResponse capitalizedIncomeAdjustment(final String loanExternalId, final Long transactionId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction2(loanExternalId, transactionId, - request, "capitalizedIncomeAdjustment")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByLoanExternalId(loanExternalId, + transactionId, request, "capitalizedIncomeAdjustment")); } public PostLoansLoanIdTransactionsResponse capitalizedIncomeAdjustment(final String loanExternalId, final String transactionExternalId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction3(loanExternalId, - transactionExternalId, request, "capitalizedIncomeAdjustment")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByLoanAndTransactionExternalId( + loanExternalId, transactionExternalId, request, "capitalizedIncomeAdjustment")); } public PostLoansLoanIdTransactionsResponse capitalizedIncomeAdjustment(final Long loanId, final String transactionExternalId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction1(loanId, transactionExternalId, - request, "capitalizedIncomeAdjustment")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByTransactionExternalId(loanId, + transactionExternalId, request, "capitalizedIncomeAdjustment")); } public PostLoansLoanIdTransactionsResponse capitalizedIncomeAdjustment(final Long loanId, final Long capitalizedIncomeTransactionId, @@ -980,20 +980,20 @@ public PostLoansLoanIdTransactionsResponse buyDownFeeAdjustment(final Long loanI public PostLoansLoanIdTransactionsResponse buyDownFeeAdjustment(final String loanExternalId, final Long transactionId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction2(loanExternalId, transactionId, - request, "buyDownFeeAdjustment")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByLoanExternalId(loanExternalId, + transactionId, request, "buyDownFeeAdjustment")); } public PostLoansLoanIdTransactionsResponse buyDownFeeAdjustment(final String loanExternalId, final String transactionExternalId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction3(loanExternalId, - transactionExternalId, request, "buyDownFeeAdjustment")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByLoanAndTransactionExternalId( + loanExternalId, transactionExternalId, request, "buyDownFeeAdjustment")); } public PostLoansLoanIdTransactionsResponse buyDownFeeAdjustment(final Long loanId, final String transactionExternalId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction1(loanId, transactionExternalId, - request, "buyDownFeeAdjustment")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByTransactionExternalId(loanId, + transactionExternalId, request, "buyDownFeeAdjustment")); } public PostLoansLoanIdTransactionsResponse buyDownFeeAdjustment(final Long loanId, final Long buyDownFeeTransactionId, @@ -1080,8 +1080,8 @@ public PostLoansLoanIdTransactionsResponse makeInterestPaymentWaiver(final Long public PostLoansLoanIdTransactionsResponse makeInterestPaymentWaiver(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, - "interestPaymentWaiver")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "interestPaymentWaiver")); } public PostLoansLoanIdTransactionsResponse reAge(final Long loanId, final PostLoansLoanIdTransactionsRequest request) { @@ -1110,49 +1110,52 @@ public PutChargeTransactionChangesResponse undoWaiveLoanCharge(final Long loanId public PutChargeTransactionChangesResponse undoWaiveLoanCharge(final Long loanId, final String transactionExternalId, final PutChargeTransactionChangesRequest request) { log.info("--------------------------------- UNDO WAIVE CHARGES FOR LOAN --------------------------------"); - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.undoWaiveCharge1(loanId, transactionExternalId, request)); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.undoWaiveChargeByTransactionExternalId(loanId, + transactionExternalId, request)); } public PutChargeTransactionChangesResponse undoWaiveLoanCharge(final String loanExternalId, final Long transactionId, final PutChargeTransactionChangesRequest request) { log.info("--------------------------------- UNDO WAIVE CHARGES FOR LOAN --------------------------------"); - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.undoWaiveCharge2(loanExternalId, transactionId, request)); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.undoWaiveChargeByLoanExternalId(loanExternalId, + transactionId, request)); } public PutChargeTransactionChangesResponse undoWaiveLoanCharge(final String loanExternalId, final String transactionExternalId, final PutChargeTransactionChangesRequest request) { log.info("--------------------------------- UNDO WAIVE CHARGES FOR LOAN --------------------------------"); - return Calls.ok( - FineractClientHelper.getFineractClient().loanTransactions.undoWaiveCharge3(loanExternalId, transactionExternalId, request)); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions + .undoWaiveChargeByLoanAndTransactionExternalId(loanExternalId, transactionExternalId, request)); } public PostLoansLoanIdChargesChargeIdResponse waiveLoanCharge(final Long loanId, final Long loanChargeId, final PostLoansLoanIdChargesChargeIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanCharge2(loanId, loanChargeId, request, "waive")); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanChargeOnExistingCharge(loanId, loanChargeId, + request, "waive")); } public PostLoansLoanIdChargesChargeIdResponse waiveLoanCharge(final String loanExternalId, final Long loanChargeId, final PostLoansLoanIdChargesChargeIdRequest request) { - return Calls.ok( - FineractClientHelper.getFineractClient().loanCharges.executeLoanCharge4(loanExternalId, loanChargeId, request, "waive")); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges + .executeLoanChargeByLoanExternalIdOnExistingCharge(loanExternalId, loanChargeId, request, "waive")); } public PostLoansLoanIdChargesChargeIdResponse waiveLoanCharge(final Long loanId, final String loanChargeExternalId, final PostLoansLoanIdChargesChargeIdRequest request) { - return Calls.ok( - FineractClientHelper.getFineractClient().loanCharges.executeLoanCharge3(loanId, loanChargeExternalId, request, "waive")); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanChargeByChargeExternalId(loanId, + loanChargeExternalId, request, "waive")); } public PostLoansLoanIdChargesChargeIdResponse waiveLoanCharge(final String loanExternalId, final String loanChargeExternalId, final PostLoansLoanIdChargesChargeIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanCharge5(loanExternalId, loanChargeExternalId, - request, "waive")); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanChargeByLoanAndChargeExternalId(loanExternalId, + loanChargeExternalId, request, "waive")); } public PostLoansLoanIdTransactionsResponse makeLoanRepayment(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls.ok( - FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, "repayment")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "repayment")); } public PostLoansLoanIdTransactionsResponse makeMerchantIssuedRefund(final Long loanId, @@ -1163,8 +1166,8 @@ public PostLoansLoanIdTransactionsResponse makeMerchantIssuedRefund(final Long l public PostLoansLoanIdTransactionsResponse makeMerchantIssuedRefund(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, - "merchantIssuedRefund")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "merchantIssuedRefund")); } public PostLoansLoanIdTransactionsResponse makePayoutRefund(final Long loanId, final PostLoansLoanIdTransactionsRequest request) { @@ -1173,8 +1176,8 @@ public PostLoansLoanIdTransactionsResponse makePayoutRefund(final Long loanId, f public PostLoansLoanIdTransactionsResponse makePayoutRefund(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls.ok( - FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, "payoutRefund")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "payoutRefund")); } public PostLoansLoanIdTransactionsResponse makeChargeRefund(final Long loanId, final PostLoansLoanIdTransactionsRequest request) { @@ -1183,8 +1186,8 @@ public PostLoansLoanIdTransactionsResponse makeChargeRefund(final Long loanId, f public PostLoansLoanIdTransactionsResponse makeChargeRefund(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls.ok( - FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, "chargeRefund")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "chargeRefund")); } public PostLoansLoanIdTransactionsResponse manualInterestRefund(final Long loanId, final Long targetTransactionId, @@ -1200,8 +1203,8 @@ public PostLoansLoanIdTransactionsResponse makeGoodwillCredit(final Long loanId, public PostLoansLoanIdTransactionsResponse makeGoodwillCredit(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, - "goodwillCredit")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "goodwillCredit")); } public PostLoansLoanIdTransactionsResponse makeWaiveInterest(final Long loanId, final PostLoansLoanIdTransactionsRequest request) { @@ -1210,8 +1213,8 @@ public PostLoansLoanIdTransactionsResponse makeWaiveInterest(final Long loanId, public PostLoansLoanIdTransactionsResponse makeWaiveInterest(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, - "waiveinterest")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "waiveinterest")); } public PostLoansLoanIdTransactionsResponse makeWriteoff(final Long loanId, final PostLoansLoanIdTransactionsRequest request) { @@ -1219,8 +1222,8 @@ public PostLoansLoanIdTransactionsResponse makeWriteoff(final Long loanId, final } public PostLoansLoanIdTransactionsResponse makeWriteoff(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls - .ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, "writeoff")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "writeoff")); } public PostLoansLoanIdTransactionsResponse makeUndoWriteoff(final Long loanId, final PostLoansLoanIdTransactionsRequest request) { @@ -1229,8 +1232,8 @@ public PostLoansLoanIdTransactionsResponse makeUndoWriteoff(final Long loanId, f public PostLoansLoanIdTransactionsResponse makeUndoWriteoff(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls.ok( - FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, "undowriteoff")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "undowriteoff")); } public PostLoansLoanIdTransactionsResponse makeRecoveryPayment(final Long loanId, final PostLoansLoanIdTransactionsRequest request) { @@ -1240,8 +1243,8 @@ public PostLoansLoanIdTransactionsResponse makeRecoveryPayment(final Long loanId public PostLoansLoanIdTransactionsResponse makeRecoveryPayment(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, - "recoverypayment")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "recoverypayment")); } public PostLoansLoanIdTransactionsResponse makeRefundByCash(final Long loanId, final PostLoansLoanIdTransactionsRequest request) { @@ -1250,8 +1253,8 @@ public PostLoansLoanIdTransactionsResponse makeRefundByCash(final Long loanId, f public PostLoansLoanIdTransactionsResponse makeRefundByCash(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls.ok( - FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, "refundByCash")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "refundByCash")); } public PostLoansLoanIdTransactionsResponse makeCreditBalanceRefund(final Long loanId, @@ -1262,26 +1265,26 @@ public PostLoansLoanIdTransactionsResponse makeCreditBalanceRefund(final Long lo public PostLoansLoanIdTransactionsResponse makeCreditBalanceRefund(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, - "creditBalanceRefund")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "creditBalanceRefund")); } public PostLoansLoanIdTransactionsResponse reverseLoanTransaction(final String loanExternalId, final Long transactionId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction2(loanExternalId, transactionId, - request, "undo")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByLoanExternalId(loanExternalId, + transactionId, request, "undo")); } public PostLoansLoanIdTransactionsResponse reverseLoanTransaction(final String loanExternalId, final String transactionExternalId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction3(loanExternalId, - transactionExternalId, request, "undo")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions + .adjustLoanTransactionByLoanAndTransactionExternalId(loanExternalId, transactionExternalId, request, "undo")); } public PostLoansLoanIdTransactionsResponse reverseLoanTransaction(final Long loanId, final String transactionExternalId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction1(loanId, transactionExternalId, - request, "undo")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByTransactionExternalId(loanId, + transactionExternalId, request, "undo")); } public PostLoansLoanIdTransactionsResponse chargebackLoanTransaction(final Long loanId, final Long transactionId, @@ -1292,38 +1295,38 @@ public PostLoansLoanIdTransactionsResponse chargebackLoanTransaction(final Long public PostLoansLoanIdTransactionsResponse chargebackLoanTransaction(final String loanExternalId, final Long transactionId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction2(loanExternalId, transactionId, - request, "chargeback")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByLoanExternalId(loanExternalId, + transactionId, request, "chargeback")); } public PostLoansLoanIdTransactionsResponse chargebackLoanTransaction(final String loanExternalId, final String transactionExternalId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction3(loanExternalId, - transactionExternalId, request, "chargeback")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions + .adjustLoanTransactionByLoanAndTransactionExternalId(loanExternalId, transactionExternalId, request, "chargeback")); } public PostLoansLoanIdTransactionsResponse chargebackLoanTransaction(final Long loanId, final String transactionExternalId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction1(loanId, transactionExternalId, - request, "chargeback")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByTransactionExternalId(loanId, + transactionExternalId, request, "chargeback")); } public PostLoansLoanIdTransactionsResponse adjustLoanTransaction(final String loanExternalId, final Long transactionId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction2(loanExternalId, transactionId, - request, "adjust")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByLoanExternalId(loanExternalId, + transactionId, request, "adjust")); } public PostLoansLoanIdTransactionsResponse adjustLoanTransaction(final String loanExternalId, final String transactionExternalId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction3(loanExternalId, - transactionExternalId, request, "adjust")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions + .adjustLoanTransactionByLoanAndTransactionExternalId(loanExternalId, transactionExternalId, request, "adjust")); } public PostLoansLoanIdTransactionsResponse adjustLoanTransaction(final Long loanId, final String transactionExternalId, final PostLoansLoanIdTransactionsTransactionIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransaction1(loanId, transactionExternalId, - request, "adjust")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.adjustLoanTransactionByTransactionExternalId(loanId, + transactionExternalId, request, "adjust")); } public PostLoansLoanIdTransactionsResponse adjustLoanTransaction(final Long loanId, final Long transactionId, @@ -1393,7 +1396,8 @@ public PostLoansLoanIdChargesResponse addLoanCharge(final Long loanId, final Pos } public PostLoansLoanIdChargesResponse addLoanCharge(final String loanExternalId, final PostLoansLoanIdChargesRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanCharge1(loanExternalId, request, "")); + return Calls + .ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanChargeByLoanExternalId(loanExternalId, request, "")); } // TODO: Rewrite to use fineract-client instead! @@ -1473,18 +1477,20 @@ public PutLoansLoanIdChargesChargeIdResponse updateLoanCharge(final Long loanId, public PutLoansLoanIdChargesChargeIdResponse updateLoanCharge(final Long loanId, final String loanChargeExternalId, final PutLoansLoanIdChargesChargeIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.updateLoanCharge1(loanId, loanChargeExternalId, request)); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.updateLoanChargeByChargeExternalId(loanId, + loanChargeExternalId, request)); } public PutLoansLoanIdChargesChargeIdResponse updateLoanCharge(final String loanExternalId, final Long loanChargeId, final PutLoansLoanIdChargesChargeIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.updateLoanCharge2(loanExternalId, loanChargeId, request)); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.updateLoanChargeByLoanExternalId(loanExternalId, loanChargeId, + request)); } public PutLoansLoanIdChargesChargeIdResponse updateLoanCharge(final String loanExternalId, final String loanChargeExternalId, final PutLoansLoanIdChargesChargeIdRequest request) { - return Calls - .ok(FineractClientHelper.getFineractClient().loanCharges.updateLoanCharge3(loanExternalId, loanChargeExternalId, request)); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.updateLoanChargeByLoanAndChargeExternalId(loanExternalId, + loanChargeExternalId, request)); } public DeleteLoansLoanIdChargesChargeIdResponse deleteLoanCharge(final Long loanId, final Long loanChargeId) { @@ -1492,15 +1498,18 @@ public DeleteLoansLoanIdChargesChargeIdResponse deleteLoanCharge(final Long loan } public DeleteLoansLoanIdChargesChargeIdResponse deleteLoanCharge(final Long loanId, final String loanChargeExternalId) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.deleteLoanCharge1(loanId, loanChargeExternalId)); + return Calls + .ok(FineractClientHelper.getFineractClient().loanCharges.deleteLoanChargeByChargeExternalId(loanId, loanChargeExternalId)); } public DeleteLoansLoanIdChargesChargeIdResponse deleteLoanCharge(final String loanExternalId, final Long loanChargeId) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.deleteLoanCharge2(loanExternalId, loanChargeId)); + return Calls + .ok(FineractClientHelper.getFineractClient().loanCharges.deleteLoanChargeByLoanExternalId(loanExternalId, loanChargeId)); } public DeleteLoansLoanIdChargesChargeIdResponse deleteLoanCharge(final String loanExternalId, final String loanChargeExternalId) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.deleteLoanCharge3(loanExternalId, loanChargeExternalId)); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.deleteLoanChargeByLoanAndChargeExternalId(loanExternalId, + loanChargeExternalId)); } // TODO: Rewrite to use fineract-client instead! @@ -1553,13 +1562,14 @@ public HashMap undoWaiveChargesForLoan(final Integer loanId, final Integer trans public PostLoansLoanIdChargesChargeIdResponse chargeAdjustment(final Long loanId, final Long chargeId, final PostLoansLoanIdChargesChargeIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanCharge2(loanId, chargeId, request, "adjustment")); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanChargeOnExistingCharge(loanId, chargeId, request, + "adjustment")); } public PostLoansLoanIdChargesChargeIdResponse chargeAdjustment(final String loanExternalId, final String loanChargeExternalId, final PostLoansLoanIdChargesChargeIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanCharge5(loanExternalId, loanChargeExternalId, - request, "adjustment")); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanChargeByLoanAndChargeExternalId(loanExternalId, + loanChargeExternalId, request, "adjustment")); } // TODO: Rewrite to use fineract-client instead! @@ -1588,19 +1598,20 @@ public Integer payChargesForLoan(final Integer loanId, final Integer loanchargeI public PostLoansLoanIdChargesChargeIdResponse payLoanCharge(final Long loanId, final Long loanChargeId, final PostLoansLoanIdChargesChargeIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanCharge2(loanId, loanChargeId, request, "pay")); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanChargeOnExistingCharge(loanId, loanChargeId, + request, "pay")); } public PostLoansLoanIdChargesChargeIdResponse payLoanCharge(final String loanExternalId, final Long loanChargeId, final PostLoansLoanIdChargesChargeIdRequest request) { - return Calls - .ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanCharge4(loanExternalId, loanChargeId, request, "pay")); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges + .executeLoanChargeByLoanExternalIdOnExistingCharge(loanExternalId, loanChargeId, request, "pay")); } public PostLoansLoanIdChargesChargeIdResponse payLoanCharge(final String loanExternalId, final String loanChargeExternalId, final PostLoansLoanIdChargesChargeIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanCharge5(loanExternalId, loanChargeExternalId, - request, "pay")); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.executeLoanChargeByLoanAndChargeExternalId(loanExternalId, + loanChargeExternalId, request, "pay")); } // TODO: Rewrite to use fineract-client instead! @@ -1629,15 +1640,18 @@ public GetLoansLoanIdChargesChargeIdResponse getLoanCharge(final Long loanId, fi } public GetLoansLoanIdChargesChargeIdResponse getLoanCharge(final String loanExternalId, final Long loanChargeId) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.retrieveLoanCharge2(loanExternalId, loanChargeId)); + return Calls + .ok(FineractClientHelper.getFineractClient().loanCharges.retrieveLoanChargeByLoanExternalId(loanExternalId, loanChargeId)); } public GetLoansLoanIdChargesChargeIdResponse getLoanCharge(final Long loanId, final String loanChargeExternalId) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.retrieveLoanCharge1(loanId, loanChargeExternalId)); + return Calls.ok( + FineractClientHelper.getFineractClient().loanCharges.retrieveLoanChargeByChargeExternalId(loanId, loanChargeExternalId)); } public GetLoansLoanIdChargesChargeIdResponse getLoanCharge(final String loanExternalId, final String loanChargeExternalId) { - return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.retrieveLoanCharge3(loanExternalId, loanChargeExternalId)); + return Calls.ok(FineractClientHelper.getFineractClient().loanCharges.retrieveLoanChargeByLoanAndChargeExternalId(loanExternalId, + loanChargeExternalId)); } // TODO: Rewrite to use fineract-client instead! @@ -1677,7 +1691,7 @@ public GetLoansLoanIdResponse getLoanDetails(final Long loanId) { } public GetLoansLoanIdResponse getLoanDetails(final String loanExternalId) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.retrieveLoan1(loanExternalId, false, "all", null, null)); + return Calls.ok(FineractClientHelper.getFineractClient().loans.retrieveLoanByExternalId(loanExternalId, false, "all", null, null)); } public GetLoansLoanIdTransactionsResponse getLoanTransactions(final Long loanId) { @@ -1730,8 +1744,8 @@ public PostLoansLoanIdTransactionsResponse createManualInterestRefund(Long loanI // org.apache.fineract.client.models.PostLoansLoanIdRequest) public GetLoansResponse retrieveAllLoans(final String accountNumber, final String associations, final Long clientId) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.retrieveAll27(null, 0, 10, null, null, accountNumber, associations, - clientId, null)); + return Calls.ok(FineractClientHelper.getFineractClient().loans.retrieveAllLoans(null, 0, 10, null, null, accountNumber, + associations, clientId, null)); } @Deprecated(forRemoval = true) @@ -2916,20 +2930,20 @@ public GetLoansLoanIdTransactionsTemplateResponse retrieveTransactionTemplate(Lo public GetLoansLoanIdTransactionsTemplateResponse retrieveTransactionTemplate(String loanExternalIdStr, String command, String dateFormat, String transactionDate, String locale) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.retrieveTransactionTemplate1(loanExternalIdStr, command, - dateFormat, transactionDate, locale, null)); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions + .retrieveTransactionTemplateByLoanExternalId(loanExternalIdStr, command, dateFormat, transactionDate, locale, null)); } public GetLoansApprovalTemplateResponse getLoanApprovalTemplate(String loanExternalIdStr) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.retrieveApprovalTemplate1(loanExternalIdStr, "approval")); + return Calls.ok(FineractClientHelper.getFineractClient().loans.retrieveApprovalTemplateByExternalId(loanExternalIdStr, "approval")); } public DeleteLoansLoanIdResponse deleteLoanApplication(String loanExternalId) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.deleteLoanApplication1(loanExternalId)); + return Calls.ok(FineractClientHelper.getFineractClient().loans.deleteLoanApplicationByExternalId(loanExternalId)); } public List getLoanDelinquencyTags(String loanExternalId) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.getDelinquencyTagHistory1(loanExternalId)); + return Calls.ok(FineractClientHelper.getFineractClient().loans.getDelinquencyTagHistoryByExternalId(loanExternalId)); } public PostLoansResponse applyLoan(PostLoansRequest request) { @@ -2943,7 +2957,7 @@ public void applyLoanWithError(PostLoansRequest request, Integer httpStatus) { } public PostLoansLoanIdResponse approveLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "approve")); + return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, "approve")); } public PostLoansLoanIdResponse approveLoan(Long loanId, PostLoansLoanIdRequest request) { @@ -2951,7 +2965,7 @@ public PostLoansLoanIdResponse approveLoan(Long loanId, PostLoansLoanIdRequest r } public PostLoansLoanIdResponse rejectLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "reject")); + return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, "reject")); } public PostLoansLoanIdResponse rejectLoan(Long loanId, PostLoansLoanIdRequest request) { @@ -2959,11 +2973,12 @@ public PostLoansLoanIdResponse rejectLoan(Long loanId, PostLoansLoanIdRequest re } public PostLoansLoanIdResponse withdrawnByApplicantLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "withdrawnByApplicant")); + return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, + "withdrawnByApplicant")); } public PostLoansLoanIdResponse disburseLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "disburse")); + return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, "disburse")); } public PostLoansLoanIdResponse disburseLoan(Long loanId, PostLoansLoanIdRequest request) { @@ -2991,15 +3006,18 @@ public PostLoansLoanIdResponse disburseLoan(Long loanId, String date, Double amo } public PostLoansLoanIdResponse disburseToSavingsLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "disburseToSavings")); + return Calls.ok( + FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, "disburseToSavings")); } public PostLoansLoanIdResponse undoApprovalLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "undoapproval")); + return Calls + .ok(FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, "undoapproval")); } public PostLoansLoanIdResponse undoDisbursalLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "undodisbursal")); + return Calls + .ok(FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, "undodisbursal")); } public PostLoansLoanIdResponse undoDisbursalLoan(Long loanId, PostLoansLoanIdRequest request) { @@ -3007,7 +3025,8 @@ public PostLoansLoanIdResponse undoDisbursalLoan(Long loanId, PostLoansLoanIdReq } public PostLoansLoanIdResponse undoLastDisbursalLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "undolastdisbursal")); + return Calls.ok( + FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, "undolastdisbursal")); } public PostLoansLoanIdResponse undoLastDisbursalLoan(Long loanId, PostLoansLoanIdRequest request) { @@ -3015,24 +3034,28 @@ public PostLoansLoanIdResponse undoLastDisbursalLoan(Long loanId, PostLoansLoanI } public PostLoansLoanIdResponse assignLoanOfficerLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "assignloanofficer")); + return Calls.ok( + FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, "assignloanofficer")); } public PostLoansLoanIdResponse unassignLoanOfficerLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "unassignloanofficer")); + return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, + "unassignloanofficer")); } public PostLoansLoanIdResponse recoverGuaranteesLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "recoverGuarantees")); + return Calls.ok( + FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, "recoverGuarantees")); } public PostLoansLoanIdResponse assignDelinquencyLoan(String loanExternalId, PostLoansLoanIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loans.stateTransitions1(loanExternalId, request, "assigndelinquency")); + return Calls.ok( + FineractClientHelper.getFineractClient().loans.stateTransitionsByExternalId(loanExternalId, request, "assigndelinquency")); } public PostLoansLoanIdTransactionsResponse closeRescheduledLoan(String loanExternalId, PostLoansLoanIdTransactionsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, - "close-rescheduled")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "close-rescheduled")); } public PostLoansLoanIdTransactionsResponse closeRescheduledLoan(Long loanId, PostLoansLoanIdTransactionsRequest request) { @@ -3041,8 +3064,8 @@ public PostLoansLoanIdTransactionsResponse closeRescheduledLoan(Long loanId, Pos } public PostLoansLoanIdTransactionsResponse closeLoan(String loanExternalId, PostLoansLoanIdTransactionsRequest request) { - return Calls - .ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, "close")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "close")); } public PostLoansLoanIdTransactionsResponse closeLoan(Long loanId, PostLoansLoanIdTransactionsRequest request) { @@ -3050,8 +3073,8 @@ public PostLoansLoanIdTransactionsResponse closeLoan(Long loanId, PostLoansLoanI } public PostLoansLoanIdTransactionsResponse forecloseLoan(String loanExternalId, PostLoansLoanIdTransactionsRequest request) { - return Calls.ok( - FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, "foreclosure")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "foreclosure")); } public PostLoansLoanIdTransactionsResponse forecloseLoan(Long loanId, PostLoansLoanIdTransactionsRequest request) { @@ -3059,8 +3082,8 @@ public PostLoansLoanIdTransactionsResponse forecloseLoan(Long loanId, PostLoansL } public PostLoansLoanIdTransactionsResponse chargeOffLoan(String loanExternalId, PostLoansLoanIdTransactionsRequest request) { - return Calls.ok( - FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, "charge-off")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "charge-off")); } public PostLoansLoanIdTransactionsResponse chargeOffLoan(Long loanId, PostLoansLoanIdTransactionsRequest request) { @@ -3068,8 +3091,8 @@ public PostLoansLoanIdTransactionsResponse chargeOffLoan(Long loanId, PostLoansL } public PostLoansLoanIdTransactionsResponse undoChargeOffLoan(String loanExternalId, PostLoansLoanIdTransactionsRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, - "undo-charge-off")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "undo-charge-off")); } public PostLoansLoanIdTransactionsResponse undoChargeOffLoan(Long loanId, PostLoansLoanIdTransactionsRequest request) { @@ -3111,8 +3134,8 @@ public PostLoanProductsResponse createLoanProduct(PostLoanProductsRequest reques } public PostLoansLoanIdTransactionsResponse makeLoanDownPayment(String loanExternalId, PostLoansLoanIdTransactionsRequest request) { - return Calls.ok( - FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, "downPayment")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "downPayment")); } public PostLoansLoanIdTransactionsResponse makeLoanDownPayment(Long loanId, PostLoansLoanIdTransactionsRequest request) { @@ -3144,8 +3167,8 @@ public Object disburseLoanWithTransactionAmountWithError(final String date, fina public PostLoansLoanIdTransactionsResponse writeOffLoanAccount(final String loanExternalId, final PostLoansLoanIdTransactionsRequest request) { - return Calls - .ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction1(loanExternalId, request, "writeoff")); + return Calls.ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransactionByLoanExternalId(loanExternalId, + request, "writeoff")); } // TODO: Rewrite to use fineract-client instead! diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java index 9431c96b2e8..515c4c9f527 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java @@ -379,7 +379,7 @@ public HashMap closeSavingsAccount(final Integer savingsID, String withdrawBalan } public PostSavingsAccountsAccountIdResponse closeSavingsAccount(final Long savingsId, PostSavingsAccountsAccountIdRequest request) { - return Calls.ok(FineractClientHelper.getFineractClient().savingsAccounts.handleCommands6(savingsId, request, "close")); + return Calls.ok(FineractClientHelper.getFineractClient().savingsAccounts.handleCommandsSavingsAccount(savingsId, request, "close")); } // TODO: Rewrite to use fineract-client instead! @@ -432,18 +432,20 @@ public Object withdrawalFromSavingsAccount(final Integer savingsId, final String public Response withdrawalFromSavingsAccount(final Long savingsId, PostSavingsAccountTransactionsRequest request) { - return Calls.executeU(FineractClientHelper.getFineractClient().savingsTransactions.transaction2(savingsId, request, "withdrawal")); + return Calls.executeU(FineractClientHelper.getFineractClient().savingsTransactions.createSavingsAccountTransaction(savingsId, + request, "withdrawal")); } public Response forceWithdrawalFromSavingsAccount(final Long savingsId, PostSavingsAccountTransactionsRequest request) { - return Calls.executeU( - FineractClientHelper.getFineractClient().savingsTransactions.transaction2(savingsId, request, "force-withdrawal")); + return Calls.executeU(FineractClientHelper.getFineractClient().savingsTransactions.createSavingsAccountTransaction(savingsId, + request, "force-withdrawal")); } public Response depositIntoSavingsAccount(final Long savingsId, PostSavingsAccountTransactionsRequest request) { - return Calls.executeU(FineractClientHelper.getFineractClient().savingsTransactions.transaction2(savingsId, request, "deposit")); + return Calls.executeU(FineractClientHelper.getFineractClient().savingsTransactions.createSavingsAccountTransaction(savingsId, + request, "deposit")); } // TODO: Rewrite to use fineract-client instead! @@ -1075,8 +1077,8 @@ public SavingsAccountTransactionsSearchResponse searchSavingsTransactions(Intege } public Map querySavingsTransactions(Integer savingsId, PagedLocalRequestAdvancedQueryRequest request) { - String response = Calls - .ok(FineractClientHelper.getFineractClient().savingsTransactions.advancedQuery1(savingsId.longValue(), request)); + String response = Calls.ok(FineractClientHelper.getFineractClient().savingsTransactions + .advancedQuerySavingsAccountTransactions(savingsId.longValue(), request)); return JsonPath.from(response).get(""); } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/savings/SavingsTestLifecycleExtension.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/savings/SavingsTestLifecycleExtension.java index 11bd89e288f..f24e62bb5af 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/savings/SavingsTestLifecycleExtension.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/savings/SavingsTestLifecycleExtension.java @@ -64,8 +64,8 @@ public void afterAll(ExtensionContext context) { savingsIds.forEach(savingsId -> { try { this.savingsAccountHelper.postInterestForSavings(savingsId.intValue()); - SavingsAccountData savingsAccountData = Calls - .ok(FineractClientHelper.getFineractClient().savingsAccounts.retrieveOne26(savingsId, false, null, "all")); + SavingsAccountData savingsAccountData = Calls.ok( + FineractClientHelper.getFineractClient().savingsAccounts.retrieveSavingsAccount(savingsId, false, null, "all")); BigDecimal accountBalance = MathUtil.subtract(savingsAccountData.getSummary().getAvailableBalance(), savingsAccountData.getMinRequiredBalance(), MathContext.DECIMAL64); if (accountBalance.compareTo(BigDecimal.ZERO) > 0) { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanproduct/WorkingCapitalLoanProductHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanproduct/WorkingCapitalLoanProductHelper.java index 139a65fb9ed..74bf6e9517b 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanproduct/WorkingCapitalLoanProductHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanproduct/WorkingCapitalLoanProductHelper.java @@ -41,12 +41,12 @@ public PostWorkingCapitalLoanProductsResponse createWorkingCapitalLoanProduct(fi public GetWorkingCapitalLoanProductsProductIdResponse retrieveWorkingCapitalLoanProductByExternalId(final String externalId) { return FeignCalls.ok(() -> FineractFeignClientHelper.getFineractFeignClient().workingCapitalLoanProducts() - .retrieveWorkingCapitalLoanProductDetailsByExternalId(externalId)); + .retrieveOneWorkingCapitalLoanProductByExternalId(externalId)); } public GetWorkingCapitalLoanProductsProductIdResponse retrieveWorkingCapitalLoanProductById(final Long productId) { return FeignCalls.ok(() -> FineractFeignClientHelper.getFineractFeignClient().workingCapitalLoanProducts() - .retrieveWorkingCapitalLoanProductDetails(productId)); + .retrieveOneWorkingCapitalLoanProduct(productId)); } public List retrieveAllWorkingCapitalLoanProducts() { @@ -56,7 +56,7 @@ public List retrieveAllWorkingCapitalLoan public GetWorkingCapitalLoanProductsTemplateResponse retrieveTemplate() { return FeignCalls.ok(() -> FineractFeignClientHelper.getFineractFeignClient().workingCapitalLoanProducts() - .retrieveWorkingCapitalLoanProductTemplate()); + .retrieveTemplateWorkingCapitalLoanProduct()); } public PutWorkingCapitalLoanProductsProductIdResponse updateWorkingCapitalLoanProductByExternalId(final String externalId, diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/savings/AccountTransferWithdrawalFeeTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/savings/AccountTransferWithdrawalFeeTest.java index 4e496521bcf..105af2599b3 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/savings/AccountTransferWithdrawalFeeTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/savings/AccountTransferWithdrawalFeeTest.java @@ -87,19 +87,21 @@ public void testFromSavingsToSavingsAccountTransferWithWithdrawalFee() { // Perform transfer - without null-checks in SavingsAccount.payWithdrawalFee(), // this would trigger NPE because paymentDetail is null during account transfers - ok(fineractClient().accountTransfers.create4(new AccountTransferRequest().fromClientId(String.valueOf(fromClientId)) + ok(fineractClient().accountTransfers.createAccountTransfer(new AccountTransferRequest().fromClientId(String.valueOf(fromClientId)) .fromAccountId(String.valueOf(fromSavingsId)).fromAccountType("2").fromOfficeId("1").toClientId(String.valueOf(toClientId)) .toAccountId(String.valueOf(toSavingsId)).toAccountType("2").toOfficeId("1").transferDate(TRANSFER_DATE) .transferAmount(ACCOUNT_TRANSFER_AMOUNT).transferDescription("Transfer").dateFormat(DATETIME_PATTERN).locale("en_GB"))); // Verify balances: charge has no payment type binding, so it applies as normal withdrawal fee // from = 30000 - 15000 (transfer) - 100 (withdrawal fee) = 14900 - SavingsAccountData fromSavingsAccount = ok(fineractClient().savingsAccounts.retrieveOne26(fromSavingsId, false, null, "summary")); + SavingsAccountData fromSavingsAccount = ok( + fineractClient().savingsAccounts.retrieveSavingsAccount(fromSavingsId, false, null, "summary")); Assertions.assertEquals(BigDecimal.valueOf(14900).setScale(0), fromSavingsAccount.getSummary().getAccountBalance().setScale(0), "Verifying From Savings Account Balance after Account Transfer with Withdrawal Fee"); // to = 0 + 15000 (transfer) = 15000 - SavingsAccountData toSavingsAccount = ok(fineractClient().savingsAccounts.retrieveOne26(toSavingsId, false, null, "summary")); + SavingsAccountData toSavingsAccount = ok( + fineractClient().savingsAccounts.retrieveSavingsAccount(toSavingsId, false, null, "summary")); Assertions.assertEquals(BigDecimal.valueOf(15000).setScale(0), toSavingsAccount.getSummary().getAccountBalance().setScale(0), "Verifying To Savings Account Balance after Account Transfer"); } @@ -155,7 +157,7 @@ public void testFromSavingsToSavingsAccountTransferWithPaymentTypeWithdrawalFee( // Perform transfer - without null-checks in SavingsAccount.payWithdrawalFee(), // this throws NPE because paymentDetail is null and code tries to call // paymentDetail.getPaymentType().getName() - ok(fineractClient().accountTransfers.create4(new AccountTransferRequest().fromClientId(String.valueOf(fromClientId)) + ok(fineractClient().accountTransfers.createAccountTransfer(new AccountTransferRequest().fromClientId(String.valueOf(fromClientId)) .fromAccountId(String.valueOf(fromSavingsId)).fromAccountType("2").fromOfficeId("1").toClientId(String.valueOf(toClientId)) .toAccountId(String.valueOf(toSavingsId)).toAccountType("2").toOfficeId("1").transferDate(TRANSFER_DATE) .transferAmount(ACCOUNT_TRANSFER_AMOUNT).transferDescription("Transfer").dateFormat(DATETIME_PATTERN).locale("en_GB"))); @@ -163,12 +165,14 @@ public void testFromSavingsToSavingsAccountTransferWithPaymentTypeWithdrawalFee( // The payment-type fee is not applied because paymentDetail is null during transfer // and the null-check skips the payment type matching // from = 30000 - 15000 = 15000 - SavingsAccountData fromSavingsAccount = ok(fineractClient().savingsAccounts.retrieveOne26(fromSavingsId, false, null, "summary")); + SavingsAccountData fromSavingsAccount = ok( + fineractClient().savingsAccounts.retrieveSavingsAccount(fromSavingsId, false, null, "summary")); Assertions.assertEquals(BigDecimal.valueOf(15000).setScale(0), fromSavingsAccount.getSummary().getAccountBalance().setScale(0), "Verifying From Savings Account Balance after Account Transfer with Payment Type Withdrawal Fee"); // to = 0 + 15000 = 15000 - SavingsAccountData toSavingsAccount = ok(fineractClient().savingsAccounts.retrieveOne26(toSavingsId, false, null, "summary")); + SavingsAccountData toSavingsAccount = ok( + fineractClient().savingsAccounts.retrieveSavingsAccount(toSavingsId, false, null, "summary")); Assertions.assertEquals(BigDecimal.valueOf(15000).setScale(0), toSavingsAccount.getSummary().getAccountBalance().setScale(0), "Verifying To Savings Account Balance after Account Transfer"); } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/savings/base/BaseSavingsIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/savings/base/BaseSavingsIntegrationTest.java index b9e0bf0327f..fb967b5fefc 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/savings/base/BaseSavingsIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/savings/base/BaseSavingsIntegrationTest.java @@ -130,7 +130,7 @@ protected PostSavingsProductsRequest dailyInterestPostingProduct() { } protected PostSavingsProductsResponse createProduct(PostSavingsProductsRequest productsRequest) { - return ok(fineractClient().savingsProducts.create14(productsRequest)); + return ok(fineractClient().savingsProducts.createSavingsProduct(productsRequest)); } protected PostSavingsAccountsRequest applySavingsRequest(Long clientId, Long productId, String submittedDate) { @@ -139,19 +139,19 @@ protected PostSavingsAccountsRequest applySavingsRequest(Long clientId, Long pro } protected PostSavingsAccountsResponse applySavingsAccount(PostSavingsAccountsRequest request) { - return ok(fineractClient().savingsAccounts.submitApplication2(request)); + return ok(fineractClient().savingsAccounts.submitSavingsApplication(request)); } protected PostSavingsAccountsAccountIdResponse approveSavingsAccount(Long savingsId, String date) { PostSavingsAccountsAccountIdRequest request = new PostSavingsAccountsAccountIdRequest().dateFormat(DATETIME_PATTERN).locale("en") .approvedOnDate(date); - return ok(fineractClient().savingsAccounts.handleCommands6(savingsId, request, "approve")); + return ok(fineractClient().savingsAccounts.handleCommandsSavingsAccount(savingsId, request, "approve")); } protected PostSavingsAccountsAccountIdResponse activateSavingsAccount(Long savingsId, String date) { PostSavingsAccountsAccountIdRequest request = new PostSavingsAccountsAccountIdRequest().dateFormat(DATETIME_PATTERN).locale("en") .activatedOnDate(date); - return ok(fineractClient().savingsAccounts.handleCommands6(savingsId, request, "activate")); + return ok(fineractClient().savingsAccounts.handleCommandsSavingsAccount(savingsId, request, "activate")); } protected PostSavingsAccountTransactionsResponse deposit(Long savingsId, String date, BigDecimal amount) { @@ -160,15 +160,15 @@ protected PostSavingsAccountTransactionsResponse deposit(Long savingsId, String .locale("en") // .paymentTypeId(1).transactionAmount(amount) // .transactionDate(date); // - return ok(fineractClient().savingsTransactions.transaction2(savingsId, request, "deposit")); + return ok(fineractClient().savingsTransactions.createSavingsAccountTransaction(savingsId, request, "deposit")); } protected SavingsAccountData getSavingsAccount(Long savingsId) { - return ok(fineractClient().savingsAccounts.retrieveOne26(savingsId, false, null, "transactions")); + return ok(fineractClient().savingsAccounts.retrieveSavingsAccount(savingsId, false, null, "transactions")); } protected List getTransactions(Long savingsId) { - return ok(fineractClient().savingsAccounts.retrieveOne26(savingsId, false, null, "transactions")).getTransactions(); + return ok(fineractClient().savingsAccounts.retrieveSavingsAccount(savingsId, false, null, "transactions")).getTransactions(); } protected void verifyNoTransactions(Long savingsId) { @@ -176,7 +176,8 @@ protected void verifyNoTransactions(Long savingsId) { } protected void verifyTransactions(Long savingsId, Transaction... transactions) { - SavingsAccountData savingsDetails = ok(fineractClient().savingsAccounts.retrieveOne26(savingsId, false, null, "transactions")); + SavingsAccountData savingsDetails = ok( + fineractClient().savingsAccounts.retrieveSavingsAccount(savingsId, false, null, "transactions")); if (transactions == null || transactions.length == 0) { Assertions.assertTrue(savingsDetails.getTransactions().isEmpty(), "No transaction is expected on savings account " + savingsId); } else {