Cnde 2274 2

nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/controller/DataExchangeController.java

@@ -156,7 +156,13 @@ public ResponseEntity<String> dataSync(@PathVariable String tableName, @RequestP
                                            @RequestHeader(name = "endRow", defaultValue = "0", required = false) String endRow,
                                            @RequestHeader(name = "initialLoad", defaultValue = "false", required = false) String initialLoadApplied,
                                            @RequestHeader(name = "allowNull", defaultValue = "false", required = false) String allowNull,
+                                           @RequestHeader(name = "version", defaultValue = "") String version,
+                                           @RequestHeader(name = "noPagination", defaultValue = "false") String noPagination,
                                            HttpServletRequest request) throws DataExchangeException {
+        if (version == null || version.isEmpty()) {
+            throw new DataExchangeException("Version is Missing");
+        }
+
         if (request != null) {
             String clientIp = getClientIp(request); // Retrieve client IP
             logger.info("Fetching Data for Data Availability, Table: {}, Client IP: {}", tableName, clientIp);
@@ -166,7 +172,7 @@ public ResponseEntity<String> dataSync(@PathVariable String tableName, @RequestP
 
         var ts = convertTimestampFromString(timestamp);
         var base64CompressedData = dataExchangeGenericService.getDataForDataSync(tableName, ts, startRow, endRow, Boolean.parseBoolean(initialLoadApplied),
-                Boolean.parseBoolean(allowNull));
+                Boolean.parseBoolean(allowNull), Boolean.parseBoolean(noPagination));
         return new ResponseEntity<>(base64CompressedData, HttpStatus.OK);
     }
 
@@ -204,7 +210,13 @@ public ResponseEntity<String> dataSync(@PathVariable String tableName, @RequestP
     @GetMapping(path = "/api/datasync/count/{tableName}")
     public ResponseEntity<Integer> dataSyncTotalRecords(@PathVariable String tableName,
                                                        @RequestParam String timestamp,
-                                           @RequestHeader(name = "initialLoad", defaultValue = "false", required = false) String initialLoadApplied) throws DataExchangeException {
+                                                        @RequestHeader(name = "initialLoad", defaultValue = "false", required = false) String initialLoadApplied,
+                                                        @RequestHeader(name = "version", defaultValue = "") String version
+                                                        ) throws DataExchangeException {
+        if (version == null || version.isEmpty()) {
+            throw new DataExchangeException("Version is Missing");
+        }
+
         logger.info("Fetching Data Count for Data Availability, Table {}", tableName);
         var ts = convertTimestampFromString(timestamp);
         var res = dataExchangeGenericService.getTotalRecord(tableName, Boolean.parseBoolean(initialLoadApplied), ts);

nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/DataExchangeGenericService.java

@@ -96,7 +96,7 @@ else if (sourceDb.equalsIgnoreCase("NBS_ODSE")) {
     }
 
     public String getDataForDataSync(String tableName, String timeStamp, String startRow, String endRow,
-                                     boolean initialLoad, boolean allowNull) throws DataExchangeException {
+                                     boolean initialLoad, boolean allowNull, boolean noPagination) throws DataExchangeException {
 
         DataSyncConfig dataConfig = getConfigByTableName(tableName);
 
@@ -110,7 +110,7 @@ public String getDataForDataSync(String tableName, String timeStamp, String star
 
         try {
             Callable<String> callable = () -> {
-                String baseQuery = preparePaginationQuery(dataConfig, timeStamp, startRow, endRow, initialLoad, allowNull);
+                String baseQuery = preparePaginationQuery(dataConfig, timeStamp, startRow, endRow, initialLoad, allowNull, noPagination);
 
                 List<Map<String, Object>> data = executeQueryForData(baseQuery, dataConfig.getSourceDb());
 
@@ -132,13 +132,16 @@ public String getDataForDataSync(String tableName, String timeStamp, String star
     }
 
     private String preparePaginationQuery(DataSyncConfig dataConfig, String timeStamp, String startRow,
-                                          String endRow, boolean initialLoad, boolean allowNull) {
+                                          String endRow, boolean initialLoad, boolean allowNull, boolean noPagination) {
 
         String baseQuery;
 
         if (allowNull && dataConfig.getQueryWithNullTimeStamp() != null && !dataConfig.getQueryWithNullTimeStamp().isEmpty()) {
             baseQuery = dataConfig.getQueryWithNullTimeStamp().replaceAll(";", "") ; //NOSONAR
         }
+        else if (noPagination || dataConfig.getQueryWithPagination().isEmpty()) {
+            baseQuery = dataConfig.getQuery().replaceAll(";", "") ; //NOSONAR
+        }
         else
         {
             baseQuery = dataConfig.getQueryWithPagination()

nnd-data-exchange-service/src/main/java/gov/cdc/nnddataexchangeservice/service/interfaces/IDataExchangeGenericService.java

@@ -5,7 +5,7 @@
 public interface IDataExchangeGenericService {
     Integer getTotalRecord(String tableName, boolean initialLoad, String timestamp) throws DataExchangeException;
     String getDataForDataSync(String tableName, String timeStamp, String startRow, String endRow,
-                            boolean initialLoad, boolean allowNull) throws DataExchangeException;
+                            boolean initialLoad, boolean allowNull, boolean noPagination) throws DataExchangeException;
     String decodeAndDecompress(String base64EncodedData) throws DataExchangeException;
 
 }