diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java index 0d3e71078..fbd460cc5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java @@ -119,6 +119,10 @@ public class CommandStrategyProvider { "getTransactionByIdCommandStrategy"); commandStrategies.put(CommandContext.resource("datatables\\/[a-zA-Z0-9_]*\\/\\d+").method("GET").build(), "getDatatableEntryByAppTableIdCommandStrategy"); + commandStrategies.put(CommandContext.resource("datatables\\/[a-zA-Z0-9_]*\\/\\d+").method("POST").build(), + "createDatatableEntryCommandStrategy"); + commandStrategies.put(CommandContext.resource("datatables\\/[a-zA-Z0-9_]*\\/\\d+\\/\\d+").method("PUT").build(), + "updateDatatableEntryOneToManyCommandStrategy"); commandStrategies.put( CommandContext.resource("datatables\\/[a-zA-Z0-9_]*\\/\\d+(\\?(\\w+(?:\\=[\\w,]+|&)+)+)").method("GET").build(), "getDatatableEntryByAppTableIdCommandStrategy"); diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateDatatableEntryCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateDatatableEntryCommandStrategy.java new file mode 100644 index 000000000..e757c073d --- /dev/null +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateDatatableEntryCommandStrategy.java @@ -0,0 +1,71 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.batch.command.internal; + +import com.google.common.base.Splitter; +import java.util.List; +import javax.ws.rs.core.UriInfo; +import lombok.RequiredArgsConstructor; +import org.apache.fineract.batch.command.CommandStrategy; +import org.apache.fineract.batch.domain.BatchRequest; +import org.apache.fineract.batch.domain.BatchResponse; +import org.apache.fineract.infrastructure.dataqueries.api.DatatablesApiResource; +import org.springframework.stereotype.Component; + +/** + * Implements {@link CommandStrategy} and creates a new datatable entry for a given loan. It passes the contents of the + * body from the BatchRequest to {@link DatatablesApiResource} and gets back the response. This class will also catch + * any errors raised by {@link DatatablesApiResource} and map those errors to appropriate status codes in BatchResponse. + * + * @see CommandStrategy + * @see BatchRequest + * @see BatchResponse + */ +@Component +@RequiredArgsConstructor +public class CreateDatatableEntryCommandStrategy implements CommandStrategy { + + private final DatatablesApiResource datatablesApiResource; + + @Override + public BatchResponse execute(BatchRequest request, @SuppressWarnings("unused") UriInfo uriInfo) { + + final BatchResponse response = new BatchResponse(); + final String responseBody; + + response.setRequestId(request.getRequestId()); + response.setHeaders(request.getHeaders()); + + final List pathParameters = Splitter.on('/').splitToList(request.getRelativeUrl()); + // Pluck out the datatable name & loanId out of the relative path + final String datatableName = pathParameters.get(1); + final Long loanId = Long.parseLong(pathParameters.get(2)); + + // Calls 'createDatatableEntry' function from + // 'DatatablesApiResource' to create a datatable entry on an existing loan + responseBody = datatablesApiResource.createDatatableEntry(datatableName, loanId, request.getBody()); + + response.setStatusCode(200); + // Sets the body of the response after datatable entry is successfully + // created + response.setBody(responseBody); + + return response; + } +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/UpdateDatatableEntryOneToManyCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/UpdateDatatableEntryOneToManyCommandStrategy.java new file mode 100644 index 000000000..3d4a45657 --- /dev/null +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/UpdateDatatableEntryOneToManyCommandStrategy.java @@ -0,0 +1,72 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.batch.command.internal; + +import com.google.common.base.Splitter; +import java.util.List; +import javax.ws.rs.core.UriInfo; +import lombok.RequiredArgsConstructor; +import org.apache.fineract.batch.command.CommandStrategy; +import org.apache.fineract.batch.domain.BatchRequest; +import org.apache.fineract.batch.domain.BatchResponse; +import org.apache.fineract.infrastructure.dataqueries.api.DatatablesApiResource; +import org.springframework.stereotype.Component; + +/** + * Implements {@link CommandStrategy} and updates a datatable entry for a given loan. It passes the contents of the body + * from the BatchRequest to {@link DatatablesApiResource} and gets back the response. This class will also catch any + * errors raised by {@link DatatablesApiResource} and map those errors to appropriate status codes in BatchResponse. + * + * @see CommandStrategy + * @see BatchRequest + * @see BatchResponse + */ +@Component +@RequiredArgsConstructor +public class UpdateDatatableEntryOneToManyCommandStrategy implements CommandStrategy { + + private final DatatablesApiResource datatablesApiResource; + + @Override + public BatchResponse execute(BatchRequest request, @SuppressWarnings("unused") UriInfo uriInfo) { + + final BatchResponse response = new BatchResponse(); + final String responseBody; + + response.setRequestId(request.getRequestId()); + response.setHeaders(request.getHeaders()); + + final List pathParameters = Splitter.on('/').splitToList(request.getRelativeUrl()); + // Pluck out the datatable name, loanId & datatable entry id out of the relative path + final String datatableName = pathParameters.get(1); + final Long loanId = Long.parseLong(pathParameters.get(2)); + final Long datatableEntryId = Long.parseLong(pathParameters.get(3)); + + // Calls 'updateDatatableEntryOneToMany' function from + // 'DatatablesApiResource' to update a datatable entry on an existing loan in a one-many relationship + responseBody = datatablesApiResource.updateDatatableEntryOneToMany(datatableName, loanId, datatableEntryId, request.getBody()); + + response.setStatusCode(200); + // Sets the body of the response after datatable entry is successfully + // updated + response.setBody(responseBody); + + return response; + } +} diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/CommandStrategyProviderTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/CommandStrategyProviderTest.java index 1fa216a46..9579cf9ae 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/CommandStrategyProviderTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/CommandStrategyProviderTest.java @@ -33,6 +33,7 @@ import org.apache.fineract.batch.command.internal.ApproveLoanRescheduleCommandSt import org.apache.fineract.batch.command.internal.CollectChargesCommandStrategy; import org.apache.fineract.batch.command.internal.CreateChargeCommandStrategy; import org.apache.fineract.batch.command.internal.CreateClientCommandStrategy; +import org.apache.fineract.batch.command.internal.CreateDatatableEntryCommandStrategy; import org.apache.fineract.batch.command.internal.CreateLoanRescheduleRequestCommandStrategy; import org.apache.fineract.batch.command.internal.CreateTransactionLoanCommandStrategy; import org.apache.fineract.batch.command.internal.DisburseLoanCommandStrategy; @@ -42,6 +43,7 @@ import org.apache.fineract.batch.command.internal.GetLoanByIdCommandStrategy; import org.apache.fineract.batch.command.internal.GetTransactionByIdCommandStrategy; import org.apache.fineract.batch.command.internal.UnknownCommandStrategy; import org.apache.fineract.batch.command.internal.UpdateClientCommandStrategy; +import org.apache.fineract.batch.command.internal.UpdateDatatableEntryOneToManyCommandStrategy; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -99,7 +101,11 @@ public class CommandStrategyProviderTest { Arguments.of("datatables/test_dt_table/123", HttpMethod.GET, "getDatatableEntryByAppTableIdCommandStrategy", mock(GetDatatableEntryByAppTableIdCommandStrategy.class)), Arguments.of("datatables/test_dt_table/123?genericResultSet=true", HttpMethod.GET, - "getDatatableEntryByAppTableIdCommandStrategy", mock(GetDatatableEntryByAppTableIdCommandStrategy.class))); + "getDatatableEntryByAppTableIdCommandStrategy", mock(GetDatatableEntryByAppTableIdCommandStrategy.class)), + Arguments.of("datatables/test_dt_table/123", HttpMethod.POST, "createDatatableEntryCommandStrategy", + mock(CreateDatatableEntryCommandStrategy.class)), + Arguments.of("datatables/test_dt_table/123/1", HttpMethod.PUT, "updateDatatableEntryOneToManyCommandStrategy", + mock(UpdateDatatableEntryOneToManyCommandStrategy.class))); } /** diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateDatatableEntryCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateDatatableEntryCommandStrategyTest.java new file mode 100644 index 000000000..ff63a7dda --- /dev/null +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateDatatableEntryCommandStrategyTest.java @@ -0,0 +1,104 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.batch.command.internal; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; + +import javax.ws.rs.HttpMethod; +import javax.ws.rs.core.UriInfo; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.fineract.batch.domain.BatchRequest; +import org.apache.fineract.batch.domain.BatchResponse; +import org.apache.fineract.infrastructure.dataqueries.api.DatatablesApiResource; +import org.apache.http.HttpStatus; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +public class CreateDatatableEntryCommandStrategyTest { + + /** + * Test {@link CreateDatatableEntryCommandStrategy#execute} happy path scenario. + */ + @Test + public void testExecuteSuccessScenario() { + // given + final TestContext testContext = new TestContext(); + + final Long loanId = Long.valueOf(RandomStringUtils.randomNumeric(4)); + final String datatableName = RandomStringUtils.randomAlphabetic(10); + final BatchRequest request = getBatchRequest(datatableName, loanId); + final String responseBody = "{\"resourceId\":193}"; + + given(testContext.datatablesApiResource.createDatatableEntry(eq(datatableName), eq(loanId), eq(request.getBody()))) + .willReturn(responseBody); + + // when + final BatchResponse response = testContext.subjectToTest.execute(request, testContext.uriInfo); + + // then + assertEquals(response.getStatusCode(), HttpStatus.SC_OK); + assertEquals(response.getRequestId(), request.getRequestId()); + assertEquals(response.getHeaders(), request.getHeaders()); + assertEquals(response.getBody(), responseBody); + } + + /** + * Creates and returns a create datatable entry request with the given loan id. + * + * @param datatableName + * the name of the datatable + * @param loanId + * the loan id + * @return BatchRequest + */ + private BatchRequest getBatchRequest(final String datatableName, final Long loanId) { + + final BatchRequest br = new BatchRequest(); + String relativeUrl = String.format("datatables/%s/%s", datatableName, loanId); + + br.setRequestId(Long.valueOf(RandomStringUtils.randomNumeric(5))); + br.setRelativeUrl(relativeUrl); + br.setMethod(HttpMethod.POST); + br.setBody("{\"locale\":\"en\",\"dateFormat\":\"dd MMMM yyyy\",\"enabled\":true,\"amount\":500.10}"); + + return br; + } + + /** + * Private test context class used since testng runs in parallel to avoid state between tests + */ + private static class TestContext { + + @Mock + private UriInfo uriInfo; + + @Mock + private DatatablesApiResource datatablesApiResource; + + private final CreateDatatableEntryCommandStrategy subjectToTest; + + TestContext() { + MockitoAnnotations.openMocks(this); + subjectToTest = new CreateDatatableEntryCommandStrategy(datatablesApiResource); + } + } +} diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/UpdateDatatableEntryOneToManyCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/UpdateDatatableEntryOneToManyCommandStrategyTest.java new file mode 100644 index 000000000..7300252f5 --- /dev/null +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/UpdateDatatableEntryOneToManyCommandStrategyTest.java @@ -0,0 +1,107 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.batch.command.internal; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; + +import javax.ws.rs.HttpMethod; +import javax.ws.rs.core.UriInfo; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.fineract.batch.domain.BatchRequest; +import org.apache.fineract.batch.domain.BatchResponse; +import org.apache.fineract.infrastructure.dataqueries.api.DatatablesApiResource; +import org.apache.http.HttpStatus; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +public class UpdateDatatableEntryOneToManyCommandStrategyTest { + + /** + * Test {@link UpdateDatatableEntryOneToManyCommandStrategy#execute} happy path scenario. + */ + @Test + public void testExecuteSuccessScenario() { + // given + final TestContext testContext = new TestContext(); + + final Long loanId = Long.valueOf(RandomStringUtils.randomNumeric(4)); + final Long datatableEntryId = Long.valueOf(RandomStringUtils.randomNumeric(3)); + final String datatableName = RandomStringUtils.randomAlphabetic(10); + final BatchRequest request = getBatchRequest(datatableName, loanId, datatableEntryId); + final String responseBody = "{\"resourceId\":193}"; + + given(testContext.datatablesApiResource.updateDatatableEntryOneToMany(eq(datatableName), eq(loanId), eq(datatableEntryId), + eq(request.getBody()))).willReturn(responseBody); + + // when + final BatchResponse response = testContext.subjectToTest.execute(request, testContext.uriInfo); + + // then + assertEquals(response.getStatusCode(), HttpStatus.SC_OK); + assertEquals(response.getRequestId(), request.getRequestId()); + assertEquals(response.getHeaders(), request.getHeaders()); + assertEquals(response.getBody(), responseBody); + } + + /** + * Creates and returns a create datatable entry request with the given loan id. + * + * @param datatableName + * the name of the datatable + * @param loanId + * the loan id + * @param datatableEntryId + * the datatable entry id + * @return BatchRequest + */ + private BatchRequest getBatchRequest(final String datatableName, final Long loanId, final Long datatableEntryId) { + + final BatchRequest br = new BatchRequest(); + String relativeUrl = String.format("datatables/%s/%s/%s", datatableName, loanId, datatableEntryId); + + br.setRequestId(Long.valueOf(RandomStringUtils.randomNumeric(5))); + br.setRelativeUrl(relativeUrl); + br.setMethod(HttpMethod.PUT); + br.setBody("{\"locale\":\"en\",\"dateFormat\":\"dd MMMM yyyy\",\"enabled\":true,\"amount\":500.10}"); + + return br; + } + + /** + * Private test context class used since testng runs in parallel to avoid state between tests + */ + private static class TestContext { + + @Mock + private UriInfo uriInfo; + + @Mock + private DatatablesApiResource datatablesApiResource; + + private final UpdateDatatableEntryOneToManyCommandStrategy subjectToTest; + + TestContext() { + MockitoAnnotations.openMocks(this); + subjectToTest = new UpdateDatatableEntryOneToManyCommandStrategy(datatablesApiResource); + } + } +} diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/BatchApiTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/BatchApiTest.java index c29d6371f..afb0505fe 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/BatchApiTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/BatchApiTest.java @@ -19,7 +19,9 @@ package org.apache.fineract.integrationtests; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -34,6 +36,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.commons.lang3.RandomStringUtils; import org.apache.fineract.batch.command.internal.AdjustTransactionCommandStrategy; import org.apache.fineract.batch.command.internal.CreateTransactionLoanCommandStrategy; @@ -1094,7 +1097,7 @@ public class BatchApiTest { // Get datatable batch request final BatchRequest getDatatableBatchRequest = BatchHelper.getDatatableByIdRequest(loanId, datatableName, - "genericResultSet=true"); + "genericResultSet=true", null); final List batchRequestsGetLoan = Arrays.asList(getLoanBatchRequest, getDatatableBatchRequest); @@ -1126,6 +1129,89 @@ public class BatchApiTest { } } + /** + * Test for the successful create and update datatable entry. A '200' status code is expected on successful + * responses. + * + * @see org.apache.fineract.batch.command.internal.CreateDatatableEntryCommandStrategy + * @see org.apache.fineract.batch.command.internal.UpdateDatatableEntryOneToManyCommandStrategy + * @see org.apache.fineract.batch.command.internal.GetDatatableEntryByAppTableIdCommandStrategy + */ + @Test + public void shouldReturnOkStatusOnSuccessfulCreateDataTableEntry() { + final FromJsonHelper jsonHelper = new FromJsonHelper(); + final Long loanId = jsonHelper.extractLongNamed("loanId", jsonHelper.parse(setupAccount()).getAsJsonObject()); + // creating datatable with m_loan association + final Map columnMap = new HashMap<>(); + final List> datatableColumnsList = new ArrayList<>(); + final String datatableName = Utils.randomNameGenerator(LOAN_APP_TABLE_NAME + "_", 5); + final String columnName1 = Utils.randomNameGenerator("COL1_", 5); + final String columnName2 = Utils.randomNameGenerator("COL2_", 5); + columnMap.put("datatableName", datatableName); + columnMap.put("apptableName", LOAN_APP_TABLE_NAME); + columnMap.put("entitySubType", "PERSON"); + columnMap.put("multiRow", true); + DatatableHelper.addDatatableColumns(datatableColumnsList, columnName1, "String", true, 10, null); + DatatableHelper.addDatatableColumns(datatableColumnsList, columnName2, "String", false, 10, null); + columnMap.put("columns", datatableColumnsList); + final String datatableRequestJsonString = new Gson().toJson(columnMap); + LOG.info("CreateDataTable map : {}", datatableRequestJsonString); + + this.datatableHelper.createDatatable(datatableRequestJsonString, ""); + + // Create a datatable entry so that it can be updated using BatchApi + final Map datatableEntryMap = new HashMap<>(); + datatableEntryMap.put(columnName1, Utils.randomNameGenerator("VAL1_", 3)); + datatableEntryMap.put(columnName2, Utils.randomNameGenerator("VAL2_", 3)); + final String datatableEntryRequestJsonString = new Gson().toJson(datatableEntryMap); + LOG.info("CreateDataTableEntry map : {}", datatableEntryRequestJsonString); + + final Map datatableEntryResponse = this.datatableHelper.createDatatableEntry(datatableName, loanId.intValue(), + false, datatableEntryRequestJsonString); + final Integer datatableEntryResourceId = (Integer) datatableEntryResponse.get("resourceId"); + assertNotNull(datatableEntryResourceId, "ERROR IN CREATING THE ENTITY DATATABLE RECORD"); + + // Create datatable entry batch request + final BatchRequest createDatatableEntryRequest = BatchHelper.createDatatableEntryRequest(loanId, datatableName, + Arrays.asList(columnName1, columnName2)); + + // Update datatable entry batch request + final BatchRequest updateDatatableEntryByEntryIdRequest = BatchHelper.updateDatatableEntryByEntryIdRequest(loanId, datatableName, + Long.valueOf(datatableEntryResourceId), Arrays.asList(columnName1)); + + // Get datatable entries batch request + final BatchRequest getDatatableEntriesRequest = BatchHelper.getDatatableByIdRequest(loanId, datatableName, null, + updateDatatableEntryByEntryIdRequest.getReference()); + + final List batchRequestsDatatableEntries = Arrays.asList(createDatatableEntryRequest, + updateDatatableEntryByEntryIdRequest, getDatatableEntriesRequest); + LOG.info("Batch Request : {}", BatchHelper.toJsonString(batchRequestsDatatableEntries)); + + final List responseDatatableBatch = BatchHelper.postBatchRequestsWithEnclosingTransaction(this.requestSpec, + this.responseSpec, BatchHelper.toJsonString(batchRequestsDatatableEntries)); + + LOG.info("Batch Response : {}", new Gson().toJson(responseDatatableBatch)); + + final BatchResponse batchResponse1 = responseDatatableBatch.get(0); + final BatchResponse batchResponse2 = responseDatatableBatch.get(1); + final BatchResponse batchResponse3 = responseDatatableBatch.get(2); + Assertions.assertEquals(HttpStatus.SC_OK, batchResponse1.getStatusCode(), "Verify Status Code 200 for create datatable entry"); + Assertions.assertEquals(HttpStatus.SC_OK, batchResponse2.getStatusCode(), "Verify Status Code 200 for update datatable entry"); + Assertions.assertEquals(HttpStatus.SC_OK, batchResponse3.getStatusCode(), "Verify Status Code 200 for get datatable entries"); + + final String getDatatableEntriesResponse = batchResponse3.getBody(); + + final Long createDatatableEntryId = jsonHelper.extractLongNamed("resourceId", + jsonHelper.parse(batchResponse1.getBody()).getAsJsonObject()); + + final JsonArray datatableEntries = jsonHelper.parse(getDatatableEntriesResponse).getAsJsonArray(); + Assertions.assertEquals(2, datatableEntries.size()); + + // Ensure both resourceIds are available in response + Assertions.assertTrue(getDatatableEntriesResponse.contains(String.format("\"id\": %d", createDatatableEntryId))); + Assertions.assertTrue(getDatatableEntriesResponse.contains(String.format("\"id\": %d", datatableEntryResourceId))); + } + /** * Test for the successful get loan and get datatable entry where get datatable request have no query param. A '200' * status code is expected on successful responses. @@ -1144,7 +1230,7 @@ public class BatchApiTest { final BatchRequest getLoanBatchRequest = BatchHelper.getLoanByIdRequest(loanId, "associations=repaymentSchedule,transactions"); // Get datatable batch request - final BatchRequest getDatatableBatchRequest = BatchHelper.getDatatableByIdRequest(loanId, datatableName, null); + final BatchRequest getDatatableBatchRequest = BatchHelper.getDatatableByIdRequest(loanId, datatableName, null, null); final List batchRequestsGetLoan = Arrays.asList(getLoanBatchRequest, getDatatableBatchRequest); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BatchHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BatchHelper.java index 925764c67..a80158fd5 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BatchHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/BatchHelper.java @@ -27,8 +27,10 @@ import java.time.LocalDate; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.ws.rs.HttpMethod; import org.apache.fineract.batch.command.internal.CreateTransactionLoanCommandStrategy; import org.apache.fineract.batch.domain.BatchRequest; @@ -801,16 +803,20 @@ public final class BatchHelper { * the name of datatable * @param queryParameter * the query parameters + * @param referenceId + * the reference id * @return the {@link BatchRequest} */ - public static BatchRequest getDatatableByIdRequest(final Long loanId, final String datatableName, final String queryParameter) { + public static BatchRequest getDatatableByIdRequest(final Long loanId, final String datatableName, final String queryParameter, + final Long referenceId) { final BatchRequest br = new BatchRequest(); String relativeUrl = String.format("datatables/%s/%s", datatableName, loanId); if (queryParameter != null) { relativeUrl = relativeUrl + "?" + queryParameter; } - br.setRequestId(4568L); + br.setRequestId(4571L); + br.setReference(referenceId); br.setRelativeUrl(relativeUrl); br.setMethod(HttpMethod.GET); br.setBody("{}"); @@ -818,6 +824,64 @@ public final class BatchHelper { return br; } + /** + * Creates and returns a batch request to create datatable entry. + * + * @param loanId + * the loan id + * @param datatableName + * the name of datatable + * @param columnNames + * the column names + * @return the {@link BatchRequest} + */ + public static BatchRequest createDatatableEntryRequest(final Long loanId, final String datatableName, final List columnNames) { + final BatchRequest br = new BatchRequest(); + final String relativeUrl = String.format("datatables/%s/%s", datatableName, loanId); + final Map datatableEntryMap = new HashMap<>(); + datatableEntryMap.putAll(columnNames.stream().collect(Collectors.toMap(v -> v, v -> Utils.randomNameGenerator("VAL_", 3)))); + final String datatableEntryRequestJsonString = new Gson().toJson(datatableEntryMap); + LOG.info("CreateDataTableEntry map : {}", datatableEntryRequestJsonString); + + br.setRequestId(4569L); + br.setRelativeUrl(relativeUrl); + br.setMethod(HttpMethod.POST); + br.setBody(datatableEntryRequestJsonString); + + return br; + } + + /** + * Creates and returns a batch request to create datatable entry. + * + * @param loanId + * the loan id + * @param datatableName + * the name of datatable + * @param datatableEntryId + * the resource id of the datatable entry + * @param columnNames + * the column names + * @return the {@link BatchRequest} + */ + public static BatchRequest updateDatatableEntryByEntryIdRequest(final Long loanId, final String datatableName, + final Long datatableEntryId, final List columnNames) { + final BatchRequest br = new BatchRequest(); + final String relativeUrl = String.format("datatables/%s/%s/%s", datatableName, loanId, datatableEntryId); + final Map datatableEntryMap = new HashMap<>(); + datatableEntryMap.putAll(columnNames.stream().collect(Collectors.toMap(v -> v, v -> Utils.randomNameGenerator("VAL_", 3)))); + final String datatableEntryRequestJsonString = new Gson().toJson(datatableEntryMap); + LOG.info("UpdateDataTableEntry map : {}", datatableEntryRequestJsonString); + + br.setRequestId(4570L); + br.setReference(4569L); + br.setRelativeUrl(relativeUrl); + br.setMethod(HttpMethod.PUT); + br.setBody(datatableEntryRequestJsonString); + + return br; + } + public static BatchRequest createAdjustTransactionRequest(final Long requestId, final Long reference, final String amount, final LocalDate date) { final BatchRequest br = new BatchRequest();