Merge pull request #211 from companieshouse/feature/remove-oracle-query-api-idva3-2687

Remove identity-verification-details endpoint

Author: hepsimo

pom.xml

@@ -36,8 +36,8 @@
         <commons-lang3.version>3.18.0</commons-lang3.version>
         <!-- Internal -->
         <structured-logging.version>3.0.40</structured-logging.version>
-        <private-api-sdk-java.version>4.0.375</private-api-sdk-java.version>
-        <api-sdk-java.version>6.4.4</api-sdk-java.version>
+        <private-api-sdk-java.version>4.0.380</private-api-sdk-java.version>
+        <api-sdk-java.version>6.4.6</api-sdk-java.version>
         <api-security-java.version>2.0.13</api-security-java.version>
 
         <!-- tests -->

src/main/java/uk/gov/companieshouse/pscdataapi/config/ApplicationConfig.java

@@ -35,18 +35,15 @@ public class ApplicationConfig {
     private final String kafkaApiUrl;
     private final String metricsApiUrl;
     private final String exemptionsApiUrl;
-    private final String oracleQueryApiUrl;
 
     public ApplicationConfig(@Value("${api.key}") String apiKey,
             @Value("${kafka.api.url}") String kafkaApiUrl,
             @Value("${metrics.api.url}") String metricsApiUrl,
-            @Value("${exemptions.api.url}") String exemptionsApiUrl,
-            @Value("${oracle.query.api.url}") final String oracleQueryApiUrl) {
+            @Value("${exemptions.api.url}") String exemptionsApiUrl) {
         this.apiKey = apiKey;
         this.kafkaApiUrl = kafkaApiUrl;
         this.metricsApiUrl = metricsApiUrl;
         this.exemptionsApiUrl = exemptionsApiUrl;
-        this.oracleQueryApiUrl = oracleQueryApiUrl;
     }
 
     /*
@@ -79,15 +76,6 @@ public Supplier<InternalApiClient> exemptionsApiClientSupplier() {
         return () -> buildClient(exemptionsApiUrl);
     }
 
-    @Bean
-    public Supplier<InternalApiClient> oracleQueryApiClientSupplier() {
-        return () -> {
-            final var internalApiClient = buildClient(oracleQueryApiUrl);
-            internalApiClient.setInternalBasePath(oracleQueryApiUrl);
-            return internalApiClient;
-        };
-    }
-
     @Bean
     @Primary
     public ObjectMapper objectMapper() {

src/main/java/uk/gov/companieshouse/pscdataapi/controller/CompanyPscWithIdentityVerificationDetailsGetController.java

@@ -17,7 +17,6 @@
 import uk.gov.companieshouse.api.metrics.PscApi;
 import uk.gov.companieshouse.api.metrics.RegisterApi;
 import uk.gov.companieshouse.api.metrics.RegistersApi;
-import uk.gov.companieshouse.api.model.psc.PscIndividualWithIdentityVerificationDetailsApi;
 import uk.gov.companieshouse.api.psc.CorporateEntity;
 import uk.gov.companieshouse.api.psc.CorporateEntityBeneficialOwner;
 import uk.gov.companieshouse.api.psc.FullRecordCompanyPSCApi;
@@ -33,20 +32,16 @@
 import uk.gov.companieshouse.logging.Logger;
 import uk.gov.companieshouse.logging.LoggerFactory;
 import uk.gov.companieshouse.pscdataapi.api.ChsKafkaApiService;
-import uk.gov.companieshouse.pscdataapi.config.FeatureFlags;
 import uk.gov.companieshouse.pscdataapi.exceptions.ConflictException;
-import uk.gov.companieshouse.pscdataapi.exceptions.InternalDataException;
 import uk.gov.companieshouse.pscdataapi.exceptions.NotFoundException;
 import uk.gov.companieshouse.pscdataapi.logging.DataMapHolder;
 import uk.gov.companieshouse.pscdataapi.models.Created;
 import uk.gov.companieshouse.pscdataapi.models.Links;
 import uk.gov.companieshouse.pscdataapi.models.PscData;
 import uk.gov.companieshouse.pscdataapi.models.PscDeleteRequest;
 import uk.gov.companieshouse.pscdataapi.models.PscDocument;
-import uk.gov.companieshouse.pscdataapi.models.PscSensitiveData;
 import uk.gov.companieshouse.pscdataapi.repository.CompanyPscRepository;
 import uk.gov.companieshouse.pscdataapi.transform.CompanyPscTransformer;
-import uk.gov.companieshouse.pscdataapi.transform.IdentityVerificationDetailsMapper;
 
 @Component
 public class CompanyPscService {
@@ -62,30 +57,22 @@ public class CompanyPscService {
     private static final String LEGAL_PERSON_BENEFICIAL_OWNER = "legal-person-beneficial-owner";
     private static final String SUPER_SECURE_PERSON_WITH_SIGNIFICANT_CONTROL = "super-secure-person-with-significant-control";
     private static final String SUPER_SECURE_BENEFICIAL_OWNER = "super-secure-beneficial-owner";
-    private static final String NO_INTERNAL_ID_MSG = "sensitive_data.internal_id is null";
 
-    private final FeatureFlags featureFlags;
     private final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSSSSS");
     private final CompanyPscTransformer transformer;
     private final CompanyPscRepository repository;
     private final ChsKafkaApiService chsKafkaApiService;
     private final CompanyExemptionsApiService companyExemptionsApiService;
     private final CompanyMetricsApiService companyMetricsApiService;
-    private final OracleQueryApiService oracleQueryApiService;
-    private final IdentityVerificationDetailsMapper identityVerificationDetailsMapper;
 
-    public CompanyPscService(final FeatureFlags featureFlags, final CompanyPscTransformer transformer, final CompanyPscRepository repository,
+    public CompanyPscService(final CompanyPscTransformer transformer, final CompanyPscRepository repository,
             final ChsKafkaApiService chsKafkaApiService, final CompanyExemptionsApiService companyExemptionsApiService,
-            final CompanyMetricsApiService companyMetricsApiService, final OracleQueryApiService oracleQueryApiService,
-            final IdentityVerificationDetailsMapper identityVerificationDetailsMapper) {
-        this.featureFlags = featureFlags;
+            final CompanyMetricsApiService companyMetricsApiService) {
         this.transformer = transformer;
         this.repository = repository;
         this.chsKafkaApiService = chsKafkaApiService;
         this.companyExemptionsApiService = companyExemptionsApiService;
         this.companyMetricsApiService = companyMetricsApiService;
-        this.oracleQueryApiService = oracleQueryApiService;
-        this.identityVerificationDetailsMapper = identityVerificationDetailsMapper;
     }
 
     public void insertPscRecord(FullRecordCompanyPSCApi requestBody) {
@@ -142,33 +129,6 @@ public Individual getIndividualPsc(final String companyNumber, final String noti
                 });
     }
 
-    public PscIndividualWithIdentityVerificationDetailsApi getIndividualWithIdentityVerificationDetails(final String companyNumber,
-            final String notificationId) {
-        return repository.getPscByCompanyNumberAndId(companyNumber, notificationId)
-                .filter(document -> INDIVIDUAL_PERSON_WITH_SIGNIFICANT_CONTROL.equals(document.getData().getKind()))
-                .map(document -> {
-                    DataMapHolder.get().companyNumber(companyNumber).itemId(notificationId);
-
-                    final var individualWithIdentityVerificationDetails =
-                            transformer.transformPscDocToIndividualWithIdentityVerificationDetails(document);
-                    final Long internalId = Optional.ofNullable(document.getSensitiveData()).map(
-                        PscSensitiveData::getInternalId).orElseThrow(() -> {
-                        LOGGER.error(NO_INTERNAL_ID_MSG, DataMapHolder.getLogMap());
-                        return new InternalDataException(NO_INTERNAL_ID_MSG);
-                    });
-
-                    oracleQueryApiService.getIdentityVerificationDetails(internalId).map(
-                        identityVerificationDetailsMapper::mapToIdentityVerificationDetails).ifPresent(
-                        individualWithIdentityVerificationDetails::setIdentityVerificationDetails);
-
-                    return individualWithIdentityVerificationDetails;
-                })
-                .orElseThrow(() -> {
-                    LOGGER.error(NOT_FOUND_MSG, DataMapHolder.getLogMap());
-                    return new NotFoundException(NOT_FOUND_MSG);
-                });
-    }
-
     public IndividualBeneficialOwner getIndividualBeneficialOwnerPsc(final String companyNumber, final String notificationId,
             final boolean registerView) {
         return repository.findById(notificationId)

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

@@ -8,7 +8,6 @@
 import org.springframework.stereotype.Component;
 import uk.gov.companieshouse.api.model.common.Date3Tuple;
 import uk.gov.companieshouse.api.model.psc.NameElementsApi;
-import uk.gov.companieshouse.api.model.psc.PscIndividualWithIdentityVerificationDetailsApi;
 import uk.gov.companieshouse.api.model.psc.PscLinks;
 import uk.gov.companieshouse.api.psc.CorporateEntity;
 import uk.gov.companieshouse.api.psc.CorporateEntityBeneficialOwner;
@@ -80,40 +79,6 @@ public Individual transformPscDocToIndividual(PscDocument pscDocument, boolean s
         return individual;
     }
 
-    /**
-     * Transforms a PSC document into an Individual with Identity Verification Details.
-     *
-     * @param pscDocument the PSC document to transform
-     * @return the transformed Individual with Identity Verification Details
-     */
-    public PscIndividualWithIdentityVerificationDetailsApi transformPscDocToIndividualWithIdentityVerificationDetails(
-            PscDocument pscDocument) {
-        LOGGER.info("Attempting to transform pscDocument to Individual With Identity Verification Details", DataMapHolder.getLogMap());
-
-        final var detailsApi = new PscIndividualWithIdentityVerificationDetailsApi();
-        detailsApi.setKind(
-                PscIndividualWithIdentityVerificationDetailsApi.KindEnum.INDIVIDUAL_PERSON_WITH_SIGNIFICANT_CONTROL);
-        if (pscDocument.getData() != null) {
-            final var pscData = pscDocument.getData();
-
-            detailsApi.setEtag(pscData.getEtag());
-            detailsApi.setCountryOfResidence(pscData.getCountryOfResidence());
-            detailsApi.setName(pscData.getName());
-            detailsApi.setNameElements(mapNameElementsApi(pscData.getNameElements()));
-            detailsApi.setAddress(mapCommonAddress(pscData.getAddress()));
-            detailsApi.setNaturesOfControl(pscData.getNaturesOfControl());
-            detailsApi.setNationality(pscData.getNationality());
-            detailsApi.setLinks(mapLinksToPscLinks(pscData.getLinks()));
-            detailsApi.setNotifiedOn(pscData.getNotifiedOn());
-            detailsApi.setCeasedOn(pscData.getCeasedOn());
-        }
-        if (pscDocument.getSensitiveData() != null) {
-            detailsApi.setDateOfBirth(
-                    mapDate3Tuple(pscDocument.getSensitiveData().getDateOfBirth(), false));
-        }
-        return detailsApi;
-    }
-
     /**
      * Transform Individual PSC full record.
      *

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

@@ -8,7 +8,6 @@ api.key=${CHS_API_KEY:chsApiKey}
 kafka.api.url=${CHS_KAFKA_API_URL:http://localhost:8888}
 metrics.api.url=${API_LOCAL_URL:http://localhost:8888}
 exemptions.api.url=${API_LOCAL_URL:http://localhost:8888}
-oracle.query.api.url=${ORACLE_QUERY_API_URL:http://localhost:8888}
 spring.data.mongodb.uri=${MONGODB_URL:mongodb://mongo:27017}
 spring.data.mongodb.name=company_pscs
 # Disable static resources (otherwise NoResourceFoundException when no handler found)

src/main/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformer.java

@@ -17,13 +17,11 @@
 import uk.gov.companieshouse.api.util.security.EricConstants;
 import uk.gov.companieshouse.api.util.security.SecurityConstants;
 import uk.gov.companieshouse.pscdataapi.controller.CompanyPscFullRecordGetController;
-import uk.gov.companieshouse.pscdataapi.controller.CompanyPscWithIdentityVerificationDetailsGetController;
 import uk.gov.companieshouse.pscdataapi.service.CompanyPscService;
 
 @ExtendWith(SpringExtension.class)
 @WebMvcTest(controllers = {
-        CompanyPscFullRecordGetController.class,
-        CompanyPscWithIdentityVerificationDetailsGetController.class,
+        CompanyPscFullRecordGetController.class
 }, properties = {"feature.identity_verification=true"})
 class WebSecurityConfigTest {
 
@@ -33,9 +31,6 @@ class WebSecurityConfigTest {
     private static final String GET_INDIVIDUAL_FULL_RECORD_URL = String.format(
             "/company/%s/persons-with-significant-control/individual/%s/full_record", MOCK_COMPANY_NUMBER,
             MOCK_NOTIFICATION_ID);
-    private static final String GET_INDIVIDUAL_WITH_IDENTITY_VERIFICATION_DETAILS_URL = String.format(
-            "/company/%s/persons-with-significant-control/individual/%s/identity-verification-details", MOCK_COMPANY_NUMBER,
-            MOCK_NOTIFICATION_ID);
 
     @MockitoBean
     private CompanyPscService companyPscService;
@@ -52,10 +47,6 @@ void shouldForbidAccessWithUnderprivilegedApiKey() throws Exception {
                         .headers(headers)
                         .contentType(APPLICATION_JSON))
                 .andExpect(status().isForbidden());
-        mockMvc.perform(get(GET_INDIVIDUAL_WITH_IDENTITY_VERIFICATION_DETAILS_URL)
-                        .headers(headers)
-                        .contentType(APPLICATION_JSON))
-                .andExpect(status().isForbidden());
 
     }
 
@@ -68,10 +59,6 @@ void shouldAllowAccessWithInternalUserApiKey() throws Exception {
                         .headers(headers)
                         .contentType(APPLICATION_JSON))
                 .andExpect(status().isOk());
-        mockMvc.perform(get(GET_INDIVIDUAL_WITH_IDENTITY_VERIFICATION_DETAILS_URL)
-                        .headers(headers)
-                        .contentType(APPLICATION_JSON))
-                .andExpect(status().isOk());
 
     }