Merge pull request #174 from companieshouse/feature/rename-feature-flag

Rename Feature flag FEATURE_FLAG_PSC_INDIVIDUAL_FULL_RECORD_GET_081124

Author: PhilipGlover

src/itest/java/uk/gov/companieshouse/pscdataapi/CucumberFeaturesRunnerIT.java

@@ -36,7 +36,7 @@ public class CucumberFeaturesRunnerIT {
 
     @DynamicPropertySource
     public static void setProperties(DynamicPropertyRegistry registry) {
-        registry.add("feature.psc_individual_full_record_get", () -> true);
+        registry.add("feature.identity_verification", () -> true);
         registry.add("spring.data.mongodb.uri", mongoDBContainer::getReplicaSetUrl);
         mongoDBContainer.start();
     }

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

@@ -11,7 +11,7 @@ public class FeatureFlags {
     private final boolean individualPscFullRecordAddVerificationStateEnabled;
 
     public FeatureFlags(@Value("${feature.seeding_collection_enabled}") final boolean streamHookDisabled,
-        @Value("${feature.psc_individual_full_record_get}") final boolean individualPscFullRecordGetEnabled,
+        @Value("${feature.identity_verification}") final boolean individualPscFullRecordGetEnabled,
         @Value("${feature.psc_individual_full_record_add_verification_state}") final boolean individualPscFullRecordAddVerificationStateEnabled) {
         this.streamHookDisabled = streamHookDisabled;
         this.individualPscFullRecordGetEnabled = individualPscFullRecordGetEnabled;

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

@@ -21,7 +21,7 @@
 @Configuration
 public class WebSecurityConfig implements WebMvcConfigurer {
     // feature flag marked for future removal
-    @Value("${feature.psc_individual_full_record_get:false}")
+    @Value("${feature.identity_verification:false}")
     private Boolean featurePscIndividualFullRecordGet;
 
     List<String> otherAllowedAuthMethods = Arrays.asList("oauth2");

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

@@ -14,7 +14,7 @@
 import uk.gov.companieshouse.pscdataapi.service.CompanyPscService;
 
 @RestController
-@ConditionalOnProperty(prefix = "feature", name = "psc_individual_full_record_get", havingValue = "true")
+@ConditionalOnProperty(prefix = "feature", name = "identity_verification", havingValue = "true")
 @RequestMapping(path = "/company/{company_number}/persons-with-significant-control",
         produces = "application/json")
 public class CompanyPscFullRecordGetController {

src/main/resources/application.properties

@@ -21,7 +21,7 @@ spring.mvc.throw-exception-if-no-handler-found=false
 spring.data.jackson.default-property-inclusion=NON_NULL
 
 feature.seeding_collection_enabled=${SEEDING_COLLECTION_ENABLED:false}
-feature.psc_individual_full_record_get=${FEATURE_FLAG_PSC_INDIVIDUAL_FULL_RECORD_GET_081124:false}
+feature.identity_verification=${FEATURE_FLAG_IDENTITY_VERIFICATION_081124:false}
 feature.psc_individual_full_record_add_verification_state=${FEATURE_FLAG_PSC_INDIVIDUAL_FULL_RECORD_ADD_VERIFICATION_STATE_180225:false}
 
 server.port=${PORT:8081}

src/test/java/uk/gov/companieshouse/pscdataapi/config/WebSecurityConfigTest.java

@@ -21,7 +21,7 @@
 
 @ExtendWith(SpringExtension.class)
 @WebMvcTest(value = CompanyPscFullRecordGetController.class,
-    properties = {"feature.psc_individual_full_record_get=true"})
+    properties = {"feature.identity_verification=true"})
 class WebSecurityConfigTest {
     private static final String MOCK_COMPANY_NUMBER = "1234567";
     private static final String MOCK_NOTIFICATION_ID = "123456789";

src/test/java/uk/gov/companieshouse/pscdataapi/controller/CompanyPscFullRecordGetControllerTest.java

@@ -29,7 +29,7 @@
 import uk.gov.companieshouse.pscdataapi.exceptions.ResourceNotFoundException;
 import uk.gov.companieshouse.pscdataapi.service.CompanyPscService;
 
-@SpringBootTest(properties = {"feature.psc_individual_full_record_get=true"})
+@SpringBootTest(properties = {"feature.identity_verification=true"})
 @AutoConfigureMockMvc
 class CompanyPscFullRecordGetControllerTest {
 

src/test/java/uk/gov/companieshouse/pscdataapi/controller/CompanyPscFullRecordGetDisabledControllerTest.java

@@ -21,7 +21,7 @@
 import uk.gov.companieshouse.api.psc.Individual;
 import uk.gov.companieshouse.pscdataapi.service.CompanyPscService;
 
-@SpringBootTest(properties = {"feature.psc_individual_full_record_get=false"}, webEnvironment = WebEnvironment.RANDOM_PORT)
+@SpringBootTest(properties = {"feature.identity_verification=false"}, webEnvironment = WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
 class CompanyPscFullRecordGetDisabledControllerTest {