avniproject/avni-webapp#1140 | Added removed value report values and …

…set via environment variable

avni-server-api/src/main/java/org/avni/server/web/util/Configuration.java

@@ -1,20 +1,45 @@
 package org.avni.server.web.util;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.avni.server.web.OrganisationConfigController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-
+import javax.annotation.PostConstruct;
 import java.util.List;
 
 @Component
-@ConfigurationProperties(prefix = "avni")
 public class Configuration {
+    @Value("${avni.reportingSystems}")
+    private String report;
     private List<ReportingSystem> reportingSystems;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+    private static final Logger logger = LoggerFactory.getLogger(OrganisationConfigController.class);
+
+    public void setReport(String report) {
+        System.out.println(report);
+        this.report = report;
+    }
+
     public List<ReportingSystem> getReportingSystems() {
         return reportingSystems;
     }
 
     public void setReportingSystems(List<ReportingSystem> reportingSystems) {
         this.reportingSystems = reportingSystems;
     }
+
+    @PostConstruct
+    public void addReportingSystems() {
+        try {
+            logger.info(String.format("reporting system getting from environemt %s", report));
+            reportingSystems = objectMapper.readValue(report, objectMapper.getTypeFactory().constructCollectionType(List.class, ReportingSystem.class));
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+        }
+    }
 }

avni-server-api/src/main/resources/application.properties

@@ -148,9 +148,4 @@ avni.exception.in.response=${AVNI_SEND_EXCEPTION_IN_RESPONSE:true}
 logging.level.org.hibernate.SQL=OFF
 
 #reporting
-avni.reportingSystems[0].name=Metabase Reports
-avni.reportingSystems[0].url=https://reporting.avniproject.org
-avni.reportingSystems[1].name=Jasper Reports
-avni.reportingSystems[1].url=https://reporting-jasper.avniproject.org/jasperserver/login.html
-avni.reportingSystems[2].name=Superset Reports
-avni.reportingSystems[2].url=https://reporting-superset.avniproject.org/login/
+avni.reportingSystems=${OPENCHS_REPORT_SYSTEMS:null}