adjusted search

Author: sterlp

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.5.6 - (2025-03-06)
+
+-   Better ID search
+-   Added info to the UI how to search
+
 ## v1.5.5 - (2025-03-04)
 
 -   MdcTriggerInterceptor adds now start date and scheduler name

core/src/main/java/org/sterl/spring/persistent_tasks/history/HistoryService.java

@@ -17,6 +17,7 @@
 import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryLastStateEntity;
 import org.sterl.spring.persistent_tasks.history.repository.TriggerHistoryDetailRepository;
 import org.sterl.spring.persistent_tasks.history.repository.TriggerHistoryLastStateRepository;
+import org.sterl.spring.persistent_tasks.shared.StringHelper;
 import org.sterl.spring.persistent_tasks.shared.stereotype.TransactionalService;
 import org.sterl.spring.persistent_tasks.trigger.TriggerService;
 import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
@@ -102,8 +103,7 @@ public Page<TriggerHistoryLastStateEntity> findTriggerState(
         if (key == null && status == null) {
             return triggerHistoryLastStateRepository.findAll(page);
         }
-        var id = key == null ? null : key.getId();
-        if (id != null) id = id += "%";
+        final var id = StringHelper.applySearchWildCard(key);
         final var name = key == null ? null : key.getTaskName();
         return triggerHistoryLastStateRepository.findAll(id, name, status, page);
     }

core/src/main/java/org/sterl/spring/persistent_tasks/shared/StringHelper.java

@@ -0,0 +1,22 @@
+package org.sterl.spring.persistent_tasks.shared;
+
+import org.sterl.spring.persistent_tasks.api.TriggerKey;
+
+public class StringHelper {
+
+    /**
+     * Replaces all <code>*</code> with <code>%</code> as needed
+     */
+    public static String applySearchWildCard(String value) {
+        if (value == null || value.length() == 0) return null;
+        return value.replace('*', '%');
+    }
+
+    /**
+     * Replaces all <code>*</code> with <code>%</code> as needed for the id.
+     */
+    public static String applySearchWildCard(TriggerKey key) {
+        if (key == null) return null;
+        return applySearchWildCard(key.getId());
+    }
+}

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

@@ -11,6 +11,7 @@
 import org.sterl.spring.persistent_tasks.api.TaskId;
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
 import org.sterl.spring.persistent_tasks.api.TriggerStatus;
+import org.sterl.spring.persistent_tasks.shared.StringHelper;
 import org.sterl.spring.persistent_tasks.shared.stereotype.TransactionalCompontant;
 import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
 import org.sterl.spring.persistent_tasks.trigger.repository.TriggerRepository;
@@ -53,7 +54,7 @@ public List<TriggerEntity> findTriggersLastPingAfter(OffsetDateTime dateTime) {
     public Page<TriggerEntity> listTriggers(@Nullable TriggerKey key,
             @Nullable TriggerStatus status, Pageable page) {
         if (key == null && status == null) return triggerRepository.findAll(page);
-        final var id = key == null ? null : key.getId();
+        final var id = StringHelper.applySearchWildCard(key);
         final var name = key == null ? null : key.getTaskName();
         return triggerRepository.findAll(id, name, status, page);
     }

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

@@ -4,6 +4,7 @@
 
 import java.time.Duration;
 import java.time.OffsetDateTime;
+import java.util.UUID;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -63,14 +64,18 @@ void testList() {
     @Test
     void testSearchById() {
         // GIVEN
+        var uuid = UUID.randomUUID().toString();
         var key1 = triggerService.queue(TaskTriggerBuilder
-                .newTrigger("task1").build()).getKey();
+                .newTrigger("task1")
+                    .id("[@foo:[email protected]:" + uuid + "]")
+                    .build())
+                .getKey();
         var key2 = triggerService.queue(TaskTriggerBuilder
                 .newTrigger("task1").build()).getKey();
 
         // WHEN
         var response = template.exchange(
-                baseUrl + "?id=" + key1.getId().substring(0, 30),
+                baseUrl + "?id=" + key1.getId().substring(0, 30) + "*",
                 HttpMethod.GET,
                 null,
                 String.class);
@@ -80,21 +85,30 @@ void testSearchById() {
         assertThat(response.getBody()).isNotNull();
         assertThat(response.getBody()).contains(key1.getId());
         assertThat(response.getBody()).doesNotContain(key2.getId());
+        
+        // WHEN
+        response = template.exchange(
+                baseUrl + "?id=*" + key1.getId().substring(10, 30) + "*",
+                HttpMethod.GET,
+                null,
+                String.class);
+        assertThat(response.getBody()).contains(key1.getId());
+        assertThat(response.getBody()).doesNotContain(key2.getId());
     }
-    
+
     @Test
     void testSearchByStatus() {
         // GIVEN
         var k1 = createStatus(new TriggerKey("1-foo", "foo"), TriggerStatus.WAITING).getKey();
         var k2 = createStatus(new TriggerKey("2-foo", "bar"), TriggerStatus.RUNNING).getKey();
-        
+
         // WHEN
         var response = template.exchange(
                 baseUrl + "?status=" + TriggerStatus.RUNNING,
                 HttpMethod.GET,
                 null,
                 String.class);
-        
+
         // THEN
         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
         assertThat(response.getBody()).isNotNull();

ui/src/history/history.page.tsx

@@ -8,7 +8,6 @@ import TriggerStatusSelect from "@src/shared/view/triger-status-select.view";
 import TriggerItemView from "@src/shared/view/trigger-list-item.view";
 import TaskSelect from "@src/task/view/task-select.view";
 import { useQuery } from "crossroad";
-import { useState } from "react";
 import { Accordion, Col, Form, Row, Stack } from "react-bootstrap";
 
 const HistoryPage = () => {
@@ -19,7 +18,7 @@ const HistoryPage = () => {
     );
 
     const doReload = () => {
-        triggers.doGet("?size=10&" + new URLSearchParams(query).toString());
+        triggers.doGet("?size=4&" + new URLSearchParams(query).toString());
     };
 
     useAutoRefresh(10000, doReload, [query]);
@@ -33,11 +32,12 @@ const HistoryPage = () => {
                         <Form.Control
                             defaultValue={query.id || ""}
                             type="text"
-                            placeholder="Search..."
+                            placeholder="ID search, '*' any string, '_' any character ..."
                             onKeyUp={(e) =>
                                 e.key == "Enter"
                                     ? setQuery((prev) => ({
                                           ...prev,
+                                          page: 0 + "",
                                           id: (e.target as HTMLInputElement)
                                               .value,
                                       }))

ui/src/trigger/triggers.page.tsx

@@ -30,11 +30,12 @@ const TriggersPage = () => {
                     <Form.Control
                         defaultValue={query.id || ""}
                         type="text"
-                        placeholder="Search..."
+                        placeholder="ID search, '*' any string, '_' any character ..."
                         onKeyUp={(e) =>
                             e.key == "Enter"
                                 ? setQuery((prev) => ({
                                       ...prev,
+                                      page: 0 + "",
                                       id: (e.target as HTMLInputElement).value,
                                   }))
                                 : null