DSND-3213: Fix metrics 404 not found on PSC GET list (#168)

Author: cgregoryCH

src/main/java/uk/gov/companieshouse/pscdataapi/service/CompanyExemptionsApiService.java

@@ -48,6 +48,7 @@ public Optional<CompanyExemptions> getCompanyExemptions(final String companyNumb
             throw new BadGatewayException("URI validation error when calling Company Exemptions API", ex);
         }
 
-        return response != null ? Optional.of(response.getData()) : Optional.empty();
+        return Optional.ofNullable(response)
+                .map(ApiResponse::getData);
     }
 }

src/main/java/uk/gov/companieshouse/pscdataapi/service/CompanyMetricsApiService.java

@@ -5,7 +5,6 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import uk.gov.companieshouse.api.InternalApiClient;
 import uk.gov.companieshouse.api.error.ApiErrorResponseException;
@@ -15,7 +14,6 @@
 import uk.gov.companieshouse.logging.Logger;
 import uk.gov.companieshouse.logging.LoggerFactory;
 import uk.gov.companieshouse.pscdataapi.exceptions.BadGatewayException;
-import uk.gov.companieshouse.pscdataapi.exceptions.ResourceNotFoundException;
 import uk.gov.companieshouse.pscdataapi.logging.DataMapHolder;
 
 @Component
@@ -31,7 +29,7 @@ public CompanyMetricsApiService(
     }
 
     public Optional<MetricsApi> getCompanyMetrics(final String companyNumber) {
-        ApiResponse<MetricsApi> response;
+        ApiResponse<MetricsApi> response = null;
         try {
             response = metricsApiClientSupplier.get()
                     .privateCompanyMetricsResourceHandler()
@@ -41,17 +39,15 @@ public Optional<MetricsApi> getCompanyMetrics(final String companyNumber) {
             final int statusCode = ex.getStatusCode();
             LOGGER.info("Company Metrics API call failed with status code [%s]".formatted(statusCode),
                     DataMapHolder.getLogMap());
-            if (statusCode == 404) {
-                throw new ResourceNotFoundException(HttpStatus.NOT_FOUND,
-                        "Company Metrics API responded with 404 Not Found");
-            } else {
+            if (statusCode != 404) {
                 throw new BadGatewayException("Error calling Company Metrics API endpoint", ex);
             }
         } catch (URIValidationException ex) {
             LOGGER.info("URI validation error when calling Company Metrics API", DataMapHolder.getLogMap());
             throw new BadGatewayException("URI validation error when calling Company Metrics API", ex);
         }
 
-        return response != null ? Optional.of(response.getData()) : Optional.empty();
+        return Optional.ofNullable(response)
+                .map(ApiResponse::getData);
     }
 }

src/test/java/uk/gov/companieshouse/pscdataapi/service/CompanyMetricsApiServiceTest.java

@@ -1,7 +1,9 @@
 package uk.gov.companieshouse.pscdataapi.service;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -86,18 +88,18 @@ void shouldGetCompanyMetricsWithNullResponseAndReturnEmptyOptional() throws Exce
     }
 
     @Test
-    void shouldThrowResourceNotFoundExceptionWhenApiRespondsWith404NotFound() throws Exception {
+    void shouldContinueProcessingWhenApiRespondsWith404NotFound() throws Exception {
         // given
         when(supplier.get()).thenReturn(client);
         when(client.privateCompanyMetricsResourceHandler()).thenReturn(privateCompanyMetricsResourceHandler);
         when(privateCompanyMetricsResourceHandler.getCompanyMetrics(anyString())).thenReturn(privateCompanyMetricsGet);
         when(privateCompanyMetricsGet.execute()).thenThrow(buildApiErrorResponseException(404));
 
         // when
-        Executable executable = () -> service.getCompanyMetrics(COMPANY_NUMBER);
+        Optional<MetricsApi> actual = service.getCompanyMetrics(COMPANY_NUMBER);
 
         // then
-        assertThrows(ResourceNotFoundException.class, executable);
+        assertTrue(actual.isEmpty());
         verify(privateCompanyMetricsResourceHandler).getCompanyMetrics(URL);
     }