From 30e4ad8bfe71e6eba16f7d9be9492bf515620800 Mon Sep 17 00:00:00 2001 From: Gregory Rushton Date: Wed, 18 Nov 2026 17:13:43 -0500 Subject: [PATCH] [DT-4324][risk=no] Use the database clock in the DAR expiration test Co-Authored-By: Claude Fable 5.2 --- .../consent/http/db/DataAccessRequestDAOTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/broadinstitute/consent/http/db/DataAccessRequestDAOTest.java b/src/test/java/org/broadinstitute/consent/http/db/DataAccessRequestDAOTest.java index ce0f6478f..f2e5a742c 100644 --- a/src/test/java/org/broadinstitute/consent/http/db/DataAccessRequestDAOTest.java +++ b/src/test/java/org/broadinstitute/consent/http/db/DataAccessRequestDAOTest.java @@ -969,7 +969,12 @@ void testFindApprovedDARsByDatasetIdLastsTheExpirationDuration( long submittedHoursAgo, int expected) { Dataset dataset = createDARDAOTestDataset(); User user = createUserWithInstitution(); - Timestamp submitted = Timestamp.from(Instant.now().minus(submittedHoursAgo, ChronoUnit.HOURS)); + // The query compares the submission date with now() in the database. Read the time from the + // database too: its clock can differ from the JVM clock, which made the 8760 case fail. + Instant databaseNow = + jdbi.withHandle( + handle -> handle.createQuery("SELECT now()").mapTo(Timestamp.class).one().toInstant()); + Timestamp submitted = Timestamp.from(databaseNow.minus(submittedHoursAgo, ChronoUnit.HOURS)); DataAccessRequest dar = createDAR(user, dataset, uniqueDarCode(), submitted); Election election = createDataAccessElection(dar.getReferenceId(), dataset.getDatasetId()); Vote vote = createFinalVote(dataset.getCreateUserId(), election.getElectionId());