Merge pull request #149 from q-rapids/develop

Release v1.4

Author: alejandravv

build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'jacoco'
 apply plugin: 'org.asciidoctor.convert'
 
 group = 'com.upc.gessi.qrapids'
-version = '1.3'
+version = '1.4'
 sourceCompatibility = 1.8
 
 war {

docs/asciidoc/index.adoc

@@ -1,5 +1,5 @@
 = Q-Rapids Dashboard API REST Documentation
-v1.3, {docdate}
+v1.4, {docdate}
 :toc: left
 
 :sectnums:
@@ -57,6 +57,21 @@ include::{snippets}/si/historical-conflict/http-response.adoc[]
 include::{snippets}/si/historical-read-error/http-response.adoc[]
 :numbered:
 
+=== Get current and historical evaluation
+
+operation::si/current_and_historical[snippets='request-parameters,curl-request,response-fields,http-response']
+
+:numbered!:
+==== HTTP response wrong project
+include::{snippets}/alerts/get-all-wrong-project/http-response.adoc[]
+
+==== HTTP response categories error
+include::{snippets}/si/historical-conflict/http-response.adoc[]
+
+==== HTTP response error on ElasticSearch connection
+include::{snippets}/si/historical-read-error/http-response.adoc[]
+:numbered:
+
 
 === Get prediction evaluation
 
@@ -279,7 +294,7 @@ include::{snippets}/alerts/add-qr-from-alert-backlog-error/http-response.adoc[]
 
 === Get historical evaluation
 
-operation::qf/current[snippets='request-parameters,curl-request,response-fields,http-response']
+operation::qf/historical[snippets='request-parameters,curl-request,response-fields,http-response']
 
 :numbered!:
 
@@ -294,7 +309,7 @@ include::{snippets}/alerts/add-qr-from-alert-backlog-error/http-response.adoc[]
 
 === Get historical evaluation for strategic indicator
 
-operation::qf/current-si[snippets='path-parameters,request-parameters,curl-request,response-fields,http-response']
+operation::qf/historical-si[snippets='path-parameters,request-parameters,curl-request,response-fields,http-response']
 
 :numbered!:
 

docs/asciidoc/index.html

@@ -2,7 +2,7 @@ sonar.projectKey=q-rapids_qrapids-dashboard
 
 sonar.projectName=qrapids-dashboard
 
-sonar.projectVersion=1.3
+sonar.projectVersion=1.4
 
 sonar.sources=src/main/java
 sonar.tests=src/test/java

docs/index.html

@@ -0,0 +1,170 @@
+package com.upc.gessi.qrapids.app.presentation.rest.dto;
+
+import com.upc.gessi.qrapids.app.domain.controllers.StrategicIndicatorsController;
+import org.springframework.data.util.Pair;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public class DTOSICurrentHistoricEvaluation {
+    //class attributes
+    private String id;
+    private Long dbId;
+    private String prjName;
+    private String name;
+    private String description;
+    private Pair<Float, String> currentValue;
+    private String currentValueDescription;
+    private String currentRationale;
+    private LocalDate currentDate;
+    private List<DTOSIAssessment> probabilities;
+    private List<DTOHistoricalData> historicalDataList;
+
+    public static class DTOHistoricalData {
+        private Pair<Float, String> value;
+        private String valueDescription;
+        private String rationale;
+        private LocalDate date;
+
+        public DTOHistoricalData(Pair<Float, String> value, String rationale, LocalDate date) {
+            setValue(value);
+            this.valueDescription = StrategicIndicatorsController.buildDescriptiveLabelAndValue(value);
+            setRationale(rationale);
+            setDate(date);
+        }
+
+        public void setValue(Pair<Float, String> value) {
+            this.value = value;
+        }
+
+        public Pair<Float, String> getValue() {
+            return value;
+        }
+
+        public String getValueDescription() {
+            return valueDescription;
+        }
+
+        public void setValueDescription(String valueDescription) {
+            this.valueDescription = valueDescription;
+        }
+
+        public void setRationale(String rationale) {
+            this.rationale = rationale;
+        }
+
+        public String getRationale() {
+            return rationale;
+        }
+
+        public void setDate(LocalDate date) {
+            this.date = date;
+        }
+
+        public LocalDate getDate() {
+            return date;
+        }
+    }
+
+    public DTOSICurrentHistoricEvaluation(String id, String prjName, String name, String description, Pair<Float, String> value, Long dbId,
+                                          String rationale, List<DTOSIAssessment> probabilities, LocalDate date) {
+        setId(id);
+        setPrjName(prjName);
+        setName(name);
+        setDescription(description);
+        setCurrentValue(value);
+        setCurrentRationale(rationale);
+        setProbabilities(probabilities);
+        setCurrentDate(date);
+        setDbId(dbId);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Long getDbId() {
+        return dbId;
+    }
+
+    public void setDbId(Long dbId) {
+        this.dbId = dbId;
+    }
+
+    public String getPrjName() {
+        return prjName;
+    }
+
+    public void setPrjName(String prjName) {
+        this.prjName = prjName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        if (description != null)
+            this.description = description;
+    }
+
+    public Pair<Float, String> getCurrentValue() {
+        return currentValue;
+    }
+
+    public String getCurrentValueDescription() { return currentValueDescription;}
+
+    private void setCurrentValueDescription(Pair<Float, String> value) {
+        this.currentValueDescription = StrategicIndicatorsController.buildDescriptiveLabelAndValue(value);
+    }
+
+    public void setCurrentValue(Pair<Float, String> value) {
+        this.currentValue = value;
+        setCurrentValueDescription(value);
+    }
+
+    public void setCurrentRationale(String rationale) {
+        this.currentRationale = rationale;
+    }
+
+    public String getCurrentRationale() {
+        return currentRationale;
+    }
+
+    public List<DTOSIAssessment> getProbabilities() {
+        return probabilities;
+    }
+
+    public void setProbabilities(List<DTOSIAssessment> probabilities) {
+        this.probabilities = probabilities;
+    }
+
+    public LocalDate getCurrentDate() {
+        return currentDate;
+    }
+
+    public void setCurrentDate(LocalDate date) {
+        this.currentDate = date;
+    }
+
+    public List<DTOHistoricalData> getHistoricalDataList() {
+        return historicalDataList;
+    }
+
+    public void setHistoricalDataList(List<DTOHistoricalData> historicalData) {
+        this.historicalDataList = historicalData;
+    }
+
+}

sonar-project.properties

@@ -507,4 +507,40 @@ public LocalDate getcurrentDate(@RequestParam(value = "prj") String prj) {
         // if the response is null
         return null;
     }
+
+    @GetMapping("/api/strategicIndicators/current_and_historical")
+    @ResponseStatus(HttpStatus.OK)
+    public List<DTOSICurrentHistoricEvaluation> getStrategicIndicatorsCurrentHistoricEvaluation(@RequestParam(value = "prj", required=false) String prj, @RequestParam("from") String from, @RequestParam("to") String to) {
+        try {
+            Project project = projectsController.findProjectByExternalId(prj);
+            List<DTOStrategicIndicatorEvaluation> currentData = strategicIndicatorsController.getAllStrategicIndicatorsCurrentEvaluation(prj);
+            List<DTOStrategicIndicatorEvaluation> historicData = strategicIndicatorsController.getAllStrategicIndicatorsHistoricalEvaluation(prj, LocalDate.parse(from), LocalDate.parse(to));
+            List<DTOSICurrentHistoricEvaluation> result = new ArrayList<>();
+            int j = 0;
+            for (int i = 0; i < currentData.size(); i++) {
+                DTOStrategicIndicatorEvaluation aux = currentData.get(i);
+                DTOSICurrentHistoricEvaluation siInfo = new DTOSICurrentHistoricEvaluation(aux.getId(),project.getName(),aux.getName(),aux.getDescription(),
+                        aux.getValue(), aux.getDbId(),aux.getRationale(),aux.getProbabilities(),aux.getDate());
+                List<DTOSICurrentHistoricEvaluation.DTOHistoricalData> siHistInfo = new ArrayList<>();
+                while (j < historicData.size() && aux.getId().equals(historicData.get(j).getId())) {
+                    DTOStrategicIndicatorEvaluation histAux = historicData.get(j);
+                    DTOSICurrentHistoricEvaluation.DTOHistoricalData histInfo = new DTOSICurrentHistoricEvaluation.DTOHistoricalData(histAux.getValue(),histAux.getRationale(),histAux.getDate());
+                    siHistInfo.add(histInfo);
+                    j++;
+                }
+                siInfo.setHistoricalDataList(siHistInfo);
+                result.add(siInfo);
+            }
+            return result;
+        } catch (ElasticsearchStatusException e) {
+            logger.error(e.getMessage(), e);
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, Messages.PROJECT_NOT_FOUND);
+        } catch (CategoriesException | ProjectNotFoundException e) {
+            logger.error(e.getMessage(), e);
+            throw new ResponseStatusException(HttpStatus.CONFLICT, Messages.CATEGORIES_DO_NOT_MATCH);
+        } catch (IOException e) {
+            logger.error(e.getMessage(), e);
+            throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, Messages.INTERNAL_SERVER_ERROR + e.getMessage());
+        }
+    }
 }

src/main/java/com/upc/gessi/qrapids/app/presentation/rest/dto/DTOSICurrentHistoricEvaluation.java

@@ -11,6 +11,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RestController
@@ -25,6 +26,20 @@ public class Util {
     @Value("${server.url}")
     private String serverUrl;
 
+    // add jasterserver data
+    @Value("${jasperServer.url}")
+    private String jasperserverURL;
+    @Value("${jasperserver.user}")
+    private String jasperserverUser;
+    @Value("${jasperserver.password}")
+    private String jasperserverPassword;
+
+    @GetMapping("/api/jasperserverInfo")
+    @ResponseStatus(HttpStatus.OK)
+    public List<String> jasperserverInfo() {
+        return Arrays.asList(jasperserverURL, jasperserverUser, jasperserverPassword);
+    }
+
     @GetMapping("/api/rawdataDashboard")
     @ResponseStatus(HttpStatus.OK)
     public String RawDataDashboard() {

src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/StrategicIndicators.java

@@ -0,0 +1,10 @@
+package com.upc.gessi.qrapids.app.presentation.web.mapping;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.stereotype.Controller;
+
+@Controller("/Reporting")
+public class ReportingController {
+    @RequestMapping("/Reporting")
+    public String reporting(){ return "Reporting/Reporting"; }
+}

src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Util.java

@@ -1,24 +1,22 @@
 @CHARSET "UTF-8";
 
 
-#productView, #SIConfigView, #CategoriesConfigView {
+#productView, #SIConfigView, #CategoriesConfigView, #ReportingView {
 	display: flex;
 	flex-direction: row;
 }
-
-#productTree, #SITree, #CategoriesElementSelector {
+#productTree, #SITree, #CategoriesElementSelector, #ProjectSelector {
 	margin: 1%;
 	width: 21%;
 }
 
-#productInfo, #SIInfo, #Categories {
+#productInfo, #SIInfo, #Categories, #ReportingInfo {
 	margin: 1%;
 	width: 75%;
 	display: flex;
 	flex-direction: column;
 }
-
-#productForm, #SIForm, #SICategories, #FactorsCategories, #MetricsCategories {
+#productForm, #SIForm, #SICategories, #FactorsCategories, #MetricsCategories, #RedirectToReport, #tableREPdiv {
 	margin: 1%;
 	display: flex;
 	flex-direction: column;