avniproject/avni-webapp#1140 | set response entity and removed avni r…

…eporting properties
vedfordev · Mar 12, 2024 · 9443e7f · 9443e7f
1 parent 0dfe3e7
commit 9443e7f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/web/ConfigurationController.java b/avni-server-api/src/main/java/org/avni/server/web/ConfigurationController.java
@@ -1,17 +1,25 @@
 package org.avni.server.web;
 
 import org.avni.server.web.util.Configuration;
+import org.avni.server.web.util.ConfigurationResponse;
+import org.avni.server.web.util.ReportingSystem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 public class ConfigurationController {
     @Autowired
     private Configuration configuration;
+
     @GetMapping("/Config")
-    public ResponseEntity<Configuration> getReportConfig(){
-        return ResponseEntity.ok(configuration);
+    public ResponseEntity<ConfigurationResponse> getReportConfig() {
+        ConfigurationResponse configurationResponse = new ConfigurationResponse();
+        List<ReportingSystem> reportingSystems = configuration.getReportingSystems();
+        configurationResponse.setReportingSystems(reportingSystems);
+        return ResponseEntity.ok(configurationResponse);
     }
 }
diff --git a/avni-server-api/src/main/java/org/avni/server/web/util/ConfigurationResponse.java b/avni-server-api/src/main/java/org/avni/server/web/util/ConfigurationResponse.java
@@ -0,0 +1,17 @@
+package org.avni.server.web.util;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ConfigurationResponse {
+    private List<ReportingSystem> reportingSystems;
+
+    public List<ReportingSystem> getReportingSystems() {
+        return reportingSystems;
+    }
+
+    public void setReportingSystems(List<ReportingSystem> reportingSystems) {
+        List<ReportingSystem> filteredReportingSystems = reportingSystems.stream().filter(reportingSystem -> !(reportingSystem.getName().equals("") || reportingSystem.getUrl().equals("")) ).collect(Collectors.toList());
+        this.reportingSystems = filteredReportingSystems;
+    }
+}
diff --git a/avni-server-api/src/main/resources/application.properties b/avni-server-api/src/main/resources/application.properties
@@ -148,9 +148,9 @@ avni.exception.in.response=${AVNI_SEND_EXCEPTION_IN_RESPONSE:true}
 logging.level.org.hibernate.SQL=OFF
 
 #reporting
-avni.reportingSystems[0].name=${AVNI_REPORTING_SYSTEM_0_NAME:Avni Metabase Reports}
-avni.reportingSystems[0].url=${AVNI_REPORTING_SYSTEM_0_URL:https://reporting.avniproject.org}
-avni.reportingSystems[1].name=${AVNI_REPORTING_SYSTEM_1_NAME:Avni Jasper Reports}
-avni.reportingSystems[1].url=${AVNI_REPORTING_SYSTEM_1_URL:https://reporting-jasper.avniproject.org/jasperserver/login.html}
-avni.reportingSystems[2].name=${AVNI_REPORTING_SYSTEM_2_NAME:Avni Superset Reports}
-avni.reportingSystems[2].url=${AVNI_REPORTING_SYSTEM_2_URL:https://reporting-superset.avniproject.org/login/}
+avni.reportingSystems[0].name=${AVNI_REPORTING_SYSTEM_0_NAME:}
+avni.reportingSystems[0].url=${AVNI_REPORTING_SYSTEM_0_URL:}
+avni.reportingSystems[1].name=${AVNI_REPORTING_SYSTEM_1_NAME:}
+avni.reportingSystems[1].url=${AVNI_REPORTING_SYSTEM_1_URL:}
+avni.reportingSystems[2].name=${AVNI_REPORTING_SYSTEM_2_NAME:}
+avni.reportingSystems[2].url=${AVNI_REPORTING_SYSTEM_2_URL:}