merge conflicts

ls1intum · Dec 1, 2024 · 3037731 · 3037731
1 parent 9a2063f
commit 3037731
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobQueueItem.java
@@ -54,6 +54,8 @@ public BuildJobQueueItem(BuildJobQueueItem queueItem, ResultDTO submissionResult
 
     public BuildJobQueueItem(BuildJobQueueItem queueItem, BuildAgentDTO buildAgent, int newRetryCount) {
         this(queueItem.id(), queueItem.name(), buildAgent, queueItem.participationId(), queueItem.courseId(), queueItem.exerciseId(), newRetryCount, queueItem.priority(), null,
-                queueItem.repositoryInfo(), new JobTimingInfo(queueItem.jobTimingInfo.submissionDate(), ZonedDateTime.now(), null), queueItem.buildConfig(), null);
+                queueItem.repositoryInfo(),
+                new JobTimingInfo(queueItem.jobTimingInfo.submissionDate(), ZonedDateTime.now(), null, null, queueItem.jobTimingInfo().estimatedDuration()),
+                queueItem.buildConfig(), null);
     }
 }
diff --git a/...java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java b/...java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java
@@ -352,11 +352,11 @@ public ZonedDateTime getBuildJobEstimatedQueueDuration(long participationId) {
             return ZonedDateTime.now();
         }
 
-        List<BuildJobQueueItem> jobsQueuedBefore = queue.stream().sorted(new LocalCIPriorityQueueComparator()).takeWhile(job -> !job.id().equals(buildJobId)).toList();
+        List<BuildJobQueueItem> jobsQueuedBefore = getQueuedJobs().stream().sorted(new LocalCIPriorityQueueComparator()).takeWhile(job -> !job.id().equals(buildJobId)).toList();
 
         ZonedDateTime now = ZonedDateTime.now();
 
-        List<Long> agentsAvailabilities = new ArrayList<>(processingJobs.values().stream().map(job -> buildJobRemainingDuration(job, now)).sorted().toList());
+        List<Long> agentsAvailabilities = new ArrayList<>(getQueuedJobs().stream().map(job -> buildJobRemainingDuration(job, now)).sorted().toList());
 
         if (agentsAvailabilities.size() < this.buildAgentsCapacity) {
             int agentsToAdd = this.buildAgentsCapacity - agentsAvailabilities.size();
@@ -377,7 +377,7 @@ public ZonedDateTime getBuildJobEstimatedQueueDuration(long participationId) {
     }
 
     private String getIdOfQueuedJobFromParticipation(long participationId) {
-        var participationBuildJobIds = queue.stream().filter(job -> job.participationId() == participationId).map(BuildJobQueueItem::id).toList();
+        var participationBuildJobIds = getQueuedJobs().stream().filter(job -> job.participationId() == participationId).map(BuildJobQueueItem::id).toList();
         if (participationBuildJobIds.isEmpty()) {
             return null;
         }
@@ -431,8 +431,8 @@ public void entryUpdated(com.hazelcast.core.EntryEvent<String, BuildAgentInforma
     }
 
     private void getBuildAgentsCapacity() {
-        buildAgentsCapacity = buildAgentInformation.values().stream().mapToInt(BuildAgentInformation::maxNumberOfConcurrentBuildJobs).sum();
-        runningBuildJobCount = buildAgentInformation.values().stream().mapToInt(BuildAgentInformation::numberOfCurrentBuildJobs).sum();
+        buildAgentsCapacity = getBuildAgentInformation().stream().mapToInt(BuildAgentInformation::maxNumberOfConcurrentBuildJobs).sum();
+        runningBuildJobCount = getBuildAgentInformation().stream().mapToInt(BuildAgentInformation::numberOfCurrentBuildJobs).sum();
     }
 
     /**
@@ -443,8 +443,8 @@ private void getBuildAgentsCapacity() {
      * @return the build start date and estimated completion date of the submission if it is currently being processed, null otherwise
      */
     public BuildTimingInfo isSubmissionProcessing(long participationId, String commitHash) {
-        var buildJob = processingJobs.values().stream()
-                .filter(job -> job.participationId() == participationId && Objects.equals(commitHash, job.buildConfig().assignmentCommitHash())).findFirst();
+        var buildJob = getProcessingJobs().stream().filter(job -> job.participationId() == participationId && Objects.equals(commitHash, job.buildConfig().assignmentCommitHash()))
+                .findFirst();
         if (buildJob.isPresent()) {
             return new BuildTimingInfo(buildJob.get().jobTimingInfo().buildStartDate(), buildJob.get().jobTimingInfo().estimatedCompletionDate());
         }