diff --git a/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/AnonymousLeaderboardPersistenceIntegrationTest.java b/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/AnonymousLeaderboardPersistenceIntegrationTest.java index c30c3668..c6002a29 100644 --- a/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/AnonymousLeaderboardPersistenceIntegrationTest.java +++ b/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/AnonymousLeaderboardPersistenceIntegrationTest.java @@ -7,9 +7,13 @@ import com.idea2strategy.backend.application.competition.InvalidLeaderboardCursorException; import com.idea2strategy.backend.application.competition.LeaderboardAccessException; import com.idea2strategy.backend.application.competition.LeaderboardAuthenticationException; +import com.idea2strategy.backend.application.competition.LeaderboardQueryResult; import com.idea2strategy.backend.application.competition.RoomLeaderboardQuery; +import com.idea2strategy.backend.application.competition.RoomLeaderboardQueryResult; import java.time.Instant; +import java.time.LocalDate; import java.time.ZoneOffset; +import java.util.List; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -41,7 +45,9 @@ class AnonymousLeaderboardPersistenceIntegrationTest { private static final UUID FEE_POLICY_ID = id(60); private static final UUID BUFFER_POLICY_ID = id(61); private static final UUID OPERATOR_ID = id(62); - private static final Instant CUTOFF = Instant.parse("2026-08-02T05:00:00Z"); + // Ended rooms leave the leaderboard a year after ended_at, so the seeded rooms end on a recent day. + private static final Instant CUTOFF = LocalDate.now(ZoneOffset.UTC).minusDays(30) + .atTime(5, 0).toInstant(ZoneOffset.UTC); @Container static final PostgreSQLContainer POSTGRES = new PostgreSQLContainer("postgres:16-alpine"); @@ -308,14 +314,8 @@ void resolvesAnIssuedAnchorFromImmutableMembershipAfterItsOwnerIsSanctioned() { @Test void usesFrozenFinalSecretGrantsInsteadOfMutableParticipationStatus() { - seedSnapshot(SECRET_ROOM_ID, id(40), "FINAL", CUTOFF); - seedBotParticipation(SECRET_ROOM_ID, VIEWER_ID, id(41), id(42), "secret-member", "REGISTERED"); + seedSecretFinalAccess(); seedRoomDetails(SECRET_ROOM_ID); - jdbc.update( - "insert into competition.room_final_access_grants " - + "(room_id, account_id, snapshot_id, eligibility_basis, granted_at) " - + "values (?, ?, ?, 'ACTIVE_PARTICIPANT', ?)", - SECRET_ROOM_ID, VIEWER_ID, id(40), CUTOFF.atOffset(ZoneOffset.UTC)); assertThat(adapter.query(query(ROOM_ID, VIEWER_ID, null, null, 10))).isNotNull(); assertThat(adapter.query(query(SECRET_ROOM_ID, VIEWER_ID, null, null, 10)).snapshotId()) @@ -363,6 +363,29 @@ void closesEndedRoomQueriesAtTheExactOneYearBoundaryAndRechecksCursors() { .isEqualTo(SNAPSHOT_ID); } + @Test + void hidesPublicAndGrantedSecretRoomsThatEndedMoreThanAYearAgo() { + seedLeaderboard(); + seedSecretFinalAccess(); + assertThat(adapter.query(query(ROOM_ID, VIEWER_ID, null, null, 10)).snapshotId()).isEqualTo(SNAPSHOT_ID); + assertThat(adapter.query(query(SECRET_ROOM_ID, VIEWER_ID, null, null, 10)).snapshotId()).isEqualTo(id(40)); + + jdbc.update( + "update competition.rooms set ended_at = current_timestamp - interval '1 year 1 day' " + + "where id in (?, ?)", + ROOM_ID, SECRET_ROOM_ID); + + for (UUID roomId : List.of(ROOM_ID, SECRET_ROOM_ID)) { + assertThat(adapter.query(query(roomId, VIEWER_ID, null, null, 10))) + .isEqualTo(LeaderboardQueryResult.empty()); + assertThat(adapter.queryOwned(query(roomId, VIEWER_ID, null, null, 10))) + .isEqualTo(LeaderboardQueryResult.empty()); + assertThat(roomLeaderboardAdapter.queryRoomLeaderboard(new RoomLeaderboardQuery( + roomId, VIEWER_ID, null, null, null, 10, null, null, 10))) + .isEqualTo(RoomLeaderboardQueryResult.empty()); + } + } + @Test void returnsEmptyWhenNoPublishedOrFinalSnapshotExists() { assertThat(adapter.query(query(EMPTY_ROOM_ID, VIEWER_ID, null, null, 10)).rows()).isEmpty(); @@ -454,6 +477,16 @@ private void seedLeaderboard() { seedEntry(VIEWER_ID, id(22), id(12), id(32), "gamma", 2, false, null); } + private void seedSecretFinalAccess() { + seedSnapshot(SECRET_ROOM_ID, id(40), "FINAL", CUTOFF); + seedBotParticipation(SECRET_ROOM_ID, VIEWER_ID, id(41), id(42), "secret-member", "REGISTERED"); + jdbc.update( + "insert into competition.room_final_access_grants " + + "(room_id, account_id, snapshot_id, eligibility_basis, granted_at) " + + "values (?, ?, ?, 'ACTIVE_PARTICIPANT', ?)", + SECRET_ROOM_ID, VIEWER_ID, id(40), CUTOFF.atOffset(ZoneOffset.UTC)); + } + private void seedSanction(UUID accountId, String sanctionType) { jdbc.update( "insert into identity.account_sanctions " diff --git a/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/BacktestCompetitionSettlementPersistenceIntegrationTest.java b/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/BacktestCompetitionSettlementPersistenceIntegrationTest.java index a47622fd..ef1d6c9d 100644 --- a/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/BacktestCompetitionSettlementPersistenceIntegrationTest.java +++ b/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/BacktestCompetitionSettlementPersistenceIntegrationTest.java @@ -10,6 +10,7 @@ import java.math.BigDecimal; import java.time.Clock; import java.time.Instant; +import java.time.LocalDate; import java.time.ZoneOffset; import java.util.UUID; import org.junit.jupiter.api.Test; @@ -30,7 +31,9 @@ @org.springframework.boot.test.context.SpringBootTest( classes = BacktestCompetitionSettlementPersistenceIntegrationTest.TestApplication.class) class BacktestCompetitionSettlementPersistenceIntegrationTest { - private static final Instant NOW = Instant.parse("2026-08-10T03:00:00Z"); + // Ended rooms leave the leaderboard a year after ended_at, so settlement runs on a recent day. + private static final Instant NOW = LocalDate.now(ZoneOffset.UTC).minusDays(30) + .atTime(3, 0).toInstant(ZoneOffset.UTC); @Container static final PostgreSQLContainer POSTGRES = new PostgreSQLContainer("postgres:16-alpine"); diff --git a/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/BacktestResultIsolationPersistenceIntegrationTest.java b/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/BacktestResultIsolationPersistenceIntegrationTest.java index 032158d1..8ddabf50 100644 --- a/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/BacktestResultIsolationPersistenceIntegrationTest.java +++ b/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/BacktestResultIsolationPersistenceIntegrationTest.java @@ -7,6 +7,7 @@ import com.idea2strategy.backend.application.competition.OwnedBotComparisonQueryService; import com.idea2strategy.backend.messaging.backtest.v1.BacktestResultContractFixtures; import java.time.Instant; +import java.time.LocalDate; import java.time.ZoneOffset; import java.util.UUID; import org.junit.jupiter.api.Test; @@ -26,7 +27,9 @@ @Testcontainers(disabledWithoutDocker = true) @SpringBootTest(classes = BacktestResultIsolationPersistenceIntegrationTest.TestApplication.class) class BacktestResultIsolationPersistenceIntegrationTest { - private static final Instant AT = Instant.parse("2026-08-02T15:00:00Z"); + // Ended rooms leave the leaderboard a year after ended_at, so the rooms end on a recent day. + private static final Instant AT = LocalDate.now(ZoneOffset.UTC).minusDays(30) + .atTime(15, 0).toInstant(ZoneOffset.UTC); @Container static final PostgreSQLContainer POSTGRES = new PostgreSQLContainer("postgres:16-alpine"); diff --git a/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/CompetitionJourneyPersistenceE2ETest.java b/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/CompetitionJourneyPersistenceE2ETest.java index 948cf376..9cd6f65b 100644 --- a/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/CompetitionJourneyPersistenceE2ETest.java +++ b/modules/backend-persistence/src/test/java/com/idea2strategy/backend/persistence/competition/CompetitionJourneyPersistenceE2ETest.java @@ -40,6 +40,7 @@ import java.math.BigDecimal; import java.time.Clock; import java.time.Instant; +import java.time.LocalDate; import java.time.ZoneOffset; import java.util.List; import java.util.Map; @@ -60,7 +61,9 @@ @Testcontainers(disabledWithoutDocker = true) @SpringBootTest(classes = CompetitionJourneyPersistenceE2ETest.TestApplication.class) class CompetitionJourneyPersistenceE2ETest { - private static final Instant CREATED_AT = Instant.parse("2026-08-02T00:00:00Z"); + // Ended rooms leave the leaderboard a year after ended_at, so the journey runs on a recent day. + private static final Instant CREATED_AT = LocalDate.now(ZoneOffset.UTC).minusDays(30) + .atStartOfDay(ZoneOffset.UTC).toInstant(); private static final Instant RECRUITMENT_AT = CREATED_AT.plusSeconds(10); private static final Instant ADMISSION_AT = CREATED_AT.plusSeconds(30); private static final Instant EVALUATION_AT = CREATED_AT.plusSeconds(60);