Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ private void registerJob() {
Set<MonitorableJob> userJobs = JobUtils.getJobsForUser(this.owner);
userJobs.add(this);
JobUtils.userJobsMap.put(retrieveUserId(), userJobs);
JobUtils.removeJobsOlderThanAWeek();
}

@JsonProperty("owner")
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/com/conveyal/datatools/manager/utils/JobUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -173,4 +175,15 @@ public static DeployJob queueDeployJob(Deployment deployment, Auth0UserProfile o
deploymentJobsByServer.put(server.id, deployJob);
return deployJob;
}

/**
* Removes all jobs that are older than one week.
*/
public static void removeJobsOlderThanAWeek() {
LocalDateTime oneWeekAgo = LocalDateTime.now().minusDays(7);
userJobsMap.forEach((userId, jobs) ->
jobs.removeIf(job -> LocalDateTime.parse(job.status.modified, DateTimeFormatter.ISO_DATE_TIME)
.isBefore(oneWeekAgo))
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.conveyal.datatools.manager.utils;

import com.conveyal.datatools.common.status.MonitorableJob;
import com.google.common.collect.Sets;
import org.junit.jupiter.api.Test;

import java.time.Instant;
import java.util.Set;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

class JobUtilsTest {

@Test
void testRemoveJobsOlderThanAWeek() {
JobUtils.userJobsMap.clear();
String userId = "user-id";
Set<MonitorableJob> jobs = Sets.newConcurrentHashSet();

MonitorableJob oldJob = createMonitorableJob();
oldJob.status.modified = Instant.now().minus(java.time.Duration.ofDays(8)).toString();

MonitorableJob recentJob = createMonitorableJob();
recentJob.status.modified = Instant.now().toString();

jobs.add(oldJob);
jobs.add(recentJob);
JobUtils.userJobsMap.put(userId, jobs);

JobUtils.removeJobsOlderThanAWeek();

Set<MonitorableJob> remainingJobs = JobUtils.userJobsMap.get(userId);
assertEquals(1, remainingJobs.size());
assertTrue(remainingJobs.stream().anyMatch(job -> job.jobId.equals(recentJob.jobId)));
}

private MonitorableJob createMonitorableJob() {
return new MonitorableJob() {
@Override
public void jobLogic() {

}
};
}
}
Loading