[CTHLU-52] rename reporting-hydration to reporting-pipeline

.github/workflows/run-unit-tests.yaml

@@ -5,6 +5,7 @@ on:
       - "investigation-service/**"
       - "ldfdata-service/**"
       - "person-service/**"
+      - "reporting-pipeline-service/**"
       - "post-processing-service/**"
       - "observation-service/**"
       - "organization-service/**"

.gitignore

@@ -43,4 +43,3 @@ hs_err_pid*
 # Ignore Gradle build output directory
 build
 application-local.yaml
-NEDSSDev/

docker-compose.yaml

@@ -234,12 +234,12 @@ services:
       liquibase:
         condition: service_completed_successfully
 
-  reporting-hydration-service:
+  reporting-pipeline-service:
     build:
-      dockerfile: ./reporting-hydration-service/Dockerfile
+      dockerfile: ./reporting-pipeline-service/Dockerfile
     environment:
-      - DB_USERNAME=reporting_hydration_service_rdb
-      - DB_PASSWORD=reporting_hydration_service
+      - DB_USERNAME=reporting_pipeline_service_rdb
+      - DB_PASSWORD=reporting_pipeline_service
       - DB_HOST=jdbc:sqlserver://nbs-mssql:1433;databaseName=RDB_MODERN;encrypt=true;trustServerCertificate=true;
       - KAFKA_BOOTSTRAP_SERVER=kafka:29092
     depends_on:

documentation/DevSetup.md

@@ -19,7 +19,7 @@
 1. [organization-service](../organization-service/Dockerfile) - Processes Kafka message for Organization data
 1. [person-service](../person-service/Dockerfile) - Processes Kafka message for Person data
 1. [post-processing-service](../post-processing-service/Dockerfile) - Handles mapping key-uid mappings
-1. [reporting-hydration-service](../reporting-hydration-service/Dockerfile) - **FUTURE** service for consolidating all the DataReporting microserices
+1. [reporting-pipeline-service](../reporting-pipeline-service/Dockerfile) - **FUTURE** service for consolidating all the DataReporting microserices
 
 ### Prerequisites:
 

liquibase-service/src/main/resources/db/001-master/01_onboarding_scripts_user_creation/009-user-reporting_hydration_service_rdb.sql → liquibase-service/src/main/resources/db/001-master/01_onboarding_scripts_user_creation/009-user-reporting_pipeline_service_rdb.sql

@@ -1,11 +1,11 @@
 -- ==========================================
--- USER: reporting_hydration_service_rdb
--- SERVICE: reporting-hydration-service
+-- USER: reporting_pipeline_service_rdb
+-- SERVICE: reporting-pipeline-service
 -- ==========================================
 USE [master];
 
-DECLARE @UserName NVARCHAR(150) = 'reporting_hydration_service_rdb';
-DECLARE @UserPassword NVARCHAR(128) = N'reporting_hydration_service'; --Please provide your generated password.
+DECLARE @UserName NVARCHAR(150) = 'reporting_pipeline_service_rdb';
+DECLARE @UserPassword NVARCHAR(128) = N'reporting_pipeline_service'; --Please provide your generated password.
 
 -- Check if login already exists before creating
 IF NOT EXISTS (SELECT * FROM sys.server_principals WHERE name = @UserName)
@@ -103,4 +103,4 @@ IF EXISTS (SELECT * FROM sys.database_principals WHERE name = @UserName)
         PRINT 'Granted EXECUTE permission to [' + @UserName + ']';
     END
 
-PRINT 'Reporting hydration service permission grants completed.';
+PRINT 'Reporting pipeline service permission grants completed.';

reporting-pipeline-service/Dockerfile

@@ -0,0 +1,31 @@
+FROM amazoncorretto:21 as builder
+
+RUN yum update -y && yum clean all
+
+#Copy project config
+COPY gradle /usr/src/gradle
+COPY gradlew /usr/src/gradlew
+COPY settings.gradle /usr/src/settings.gradle
+
+#Copy sources
+COPY common-util /usr/src/common-util
+COPY reporting-pipeline-service /usr/src/reporting-pipeline-service
+
+#cd to root directory
+WORKDIR /usr/src/
+
+#Build service along with any required libraries
+RUN ./gradlew :reporting-pipeline-service:buildNeeded -x test --no-daemon
+
+FROM amazoncorretto:21
+RUN yum update -y && yum install -y curl && yum clean all
+COPY --from=builder /usr/src/reporting-pipeline-service/build/libs/reporting-pipeline-service*.jar reporting-pipeline-service.jar
+
+EXPOSE 8095
+
+HEALTHCHECK --interval=30s --timeout=3s --retries=3 \
+  CMD curl -f http://localhost:8095/actuator/health || exit 1
+
+# Run jar
+ENTRYPOINT ["java", "-jar", "reporting-pipeline-service.jar"]
+CMD ["java", "-jar", "reporting-pipeline-service.jar"]

reporting-pipeline-service/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'reporting-pipeline-service'

reporting-hydration-service/src/main/java/gov/cdc/etldatapipeline/reportinghydration/ReportingHydrationServiceApplication.java → reporting-pipeline-service/src/main/java/gov/cdc/etldatapipeline/pipeline/ReportingPipelineServiceApplication.java

@@ -1,21 +1,21 @@
-package gov.cdc.etldatapipeline.reportinghydration;
+package gov.cdc.etldatapipeline.pipeline;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
- * Main entry point for the Reporting Hydration Service. This service is intended to consolidate
+ * Main entry point for the Reporting Pipeline Service. This service is intended to consolidate
  * various reporting microservices into a single application to simplify the ETL data pipeline.
  */
 @SpringBootApplication
-public class ReportingHydrationServiceApplication {
+public class ReportingPipelineServiceApplication {
 
   /**
-   * Starts the Reporting Hydration Service application.
+   * Starts the Reporting Pipeline Service application.
    *
    * @param args command-line arguments
    */
   public static void main(String[] args) {
-    SpringApplication.run(ReportingHydrationServiceApplication.class, args);
+    SpringApplication.run(ReportingPipelineServiceApplication.class, args);
   }
 }

reporting-hydration-service/src/main/resources/application.yaml → reporting-pipeline-service/src/main/resources/application.yaml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: reporting-hydration-service
+    name: reporting-pipeline-service
   kafka:
     bootstrap-servers: ${KAFKA_BOOTSTRAP_SERVER}
   datasource:

reporting-hydration-service/src/test/java/gov/cdc/etldatapipeline/reportinghydration/ReportingHydrationServiceApplicationTests.java → reporting-pipeline-service/src/test/java/gov/cdc/etldatapipeline/pipeline/ReportingPipelineServiceApplicationTests.java

@@ -1,4 +1,4 @@
-package gov.cdc.etldatapipeline.reportinghydration;
+package gov.cdc.etldatapipeline.pipeline;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.mock;
@@ -15,7 +15,7 @@
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 
 @SpringBootTest
-class ReportingHydrationServiceApplicationTests {
+class ReportingPipelineServiceApplicationTests {
 
   @Autowired private ApplicationContext context;
 
@@ -25,13 +25,12 @@ void testMain() {
       mocked
           .when(
               () ->
-                  SpringApplication.run(
-                      ReportingHydrationServiceApplication.class, new String[] {}))
+                  SpringApplication.run(ReportingPipelineServiceApplication.class, new String[] {}))
           .thenReturn(null);
 
-      ReportingHydrationServiceApplication.main(new String[] {});
+      ReportingPipelineServiceApplication.main(new String[] {});
       mocked.verify(
-          () -> SpringApplication.run(ReportingHydrationServiceApplication.class, new String[] {}),
+          () -> SpringApplication.run(ReportingPipelineServiceApplication.class, new String[] {}),
           Mockito.times(1));
     }
   }

settings.gradle

@@ -18,4 +18,4 @@ include 'ldfdata-service'
 
 include 'liquibase-service'
 
-include 'reporting-hydration-service'
+include 'reporting-pipeline-service'