fixed search and extended resume function

Author: sterlp

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.1.2 - (2025-07-07)
+
+### Bug fixes:
+- fixed search for exact values
+- extended resume function interface to modify the state
+
 ## v2.1.0 - (2025-07-07)
 
 ### New features:

core/src/main/java/org/sterl/spring/persistent_tasks/shared/repository/TriggerRepository.java

@@ -40,15 +40,16 @@ default Predicate buildSearch(
         final var predicate = new BooleanBuilder();
 
         if (search.getSearch() != null) {
-            final var value = StringHelper.applySearchWildCard(search.getSearch());
             Predicate pId;
-            if (StringHelper.isSqlSearch(value)) {
+            if (StringHelper.isSqlSearch(search.getSearch())) {
+                final var value = StringHelper.applySearchWildCard(search.getSearch());
                 pId = ExpressionUtils.anyOf(
                         qData.key.id.like(value),
                         qData.correlationId.like(value),
                         qData.tag.like(value)
                     );
             } else {
+                final var value = search.getSearch();
                 pId = ExpressionUtils.anyOf(
                         qData.key.id.eq(value),
                         qData.correlationId.eq(value),

core/src/main/java/org/sterl/spring/persistent_tasks/task/exception/CancelTaskException.java

@@ -5,6 +5,7 @@
  */
 public class CancelTaskException extends TaskException {
     private static final long serialVersionUID = 1L;
+
     public CancelTaskException(String message, Throwable cause) {
         super(message, cause);
     }

core/src/main/java/org/sterl/spring/persistent_tasks/task/exception/FailTaskNoRetryException.java

@@ -5,6 +5,7 @@
  */
 public class FailTaskNoRetryException extends TaskException {
     private static final long serialVersionUID = 1L;
+
     public FailTaskNoRetryException(String message, Throwable cause) {
         super(message, cause);
     }

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/TriggerService.java

@@ -5,6 +5,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -142,9 +143,7 @@ public <T extends Serializable> RunningTriggerEntity queue(TriggerRequest<T> tig
     }
 
     /**
-     * Will resume any found
-     * @param trigger
-     * @return
+     * Will resume any found {@link RunningTriggerEntity} in state {@link TriggerStatus#AWAITING_SIGNAL}
      */
     public Page<RunningTriggerEntity> resume(TriggerRequest<?> trigger) {
         if (trigger.key().getId() == null && trigger.correlationId() == null) {
@@ -153,6 +152,19 @@ public Page<RunningTriggerEntity> resume(TriggerRequest<?> trigger) {
         taskService.assertIsKnown(trigger.taskId());
         return editTrigger.resume(trigger);
     }
+    
+    /**
+     * Will resume first found {@link RunningTriggerEntity} in state {@link TriggerStatus#AWAITING_SIGNAL}
+     * with the given search.
+     */
+    public <T extends Serializable> Optional<RunningTriggerEntity> resumeOne(
+            TriggerSearch search, Function<T, T> stateModifier) {
+        if (search.getKeyId() == null && search.getCorrelationId() == null) {
+            throw new IllegalArgumentException("Trigger ID or correlationId required to resume: " 
+                    + search);
+        }
+        return editTrigger.resumeOne(search, stateModifier);
+    }
 
     /**
      * If you changed your mind, cancel the persistentTask

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/component/EditTriggerComponent.java

@@ -5,6 +5,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.domain.Page;
@@ -149,6 +150,29 @@ public Page<RunningTriggerEntity> resume(TriggerRequest<?> trigger) {
         return foundTriggers;
     }
 
+    /**
+     * Resumes the first found trigger with the given
+     * @param <T> state type
+     * @param search search to run
+     * @param stateModifier updates the state and should return the run 
+     * @return the updated trigger
+     */
+    public <T extends Serializable> Optional<RunningTriggerEntity> resumeOne(
+            TriggerSearch search, Function<T, T> stateModifier) {
+        
+        search.setStatus(TriggerStatus.AWAITING_SIGNAL);
+        var foundTriggers = readTrigger.searchTriggers(search, Pageable.ofSize(1));
+
+        foundTriggers.forEach(t -> {
+            var newStart = stateModifier.apply((T)stateSerializer.deserialize(t.getData().getState()));
+            t.getData().setState(stateSerializer.serialize(newStart));
+            t.runAt(OffsetDateTime.now());
+            publisher.publishEvent(new TriggerResumedEvent(t.getId(), t.copyData(), newStart));
+        });
+
+        return foundTriggers.isEmpty() ? Optional.empty() : Optional.of(foundTriggers.getContent().get(0));
+    }
+    
     public RunningTriggerEntity expireTrigger(RunningTriggerEntity t) {
         t.getData().setStatus(TriggerStatus.EXPIRED_SIGNAL);
         t.getData().setStart(null);

core/src/test/java/org/sterl/spring/persistent_tasks/trigger/TriggerServiceTest.java

@@ -20,6 +20,7 @@
 import org.sterl.spring.persistent_tasks.api.TaskId.TriggerBuilder;
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
 import org.sterl.spring.persistent_tasks.api.TriggerRequest;
+import org.sterl.spring.persistent_tasks.api.TriggerSearch;
 import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 import org.sterl.spring.persistent_tasks.history.repository.CompletedTriggerRepository;
 import org.sterl.spring.persistent_tasks.task.exception.CancelTaskException;
@@ -556,6 +557,47 @@ void testResumeWaitingTriggerForSignal() {
         assertThat(persistentTaskTestService.runNextTrigger()).isEmpty();
     }
 
+    @Test
+    void testResumeWaitingTriggerWithFunction() {
+        // GIVEN
+        TaskId<String> taskId = taskService.replace("foo", asserts::info);
+        subject.queue(taskId.newTrigger()
+                .waitForSignal(OffsetDateTime.now().plusDays(1))
+                .state("foo bar")
+                .tag("aaa")
+                .build());
+        var triggerKey = subject.queue(taskId.newTrigger()
+                .waitForSignal(OffsetDateTime.now().plusDays(1))
+                .state("old state")
+                .tag("aaa")
+                .build()).getKey();
+        assertThat(persistentTaskTestService.runNextTrigger()).isEmpty();
+        
+        // WHEN
+        var search = new TriggerSearch();
+        search.setTag("aaa");
+        search.setKeyId(triggerKey.getId());
+        subject.resumeOne(search, s -> {
+            return "Cool new State";
+        });
+        
+        // THEN
+        var t = subject.get(triggerKey).get();
+        assertThat(t.getData().getStatus()).isEqualTo(TriggerStatus.WAITING);
+        assertThat(t.getData().getState()).isEqualTo(subject.getStateSerializer().serialize("Cool new State"));
+        
+        // WHEN
+        assertThat(persistentTaskTestService.runNextTrigger()).isPresent();
+        
+        // THEN
+        asserts.awaitValueOnce("Cool new State");
+        asserts.assertMissing("old state");
+        asserts.assertMissing("foo bar");
+        assertThat(events.stream(TriggerResumedEvent.class).count()).isOne();
+        // AND
+        assertThat(persistentTaskTestService.runNextTrigger()).isEmpty();
+    }
+    
     @Test
     void testAwaitForSignalTriggersInTimeoutWillNotRun() {
         // GIVEN

core/src/test/java/org/sterl/spring/persistent_tasks/trigger/api/TriggerResourceTest.java

@@ -99,6 +99,19 @@ void testSearchById() {
         assertThat(response.getBody()).isNotNull();
         assertThat(response.getBody()).contains(key1.getId());
         assertThat(response.getBody()).doesNotContain(key2.getId());
+        
+        // WHEN exact search, no wild card
+        response = template.exchange(
+                baseUrl + "?search=" + key1.getId(),
+                HttpMethod.GET,
+                null,
+                String.class);
+        
+        // THEN
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(response.getBody()).isNotNull();
+        assertThat(response.getBody()).contains(key1.getId());
+        assertThat(response.getBody()).doesNotContain(key2.getId());
     }
 
     @Test