From 9feaa75f0017e130204c99f5167625de6ec015fa Mon Sep 17 00:00:00 2001 From: benedwards Date: Fri, 31 Jan 2025 11:16:23 +0000 Subject: [PATCH] Updated code to use currentTimeHelper --- .../gov/hmcts/darts/common/helper/CurrentTimeHelper.java | 7 +++++-- .../darts/log/service/impl/AudioLoggerServiceImpl.java | 8 +++----- .../log/service/impl/AudioLoggerServiceImplTest.java | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/darts/common/helper/CurrentTimeHelper.java b/src/main/java/uk/gov/hmcts/darts/common/helper/CurrentTimeHelper.java index 3aad1520b0f..d5f9659ef25 100644 --- a/src/main/java/uk/gov/hmcts/darts/common/helper/CurrentTimeHelper.java +++ b/src/main/java/uk/gov/hmcts/darts/common/helper/CurrentTimeHelper.java @@ -3,6 +3,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; +import java.time.Clock; import java.time.LocalDate; import java.time.OffsetDateTime; @@ -14,12 +15,14 @@ @RequiredArgsConstructor public class CurrentTimeHelper { + private final Clock clock; + public OffsetDateTime currentOffsetDateTime() { - return OffsetDateTime.now(); + return OffsetDateTime.now(clock); } public LocalDate currentLocalDate() { - return LocalDate.now(); + return LocalDate.now(clock); } } diff --git a/src/main/java/uk/gov/hmcts/darts/log/service/impl/AudioLoggerServiceImpl.java b/src/main/java/uk/gov/hmcts/darts/log/service/impl/AudioLoggerServiceImpl.java index 25dcf4e79f0..afa2d317e8e 100644 --- a/src/main/java/uk/gov/hmcts/darts/log/service/impl/AudioLoggerServiceImpl.java +++ b/src/main/java/uk/gov/hmcts/darts/log/service/impl/AudioLoggerServiceImpl.java @@ -4,12 +4,10 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import uk.gov.hmcts.darts.audio.model.AddAudioMetadataRequest; +import uk.gov.hmcts.darts.common.helper.CurrentTimeHelper; import uk.gov.hmcts.darts.log.service.AudioLoggerService; import uk.gov.hmcts.darts.util.DataUtil; -import java.time.Clock; -import java.time.OffsetDateTime; - import static uk.gov.hmcts.darts.util.DateTimeHelper.getDateTimeIsoFormatted; @Service @@ -17,7 +15,7 @@ @AllArgsConstructor public class AudioLoggerServiceImpl implements AudioLoggerService { - private final Clock clock; + private final CurrentTimeHelper currentTimeHelper; @Override public void audioUploaded(AddAudioMetadataRequest request) { @@ -33,6 +31,6 @@ public void missingCourthouse(String courthouse, String courtroom) { log.warn("Courthouse not found: courthouse={}, courtroom={}, timestamp={}", DataUtil.toUpperCase(courthouse), DataUtil.toUpperCase(courtroom), - getDateTimeIsoFormatted(OffsetDateTime.now(clock))); + getDateTimeIsoFormatted(currentTimeHelper.currentOffsetDateTime())); } } diff --git a/src/test/java/uk/gov/hmcts/darts/log/service/impl/AudioLoggerServiceImplTest.java b/src/test/java/uk/gov/hmcts/darts/log/service/impl/AudioLoggerServiceImplTest.java index bd80fe38828..86acdabe91d 100644 --- a/src/test/java/uk/gov/hmcts/darts/log/service/impl/AudioLoggerServiceImplTest.java +++ b/src/test/java/uk/gov/hmcts/darts/log/service/impl/AudioLoggerServiceImplTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import uk.gov.hmcts.darts.audio.model.AddAudioMetadataRequest; +import uk.gov.hmcts.darts.common.helper.CurrentTimeHelper; import uk.gov.hmcts.darts.log.service.AudioLoggerService; import uk.gov.hmcts.darts.util.TestClock; @@ -45,7 +46,7 @@ public static void tearDown() { @BeforeEach void setUp() { - audioLoggerService = new AudioLoggerServiceImpl(new TestClock(STARTED_AT)); + audioLoggerService = new AudioLoggerServiceImpl(new CurrentTimeHelper(new TestClock(STARTED_AT))); } @Test