[fineract] branch develop updated: FINERACT-1345: Fixing support for parameterType reports

[ptuomola]

This is an automated email from the ASF dual-hosted git repository.

ptuomola 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 f87b66d  FINERACT-1345: Fixing support for parameterType reports
f87b66d is described below

commit f87b66d4e1beb244bb77b7f084b64e72fd3f697c
Author: Petri Tuomola <pe...@tuomola.org>
AuthorDate: Sun May 16 09:33:58 2021 +0800

    FINERACT-1345: Fixing support for parameterType reports
---
 .../infrastructure/dataqueries/api/RunreportsApiResource.java       | 2 +-
 .../infrastructure/dataqueries/service/ReadReportingService.java    | 2 +-
 .../dataqueries/service/ReadReportingServiceImpl.java               | 6 +++++-
 .../service/ReportMailingJobWritePlatformServiceImpl.java           | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java
 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java
index 0f0c4c5..a3dd2e8 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java
@@ -105,7 +105,7 @@ public class RunreportsApiResource {
         // Pass through isSelfServiceUserReport so that 
ReportingProcessService implementations can use it
         queryParams.putSingle(IS_SELF_SERVICE_USER_REPORT_PARAMETER, 
Boolean.toString(isSelfServiceUserReport));
 
-        String reportType = 
this.readExtraDataAndReportingService.getReportType(reportName, 
isSelfServiceUserReport);
+        String reportType = 
this.readExtraDataAndReportingService.getReportType(reportName, 
isSelfServiceUserReport, parameterType);
         ReportingProcessService reportingProcessService = 
this.reportingProcessServiceProvider.findReportingProcessService(reportType);
         if (reportingProcessService == null) {
             throw new 
PlatformServiceUnavailableException("err.msg.report.service.implementation.missing",
diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingService.java
 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingService.java
index cf4b383..ab36113 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingService.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingService.java
@@ -34,7 +34,7 @@ public interface ReadReportingService {
 
     ReportData retrieveReport(Long id);
 
-    String getReportType(String reportName, boolean isSelfServiceUserReport);
+    String getReportType(String reportName, boolean isSelfServiceUserReport, 
boolean isParameterType);
 
     Collection<ReportParameterData> getAllowedParameters();
 
diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
index cd538e3..c12df88 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
@@ -212,7 +212,11 @@ public class ReadReportingServiceImpl implements 
ReadReportingService {
     }
 
     @Override
-    public String getReportType(final String reportName, final boolean 
isSelfServiceUserReport) {
+    public String getReportType(final String reportName, final boolean 
isSelfServiceUserReport, final boolean isParameterType) {
+        if (isParameterType) {
+            return "Table";
+        }
+
         final String sql = "SELECT ifNull(report_type,'') AS report_type FROM 
`stretchy_report` WHERE report_name = ? AND self_service_user_report = ?";
 
         final String sqlWrapped = this.genericDataService.wrapSQL(sql);
diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java
 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java
index 1de29e3..241d0e6 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java
@@ -441,7 +441,7 @@ public class ReportMailingJobWritePlatformServiceImpl 
implements ReportMailingJo
 
         try {
             final boolean isSelfServiceUserReport = false;
-            final String reportType = 
this.readReportingService.getReportType(reportName, isSelfServiceUserReport);
+            final String reportType = 
this.readReportingService.getReportType(reportName, isSelfServiceUserReport, 
false);
             final ReportingProcessService reportingProcessService = 
this.reportingProcessServiceProvider
                     .findReportingProcessService(reportType);