You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ar...@apache.org on 2022/07/29 08:15:21 UTC
[fineract] branch develop updated: Fix Product Mix queries using group by
This is an automated email from the ASF dual-hosted git repository.
arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 81601645a Fix Product Mix queries using group by
81601645a is described below
commit 81601645a4617bd274ebd2af30f7f0fa2669a805
Author: Jose Alberto Hernandez <al...@MacBook-Pro.local>
AuthorDate: Wed Jul 27 15:18:51 2022 -0500
Fix Product Mix queries using group by
---
.../service/ProductMixReadPlatformServiceImpl.java | 4 +-
.../ProductMixIntegrationTest.java | 59 ++++++++++++++++++++++
.../integrationtests/common/ProductMixHelper.java | 53 +++++++++++++++++++
3 files changed, 114 insertions(+), 2 deletions(-)
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java
index 6de59f581..208084f9e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java
@@ -58,7 +58,7 @@ public class ProductMixReadPlatformServiceImpl implements ProductMixReadPlatform
final ProductMixDataExtractor extractor = new ProductMixDataExtractor(this.loanProductReadPlatformService, productId);
- final String sql = "Select " + extractor.schema() + " where pm.product_id=? group by pm.product_id";
+ final String sql = "Select " + extractor.schema() + " where pm.product_id=?";
final Map<Long, ProductMixData> productMixData = this.jdbcTemplate.query(sql, extractor, new Object[] { productId }); // NOSONAR
@@ -76,7 +76,7 @@ public class ProductMixReadPlatformServiceImpl implements ProductMixReadPlatform
final ProductMixDataExtractor extractor = new ProductMixDataExtractor(this.loanProductReadPlatformService, null);
- final String sql = "Select " + extractor.schema() + " group by pm.product_id";
+ final String sql = "Select " + extractor.schema();
final Map<Long, ProductMixData> productMixData = this.jdbcTemplate.query(sql, extractor); // NOSONAR
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ProductMixIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ProductMixIntegrationTest.java
new file mode 100644
index 000000000..76b7f18ca
--- /dev/null
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ProductMixIntegrationTest.java
@@ -0,0 +1,59 @@
+/**
+ * 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.integrationtests;
+
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
+import io.restassured.specification.ResponseSpecification;
+import java.util.ArrayList;
+import java.util.HashMap;
+import org.apache.fineract.integrationtests.common.ProductMixHelper;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class ProductMixIntegrationTest {
+
+ private RequestSpecification requestSpec;
+ private ResponseSpecification responseSpec;
+
+ private ProductMixHelper productMixHelper;
+
+ @BeforeEach
+ public void setUp() throws Exception {
+ Utils.initializeRESTAssured();
+ this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
+ this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
+ this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
+ this.productMixHelper = new ProductMixHelper(this.requestSpec, this.responseSpec);
+ }
+
+ @Test
+ public void getProductMixList() {
+ final ArrayList productMixList = this.productMixHelper.getProductsMixList();
+ Assertions.assertNotNull(productMixList);
+
+ final HashMap productMixTemplate = (HashMap) this.productMixHelper.getProductMixTemplate();
+ Assertions.assertNotNull(productMixTemplate);
+ }
+
+}
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ProductMixHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ProductMixHelper.java
new file mode 100644
index 000000000..56912044f
--- /dev/null
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ProductMixHelper.java
@@ -0,0 +1,53 @@
+/**
+ * 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.integrationtests.common;
+
+import io.restassured.specification.RequestSpecification;
+import io.restassured.specification.ResponseSpecification;
+import java.util.ArrayList;
+import java.util.HashMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ProductMixHelper {
+
+ private static final Logger LOG = LoggerFactory.getLogger(ProductMixHelper.class);
+ private static final String PRODUCT_MIX_URL = "/fineract-provider/api/v1/loanproducts";
+
+ private final RequestSpecification requestSpec;
+ private final ResponseSpecification responseSpec;
+
+ public ProductMixHelper(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
+ this.requestSpec = requestSpec;
+ this.responseSpec = responseSpec;
+ }
+
+ public ArrayList getProductsMixList() {
+ final String GET_PRODUCT_MIX_URL = PRODUCT_MIX_URL + "?" + Utils.TENANT_IDENTIFIER;
+ LOG.info("------------------------ RETRIEVING PRODUCT MIX -------------------------");
+ return Utils.performServerGet(this.requestSpec, this.responseSpec, GET_PRODUCT_MIX_URL, "");
+ }
+
+ public HashMap getProductMixTemplate() {
+ final String GET_PRODUCT_MIX_URL = PRODUCT_MIX_URL + "/template?isProductMixTemplate=true&" + Utils.TENANT_IDENTIFIER;
+ LOG.info("-------------------- RETRIEVING PRODUCT MIX TEMPLATE ---------------------");
+ return Utils.performServerGet(this.requestSpec, this.responseSpec, GET_PRODUCT_MIX_URL, "");
+ }
+
+}