POC sow014 changes

build.gradle

@@ -21,7 +21,7 @@ plugins {
     id 'org.jetbrains.gradle.plugin.idea-ext' version '0.7'
     id 'info.solidsoft.pitest' version '1.15.0'
     id 'uk.gov.hmcts.java' version '0.12.57'
-    id 'au.com.dius.pact' version '4.3.12'
+    id 'au.com.dius.pact' version '4.6.14'
     id "org.jsonschema2pojo" version "1.2.1"
 }
 
@@ -154,7 +154,11 @@ tasks.withType(Checkstyle) {
 }
 
 tasks.withType(Test) {
-    maxParallelForks = System.getenv('MAX_NUM_PARALLEL_THREADS') ?: 6 as int
+    // Default heap is 500M and too small for our tests which cache many spring contexts.
+    maxHeapSize = "3g"
+    // Spring contexts maintain database connection pools.
+    // If we have too many we exhaust postgres' ability to create new connections.
+    systemProperty 'spring.test.context.cache.maxSize', '5'
 
     useJUnitPlatform()
 
@@ -664,8 +668,8 @@ jsonSchema2Pojo {
 sonarqube {
     properties {
         property "sonar.exclusions", "build/generated-sources/**/*.java," +
-            "**/AppInsightsConfiguration.java," +
-            "**/TestingSupportController.java"
+            "**/AppInsightsConfiguration.java,**/domain/**/*,,**/data/**/*,**/ApplicationParams.java," +
+            "**/UserAuthHeadersInterceptor.java,**/TestingSupportController.java"
         property "sonar.projectName", "ccd-data-store-api"
         property "sonar.projectKey", "ccd-data-store-api"
         property "sonar.coverage.jacoco.xmlReportPaths", "${jacocoTestReport.reports.xml.outputLocation}"

src/contractTest/java/uk/gov/hmcts/ccd/v2/external/controller/ContractTestSubmitCaseTransaction.java

@@ -12,6 +12,7 @@
 import uk.gov.hmcts.ccd.domain.service.common.CaseTypeService;
 import uk.gov.hmcts.ccd.domain.service.common.SecurityClassificationService;
 import uk.gov.hmcts.ccd.domain.service.common.UIDService;
+import uk.gov.hmcts.ccd.domain.service.createcase.POCSubmitCaseTransaction;
 import uk.gov.hmcts.ccd.domain.service.createcase.SubmitCaseTransaction;
 import uk.gov.hmcts.ccd.domain.service.getcasedocument.CaseDocumentService;
 import uk.gov.hmcts.ccd.domain.service.getcasedocument.CaseDocumentTimestampService;
@@ -35,11 +36,12 @@ public ContractTestSubmitCaseTransaction(DefaultCaseDetailsRepository caseDetail
                                              CaseDocumentService caseDocumentService,
                                              ApplicationParams applicationParams,
                                              CaseAccessGroupUtils caseAccessGroupUtils,
-                                             CaseDocumentTimestampService caseDocumentTimestampService) {
+                                             CaseDocumentTimestampService caseDocumentTimestampService,
+                                             POCSubmitCaseTransaction pocSubmitCaseTransaction) {
         super(caseDetailsRepository, caseAuditEventRepository, caseTypeService,
             callbackInvoker, uidService, securityClassificationService,
             caseDataAccessControl, messageService, caseDocumentService, applicationParams,
-            caseAccessGroupUtils, caseDocumentTimestampService);
+            caseAccessGroupUtils, caseDocumentTimestampService, pocSubmitCaseTransaction);
 
     }
 }

src/contractTest/resources/application.properties

@@ -286,3 +286,6 @@ spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER
 
 definition-store.retry.maxAttempts=${DEFINITION_STORE_RETRY_MAX_ATTEMPTS:3}
 definition-store.retry.maxDelay=${DEFINITION_STORE_RETRY_MAX_DELAY:1000}
+
+poc.apis.url=${POC_APIS_URL:http://localhost:4013}
+poc.feature.enabled=${POC_FEATURE_ENABLED:false}

src/main/java/uk/gov/hmcts/ccd/ApplicationParams.java

@@ -235,6 +235,11 @@ public class ApplicationParams {
     @Value("#{'${ccd.callback.passthru-header-contexts}'.split(',')}")
     private List<String> callbackPassthruHeaderContexts;
 
+    private List<String> pocCaseTypes = List.of("CIVIL", "NFD", "PCS");
+
+    @Value("${poc.feature.enabled}")
+    private boolean isPocFeatureEnabled;
+
     public static String encode(final String stringToEncode) {
         try {
             return URLEncoder.encode(stringToEncode, "UTF-8");
@@ -629,4 +634,20 @@ public List<String> getCallbackPassthruHeaderContexts() {
     public List<String> getUploadTimestampFeaturedCaseTypes() {
         return uploadTimestampFeaturedCaseTypes;
     }
+
+    public boolean isPocFeatureEnabled() {
+        return isPocFeatureEnabled;
+    }
+
+    public void setPocFeatureEnabled(boolean pocFeatureEnabled) {
+        isPocFeatureEnabled = pocFeatureEnabled;
+    }
+
+    public List<String> getPocCaseTypes() {
+        return pocCaseTypes;
+    }
+
+    public void setPocCaseTypes(List<String> pocCaseTypes) {
+        this.pocCaseTypes = pocCaseTypes;
+    }
 }

src/main/java/uk/gov/hmcts/ccd/clients/PocApiClient.java

@@ -0,0 +1,27 @@
+package uk.gov.hmcts.ccd.clients;
+
+import java.util.List;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import uk.gov.hmcts.ccd.customheaders.UserAuthHeadersInterceptorConfig;
+import uk.gov.hmcts.ccd.domain.model.aggregated.POCCaseEvent;
+import uk.gov.hmcts.ccd.domain.model.definition.CaseDetails;
+import uk.gov.hmcts.ccd.domain.model.std.AuditEvent;
+
+@FeignClient(name = "pocApi", url = "${poc.apis.url}", configuration = UserAuthHeadersInterceptorConfig.class)
+public interface PocApiClient {
+
+    @GetMapping(value = "/ccd/cases/{case-ref}")
+    CaseDetails getCase(@PathVariable("case-ref") String caseRef);
+
+    @PostMapping(value = "/ccd/cases", consumes = MediaType.APPLICATION_JSON_VALUE,
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    CaseDetails createEvent(@RequestBody POCCaseEvent caseEvent);
+
+    @GetMapping(value = "/ccd/cases/{case-ref}/history")
+    List<AuditEvent> getCaseHistory(@PathVariable("case-ref") String caseReference);
+}

src/main/java/uk/gov/hmcts/ccd/customheaders/UserAuthHeadersInterceptor.java

@@ -0,0 +1,37 @@
+package uk.gov.hmcts.ccd.customheaders;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import uk.gov.hmcts.ccd.data.SecurityUtils;
+
+public class UserAuthHeadersInterceptor implements RequestInterceptor {
+
+    private static final String EXPERIMENTAL = "experimental";
+    public static final String SERVICE_AUTHORIZATION = "ServiceAuthorization";
+    private final SecurityUtils securityUtils;
+
+    public UserAuthHeadersInterceptor(SecurityUtils securityUtils) {
+        this.securityUtils = securityUtils;
+    }
+
+    @Override
+    public void apply(RequestTemplate template) {
+        if (!template.headers().containsKey(AUTHORIZATION)) {
+            template.header(AUTHORIZATION, securityUtils.getUserBearerToken());
+        }
+        if (!template.headers().containsKey(SERVICE_AUTHORIZATION)) {
+            template.header(SERVICE_AUTHORIZATION, securityUtils.getServiceAuthorization());
+        }
+        // TODO: will be removed once ccd cleaned in their end
+        template.header(EXPERIMENTAL, "true");
+
+        var requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        var request = requestAttributes.getRequest();
+        template.header(HttpHeaders.REFERER, request.getHeader(HttpHeaders.REFERER));
+    }
+}

src/main/java/uk/gov/hmcts/ccd/customheaders/UserAuthHeadersInterceptorConfig.java

@@ -0,0 +1,19 @@
+package uk.gov.hmcts.ccd.customheaders;
+
+import feign.Retryer;
+import org.springframework.context.annotation.Bean;
+import uk.gov.hmcts.ccd.data.SecurityUtils;
+
+
+public class UserAuthHeadersInterceptorConfig {
+
+    @Bean
+    public UserAuthHeadersInterceptor userAuthHeadersInterceptor(SecurityUtils securityUtils) {
+        return new UserAuthHeadersInterceptor(securityUtils);
+    }
+
+    @Bean
+    public Retryer retryer() {
+        return Retryer.NEVER_RETRY;
+    }
+}

src/main/java/uk/gov/hmcts/ccd/data/AuthClientsConfiguration.java

@@ -5,6 +5,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
+import uk.gov.hmcts.ccd.clients.PocApiClient;
 import uk.gov.hmcts.reform.authorisation.ServiceAuthorisationApi;
 import uk.gov.hmcts.reform.authorisation.generators.AuthTokenGenerator;
 import uk.gov.hmcts.reform.authorisation.generators.AuthTokenGeneratorFactory;
@@ -15,7 +16,7 @@
 
 @Configuration
 @Lazy
-@EnableFeignClients(basePackageClasses = {IdamApi.class, ServiceAuthorisationApi.class})
+@EnableFeignClients(basePackageClasses = {IdamApi.class, ServiceAuthorisationApi.class, PocApiClient.class})
 public class AuthClientsConfiguration {
 
     @Bean

src/main/java/uk/gov/hmcts/ccd/data/casedetails/CaseAuditEventRepository.java

@@ -3,6 +3,7 @@
 import org.hibernate.transform.Transformers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import uk.gov.hmcts.ccd.ApplicationParams;
 import uk.gov.hmcts.ccd.domain.model.definition.CaseDetails;
 import uk.gov.hmcts.ccd.domain.model.std.AuditEvent;
 import uk.gov.hmcts.ccd.endpoint.exceptions.ResourceNotFoundException;
@@ -26,13 +27,19 @@ public class CaseAuditEventRepository {
     private static final String EVENT_NOT_FOUND = "Event not found";
 
     private final CaseAuditEventMapper caseAuditEventMapper;
+    private final POCCaseAuditEventRepository pocCaseAuditEventRepository;
+    private final ApplicationParams applicationParams;
 
     @PersistenceContext
     private EntityManager em;
 
     @Inject
-    public CaseAuditEventRepository(final CaseAuditEventMapper caseAuditEventMapper) {
+    public CaseAuditEventRepository(final CaseAuditEventMapper caseAuditEventMapper,
+                                    final POCCaseAuditEventRepository pocCaseAuditEventRepository,
+                                    final ApplicationParams applicationParams) {
         this.caseAuditEventMapper = caseAuditEventMapper;
+        this.pocCaseAuditEventRepository = pocCaseAuditEventRepository;
+        this.applicationParams = applicationParams;
     }
 
     public AuditEvent set(final AuditEvent auditEvent) {
@@ -42,6 +49,10 @@ public AuditEvent set(final AuditEvent auditEvent) {
     }
 
     public List<AuditEvent> findByCase(final CaseDetails caseDetails) {
+        if (applicationParams.isPocFeatureEnabled()) {
+            return pocCaseAuditEventRepository.findByCase(caseDetails);
+        }
+
         final List<CaseAuditEventEntity> resultList = em.createNamedQuery(CaseAuditEventEntity.FIND_BY_CASE)
             .setParameter(CaseAuditEventEntity.CASE_DATA_ID, Long.valueOf(caseDetails.getId()))
             .unwrap(org.hibernate.query.Query.class)

src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java

@@ -54,17 +54,20 @@ public class DefaultCaseDetailsRepository implements CaseDetailsRepository {
     private final SearchQueryFactoryOperation queryBuilder;
     private final CaseDetailsQueryBuilderFactory queryBuilderFactory;
     private final ApplicationParams applicationParams;
+    private final POCCaseDetailsRepository pocCaseDetailsRepository;
 
     @Inject
     public DefaultCaseDetailsRepository(
         final CaseDetailsMapper caseDetailsMapper,
         final SearchQueryFactoryOperation queryBuilder,
         final CaseDetailsQueryBuilderFactory queryBuilderFactory,
-        final ApplicationParams applicationParams) {
+        final ApplicationParams applicationParams,
+        final POCCaseDetailsRepository pocCaseDetailsRepository) {
         this.caseDetailsMapper = caseDetailsMapper;
         this.queryBuilder = queryBuilder;
         this.queryBuilderFactory = queryBuilderFactory;
         this.applicationParams = applicationParams;
+        this.pocCaseDetailsRepository = pocCaseDetailsRepository;
     }
 
     @Override
@@ -117,17 +120,24 @@ public List<Long> findCaseReferencesByIds(final List<Long> ids) {
 
     @Override
     public Optional<CaseDetails> findByReference(String jurisdiction, Long caseReference) {
-        return findByReference(jurisdiction, caseReference.toString());
+        String reference = caseReference.toString();
+        return applicationParams.isPocFeatureEnabled()
+                ? pocCaseDetailsRepository.findByReference(jurisdiction, reference)
+                : findByReference(jurisdiction, reference);
     }
 
     @Override
     public Optional<CaseDetails> findByReference(String jurisdiction, String reference) {
-        return find(jurisdiction, null, reference).map(this.caseDetailsMapper::entityToModel);
+        return applicationParams.isPocFeatureEnabled()
+                ? pocCaseDetailsRepository.findByReference(jurisdiction, reference)
+                : find(jurisdiction, null, reference).map(this.caseDetailsMapper::entityToModel);
     }
 
     @Override
     public Optional<CaseDetails> findByReference(String caseReference) {
-        return findByReference(null, caseReference);
+        return applicationParams.isPocFeatureEnabled()
+                ? pocCaseDetailsRepository.findByReference(caseReference)
+                : findByReference(null, caseReference);
     }
 
     /**
@@ -138,7 +148,10 @@ public Optional<CaseDetails> findByReference(String caseReference) {
     @Override
     @Deprecated
     public CaseDetails findByReference(final Long caseReference) {
-        return findByReference(null, caseReference).orElseThrow(() -> new ResourceNotFoundException("No case found"));
+        return applicationParams.isPocFeatureEnabled()
+                ? pocCaseDetailsRepository.findByReference(caseReference)
+                : findByReference(null,
+                caseReference).orElseThrow(() -> new ResourceNotFoundException("No case found"));
     }
 
     /**
@@ -153,7 +166,9 @@ public CaseDetails findByReference(final Long caseReference) {
     public CaseDetails findUniqueCase(final String jurisdiction,
                                       final String caseTypeId,
                                       final String reference) {
-        return findByReference(jurisdiction, reference).orElse(null);
+        return applicationParams.isPocFeatureEnabled()
+                ? pocCaseDetailsRepository.findUniqueCase(jurisdiction, caseTypeId, reference)
+                : findByReference(jurisdiction, reference).orElse(null);
     }
 
     @Override
@@ -220,6 +235,10 @@ private List<Long> findReferencesByIds(List<Long> ids) {
      */
     @Override
     public Optional<CaseDetails> findByReferenceWithNoAccessControl(String reference) {
+        if (applicationParams.isPocFeatureEnabled()) {
+            return pocCaseDetailsRepository.findByReferenceWithNoAccessControl(reference);
+        }
+
         CaseDetailsQueryBuilder<CaseDetailsEntity> qb = queryBuilderFactory.selectUnsecured(em);
         qb.whereReference(String.valueOf(reference));
         return qb.getSingleResult().map(this.caseDetailsMapper::entityToModel);

src/main/java/uk/gov/hmcts/ccd/data/casedetails/POCCaseAuditEventRepository.java

@@ -0,0 +1,27 @@
+package uk.gov.hmcts.ccd.data.casedetails;
+
+import java.util.List;
+import javax.inject.Inject;
+import org.springframework.stereotype.Service;
+import uk.gov.hmcts.ccd.clients.PocApiClient;
+import uk.gov.hmcts.ccd.domain.model.definition.CaseDetails;
+import uk.gov.hmcts.ccd.domain.model.std.AuditEvent;
+
+@Service
+public class POCCaseAuditEventRepository {
+
+
+    private final PocApiClient pocApiClient;
+
+    @Inject
+    public POCCaseAuditEventRepository(final PocApiClient pocApiClient) {
+        this.pocApiClient = pocApiClient;
+    }
+
+    public List<AuditEvent> findByCase(final CaseDetails caseDetails) {
+
+        Long reference = caseDetails.getReference();
+        return pocApiClient.getCaseHistory(reference.toString());
+    }
+
+}