Merge remote-tracking branch 'origin/master' into develop

reportportal · Sep 19, 2024 · 7167fc7 · 7167fc7
2 parents 8a5314f + ad8a9ce
commit 7167fc7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ project.ext {
 
 ext['junit-jupiter.version'] = '5.10.0'
 
-def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' + (releaseMode ? '5.10.0' : 'develop')
+def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' + (releaseMode ? '5.12.0' : 'develop')
 
 apply from: "$scriptsUrl/build-commons.gradle"
 apply from: "$scriptsUrl/build-info.gradle"

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.11.2
+version=5.12.1
 description=EPAM Report portal. Service jobs
 dockerServerUrl=unix:///var/run/docker.sock
 dockerPrepareEnvironment=

diff --git a/src/main/java/com/epam/reportportal/jobs/statistics/DefectUpdateStatisticsJob.java b/src/main/java/com/epam/reportportal/jobs/statistics/DefectUpdateStatisticsJob.java
@@ -125,13 +125,14 @@ public void execute() {
 
         if (metadata.optInt("userAnalyzed") > 0) {
           status.add("manually");
+          sentToAnalyze += metadata.optInt("userAnalyzed");
         } else {
           status.add("automatically");
+          sentToAnalyze += metadata.optInt("sentToAnalyze");
         }
 
         userAnalyzed += metadata.optInt("userAnalyzed");
         autoAnalyzed += metadata.optInt("analyzed");
-        sentToAnalyze += metadata.optInt("userAnalyzed") + metadata.optInt("sentToAnalyze");
         version = metadata.getString("version");
 
       } while (rs.next());
@@ -164,6 +165,9 @@ public void execute() {
       sendRequest(requestBody);
 
     });
+
+    LOGGER.info("Completed items defect update statistics job");
+
   }
 
   private void sendRequest(JSONObject requestBody) {