Skip to content

The Unified and Autonomous Development Platform

fix: Update duration calculations in build and pull request services

Robin Shenaef745b5fd5a
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
index 3aca553e7e..7306494380 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
@@ -555,8 +555,8 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Bui
Map<Integer, Pair<Integer, Integer>> stats = new HashMap<>();
for (var result: getSession().createQuery(criteriaQuery).getResultList()) {
- var pendingDuration = ((Double)result[1])/60000;
- var runningDuration = ((Double)result[2])/60000;
+ var pendingDuration = ((Double)result[1])/1000;
+ var runningDuration = ((Double)result[2])/1000;
stats.put((int)result[0], new ImmutablePair<>((int)pendingDuration, (int)runningDuration));
}
return stats;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
index bab948210c..0418d69904 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
@@ -1168,7 +1168,7 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
Map<Integer, Integer> stats = new HashMap<>();
for (var result: getSession().createQuery(criteriaQuery).getResultList()) {
- var duration = ((Double)result[1])/60000;
+ var duration = ((Double)result[1])/1000;
stats.put((int)result[0], (int)duration);
}
return stats;
diff --git a/server-ee b/server-ee
index f88d3041eb..713aee4fd8 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit f88d3041eb1ba79a884743421b9e2d2ed6fdf43d
+Subproject commit 713aee4fd8dbc9b2e997ac4daf720d309ab70145