Skip to content

Commit 4c58a64

Browse files
fix(core): apply timeRange filter in triggers (#12721)
1 parent 686c99f commit 4c58a64

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

webserver/src/main/java/io/kestra/webserver/controllers/api/TriggerController.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import io.swagger.v3.oas.annotations.Operation;
3434
import io.swagger.v3.oas.annotations.Parameter;
3535
import io.swagger.v3.oas.annotations.enums.ParameterIn;
36+
import io.swagger.v3.oas.annotations.media.ExampleObject;
3637
import jakarta.inject.Inject;
3738
import jakarta.validation.Valid;
3839
import jakarta.validation.constraints.Min;
@@ -42,6 +43,7 @@
4243
import lombok.Getter;
4344
import lombok.extern.slf4j.Slf4j;
4445

46+
import java.time.Duration;
4547
import java.time.ZonedDateTime;
4648
import java.util.ArrayList;
4749
import java.util.List;
@@ -87,6 +89,10 @@ public PagedResults<Triggers> searchTriggers(
8789
// Deprecated params
8890
@Parameter(description = "A string filter",deprecated = true) @Nullable @QueryValue(value = "q") String query,
8991
@Parameter(description = "A namespace filter prefix", deprecated = true) @Nullable @QueryValue String namespace,
92+
@Parameter(description = "A time range filter relative to the current time", deprecated = true, examples = {
93+
@ExampleObject(name = "Filter last 5 minutes", value = "PT5M"),
94+
@ExampleObject(name = "Filter last 24 hours", value = "P1D")
95+
}) @Nullable @QueryValue Duration timeRange,
9096
@Parameter(description = "The identifier of the worker currently evaluating the trigger", deprecated = true) @Nullable @QueryValue String workerId,
9197
@Parameter(description = "The flow identifier",deprecated = true) @Nullable @QueryValue String flowId
9298

@@ -103,6 +109,9 @@ public PagedResults<Triggers> searchTriggers(
103109
null,
104110
null,
105111
null,
112+
timeRange,
113+
null,
114+
null,
106115
workerId,
107116
null);
108117

webserver/src/test/java/io/kestra/webserver/controllers/api/TriggerControllerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ void search() {
7878
.tenantId(TENANT_ID)
7979
.triggerId("trigger-nextexec-schedule")
8080
.date(ZonedDateTime.now())
81+
.nextExecutionDate(ZonedDateTime.now())
8182
.build();
8283

8384
jdbcTriggerRepository.save(trigger);

0 commit comments

Comments
 (0)