Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sorting jobs by date/time #139

Merged
merged 6 commits into from
Jun 22, 2023
Merged

Sorting jobs by date/time #139

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
62d7591
Sorting jobs by date/time
Levi-Lehman Jun 13, 2023
68a3d65
Reverted Initial Solution, new solution implemented
Levi-Lehman Jun 15, 2023
1e99bce
Removed unused imports
Levi-Lehman Jun 15, 2023
f6d89bc
formatting change
Levi-Lehman Jun 15, 2023
90591d7
formatting change
Levi-Lehman Jun 15, 2023
7c3cf9e
dsc vs desc typo fixed
Levi-Lehman Jun 19, 2023
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
5 changes: 3 additions & 2 deletions src/main/java/com/impactupgrade/nucleus/controller/JobController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -83,8 +84,8 @@ private List<JobDto> toJobDtos(List<Job> jobs, String timezoneId) {
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(DATE_FORMAT);
DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern(TIME_FORMAT);
return jobs.stream()
Levi-Lehman marked this conversation as resolved.
Show resolved Hide resolved
.map(job -> toJobDto(job, zoneId, dateFormatter, timeFormatter))
.collect(Collectors.toList());
.map(job -> toJobDto(job, zoneId, dateFormatter, timeFormatter))
.collect(Collectors.toList());
}

private JobDto toJobDto(Job job, String timezoneId, DateTimeFormatter dateFormatter, DateTimeFormatter timeFormatter) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/impactupgrade/nucleus/service/segment/DBJobLoggingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,9 @@ public List<Job> getJobs(JobType jobType) {
private List<Job> getJobs(Organization org, JobType jobType) {
try (Session session = openSession()) {
String queryString = "select j from Job j " +
"where j.org.id = :orgId " +
"and j.jobType = :jobType";
"where j.org.id = :orgId " +
"and j.jobType = :jobType " +
"order by j.id dsc";
Levi-Lehman marked this conversation as resolved.
Show resolved Hide resolved
Query<Job> query = session.createQuery(queryString);
query.setParameter("orgId", org.getId());
query.setParameter("jobType", jobType);
Expand Down