Merge pull request #142 from q-rapids/develop

Release v1.3

Author: alejandravv

build.gradle

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

docs/asciidoc/index.adoc

@@ -1,5 +1,5 @@
 = Q-Rapids Dashboard API REST Documentation
-v1.2, {docdate}
+v1.3, {docdate}
 :toc: left
 
 :sectnums:

docs/asciidoc/index.html

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

sonar-project.properties

@@ -227,8 +227,8 @@ public List<DTODetailedStrategicIndicator> getSingleDetailedStrategicIndicatorsH
         return qmaDetailedStrategicIndicators.HistoricalData(strategicIndicatorId, from, to, projectExternalId);
     }
 
-    public List<DTOStrategicIndicatorEvaluation> getStrategicIndicatorsPrediction (String technique, String freq, String horizon, String projectExternalId) throws IOException, ElasticsearchStatusException {
-        return qmaForecast.ForecastSI(technique, freq, horizon, projectExternalId);
+    public List<DTOStrategicIndicatorEvaluation> getStrategicIndicatorsPrediction (List<DTOStrategicIndicatorEvaluation> si, String technique, String freq, String horizon, String projectExternalId) throws IOException, ElasticsearchStatusException {
+        return qmaForecast.ForecastSI(si,technique, freq, horizon, projectExternalId);
     }
 
     public List<DTODetailedStrategicIndicator> getDetailedStrategicIndicatorsPrediction (List<DTODetailedStrategicIndicator> currentEvaluation, String technique, String freq, String horizon, String projectExternalId) throws IOException, ElasticsearchStatusException {
@@ -242,12 +242,15 @@ public void trainForecastModelsAllProjects(String technique) throws IOException,
         }
     }
 
-    public void trainForecastModelsSingleProject(String project, String technique) throws IOException {
+    public void trainForecastModelsSingleProject(String project, String technique) throws IOException, CategoriesException {
         List<DTOMetric> metrics = metricsController.getAllMetricsCurrentEvaluation(project);
         qmaForecast.trainMetricForecast(metrics, "7", project, technique);
 
         List<DTOQualityFactor> factors = qualityFactorsController.getAllFactorsWithMetricsCurrentEvaluation(project);
         qmaForecast.trainFactorForecast(factors, "7", project, technique);
+
+        List<DTOStrategicIndicatorEvaluation> strategicIndicators = getAllStrategicIndicatorsCurrentEvaluation(project);
+        qmaForecast.trainStrategicIndicatorForecast(strategicIndicators, "7", project, technique);
     }
 
     public boolean assessStrategicIndicators(String projectExternalId, LocalDate dateFrom) throws IOException, CategoriesException, ProjectNotFoundException {

src/main/java/com/upc/gessi/qrapids/app/domain/adapters/Forecast.java

@@ -27,6 +27,8 @@ public class DTOStrategicIndicatorEvaluation {
     private String categories_description;
     private boolean hasBN;
     private boolean hasFeedback;
+    private Pair<Float, Float> confidence80;
+    private Pair<Float, Float> confidence95;
     private String forecastingError;
     private int mismatchDays;
     private List<String> missingFactors;
@@ -58,6 +60,22 @@ public DTOStrategicIndicatorEvaluation(String id, String name, String descriptio
         setHasBN(hasBN);
     }
 
+    public DTOStrategicIndicatorEvaluation(String id, String name, String description, Pair<Float, String> value, Pair<Float, Float> confidence80, Pair<Float, Float> confidence95, String rationale, List<DTOSIAssessment> probabilities, LocalDate date, String datasource, Long dbId, String categories, boolean hasBN) {
+        setId(id);
+        setName(name);
+        setDescription(description);
+        setValue(value);
+        setConfidence80(confidence80);
+        setConfidence95(confidence95);
+        setRationale(rationale);
+        setProbabilities(probabilities);
+        setDate(date);
+        setDbId(dbId);
+        setDatasource(datasource);
+        setCategories_description(categories);
+        setHasBN(hasBN);
+    }
+
     public DTOStrategicIndicatorEvaluation(String id, String name, String forecastingError) {
         this.id = id;
         this.name = name;
@@ -102,7 +120,6 @@ public void setDescription(String description) {
             this.description = description;
     }
 
-
     public Pair<Float, String> getValue() {
         return value;
     }
@@ -208,4 +225,20 @@ public List<String> getMissingFactors() {
     public void setMissingFactors(List<String> missingFactors) {
         this.missingFactors = missingFactors;
     }
+
+    public void setConfidence80(Pair<Float, Float> confidence80) {
+        this.confidence80 = confidence80;
+    }
+
+    public Pair<Float, Float> getConfidence80() {
+        return confidence80;
+    }
+
+    public void setConfidence95(Pair<Float, Float> confidence95) {
+        this.confidence95 = confidence95;
+    }
+
+    public Pair<Float, Float> getConfidence95() {
+        return confidence95;
+    }
 }

src/main/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsController.java

@@ -109,10 +109,10 @@ public List<DTOMetric> getHistoricalDataForMetric(@RequestParam(value = "prj") S
 
     @RequestMapping("/api/metrics/prediction")
     @ResponseStatus(HttpStatus.OK)
-    public List<DTOMetric> getMetricsPredictionData(@RequestParam(value = "prj") String prj, @RequestParam("technique") String techinique, @RequestParam("horizon") String horizon) throws IOException {
+    public List<DTOMetric> getMetricsPredictionData(@RequestParam(value = "prj") String prj, @RequestParam("technique") String technique, @RequestParam("horizon") String horizon) throws IOException {
         try {
             List<DTOMetric> currentEvaluation = metricsController.getAllMetricsCurrentEvaluation(prj);
-            return metricsController.getMetricsPrediction(currentEvaluation, prj, techinique, "7", horizon);
+            return metricsController.getMetricsPrediction(currentEvaluation, prj, technique, "7", horizon);
         } catch (ElasticsearchStatusException e) {
             logger.error(e.getMessage(), e);
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, Messages.PROJECT_NOT_FOUND);
@@ -122,4 +122,16 @@ public List<DTOMetric> getMetricsPredictionData(@RequestParam(value = "prj") Str
         }
     }
 
+    @GetMapping("/api/metrics/currentDate")
+    @ResponseStatus(HttpStatus.OK)
+    public LocalDate getcurrentDate(@RequestParam(value = "prj") String prj) {
+        try {
+            List<DTOMetric> metrics = metricsController.getAllMetricsCurrentEvaluation(prj);
+            return metrics.get(0).getDate();
+        } catch (IOException e) {
+            logger.error(e.getMessage(), e);
+        }
+        // if the response is null
+        return null;
+    }
 }

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

@@ -3,10 +3,7 @@
 import com.upc.gessi.qrapids.app.domain.controllers.MetricsController;
 import com.upc.gessi.qrapids.app.domain.controllers.QualityFactorsController;
 import com.upc.gessi.qrapids.app.domain.models.QFCategory;
-import com.upc.gessi.qrapids.app.presentation.rest.dto.DTOCategoryThreshold;
-import com.upc.gessi.qrapids.app.presentation.rest.dto.DTOFactor;
-import com.upc.gessi.qrapids.app.presentation.rest.dto.DTOMetric;
-import com.upc.gessi.qrapids.app.presentation.rest.dto.DTOQualityFactor;
+import com.upc.gessi.qrapids.app.presentation.rest.dto.*;
 import com.upc.gessi.qrapids.app.domain.exceptions.CategoriesException;
 import com.upc.gessi.qrapids.app.presentation.rest.services.helpers.Messages;
 import org.elasticsearch.ElasticsearchStatusException;
@@ -189,4 +186,17 @@ public List<DTOMetric> getMetricsPredictionData(@RequestParam(value = "prj") Str
             throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, Messages.INTERNAL_SERVER_ERROR + e.getMessage());
         }
     }
+
+    @GetMapping("/api/qualityFactors/currentDate")
+    @ResponseStatus(HttpStatus.OK)
+    public LocalDate getcurrentDate(@RequestParam(value = "prj") String prj) {
+        try {
+            List<DTOFactor> qfs = qualityFactorsController.getAllFactorsEvaluation(prj);
+            return qfs.get(0).getDate();
+        } catch (IOException e) {
+            logger.error(e.getMessage(), e);
+        }
+        // if the response is null
+        return null;
+    }
 }

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

@@ -186,11 +186,12 @@ List<DTOQualityFactor> getQualityFactorsHistoricalData(@RequestParam(value = "pr
     @ResponseStatus(HttpStatus.OK)
     public List<DTOStrategicIndicatorEvaluation> getStrategicIndicatorsPrediction(@RequestParam(value = "prj", required=false) String prj, @RequestParam("technique") String technique, @RequestParam("horizon") String horizon) {
         try {
-            return strategicIndicatorsController.getStrategicIndicatorsPrediction(technique, "7", horizon, prj);
+            List<DTOStrategicIndicatorEvaluation> currentEvaluation = strategicIndicatorsController.getAllStrategicIndicatorsCurrentEvaluation(prj);
+            return strategicIndicatorsController.getStrategicIndicatorsPrediction(currentEvaluation, technique, "7", horizon, prj);
         } catch (ElasticsearchStatusException e) {
             logger.error(e.getMessage(), e);
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, Messages.PROJECT_NOT_FOUND);
-        } catch (IOException e) {
+        } catch (IOException | CategoriesException  e) {
             logger.error(e.getMessage(), e);
             throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, Messages.INTERNAL_SERVER_ERROR + e.getMessage());
         }
@@ -392,7 +393,8 @@ public void newSICategories (@RequestBody List<Map<String, String>> categories)
     private enum TrainType {
         NONE, ONE, ALL
     }
-//TODO: assessSI
+
+    //TODO: assessSI
     @RequestMapping("/api/assessStrategicIndicators")
     @ResponseStatus(HttpStatus.OK)
     public void assesStrategicIndicatorsLegacy(@RequestParam(value = "prj", required=false) String prj,
@@ -492,4 +494,17 @@ public List<DTORelationsSI> getQualityModel(@RequestParam("prj") String prj, @Re
     public List<String> getForecastTechniques() {
         return strategicIndicatorsController.getForecastTechniques();
     }
+
+    @GetMapping("/api/strategicIndicators/currentDate")
+    @ResponseStatus(HttpStatus.OK)
+    public LocalDate getcurrentDate(@RequestParam(value = "prj") String prj) {
+        try {
+            List<DTOStrategicIndicatorEvaluation> si = strategicIndicatorsController.getAllStrategicIndicatorsCurrentEvaluation(prj);
+            return si.get(0).getDate();
+        } catch (IOException | CategoriesException e) {
+            logger.error(e.getMessage(), e);
+        }
+        // if the response is null
+        return null;
+    }
 }