From a981b4923e9e04afb2efea52f161120609cde6c2 Mon Sep 17 00:00:00 2001 From: Duc Nguyen <117302958+ndduc01@users.noreply.github.com> Date: Fri, 2 Aug 2024 09:57:59 -0700 Subject: [PATCH] Cndit 1599 2 (#6) * added processor * added core for netss * added support for nettss * fix failure * unit test for data exchange * test for poll * update yaml and added logic to processing date input * unit test and added script for windows and lnux * unit test and added script for windows and lnux * updated read me * updated script --- .DS_Store | Bin 8196 -> 8196 bytes README.md | 8 + nnd-data-exchange-service/build.gradle | 21 +- .../controller/DataExchangeController.java | 4 +- .../msg/NETSSTransportQOutRepository.java | 13 + .../msg/TransportQOutRepository.java | 3 - .../msg/model/NETSSTransportQOut.java | 9 +- .../repository/msg/model/TransportQOut.java | 2 +- .../odse/CNTransportQOutRepository.java | 5 - .../odse/model/CNTransportQOut.java | 9 +- .../CustomAuthenticationManagerResolver.java | 3 - .../service/CNTransportQOutService.java | 7 +- .../service/DataExchangeService.java | 5 +- .../service/NetsstTransportService.java | 43 ++- .../service/TransportQOutService.java | 3 - .../interfaces/IDataExchangeService.java | 2 +- .../interfaces/INetsstTransportService.java | 6 + .../service/model/dto/CNTransportQOutDto.java | 3 + .../model/dto/NETSSTransportQOutDto.java | 4 + .../service/model/dto/TransportQOutDto.java | 3 + .../service/CNTransportQOutServiceTest.java | 95 +++++++ .../service/DataExchangeServiceTest.java | 85 ++++++ .../service/NetsstTransportServiceTest.java | 91 +++++++ .../service/TransportQOutServiceTest.java | 118 +++++++++ nnd-data-poll-service/build.gradle | 7 +- .../execute_script/nnd_data_poll_service.cmd | 13 + .../execute_script/nnd_data_poll_service.sh | 14 + .../msg/NETSSTransportQOutRepository.java | 7 +- .../service/DataHandlingService.java | 6 + .../service/NetsstTransportService.java | 61 ++++- .../interfaces/INetsstTransportService.java | 7 + .../service/model/dto/CNTransportQOutDto.java | 3 + .../model/dto/NETSSTransportQOutDto.java | 3 + .../service/model/dto/TransportQOutDto.java | 4 + .../NndDataPollServiceApplicationTests.java | 13 - .../service/CNTransportQOutServiceTest.java | 101 +++++++ .../service/DataHandlingServiceTest.java | 83 ++++++ .../service/DataPullServiceTest.java | 47 ++++ .../service/ErrorHandlingServiceTest.java | 68 +++++ .../service/NetsstTransportServiceTest.java | 104 ++++++++ .../service/TokenServiceTest.java | 67 +++++ .../service/TransportQOutServiceTest.java | 112 ++++++++ nnd-message-processor/.gitignore | 37 +++ nnd-message-processor/build.gradle | 51 ++++ .../execute_script/nnd_message_processor.cmd | 9 + .../execute_script/nnd_message_processor.sh | 9 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + nnd-message-processor/gradlew | 249 ++++++++++++++++++ nnd-message-processor/gradlew.bat | 92 +++++++ .../NndMessageProcessorApplication.java | 15 ++ .../configuration/DataSourceConfig.java | 71 +++++ .../exception/DataProcessorException.java | 7 + .../NetssTransportQOutRepository.java | 60 +++++ .../repository/model/NETSSTransportQOut.java | 70 +++++ .../service/MessageProcessingService.java | 201 ++++++++++++++ .../service/NETSSTransportQOutService.java | 50 ++++ .../service/NetssCaseService.java | 137 ++++++++++ .../INETSSTransportQOutService.java | 11 + .../service/interfaces/INetssCaseService.java | 7 + .../model/dto/NETSSTransportQOutDto.java | 58 ++++ .../src/main/resources/application.yaml | 42 +++ .../service/MessageProcessingServiceTest.java | 181 +++++++++++++ .../NETSSTransportQOutServiceTest.java | 139 ++++++++++ .../service/NetssCaseServiceTest.java | 121 +++++++++ 65 files changed, 2834 insertions(+), 52 deletions(-) create mode 100644 nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/CNTransportQOutServiceTest.java create mode 100644 nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/DataExchangeServiceTest.java create mode 100644 nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/NetsstTransportServiceTest.java create mode 100644 nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/TransportQOutServiceTest.java create mode 100644 nnd-data-poll-service/execute_script/nnd_data_poll_service.cmd create mode 100755 nnd-data-poll-service/execute_script/nnd_data_poll_service.sh delete mode 100644 nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/NndDataPollServiceApplicationTests.java create mode 100644 nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/CNTransportQOutServiceTest.java create mode 100644 nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/DataHandlingServiceTest.java create mode 100644 nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/DataPullServiceTest.java create mode 100644 nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/ErrorHandlingServiceTest.java create mode 100644 nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/NetsstTransportServiceTest.java create mode 100644 nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/TokenServiceTest.java create mode 100644 nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/TransportQOutServiceTest.java create mode 100644 nnd-message-processor/.gitignore create mode 100644 nnd-message-processor/build.gradle create mode 100644 nnd-message-processor/execute_script/nnd_message_processor.cmd create mode 100755 nnd-message-processor/execute_script/nnd_message_processor.sh create mode 100644 nnd-message-processor/gradle/wrapper/gradle-wrapper.jar create mode 100644 nnd-message-processor/gradle/wrapper/gradle-wrapper.properties create mode 100755 nnd-message-processor/gradlew create mode 100644 nnd-message-processor/gradlew.bat create mode 100644 nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/NndMessageProcessorApplication.java create mode 100644 nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/configuration/DataSourceConfig.java create mode 100644 nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/exception/DataProcessorException.java create mode 100644 nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/repository/NetssTransportQOutRepository.java create mode 100644 nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/repository/model/NETSSTransportQOut.java create mode 100644 nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/MessageProcessingService.java create mode 100644 nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/NETSSTransportQOutService.java create mode 100644 nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/NetssCaseService.java create mode 100644 nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/interfaces/INETSSTransportQOutService.java create mode 100644 nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/interfaces/INetssCaseService.java create mode 100644 nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/model/dto/NETSSTransportQOutDto.java create mode 100644 nnd-message-processor/src/main/resources/application.yaml create mode 100644 nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/MessageProcessingServiceTest.java create mode 100644 nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/NETSSTransportQOutServiceTest.java create mode 100644 nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/NetssCaseServiceTest.java diff --git a/.DS_Store b/.DS_Store index acbcf531e074cc17c086acacb7d6fab3a8d31160..3bde1eb6c2399922110e0c739878c4d3764a677f 100644 GIT binary patch delta 50 zcmZp1XmQvOD>zw2zN0&1(f&m?rxP1x~gUQQWL7@{k(<$$tvz diff --git a/README.md b/README.md index db7a0ff..29e63fd 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,14 @@ This architecture ensure the STLT can make a secure connection to CDC database w - OP_DBUSER: On Prem DB info - NBS_NND_CRON: Cron Scheduler (ex: * * * * * *) - NBS_NND_CRON_TIME_ZONE: Cron timezone (ex: UTC) +- NETSS Message Processor ENV: + - NBS_NND_CRON: Cron Scheduler (ex: * * * * * *) + - NND_FILE_LOCATION: Path to output directory on the setup machine (ex: /Users/UserName/Desktop/LOG) + - NND_PRIOR: prior date indicator (ex: either T or F) + - NND_DATE: date value (format: 12/30/2023) + - OP_DBPASSWORD: On Prem DB info + - OP_DBSERVER: On Prem DB info + - OP_DBUSER: On Prem DB info ## Useful command to run Poller jar file The two enviroment variable the end user will need to explicitly set when running the poller service is the CRON configuration (NBS_NND_CRON (schedule) and NBS_NND_CRON_TIME_ZONE (timezone)) diff --git a/nnd-data-exchange-service/build.gradle b/nnd-data-exchange-service/build.gradle index cae9bac..4fbed90 100644 --- a/nnd-data-exchange-service/build.gradle +++ b/nnd-data-exchange-service/build.gradle @@ -28,20 +28,29 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' - implementation 'com.google.code.gson:gson:2.10.1' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server:3.2.0' implementation 'com.microsoft.sqlserver:mssql-jdbc:12.2.0.jre11' implementation 'com.zaxxer:HikariCP:5.0.1' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - testImplementation 'org.springframework.security:spring-security-test:6.2.0' - runtimeOnly 'com.nimbusds:oauth2-oidc-sdk:11.8' implementation 'org.apache.httpcomponents.core5:httpcore5:5.2.5' + runtimeOnly 'com.nimbusds:oauth2-oidc-sdk:11.8' + + testImplementation platform('org.junit:junit-bom') + testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation 'org.mockito:mockito-core' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } -tasks.named('test') { +test { useJUnitPlatform() } + + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/controller/DataExchangeController.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/controller/DataExchangeController.java index cff84ac..417828a 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/controller/DataExchangeController.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/controller/DataExchangeController.java @@ -9,7 +9,6 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -43,10 +42,11 @@ public DataExchangeController(IDataExchangeService dataExchangeService) { @GetMapping(path = "/api/nnd/data-exchange") public ResponseEntity exchangingData(@RequestParam("cnStatusTime") String cnStatusTime, @RequestParam("transportStatusTime") String transportStatusTime, + @RequestParam("netssTime") String netssTime, @RequestParam("statusCd") String statusCd) throws DataExchangeException { if (statusCd.isEmpty()) { throw new DataExchangeException("Status Code is Missing"); } - return ResponseEntity.ok(dataExchangeService.getDataForOnPremExchanging(cnStatusTime, transportStatusTime, statusCd)); + return ResponseEntity.ok(dataExchangeService.getDataForOnPremExchanging(cnStatusTime, transportStatusTime,netssTime, statusCd)); } } diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/NETSSTransportQOutRepository.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/NETSSTransportQOutRepository.java index 7991ebc..381134b 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/NETSSTransportQOutRepository.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/NETSSTransportQOutRepository.java @@ -2,8 +2,21 @@ import gov.cdc.nnddataexchangeservice.repository.msg.model.NETSSTransportQOut; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import java.sql.Timestamp; +import java.util.Collection; +import java.util.Optional; + @Repository public interface NETSSTransportQOutRepository extends JpaRepository { + @Query("SELECT a FROM NETSSTransportQOut a") + Optional> findNetssTransport (); + + @Query("SELECT a FROM NETSSTransportQOut a WHERE a.addTime > :recordStatusTime") + Optional> findNetssTransportByCreationTime (@Param("recordStatusTime") Timestamp recordStatusTime); + + } diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/TransportQOutRepository.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/TransportQOutRepository.java index 7e4b1ac..682072a 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/TransportQOutRepository.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/TransportQOutRepository.java @@ -1,14 +1,11 @@ package gov.cdc.nnddataexchangeservice.repository.msg; -import gov.cdc.nnddataexchangeservice.repository.msg.model.NETSSTransportQOut; import gov.cdc.nnddataexchangeservice.repository.msg.model.TransportQOut; -import gov.cdc.nnddataexchangeservice.repository.odse.model.CNTransportQOut; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import java.sql.Timestamp; import java.util.Collection; import java.util.Optional; diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/model/NETSSTransportQOut.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/model/NETSSTransportQOut.java index 5202e21..5da565a 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/model/NETSSTransportQOut.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/model/NETSSTransportQOut.java @@ -1,10 +1,13 @@ package gov.cdc.nnddataexchangeservice.repository.msg.model; -import jakarta.persistence.*; -import lombok.Data; -import lombok.NoArgsConstructor; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.sql.Timestamp; diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/model/TransportQOut.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/model/TransportQOut.java index 516b812..98ac3c2 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/model/TransportQOut.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/msg/model/TransportQOut.java @@ -1,7 +1,7 @@ package gov.cdc.nnddataexchangeservice.repository.msg.model; import jakarta.persistence.*; -import lombok.*; +import lombok.Data; @Entity @Table(name = "TransportQ_out") diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/odse/CNTransportQOutRepository.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/odse/CNTransportQOutRepository.java index aca4021..2ba3a72 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/odse/CNTransportQOutRepository.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/odse/CNTransportQOutRepository.java @@ -1,9 +1,7 @@ package gov.cdc.nnddataexchangeservice.repository.odse; -import gov.cdc.nnddataexchangeservice.repository.msg.model.TransportQOut; import gov.cdc.nnddataexchangeservice.repository.odse.model.CNTransportQOut; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @@ -23,7 +21,4 @@ Optional> findTransportByCreationTimeAndStatus (@Par - @Modifying - @Query("UPDATE CNTransportQOut a SET a.recordStatusCd = :statusCd, a.recordStatusTime = :statusTime WHERE a.cnTransportqOutUid = :uid") - void updateTransportStatusByUid(Long uid, String statusCd, Timestamp statusTime); } diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/odse/model/CNTransportQOut.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/odse/model/CNTransportQOut.java index ab19ce5..fe9c8b2 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/odse/model/CNTransportQOut.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/repository/odse/model/CNTransportQOut.java @@ -1,11 +1,14 @@ package gov.cdc.nnddataexchangeservice.repository.odse.model; -import jakarta.persistence.*; -import lombok.Data; -import lombok.NoArgsConstructor; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.sql.Timestamp; diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/security/CustomAuthenticationManagerResolver.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/security/CustomAuthenticationManagerResolver.java index bb0c005..7f326b2 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/security/CustomAuthenticationManagerResolver.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/security/CustomAuthenticationManagerResolver.java @@ -3,9 +3,6 @@ import gov.cdc.nnddataexchangeservice.exception.DataExchangeSecurityException; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import jakarta.servlet.http.HttpServletRequest; -import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManagerResolver; import org.springframework.security.oauth2.server.resource.authentication.OpaqueTokenAuthenticationProvider; diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/CNTransportQOutService.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/CNTransportQOutService.java index c5971bc..d62d194 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/CNTransportQOutService.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/CNTransportQOutService.java @@ -27,13 +27,14 @@ public List getTransportData(String statusCd, String statusT List cnTransportQOutDtoList = new ArrayList<>(); try { - SimpleDateFormat formatter = new SimpleDateFormat(TIMESTAMP_FORMAT); - java.util.Date parsedDate = formatter.parse(statusTime); - Timestamp recordStatusTime = new Timestamp(parsedDate.getTime()); + Optional> transportQOutResults; if (statusTime.isEmpty()) { transportQOutResults = cnTransportQOutRepository.findTransportByStatusCd(statusCd); } else { + SimpleDateFormat formatter = new SimpleDateFormat(TIMESTAMP_FORMAT); + java.util.Date parsedDate = formatter.parse(statusTime); + Timestamp recordStatusTime = new Timestamp(parsedDate.getTime()); transportQOutResults = cnTransportQOutRepository.findTransportByCreationTimeAndStatus(recordStatusTime, statusCd); } diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/DataExchangeService.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/DataExchangeService.java index 3d676e4..3bd4715 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/DataExchangeService.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/DataExchangeService.java @@ -23,16 +23,19 @@ public DataExchangeService(INetsstTransportService netsstTransportService, this.cnTransportQOutService = icnTransportQOutService; } - public DataExchangeModel getDataForOnPremExchanging(String cnStatusTime, String transportTime, String statusCd) throws DataExchangeException { + public DataExchangeModel getDataForOnPremExchanging(String cnStatusTime, String transportTime,String netssTime, String statusCd) throws DataExchangeException { var dataExchange = new DataExchangeModel(); var cnTransportDatas = cnTransportQOutService.getTransportData(statusCd, cnStatusTime); var transportDatas = transportQOutService.getTransportData(transportTime); + var netssDatas = netsstTransportService.getNetssTransportData(netssTime); dataExchange.setCnTransportQOutDtoList(cnTransportDatas); dataExchange.setTransportQOutDtoList(transportDatas); + dataExchange.setNetssTransportQOutDtoList(netssDatas); dataExchange.setCountCnTransport(cnTransportDatas.size()); dataExchange.setCountTransport(transportDatas.size()); + dataExchange.setCountNetssTransport(netssDatas.size()); return dataExchange; } } diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/NetsstTransportService.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/NetsstTransportService.java index d5a5265..8c59ec8 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/NetsstTransportService.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/NetsstTransportService.java @@ -1,15 +1,56 @@ package gov.cdc.nnddataexchangeservice.service; +import gov.cdc.nnddataexchangeservice.exception.DataExchangeException; import gov.cdc.nnddataexchangeservice.repository.msg.NETSSTransportQOutRepository; -import gov.cdc.nnddataexchangeservice.repository.msg.TransportQOutRepository; +import gov.cdc.nnddataexchangeservice.repository.msg.model.NETSSTransportQOut; import gov.cdc.nnddataexchangeservice.service.interfaces.INetsstTransportService; +import gov.cdc.nnddataexchangeservice.service.model.dto.NETSSTransportQOutDto; import org.springframework.stereotype.Service; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Optional; + @Service public class NetsstTransportService implements INetsstTransportService { private final NETSSTransportQOutRepository netssTransportQOutRepository; + private static final String TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; public NetsstTransportService(NETSSTransportQOutRepository netssTransportQOutRepository) { this.netssTransportQOutRepository = netssTransportQOutRepository; } + + + public List getNetssTransportData(String statusTime) throws DataExchangeException { + + List cnTransportQOutDtoList = new ArrayList<>(); + try { + + Optional> transportQOutResults; + if (statusTime.isEmpty()) { + transportQOutResults = netssTransportQOutRepository.findNetssTransport(); + } else { + SimpleDateFormat formatter = new SimpleDateFormat(TIMESTAMP_FORMAT); + java.util.Date parsedDate = formatter.parse(statusTime); + Timestamp recordStatusTime = new Timestamp(parsedDate.getTime()); + transportQOutResults = netssTransportQOutRepository.findNetssTransportByCreationTime(recordStatusTime); + } + + if (transportQOutResults.isPresent()) { + for(var item : transportQOutResults.get()) { + NETSSTransportQOutDto transportQOutDto = new NETSSTransportQOutDto(item); + cnTransportQOutDtoList.add(transportQOutDto); + } + } + + } catch (Exception e) { + throw new DataExchangeException(e.getMessage()); + } + + + return cnTransportQOutDtoList; + } } diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/TransportQOutService.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/TransportQOutService.java index 49aaeed..2f41801 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/TransportQOutService.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/TransportQOutService.java @@ -3,13 +3,10 @@ import gov.cdc.nnddataexchangeservice.exception.DataExchangeException; import gov.cdc.nnddataexchangeservice.repository.msg.TransportQOutRepository; import gov.cdc.nnddataexchangeservice.repository.msg.model.TransportQOut; -import gov.cdc.nnddataexchangeservice.repository.odse.model.CNTransportQOut; import gov.cdc.nnddataexchangeservice.service.interfaces.ITransportQOutService; -import gov.cdc.nnddataexchangeservice.service.model.dto.CNTransportQOutDto; import gov.cdc.nnddataexchangeservice.service.model.dto.TransportQOutDto; import org.springframework.stereotype.Service; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/interfaces/IDataExchangeService.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/interfaces/IDataExchangeService.java index 2219e05..31e6baf 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/interfaces/IDataExchangeService.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/interfaces/IDataExchangeService.java @@ -4,5 +4,5 @@ import gov.cdc.nnddataexchangeservice.service.model.DataExchangeModel; public interface IDataExchangeService { - DataExchangeModel getDataForOnPremExchanging(String cnStatusTime, String transportStatusTime, String statusCd) throws DataExchangeException; + DataExchangeModel getDataForOnPremExchanging(String cnStatusTime, String transportStatusTime, String netssTime , String statusCd) throws DataExchangeException; } diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/interfaces/INetsstTransportService.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/interfaces/INetsstTransportService.java index df6adba..ebe2195 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/interfaces/INetsstTransportService.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/interfaces/INetsstTransportService.java @@ -1,4 +1,10 @@ package gov.cdc.nnddataexchangeservice.service.interfaces; +import gov.cdc.nnddataexchangeservice.exception.DataExchangeException; +import gov.cdc.nnddataexchangeservice.service.model.dto.NETSSTransportQOutDto; + +import java.util.List; + public interface INetsstTransportService { + List getNetssTransportData(String statusTime) throws DataExchangeException; } diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/CNTransportQOutDto.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/CNTransportQOutDto.java index 01b13c7..2c938ea 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/CNTransportQOutDto.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/CNTransportQOutDto.java @@ -27,6 +27,9 @@ public class CNTransportQOutDto { private Timestamp recordStatusTime; private Integer versionCtrlNbr; + public CNTransportQOutDto() { + + } // Constructor to convert domain model to DTO public CNTransportQOutDto(CNTransportQOut cnTransportQOut) { this.cnTransportqOutUid = cnTransportQOut.getCnTransportqOutUid(); diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/NETSSTransportQOutDto.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/NETSSTransportQOutDto.java index 1989d04..135f424 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/NETSSTransportQOutDto.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/NETSSTransportQOutDto.java @@ -21,6 +21,10 @@ public class NETSSTransportQOutDto { private String payload; private String recordStatusCd; + public NETSSTransportQOutDto() { + + } + // Constructor to convert domain model to DTO public NETSSTransportQOutDto(NETSSTransportQOut netssTransportQOut) { this.netssTransportQOutUid = netssTransportQOut.getNetssTransportQOutUid(); diff --git a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/TransportQOutDto.java b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/TransportQOutDto.java index c7a603d..be1636d 100644 --- a/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/TransportQOutDto.java +++ b/nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/model/dto/TransportQOutDto.java @@ -41,6 +41,9 @@ public class TransportQOutDto { private String responseMessageSignature; private Integer priority; + public TransportQOutDto() { + + } // Constructor to convert domain model to DTO public TransportQOutDto(TransportQOut transportQOut) { this.recordId = transportQOut.getRecordId(); diff --git a/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/CNTransportQOutServiceTest.java b/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/CNTransportQOutServiceTest.java new file mode 100644 index 0000000..af88c66 --- /dev/null +++ b/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/CNTransportQOutServiceTest.java @@ -0,0 +1,95 @@ +package gov.cdc.nnddataexchangeservice.service; + + +import gov.cdc.nnddataexchangeservice.exception.DataExchangeException; +import gov.cdc.nnddataexchangeservice.repository.odse.CNTransportQOutRepository; +import gov.cdc.nnddataexchangeservice.repository.odse.model.CNTransportQOut; +import gov.cdc.nnddataexchangeservice.service.model.dto.CNTransportQOutDto; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +public class CNTransportQOutServiceTest { + + @Mock + private CNTransportQOutRepository cnTransportQOutRepository; + + @InjectMocks + private CNTransportQOutService cnTransportQOutService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + } + + @Test + void testGetTransportData_NoStatusTime() throws Exception { + String statusCd = "status"; + String statusTime = ""; + + CNTransportQOut cnTransportQOut = new CNTransportQOut(); + List cnTransportQOutList = Arrays.asList(cnTransportQOut); + + when(cnTransportQOutRepository.findTransportByStatusCd(statusCd)).thenReturn(Optional.of(cnTransportQOutList)); + + List result = cnTransportQOutService.getTransportData(statusCd, statusTime); + + assertEquals(1, result.size()); + verify(cnTransportQOutRepository, times(1)).findTransportByStatusCd(statusCd); + } + + @Test + void testGetTransportData_WithStatusTime() throws Exception { + String statusCd = "status"; + String statusTime = "2023-07-30 10:00:00.000"; + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + java.util.Date parsedDate = formatter.parse(statusTime); + Timestamp recordStatusTime = new Timestamp(parsedDate.getTime()); + + CNTransportQOut cnTransportQOut = new CNTransportQOut(); + List cnTransportQOutList = Arrays.asList(cnTransportQOut); + + when(cnTransportQOutRepository.findTransportByCreationTimeAndStatus(recordStatusTime, statusCd)).thenReturn(Optional.of(cnTransportQOutList)); + + List result = cnTransportQOutService.getTransportData(statusCd, statusTime); + + assertEquals(1, result.size()); + verify(cnTransportQOutRepository, times(1)).findTransportByCreationTimeAndStatus(recordStatusTime, statusCd); + } + + @Test + void testGetTransportData_NoResults() throws Exception { + String statusCd = "status"; + String statusTime = ""; + + when(cnTransportQOutRepository.findTransportByStatusCd(statusCd)).thenReturn(Optional.of(Collections.emptyList())); + + List result = cnTransportQOutService.getTransportData(statusCd, statusTime); + + assertTrue(result.isEmpty()); + verify(cnTransportQOutRepository, times(1)).findTransportByStatusCd(statusCd); + } + + @Test + void testGetTransportData_Exception() { + String statusCd = "status"; + String statusTime = ""; + + when(cnTransportQOutRepository.findTransportByStatusCd(statusCd)).thenThrow(new RuntimeException("Database error")); + + assertThrows(DataExchangeException.class, () -> cnTransportQOutService.getTransportData(statusCd, statusTime)); + } +} diff --git a/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/DataExchangeServiceTest.java b/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/DataExchangeServiceTest.java new file mode 100644 index 0000000..6851634 --- /dev/null +++ b/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/DataExchangeServiceTest.java @@ -0,0 +1,85 @@ +package gov.cdc.nnddataexchangeservice.service; + + +import gov.cdc.nnddataexchangeservice.exception.DataExchangeException; +import gov.cdc.nnddataexchangeservice.service.interfaces.ICNTransportQOutService; +import gov.cdc.nnddataexchangeservice.service.interfaces.INetsstTransportService; +import gov.cdc.nnddataexchangeservice.service.interfaces.ITransportQOutService; +import gov.cdc.nnddataexchangeservice.service.model.DataExchangeModel; +import gov.cdc.nnddataexchangeservice.service.model.dto.CNTransportQOutDto; +import gov.cdc.nnddataexchangeservice.service.model.dto.NETSSTransportQOutDto; +import gov.cdc.nnddataexchangeservice.service.model.dto.TransportQOutDto; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.Collections; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +public class DataExchangeServiceTest { + + @Mock + private INetsstTransportService netsstTransportService; + + @Mock + private ITransportQOutService transportQOutService; + + @Mock + private ICNTransportQOutService cnTransportQOutService; + + @InjectMocks + private DataExchangeService dataExchangeService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + } + + @Test + void testGetDataForOnPremExchanging() throws Exception { + String cnStatusTime = "2023-07-30 10:00:00.000"; + String transportTime = "2023-07-30 10:00:00.000"; + String netssTime = "2023-07-30 10:00:00.000"; + String statusCd = "status"; + + List cnTransportQOutDtos = Collections.singletonList(new CNTransportQOutDto()); + List transportQOutDtos = Collections.singletonList(new TransportQOutDto()); + List netssTransportQOutDtos = Collections.singletonList(new NETSSTransportQOutDto()); + + when(cnTransportQOutService.getTransportData(statusCd, cnStatusTime)).thenReturn(cnTransportQOutDtos); + when(transportQOutService.getTransportData(transportTime)).thenReturn(transportQOutDtos); + when(netsstTransportService.getNetssTransportData(netssTime)).thenReturn(netssTransportQOutDtos); + + DataExchangeModel result = dataExchangeService.getDataForOnPremExchanging(cnStatusTime, transportTime, netssTime, statusCd); + + assertNotNull(result); + assertEquals(cnTransportQOutDtos.size(), result.getCountCnTransport()); + assertEquals(transportQOutDtos.size(), result.getCountTransport()); + assertEquals(netssTransportQOutDtos.size(), result.getCountNetssTransport()); + + verify(cnTransportQOutService, times(1)).getTransportData(statusCd, cnStatusTime); + verify(transportQOutService, times(1)).getTransportData(transportTime); + verify(netsstTransportService, times(1)).getNetssTransportData(netssTime); + } + + @Test + void testGetDataForOnPremExchanging_Exception() throws Exception { + String cnStatusTime = "2023-07-30 10:00:00.000"; + String transportTime = "2023-07-30 10:00:00.000"; + String netssTime = "2023-07-30 10:00:00.000"; + String statusCd = "status"; + + when(cnTransportQOutService.getTransportData(statusCd, cnStatusTime)).thenThrow(new DataExchangeException("Exception")); + + assertThrows(DataExchangeException.class, () -> dataExchangeService.getDataForOnPremExchanging(cnStatusTime, transportTime, netssTime, statusCd)); + + verify(cnTransportQOutService, times(1)).getTransportData(statusCd, cnStatusTime); + verify(transportQOutService, times(0)).getTransportData(transportTime); + verify(netsstTransportService, times(0)).getNetssTransportData(netssTime); + } +} \ No newline at end of file diff --git a/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/NetsstTransportServiceTest.java b/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/NetsstTransportServiceTest.java new file mode 100644 index 0000000..b2d5bc7 --- /dev/null +++ b/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/NetsstTransportServiceTest.java @@ -0,0 +1,91 @@ +package gov.cdc.nnddataexchangeservice.service; + + +import gov.cdc.nnddataexchangeservice.exception.DataExchangeException; +import gov.cdc.nnddataexchangeservice.repository.msg.NETSSTransportQOutRepository; +import gov.cdc.nnddataexchangeservice.repository.msg.model.NETSSTransportQOut; +import gov.cdc.nnddataexchangeservice.service.model.dto.NETSSTransportQOutDto; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +class NetsstTransportServiceTest { + + @Mock + private NETSSTransportQOutRepository netssTransportQOutRepository; + + @InjectMocks + private NetsstTransportService netsstTransportService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + } + + @Test + void testGetNetssTransportData_NoStatusTime() throws Exception { + String statusTime = ""; + + NETSSTransportQOut netssTransportQOut = new NETSSTransportQOut(); + List netssTransportQOutList = Arrays.asList(netssTransportQOut); + + when(netssTransportQOutRepository.findNetssTransport()).thenReturn(Optional.of(netssTransportQOutList)); + + List result = netsstTransportService.getNetssTransportData(statusTime); + + assertEquals(1, result.size()); + verify(netssTransportQOutRepository, times(1)).findNetssTransport(); + } + + @Test + void testGetNetssTransportData_WithStatusTime() throws Exception { + String statusTime = "2023-07-30 10:00:00.000"; + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + java.util.Date parsedDate = formatter.parse(statusTime); + Timestamp recordStatusTime = new Timestamp(parsedDate.getTime()); + + NETSSTransportQOut netssTransportQOut = new NETSSTransportQOut(); + List netssTransportQOutList = Arrays.asList(netssTransportQOut); + + when(netssTransportQOutRepository.findNetssTransportByCreationTime(recordStatusTime)).thenReturn(Optional.of(netssTransportQOutList)); + + List result = netsstTransportService.getNetssTransportData(statusTime); + + assertEquals(1, result.size()); + verify(netssTransportQOutRepository, times(1)).findNetssTransportByCreationTime(recordStatusTime); + } + + @Test + void testGetNetssTransportData_NoResults() throws Exception { + String statusTime = ""; + + when(netssTransportQOutRepository.findNetssTransport()).thenReturn(Optional.of(Collections.emptyList())); + + List result = netsstTransportService.getNetssTransportData(statusTime); + + assertTrue(result.isEmpty()); + verify(netssTransportQOutRepository, times(1)).findNetssTransport(); + } + + @Test + void testGetNetssTransportData_Exception() { + String statusTime = ""; + + when(netssTransportQOutRepository.findNetssTransport()).thenThrow(new RuntimeException("Database error")); + + assertThrows(DataExchangeException.class, () -> netsstTransportService.getNetssTransportData(statusTime)); + } +} \ No newline at end of file diff --git a/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/TransportQOutServiceTest.java b/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/TransportQOutServiceTest.java new file mode 100644 index 0000000..8a69574 --- /dev/null +++ b/nnd-data-exchange-service/src/test/java/gov.cdc.nnddataexchangeservice/service/TransportQOutServiceTest.java @@ -0,0 +1,118 @@ +package gov.cdc.nnddataexchangeservice.service; + +import gov.cdc.nnddataexchangeservice.exception.DataExchangeException; +import gov.cdc.nnddataexchangeservice.repository.msg.TransportQOutRepository; +import gov.cdc.nnddataexchangeservice.repository.msg.model.TransportQOut; +import gov.cdc.nnddataexchangeservice.service.model.dto.TransportQOutDto; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + + + +class TransportQOutServiceTest { + + @Mock + private TransportQOutRepository transportQOutRepository; + + @InjectMocks + private TransportQOutService transportQOutService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + } + + @Test + void testGetTransportData_WithStatusTime_Success() throws DataExchangeException { + String statusTime = "2023-07-30 12:00:00.000"; + List mockTransportQOutList = new ArrayList<>(); + mockTransportQOutList.add(new TransportQOut()); + mockTransportQOutList.add(new TransportQOut()); + + when(transportQOutRepository.findTransportByCreationTime(statusTime)).thenReturn(Optional.of(mockTransportQOutList)); + + List result = transportQOutService.getTransportData(statusTime); + + assertNotNull(result); + assertEquals(2, result.size()); + verify(transportQOutRepository, times(1)).findTransportByCreationTime(statusTime); + } + + @Test + void testGetTransportData_WithoutStatusTime_Success() throws DataExchangeException { + String statusTime = ""; + List mockTransportQOutList = new ArrayList<>(); + mockTransportQOutList.add(new TransportQOut()); + mockTransportQOutList.add(new TransportQOut()); + + when(transportQOutRepository.findTransportByWithoutCreationTime()).thenReturn(Optional.of(mockTransportQOutList)); + + List result = transportQOutService.getTransportData(statusTime); + + assertNotNull(result); + assertEquals(2, result.size()); + verify(transportQOutRepository, times(1)).findTransportByWithoutCreationTime(); + } + + @Test + void testGetTransportData_WithStatusTime_Empty() throws DataExchangeException { + String statusTime = "2023-07-30 12:00:00.000"; + + when(transportQOutRepository.findTransportByCreationTime(statusTime)).thenReturn(Optional.empty()); + + List result = transportQOutService.getTransportData(statusTime); + + assertNotNull(result); + assertTrue(result.isEmpty()); + verify(transportQOutRepository, times(1)).findTransportByCreationTime(statusTime); + } + + @Test + void testGetTransportData_WithoutStatusTime_Empty() throws DataExchangeException { + String statusTime = ""; + + when(transportQOutRepository.findTransportByWithoutCreationTime()).thenReturn(Optional.empty()); + + List result = transportQOutService.getTransportData(statusTime); + + assertNotNull(result); + assertTrue(result.isEmpty()); + verify(transportQOutRepository, times(1)).findTransportByWithoutCreationTime(); + } + + @Test + void testGetTransportData_WithStatusTime_Exception() { + String statusTime = "2023-07-30 12:00:00.000"; + + when(transportQOutRepository.findTransportByCreationTime(statusTime)).thenThrow(new RuntimeException("Database error")); + + DataExchangeException exception = assertThrows(DataExchangeException.class, () -> + transportQOutService.getTransportData(statusTime)); + + assertEquals("Database error", exception.getMessage()); + verify(transportQOutRepository, times(1)).findTransportByCreationTime(statusTime); + } + + @Test + void testGetTransportData_WithoutStatusTime_Exception() { + String statusTime = ""; + + when(transportQOutRepository.findTransportByWithoutCreationTime()).thenThrow(new RuntimeException("Database error")); + + DataExchangeException exception = assertThrows(DataExchangeException.class, () -> + transportQOutService.getTransportData(statusTime)); + + assertEquals("Database error", exception.getMessage()); + verify(transportQOutRepository, times(1)).findTransportByWithoutCreationTime(); + } +} diff --git a/nnd-data-poll-service/build.gradle b/nnd-data-poll-service/build.gradle index 1564183..d0e00c8 100644 --- a/nnd-data-poll-service/build.gradle +++ b/nnd-data-poll-service/build.gradle @@ -33,12 +33,15 @@ dependencies { testRuntimeOnly 'org.junit.platform:junit-platform-launcher' implementation 'com.microsoft.sqlserver:mssql-jdbc:12.2.0.jre11' + testImplementation(platform('org.junit:junit-bom')) + testImplementation('org.junit.jupiter:junit-jupiter') + testImplementation 'org.junit.jupiter:junit-jupiter-engine' + testImplementation 'org.mockito:mockito-core' } -tasks.named('test') { +test { useJUnitPlatform() } - bootJar { archiveBaseName.set('nnd-data-poll-service') archiveVersion.set('') diff --git a/nnd-data-poll-service/execute_script/nnd_data_poll_service.cmd b/nnd-data-poll-service/execute_script/nnd_data_poll_service.cmd new file mode 100644 index 0000000..5e84a5b --- /dev/null +++ b/nnd-data-poll-service/execute_script/nnd_data_poll_service.cmd @@ -0,0 +1,13 @@ +@echo off +set NBS_NND_CRON=* * * * * * +set NBS_NND_CRON_TIME_ZONE=UTC +set NND_DE_CLIENT_ID=nnd-keycloak-client +set NND_DE_DE=/api/nnd/data-exchange +set NND_DE_SECRET=bpVTppDam4sxXt4hfgm5hZ6Rteponjb9 +set NND_DE_TOKEN=/api/auth/token +set NND_DE_URL=http://localhost:8081 +set NND_FILE_LOCATION=C:\Users\DucNguyen\Desktop\LOG\Poll +set OP_DBPASSWORD=fake.fake.fake.1234 +set OP_DBSERVER=localhost:1433 +set OP_DBUSER=sa +java -jar nnd-data-poll-service.jar diff --git a/nnd-data-poll-service/execute_script/nnd_data_poll_service.sh b/nnd-data-poll-service/execute_script/nnd_data_poll_service.sh new file mode 100755 index 0000000..dbf2b31 --- /dev/null +++ b/nnd-data-poll-service/execute_script/nnd_data_poll_service.sh @@ -0,0 +1,14 @@ +#!/bin/bash +export NBS_NND_CRON="* * * * * *" +export NBS_NND_CRON_TIME_ZONE="UTC" +export NND_DE_CLIENT_ID="nnd-keycloak-client" +export NND_DE_DE="/api/nnd/data-exchange" +export NND_DE_SECRET="bpVTppDam4sxXt4hfgm5hZ6Rteponjb9" +export NND_DE_TOKEN="/api/auth/token" +export NND_DE_URL="http://localhost:8081" +export NND_FILE_LOCATION="/Users/DucNguyen/Desktop/LOG/Poll" +export OP_DBPASSWORD="fake.fake.fake.1234" +export OP_DBSERVER="localhost:1433" +export OP_DBUSER="sa" + +java -jar /Users/DucNguyen/Desktop/CDC_Repos/NEDSS-NNDSS/nnd-data-poll-service/build/libs/nnd-data-poll-service.jar diff --git a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/repository/msg/NETSSTransportQOutRepository.java b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/repository/msg/NETSSTransportQOutRepository.java index 851ef8f..1198d87 100644 --- a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/repository/msg/NETSSTransportQOutRepository.java +++ b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/repository/msg/NETSSTransportQOutRepository.java @@ -2,8 +2,13 @@ import gov.cdc.nnddatapollservice.repository.msg.model.NETSSTransportQOut; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; +import java.sql.Timestamp; +import java.util.Optional; + @Repository public interface NETSSTransportQOutRepository extends JpaRepository { -} + @Query("SELECT MAX(a.addTime) FROM NETSSTransportQOut a ") + Optional findMaxTimeStamp ();} diff --git a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/DataHandlingService.java b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/DataHandlingService.java index a2155d9..91da085 100644 --- a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/DataHandlingService.java +++ b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/DataHandlingService.java @@ -53,12 +53,14 @@ public DataHandlingService(ICNTransportQOutService icnTransportQOutService, public void handlingExchangedData() throws DataPollException { var cnTimeStamp = icnTransportQOutService.getMaxTimestamp(); var transportTimeStamp = transportQOutService.getMaxTimestamp(); + var netssTimeStamp = netsstTransportService.getMaxTimestamp(); var token = tokenService.getToken(); var param = new HashMap(); param.put("cnStatusTime", cnTimeStamp); param.put("transportStatusTime", transportTimeStamp); + param.put("netssTime", netssTimeStamp); param.put("statusCd", "UNPROCESSED"); String data = callDataExchangeEndpoint(token, param); @@ -80,6 +82,10 @@ public void persistingExchangeData(String data) throws DataPollException { if (!dataExchangeModel.getTransportQOutDtoList().isEmpty()) { transportQOutService.saveDataExchange(dataExchangeModel.getTransportQOutDtoList()); } + + if (!dataExchangeModel.getNetssTransportQOutDtoList().isEmpty()) { + netsstTransportService.saveDataExchange(dataExchangeModel.getNetssTransportQOutDtoList()); + } } catch (Exception e) { throw new DataPollException(e.getMessage()); } diff --git a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/NetsstTransportService.java b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/NetsstTransportService.java index 891b7f5..0c301e7 100644 --- a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/NetsstTransportService.java +++ b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/NetsstTransportService.java @@ -1,14 +1,73 @@ package gov.cdc.nnddatapollservice.service; +import gov.cdc.nnddatapollservice.exception.DataPollException; import gov.cdc.nnddatapollservice.repository.msg.NETSSTransportQOutRepository; +import gov.cdc.nnddatapollservice.repository.msg.model.NETSSTransportQOut; +import gov.cdc.nnddatapollservice.repository.odse.model.CNTransportQOut; +import gov.cdc.nnddatapollservice.service.interfaces.IErrorHandlingService; import gov.cdc.nnddatapollservice.service.interfaces.INetsstTransportService; +import gov.cdc.nnddatapollservice.service.model.dto.CNTransportQOutDto; +import gov.cdc.nnddatapollservice.service.model.dto.NETSSTransportQOutDto; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; + @Service public class NetsstTransportService implements INetsstTransportService { private final NETSSTransportQOutRepository netssTransportQOutRepository; + private static final String TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; + private final IErrorHandlingService errorHandlingService; + + @Value("${io.finalLocation}") + private String fileLocation; - public NetsstTransportService(NETSSTransportQOutRepository netssTransportQOutRepository) { + public NetsstTransportService(NETSSTransportQOutRepository netssTransportQOutRepository, IErrorHandlingService errorHandlingService) { this.netssTransportQOutRepository = netssTransportQOutRepository; + this.errorHandlingService = errorHandlingService; + } + + public String getMaxTimestamp() { + var time = netssTransportQOutRepository.findMaxTimeStamp(); + if (time.isPresent()) { + Timestamp maxTimestamp = time.get(); + SimpleDateFormat formatter = new SimpleDateFormat(TIMESTAMP_FORMAT); + return formatter.format(maxTimestamp); + } + else { + return ""; + } + } + + public void saveDataExchange(List transportQOutDtoList) throws DataPollException { + try { + List cnTransportQOutList = new ArrayList<>(); + for (var item : transportQOutDtoList) { + NETSSTransportQOut transportQOut = new NETSSTransportQOut(item); + cnTransportQOutList.add(transportQOut); + } + + int batchSize = 10; + for (int i = 0; i < cnTransportQOutList.size(); i += batchSize) { + int end = Math.min(i + batchSize, cnTransportQOutList.size()); + List batch = cnTransportQOutList.subList(i, end); + + try { + netssTransportQOutRepository.saveAll(batch); + netssTransportQOutRepository.flush(); // Ensure the batch is written to the database + } catch (Exception e) { + // Log the error and dump the batch to a file + String fileName = "cn_transportQOut_failed_batch_" + System.currentTimeMillis() + ".json"; + errorHandlingService.dumpBatchToFile(batch, fileName, fileLocation); + } + } + + } catch (Exception e) { + throw new DataPollException(e.getMessage()); + } + } } diff --git a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/interfaces/INetsstTransportService.java b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/interfaces/INetsstTransportService.java index 0fd1c49..a152055 100644 --- a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/interfaces/INetsstTransportService.java +++ b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/interfaces/INetsstTransportService.java @@ -1,4 +1,11 @@ package gov.cdc.nnddatapollservice.service.interfaces; +import gov.cdc.nnddatapollservice.exception.DataPollException; +import gov.cdc.nnddatapollservice.service.model.dto.NETSSTransportQOutDto; + +import java.util.List; + public interface INetsstTransportService { + String getMaxTimestamp(); + void saveDataExchange(List transportQOutDtoList) throws DataPollException; } diff --git a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/CNTransportQOutDto.java b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/CNTransportQOutDto.java index 907576a..f760410 100644 --- a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/CNTransportQOutDto.java +++ b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/CNTransportQOutDto.java @@ -27,6 +27,9 @@ public class CNTransportQOutDto { private Timestamp recordStatusTime; private Integer versionCtrlNbr; + public CNTransportQOutDto() { + + } // Constructor to convert domain model to DTO public CNTransportQOutDto(CNTransportQOut cnTransportQOut) { this.cnTransportqOutUid = cnTransportQOut.getCnTransportqOutUid(); diff --git a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/NETSSTransportQOutDto.java b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/NETSSTransportQOutDto.java index c246466..5f0cb90 100644 --- a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/NETSSTransportQOutDto.java +++ b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/NETSSTransportQOutDto.java @@ -21,6 +21,9 @@ public class NETSSTransportQOutDto { private String payload; private String recordStatusCd; + public NETSSTransportQOutDto(){ + + } // Constructor to convert domain model to DTO public NETSSTransportQOutDto(NETSSTransportQOut netssTransportQOut) { this.netssTransportQOutUid = netssTransportQOut.getNetssTransportQOutUid(); diff --git a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/TransportQOutDto.java b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/TransportQOutDto.java index 60356e8..6f35425 100644 --- a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/TransportQOutDto.java +++ b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/model/dto/TransportQOutDto.java @@ -41,6 +41,10 @@ public class TransportQOutDto { private String responseMessageSignature; private Integer priority; + public TransportQOutDto(){ + + } + // Constructor to convert domain model to DTO public TransportQOutDto(TransportQOut transportQOut) { this.recordId = transportQOut.getRecordId(); diff --git a/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/NndDataPollServiceApplicationTests.java b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/NndDataPollServiceApplicationTests.java deleted file mode 100644 index 359a045..0000000 --- a/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/NndDataPollServiceApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -//package gov.cdc.nnddatapollservice; -// -//import org.junit.jupiter.api.Test; -//import org.springframework.boot.test.context.SpringBootTest; -// -//@SpringBootTest -//class NndDataPollServiceApplicationTests { -// -// @Test -// void contextLoads() { -// } -// -//} diff --git a/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/CNTransportQOutServiceTest.java b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/CNTransportQOutServiceTest.java new file mode 100644 index 0000000..2581e90 --- /dev/null +++ b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/CNTransportQOutServiceTest.java @@ -0,0 +1,101 @@ +package gov.cdc.nnddatapollservice.service; + +import gov.cdc.nnddatapollservice.exception.DataPollException; +import gov.cdc.nnddatapollservice.repository.odse.CNTransportQOutRepository; +import gov.cdc.nnddatapollservice.repository.odse.model.CNTransportQOut; +import gov.cdc.nnddatapollservice.service.interfaces.IErrorHandlingService; +import gov.cdc.nnddatapollservice.service.model.dto.CNTransportQOutDto; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +public class CNTransportQOutServiceTest { + + @Mock + private CNTransportQOutRepository cnTransportQOutRepository; + + @Mock + private IErrorHandlingService errorHandlingService; + + @InjectMocks + private CNTransportQOutService cnTransportQOutService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + } + + @Test + void testGetMaxTimestamp_WithTimestamp() { + Timestamp maxTimestamp = new Timestamp(System.currentTimeMillis()); + when(cnTransportQOutRepository.findMaxTimeStamp()).thenReturn(Optional.of(maxTimestamp)); + + String result = cnTransportQOutService.getMaxTimestamp(); + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + assertEquals(formatter.format(maxTimestamp), result); + verify(cnTransportQOutRepository, times(1)).findMaxTimeStamp(); + } + + @Test + void testGetMaxTimestamp_NoTimestamp() { + when(cnTransportQOutRepository.findMaxTimeStamp()).thenReturn(Optional.empty()); + + String result = cnTransportQOutService.getMaxTimestamp(); + + assertEquals("", result); + verify(cnTransportQOutRepository, times(1)).findMaxTimeStamp(); + } + + @Test + void testSaveDataExchange_Success() throws DataPollException { + List transportQOutDtoList = new ArrayList<>(); + transportQOutDtoList.add(new CNTransportQOutDto()); + transportQOutDtoList.add(new CNTransportQOutDto()); + + cnTransportQOutService.saveDataExchange(transportQOutDtoList); + + verify(cnTransportQOutRepository, times(1)).saveAll(anyList()); + verify(cnTransportQOutRepository, times(1)).flush(); + } + + @Test + void testSaveDataExchange_PartialFailure() throws Exception { + List transportQOutDtoList = new ArrayList<>(); + for (int i = 0; i < 20; i++) { + transportQOutDtoList.add(new CNTransportQOutDto()); + } + + + doThrow(new RuntimeException("Batch save failed")).when(cnTransportQOutRepository).saveAll(anyList()); + + cnTransportQOutService.saveDataExchange(transportQOutDtoList); + + verify(errorHandlingService, atLeastOnce()).dumpBatchToFile(any(), any(), any()); + } + + @Test + void testSaveDataExchange_Exception() { + List transportQOutDtoList = new ArrayList<>(); + transportQOutDtoList.add(new CNTransportQOutDto()); + + doThrow(new RuntimeException("Exception")).when(cnTransportQOutRepository).saveAll(anyList()); + doThrow(new RuntimeException("Exception")).when(errorHandlingService).dumpBatchToFile(any(), any(), any()); + + + assertThrows(DataPollException.class, () -> cnTransportQOutService.saveDataExchange(transportQOutDtoList)); + + + } +} diff --git a/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/DataHandlingServiceTest.java b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/DataHandlingServiceTest.java new file mode 100644 index 0000000..e2a6145 --- /dev/null +++ b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/DataHandlingServiceTest.java @@ -0,0 +1,83 @@ +package gov.cdc.nnddatapollservice.service; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import gov.cdc.nnddatapollservice.exception.DataPollException; +import gov.cdc.nnddatapollservice.service.interfaces.*; +import gov.cdc.nnddatapollservice.service.model.DataExchangeModel; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestTemplate; + +import java.lang.reflect.Field; +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; + +public class DataHandlingServiceTest { + + @Mock + private ICNTransportQOutService icnTransportQOutService; + + @Mock + private INetsstTransportService netsstTransportService; + + @Mock + private ITransportQOutService transportQOutService; + + @Mock + private ITokenService tokenService; + + @Mock + private RestTemplate restTemplate; + + @InjectMocks + private DataHandlingService dataHandlingService; + + @BeforeEach + void setUp() throws NoSuchFieldException, IllegalAccessException { + MockitoAnnotations.openMocks(this); + + // Set the exchangeEndpoint value using reflection + Field exchangeEndpointField = DataHandlingService.class.getDeclaredField("exchangeEndpoint"); + exchangeEndpointField.setAccessible(true); + exchangeEndpointField.set(dataHandlingService, "http://example.com/exchange"); + } + + + @Test + void testPersistingExchangeData_Success() throws DataPollException { + String data = "{\"cnTransportQOutDtoList\":[], \"transportQOutDtoList\":[], \"netssTransportQOutDtoList\":[]}"; + + dataHandlingService.persistingExchangeData(data); + + verify(icnTransportQOutService, never()).saveDataExchange(anyList()); + verify(transportQOutService, never()).saveDataExchange(anyList()); + verify(netsstTransportService, never()).saveDataExchange(anyList()); + } + + @Test + void testPersistingExchangeData_Exception() throws DataPollException { + String data = "invalid json"; + + assertThrows(DataPollException.class, () -> dataHandlingService.persistingExchangeData(data)); + + verify(icnTransportQOutService, never()).saveDataExchange(anyList()); + verify(transportQOutService, never()).saveDataExchange(anyList()); + verify(netsstTransportService, never()).saveDataExchange(anyList()); + } + + +} diff --git a/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/DataPullServiceTest.java b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/DataPullServiceTest.java new file mode 100644 index 0000000..6904f45 --- /dev/null +++ b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/DataPullServiceTest.java @@ -0,0 +1,47 @@ +package gov.cdc.nnddatapollservice.service; + +import gov.cdc.nnddatapollservice.exception.DataPollException; +import gov.cdc.nnddatapollservice.service.interfaces.IDataHandlingService; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.test.util.ReflectionTestUtils; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.*; + +public class DataPullServiceTest { + + @Mock + private IDataHandlingService dataHandlingService; + + @InjectMocks + private DataPullService dataPullService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + + // Set the cron and zone values using reflection + ReflectionTestUtils.setField(dataPullService, "cron", "0 0/5 * * * ?"); + ReflectionTestUtils.setField(dataPullService, "zone", "UTC"); + } + + @Test + void testScheduleDataFetch_Success() throws DataPollException { + dataPullService.scheduleDataFetch(); + + verify(dataHandlingService, times(1)).handlingExchangedData(); + } + + @Test + void testScheduleDataFetch_Exception() throws DataPollException { + doThrow(new DataPollException("Exception")).when(dataHandlingService).handlingExchangedData(); + + assertThrows(DataPollException.class, () -> dataPullService.scheduleDataFetch()); + + verify(dataHandlingService, times(1)).handlingExchangedData(); + } +} \ No newline at end of file diff --git a/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/ErrorHandlingServiceTest.java b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/ErrorHandlingServiceTest.java new file mode 100644 index 0000000..3d22eb8 --- /dev/null +++ b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/ErrorHandlingServiceTest.java @@ -0,0 +1,68 @@ +package gov.cdc.nnddatapollservice.service; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import gov.cdc.nnddatapollservice.service.interfaces.IErrorHandlingService; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.test.util.ReflectionTestUtils; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.nio.file.Files; +import java.util.Arrays; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +public class ErrorHandlingServiceTest { + + private ErrorHandlingService errorHandlingService; + @Mock + private Logger mockLogger; + + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + errorHandlingService = new ErrorHandlingService(); + ReflectionTestUtils.setField(errorHandlingService, "logger", mockLogger); + } + + @Test + void testDumpBatchToFile_Success() throws IOException { + List batch = Arrays.asList("item1", "item2", "item3"); + String fileName = "test_batch.json"; + String fileLocation = System.getProperty("java.io.tmpdir"); // Temporary directory for testing + + errorHandlingService.dumpBatchToFile(batch, fileName, fileLocation); + + File file = new File(fileLocation, fileName); + assertTrue(file.exists()); + + String content = Files.readString(file.toPath()); + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + String expectedContent = gson.toJson(batch); + assertEquals(expectedContent.trim(), content.trim()); + + // Clean up + file.delete(); + } + + @Test + void testDumpBatchToFile_Exception() { + List batch = Arrays.asList("item1", "item2", "item3"); + String fileName = "test_batch.json"; + String fileLocation = "/invalid/path"; + + errorHandlingService.dumpBatchToFile(batch, fileName, fileLocation); + + verify(mockLogger, atLeastOnce()).error((String) any(), anyString()); + } +} diff --git a/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/NetsstTransportServiceTest.java b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/NetsstTransportServiceTest.java new file mode 100644 index 0000000..b54c1a0 --- /dev/null +++ b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/NetsstTransportServiceTest.java @@ -0,0 +1,104 @@ +package gov.cdc.nnddatapollservice.service; + +import gov.cdc.nnddatapollservice.exception.DataPollException; +import gov.cdc.nnddatapollservice.repository.msg.NETSSTransportQOutRepository; +import gov.cdc.nnddatapollservice.repository.msg.model.NETSSTransportQOut; +import gov.cdc.nnddatapollservice.service.interfaces.IErrorHandlingService; +import gov.cdc.nnddatapollservice.service.model.dto.NETSSTransportQOutDto; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.test.util.ReflectionTestUtils; + +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +public class NetsstTransportServiceTest { + + @Mock + private NETSSTransportQOutRepository netssTransportQOutRepository; + + @Mock + private IErrorHandlingService errorHandlingService; + + @InjectMocks + private NetsstTransportService netsstTransportService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + ReflectionTestUtils.setField(netsstTransportService, "fileLocation", System.getProperty("java.io.tmpdir")); + } + + @Test + void testGetMaxTimestamp_WithTimestamp() { + Timestamp maxTimestamp = new Timestamp(System.currentTimeMillis()); + when(netssTransportQOutRepository.findMaxTimeStamp()).thenReturn(Optional.of(maxTimestamp)); + + String result = netsstTransportService.getMaxTimestamp(); + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + assertEquals(formatter.format(maxTimestamp), result); + verify(netssTransportQOutRepository, times(1)).findMaxTimeStamp(); + } + + @Test + void testGetMaxTimestamp_NoTimestamp() { + when(netssTransportQOutRepository.findMaxTimeStamp()).thenReturn(Optional.empty()); + + String result = netsstTransportService.getMaxTimestamp(); + + assertEquals("", result); + verify(netssTransportQOutRepository, times(1)).findMaxTimeStamp(); + } + + @Test + void testSaveDataExchange_Success() throws DataPollException { + List transportQOutDtoList = new ArrayList<>(); + transportQOutDtoList.add(new NETSSTransportQOutDto()); + transportQOutDtoList.add(new NETSSTransportQOutDto()); + + netsstTransportService.saveDataExchange(transportQOutDtoList); + + verify(netssTransportQOutRepository, times(1)).saveAll(anyList()); + verify(netssTransportQOutRepository, times(1)).flush(); + } + + @Test + void testSaveDataExchange_PartialFailure() throws Exception { + List transportQOutDtoList = new ArrayList<>(); + for (int i = 0; i < 20; i++) { + transportQOutDtoList.add(new NETSSTransportQOutDto()); + } + + doThrow(new RuntimeException("Batch save failed")).when(netssTransportQOutRepository).saveAll(anyList()); + + netsstTransportService.saveDataExchange(transportQOutDtoList); + + verify(netssTransportQOutRepository, times(2)).saveAll(anyList()); + verify(netssTransportQOutRepository, never()).flush(); + verify(errorHandlingService, atLeastOnce()).dumpBatchToFile(anyList(), anyString(), anyString()); + } + + @Test + void testSaveDataExchange_Exception() { + List transportQOutDtoList = new ArrayList<>(); + transportQOutDtoList.add(new NETSSTransportQOutDto()); + + doThrow(new RuntimeException("Exception")).when(netssTransportQOutRepository).saveAll(anyList()); + doThrow(new RuntimeException("Exception")).when(errorHandlingService).dumpBatchToFile(anyList(), anyString(), anyString()); + + assertThrows(DataPollException.class, () -> netsstTransportService.saveDataExchange(transportQOutDtoList)); + + verify(netssTransportQOutRepository, times(1)).saveAll(anyList()); + } +} diff --git a/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/TokenServiceTest.java b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/TokenServiceTest.java new file mode 100644 index 0000000..1385019 --- /dev/null +++ b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/TokenServiceTest.java @@ -0,0 +1,67 @@ +package gov.cdc.nnddatapollservice.service; + +import gov.cdc.nnddatapollservice.service.interfaces.ITokenService; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseEntity; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.web.client.RestTemplate; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +public class TokenServiceTest { + + @Mock + private RestTemplate restTemplate; + + @InjectMocks + private TokenService tokenService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + ReflectionTestUtils.setField(tokenService, "tokenEndpoint", "http://example.com/token"); + ReflectionTestUtils.setField(tokenService, "clientId", "testClientId"); + ReflectionTestUtils.setField(tokenService, "clientSecret", "testClientSecret"); + } + + @Test + void testGetToken_Success() { + String expectedToken = "newToken"; + HttpHeaders headers = new HttpHeaders(); + headers.add("clientid", "testClientId"); + headers.add("clientsecret", "testClientSecret"); + HttpEntity entity = new HttpEntity<>(headers); + + when(restTemplate.postForEntity("http://example.com/token", entity, String.class)) + .thenReturn(ResponseEntity.ok(expectedToken)); + + String token = tokenService.getToken(); + + assertEquals(expectedToken, token); + verify(restTemplate, times(1)).postForEntity("http://example.com/token", entity, String.class); + } + + @Test + void testFetchNewToken() { + String expectedToken = "newToken"; + HttpHeaders headers = new HttpHeaders(); + headers.add("clientid", "testClientId"); + headers.add("clientsecret", "testClientSecret"); + HttpEntity entity = new HttpEntity<>(headers); + + when(restTemplate.postForEntity("http://example.com/token", entity, String.class)) + .thenReturn(ResponseEntity.ok(expectedToken)); + + String token = ReflectionTestUtils.invokeMethod(tokenService, "fetchNewToken"); + + assertEquals(expectedToken, token); + verify(restTemplate, times(1)).postForEntity("http://example.com/token", entity, String.class); + } +} diff --git a/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/TransportQOutServiceTest.java b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/TransportQOutServiceTest.java new file mode 100644 index 0000000..414af42 --- /dev/null +++ b/nnd-data-poll-service/src/test/java/gov/cdc/nnddatapollservice/service/TransportQOutServiceTest.java @@ -0,0 +1,112 @@ +package gov.cdc.nnddatapollservice.service; + +import gov.cdc.nnddatapollservice.exception.DataPollException; +import gov.cdc.nnddatapollservice.repository.msg.TransportQOutRepository; +import gov.cdc.nnddatapollservice.repository.msg.model.TransportQOut; +import gov.cdc.nnddatapollservice.service.interfaces.IErrorHandlingService; +import gov.cdc.nnddatapollservice.service.model.dto.TransportQOutDto; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.test.util.ReflectionTestUtils; + +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.*; + +public class TransportQOutServiceTest { + + @Mock + private TransportQOutRepository transportQOutRepository; + + @Mock + private IErrorHandlingService errorHandlingService; + + @InjectMocks + private TransportQOutService transportQOutService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + ReflectionTestUtils.setField(transportQOutService, "fileLocation", System.getProperty("java.io.tmpdir")); + } + + @Test + void testGetMaxTimestamp_WithTimestamp() throws DataPollException { + Timestamp maxTimestamp = new Timestamp(System.currentTimeMillis()); + when(transportQOutRepository.findMaxTimeStamp()).thenReturn(Optional.of(maxTimestamp.toString())); + + String result = transportQOutService.getMaxTimestamp(); + + assertEquals(maxTimestamp.toString(), result); + verify(transportQOutRepository, times(1)).findMaxTimeStamp(); + } + + @Test + void testGetMaxTimestamp_NoTimestamp() throws DataPollException { + when(transportQOutRepository.findMaxTimeStamp()).thenReturn(Optional.empty()); + + String result = transportQOutService.getMaxTimestamp(); + + assertEquals("", result); + verify(transportQOutRepository, times(1)).findMaxTimeStamp(); + } + + @Test + void testGetMaxTimestamp_Exception() { + when(transportQOutRepository.findMaxTimeStamp()).thenThrow(new RuntimeException("Exception")); + + assertThrows(DataPollException.class, () -> transportQOutService.getMaxTimestamp()); + + verify(transportQOutRepository, times(1)).findMaxTimeStamp(); + } + + @Test + void testSaveDataExchange_Success() throws DataPollException { + List transportQOutDtoList = new ArrayList<>(); + transportQOutDtoList.add(new TransportQOutDto()); + transportQOutDtoList.add(new TransportQOutDto()); + + transportQOutService.saveDataExchange(transportQOutDtoList); + + verify(transportQOutRepository, times(1)).saveAll(anyList()); + verify(transportQOutRepository, times(1)).flush(); + } + + @Test + void testSaveDataExchange_PartialFailure() throws DataPollException { + List transportQOutDtoList = new ArrayList<>(); + for (int i = 0; i < 20; i++) { + transportQOutDtoList.add(new TransportQOutDto()); + } + + doThrow(new RuntimeException("Batch save failed")).when(transportQOutRepository).saveAll(anyList()); + + transportQOutService.saveDataExchange(transportQOutDtoList); + + verify(transportQOutRepository, times(2)).saveAll(anyList()); + verify(transportQOutRepository, never()).flush(); + verify(errorHandlingService, atLeastOnce()).dumpBatchToFile(anyList(), anyString(), anyString()); + } + + @Test + void testSaveDataExchange_Exception() { + List transportQOutDtoList = new ArrayList<>(); + transportQOutDtoList.add(new TransportQOutDto()); + + doThrow(new RuntimeException("Exception")).when(transportQOutRepository).saveAll(anyList()); + doThrow(new RuntimeException("Exception")).when(errorHandlingService).dumpBatchToFile(anyList(), anyString(), anyString()); + + assertThrows(DataPollException.class, () -> transportQOutService.saveDataExchange(transportQOutDtoList)); + + verify(transportQOutRepository, times(1)).saveAll(anyList()); + verify(errorHandlingService, atLeastOnce()).dumpBatchToFile(anyList(), anyString(), anyString()); + } +} diff --git a/nnd-message-processor/.gitignore b/nnd-message-processor/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/nnd-message-processor/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/nnd-message-processor/build.gradle b/nnd-message-processor/build.gradle new file mode 100644 index 0000000..a68a1da --- /dev/null +++ b/nnd-message-processor/build.gradle @@ -0,0 +1,51 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.2' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'gov.cdc' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'com.microsoft.sqlserver:mssql-jdbc:12.2.0.jre11' + implementation 'com.zaxxer:HikariCP:5.0.1' + + testImplementation(platform('org.junit:junit-bom')) + testImplementation('org.junit.jupiter:junit-jupiter') + testImplementation 'org.junit.jupiter:junit-jupiter-engine' + testImplementation 'org.mockito:mockito-core' +} + +test { + useJUnitPlatform() +} + + +bootJar { + archiveBaseName.set('nnd-message-processor') + archiveVersion.set('') + archiveClassifier.set('') +} \ No newline at end of file diff --git a/nnd-message-processor/execute_script/nnd_message_processor.cmd b/nnd-message-processor/execute_script/nnd_message_processor.cmd new file mode 100644 index 0000000..8623bfe --- /dev/null +++ b/nnd-message-processor/execute_script/nnd_message_processor.cmd @@ -0,0 +1,9 @@ +@echo off +set NBS_NND_CRON=* * * * * * +set NND_FILE_LOCATION=/Users/DucNguyen/Desktop/LOG +set NND_PRIOR=true +set NND_DATE=12/30/2023 +set OP_DBPASSWORD=fake.fake.fake.1234 +set OP_DBSERVER=localhost:1433 +set OP_DBUSER=sa +java -jar nnd-message-processor.jar diff --git a/nnd-message-processor/execute_script/nnd_message_processor.sh b/nnd-message-processor/execute_script/nnd_message_processor.sh new file mode 100755 index 0000000..7379652 --- /dev/null +++ b/nnd-message-processor/execute_script/nnd_message_processor.sh @@ -0,0 +1,9 @@ +#!/bin/bash +export NBS_NND_CRON="* * * * * *" +export NND_FILE_LOCATION="/Users/DucNguyen/Desktop/LOG" +export NND_PRIOR="true" +export NND_DATE="12/30/2023" +export OP_DBPASSWORD="fake.fake.fake.1234" +export OP_DBSERVER="localhost:1433" +export OP_DBUSER="sa" +java -jar /Users/DucNguyen/Desktop/CDC_Repos/NEDSS-NNDSS/nnd-message-processor/build/libs/nnd-message-processor.jar diff --git a/nnd-message-processor/gradle/wrapper/gradle-wrapper.jar b/nnd-message-processor/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ zQccdaaVK$5bz;*rnyK{_SQYM>;aES6Qs^lj9lEs6_J+%nIiuQC*fN;z8md>r_~Mfl zU%p5Dt_YT>gQqfr@`cR!$NWr~+`CZb%dn;WtzrAOI>P_JtsB76PYe*<%H(y>qx-`Kq!X_; z<{RpAqYhE=L1r*M)gNF3B8r(<%8mo*SR2hu zccLRZwGARt)Hlo1euqTyM>^!HK*!Q2P;4UYrysje@;(<|$&%vQekbn|0Ruu_Io(w4#%p6ld2Yp7tlA`Y$cciThP zKzNGIMPXX%&Ud0uQh!uQZz|FB`4KGD?3!ND?wQt6!n*f4EmCoJUh&b?;B{|lxs#F- z31~HQ`SF4x$&v00@(P+j1pAaj5!s`)b2RDBp*PB=2IB>oBF!*6vwr7Dp%zpAx*dPr zb@Zjq^XjN?O4QcZ*O+8>)|HlrR>oD*?WQl5ri3R#2?*W6iJ>>kH%KnnME&TT@ZzrHS$Q%LC?n|e>V+D+8D zYc4)QddFz7I8#}y#Wj6>4P%34dZH~OUDb?uP%-E zwjXM(?Sg~1!|wI(RVuxbu)-rH+O=igSho_pDCw(c6b=P zKk4ATlB?bj9+HHlh<_!&z0rx13K3ZrAR8W)!@Y}o`?a*JJsD+twZIv`W)@Y?Amu_u zz``@-e2X}27$i(2=9rvIu5uTUOVhzwu%mNazS|lZb&PT;XE2|B&W1>=B58#*!~D&) zfVmJGg8UdP*fx(>Cj^?yS^zH#o-$Q-*$SnK(ZVFkw+er=>N^7!)FtP3y~Xxnu^nzY zikgB>Nj0%;WOltWIob|}%lo?_C7<``a5hEkx&1ku$|)i>Rh6@3h*`slY=9U}(Ql_< zaNG*J8vb&@zpdhAvv`?{=zDedJ23TD&Zg__snRAH4eh~^oawdYi6A3w8<Ozh@Kw)#bdktM^GVb zrG08?0bG?|NG+w^&JvD*7LAbjED{_Zkc`3H!My>0u5Q}m!+6VokMLXxl`Mkd=g&Xx z-a>m*#G3SLlhbKB!)tnzfWOBV;u;ftU}S!NdD5+YtOjLg?X}dl>7m^gOpihrf1;PY zvll&>dIuUGs{Qnd- zwIR3oIrct8Va^Tm0t#(bJD7c$Z7DO9*7NnRZorrSm`b`cxz>OIC;jSE3DO8`hX955ui`s%||YQtt2 z5DNA&pG-V+4oI2s*x^>-$6J?p=I>C|9wZF8z;VjR??Icg?1w2v5Me+FgAeGGa8(3S z4vg*$>zC-WIVZtJ7}o9{D-7d>zCe|z#<9>CFve-OPAYsneTb^JH!Enaza#j}^mXy1 z+ULn^10+rWLF6j2>Ya@@Kq?26>AqK{A_| zQKb*~F1>sE*=d?A?W7N2j?L09_7n+HGi{VY;MoTGr_)G9)ot$p!-UY5zZ2Xtbm=t z@dpPSGwgH=QtIcEulQNI>S-#ifbnO5EWkI;$A|pxJd885oM+ zGZ0_0gDvG8q2xebj+fbCHYfAXuZStH2j~|d^sBAzo46(K8n59+T6rzBwK)^rfPT+B zyIFw)9YC-V^rhtK`!3jrhmW-sTmM+tPH+;nwjL#-SjQPUZ53L@A>y*rt(#M(qsiB2 zx6B)dI}6Wlsw%bJ8h|(lhkJVogQZA&n{?Vgs6gNSXzuZpEyu*xySy8ro07QZ7Vk1!3tJphN_5V7qOiyK8p z#@jcDD8nmtYi1^l8ml;AF<#IPK?!pqf9D4moYk>d99Im}Jtwj6c#+A;f)CQ*f-hZ< z=p_T86jog%!p)D&5g9taSwYi&eP z#JuEK%+NULWus;0w32-SYFku#i}d~+{Pkho&^{;RxzP&0!RCm3-9K6`>KZpnzS6?L z^H^V*s!8<>x8bomvD%rh>Zp3>Db%kyin;qtl+jAv8Oo~1g~mqGAC&Qi_wy|xEt2iz zWAJEfTV%cl2Cs<1L&DLRVVH05EDq`pH7Oh7sR`NNkL%wi}8n>IXcO40hp+J+sC!W?!krJf!GJNE8uj zg-y~Ns-<~D?yqbzVRB}G>0A^f0!^N7l=$m0OdZuqAOQqLc zX?AEGr1Ht+inZ-Qiwnl@Z0qukd__a!C*CKuGdy5#nD7VUBM^6OCpxCa2A(X;e0&V4 zM&WR8+wErQ7UIc6LY~Q9x%Sn*Tn>>P`^t&idaOEnOd(Ufw#>NoR^1QdhJ8s`h^|R_ zXX`c5*O~Xdvh%q;7L!_!ohf$NfEBmCde|#uVZvEo>OfEq%+Ns7&_f$OR9xsihRpBb z+cjk8LyDm@U{YN>+r46?nn{7Gh(;WhFw6GAxtcKD+YWV?uge>;+q#Xx4!GpRkVZYu zzsF}1)7$?%s9g9CH=Zs+B%M_)+~*j3L0&Q9u7!|+T`^O{xE6qvAP?XWv9_MrZKdo& z%IyU)$Q95AB4!#hT!_dA>4e@zjOBD*Y=XjtMm)V|+IXzjuM;(l+8aA5#Kaz_$rR6! zj>#&^DidYD$nUY(D$mH`9eb|dtV0b{S>H6FBfq>t5`;OxA4Nn{J(+XihF(stSche7$es&~N$epi&PDM_N`As;*9D^L==2Q7Z2zD+CiU(|+-kL*VG+&9!Yb3LgPy?A zm7Z&^qRG_JIxK7-FBzZI3Q<;{`DIxtc48k> zc|0dmX;Z=W$+)qE)~`yn6MdoJ4co;%!`ddy+FV538Y)j(vg}5*k(WK)KWZ3WaOG!8 z!syGn=s{H$odtpqFrT#JGM*utN7B((abXnpDM6w56nhw}OY}0TiTG1#f*VFZr+^-g zbP10`$LPq_;PvrA1XXlyx2uM^mrjTzX}w{yuLo-cOClE8MMk47T25G8M!9Z5ypOSV zAJUBGEg5L2fY)ZGJb^E34R2zJ?}Vf>{~gB!8=5Z) z9y$>5c)=;o0HeHHSuE4U)#vG&KF|I%-cF6f$~pdYJWk_dD}iOA>iA$O$+4%@>JU08 zS`ep)$XLPJ+n0_i@PkF#ri6T8?ZeAot$6JIYHm&P6EB=BiaNY|aA$W0I+nz*zkz_z zkEru!tj!QUffq%)8y0y`T&`fuus-1p>=^hnBiBqD^hXrPs`PY9tU3m0np~rISY09> z`P3s=-kt_cYcxWd{de@}TwSqg*xVhp;E9zCsnXo6z z?f&Sv^U7n4`xr=mXle94HzOdN!2kB~4=%)u&N!+2;z6UYKUDqi-s6AZ!haB;@&B`? z_TRX0%@suz^TRdCb?!vNJYPY8L_}&07uySH9%W^Tc&1pia6y1q#?*Drf}GjGbPjBS zbOPcUY#*$3sL2x4v_i*Y=N7E$mR}J%|GUI(>WEr+28+V z%v5{#e!UF*6~G&%;l*q*$V?&r$Pp^sE^i-0$+RH3ERUUdQ0>rAq2(2QAbG}$y{de( z>{qD~GGuOk559Y@%$?N^1ApVL_a704>8OD%8Y%8B;FCt%AoPu8*D1 zLB5X>b}Syz81pn;xnB}%0FnwazlWfUV)Z-~rZg6~b z6!9J$EcE&sEbzcy?CI~=boWA&eeIa%z(7SE^qgVLz??1Vbc1*aRvc%Mri)AJaAG!p z$X!_9Ds;Zz)f+;%s&dRcJt2==P{^j3bf0M=nJd&xwUGlUFn?H=2W(*2I2Gdu zv!gYCwM10aeus)`RIZSrCK=&oKaO_Ry~D1B5!y0R=%!i2*KfXGYX&gNv_u+n9wiR5 z*e$Zjju&ODRW3phN925%S(jL+bCHv6rZtc?!*`1TyYXT6%Ju=|X;6D@lq$8T zW{Y|e39ioPez(pBH%k)HzFITXHvnD6hw^lIoUMA;qAJ^CU?top1fo@s7xT13Fvn1H z6JWa-6+FJF#x>~+A;D~;VDs26>^oH0EI`IYT2iagy23?nyJ==i{g4%HrAf1-*v zK1)~@&(KkwR7TL}L(A@C_S0G;-GMDy=MJn2$FP5s<%wC)4jC5PXoxrQBFZ_k0P{{s@sz+gX`-!=T8rcB(=7vW}^K6oLWMmp(rwDh}b zwaGGd>yEy6fHv%jM$yJXo5oMAQ>c9j`**}F?MCry;T@47@r?&sKHgVe$MCqk#Z_3S z1GZI~nOEN*P~+UaFGnj{{Jo@16`(qVNtbU>O0Hf57-P>x8Jikp=`s8xWs^dAJ9lCQ z)GFm+=OV%AMVqVATtN@|vp61VVAHRn87}%PC^RAzJ%JngmZTasWBAWsoAqBU+8L8u z4A&Pe?fmTm0?mK-BL9t+{y7o(7jm+RpOhL9KnY#E&qu^}B6=K_dB}*VlSEiC9fn)+V=J;OnN)Ta5v66ic1rG+dGAJ1 z1%Zb_+!$=tQ~lxQrzv3x#CPb?CekEkA}0MYSgx$Jdd}q8+R=ma$|&1a#)TQ=l$1tQ z=tL9&_^vJ)Pk}EDO-va`UCT1m#Uty1{v^A3P~83_#v^ozH}6*9mIjIr;t3Uv%@VeW zGL6(CwCUp)Jq%G0bIG%?{_*Y#5IHf*5M@wPo6A{$Um++Co$wLC=J1aoG93&T7Ho}P z=mGEPP7GbvoG!uD$k(H3A$Z))+i{Hy?QHdk>3xSBXR0j!11O^mEe9RHmw!pvzv?Ua~2_l2Yh~_!s1qS`|0~0)YsbHSz8!mG)WiJE| z2f($6TQtt6L_f~ApQYQKSb=`053LgrQq7G@98#igV>y#i==-nEjQ!XNu9 z~;mE+gtj4IDDNQJ~JVk5Ux6&LCSFL!y=>79kE9=V}J7tD==Ga+IW zX)r7>VZ9dY=V&}DR))xUoV!u(Z|%3ciQi_2jl}3=$Agc(`RPb z8kEBpvY>1FGQ9W$n>Cq=DIpski};nE)`p3IUw1Oz0|wxll^)4dq3;CCY@RyJgFgc# zKouFh!`?Xuo{IMz^xi-h=StCis_M7yq$u) z?XHvw*HP0VgR+KR6wI)jEMX|ssqYvSf*_3W8zVTQzD?3>H!#>InzpSO)@SC8q*ii- z%%h}_#0{4JG;Jm`4zg};BPTGkYamx$Xo#O~lBirRY)q=5M45n{GCfV7h9qwyu1NxOMoP4)jjZMxmT|IQQh0U7C$EbnMN<3)Kk?fFHYq$d|ICu>KbY_hO zTZM+uKHe(cIZfEqyzyYSUBZa8;Fcut-GN!HSA9ius`ltNebF46ZX_BbZNU}}ZOm{M2&nANL9@0qvih15(|`S~z}m&h!u4x~(%MAO$jHRWNfuxWF#B)E&g3ghSQ9|> z(MFaLQj)NE0lowyjvg8z0#m6FIuKE9lDO~Glg}nSb7`~^&#(Lw{}GVOS>U)m8bF}x zVjbXljBm34Cs-yM6TVusr+3kYFjr28STT3g056y3cH5Tmge~ASxBj z%|yb>$eF;WgrcOZf569sDZOVwoo%8>XO>XQOX1OyN9I-SQgrm;U;+#3OI(zrWyow3 zk==|{lt2xrQ%FIXOTejR>;wv(Pb8u8}BUpx?yd(Abh6? zsoO3VYWkeLnF43&@*#MQ9-i-d0t*xN-UEyNKeyNMHw|A(k(_6QKO=nKMCxD(W(Yop zsRQ)QeL4X3Lxp^L%wzi2-WVSsf61dqliPUM7srDB?Wm6Lzn0&{*}|IsKQW;02(Y&| zaTKv|`U(pSzuvR6Rduu$wzK_W-Y-7>7s?G$)U}&uK;<>vU}^^ns@Z!p+9?St1s)dG zK%y6xkPyyS1$~&6v{kl?Md6gwM|>mt6Upm>oa8RLD^8T{0?HC!Z>;(Bob7el(DV6x zi`I)$&E&ngwFS@bi4^xFLAn`=fzTC;aimE^!cMI2n@Vo%Ae-ne`RF((&5y6xsjjAZ zVguVoQ?Z9uk$2ON;ersE%PU*xGO@T*;j1BO5#TuZKEf(mB7|g7pcEA=nYJ{s3vlbg zd4-DUlD{*6o%Gc^N!Nptgay>j6E5;3psI+C3Q!1ZIbeCubW%w4pq9)MSDyB{HLm|k zxv-{$$A*pS@csolri$Ge<4VZ}e~78JOL-EVyrbxKra^d{?|NnPp86!q>t<&IP07?Z z^>~IK^k#OEKgRH+LjllZXk7iA>2cfH6+(e&9ku5poo~6y{GC5>(bRK7hwjiurqAiZ zg*DmtgY}v83IjE&AbiWgMyFbaRUPZ{lYiz$U^&Zt2YjG<%m((&_JUbZcfJ22(>bi5 z!J?<7AySj0JZ&<-qXX;mcV!f~>G=sB0KnjWca4}vrtunD^1TrpfeS^4dvFr!65knK zZh`d;*VOkPs4*-9kL>$GP0`(M!j~B;#x?Ba~&s6CopvO86oM?-? zOw#dIRc;6A6T?B`Qp%^<U5 z19x(ywSH$_N+Io!6;e?`tWaM$`=Db!gzx|lQ${DG!zb1Zl&|{kX0y6xvO1o z220r<-oaS^^R2pEyY;=Qllqpmue|5yI~D|iI!IGt@iod{Opz@*ml^w2bNs)p`M(Io z|E;;m*Xpjd9l)4G#KaWfV(t8YUn@A;nK^#xgv=LtnArX|vWQVuw3}B${h+frU2>9^ z!l6)!Uo4`5k`<<;E(ido7M6lKTgWezNLq>U*=uz&s=cc$1%>VrAeOoUtA|T6gO4>UNqsdK=NF*8|~*sl&wI=x9-EGiq*aqV!(VVXA57 zw9*o6Ir8Lj1npUXvlevtn(_+^X5rzdR>#(}4YcB9O50q97%rW2me5_L=%ffYPUSRc z!vv?Kv>dH994Qi>U(a<0KF6NH5b16enCp+mw^Hb3Xs1^tThFpz!3QuN#}KBbww`(h z7GO)1olDqy6?T$()R7y%NYx*B0k_2IBiZ14&8|JPFxeMF{vSTxF-Vi3+ZOI=Thq2} zyQgjYY1_7^ZQHh{?P))4+qUiQJLi1&{yE>h?~jU%tjdV0h|FENbM3X(KnJdPKc?~k zh=^Ixv*+smUll!DTWH!jrV*wSh*(mx0o6}1@JExzF(#9FXgmTXVoU+>kDe68N)dkQ zH#_98Zv$}lQwjKL@yBd;U(UD0UCl322=pav<=6g>03{O_3oKTq;9bLFX1ia*lw;#K zOiYDcBJf)82->83N_Y(J7Kr_3lE)hAu;)Q(nUVydv+l+nQ$?|%MWTy`t>{havFSQloHwiIkGK9YZ79^9?AZo0ZyQlVR#}lF%dn5n%xYksXf8gnBm=wO7g_^! zauQ-bH1Dc@3ItZ-9D_*pH}p!IG7j8A_o94#~>$LR|TFq zZ-b00*nuw|-5C2lJDCw&8p5N~Z1J&TrcyErds&!l3$eSz%`(*izc;-?HAFD9AHb-| z>)id`QCrzRws^9(#&=pIx9OEf2rmlob8sK&xPCWS+nD~qzU|qG6KwA{zbikcfQrdH z+ zQg>O<`K4L8rN7`GJB0*3<3`z({lWe#K!4AZLsI{%z#ja^OpfjU{!{)x0ZH~RB0W5X zTwN^w=|nA!4PEU2=LR05x~}|B&ZP?#pNgDMwD*ajI6oJqv!L81gu=KpqH22avXf0w zX3HjbCI!n9>l046)5rr5&v5ja!xkKK42zmqHzPx$9Nn_MZk`gLeSLgC=LFf;H1O#B zn=8|^1iRrujHfbgA+8i<9jaXc;CQBAmQvMGQPhFec2H1knCK2x!T`e6soyrqCamX% zTQ4dX_E*8so)E*TB$*io{$c6X)~{aWfaqdTh=xEeGvOAN9H&-t5tEE-qso<+C!2>+ zskX51H-H}#X{A75wqFe-J{?o8Bx|>fTBtl&tcbdR|132Ztqu5X0i-pisB-z8n71%q%>EF}yy5?z=Ve`}hVh{Drv1YWL zW=%ug_&chF11gDv3D6B)Tz5g54H0mDHNjuKZ+)CKFk4Z|$RD zfRuKLW`1B>B?*RUfVd0+u8h3r-{@fZ{k)c!93t1b0+Q9vOaRnEn1*IL>5Z4E4dZ!7 ztp4GP-^1d>8~LMeb}bW!(aAnB1tM_*la=Xx)q(I0Y@__Zd$!KYb8T2VBRw%e$iSdZ zkwdMwd}eV9q*;YvrBFTv1>1+}{H!JK2M*C|TNe$ZSA>UHKk);wz$(F$rXVc|sI^lD zV^?_J!3cLM;GJuBMbftbaRUs$;F}HDEDtIeHQ)^EJJ1F9FKJTGH<(Jj`phE6OuvE) zqK^K`;3S{Y#1M@8yRQwH`?kHMq4tHX#rJ>5lY3DM#o@or4&^_xtBC(|JpGTfrbGkA z2Tu+AyT^pHannww!4^!$5?@5v`LYy~T`qs7SYt$JgrY(w%C+IWA;ZkwEF)u5sDvOK zGk;G>Mh&elvXDcV69J_h02l&O;!{$({fng9Rlc3ID#tmB^FIG^w{HLUpF+iB`|
NnX)EH+Nua)3Y(c z&{(nX_ht=QbJ%DzAya}!&uNu!4V0xI)QE$SY__m)SAKcN0P(&JcoK*Lxr@P zY&P=}&B3*UWNlc|&$Oh{BEqwK2+N2U$4WB7Fd|aIal`FGANUa9E-O)!gV`((ZGCc$ zBJA|FFrlg~9OBp#f7aHodCe{6= zay$6vN~zj1ddMZ9gQ4p32(7wD?(dE>KA2;SOzXRmPBiBc6g`eOsy+pVcHu=;Yd8@{ zSGgXf@%sKKQz~;!J;|2fC@emm#^_rnO0esEn^QxXgJYd`#FPWOUU5b;9eMAF zZhfiZb|gk8aJIw*YLp4!*(=3l8Cp{(%p?ho22*vN9+5NLV0TTazNY$B5L6UKUrd$n zjbX%#m7&F#U?QNOBXkiiWB*_tk+H?N3`vg;1F-I+83{M2!8<^nydGr5XX}tC!10&e z7D36bLaB56WrjL&HiiMVtpff|K%|*{t*ltt^5ood{FOG0<>k&1h95qPio)2`eL${YAGIx(b4VN*~nKn6E~SIQUuRH zQ+5zP6jfnP$S0iJ@~t!Ai3o`X7biohli;E zT#yXyl{bojG@-TGZzpdVDXhbmF%F9+-^YSIv|MT1l3j zrxOFq>gd2%U}?6}8mIj?M zc077Zc9fq(-)4+gXv?Az26IO6eV`RAJz8e3)SC7~>%rlzDwySVx*q$ygTR5kW2ds- z!HBgcq0KON9*8Ff$X0wOq$`T7ml(@TF)VeoF}x1OttjuVHn3~sHrMB++}f7f9H%@f z=|kP_?#+fve@{0MlbkC9tyvQ_R?lRdRJ@$qcB(8*jyMyeME5ns6ypVI1Xm*Zr{DuS zZ!1)rQfa89c~;l~VkCiHI|PCBd`S*2RLNQM8!g9L6?n`^evQNEwfO@&JJRme+uopQX0%Jo zgd5G&#&{nX{o?TQwQvF1<^Cg3?2co;_06=~Hcb6~4XWpNFL!WU{+CK;>gH%|BLOh7@!hsa(>pNDAmpcuVO-?;Bic17R}^|6@8DahH)G z!EmhsfunLL|3b=M0MeK2vqZ|OqUqS8npxwge$w-4pFVXFq$_EKrZY?BuP@Az@(k`L z`ViQBSk`y+YwRT;&W| z2e3UfkCo^uTA4}Qmmtqs+nk#gNr2W4 zTH%hhErhB)pkXR{B!q5P3-OM+M;qu~f>}IjtF%>w{~K-0*jPVLl?Chz&zIdxp}bjx zStp&Iufr58FTQ36AHU)0+CmvaOpKF;W@sMTFpJ`j;3d)J_$tNQI^c<^1o<49Z(~K> z;EZTBaVT%14(bFw2ob@?JLQ2@(1pCdg3S%E4*dJ}dA*v}_a4_P(a`cHnBFJxNobAv zf&Zl-Yt*lhn-wjZsq<9v-IsXxAxMZ58C@e0!rzhJ+D@9^3~?~yllY^s$?&oNwyH!#~6x4gUrfxplCvK#!f z$viuszW>MFEcFL?>ux*((!L$;R?xc*myjRIjgnQX79@UPD$6Dz0jutM@7h_pq z0Zr)#O<^y_K6jfY^X%A-ip>P%3saX{!v;fxT-*0C_j4=UMH+Xth(XVkVGiiKE#f)q z%Jp=JT)uy{&}Iq2E*xr4YsJ5>w^=#-mRZ4vPXpI6q~1aFwi+lQcimO45V-JXP;>(Q zo={U`{=_JF`EQj87Wf}{Qy35s8r1*9Mxg({CvOt}?Vh9d&(}iI-quvs-rm~P;eRA@ zG5?1HO}puruc@S{YNAF3vmUc2B4!k*yi))<5BQmvd3tr}cIs#9)*AX>t`=~{f#Uz0 z0&Nk!7sSZwJe}=)-R^$0{yeS!V`Dh7w{w5rZ9ir!Z7Cd7dwZcK;BT#V0bzTt>;@Cl z#|#A!-IL6CZ@eHH!CG>OO8!%G8&8t4)Ro@}USB*k>oEUo0LsljsJ-%5Mo^MJF2I8- z#v7a5VdJ-Cd%(a+y6QwTmi+?f8Nxtm{g-+WGL>t;s#epv7ug>inqimZCVm!uT5Pf6 ziEgQt7^%xJf#!aPWbuC_3Nxfb&CFbQy!(8ANpkWLI4oSnH?Q3f?0k1t$3d+lkQs{~(>06l&v|MpcFsyAv zin6N!-;pggosR*vV=DO(#+}4ps|5$`udE%Kdmp?G7B#y%H`R|i8skKOd9Xzx8xgR$>Zo2R2Ytktq^w#ul4uicxW#{ zFjG_RNlBroV_n;a7U(KIpcp*{M~e~@>Q#Av90Jc5v%0c>egEdY4v3%|K1XvB{O_8G zkTWLC>OZKf;XguMH2-Pw{BKbFzaY;4v2seZV0>^7Q~d4O=AwaPhP3h|!hw5aqOtT@ z!SNz}$of**Bl3TK209@F=Tn1+mgZa8yh(Png%Zd6Mt}^NSjy)etQrF zme*llAW=N_8R*O~d2!apJnF%(JcN??=`$qs3Y+~xs>L9x`0^NIn!8mMRFA_tg`etw z3k{9JAjnl@ygIiJcNHTy02GMAvBVqEss&t2<2mnw!; zU`J)0>lWiqVqo|ex7!+@0i>B~BSU1A_0w#Ee+2pJx0BFiZ7RDHEvE*ptc9md(B{&+ zKE>TM)+Pd>HEmdJao7U@S>nL(qq*A)#eLOuIfAS@j`_sK0UEY6OAJJ-kOrHG zjHx`g!9j*_jRcJ%>CE9K2MVf?BUZKFHY?EpV6ai7sET-tqk=nDFh-(65rhjtlKEY% z@G&cQ<5BKatfdA1FKuB=i>CCC5(|9TMW%K~GbA4}80I5%B}(gck#Wlq@$nO3%@QP_ z8nvPkJFa|znk>V92cA!K1rKtr)skHEJD;k8P|R8RkCq1Rh^&}Evwa4BUJz2f!2=MH zo4j8Y$YL2313}H~F7@J7mh>u%556Hw0VUOz-Un@ZASCL)y8}4XXS`t1AC*^>PLwIc zUQok5PFS=*#)Z!3JZN&eZ6ZDP^-c@StY*t20JhCnbMxXf=LK#;`4KHEqMZ-Ly9KsS zI2VUJGY&PmdbM+iT)zek)#Qc#_i4uH43 z@T5SZBrhNCiK~~esjsO9!qBpaWK<`>!-`b71Y5ReXQ4AJU~T2Njri1CEp5oKw;Lnm)-Y@Z3sEY}XIgSy%xo=uek(kAAH5MsV$V3uTUsoTzxp_rF=tx zV07vlJNKtJhCu`b}*#m&5LV4TAE&%KtHViDAdv#c^x`J7bg z&N;#I2GkF@SIGht6p-V}`!F_~lCXjl1BdTLIjD2hH$J^YFN`7f{Q?OHPFEM$65^!u zNwkelo*5+$ZT|oQ%o%;rBX$+?xhvjb)SHgNHE_yP%wYkkvXHS{Bf$OiKJ5d1gI0j< zF6N}Aq=(WDo(J{e-uOecxPD>XZ@|u-tgTR<972`q8;&ZD!cep^@B5CaqFz|oU!iFj zU0;6fQX&~15E53EW&w1s9gQQ~Zk16X%6 zjG`j0yq}4deX2?Tr(03kg>C(!7a|b9qFI?jcE^Y>-VhudI@&LI6Qa}WQ>4H_!UVyF z((cm&!3gmq@;BD#5P~0;_2qgZhtJS|>WdtjY=q zLnHH~Fm!cxw|Z?Vw8*~?I$g#9j&uvgm7vPr#&iZgPP~v~BI4jOv;*OQ?jYJtzO<^y z7-#C={r7CO810!^s(MT!@@Vz_SVU)7VBi(e1%1rvS!?PTa}Uv`J!EP3s6Y!xUgM^8 z4f!fq<3Wer_#;u!5ECZ|^c1{|q_lh3m^9|nsMR1#Qm|?4Yp5~|er2?W^7~cl;_r4WSme_o68J9p03~Hc%X#VcX!xAu%1`R!dfGJCp zV*&m47>s^%Ib0~-2f$6oSgn3jg8m%UA;ArcdcRyM5;}|r;)?a^D*lel5C`V5G=c~k zy*w_&BfySOxE!(~PI$*dwG><+-%KT5p?whOUMA*k<9*gi#T{h3DAxzAPxN&Xws8o9Cp*`PA5>d9*Z-ynV# z9yY*1WR^D8|C%I@vo+d8r^pjJ$>eo|j>XiLWvTWLl(^;JHCsoPgem6PvegHb-OTf| zvTgsHSa;BkbG=(NgPO|CZu9gUCGr$8*EoH2_Z#^BnxF0yM~t`|9ws_xZ8X8iZYqh! zAh;HXJ)3P&)Q0(&F>!LN0g#bdbis-cQxyGn9Qgh`q+~49Fqd2epikEUw9caM%V6WgP)532RMRW}8gNS%V%Hx7apSz}tn@bQy!<=lbhmAH=FsMD?leawbnP5BWM0 z5{)@EEIYMu5;u)!+HQWhQ;D3_Cm_NADNeb-f56}<{41aYq8p4=93d=-=q0Yx#knGYfXVt z+kMxlus}t2T5FEyCN~!}90O_X@@PQpuy;kuGz@bWft%diBTx?d)_xWd_-(!LmVrh**oKg!1CNF&LX4{*j|) zIvjCR0I2UUuuEXh<9}oT_zT#jOrJAHNLFT~Ilh9hGJPI1<5`C-WA{tUYlyMeoy!+U zhA#=p!u1R7DNg9u4|QfED-2TuKI}>p#2P9--z;Bbf4Op*;Q9LCbO&aL2i<0O$ByoI z!9;Ght733FC>Pz>$_mw(F`zU?`m@>gE`9_p*=7o=7av`-&ifU(^)UU`Kg3Kw`h9-1 z6`e6+im=|m2v`pN(2dE%%n8YyQz;#3Q-|x`91z?gj68cMrHl}C25|6(_dIGk*8cA3 zRHB|Nwv{@sP4W+YZM)VKI>RlB`n=Oj~Rzx~M+Khz$N$45rLn6k1nvvD^&HtsMA4`s=MmuOJID@$s8Ph4E zAmSV^+s-z8cfv~Yd(40Sh4JG#F~aB>WFoX7ykaOr3JaJ&Lb49=B8Vk-SQT9%7TYhv z?-Pprt{|=Y5ZQ1?od|A<_IJU93|l4oAfBm?3-wk{O<8ea+`}u%(kub(LFo2zFtd?4 zwpN|2mBNywv+d^y_8#<$r>*5+$wRTCygFLcrwT(qc^n&@9r+}Kd_u@Ithz(6Qb4}A zWo_HdBj#V$VE#l6pD0a=NfB0l^6W^g`vm^sta>Tly?$E&{F?TTX~DsKF~poFfmN%2 z4x`Dc{u{Lkqz&y!33;X}weD}&;7p>xiI&ZUb1H9iD25a(gI|`|;G^NwJPv=1S5e)j z;U;`?n}jnY6rA{V^ zxTd{bK)Gi^odL3l989DQlN+Zs39Xe&otGeY(b5>rlIqfc7Ap4}EC?j<{M=hlH{1+d zw|c}}yx88_xQr`{98Z!d^FNH77=u(p-L{W6RvIn40f-BldeF-YD>p6#)(Qzf)lfZj z?3wAMtPPp>vMehkT`3gToPd%|D8~4`5WK{`#+}{L{jRUMt zrFz+O$C7y8$M&E4@+p+oV5c%uYzbqd2Y%SSgYy#xh4G3hQv>V*BnuKQhBa#=oZB~w{azUB+q%bRe_R^ z>fHBilnRTUfaJ201czL8^~Ix#+qOHSO)A|xWLqOxB$dT2W~)e-r9;bm=;p;RjYahB z*1hegN(VKK+ztr~h1}YP@6cfj{e#|sS`;3tJhIJK=tVJ-*h-5y9n*&cYCSdg#EHE# zSIx=r#qOaLJoVVf6v;(okg6?*L_55atl^W(gm^yjR?$GplNP>BZsBYEf_>wM0Lc;T zhf&gpzOWNxS>m+mN92N0{;4uw`P+9^*|-1~$uXpggj4- z^SFc4`uzj2OwdEVT@}Q`(^EcQ_5(ZtXTql*yGzdS&vrS_w>~~ra|Nb5abwf}Y!uq6R5f&6g2ge~2p(%c< z@O)cz%%rr4*cRJ5f`n@lvHNk@lE1a*96Kw6lJ~B-XfJW%?&-y?;E&?1AacU@`N`!O z6}V>8^%RZ7SQnZ-z$(jsX`amu*5Fj8g!3RTRwK^`2_QHe;_2y_n|6gSaGyPmI#kA0sYV<_qOZc#-2BO%hX)f$s-Z3xlI!ub z^;3ru11DA`4heAu%}HIXo&ctujzE2!6DIGE{?Zs>2}J+p&C$rc7gJC35gxhflorvsb%sGOxpuWhF)dL_&7&Z99=5M0b~Qa;Mo!j&Ti_kXW!86N%n= zSC@6Lw>UQ__F&+&Rzv?gscwAz8IP!n63>SP)^62(HK98nGjLY2*e^OwOq`3O|C92? z;TVhZ2SK%9AGW4ZavTB9?)mUbOoF`V7S=XM;#3EUpR+^oHtdV!GK^nXzCu>tpR|89 zdD{fnvCaN^^LL%amZ^}-E+214g&^56rpdc@yv0b<3}Ys?)f|fXN4oHf$six)-@<;W&&_kj z-B}M5U*1sb4)77aR=@%I?|Wkn-QJVuA96an25;~!gq(g1@O-5VGo7y&E_srxL6ZfS z*R%$gR}dyONgju*D&?geiSj7SZ@ftyA|}(*Y4KbvU!YLsi1EDQQCnb+-cM=K1io78o!v*);o<XwjaQH%)uIP&Zm?)Nfbfn;jIr z)d#!$gOe3QHp}2NBak@yYv3m(CPKkwI|{;d=gi552u?xj9ObCU^DJFQp4t4e1tPzM zvsRIGZ6VF+{6PvqsplMZWhz10YwS={?`~O0Ec$`-!klNUYtzWA^f9m7tkEzCy<_nS z=&<(awFeZvt51>@o_~>PLs05CY)$;}Oo$VDO)?l-{CS1Co=nxjqben*O1BR>#9`0^ zkwk^k-wcLCLGh|XLjdWv0_Hg54B&OzCE^3NCP}~OajK-LuRW53CkV~Su0U>zN%yQP zH8UH#W5P3-!ToO-2k&)}nFe`t+mdqCxxAHgcifup^gKpMObbox9LFK;LP3}0dP-UW z?Zo*^nrQ6*$FtZ(>kLCc2LY*|{!dUn$^RW~m9leoF|@Jy|M5p-G~j%+P0_#orRKf8 zvuu5<*XO!B?1E}-*SY~MOa$6c%2cM+xa8}_8x*aVn~57v&W(0mqN1W`5a7*VN{SUH zXz98DDyCnX2EPl-`Lesf`=AQT%YSDb`$%;(jUTrNen$NPJrlpPDP}prI>Ml!r6bCT;mjsg@X^#&<}CGf0JtR{Ecwd&)2zuhr#nqdgHj+g2n}GK9CHuwO zk>oZxy{vcOL)$8-}L^iVfJHAGfwN$prHjYV0ju}8%jWquw>}_W6j~m<}Jf!G?~r5&Rx)!9JNX!ts#SGe2HzobV5); zpj@&`cNcO&q+%*<%D7za|?m5qlmFK$=MJ_iv{aRs+BGVrs)98BlN^nMr{V_fcl_;jkzRju+c-y?gqBC_@J0dFLq-D9@VN&-`R9U;nv$Hg?>$oe4N&Ht$V_(JR3TG^! zzJsbQbi zFE6-{#9{G{+Z}ww!ycl*7rRdmU#_&|DqPfX3CR1I{Kk;bHwF6jh0opI`UV2W{*|nn zf_Y@%wW6APb&9RrbEN=PQRBEpM(N1w`81s=(xQj6 z-eO0k9=Al|>Ej|Mw&G`%q8e$2xVz1v4DXAi8G};R$y)ww638Y=9y$ZYFDM$}vzusg zUf+~BPX>(SjA|tgaFZr_e0{)+z9i6G#lgt=F_n$d=beAt0Sa0a7>z-?vcjl3e+W}+ z1&9=|vC=$co}-Zh*%3588G?v&U7%N1Qf-wNWJ)(v`iO5KHSkC5&g7CrKu8V}uQGcfcz zmBz#Lbqwqy#Z~UzHgOQ;Q-rPxrRNvl(&u6ts4~0=KkeS;zqURz%!-ERppmd%0v>iRlEf+H$yl{_8TMJzo0 z>n)`On|7=WQdsqhXI?#V{>+~}qt-cQbokEbgwV3QvSP7&hK4R{Z{aGHVS3;+h{|Hz z6$Js}_AJr383c_+6sNR|$qu6dqHXQTc6?(XWPCVZv=)D#6_;D_8P-=zOGEN5&?~8S zl5jQ?NL$c%O)*bOohdNwGIKM#jSAC?BVY={@A#c9GmX0=T(0G}xs`-%f3r=m6-cpK z!%waekyAvm9C3%>sixdZj+I(wQlbB4wv9xKI*T13DYG^T%}zZYJ|0$Oj^YtY+d$V$ zAVudSc-)FMl|54n=N{BnZTM|!>=bhaja?o7s+v1*U$!v!qQ%`T-6fBvmdPbVmro&d zk07TOp*KuxRUSTLRrBj{mjsnF8`d}rMViY8j`jo~Hp$fkv9F_g(jUo#Arp;Xw0M$~ zRIN!B22~$kx;QYmOkos@%|5k)!QypDMVe}1M9tZfkpXKGOxvKXB!=lo`p?|R1l=tA zp(1}c6T3Fwj_CPJwVsYtgeRKg?9?}%oRq0F+r+kdB=bFUdVDRPa;E~~>2$w}>O>v=?|e>#(-Lyx?nbg=ckJ#5U6;RT zNvHhXk$P}m9wSvFyU3}=7!y?Y z=fg$PbV8d7g25&-jOcs{%}wTDKm>!Vk);&rr;O1nvO0VrU&Q?TtYVU=ir`te8SLlS zKSNmV=+vF|ATGg`4$N1uS|n??f}C_4Sz!f|4Ly8#yTW-FBfvS48Tef|-46C(wEO_%pPhUC5$-~Y?!0vFZ^Gu`x=m7X99_?C-`|h zfmMM&Y@zdfitA@KPw4Mc(YHcY1)3*1xvW9V-r4n-9ZuBpFcf{yz+SR{ zo$ZSU_|fgwF~aakGr(9Be`~A|3)B=9`$M-TWKipq-NqRDRQc}ABo*s_5kV%doIX7LRLRau_gd@Rd_aLFXGSU+U?uAqh z8qusWWcvgQ&wu{|sRXmv?sl=xc<$6AR$+cl& zFNh5q1~kffG{3lDUdvEZu5c(aAG~+64FxdlfwY^*;JSS|m~CJusvi-!$XR`6@XtY2 znDHSz7}_Bx7zGq-^5{stTRy|I@N=>*y$zz>m^}^{d&~h;0kYiq8<^Wq7Dz0w31ShO^~LUfW6rfitR0(=3;Uue`Y%y@ex#eKPOW zO~V?)M#AeHB2kovn1v=n^D?2{2jhIQd9t|_Q+c|ZFaWt+r&#yrOu-!4pXAJuxM+Cx z*H&>eZ0v8Y`t}8{TV6smOj=__gFC=eah)mZt9gwz>>W$!>b3O;Rm^Ig*POZP8Rl0f zT~o=Nu1J|lO>}xX&#P58%Yl z83`HRs5#32Qm9mdCrMlV|NKNC+Z~ z9OB8xk5HJ>gBLi+m@(pvpw)1(OaVJKs*$Ou#@Knd#bk+V@y;YXT?)4eP9E5{J%KGtYinNYJUH9PU3A}66c>Xn zZ{Bn0<;8$WCOAL$^NqTjwM?5d=RHgw3!72WRo0c;+houoUA@HWLZM;^U$&sycWrFd zE7ekt9;kb0`lps{>R(}YnXlyGY}5pPd9zBpgXeJTY_jwaJGSJQC#-KJqmh-;ad&F- z-Y)E>!&`Rz!HtCz>%yOJ|v(u7P*I$jqEY3}(Z-orn4 zlI?CYKNl`6I){#2P1h)y(6?i;^z`N3bxTV%wNvQW+eu|x=kbj~s8rhCR*0H=iGkSj zk23lr9kr|p7#qKL=UjgO`@UnvzU)`&fI>1Qs7ubq{@+lK{hH* zvl6eSb9%yngRn^T<;jG1SVa)eA>T^XX=yUS@NCKpk?ovCW1D@!=@kn;l_BrG;hOTC z6K&H{<8K#dI(A+zw-MWxS+~{g$tI7|SfP$EYKxA}LlVO^sT#Oby^grkdZ^^lA}uEF zBSj$weBJG{+Bh@Yffzsw=HyChS(dtLE3i*}Zj@~!_T-Ay7z=B)+*~3|?w`Zd)Co2t zC&4DyB!o&YgSw+fJn6`sn$e)29`kUwAc+1MND7YjV%lO;H2}fNy>hD#=gT ze+-aFNpyKIoXY~Vq-}OWPBe?Rfu^{ps8>Xy%42r@RV#*QV~P83jdlFNgkPN=T|Kt7 zV*M`Rh*30&AWlb$;ae130e@}Tqi3zx2^JQHpM>j$6x`#{mu%tZlwx9Gj@Hc92IuY* zarmT|*d0E~vt6<+r?W^UW0&#U&)8B6+1+;k^2|FWBRP9?C4Rk)HAh&=AS8FS|NQaZ z2j!iZ)nbEyg4ZTp-zHwVlfLC~tXIrv(xrP8PAtR{*c;T24ycA-;auWsya-!kF~CWZ zw_uZ|%urXgUbc@x=L=_g@QJ@m#5beS@6W195Hn7>_}z@Xt{DIEA`A&V82bc^#!q8$ zFh?z_Vn|ozJ;NPd^5uu(9tspo8t%&-U9Ckay-s@DnM*R5rtu|4)~e)`z0P-sy?)kc zs_k&J@0&0!q4~%cKL)2l;N*T&0;mqX5T{Qy60%JtKTQZ-xb%KOcgqwJmb%MOOKk7N zgq})R_6**{8A|6H?fO+2`#QU)p$Ei2&nbj6TpLSIT^D$|`TcSeh+)}VMb}LmvZ{O| ze*1IdCt3+yhdYVxcM)Q_V0bIXLgr6~%JS<<&dxIgfL=Vnx4YHuU@I34JXA|+$_S3~ zy~X#gO_X!cSs^XM{yzDGNM>?v(+sF#<0;AH^YrE8smx<36bUsHbN#y57K8WEu(`qHvQ6cAZPo=J5C(lSmUCZ57Rj6cx!e^rfaI5%w}unz}4 zoX=nt)FVNV%QDJH`o!u9olLD4O5fl)xp+#RloZlaA92o3x4->?rB4`gS$;WO{R;Z3>cG3IgFX2EA?PK^M}@%1%A;?f6}s&CV$cIyEr#q5;yHdNZ9h{| z-=dX+a5elJoDo?Eq&Og!nN6A)5yYpnGEp}?=!C-V)(*~z-+?kY1Q7qs#Rsy%hu_60rdbB+QQNr?S1 z?;xtjUv|*E3}HmuNyB9aFL5H~3Ho0UsmuMZELp1a#CA1g`P{-mT?BchuLEtK}!QZ=3AWakRu~?f9V~3F;TV`5%9Pcs_$gq&CcU}r8gOO zC2&SWPsSG{&o-LIGTBqp6SLQZPvYKp$$7L4WRRZ0BR$Kf0I0SCFkqveCp@f)o8W)! z$%7D1R`&j7W9Q9CGus_)b%+B#J2G;l*FLz#s$hw{BHS~WNLODV#(!u_2Pe&tMsq={ zdm7>_WecWF#D=?eMjLj=-_z`aHMZ=3_-&E8;ibPmM}61i6J3is*=dKf%HC>=xbj4$ zS|Q-hWQ8T5mWde6h@;mS+?k=89?1FU<%qH9B(l&O>k|u_aD|DY*@~(`_pb|B#rJ&g zR0(~(68fpUPz6TdS@4JT5MOPrqDh5_H(eX1$P2SQrkvN8sTxwV>l0)Qq z0pzTuvtEAKRDkKGhhv^jk%|HQ1DdF%5oKq5BS>szk-CIke{%js?~%@$uaN3^Uz6Wf z_iyx{bZ(;9y4X&>LPV=L=d+A}7I4GkK0c1Xts{rrW1Q7apHf-))`BgC^0^F(>At1* za@e7{lq%yAkn*NH8Q1{@{lKhRg*^TfGvv!Sn*ed*x@6>M%aaqySxR|oNadYt1mpUZ z6H(rupHYf&Z z29$5g#|0MX#aR6TZ$@eGxxABRKakDYtD%5BmKp;HbG_ZbT+=81E&=XRk6m_3t9PvD zr5Cqy(v?gHcYvYvXkNH@S#Po~q(_7MOuCAB8G$a9BC##gw^5mW16cML=T=ERL7wsk zzNEayTG?mtB=x*wc@ifBCJ|irFVMOvH)AFRW8WE~U()QT=HBCe@s$dA9O!@`zAAT) zaOZ7l6vyR+Nk_OOF!ZlZmjoImKh)dxFbbR~z(cMhfeX1l7S_`;h|v3gI}n9$sSQ>+3@AFAy9=B_y$)q;Wdl|C-X|VV3w8 z2S#>|5dGA8^9%Bu&fhmVRrTX>Z7{~3V&0UpJNEl0=N32euvDGCJ>#6dUSi&PxFW*s zS`}TB>?}H(T2lxBJ!V#2taV;q%zd6fOr=SGHpoSG*4PDaiG0pdb5`jelVipkEk%FV zThLc@Hc_AL1#D&T4D=w@UezYNJ%0=f3iVRuVL5H?eeZM}4W*bomebEU@e2d`M<~uW zf#Bugwf`VezG|^Qbt6R_=U0}|=k;mIIakz99*>FrsQR{0aQRP6ko?5<7bkDN8evZ& zB@_KqQG?ErKL=1*ZM9_5?Pq%lcS4uLSzN(Mr5=t6xHLS~Ym`UgM@D&VNu8e?_=nSFtF$u@hpPSmI4Vo_t&v?>$~K4y(O~Rb*(MFy_igM7 z*~yYUyR6yQgzWnWMUgDov!!g=lInM+=lOmOk4L`O?{i&qxy&D*_qorRbDwj6?)!ef z#JLd7F6Z2I$S0iYI={rZNk*<{HtIl^mx=h>Cim*04K4+Z4IJtd*-)%6XV2(MCscPiw_a+y*?BKbTS@BZ3AUao^%Zi#PhoY9Vib4N>SE%4>=Jco0v zH_Miey{E;FkdlZSq)e<{`+S3W=*ttvD#hB8w=|2aV*D=yOV}(&p%0LbEWH$&@$X3x~CiF-?ejQ*N+-M zc8zT@3iwkdRT2t(XS`d7`tJQAjRmKAhiw{WOqpuvFp`i@Q@!KMhwKgsA}%@sw8Xo5Y=F zhRJZg)O4uqNWj?V&&vth*H#je6T}}p_<>!Dr#89q@uSjWv~JuW(>FqoJ5^ho0%K?E z9?x_Q;kmcsQ@5=}z@tdljMSt9-Z3xn$k)kEjK|qXS>EfuDmu(Z8|(W?gY6-l z@R_#M8=vxKMAoi&PwnaIYw2COJM@atcgfr=zK1bvjW?9B`-+Voe$Q+H$j!1$Tjn+* z&LY<%)L@;zhnJlB^Og6I&BOR-m?{IW;tyYC%FZ!&Z>kGjHJ6cqM-F z&19n+e1=9AH1VrVeHrIzqlC`w9=*zfmrerF?JMzO&|Mmv;!4DKc(sp+jy^Dx?(8>1 zH&yS_4yL7m&GWX~mdfgH*AB4{CKo;+egw=PrvkTaoBU+P-4u?E|&!c z)DKc;>$$B6u*Zr1SjUh2)FeuWLWHl5TH(UHWkf zLs>7px!c5n;rbe^lO@qlYLzlDVp(z?6rPZel=YB)Uv&n!2{+Mb$-vQl=xKw( zve&>xYx+jW_NJh!FV||r?;hdP*jOXYcLCp>DOtJ?2S^)DkM{{Eb zS$!L$e_o0(^}n3tA1R3-$SNvgBq;DOEo}fNc|tB%%#g4RA3{|euq)p+xd3I8^4E&m zFrD%}nvG^HUAIKe9_{tXB;tl|G<%>yk6R;8L2)KUJw4yHJXUOPM>(-+jxq4R;z8H#>rnJy*)8N+$wA$^F zN+H*3t)eFEgxLw+Nw3};4WV$qj&_D`%ADV2%r zJCPCo%{=z7;`F98(us5JnT(G@sKTZ^;2FVitXyLe-S5(hV&Ium+1pIUB(CZ#h|g)u zSLJJ<@HgrDiA-}V_6B^x1>c9B6%~847JkQ!^KLZ2skm;q*edo;UA)~?SghG8;QbHh z_6M;ouo_1rq9=x$<`Y@EA{C%6-pEV}B(1#sDoe_e1s3^Y>n#1Sw;N|}8D|s|VPd+g z-_$QhCz`vLxxrVMx3ape1xu3*wjx=yKSlM~nFgkNWb4?DDr*!?U)L_VeffF<+!j|b zZ$Wn2$TDv3C3V@BHpSgv3JUif8%hk%OsGZ=OxH@8&4`bbf$`aAMchl^qN>Eyu3JH} z9-S!x8-s4fE=lad%Pkp8hAs~u?|uRnL48O|;*DEU! zuS0{cpk%1E0nc__2%;apFsTm0bKtd&A0~S3Cj^?72-*Owk3V!ZG*PswDfS~}2<8le z5+W^`Y(&R)yVF*tU_s!XMcJS`;(Tr`J0%>p=Z&InR%D3@KEzzI+-2)HK zuoNZ&o=wUC&+*?ofPb0a(E6(<2Amd6%uSu_^-<1?hsxs~0K5^f(LsGqgEF^+0_H=uNk9S0bb!|O8d?m5gQjUKevPaO+*VfSn^2892K~%crWM8+6 z25@V?Y@J<9w%@NXh-2!}SK_(X)O4AM1-WTg>sj1{lj5@=q&dxE^9xng1_z9w9DK>| z6Iybcd0e zyi;Ew!KBRIfGPGytQ6}z}MeXCfLY0?9%RiyagSp_D1?N&c{ zyo>VbJ4Gy`@Fv+5cKgUgs~na$>BV{*em7PU3%lloy_aEovR+J7TfQKh8BJXyL6|P8un-Jnq(ghd!_HEOh$zlv2$~y3krgeH;9zC}V3f`uDtW(%mT#944DQa~^8ZI+zAUu4U(j0YcDfKR$bK#gvn_{JZ>|gZ5+)u?T$w7Q%F^;!Wk?G z(le7r!ufT*cxS}PR6hIVtXa)i`d$-_1KkyBU>qmgz-=T};uxx&sKgv48akIWQ89F{ z0XiY?WM^~;|T8zBOr zs#zuOONzH?svv*jokd5SK8wG>+yMC)LYL|vLqm^PMHcT=`}V$=nIRHe2?h)8WQa6O zPAU}d`1y(>kZiP~Gr=mtJLMu`i<2CspL|q2DqAgAD^7*$xzM`PU4^ga`ilE134XBQ z99P(LhHU@7qvl9Yzg$M`+dlS=x^(m-_3t|h>S}E0bcFMn=C|KamQ)=w2^e)35p`zY zRV8X?d;s^>Cof2SPR&nP3E+-LCkS0J$H!eh8~k0qo$}00b=7!H_I2O+Ro@3O$nPdm ztmbOO^B+IHzQ5w>@@@J4cKw5&^_w6s!s=H%&byAbUtczPQ7}wfTqxxtQNfn*u73Qw zGuWsrky_ajPx-5`R<)6xHf>C(oqGf_Fw|-U*GfS?xLML$kv;h_pZ@Kk$y0X(S+K80 z6^|z)*`5VUkawg}=z`S;VhZhxyDfrE0$(PMurAxl~<>lfZa>JZ288ULK7D` zl9|#L^JL}Y$j*j`0-K6kH#?bRmg#5L3iB4Z)%iF@SqT+Lp|{i`m%R-|ZE94Np7Pa5 zCqC^V3}B(FR340pmF*qaa}M}+h6}mqE~7Sh!9bDv9YRT|>vBNAqv09zXHMlcuhKD| zcjjA(b*XCIwJ33?CB!+;{)vX@9xns_b-VO{i0y?}{!sdXj1GM8+$#v>W7nw;+O_9B z_{4L;C6ol?(?W0<6taGEn1^uG=?Q3i29sE`RfYCaV$3DKc_;?HsL?D_fSYg}SuO5U zOB_f4^vZ_x%o`5|C@9C5+o=mFy@au{s)sKw!UgC&L35aH(sgDxRE2De%(%OT=VUdN ziVLEmdOvJ&5*tCMKRyXctCwQu_RH%;m*$YK&m;jtbdH#Ak~13T1^f89tn`A%QEHWs~jnY~E}p_Z$XC z=?YXLCkzVSK+Id`xZYTegb@W8_baLt-Fq`Tv|=)JPbFsKRm)4UW;yT+J`<)%#ue9DPOkje)YF2fsCilK9MIIK>p*`fkoD5nGfmLwt)!KOT+> zOFq*VZktDDyM3P5UOg`~XL#cbzC}eL%qMB=Q5$d89MKuN#$6|4gx_Jt0Gfn8w&q}%lq4QU%6#jT*MRT% zrLz~C8FYKHawn-EQWN1B75O&quS+Z81(zN)G>~vN8VwC+e+y(`>HcxC{MrJ;H1Z4k zZWuv$w_F0-Ub%MVcpIc){4PGL^I7M{>;hS?;eH!;gmcOE66z3;Z1Phqo(t zVP(Hg6q#0gIKgsg7L7WE!{Y#1nI(45tx2{$34dDd#!Z0NIyrm)HOn5W#7;f4pQci# zDW!FI(g4e668kI9{2+mLwB+=#9bfqgX%!B34V-$wwSN(_cm*^{y0jQtv*4}eO^sOV z*9xoNvX)c9isB}Tgx&ZRjp3kwhTVK?r9;n!x>^XYT z@Q^7zp{rkIs{2mUSE^2!Gf6$6;j~&4=-0cSJJDizZp6LTe8b45;{AKM%v99}{{FfC zz709%u0mC=1KXTo(=TqmZQ;c?$M3z(!xah>aywrj40sc2y3rKFw4jCq+Y+u=CH@_V zxz|qeTwa>+<|H%8Dz5u>ZI5MmjTFwXS-Fv!TDd*`>3{krWoNVx$<133`(ftS?ZPyY z&4@ah^3^i`vL$BZa>O|Nt?ucewzsF)0zX3qmM^|waXr=T0pfIb0*$AwU=?Ipl|1Y; z*Pk6{C-p4MY;j@IJ|DW>QHZQJcp;Z~?8(Q+Kk3^0qJ}SCk^*n4W zu9ZFwLHUx-$6xvaQ)SUQcYd6fF8&x)V`1bIuX@>{mE$b|Yd(qomn3;bPwnDUc0F=; zh*6_((%bqAYQWQ~odER?h>1mkL4kpb3s7`0m@rDKGU*oyF)$j~Ffd4fXV$?`f~rHf zB%Y)@5SXZvfwm10RY5X?TEo)PK_`L6qgBp=#>fO49$D zDq8Ozj0q6213tV5Qq=;fZ0$|KroY{Dz=l@lU^J)?Ko@ti20TRplXzphBi>XGx4bou zEWrkNjz0t5j!_ke{g5I#PUlEU$Km8g8TE|XK=MkU@PT4T><2OVamoK;wJ}3X0L$vX zgd7gNa359*nc)R-0!`2X@FOTB`+oETOPc=ubp5R)VQgY+5BTZZJ2?9QwnO=dnulIUF3gFn;BODC2)65)HeVd%t86sL7Rv^Y+nbn+&l z6BAJY(ETvwI)Ts$aiE8rht4KD*qNyE{8{x6R|%akbTBzw;2+6Echkt+W+`u^XX z_z&x%n '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/nnd-message-processor/gradlew.bat b/nnd-message-processor/gradlew.bat new file mode 100644 index 0000000..7101f8e --- /dev/null +++ b/nnd-message-processor/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/NndMessageProcessorApplication.java b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/NndMessageProcessorApplication.java new file mode 100644 index 0000000..fa50894 --- /dev/null +++ b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/NndMessageProcessorApplication.java @@ -0,0 +1,15 @@ +package gov.cdc.nndmessageprocessor; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; + +@SpringBootApplication +@EnableScheduling +public class NndMessageProcessorApplication { + + public static void main(String[] args) { + SpringApplication.run(NndMessageProcessorApplication.class, args); + } + +} diff --git a/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/configuration/DataSourceConfig.java b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/configuration/DataSourceConfig.java new file mode 100644 index 0000000..6c3e9cc --- /dev/null +++ b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/configuration/DataSourceConfig.java @@ -0,0 +1,71 @@ +package gov.cdc.nndmessageprocessor.configuration; + +import jakarta.persistence.EntityManagerFactory; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import javax.sql.DataSource; +import java.util.HashMap; +@Configuration +@EnableTransactionManagement +@EnableJpaRepositories( + entityManagerFactoryRef = "nndEntityManagerFactory", + transactionManagerRef = "nndTransactionManager", + basePackages = "gov.cdc.nndmessageprocessor.repository" +) +public class DataSourceConfig { + + @Value("${spring.datasource.driverClassName}") + private String driverClassName; + + @Value("${spring.datasource.nnd.url}") + private String dbUrl; + + @Value("${spring.datasource.username}") + private String dbUserName; + + @Value("${spring.datasource.password}") + private String dbUserPassword; + + @Bean(name = "nndDataSource") + public DataSource nndDataSource() { + return DataSourceBuilder.create() + .driverClassName(driverClassName) + .url(dbUrl) + .username(dbUserName) + .password(dbUserPassword) + .build(); + } + + @Bean(name = "nndEntityManagerFactoryBuilder") + public EntityManagerFactoryBuilder nndEntityManagerFactoryBuilder() { + return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(), new HashMap<>(), null); + } + + @Bean(name = "nndEntityManagerFactory") + public LocalContainerEntityManagerFactoryBean nndEntityManagerFactory( + @Qualifier("nndEntityManagerFactoryBuilder") EntityManagerFactoryBuilder nndEntityManagerFactoryBuilder, + @Qualifier("nndDataSource") DataSource nndDataSource) { + return nndEntityManagerFactoryBuilder + .dataSource(nndDataSource) + .packages("gov.cdc.nndmessageprocessor.repository") + .persistenceUnit("nnd") + .build(); + } + + @Bean(name = "nndTransactionManager") + public PlatformTransactionManager nndTransactionManager( + @Qualifier("nndEntityManagerFactory") EntityManagerFactory nndEntityManagerFactory) { + return new JpaTransactionManager(nndEntityManagerFactory); + } +} \ No newline at end of file diff --git a/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/exception/DataProcessorException.java b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/exception/DataProcessorException.java new file mode 100644 index 0000000..4606f05 --- /dev/null +++ b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/exception/DataProcessorException.java @@ -0,0 +1,7 @@ +package gov.cdc.nndmessageprocessor.exception; + +public class DataProcessorException extends Exception{ + public DataProcessorException(String message) { + super(message); + } +} diff --git a/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/repository/NetssTransportQOutRepository.java b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/repository/NetssTransportQOutRepository.java new file mode 100644 index 0000000..6a465a0 --- /dev/null +++ b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/repository/NetssTransportQOutRepository.java @@ -0,0 +1,60 @@ +package gov.cdc.nndmessageprocessor.repository; + +import gov.cdc.nndmessageprocessor.repository.model.NETSSTransportQOut; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + + +@Repository +public interface NetssTransportQOutRepository extends JpaRepository { + + String SELECT_NETSS_CASE_DATA_COLLECTION = "SELECT " + + "nt.NETSS_TransportQ_out_uid, " + + "nt.record_type_cd , " + + "nt.mmwr_year, " + + "nt.mmwr_week , " + + "nt.netss_case_id, " + + "nt.phc_local_id , " + + "nt.notification_local_id, " + + "nt.add_time, " + + "nt.payload, " + + "nt.record_status_cd " + + "FROM (SELECT " + + "NETSS_TransportQ_out_uid, " + + "record_type_cd, " + + "mmwr_year, " + + "mmwr_week, " + + "netss_case_id, " + + "phc_local_id, " + + "notification_local_id, " + + "add_time, " + + "payload, " + + "record_status_cd, " + + "ROW_NUMBER() OVER (PARTITION BY netss_case_id ORDER BY add_time DESC) AS rn " + + "FROM NETSS_TransportQ_out) nt "; + + String WHERE_CLAUSE_YTD_AND_PRIOR_YEAR = "WHERE nt.rn = 1 " + + "AND ((nt.mmwr_year = :currentYear AND nt.mmwr_week <= :currentWeek) OR (nt.mmwr_year = :priorYear)) " + + "AND nt.record_status_cd != 'LOG_DEL' " + + "ORDER BY nt.mmwr_year, nt.mmwr_week"; + + String WHERE_CLAUSE_YTD = "WHERE nt.rn = 1 " + + "AND nt.mmwr_year = :currentYear " + + "AND nt.mmwr_week <= :currentWeek " + + "AND nt.record_status_cd != 'LOG_DEL' " + + "ORDER BY nt.mmwr_year, nt.mmwr_week"; + + @Query(value = SELECT_NETSS_CASE_DATA_COLLECTION + WHERE_CLAUSE_YTD_AND_PRIOR_YEAR, nativeQuery = true) + Optional> findNetssCaseDataYtdAndPriorYear(@Param("currentYear") int currentYear, + @Param("currentWeek") int currentWeek, + @Param("priorYear") int priorYear); + + @Query(value = SELECT_NETSS_CASE_DATA_COLLECTION + WHERE_CLAUSE_YTD, nativeQuery = true) + Optional> findNetssCaseDataYtd(@Param("currentYear") int currentYear, + @Param("currentWeek") int currentWeek); +} \ No newline at end of file diff --git a/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/repository/model/NETSSTransportQOut.java b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/repository/model/NETSSTransportQOut.java new file mode 100644 index 0000000..21e3435 --- /dev/null +++ b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/repository/model/NETSSTransportQOut.java @@ -0,0 +1,70 @@ +package gov.cdc.nndmessageprocessor.repository.model; + + +import gov.cdc.nndmessageprocessor.service.model.dto.NETSSTransportQOutDto; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.Data; + +import java.sql.Timestamp; + +@Entity +@Table(name = "NETSS_TransportQ_out") +@Data +public class NETSSTransportQOut { + + @Id + @Column(name = "NETSS_TransportQ_out_uid", nullable = false) + private Long netssTransportQOutUid; + + @Column(name = "record_type_cd", nullable = false) + private String recordTypeCd; + + @Column(name = "mmwr_year", nullable = false) + private Integer mmwrYear; + + @Column(name = "mmwr_week", nullable = false) + private Integer mmwrWeek; + + @Column(name = "netss_case_id", nullable = false) + private String netssCaseId; + + @Column(name = "phc_local_id", nullable = false) + private String phcLocalId; + + @Column(name = "notification_local_id", nullable = false) + private String notificationLocalId; + + @Column(name = "add_time") + private Timestamp addTime; + + @Column(name = "payload", nullable = false) + private String payload; + + @Column(name = "record_status_cd") + private String recordStatusCd; + + public NETSSTransportQOut(NETSSTransportQOutDto dto) { + this.netssTransportQOutUid = dto.getNetssTransportQOutUid(); + this.recordTypeCd = dto.getRecordTypeCd(); + this.mmwrYear = dto.getMmwrYear(); + this.mmwrWeek = dto.getMmwrWeek(); + this.netssCaseId = dto.getNetssCaseId(); + this.phcLocalId = dto.getPhcLocalId(); + this.notificationLocalId = dto.getNotificationLocalId(); + this.addTime = dto.getAddTime(); + this.payload = dto.getPayload(); + this.recordStatusCd = dto.getRecordStatusCd(); + } + + public NETSSTransportQOut() { + // Default constructor + } + + // For Unit Test + public NETSSTransportQOut(String payload ) { + this.payload = payload; + } +} \ No newline at end of file diff --git a/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/MessageProcessingService.java b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/MessageProcessingService.java new file mode 100644 index 0000000..7d661c5 --- /dev/null +++ b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/MessageProcessingService.java @@ -0,0 +1,201 @@ +package gov.cdc.nndmessageprocessor.service; + +import gov.cdc.nndmessageprocessor.exception.DataProcessorException; +import gov.cdc.nndmessageprocessor.service.interfaces.INetssCaseService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.ZoneId; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +@Service +public class MessageProcessingService { + private static Logger logger = LoggerFactory.getLogger(MessageProcessingService.class); + + private final INetssCaseService netssCaseService; + @Value("${scheduler.cron}") + private String cron; + + @Value("${scheduler.zone:#{null}}") + private String zone; + + + @Value("${functional.date}") + private String date; + + + @Value("${functional.prior}") + private boolean prior; + + private final String KEY_WEEK = "WEEK"; + private final String KEY_YEAR = "YEAR"; + public MessageProcessingService(INetssCaseService netssCaseService) { + this.netssCaseService = netssCaseService; + } + + @Scheduled(cron = "${scheduler.cron}", zone = "${scheduler.zone:#{T(java.util.TimeZone).getDefault().getID()}}") + public void scheduleDataFetch() throws DataProcessorException { + if (zone == null || zone.isEmpty()) { + zone = ZoneId.systemDefault().getId(); + } + logger.info("CRON STARTED"); + logger.info("Cron expression: {}", cron); + logger.info("Time zone: {}", zone); + + var dateData = processDateInput(date); + // 2023 and 52 + if (!dateData.isEmpty()) { + netssCaseService.getNetssCases(dateData.get(KEY_YEAR), dateData.get(KEY_WEEK), prior); + } + } + + protected Map processDateInput(String date) throws DataProcessorException { + Date specifiedEndingDate = null; + try { + SimpleDateFormat formatter = new SimpleDateFormat("MM/dd/yyyy"); + specifiedEndingDate = formatter.parse(date); + return getMMWRAndPriorYear(specifiedEndingDate); + } catch (Exception e) { + throw new DataProcessorException(e.getMessage()); + } + } + + protected Map getMMWRAndPriorYear(Date specifiedDate) { + Map returnMap = new HashMap<>(); + + Calendar cal = Calendar.getInstance(); + if (specifiedDate != null) { + cal.setTime(specifiedDate); + } + + // Backup to the previous Saturday + while (cal.get(Calendar.DAY_OF_WEEK) != Calendar.SATURDAY) { + cal.add(Calendar.DAY_OF_WEEK, -1); + } + + Date lastSaturday = cal.getTime(); + SimpleDateFormat dateFormatter = new SimpleDateFormat("MM/dd/yyyy"); + String dateLastSaturdayStr = dateFormatter.format(lastSaturday); + + // Get the MMWR week and year for the previous Saturday + logger.info("Date previous Saturday was {}", dateLastSaturdayStr); + int[] weekYear = calcMMWR(dateLastSaturdayStr); + if (weekYear != null && weekYear.length > 0) { + returnMap.put(KEY_WEEK, (short) weekYear[0]); + returnMap.put(KEY_YEAR, (short) weekYear[1]); + } + + logger.info("MMWR Week and Year are: {} {}", returnMap.get(KEY_WEEK), returnMap.get(KEY_YEAR)); + + // Find out if Saturday was after the cutoff + String cutoffDateStr = "05/31/" + dateLastSaturdayStr.substring(dateLastSaturdayStr.length() - 4); + + try { + Date cutoffDate = dateFormatter.parse(cutoffDateStr); + } catch (ParseException e) { + logger.info("Exception processing cutoff date", e); + } + + return returnMap; + } + + protected int[] calcMMWR(String pDate) { + int[] result = {0, 0}; + + try { + // Define constants + final int SECOND = 1000; + final int MINUTE = 60 * SECOND; + final int HOUR = 60 * MINUTE; + final int DAY = 24 * HOUR; + final int WEEK = 7 * DAY; + + // Convert to date object + Date varDate = new SimpleDateFormat("MM/dd/yyyy").parse(pDate); + Calendar cal = Calendar.getInstance(); + cal.setTime(varDate); + long varTime = cal.getTimeInMillis(); + + // Get January 1st of given year + Date varJan1Date = new SimpleDateFormat("MM/dd/yyyy").parse("01/01/" + cal.get(Calendar.YEAR)); + Calendar calJan1 = Calendar.getInstance(); + calJan1.setTime(varJan1Date); + int varJan1Day = calJan1.get(Calendar.DAY_OF_WEEK); + long varJan1Time = calJan1.getTimeInMillis(); + + long t = varJan1Time; + int y = calJan1.get(Calendar.YEAR); + int w = 0; + + if (varJan1Day < 5) { + t -= ((varJan1Day - 1) * DAY); + while (t < varTime) { + w++; + t += WEEK; + t = adjustForDaylightSavings(t); + } + if (w == 53) { + Date varNextJan1Date = new SimpleDateFormat("MM/dd/yyyy").parse("01/01/" + (cal.get(Calendar.YEAR) + 1)); + Calendar varNextJan1Cal = Calendar.getInstance(); + varNextJan1Cal.setTime(varNextJan1Date); + int varNextJan1Day = varNextJan1Cal.get(Calendar.DAY_OF_WEEK); + if (varNextJan1Day < 5) { + y++; + w = 1; + } + } + } else { + t += ((7 - (varJan1Day - 1)) * DAY); + while (t <= varTime) { + w++; + t += WEEK; + t = adjustForDaylightSavings(t); + } + if (w == 0) { + y = adjustYearForWeekZero(t, y); + } + } + result[0] = w; + result[1] = y; + } catch (Exception ex) { + logger.error("Exception occurred while calculating MMWR: ", ex); + } + + return result; + } + + protected long adjustForDaylightSavings(long t) { + Date d = new Date(t); + Calendar cal = Calendar.getInstance(); + cal.setTime(d); + int h = cal.get(Calendar.HOUR); + if (h == 1) { + t -= 60 * 60 * 1000; + } + if (h == 23 || h == 11) { + t += 60 * 60 * 1000; + } + return t; + } + + protected int adjustYearForWeekZero(long t, int y) { + Date d = new Date(t); + Calendar dCal = Calendar.getInstance(); + dCal.setTime(d); + if ((dCal.get(Calendar.MONTH) == 0) && (dCal.get(Calendar.DAY_OF_WEEK) <= 5)) { + y--; + int[] prevYearWeek = calcMMWR("12/31/" + y); + return prevYearWeek[0]; + } + return y; + } + +} diff --git a/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/NETSSTransportQOutService.java b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/NETSSTransportQOutService.java new file mode 100644 index 0000000..cc01abb --- /dev/null +++ b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/NETSSTransportQOutService.java @@ -0,0 +1,50 @@ +package gov.cdc.nndmessageprocessor.service; + +import gov.cdc.nndmessageprocessor.exception.DataProcessorException; +import gov.cdc.nndmessageprocessor.repository.NetssTransportQOutRepository; +import gov.cdc.nndmessageprocessor.service.interfaces.INETSSTransportQOutService; +import gov.cdc.nndmessageprocessor.service.model.dto.NETSSTransportQOutDto; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class NETSSTransportQOutService implements INETSSTransportQOutService { + private final NetssTransportQOutRepository netssTransportQOutRepository; + + public NETSSTransportQOutService(NetssTransportQOutRepository netssTransportQOutRepository) { + this.netssTransportQOutRepository = netssTransportQOutRepository; + } + + public List getNetssCaseDataYtdAndPriorYear(int currentYear, int currentWeek, int priorYear) throws DataProcessorException { + try { + List lst = new ArrayList<>(); + var res = netssTransportQOutRepository.findNetssCaseDataYtdAndPriorYear(currentYear, currentWeek, priorYear); + if (res.isPresent()) { + for(var item : res.get()) { + lst.add(new NETSSTransportQOutDto(item)); + } + } + return lst; + } catch (Exception e) { + throw new DataProcessorException(e.getMessage()); + } + + } + + public List getNetssCaseDataYtd(int currentYear, int currentWeek) throws DataProcessorException { + try { + List lst = new ArrayList<>(); + var res = netssTransportQOutRepository.findNetssCaseDataYtd(currentYear, currentWeek); + if (res.isPresent()) { + for(var item : res.get()) { + lst.add(new NETSSTransportQOutDto(item)); + } + } + return lst; + } catch (Exception e) { + throw new DataProcessorException(e.getMessage()); + } + } +} diff --git a/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/NetssCaseService.java b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/NetssCaseService.java new file mode 100644 index 0000000..b25a370 --- /dev/null +++ b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/NetssCaseService.java @@ -0,0 +1,137 @@ +package gov.cdc.nndmessageprocessor.service; + +import gov.cdc.nndmessageprocessor.exception.DataProcessorException; +import gov.cdc.nndmessageprocessor.service.interfaces.INETSSTransportQOutService; +import gov.cdc.nndmessageprocessor.service.interfaces.INetssCaseService; +import gov.cdc.nndmessageprocessor.service.model.dto.NETSSTransportQOutDto; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.*; +import java.util.stream.Collectors; + +@Service +public class NetssCaseService implements INetssCaseService { + private static Logger logger = LoggerFactory.getLogger(NetssCaseService.class); + + private final INETSSTransportQOutService netssTransportQOutService; + @Value("${io.fileLocation}") + private String fileLocation; + private static final String NETSSFileName = "STDNETSS.dat"; // output filename per requirements + + public NetssCaseService(INETSSTransportQOutService netssTransportQOutService) { + this.netssTransportQOutService = netssTransportQOutService; + } + + public void getNetssCases(Short mmwrYear, Short mmwrWeek, Boolean includePriorYear) throws DataProcessorException { + + if (mmwrYear > 2000) { + mmwrYear = (short) (mmwrYear - 2000); //Netss uses 2 digit mmwr year + } + + var coll = getNETSSTransportQOutDTCollectionForYear(mmwrYear, mmwrWeek, includePriorYear); + + if (coll.isEmpty()) { + throw new DataProcessorException("No Data Found"); + } + + var dedupedCollection = removeDupsFromNetssCollection(coll); + var written = processAndWriteNETSSOutputFile(mmwrYear, dedupedCollection); + + if (written) { + logger.info("OK"); + } else { + logger.info("FAILED"); + } + } + + + protected List removeDupsFromNetssCollection(List netssTransportQOutDtoList) { + HashMap netssMsgMap = new HashMap<>(); + for (NETSSTransportQOutDto netssTransportQOutDto : netssTransportQOutDtoList) { + String payload = netssTransportQOutDto.getPayload(); + if (payload != null && payload.length() >= 12) { + String caseReportId = payload.substring(6, 12); // CASE REPORT ID + netssMsgMap.put(caseReportId, netssTransportQOutDto); + } + } + return new ArrayList<>(netssMsgMap.values()); + } + + + protected List getNETSSTransportQOutDTCollectionForYear(Short mmwrYear, Short mmwrWeek, Boolean includePriorYear) throws DataProcessorException { + List coll = null; + if (includePriorYear) { + coll = netssTransportQOutService.getNetssCaseDataYtdAndPriorYear(mmwrYear, mmwrWeek, mmwrYear - 1); + } else { + coll = netssTransportQOutService.getNetssCaseDataYtd(mmwrYear, mmwrWeek); + } + return coll; + } + + + protected boolean processAndWriteNETSSOutputFile(Short mmwrYear, List coll) { + File dirToWriteTo = new File(fileLocation); + if (!dirToWriteTo.exists() && !dirToWriteTo.mkdirs()) { + System.out.println("Failed to create directory: " + fileLocation); + return false; + } + + if (!dirToWriteTo.isDirectory()) { + System.out.println(fileLocation + " is not a directory."); + return false; + } + + File netssFile = new File(dirToWriteTo, NETSSFileName); + return writeNETSSOutputFile(netssFile, coll, mmwrYear); + } + + protected boolean writeNETSSOutputFile(File netssFile, List coll, Short mmwrYear) { + int totalRecordsWritten = 0; + int verificationRecordsWritten = 0; + Map countersMap = new HashMap<>(); + String formattedCount; + String blanks44 = " "; + String stateCCD = null; + + try (PrintWriter netssWriter = new PrintWriter(new FileWriter(netssFile, false))) { // overwrite existing + if (mmwrYear > 2000) { + mmwrYear = (short) (mmwrYear - 2000); + } + + for (NETSSTransportQOutDto netssTransportQOutDT : coll) { + String thisConditionCd = netssTransportQOutDT.getEvent(); + if (thisConditionCd != null) { + if (stateCCD == null) { + stateCCD = netssTransportQOutDT.getPayload().substring(2, 4); + } + netssWriter.println(netssTransportQOutDT.getPayload()); + totalRecordsWritten++; + + countersMap.merge(thisConditionCd, 1, Integer::sum); + } + } + + for (Map.Entry entry : countersMap.entrySet()) { + formattedCount = String.format("%05d", entry.getValue()); + netssWriter.println("V" + stateCCD + entry.getKey() + formattedCount + mmwrYear + blanks44); + verificationRecordsWritten++; + } + + } catch (IOException e) { + return false; + } + + if (totalRecordsWritten > 0) { + return true; + } else { + return false; + } + } +} diff --git a/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/interfaces/INETSSTransportQOutService.java b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/interfaces/INETSSTransportQOutService.java new file mode 100644 index 0000000..1aa02db --- /dev/null +++ b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/interfaces/INETSSTransportQOutService.java @@ -0,0 +1,11 @@ +package gov.cdc.nndmessageprocessor.service.interfaces; + +import gov.cdc.nndmessageprocessor.exception.DataProcessorException; +import gov.cdc.nndmessageprocessor.service.model.dto.NETSSTransportQOutDto; + +import java.util.List; + +public interface INETSSTransportQOutService { + List getNetssCaseDataYtdAndPriorYear(int currentYear, int currentWeek, int priorYear) throws DataProcessorException; + List getNetssCaseDataYtd(int currentYear, int currentWeek) throws DataProcessorException; +} diff --git a/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/interfaces/INetssCaseService.java b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/interfaces/INetssCaseService.java new file mode 100644 index 0000000..c56f660 --- /dev/null +++ b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/interfaces/INetssCaseService.java @@ -0,0 +1,7 @@ +package gov.cdc.nndmessageprocessor.service.interfaces; + +import gov.cdc.nndmessageprocessor.exception.DataProcessorException; + +public interface INetssCaseService { + void getNetssCases(Short mmwrYear, Short mmwrWeek, Boolean includePriorYear) throws DataProcessorException; +} diff --git a/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/model/dto/NETSSTransportQOutDto.java b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/model/dto/NETSSTransportQOutDto.java new file mode 100644 index 0000000..47c7db3 --- /dev/null +++ b/nnd-message-processor/src/main/java/gov/cdc/nndmessageprocessor/service/model/dto/NETSSTransportQOutDto.java @@ -0,0 +1,58 @@ +package gov.cdc.nndmessageprocessor.service.model.dto; + + +import gov.cdc.nndmessageprocessor.repository.model.NETSSTransportQOut; +import lombok.Getter; +import lombok.Setter; + +import java.sql.Timestamp; + +@Getter +@Setter +public class NETSSTransportQOutDto { + + private Long netssTransportQOutUid; + private String recordTypeCd; + private Integer mmwrYear; + private Integer mmwrWeek; + private String netssCaseId; + private String phcLocalId; + private String notificationLocalId; + private Timestamp addTime; + private String payload; + private String recordStatusCd; + + private boolean itNew; + private boolean itDelete; + private boolean itDirty; + + // Constructor to convert domain model to DTO + + // For Unit Testing + public NETSSTransportQOutDto( String payload) { + this.payload = payload; + } + public NETSSTransportQOutDto(NETSSTransportQOut netssTransportQOut) { + this.netssTransportQOutUid = netssTransportQOut.getNetssTransportQOutUid(); + this.recordTypeCd = netssTransportQOut.getRecordTypeCd(); + this.mmwrYear = netssTransportQOut.getMmwrYear(); + this.mmwrWeek = netssTransportQOut.getMmwrWeek(); + this.netssCaseId = netssTransportQOut.getNetssCaseId(); + this.phcLocalId = netssTransportQOut.getPhcLocalId(); + this.notificationLocalId = netssTransportQOut.getNotificationLocalId(); + this.addTime = netssTransportQOut.getAddTime(); + this.payload = netssTransportQOut.getPayload(); + this.recordStatusCd = netssTransportQOut.getRecordStatusCd(); + } + + public String getEvent() { + String thisPayload = getPayload(); + String conditionStr = ""; + if (thisPayload.startsWith("M")) { + conditionStr = payload.substring(17, 22); + return conditionStr; + + } + return null; + } +} diff --git a/nnd-message-processor/src/main/resources/application.yaml b/nnd-message-processor/src/main/resources/application.yaml new file mode 100644 index 0000000..10f6ed1 --- /dev/null +++ b/nnd-message-processor/src/main/resources/application.yaml @@ -0,0 +1,42 @@ +server: + port: 8083 + +functional: + date: ${NND_DATE} + prior: ${NND_PRIOR} + +io: + fileLocation: ${NND_FILE_LOCATION} + +spring: + application: + name: nnd-message-processor + +scheduler: + zone: ${NBS_NND_CRON_TIME_ZONE:} + # America/New_York + # UTC + cron: ${NBS_NND_CRON} + # "0 */5 0-2 * * *" + # every 5 min from 12 am to 3 am + # 0 * 0-2 * * * + # 0 (start at zero sec), * (run every min), 0-2 (run during 12 am to 3 am), * (run every day), * (run every month), * (run every year) + +--- +spring: + config: + activate: + on-profile: default + datasource: + hikari: + connection-timeout: 60000 + maximum-pool-size: 10 + driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver + username: ${OP_DBUSER} + password: ${OP_DBPASSWORD} + nnd: + url: jdbc:sqlserver://${OP_DBSERVER};databaseName=MSGOUTE;encrypt=true;trustServerCertificate=true; + jpa: + show-sql: true + hibernate: + ddl-auto: none diff --git a/nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/MessageProcessingServiceTest.java b/nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/MessageProcessingServiceTest.java new file mode 100644 index 0000000..16b2ea8 --- /dev/null +++ b/nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/MessageProcessingServiceTest.java @@ -0,0 +1,181 @@ +package gov.cdc.nndmessageprocessor.service; + + +import gov.cdc.nndmessageprocessor.exception.DataProcessorException; +import gov.cdc.nndmessageprocessor.service.interfaces.INetssCaseService; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.test.util.ReflectionTestUtils; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.*; + +public class MessageProcessingServiceTest { + + @Mock + private INetssCaseService netssCaseService; + + @InjectMocks + private MessageProcessingService messageProcessingService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + ReflectionTestUtils.setField(messageProcessingService, "cron", "0 0/5 * * * ?"); + ReflectionTestUtils.setField(messageProcessingService, "zone", "UTC"); + ReflectionTestUtils.setField(messageProcessingService, "date", "12/30/2023"); + ReflectionTestUtils.setField(messageProcessingService, "prior", true); + } + + @Test + void testScheduleDataFetch_Success() throws DataProcessorException { + messageProcessingService.scheduleDataFetch(); + verify(netssCaseService, times(1)).getNetssCases((short) 2023, (short) 52, true); + } + + @Test + void testProcessDateInput_Success() throws DataProcessorException { + Map dateData = messageProcessingService.processDateInput("12/30/2023"); + assertEquals((short) 52, dateData.get("WEEK")); + assertEquals((short) 2023, dateData.get("YEAR")); + } + + @Test + void testProcessDateInput_Exception() { + assertThrows(DataProcessorException.class, () -> { + messageProcessingService.processDateInput("invalid_date"); + }); + } + + @Test + void testGetMMWRAndPriorYear() { + Date specifiedDate = new Date(); + try { + specifiedDate = new SimpleDateFormat("MM/dd/yyyy").parse("12/30/2023"); + } catch (Exception e) { + // Ignore for testing + } + + Map result = ReflectionTestUtils.invokeMethod( + messageProcessingService, "getMMWRAndPriorYear", specifiedDate); + + assertEquals((short) 52, result.get("WEEK")); + assertEquals((short) 2023, result.get("YEAR")); + } + + @Test + void testCalcMMWR() { + int[] result = ReflectionTestUtils.invokeMethod( + messageProcessingService, "calcMMWR", "12/30/2023"); + + assertEquals(52, result[0]); + assertEquals(2023, result[1]); + } + + @Test + void testAdjustYearForWeekZero_StartOfNewYear() { + // Arrange + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.YEAR, 2023); + cal.set(Calendar.MONTH, Calendar.JANUARY); + cal.set(Calendar.DAY_OF_MONTH, 1); // New Year's Day + long t = cal.getTimeInMillis(); + int y = 2023; + + // Act + int result = messageProcessingService.adjustYearForWeekZero(t, y); + + // Assert + assertEquals(52, result, "Expected MMWR week should be the last week of the previous year."); + } + + @Test + void testAdjustYearForWeekZero_NotStartOfNewYear() { + // Arrange + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.YEAR, 2023); + cal.set(Calendar.MONTH, Calendar.FEBRUARY); + cal.set(Calendar.DAY_OF_MONTH, 1); // Not the start of the year + long t = cal.getTimeInMillis(); + int y = 2023; + + // Act + int result = messageProcessingService.adjustYearForWeekZero(t, y); + + // Assert + assertEquals(2023, result, "Expected year should remain unchanged."); + } + + @Test + void testAdjustYearForWeekZero_EdgeCase() { + // Arrange + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.YEAR, 2023); + cal.set(Calendar.MONTH, Calendar.JANUARY); + cal.set(Calendar.DAY_OF_MONTH, 5); // Edge case, within the first week + long t = cal.getTimeInMillis(); + int y = 2023; + + // Act + int result = messageProcessingService.adjustYearForWeekZero(t, y); + + // Assert + assertEquals(52, result, "Expected MMWR week should be the last week of the previous year."); + } + + @Test + void testCalcMMWR_Week53_TransitionToNewYear() throws Exception { + // Arrange + String pDate = "12/29/2018"; // This should fall in the 53rd week of 2018 + SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy"); + Date date = dateFormat.parse(pDate); + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + + // Act + int[] result = messageProcessingService.calcMMWR(pDate); + + // Assert + assertEquals(52, result[0], "Week should transition to 1"); + assertEquals(2018, result[1], "Year should transition to 2019"); + } + + @Test + void testCalcMMWR_WeekZero_AdjustToPreviousYear() throws Exception { + // Arrange + String pDate = "01/01/2019"; // This should adjust to the last week of 2018 + SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy"); + Date date = dateFormat.parse(pDate); + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + + // Act + int[] result = messageProcessingService.calcMMWR(pDate); + + // Assert + assertEquals(1, result[0], "Week should adjust to the last week of 2018"); + assertEquals(2019, result[1], "Year should adjust to 2018"); + } + + @Test + void testCalcMMWR_ExceptionHandling() { + // Arrange + String pDate = "invalid-date"; // This should trigger an exception + + // Act + int[] result = messageProcessingService.calcMMWR(pDate); + + // Assert + assertEquals(0, result[0], "Week should be 0 due to exception"); + assertEquals(0, result[1], "Year should be 0 due to exception"); + } +} diff --git a/nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/NETSSTransportQOutServiceTest.java b/nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/NETSSTransportQOutServiceTest.java new file mode 100644 index 0000000..b103d26 --- /dev/null +++ b/nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/NETSSTransportQOutServiceTest.java @@ -0,0 +1,139 @@ +package gov.cdc.nndmessageprocessor.service; + +import gov.cdc.nndmessageprocessor.exception.DataProcessorException; +import gov.cdc.nndmessageprocessor.repository.NetssTransportQOutRepository; +import gov.cdc.nndmessageprocessor.repository.model.NETSSTransportQOut; +import gov.cdc.nndmessageprocessor.service.model.dto.NETSSTransportQOutDto; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +public class NETSSTransportQOutServiceTest { + + @Mock + private NetssTransportQOutRepository netssTransportQOutRepository; + + @InjectMocks + private NETSSTransportQOutService netssTransportQOutService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + } + + @Test + void testGetNetssCaseDataYtdAndPriorYear_Success() throws DataProcessorException { + int currentYear = 2023; + int currentWeek = 52; + int priorYear = 2022; + + List mockNetssTransportQOutList = new ArrayList<>(); + mockNetssTransportQOutList.add(new NETSSTransportQOut("M012345678901234567890")); + mockNetssTransportQOutList.add(new NETSSTransportQOut("M112345678901234567891")); + + when(netssTransportQOutRepository.findNetssCaseDataYtdAndPriorYear(currentYear, currentWeek, priorYear)) + .thenReturn(Optional.of(mockNetssTransportQOutList)); + + List result = netssTransportQOutService.getNetssCaseDataYtdAndPriorYear(currentYear, currentWeek, priorYear); + + assertNotNull(result); + assertEquals(2, result.size()); + verify(netssTransportQOutRepository, times(1)) + .findNetssCaseDataYtdAndPriorYear(currentYear, currentWeek, priorYear); + } + + @Test + void testGetNetssCaseDataYtdAndPriorYear_Empty() throws DataProcessorException { + int currentYear = 2023; + int currentWeek = 52; + int priorYear = 2022; + + when(netssTransportQOutRepository.findNetssCaseDataYtdAndPriorYear(currentYear, currentWeek, priorYear)) + .thenReturn(Optional.empty()); + + List result = netssTransportQOutService.getNetssCaseDataYtdAndPriorYear(currentYear, currentWeek, priorYear); + + assertNotNull(result); + assertTrue(result.isEmpty()); + verify(netssTransportQOutRepository, times(1)) + .findNetssCaseDataYtdAndPriorYear(currentYear, currentWeek, priorYear); + } + + @Test + void testGetNetssCaseDataYtdAndPriorYear_Exception() { + int currentYear = 2023; + int currentWeek = 52; + int priorYear = 2022; + + when(netssTransportQOutRepository.findNetssCaseDataYtdAndPriorYear(currentYear, currentWeek, priorYear)) + .thenThrow(new RuntimeException("Database error")); + + DataProcessorException exception = assertThrows(DataProcessorException.class, () -> + netssTransportQOutService.getNetssCaseDataYtdAndPriorYear(currentYear, currentWeek, priorYear)); + + assertEquals("Database error", exception.getMessage()); + verify(netssTransportQOutRepository, times(1)) + .findNetssCaseDataYtdAndPriorYear(currentYear, currentWeek, priorYear); + } + + @Test + void testGetNetssCaseDataYtd_Success() throws DataProcessorException { + int currentYear = 2023; + int currentWeek = 52; + + List mockNetssTransportQOutList = new ArrayList<>(); + mockNetssTransportQOutList.add(new NETSSTransportQOut("M012345678901234567890")); + mockNetssTransportQOutList.add(new NETSSTransportQOut("M112345678901234567891")); + + when(netssTransportQOutRepository.findNetssCaseDataYtd(currentYear, currentWeek)) + .thenReturn(Optional.of(mockNetssTransportQOutList)); + + List result = netssTransportQOutService.getNetssCaseDataYtd(currentYear, currentWeek); + + assertNotNull(result); + assertEquals(2, result.size()); + verify(netssTransportQOutRepository, times(1)) + .findNetssCaseDataYtd(currentYear, currentWeek); + } + + @Test + void testGetNetssCaseDataYtd_Empty() throws DataProcessorException { + int currentYear = 2023; + int currentWeek = 52; + + when(netssTransportQOutRepository.findNetssCaseDataYtd(currentYear, currentWeek)) + .thenReturn(Optional.empty()); + + List result = netssTransportQOutService.getNetssCaseDataYtd(currentYear, currentWeek); + + assertNotNull(result); + assertTrue(result.isEmpty()); + verify(netssTransportQOutRepository, times(1)) + .findNetssCaseDataYtd(currentYear, currentWeek); + } + + @Test + void testGetNetssCaseDataYtd_Exception() { + int currentYear = 2023; + int currentWeek = 52; + + when(netssTransportQOutRepository.findNetssCaseDataYtd(currentYear, currentWeek)) + .thenThrow(new RuntimeException("Database error")); + + DataProcessorException exception = assertThrows(DataProcessorException.class, () -> + netssTransportQOutService.getNetssCaseDataYtd(currentYear, currentWeek)); + + assertEquals("Database error", exception.getMessage()); + verify(netssTransportQOutRepository, times(1)) + .findNetssCaseDataYtd(currentYear, currentWeek); + } +} diff --git a/nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/NetssCaseServiceTest.java b/nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/NetssCaseServiceTest.java new file mode 100644 index 0000000..da05f9d --- /dev/null +++ b/nnd-message-processor/src/test/java/gov/cdc/nndmessageprocessor/service/NetssCaseServiceTest.java @@ -0,0 +1,121 @@ +package gov.cdc.nndmessageprocessor.service; + +import gov.cdc.nndmessageprocessor.exception.DataProcessorException; +import gov.cdc.nndmessageprocessor.service.interfaces.INETSSTransportQOutService; +import gov.cdc.nndmessageprocessor.service.model.dto.NETSSTransportQOutDto; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.*; +import org.springframework.test.util.ReflectionTestUtils; + +import java.io.File; +import java.io.IOException; +import java.util.*; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +public class NetssCaseServiceTest { + + @Mock + private INETSSTransportQOutService netssTransportQOutService; + + @Spy + @InjectMocks + private NetssCaseService netssCaseService; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + ReflectionTestUtils.setField(netssCaseService, "fileLocation", System.getProperty("java.io.tmpdir")); + } + + @Test + void testGetNetssCases_Success() throws DataProcessorException { + Short mmwrYear = 2023; + Short mmwrWeek = 52; + Boolean includePriorYear = true; + + List mockCollection = Arrays.asList( + new NETSSTransportQOutDto("M012345678901234567890"), + new NETSSTransportQOutDto("M112345678901234567891") + ); + when(netssTransportQOutService.getNetssCaseDataYtdAndPriorYear((short) 23, mmwrWeek, (short) 22)).thenReturn(mockCollection); + + doReturn(true).when(netssCaseService).processAndWriteNETSSOutputFile(anyShort(), anyList()); + + netssCaseService.getNetssCases(mmwrYear, mmwrWeek, includePriorYear); + + verify(netssTransportQOutService, times(1)).getNetssCaseDataYtdAndPriorYear((short) 23, mmwrWeek, (short) 22); + + ArgumentCaptor listCaptor = ArgumentCaptor.forClass(List.class); + verify(netssCaseService, times(1)).processAndWriteNETSSOutputFile(eq((short) 23), listCaptor.capture()); + + List capturedList = listCaptor.getValue(); + assertEquals(1, capturedList.size()); + } + + @Test + void testGetNetssCases_NoDataFound() throws DataProcessorException { + Short mmwrYear = 2023; + Short mmwrWeek = 52; + Boolean includePriorYear = true; + + when(netssTransportQOutService.getNetssCaseDataYtdAndPriorYear((short) 23, mmwrWeek, (short) 22)).thenReturn(Collections.emptyList()); + + assertThrows(DataProcessorException.class, () -> netssCaseService.getNetssCases(mmwrYear, mmwrWeek, includePriorYear)); + + verify(netssTransportQOutService, times(1)).getNetssCaseDataYtdAndPriorYear((short) 23, mmwrWeek, (short) 22); + verify(netssCaseService, never()).processAndWriteNETSSOutputFile(anyShort(), anyList()); + } + + @Test + void testRemoveDupsFromNetssCollection() { + List mockCollection = Arrays.asList( + new NETSSTransportQOutDto("M012345678901234567890"), + new NETSSTransportQOutDto("M012345678901234567890"), + new NETSSTransportQOutDto("M112345678901234567891") + ); + + List result = netssCaseService.removeDupsFromNetssCollection(mockCollection); + + assertEquals(1, result.size()); + } + + @Test + void testProcessAndWriteNETSSOutputFile_Success() { + List mockCollection = Arrays.asList( + new NETSSTransportQOutDto("M012345678901234567890"), + new NETSSTransportQOutDto("M112345678901234567891") + ); + + boolean result = netssCaseService.processAndWriteNETSSOutputFile((short) 23, mockCollection); + + assertTrue(result); + } + + @Test + void testWriteNETSSOutputFile_Success() throws IOException { + List mockCollection = Arrays.asList( + new NETSSTransportQOutDto("M012345678901234567890"), + new NETSSTransportQOutDto("M112345678901234567891") + ); + + File mockFile = new File(System.getProperty("java.io.tmpdir"), "testfile.dat"); + + boolean result = netssCaseService.writeNETSSOutputFile(mockFile, mockCollection, (short) 23); + + assertTrue(result); + } + + @Test + void testWriteNETSSOutputFile_Failure() throws IOException { + List mockCollection = Collections.emptyList(); + + File mockFile = new File(System.getProperty("java.io.tmpdir"), "testfile.dat"); + + boolean result = netssCaseService.writeNETSSOutputFile(mockFile, mockCollection, (short) 23); + + assertFalse(result); + } +}