Refactor

Author: stephenokeefe

build.gradle

@@ -515,7 +515,7 @@ dependencies {
 
   testImplementation group: 'org.jeasy', name: 'easy-random-core', version: '5.0.0'
 
-  integrationTestImplementation 'com.atlassian.oai:swagger-request-validator-core:2.46.0'
+  testImplementation 'com.atlassian.oai:swagger-request-validator-core:2.46.0'
 
   compileJava.dependsOn = openApiGenerateTaskList
 }

src/integrationTest/java/uk/gov/hmcts/darts/transcriptions/controller/TranscriptionControllerGetTranscriptionTest.java

@@ -287,7 +287,7 @@ void getTranscriptionNotFoundWhenIsCurrentFalse() throws Exception {
     }
 
     @Test
-    void getTranscriptionBadRequest() throws Exception {
+    void getTranscription_ShouldReturnBadRequest_WhenNegativeTranscriptionId() throws Exception {
         MockHttpServletRequestBuilder requestBuilder = get(ENDPOINT_URL_TRANSCRIPTION, -999);
         MvcResult response = mockMvc.perform(requestBuilder).andExpect(status().isBadRequest()).andReturn();
         String actualResponse = response.getResponse().getContentAsString();

src/main/java/uk/gov/hmcts/darts/authorisation/component/impl/AuthorisationImpl.java

@@ -24,6 +24,7 @@
 import uk.gov.hmcts.darts.common.repository.TranscriptionRepository;
 import uk.gov.hmcts.darts.common.repository.TransformedMediaRepository;
 import uk.gov.hmcts.darts.util.DataUtil;
+import uk.gov.hmcts.darts.util.ValidationConstants;
 
 import java.util.Collections;
 import java.util.List;
@@ -118,7 +119,7 @@ public void authoriseByMediaId(Long mediaId, Set<SecurityRoleEnum> securityRoles
     @SuppressWarnings({"PMD.ExceptionAsFlowControl"})
     public void authoriseByTranscriptionId(Long transcriptionId, Set<SecurityRoleEnum> securityRoles) {
         try {
-            if (!DataUtil.isWithinBounds(transcriptionId, 1L, 9_223_372_036_854_775_807L)) {
+            if (!DataUtil.isWithinBounds(transcriptionId, 1L, ValidationConstants.MaxValues.MAX_LONG_VALUE)) {
                 throw new BadRequestException();
             }
             final List<CourthouseEntity> courthouses = getCourthousesFromTranscription(transcriptionId);

src/main/java/uk/gov/hmcts/darts/util/ValidationConstants.java

@@ -0,0 +1,12 @@
+package uk.gov.hmcts.darts.util;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+@SuppressWarnings({"HideUtilityClassConstructor", "java:S1118", "PMD.MissingStaticMethodInNonInstantiatableClass"})
+public class ValidationConstants {
+
+    public static class  MaxValues {
+        public static final Long MAX_LONG_VALUE = 9_223_372_036_854_775_807L;
+    }
+}

src/integrationTest/java/uk/gov/hmcts/darts/transcriptions/api/TranscriptionOpenApiContractTest.java renamed to src/test/java/uk/gov/hmcts/darts/openapi/TranscriptionOpenApiContractTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.darts.transcriptions.api;
+package uk.gov.hmcts.darts.openapi;
 
 import com.atlassian.oai.validator.OpenApiInteractionValidator;
 import com.atlassian.oai.validator.model.Request;