GH-1925 - Prevent completed event publications from being resubmitted or marked as failed

spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepositoryV2.java

@@ -109,6 +109,7 @@ private static String getUpdateSql(String table, Status status) {
 						STATUS = '%s'
 				WHERE
 						ID = ?
+						AND COMPLETION_DATE IS NULL
 						AND (STATUS IS NULL OR STATUS != '%s')
 				""".formatted(table, status.name(), status.name()));
 	}
@@ -418,6 +419,7 @@ public boolean markResubmitted(UUID identifier, Instant instant) {
 						LAST_RESUBMISSION_DATE = ?
 				WHERE
 						ID = ?
+						AND COMPLETION_DATE IS NULL
 						AND (STATUS IS NULL OR STATUS != 'RESUBMITTED')
 				""".formatted(settings.getTable()));
 

spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepositoryV2IntegrationTests.java

@@ -661,6 +661,27 @@ void marksPublicationWithNullStatusColumnAsFailed() {
 					.containsExactly(publication.getIdentifier());
 		}
 
+		@Test // GH-1925
+		void doesNotResubmitCompletedPublication() {
+
+			var publication = createPublication(new TestEvent("completed"));
+
+			repository.markCompleted(publication.getIdentifier(), Instant.now());
+
+			assertThat(repository.markResubmitted(publication.getIdentifier(), Instant.now())).isFalse();
+		}
+
+		@Test // GH-1925
+		void doesNotMarkCompletedPublicationFailed() {
+
+			var publication = createPublication(new TestEvent("completed"));
+
+			repository.markCompleted(publication.getIdentifier(), Instant.now());
+			repository.markFailed(publication.getIdentifier());
+
+			assertThat(repository.findByStatus(Status.FAILED)).isEmpty();
+		}
+
 		/**
 		 * Simulates a publication persisted by a schema version that predates the {@code STATUS} column, i.e. one for
 		 * which the column was never backfilled and is {@literal null} rather than defaulted.

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

@@ -154,6 +154,7 @@ class JpaEventPublicationRepository implements EventPublicationRepository {
 			update DefaultJpaEventPublication p
 			   set p.status = ?1
 			 where p.id = ?2
+			   and p.completionDate is null
 			   and (status is null or status != ?1)
 			""";
 
@@ -163,6 +164,7 @@ class JpaEventPublicationRepository implements EventPublicationRepository {
 			       p.completionAttempts = p.completionAttempts + 1,
 			       p.lastResubmissionDate = ?1
 			 where p.id = ?2
+			   and p.completionDate is null
 			   and (p.status is null or p.status != org.springframework.modulith.events.EventPublication$Status.RESUBMITTED)
 			""";
 

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

@@ -619,6 +619,33 @@ void marksPublicationWithNullStatusColumnAsFailed() {
 					.containsExactly(publication.getIdentifier());
 		}
 
+		@Test // GH-1925
+		void doesNotResubmitCompletedPublication() {
+
+			var publication = createPublication(new TestEvent("completed"));
+
+			repository.markCompleted(publication.getIdentifier(), Instant.now());
+			em.flush();
+			em.clear();
+
+			assertThat(repository.markResubmitted(publication.getIdentifier(), Instant.now())).isFalse();
+		}
+
+		@Test // GH-1925
+		void doesNotMarkCompletedPublicationFailed() {
+
+			var publication = createPublication(new TestEvent("completed"));
+
+			repository.markCompleted(publication.getIdentifier(), Instant.now());
+			em.flush();
+			em.clear();
+
+			repository.markFailed(publication.getIdentifier());
+			em.clear();
+
+			assertThat(repository.findByStatus(Status.FAILED)).isEmpty();
+		}
+
 		/**
 		 * Simulates a publication persisted by a schema version that predates the {@code status} column, i.e. one for
 		 * which the column was never backfilled and is {@literal null} rather than defaulted.

spring-modulith-events/spring-modulith-events-neo4j/src/main/java/org/springframework/modulith/events/neo4j/Neo4jEventPublicationRepository.java

@@ -160,13 +160,15 @@ class Neo4jEventPublicationRepository implements EventPublicationRepository {
 
 	private static final Statement UPDATE_STATUS_STATEMENT = match(EVENT_PUBLICATION_NODE)
 			.where(EVENT_PUBLICATION_NODE.property(ID).eq(parameter(ID)))
+			.and(EVENT_PUBLICATION_NODE.property(COMPLETION_DATE).isNull())
 			.and(EVENT_PUBLICATION_NODE.property(STATUS).isNull()
 					.or(EVENT_PUBLICATION_NODE.property(STATUS).ne(parameter(STATUS))))
 			.set(EVENT_PUBLICATION_NODE.property(STATUS).to(parameter(STATUS)))
 			.build();
 
 	private static final Statement RESUBMIT_STATEMENT = match(EVENT_PUBLICATION_NODE)
 			.where(EVENT_PUBLICATION_NODE.property(ID).eq(parameter(ID)))
+			.and(EVENT_PUBLICATION_NODE.property(COMPLETION_DATE).isNull())
 			.and(EVENT_PUBLICATION_NODE.property(STATUS).isNull()
 					.or(EVENT_PUBLICATION_NODE.property(STATUS).ne(literalOf(Status.RESUBMITTED.name()))))
 			.set(EVENT_PUBLICATION_NODE.property(STATUS).to(parameter(STATUS)))

spring-modulith-events/spring-modulith-events-neo4j/src/test/java/org/springframework/modulith/events/neo4j/Neo4jEventPublicationRepositoryTest.java

@@ -581,6 +581,27 @@ void marksPublicationWithNullStatusPropertyAsFailed() {
 					.containsExactly(publication.getIdentifier());
 		}
 
+		@Test // GH-1925
+		void doesNotResubmitCompletedPublication() {
+
+			var publication = createPublication(new TestEvent("completed"));
+
+			repository.markCompleted(publication.getIdentifier(), Instant.now());
+
+			assertThat(repository.markResubmitted(publication.getIdentifier(), Instant.now())).isFalse();
+		}
+
+		@Test // GH-1925
+		void doesNotMarkCompletedPublicationFailed() {
+
+			var publication = createPublication(new TestEvent("completed"));
+
+			repository.markCompleted(publication.getIdentifier(), Instant.now());
+			repository.markFailed(publication.getIdentifier());
+
+			assertThat(repository.findByStatus(EventPublication.Status.FAILED)).isEmpty();
+		}
+
 		/**
 		 * Simulates a publication persisted by a schema version that predates the {@code status} property, i.e. one for
 		 * which the property is missing rather than defaulted.