wip

CMSgov · Nov 22, 2024 · c65de74 · c65de74
1 parent 9979cb3
commit c65de74
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/e2e-bfd-test/src/test/java/gov/cms/ab2d/SpringBootApp.java b/e2e-bfd-test/src/test/java/gov/cms/ab2d/SpringBootApp.java
@@ -1,13 +1,49 @@
 package gov.cms.ab2d;
 
+import gov.cms.ab2d.common.feign.ContractFeignClient;
+import gov.cms.ab2d.worker.bfdhealthcheck.BFDHealthCheckQuartzSetup;
+import gov.cms.ab2d.worker.stuckjob.StuckJobQuartzSetup;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.retry.annotation.EnableRetry;
 
-@EnableJpaRepositories("com.*") @ComponentScan(basePackages = { "com.*" }) @EntityScan("com.*")
-@SpringBootApplication
+//@EnableJpaRepositories("com.*") @ComponentScan(basePackages = { "com.*" }) @EntityScan("com.*")
+//@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {
+        "gov.cms.ab2d.common.model",
+//        "gov.cms.ab2d.common.properties",
+        "gov.cms.ab2d.common.service",
+        "gov.cms.ab2d.common.config",
+    //    "gov.cms.ab2d.job",
+    //    "gov.cms.ab2d.coverage",
+       // "gov.cms.ab2d.worker",
+        "gov.cms.ab2d.bfd.client",
+        "gov.cms.ab2d.contracts",
+      //  "gov.cms.ab2d.worker.service",
+     //   "gov.cms.ab2d.eventclient.clients",
+     //   "gov.cms.ab2d.snsclient.clients"
+})
+@EntityScan(basePackages = {"gov.cms.ab2d.common.model", "gov.cms.ab2d.common.properties",
+        "gov.cms.ab2d.common.service",  "gov.cms.ab2d.common.config",
+        "gov.cms.ab2d.job.model", "gov.cms.ab2d.coverage.model",
+        "gov.cms.ab2d.properties.model",
+        "gov.cms.ab2d.contracts",
+        "gov.cms.ab2d.eventclient.clients", "gov.cms.ab2d.bfd.client"})
+@EnableJpaRepositories(basePackages = {"gov.cms.ab2d.common.repository", "gov.cms.ab2d.job.repository",
+        "gov.cms.ab2d.coverage.repository"})
+@EnableRetry
+@PropertySource("classpath:application.common.properties")
+//@Import({StuckJobQuartzSetup.class, BFDHealthCheckQuartzSetup.class})
+@EnableFeignClients(clients = {ContractFeignClient.class})
+@ImportAutoConfiguration({FeignAutoConfiguration.class})
 public class SpringBootApp {
 
     public static void main(String[] args) {

diff --git a/e2e-bfd-test/src/test/java/gov/cms/ab2d/testjobs/EndToEndBfdTests.java b/e2e-bfd-test/src/test/java/gov/cms/ab2d/testjobs/EndToEndBfdTests.java
@@ -16,6 +16,7 @@
 import gov.cms.ab2d.coverage.repository.CoverageSearchRepository;
 import gov.cms.ab2d.coverage.service.CoverageService;
 import gov.cms.ab2d.eventclient.clients.SQSEventClient;
+import gov.cms.ab2d.eventclient.config.Ab2dEnvironment;
 import gov.cms.ab2d.fhir.BundleUtils;
 import gov.cms.ab2d.fhir.FhirVersion;
 import gov.cms.ab2d.fhir.IdentifierUtils;
@@ -72,6 +73,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
@@ -118,6 +120,8 @@ public class EndToEndBfdTests {
     private static final AB2DLocalstackContainer LOCALSTACK_CONTAINER = new AB2DLocalstackContainer();
 
     // We don't care about logging here
+    @MockBean
+    Ab2dEnvironment environment;
     @Mock
     SQSEventClient logManager;
     @Autowired