Merge pull request #135 from companieshouse/revert-133-feature/DSND-2789

Revert "Feature/dsnd 2789"
companieshouse · Jul 25, 2024 · aa381ae · aa381ae
2 parents 6378647 + 4f6a657
commit aa381ae
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 251 deletions.
diff --git a/src/itest/java/uk/gov/companieshouse/pscdataapi/config/AbstractIntegrationTest.java b/src/itest/java/uk/gov/companieshouse/pscdataapi/config/AbstractIntegrationTest.java
@@ -4,7 +4,6 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
-import uk.gov.companieshouse.api.api.CompanyExemptionsApiService;
 import uk.gov.companieshouse.api.api.CompanyMetricsApiService;
 import uk.gov.companieshouse.pscdataapi.api.ChsKafkaApiService;
 
@@ -22,7 +21,4 @@ public abstract class AbstractIntegrationTest extends AbstractMongoConfig {
     @MockBean
     public CompanyMetricsApiService companyMetricsApiService;
 
-    @MockBean
-    CompanyExemptionsApiService companyExemptionsApiService;
-
 }
diff --git a/src/main/java/uk/gov/companieshouse/pscdataapi/models/Links.java b/src/main/java/uk/gov/companieshouse/pscdataapi/models/Links.java
@@ -11,9 +11,6 @@ public class Links {
     @Field("statement")
     private String statement;
 
-    @Field("exemptions")
-    private String exemptions;
-
     public String getSelf() {
         return self;
     }
@@ -30,10 +27,6 @@ public void setStatement(String statement) {
         this.statement = statement;
     }
 
-    public String getExemptions() { return exemptions; }
-
-    public void setExemptions(String exemptions) { this.exemptions = exemptions; }
-
     @Override
     public String toString() {
         return "Links{"
@@ -43,9 +36,6 @@ public String toString() {
                 + ", statement='"
                 + statement
                 + '\''
-                + ", exemptions='"
-                + exemptions
-                + '\''
                 + '}';
     }
 
@@ -59,12 +49,11 @@ public boolean equals(Object object) {
         }
         Links links = (Links) object;
         return Objects.equals(self, links.self)
-                && Objects.equals(statement, links.statement)
-                && Objects.equals(exemptions, links.exemptions);
+                && Objects.equals(statement, links.statement);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(self, statement, exemptions);
+        return Objects.hash(self, statement);
     }
 }
diff --git a/src/main/java/uk/gov/companieshouse/pscdataapi/service/CompanyPscService.java b/src/main/java/uk/gov/companieshouse/pscdataapi/service/CompanyPscService.java
@@ -7,14 +7,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import uk.gov.companieshouse.api.api.CompanyExemptionsApiService;
 import uk.gov.companieshouse.api.api.CompanyMetricsApiService;
-import uk.gov.companieshouse.api.exemptions.CompanyExemptions;
 import uk.gov.companieshouse.api.metrics.MetricsApi;
 import uk.gov.companieshouse.api.metrics.RegisterApi;
 import uk.gov.companieshouse.api.metrics.RegistersApi;
@@ -61,21 +57,16 @@ public class CompanyPscService {
     private final ChsKafkaApiService chsKafkaApiService;
     private final CompanyMetricsApiService companyMetricsApiService;
 
-    @Autowired
-    CompanyExemptionsApiService companyExemptionsApiService;
-
     public CompanyPscService(Logger logger,
                              CompanyPscTransformer transformer,
                              CompanyPscRepository repository,
                              ChsKafkaApiService chsKafkaApiService,
-                             CompanyMetricsApiService companyMetricsApiService,
-                             CompanyExemptionsApiService companyExemptionsApiService) {
+                             CompanyMetricsApiService companyMetricsApiService) {
         this.logger = logger;
         this.transformer = transformer;
         this.repository = repository;
         this.chsKafkaApiService = chsKafkaApiService;
         this.companyMetricsApiService = companyMetricsApiService;
-        this.companyExemptionsApiService = companyExemptionsApiService;
     }
 
     /**
@@ -610,12 +601,6 @@ private PscList createPscDocumentList(List<PscDocument> pscDocuments,
         pscList.setStartIndex(startIndex);
         pscList.setItems(documents);
 
-        if (hasPscExemptions(companyNumber)) {
-            if(hasExemptFrom(companyNumber) && !hasExemptTo(companyNumber)) {
-                links.setExemptions(String.format("/company/%s/exemptions", companyNumber));
-            }
-        }
-
         companyMetrics.ifPresentOrElse(metricsApi -> {
             try {
                 if (registerView) {
@@ -647,49 +632,4 @@ private PscList createPscDocumentList(List<PscDocument> pscDocuments,
         return pscList;
     }
 
-    private boolean hasPscExemptions(String companyNumber) {
-        Optional<CompanyExemptions> companyExemptions = companyExemptionsApiService.getCompanyExemptions(companyNumber);
-
-        return companyExemptions.filter(x ->
-                x.getExemptions() != null &&
-                        (x.getExemptions().getPscExemptAsSharesAdmittedOnMarket()!= null ||
-                                x.getExemptions().getPscExemptAsTradingOnEuRegulatedMarket() != null ||
-                                x.getExemptions().getPscExemptAsTradingOnRegulatedMarket() != null ||
-                                x.getExemptions().getPscExemptAsTradingOnUkRegulatedMarket() != null)).isPresent();
-    }
-
-    private boolean hasExemptFrom(String companyNumber) {
-        Optional<CompanyExemptions> companyExemptions = companyExemptionsApiService.getCompanyExemptions(companyNumber);
-
-        return companyExemptions
-                .map(exemptions -> exemptions.getExemptions())
-                .filter(exemptions -> exemptions != null)
-                .map(exemptions -> exemptions.getPscExemptAsSharesAdmittedOnMarket() != null
-                        && exemptions.getPscExemptAsSharesAdmittedOnMarket().getItems().get(0).getExemptFrom() != null ||
-                        exemptions.getPscExemptAsTradingOnEuRegulatedMarket() != null
-                                && exemptions.getPscExemptAsTradingOnEuRegulatedMarket().getItems().get(0).getExemptFrom() != null ||
-                        exemptions.getPscExemptAsTradingOnRegulatedMarket() != null
-                                && exemptions.getPscExemptAsTradingOnRegulatedMarket().getItems().get(0).getExemptFrom() != null ||
-                        exemptions.getPscExemptAsTradingOnUkRegulatedMarket() != null
-                                && exemptions.getPscExemptAsTradingOnUkRegulatedMarket().getItems().get(0).getExemptFrom() != null)
-                .orElse(false);
-    }
-
-    private boolean hasExemptTo(String companyNumber) {
-        Optional<CompanyExemptions> companyExemptions = companyExemptionsApiService.getCompanyExemptions(companyNumber);
-
-        return companyExemptions
-                .map(exemptions -> exemptions.getExemptions())
-                .filter(exemptions -> exemptions != null)
-                .map(exemptions -> exemptions.getPscExemptAsSharesAdmittedOnMarket() != null
-                        && exemptions.getPscExemptAsSharesAdmittedOnMarket().getItems().get(0).getExemptTo() != null ||
-                        exemptions.getPscExemptAsTradingOnEuRegulatedMarket() != null
-                                && exemptions.getPscExemptAsTradingOnEuRegulatedMarket().getItems().get(0).getExemptTo() != null ||
-                        exemptions.getPscExemptAsTradingOnRegulatedMarket() != null
-                                && exemptions.getPscExemptAsTradingOnRegulatedMarket().getItems().get(0).getExemptTo() != null ||
-                        exemptions.getPscExemptAsTradingOnUkRegulatedMarket() != null
-                                && exemptions.getPscExemptAsTradingOnUkRegulatedMarket().getItems().get(0).getExemptTo() != null)
-                .orElse(false);
-    }
-
 }
diff --git a/src/test/java/uk/gov/companieshouse/pscdataapi/PscDataApiApplicationTests.java b/src/test/java/uk/gov/companieshouse/pscdataapi/PscDataApiApplicationTests.java
@@ -2,13 +2,9 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import uk.gov.companieshouse.api.api.CompanyExemptionsApiService;
 
 @SpringBootTest
 class PscDataApiApplicationTests {
-    @MockBean
-    CompanyExemptionsApiService companyExemptionsApiService;
 
     @Test
     void contextLoads() {

diff --git a/...ompanieshouse/pscdataapi/api/ResourceChangedApiServiceAspectFeatureFlagDisabledITest.java b/...ompanieshouse/pscdataapi/api/ResourceChangedApiServiceAspectFeatureFlagDisabledITest.java
@@ -16,7 +16,6 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import uk.gov.companieshouse.api.InternalApiClient;
-import uk.gov.companieshouse.api.api.CompanyExemptionsApiService;
 import uk.gov.companieshouse.api.chskafka.ChangedResource;
 import uk.gov.companieshouse.api.error.ApiErrorResponseException;
 import uk.gov.companieshouse.api.handler.chskafka.PrivateChangedResourceHandler;
@@ -32,9 +31,6 @@ class ResourceChangedApiServiceAspectFeatureFlagDisabledITest {
     @InjectMocks
     private ChsKafkaApiService chsKafkaApiService;
 
-    @MockBean
-    CompanyExemptionsApiService companyExemptionsApiService;
-
     @MockBean
     private ApiClientService apiClientService;
 

diff --git a/...companieshouse/pscdataapi/api/ResourceChangedApiServiceAspectFeatureFlagEnabledITest.java b/...companieshouse/pscdataapi/api/ResourceChangedApiServiceAspectFeatureFlagEnabledITest.java
@@ -12,7 +12,6 @@
 import org.springframework.test.context.ActiveProfiles;
 
 import uk.gov.companieshouse.api.InternalApiClient;
-import uk.gov.companieshouse.api.api.CompanyExemptionsApiService;
 import uk.gov.companieshouse.api.chskafka.ChangedResource;
 import uk.gov.companieshouse.api.error.ApiErrorResponseException;
 import uk.gov.companieshouse.api.handler.chskafka.PrivateChangedResourceHandler;
@@ -30,9 +29,6 @@ class ResourceChangedApiServiceAspectFeatureFlagEnabledITest {
     @Autowired
     private ChsKafkaApiService chsKafkaApiService;
 
-    @MockBean
-    CompanyExemptionsApiService companyExemptionsApiService;
-
     @MockBean
     private ApiClientService apiClientService;
 

diff --git a/src/test/java/uk/gov/companieshouse/pscdataapi/service/CompanyPscServiceTest.java b/src/test/java/uk/gov/companieshouse/pscdataapi/service/CompanyPscServiceTest.java
@@ -1,7 +1,6 @@
 package uk.gov.companieshouse.pscdataapi.service;
 
 import static com.mongodb.internal.connection.tlschannel.util.Util.assertTrue;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
@@ -12,7 +11,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
@@ -31,23 +29,27 @@
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
-import uk.gov.companieshouse.api.api.CompanyExemptionsApiService;
 import uk.gov.companieshouse.api.api.CompanyMetricsApiService;
-import uk.gov.companieshouse.api.exemptions.CompanyExemptions;
-import uk.gov.companieshouse.api.exemptions.Exemptions;
-import uk.gov.companieshouse.api.exemptions.PscExemptAsTradingOnRegulatedMarketItem;
-import uk.gov.companieshouse.api.exemptions.PscExemptAsTradingOnUkRegulatedMarketItem;
 import uk.gov.companieshouse.api.metrics.MetricsApi;
 import uk.gov.companieshouse.api.metrics.RegisterApi;
 import uk.gov.companieshouse.api.metrics.RegistersApi;
-import uk.gov.companieshouse.api.model.psc.PscLinks;
-import uk.gov.companieshouse.api.psc.*;
+import uk.gov.companieshouse.api.psc.CorporateEntity;
+import uk.gov.companieshouse.api.psc.CorporateEntityBeneficialOwner;
+import uk.gov.companieshouse.api.psc.FullRecordCompanyPSCApi;
+import uk.gov.companieshouse.api.psc.Identification;
+import uk.gov.companieshouse.api.psc.Individual;
+import uk.gov.companieshouse.api.psc.IndividualBeneficialOwner;
+import uk.gov.companieshouse.api.psc.LegalPerson;
+import uk.gov.companieshouse.api.psc.LegalPersonBeneficialOwner;
+import uk.gov.companieshouse.api.psc.ListSummary;
+import uk.gov.companieshouse.api.psc.PscList;
+import uk.gov.companieshouse.api.psc.SuperSecure;
+import uk.gov.companieshouse.api.psc.SuperSecureBeneficialOwner;
 import uk.gov.companieshouse.logging.Logger;
 import uk.gov.companieshouse.pscdataapi.api.ChsKafkaApiService;
 import uk.gov.companieshouse.pscdataapi.exceptions.BadRequestException;
 import uk.gov.companieshouse.pscdataapi.exceptions.ResourceNotFoundException;
 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.PscDocument;
 import uk.gov.companieshouse.pscdataapi.repository.CompanyPscRepository;
@@ -80,16 +82,11 @@ class CompanyPscServiceTest {
     @Mock
     CompanyMetricsApiService companyMetricsApiService;
 
-    @Mock
-    CompanyExemptionsApiService companyExemptionsApiService;
-
     private FullRecordCompanyPSCApi request;
     private PscDocument pscDocument;
     private String dateString;
     private OffsetDateTime date;
     private OffsetDateTime laterDate;
-    private TestHelper testHelper;
-    private PscExemptAsTradingOnUkRegulatedMarketItem pscExemptAsTradingOnUkRegulatedMarketItem;
 
     @BeforeEach
     void setUp() {
@@ -99,8 +96,6 @@ void setUp() {
 
         request = TestHelper.buildBasicFullRecordPsc();
         pscDocument = TestHelper.buildBasicDocument();
-        testHelper = new TestHelper();
-        pscExemptAsTradingOnUkRegulatedMarketItem = new PscExemptAsTradingOnUkRegulatedMarketItem();
     }
 
     @Test
@@ -721,62 +716,4 @@ void whenCompanyNotInPublicRegisterGetPSCListShouldThrow() throws ResourceNotFou
         verify(repository, times(0)).getListSummaryRegisterView(COMPANY_NUMBER, 0, OffsetDateTime.parse("2020-12-20T06:00Z"), 25);
     }
 
-    @Test
-    void pscListReturnedByCompanyNumberFromRepositoryWithExemptions() throws ResourceNotFoundException {
-        PscList expectedPscList = TestHelper.createPscListWithExemptions();
-        PscData pscData = new PscData();
-        pscDocument.setData(pscData);
-        ListSummary listSummary = new ListSummary();
-        Identification identification = new Identification();
-        identification.setPlaceRegistered("x");
-        identification.setCountryRegistered("x");
-        identification.setRegistrationNumber("x");
-        identification.setLegalAuthority("x");
-        identification.setLegalForm("x");
-        listSummary.setIdentification(identification);
-
-        when(companyMetricsApiService.getCompanyMetrics(COMPANY_NUMBER))
-                .thenReturn(Optional.of(TestHelper.createMetrics()));
-        when(repository.getPscDocumentList(anyString(), anyInt(), anyInt())).thenReturn(Optional.of(Collections.singletonList(pscDocument)));
-        when(transformer.transformPscDocToListSummary(pscDocument, false))
-                .thenReturn(listSummary);
-        when(companyExemptionsApiService.getCompanyExemptions(any())).thenReturn(Optional.ofNullable(testHelper.createExemptions()));
-
-        PscList PscDocumentList = service.retrievePscListSummaryFromDb(COMPANY_NUMBER, 0, false, 25);
-
-        Assertions.assertEquals(expectedPscList, PscDocumentList);
-        verify(repository, times(1)).getPscDocumentList(COMPANY_NUMBER, 0, 25);
-    }
-
-    @Test
-    void hasPscExemptionsReturnsTrueWhenTradingOnUkRegulatedMarket() {
-        PscData pscData = new PscData();
-        pscDocument.setData(pscData);
-        ListSummary listSummary = new ListSummary();
-        Identification identification = new Identification();
-        identification.setPlaceRegistered("x");
-        identification.setCountryRegistered("x");
-        identification.setRegistrationNumber("x");
-        identification.setLegalAuthority("x");
-        identification.setLegalForm("x");
-        listSummary.setIdentification(identification);
-        when(repository.getPscDocumentList(anyString(), anyInt(), anyInt())).thenReturn(Optional.of(Collections.singletonList(pscDocument)));
-        when(transformer.transformPscDocToListSummary(pscDocument, false))
-                .thenReturn(listSummary);
-
-        CompanyExemptions companyExemptions = new CompanyExemptions();
-        Exemptions exemptions = new Exemptions();
-        exemptions.setPscExemptAsTradingOnUkRegulatedMarket(pscExemptAsTradingOnUkRegulatedMarketItem);
-        companyExemptions.setExemptions(testHelper.getUkExemptions());
-        when(companyExemptionsApiService.getCompanyExemptions(any())).thenReturn(Optional.ofNullable(testHelper.createExemptions()));
-
-        PscList PscDocumentList = service.retrievePscListSummaryFromDb(COMPANY_NUMBER, 0, false, 25);
-
-        Links links = new Links();
-        links.setSelf("/company/" + COMPANY_NUMBER + "/persons-with-significant-control");
-        links.setExemptions("/company/" + COMPANY_NUMBER + "/exemptions");
-
-        assertEquals(PscDocumentList.getLinks(), links);
-    }
-
 }