Merge pull request #104 from hmcts/feat/amp-182-update-timestamp

amp-182 update timestamp

Author: baranipek

build.gradle

@@ -40,7 +40,7 @@ springBoot {
 }
 
 dependencies {
-  implementation("uk.gov.hmcts.cp:api-hmcts-crime-template:2.0.0")
+  implementation("uk.gov.hmcts.cp:api-hmcts-crime-template:2.0.1")
 
   // --- Observability / Actuator / OTEL / Prometheus ---
   implementation 'org.springframework.boot:spring-boot-starter-actuator'

src/main/java/uk/gov/hmcts/cp/controllers/GlobalExceptionHandler.java

@@ -7,8 +7,7 @@
 import org.springframework.web.server.ResponseStatusException;
 import uk.gov.hmcts.cp.openapi.model.ErrorResponse;
 
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
+import java.time.Instant;
 import java.util.Objects;
 
 @RestControllerAdvice
@@ -21,16 +20,20 @@ public GlobalExceptionHandler(final Tracer tracer) {
     }
 
     @ExceptionHandler(ResponseStatusException.class)
-    public ResponseEntity<ErrorResponse> handleResponseStatusException(final ResponseStatusException responseStatusException) {
+    public ResponseEntity<ErrorResponse> handleResponseStatusException(
+            final ResponseStatusException responseStatusException) {
+
         final ErrorResponse error = ErrorResponse.builder()
                 .error(String.valueOf(responseStatusException.getStatusCode().value()))
-                .message(responseStatusException.getReason() != null ? responseStatusException.getReason() : responseStatusException.getMessage())
-                .timestamp(OffsetDateTime.now(ZoneOffset.UTC))
+                .message(responseStatusException.getReason() != null
+                        ? responseStatusException.getReason()
+                        : responseStatusException.getMessage())
+                .timestamp(Instant.now())
                 .traceId(Objects.requireNonNull(tracer.currentSpan()).context().traceId())
                 .build();
 
         return ResponseEntity
                 .status(responseStatusException.getStatusCode())
                 .body(error);
     }
-}
+}

src/test/java/uk/gov/hmcts/cp/controllers/GlobalExceptionHandlerTest.java

@@ -2,21 +2,25 @@
 
 import io.micrometer.tracing.Span;
 import io.micrometer.tracing.Tracer;
+import io.micrometer.tracing.TraceContext;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.server.ResponseStatusException;
-
 import uk.gov.hmcts.cp.openapi.model.ErrorResponse;
-import io.micrometer.tracing.TraceContext;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import java.time.Instant;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 class GlobalExceptionHandlerTest {
 
     @Test
-    void handleResponseStatusExceptionShouldReturnErrorResponseWithCorrectFields() {
+    void handle_response_status_exception_should_return_error_response_with_correct_fields() {
         // Arrange
         final Tracer tracer = mock(Tracer.class);
         final Span span = mock(Span.class);
@@ -29,18 +33,32 @@ void handleResponseStatusExceptionShouldReturnErrorResponseWithCorrectFields() {
         final GlobalExceptionHandler handler = new GlobalExceptionHandler(tracer);
 
         final String reason = "Test error";
-        final ResponseStatusException exception = new ResponseStatusException(HttpStatus.NOT_FOUND, reason);
+        final ResponseStatusException exception =
+                new ResponseStatusException(HttpStatus.NOT_FOUND, reason);
+
+        final Instant beforeCall = Instant.now();
 
         // Act
-        final ResponseEntity<ErrorResponse> response = handler.handleResponseStatusException(exception);
+        final ResponseEntity<ErrorResponse> response =
+                handler.handleResponseStatusException(exception);
+
+        final Instant afterCall = Instant.now();
 
         // Assert
         assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+
         final ErrorResponse error = response.getBody();
         assertNotNull(error);
+
         assertEquals("404", error.getError());
         assertEquals(reason, error.getMessage());
-        assertNotNull(error.getTimestamp());
         assertEquals("test-trace-id", error.getTraceId());
+
+        assertNotNull(error.getTimestamp());
+        assertTrue(
+                !error.getTimestamp().isBefore(beforeCall)
+                        && !error.getTimestamp().isAfter(afterCall),
+                "Timestamp should be between beforeCall and afterCall"
+        );
     }
-}
+}