Spring/spring-modulith
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-133 - Make sure event publication repositories return oldest uncompleted publications first.

Browse Source
This commit is contained in:
Oliver Drotbohm
2023-02-20 17:51:50 +01:00
parent 52fdc221a1
commit 3bd25bdb12
6 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepository.java
View File

@@ -59,6 +59,7 @@ class JdbcEventPublicationRepository implements EventPublicationRepository {
SELECT ID, COMPLETION_DATE, EVENT_TYPE, LISTENER_ID, PUBLICATION_DATE, SERIALIZED_EVENT
FROM EVENT_PUBLICATION
WHERE COMPLETION_DATE IS NULL
ORDER BY PUBLICATION_DATE ASC
""";
private static final String SQL_STATEMENT_UPDATE = """

31
spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepositoryIntegrationTests.java
View File

@@ -16,11 +16,15 @@
package org.springframework.modulith.events.jdbc;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import lombok.Value;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;
import java.util.Comparator;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
@@ -97,6 +101,31 @@ class JdbcEventPublicationRepositoryIntegrationTests {
assertThat(repository.findIncompletePublications()).isEmpty();
}
@Test // GH-133
void returnsOldestIncompletePublicationsFirst() {
when(serializer.serialize(any())).thenReturn("{}");
var now = LocalDateTime.now();
createPublicationAt(now.withHour(3));
createPublicationAt(now.withHour(0));
createPublicationAt(now.withHour(1));
assertThat(repository.findIncompletePublications())
.isSortedAccordingTo(Comparator.comparing(EventPublication::getPublicationDate));
}
private void createPublicationAt(LocalDateTime publicationDate) {
EventPublication publication = mock(EventPublication.class);
when(publication.getEvent()).thenReturn("");
when(publication.getTargetIdentifier()).thenReturn(TARGET_IDENTIFIER);
when(publication.getPublicationDate()).thenReturn(publicationDate.toInstant(ZoneOffset.UTC));
repository.create(publication);
}
@Nested
class Update {
@@ -240,10 +269,12 @@ class JdbcEventPublicationRepositoryIntegrationTests {
@Nested
@ActiveProfiles("hsqldb")
@Testcontainers(disabledWithoutDocker = false)
class HSQL extends TestBase {}
@Nested
@ActiveProfiles("h2")
@Testcontainers(disabledWithoutDocker = false)
class H2 extends TestBase {}
@Nested

2
spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepository.java
View File

@@ -53,6 +53,8 @@ class JpaEventPublicationRepository implements EventPublicationRepository {
from JpaEventPublication p
where
p.completionDate is null
order by
p.publicationDate asc
""";
private static final String DELETE_COMPLETED = """

20
spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java
View File

@@ -23,6 +23,9 @@ import jakarta.persistence.EntityManagerFactory;
import lombok.RequiredArgsConstructor;
import lombok.Value;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.Comparator;
import java.util.List;
import javax.sql.DataSource;
@@ -196,6 +199,23 @@ class JpaEventPublicationRepositoryIntegrationTests {
.element(0).extracting(it -> it.serializedEvent).isEqualTo(serializedEvent2);
}
@Test // GH-133
void returnsOldestIncompletePublicationsFirst() {
var now = LocalDateTime.now();
savePublicationAt(now.withHour(3));
savePublicationAt(now.withHour(0));
savePublicationAt(now.withHour(1));
assertThat(repository.findIncompletePublications())
.isSortedAccordingTo(Comparator.comparing(EventPublication::getPublicationDate));
}
private void savePublicationAt(LocalDateTime date) {
em.persist(new JpaEventPublication(date.toInstant(ZoneOffset.UTC), "", "", Object.class));
}
@Value
private static final class TestEvent {
String eventId;

3
spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepository.java
View File

@@ -79,7 +79,8 @@ class MongoDbEventPublicationRepository implements EventPublicationRepository {
@Override
public List<EventPublication> findIncompletePublications() {
var query = query(where("completionDate").isNull());
var query = query(where("completionDate").isNull())
.with(Sort.by("publicationDate").ascending());
return mongoTemplate.find(query, MongoDbEventPublication.class).stream() //
.<EventPublication> map(this::documentToDomain) //

23
spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepositoryTest.java
View File

@@ -19,8 +19,12 @@ import static org.assertj.core.api.Assertions.*;
import lombok.Value;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;
import java.util.Comparator;
import org.bson.types.ObjectId;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
@@ -100,6 +104,25 @@ class MongoDbEventPublicationRepositoryTest {
.element(0).extracting(EventPublication::getEvent).isEqualTo(testEvent1);
}
@Test // GH-133
void returnsOldestIncompletePublicationsFirst() {
var now = LocalDateTime.now();
savePublicationAt(now.withHour(3));
savePublicationAt(now.withHour(0));
savePublicationAt(now.withHour(1));
assertThat(repository.findIncompletePublications())
.isSortedAccordingTo(Comparator.comparing(EventPublication::getPublicationDate));
}
private void savePublicationAt(LocalDateTime date) {
mongoTemplate.save(
new MongoDbEventPublication(new ObjectId(), date.toInstant(ZoneOffset.UTC), "", "", null));
}
@Nested
class FindByEventAndTargetIdentifier {