dpc-5162 - removing attribution db references

Author: Jose-verdance

dpc-aggregation/src/main/java/gov/cms/dpc/aggregation/AggregationAppModule.java

@@ -8,13 +8,13 @@
 import gov.cms.dpc.aggregation.engine.JobBatchProcessor;
 import gov.cms.dpc.aggregation.engine.OperationsConfig;
 import gov.cms.dpc.aggregation.health.AggregationEngineHealthCheck;
-import gov.cms.dpc.common.jdbi.ConsentDAO;
 import gov.cms.dpc.aggregation.service.*;
 import gov.cms.dpc.aggregation.tasks.TruncateDatabase;
 import gov.cms.dpc.common.annotations.ExportPath;
 import gov.cms.dpc.common.annotations.JobTimeout;
-import gov.cms.dpc.common.hibernate.attribution.DPCManagedSessionFactory;
 import gov.cms.dpc.common.hibernate.consent.DPCConsentManagedSessionFactory;
+import gov.cms.dpc.common.hibernate.queue.DPCQueueManagedSessionFactory;
+import gov.cms.dpc.common.jdbi.ConsentDAO;
 import gov.cms.dpc.fhir.hapi.ContextUtils;
 import gov.cms.dpc.queue.models.JobQueueBatch;
 import jakarta.inject.Named;
@@ -113,7 +113,7 @@ public int provideJobTimeoutInSeconds() {
     }
 
     @Provides
-    LookBackService provideLookBackService(DPCManagedSessionFactory sessionFactory, OperationsConfig operationsConfig) {
+    LookBackService provideLookBackService(DPCQueueManagedSessionFactory sessionFactory, OperationsConfig operationsConfig) {
         //Configuring to skip look back when look back months is less than 0
         if (operationsConfig.getLookBackMonths() < 0) {
             return new EveryoneGetsDataLookBackServiceImpl();

dpc-aggregation/src/main/java/gov/cms/dpc/aggregation/DPCAggregationConfiguration.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import gov.cms.dpc.bluebutton.config.BBClientConfiguration;
 import gov.cms.dpc.bluebutton.config.BlueButtonBundleConfiguration;
-import gov.cms.dpc.common.hibernate.attribution.IDPCDatabase;
 import gov.cms.dpc.common.hibernate.consent.IDPCConsentDatabase;
 import gov.cms.dpc.common.hibernate.queue.IDPCQueueDatabase;
 import gov.cms.dpc.queue.config.DPCAwsQueueConfiguration;
@@ -18,12 +17,7 @@
 
 import java.util.List;
 
-public class DPCAggregationConfiguration extends Configuration implements BlueButtonBundleConfiguration, IDPCDatabase, IDPCConsentDatabase, IDPCQueueDatabase, DPCQueueConfig {
-
-    @Valid
-    @NotNull
-    @JsonProperty("database")
-    private final DataSourceFactory database = new DataSourceFactory();
+public class DPCAggregationConfiguration extends Configuration implements BlueButtonBundleConfiguration, IDPCConsentDatabase, IDPCQueueDatabase, DPCQueueConfig {
 
     @Valid
     @NotNull
@@ -78,11 +72,6 @@ public class DPCAggregationConfiguration extends Configuration implements BlueBu
     @NotEmpty
     private String fhirReferenceURL;
 
-    @Override
-    public DataSourceFactory getDatabase() {
-        return this.database;
-    }
-
     @Override
     public DataSourceFactory getQueueDatabase() {
         return queueDatabase;

dpc-aggregation/src/main/java/gov/cms/dpc/aggregation/DPCAggregationService.java

@@ -23,7 +23,6 @@ public class DPCAggregationService extends Application<DPCAggregationConfigurati
 
     private final DPCQueueHibernateBundle<DPCAggregationConfiguration> queueHibernateBundle = new DPCQueueHibernateBundle<>();
     private final DPCConsentHibernateBundle<DPCAggregationConfiguration> consentHibernateBundle = new DPCConsentHibernateBundle<>();
-    private final DPCHibernateBundle<DPCAggregationConfiguration> hibernateBundle = new DPCHibernateBundle<>();
 
     public static void main(final String[] args) throws Exception {
         new DPCAggregationService().run(args);
@@ -51,7 +50,6 @@ public void initialize(Bootstrap<DPCAggregationConfiguration> bootstrap) {
                 .modules(new DPCQueueHibernateModule<>(queueHibernateBundle),
                         new DPCConsentHibernateModule<>(consentHibernateBundle),
                         new AggregationAppModule(),
-                        new DPCHibernateModule<>(hibernateBundle),
                         new JobQueueModule<DPCAggregationConfiguration>(),
                         new BlueButtonClientModule<DPCAggregationConfiguration>())
                 .build();
@@ -61,7 +59,6 @@ public void initialize(Bootstrap<DPCAggregationConfiguration> bootstrap) {
         // so Dropwizard needs to initialize the HibernateBundle first to create the SessionFactory.
         bootstrap.addBundle(queueHibernateBundle);
         bootstrap.addBundle(consentHibernateBundle);
-        bootstrap.addBundle(hibernateBundle);
 
         bootstrap.addBundle(guiceBundle);
         bootstrap.addBundle(new MigrationsBundle<>() {

dpc-aggregation/src/main/java/gov/cms/dpc/aggregation/service/LookBackServiceImpl.java

@@ -2,6 +2,7 @@
 
 import com.google.common.base.Joiner;
 import gov.cms.dpc.aggregation.engine.OperationsConfig;
+import gov.cms.dpc.common.hibernate.auth.DPCAuthHibernateBundle;
 import gov.cms.dpc.fhir.DPCIdentifierSystem;
 import io.dropwizard.hibernate.UnitOfWork;
 import jakarta.inject.Inject;
@@ -35,7 +36,7 @@ public LookBackServiceImpl(OperationsConfig operationsConfig) {
     }
 
     @Override
-    @UnitOfWork(readOnly = true)
+    @UnitOfWork(value = DPCAuthHibernateBundle.BUNDLE_NAME, readOnly = true)
     @SuppressWarnings("JdkObsolete") // Date class used by FHIR stu3 Period model
     public LookBackAnswer getLookBackAnswer(ExplanationOfBenefit explanationOfBenefit, String organizationNPI, String practitionerNPI) {
         MDC.put(EOB_ID, explanationOfBenefit.getId());

dpc-aggregation/src/main/resources/application.yml

@@ -1,19 +1,3 @@
-database:
-  driverClass: ${DB_DRIVER_CLASS:-"org.postgresql.Driver"}
-  url: ${ATTRIBUTION_DB_URL:-"jdbc:postgresql://db:5432/dpc_attribution"}
-  user: "${ATTRIBUTION_DB_USER:-postgres}"
-  password: "${ATTRIBUTION_DB_PASS:-dpc-safe}"  # Ignored in AWS, needed to run locally
-  initialSize: 5
-  minSize: 5
-  maxSize: 10
-  properties:
-    charSet: UTF-8
-    hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect
-    wrapperPlugins: iam,failover,efm2
-    iamRegion: us-east-1
-    sslmode: ${DB_SSL_MODE:-"prefer"}
-    sslrootcert: /awscert/global-bundle.pem
-
 queuedb:
   driverClass: ${DB_DRIVER_CLASS:-"org.postgresql.Driver"}
   url: ${QUEUE_DB_URL:-"jdbc:postgresql://db:5432/dpc_queue"}