DSND-3213: Use one application properties file (#160)

* DSND-3213: Use one application properties file

* DSND-3213: Remove unused properties

* DSND-3213: Remove unused properties

Makefile

@@ -27,7 +27,7 @@ build:
 test: test-unit test-integration
 
 .PHONY: test-unit
-test-unit:
+test-unit: clean
 	mvn test
 
 .PHONY: test-integration

src/itest/java/uk/gov/companieshouse/pscdataapi/config/AbstractIntegrationTest.java

@@ -16,6 +16,7 @@
 @DirtiesContext
 @ActiveProfiles({"test"})
 public abstract class AbstractIntegrationTest extends AbstractMongoConfig {
+
     @MockBean
     public ChsKafkaApiService chsKafkaApiService;
 

src/itest/java/uk/gov/companieshouse/pscdataapi/config/AbstractMongoConfig.java

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

src/main/resources/application.properties

@@ -10,6 +10,9 @@ chs.api.kafka.resource-changed.uri=${PSC_API_RESOURCE_CHANGED_URI:/private/resou
 chs.api.metrics.url=${API_LOCAL_URL:localhost}
 chs.api.exemptions.url=${COMPANY_EXEMPTIONS_API_LOCAL_URL:https://localhost}
 
+api.api-url=${API_URL:localhost}
+api.api-key=${CHS_API_KEY:chsApiKey}
+
 spring.data.mongodb.uri=${MONGODB_URL:mongodb://mongo:27017}
 spring.data.mongodb.name=company_pscs
 # Disable static resources (otherwise NoResourceFoundException when no handler found)
@@ -20,4 +23,4 @@ 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.psc_individual_full_record_get=${FEATURE_FLAG_PSC_INDIVIDUAL_FULL_RECORD_GET_081124:false}