You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by "galovics (via GitHub)" <gi...@apache.org> on 2023/04/24 11:18:42 UTC
[GitHub] [fineract] galovics opened a new pull request, #3142: FINERACT-1724: More batch support for datatables APIs
galovics opened a new pull request, #3142:
URL: https://github.com/apache/fineract/pull/3142
## Description
Describe the changes made and why they were made.
Ignore if these details are present on the associated [Apache Fineract JIRA ticket](https://github.com/apache/fineract/pull/1284).
## Checklist
Please make sure these boxes are checked before submitting your pull request - thanks!
- [ ] Write the commit message as per https://github.com/apache/fineract/#pull-requests
- [ ] Acknowledge that we will not review PRs that are not passing the build _("green")_ - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.
- [ ] Create/update unit or integration tests for verifying the changes made.
- [ ] Follow coding conventions at https://cwiki.apache.org/confluence/display/FINERACT/Coding+Conventions.
- [ ] Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm with details of any API changes
- [ ] Submission is not a "code dump". (Large changes can be made "in repository" via a branch. Ask on the developer mailing list for guidance, if required.)
FYI our guidelines for code reviews are at https://cwiki.apache.org/confluence/display/FINERACT/Code+Review+Guide.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3142: FINERACT-1724: More batch support for datatables APIs
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3142:
URL: https://github.com/apache/fineract/pull/3142#discussion_r1175160470
##########
fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetDatatableEntryByAppTableIdAndDataTableIdCommandStrategy.java:
##########
@@ -0,0 +1,95 @@
+/**
+ * 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.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.infrastructure.dataqueries.api.DatatablesApiResource;
+import org.apache.http.HttpStatus;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implements {@link CommandStrategy} and get datatable by appTableId by data table id. 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.
+ */
+@Component
+@RequiredArgsConstructor
+public class GetDatatableEntryByAppTableIdAndDataTableIdCommandStrategy implements CommandStrategy {
+
+ /**
+ * Data table api resource {@link DatatablesApiResource}.
+ */
+ private final DatatablesApiResource dataTablesApiResource;
+
+ @Override
+ public BatchResponse execute(final BatchRequest request, @SuppressWarnings("unused") UriInfo uriInfo) {
+ final MutableUriInfo parameterizedUriInfo = new MutableUriInfo(uriInfo);
+ final BatchResponse response = new BatchResponse();
+ final String responseBody;
+
+ response.setRequestId(request.getRequestId());
+ response.setHeaders(request.getHeaders());
+
+ final String relativeUrl = request.getRelativeUrl();
+ final String relativeUrlSubString = StringUtils.substringAfter(relativeUrl, "/");
+
+ // uriInfo will contain the query parameter value(s) that are sent in the actual batch uri.
+ // for example: batches?enclosingTransaction=true
+ // But the query parameters that are sent in the batch relative url has to be sent to
+ // datatablesApiResource.getDatatable
+ // To use the relative url query parameters
+ // - Parse and fetch the query parameters sent in the relative url
+ // (datatables/dt_123/1/2?genericResultSet=false)
+ // - Add them to the MutableUriInfo query parameters list
+ // - Call datatablesApiResource.getDatatableManyEntry(dataTable, appTableId, dataTableId, null, false, generic
+ // resultSet, uriInfo)
+ final String[] resources = StringUtils.split(relativeUrlSubString, "/");
+ final String dataTableName = resources[0];
+ final Long appTableId = Long.parseLong(resources[1]);
+ final Long dataTableId = Long.parseLong(StringUtils.substringBefore(resources[2], "?"));
+ boolean genericResultSet = false;
+ if (relativeUrl.indexOf('?') > 0) {
+ Map<String, String> queryParameters = CommandStrategyUtils.getQueryParameters(relativeUrl);
+ // Add the query parameters sent in the relative URL to MutableUriInfo
+ if (queryParameters.containsKey("genericResultSet")) {
Review Comment:
Would you mind to add the other optional parameter as well? (order)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] galovics merged pull request #3142: FINERACT-1724: More batch support for datatables APIs
Posted by "galovics (via GitHub)" <gi...@apache.org>.
galovics merged PR #3142:
URL: https://github.com/apache/fineract/pull/3142
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org