8000 Quartz - display trigger timezone in UI #3971 by Ki10V01T · Pull Request #4579 · jmix-framework/jmix · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Quartz - display trigger timezone in UI #3971 #4579

8000
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

Merged
merged 5 commits into from
Jul 4, 2025
Merged

Quartz - display trigger timezone in UI #3971 #4579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86d1bb7
Added timeZoneId field to TriggerModel class. Added setting timeZoneI…
Ki10V01T Jul 1, 2025
8d23663
removed timeZoneId column from JobModelDetailView and added info abou…
Ki10V01T Jul 2, 2025
64a16c8
Returned the renders to their original state. Moved logic from render…
Ki10V01T Jul 2, 2025
93ca2b3
Minor code refactoring. Renamed variables in tests
Ki10V01T Jul 3, 2025
eee41f6
Minor code refactoring
Ki10V01T Jul 4, 2025
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
6 changes: 6 additions & 0 deletions jmix-quartz/quartz/src/main/java/io/jmix/quartz/model/TriggerModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public class TriggerModel {
@Positive
private Long repeatInterval;

private String timeZoneId;

public UUID getId() {
return id;
}
Expand Down Expand Up @@ -75,6 +77,10 @@ public ScheduleType getScheduleType() {
return scheduleType;
}

public void setTimeZoneId(String timeZone) { this.timeZoneId = timeZone; }

public String getTimeZoneId() { return timeZoneId; }

@Nullable
public Date getStartDate() {
return startDate;
Expand Down
1 change: 1 addition & 0 deletions jmix-quartz/quartz/src/main/java/io/jmix/quartz/service/QuartzService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ from the startTime to the current moment after trigger is recreated (all trigger

if (trigger instanceof CronTrigger) {
triggerModel.setCronExpression(((CronTrigger) trigger).getCronExpression());
triggerModel.setTimeZoneId(((CronTrigger) trigger).getTimeZone().getID());
} else if (trigger instanceof SimpleTrigger simpleTrigger) {
triggerModel.setRepeatCount(simpleTrigger.getRepeatCount());
triggerModel.setRepeatInterval(simpleTrigger.getRepeatInterval());
Expand Down
2 changes: 1 addition & 1 deletion jmix-quartz/quartz/src/main/java/io/jmix/quartz/util/ScheduleDescriptionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public String getScheduleDescription(TriggerModel triggerModel) {
}

if (scheduleType == ScheduleType.CRON_EXPRESSION) {
return triggerModel.getCronExpression();
return String.format("%s (%s)", triggerModel.getCronExpression(), triggerModel.getTimeZoneId());
}

Long repeatInterval = triggerModel.getRepeatInterval();
Expand Down
10000 1 change: 1 addition & 0 deletions jmix-quartz/quartz/src/main/resources/io/jmix/quartz/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ io.jmix.quartz.model/TriggerModel.triggerName=Name
io.jmix.quartz.model/TriggerModel.triggerGroup=Group
io.jmix.quartz.model/TriggerModel.scheduleType=Schedule type
io.jmix.quartz.model/TriggerModel.startDate=Start date
io.jmix.quartz.model/TriggerModel.timeZoneId=Time zone
io.jmix.quartz.model/TriggerModel.lastFireDate=Last fire date
io.jmix.quartz.model/TriggerModel.nextFireDate=Next fire date
io.jmix.quartz.model/TriggerModel.misfireInstructionId=Misfire instruction
Expand Down
21 changes: 18 additions & 3 deletions jmix-quartz/quartz/src/test/java/io/jmix/quartz/util/ScheduleDescriptionProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,14 @@ void getScheduleDescription_cron_schedule_type() {
TriggerModel triggerMock = mock(TriggerModel.class);
when(triggerMock.getScheduleType()).thenReturn(CRON_EXPRESSION);
String cronExpression = CRON_EXPRESSION_EXAMPLE;
String timeZoneId = "UTC";
String expectedResult = String.format("%s (%s)", cronExpression, timeZoneId);

when(triggerMock.getTimeZoneId()).thenReturn("UTC");
when(triggerMock.getCronExpression()).thenReturn(cronExpression);

ScheduleDescriptionProvider service = new ScheduleDescriptionProvider(messagesMock);
assertEquals(cronExpression, service.getScheduleDescription(triggerMock));
assertEquals(expectedResult, service.getScheduleDescription(triggerMock));
}

@Test
Expand Down Expand Up @@ -157,29 +161,40 @@ void getScheduleDescription_for_job_without_triggers() {
void getScheduleDescription_for_job_one_trigger() {
JobModel jobModelMock = mock(JobModel.class);
TriggerModel triggerModelMock = mock(TriggerModel.class);
String timeZoneId = "UTC";
String expectedResult = String.format("%s (%s)", CRON_EXPRESSION_EXAMPLE, timeZoneId);

when(triggerModelMock.getTimeZoneId()).thenReturn("UTC");
when(triggerModelMock.getScheduleType()).thenReturn(CRON_EXPRESSION);
when(triggerModelMock.getCronExpression()).thenReturn(CRON_EXPRESSION_EXAMPLE);
when(jobModelMock.getTriggers()).thenReturn(asList(triggerModelMock));

ScheduleDescriptionProvider service = new ScheduleDescriptionProvider(mock(Messages.class));
assertEquals(CRON_EXPRESSION_EXAMPLE, service.getScheduleDescription(jobModelMock));
assertEquals(expectedResult, service.getScheduleDescription(jobModelMock));
}

@Test
void getScheduleDescription_for_job_some_trigger() {
JobModel jobModelMock = mock(JobModel.class);
TriggerModel triggerModelMock = mock(TriggerModel.class);
String timeZoneId = "UTC";
String cronExpressionWithTimeZone1 = String.format("%s (%s)", CRON_EXPRESSION_EXAMPLE, timeZoneId);
String cronExpressionWithTimeZone2 = String.format("%s (%s)", CRON_EXPRESSION_EXAMPLE_2, timeZoneId);
String expectedResult = cronExpressionWithTimeZone1+", "+cronExpressionWithTimeZone2;

when(triggerModelMock.getTimeZoneId()).thenReturn("UTC");
when(triggerModelMock.getScheduleType()).thenReturn(CRON_EXPRESSION);
when(triggerModelMock.getCronExpression()).thenReturn(CRON_EXPRESSION_EXAMPLE);

TriggerModel triggerModelMock2 = mock(TriggerModel.class);
when(triggerModelMock2.getTimeZoneId()).thenReturn("UTC");
when(triggerModelMock2.getScheduleType()).thenReturn(CRON_EXPRESSION);
when(triggerModelMock2.getCronExpression()).thenReturn(CRON_EXPRESSION_EXAMPLE_2);

when(jobModelMock.getTriggers()).thenReturn(asList(triggerModelMock, triggerModelMock2));

ScheduleDescriptionProvider service = new ScheduleDescriptionProvider(mock(Messages.class));
assertEquals(CRON_EXPRESSION_EXAMPLE+", "+CRON_EXPRESSION_EXAMPLE_2, service.getScheduleDescription(jobModelMock));
assertEquals(expectedResult, service.getScheduleDescription(jobModelMock));
}

@Test
Expand Down
0