Skip to content

Commit d7a4c6b

Browse files
committed
extended chnagelog
1 parent cb80b35 commit d7a4c6b

File tree

3 files changed

+36
-10
lines changed

3 files changed

+36
-10
lines changed

CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
# Changelog
22

3-
## v2.0.0 - (2025-06-16)
3+
## v2.1.0 - (2025-07-07)
4+
5+
### New features:
6+
7+
- Grouped triggers API
8+
- UI elements are published to npmjs.com
9+
- Lazy render of pages
10+
- Link to github
11+
12+
## v2.0.0 - (2025-06-16)x
413

514
### New features:
615

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,49 @@
11
package org.sterl.spring.persistent_tasks.history.api;
22

3-
import static org.junit.jupiter.api.Assertions.*;
3+
import static org.assertj.core.api.Assertions.assertThat;
4+
5+
import java.time.OffsetDateTime;
46

57
import org.junit.jupiter.api.BeforeEach;
68
import org.junit.jupiter.api.Test;
7-
import org.springframework.beans.factory.annotation.Autowired;
89
import org.springframework.boot.test.web.server.LocalServerPort;
10+
import org.springframework.http.HttpMethod;
911
import org.springframework.web.client.RestTemplate;
1012
import org.sterl.spring.persistent_tasks.AbstractSpringTest;
11-
import org.sterl.spring.persistent_tasks.trigger.repository.RunningTriggerRepository;
13+
import org.sterl.spring.persistent_tasks.api.TaskId;
14+
15+
import com.fasterxml.jackson.core.JsonProcessingException;
16+
import com.fasterxml.jackson.databind.JsonMappingException;
1217

1318
class TriggerHistoryResourceTest extends AbstractSpringTest {
1419

1520
@LocalServerPort
1621
private int port;
17-
@Autowired
18-
private RunningTriggerRepository triggerRepository;
1922
private String baseUrl;
2023
private final RestTemplate template = new RestTemplate();
2124

2225
@BeforeEach
2326
void setupRest() {
24-
baseUrl = "http://localhost:" + port + "/spring-tasks-api";
27+
baseUrl = "http://localhost:" + port + "/spring-tasks-api/";
2528
}
2629

2730
@Test
28-
void test() {
29-
fail("Not yet implemented");
31+
void testGroupSearch() throws JsonMappingException, JsonProcessingException {
32+
TaskId<String> taskId = taskService.replace("foo", c -> asserts.info("foo"));
33+
triggerService.queue(taskId.newTrigger().id("1").correlationId("a1").tag("tag1").build());
34+
triggerService.queue(taskId.newTrigger().id("2").correlationId("a1").tag("tag1").build());
35+
triggerService.queue(taskId.newTrigger().id("3").correlationId("a1").tag("tag2").build());
36+
37+
// WHEN
38+
persistentTaskTestService.runAllDueTrigger(OffsetDateTime.now().plusMinutes(1));
39+
var result = template.exchange(
40+
baseUrl + TriggerHistoryResource.PATH_GROUP + "?tag=tag1",
41+
HttpMethod.GET,
42+
null,
43+
String.class);
44+
45+
assertThat(result.getBody()).contains("\"count\":2");
46+
assertThat(result.getBody()).contains("\"groupByValue\":\"a1\"");
3047
}
3148

3249
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ private RunningTriggerEntity createStatus(TriggerKey key, TriggerStatus status)
208208
final var now = OffsetDateTime.now();
209209
final var isCancel = status == TriggerStatus.CANCELED;
210210

211-
RunningTriggerEntity result = new RunningTriggerEntity();
211+
var result = new RunningTriggerEntity();
212212
result.setData(TriggerEntity
213213
.builder()
214214
.correlationId(UUID.randomUUID().toString())

0 commit comments

Comments
 (0)