[FINERACT-1751] Add savings account transaction request to Batch API

fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java

@@ -128,7 +128,15 @@ public class CommandStrategyProvider {
         commandStrategies.put(
                 CommandContext.resource("loans\\/external-id\\/" + UUID_PARAM_REGEX + OPTIONAL_QUERY_PARAM_REGEX).method(GET).build(),
                 "getLoanByExternalIdCommandStrategy");
+        commandStrategies.put(CommandContext.resource("savingsaccounts\\/" + NUMBER_REGEX + OPTIONAL_QUERY_PARAM_REGEX).method(GET).build(),
+                "getSavingsAccountByIdCommandStrategy");
         commandStrategies.put(CommandContext.resource("savingsaccounts").method(POST).build(), "applySavingsCommandStrategy");
+        commandStrategies.put(CommandContext
+                .resource("savingsaccounts\\/" + NUMBER_REGEX + "\\/transactions" + OPTIONAL_COMMAND_PARAM_REGEX).method(POST).build(),
+                "savingsAccountTransactionCommandStrategy");
+        commandStrategies.put(CommandContext
+                .resource("savingsaccounts\\/" + NUMBER_REGEX + "\\/transactions\\/" + NUMBER_REGEX + OPTIONAL_COMMAND_PARAM_REGEX)
+                .method(POST).build(), "savingsAccountAdjustTransactionCommandStrategy");
         commandStrategies.put(CommandContext.resource("loans\\/" + NUMBER_REGEX + "\\/charges").method(POST).build(),
                 "createChargeCommandStrategy");
         commandStrategies

fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetSavingsAccountByIdCommandStrategy.java

@@ -0,0 +1,81 @@
+/**
+ * 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 java.util.HashMap;
+import java.util.Map;
+import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.batch.command.CommandStrategy;
+import org.apache.fineract.batch.command.CommandStrategyUtils;
+import org.apache.fineract.batch.domain.BatchRequest;
+import org.apache.fineract.batch.domain.BatchResponse;
+import org.apache.fineract.infrastructure.core.api.MutableUriInfo;
+import org.apache.fineract.portfolio.savings.api.SavingsAccountsApiResource;
+import org.apache.http.HttpStatus;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class GetSavingsAccountByIdCommandStrategy implements CommandStrategy {
+
+    private final SavingsAccountsApiResource savingsAccountsApiResource;
+
+    @Override
+    public BatchResponse execute(BatchRequest batchRequest, UriInfo uriInfo) {
+        final MutableUriInfo parameterizedUriInfo = new MutableUriInfo(uriInfo);
+        final BatchResponse response = new BatchResponse();
+
+        response.setRequestId(batchRequest.getRequestId());
+        response.setHeaders(batchRequest.getHeaders());
+
+        final String relativeUrl = batchRequest.getRelativeUrl();
+
+        final Long savingsAccountId;
+        Map<String, String> queryParameters = new HashMap<>();
+        if (relativeUrl.indexOf('?') > 0) {
+            savingsAccountId = Long.parseLong(StringUtils.substringBetween(relativeUrl, "/", "?"));
+            queryParameters = CommandStrategyUtils.getQueryParameters(relativeUrl);
+            CommandStrategyUtils.addQueryParametersToUriInfo(parameterizedUriInfo, queryParameters);
+        } else {
+            savingsAccountId = Long.parseLong(StringUtils.substringAfter(relativeUrl, "/"));
+        }
+
+        String staffInSelectedOfficeOnly = null;
+        String chargeStatus = null;
+        if (!queryParameters.isEmpty()) {
+            if (queryParameters.containsKey("staffInSelectedOfficeOnly")) {
+                staffInSelectedOfficeOnly = queryParameters.get("staffInSelectedOfficeOnly");
+            }
+            if (queryParameters.containsKey("chargeStatus")) {
+                chargeStatus = queryParameters.get("chargeStatus");
+            }
+        }
+
+        final String responseBody = savingsAccountsApiResource.retrieveOne(savingsAccountId,
+                Boolean.parseBoolean(staffInSelectedOfficeOnly), chargeStatus, uriInfo);
+
+        response.setStatusCode(HttpStatus.SC_OK);
+
+        response.setBody(responseBody);
+
+        return response;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/SavingsAccountAdjustTransactionCommandStrategy.java

@@ -0,0 +1,70 @@
+/**
+ * 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 java.util.Map;
+import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.batch.command.CommandStrategy;
+import org.apache.fineract.batch.command.CommandStrategyUtils;
+import org.apache.fineract.batch.domain.BatchRequest;
+import org.apache.fineract.batch.domain.BatchResponse;
+import org.apache.fineract.portfolio.savings.api.SavingsAccountTransactionsApiResource;
+import org.apache.http.HttpStatus;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class SavingsAccountAdjustTransactionCommandStrategy implements CommandStrategy {
+
+    private final SavingsAccountTransactionsApiResource savingsAccountTransactionsApiResource;
+
+    @Override
+    public BatchResponse execute(BatchRequest batchRequest, UriInfo uriInfo) {
+        final BatchResponse response = new BatchResponse();
+
+        response.setRequestId(batchRequest.getRequestId());
+        response.setHeaders(batchRequest.getHeaders());
+        String relativeUrl = batchRequest.getRelativeUrl();
+        final List<String> pathParameters;
+        String command = null;
+        if (relativeUrl.indexOf('?') > 0) {
+            String subString = StringUtils.substringBefore(relativeUrl, "?");
+            pathParameters = Splitter.on('/').splitToList(subString);
+            final Map<String, String> queryParameters = CommandStrategyUtils.getQueryParameters(relativeUrl);
+            command = queryParameters.get("command");
+        } else {
+            pathParameters = Splitter.on('/').splitToList(relativeUrl);
+        }
+
+        Long savingsAccountId = Long.parseLong(pathParameters.get(1));
+        Long transactionId = Long.parseLong(pathParameters.get(3));
+        final String responseBody = savingsAccountTransactionsApiResource.adjustTransaction(savingsAccountId, transactionId, command,
+                batchRequest.getBody());
+
+        response.setStatusCode(HttpStatus.SC_OK);
+
+        response.setBody(responseBody);
+
+        return response;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/SavingsAccountTransactionCommandStrategy.java

@@ -0,0 +1,63 @@
+/**
+ * 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 java.util.Map;
+import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.batch.command.CommandStrategy;
+import org.apache.fineract.batch.command.CommandStrategyUtils;
+import org.apache.fineract.batch.domain.BatchRequest;
+import org.apache.fineract.batch.domain.BatchResponse;
+import org.apache.fineract.portfolio.savings.api.SavingsAccountTransactionsApiResource;
+import org.apache.http.HttpStatus;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class SavingsAccountTransactionCommandStrategy implements CommandStrategy {
+
+    private final SavingsAccountTransactionsApiResource savingsAccountTransactionsApiResource;
+
+    @Override
+    public BatchResponse execute(BatchRequest batchRequest, UriInfo uriInfo) {
+        final BatchResponse response = new BatchResponse();
+
+        response.setRequestId(batchRequest.getRequestId());
+        response.setHeaders(batchRequest.getHeaders());
+        String relativeUrl = batchRequest.getRelativeUrl();
+        final List<String> pathParameters = Splitter.on('/').splitToList(relativeUrl);
+        String command = null;
+        if (relativeUrl.indexOf('?') > 0) {
+            final Map<String, String> queryParameters = CommandStrategyUtils.getQueryParameters(relativeUrl);
+            command = queryParameters.get("command");
+        }
+
+        Long savingsAccountId = Long.parseLong(pathParameters.get(1));
+        final String responseBody = savingsAccountTransactionsApiResource.transaction(savingsAccountId, command, batchRequest.getBody());
+
+        response.setStatusCode(HttpStatus.SC_OK);
+
+        response.setBody(responseBody);
+
+        return response;
+    }
+}