Correct update of information about the assessment

q-rapids · Nov 17, 2020 · 097976b · 097976b
1 parent b48fb32
commit 097976b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 group = 'com.dw'
-version = '0.19'
+version = '1.0'
 
 description = """qrapids-qma-elastic"""
 

diff --git a/src/main/java/evaluation/StrategicIndicator.java b/src/main/java/evaluation/StrategicIndicator.java
@@ -285,14 +285,7 @@ public static List<FactorMetricEvaluationDTO> getMetricsEvaluations(String proje
         StrategicIndicatorFactorEvaluationDTO siFactors = getFactorsEvaluations(projectId,strategicIndicatorID);
 
         for (FactorEvaluationDTO factor : siFactors.getFactors()) {
-            ret.add(new FactorMetricEvaluationDTO(
-                    factor.getID(),
-                    factor.getName(),
-                    factor.getProject(),
-                    Factor.getMetricsEvaluations(
-                            factor.getProject(),
-                            factor.getID())
-                            .getMetrics()));
+            ret.add(new FactorMetricEvaluationDTO(factor, Factor.getMetricsEvaluations(factor.getProject(),factor.getID()).getMetrics()));
         }
         return ret;
     }
@@ -320,14 +313,7 @@ public static List<FactorMetricEvaluationDTO> getMetricsEvaluations(String proje
                                                                                 strategicIndicatorID, from, to);
 
         for (FactorEvaluationDTO factor : siFactors.getFactors()) {
-            ret.add(new FactorMetricEvaluationDTO(
-                    factor.getID(),
-                    factor.getName(),
-                    factor.getProject(),
-                    Factor.getMetricsEvaluations(
-                            factor.getProject(),
-                            factor.getID(), from, to)
-                            .getMetrics()));
+            ret.add(new FactorMetricEvaluationDTO(factor, Factor.getMetricsEvaluations(factor.getProject(),factor.getID(), from, to).getMetrics()));
         }
         return ret;
     }

diff --git a/src/main/java/util/Queries.java b/src/main/java/util/Queries.java
@@ -349,13 +349,18 @@ public static UpdateResponse setStrategicIndicatorValue(QMLevel QMLevel,
                 .field(PROJECT, projectId)
                 .field(STRATEGIC_INDICATOR_ID, strategicIndicatorID)
                 .field(EVALUATION_DATE, evaluationDate)
-                .field(DATA_SOURCE, "QRapids Dashboard")
-                .field(NAME, strategicIndicatorName)
-                .field(DESCRIPTION, strategicIndicatorDescription);
+                .field(DATA_SOURCE, "QRapids Dashboard");
+                //.field(NAME, strategicIndicatorName)
+                //.field(DESCRIPTION, strategicIndicatorDescription);
 
         // If the entry already exists, we update the information about the assessment
         XContentBuilder updateReqObj = jsonBuilder().startObject();
 
+        updateReqObj.field(NAME, strategicIndicatorName);
+        indexReqObj.field(NAME, strategicIndicatorName);
+        updateReqObj.field(DESCRIPTION, strategicIndicatorDescription);
+        indexReqObj.field(DESCRIPTION, strategicIndicatorDescription);
+
         updateReqObj.field(VALUE, value);
         indexReqObj.field(VALUE, value);
         updateReqObj.field(RATIONALE, info);
@@ -422,13 +427,18 @@ public static UpdateResponse setFactorValue(QMLevel QMLevel,
                 .field(PROJECT, projectId)
                 .field(FACTOR_ID, factorID)
                 .field(EVALUATION_DATE, evaluationDate)
-                .field(DATA_SOURCE, "QRapids Dashboard")
-                .field(NAME, factorName)
-                .field(DESCRIPTION, factorDescription);
+                .field(DATA_SOURCE, "QRapids Dashboard");
+                //.field(NAME, factorName)
+                //.field(DESCRIPTION, factorDescription);
 
         // If the entry already exists, we update the information about the assessment
         XContentBuilder updateReqObj = jsonBuilder().startObject();
 
+        updateReqObj.field(NAME, factorName);
+        indexReqObj.field(NAME, factorName);
+        updateReqObj.field(DESCRIPTION, factorDescription);
+        indexReqObj.field(DESCRIPTION, factorDescription);
+
         updateReqObj.field(VALUE, value);
         indexReqObj.field(VALUE, value);
         updateReqObj.field(RATIONALE, info);