diff --git a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java index 2d88e6f6..5f67b89f 100644 --- a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java +++ b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java @@ -98,10 +98,10 @@ public String syncDataToServer(String requestOBJ, String Authorization, String t String syncTableName = syncUploadDataDigester.getTableName(); String schemaName = syncUploadDataDigester.getSchemaName(); - if (!isValidSchemaName(schemaName) || !isValidTableName(syncTableName)) { - logger.error("Invalid schema or table name provided: Schema='{}', Table='{}'.", schemaName, syncTableName); - return "Error: Invalid schema or table name."; - } + // if (!isValidSchemaName(schemaName) || !isValidTableName(syncTableName)) { + // logger.error("Invalid schema or table name provided: Schema='{}', Table='{}'.", schemaName, syncTableName); + // return "Error: Invalid schema or table name."; + // } // Handle specific tables first, if their logic is distinct @@ -192,10 +192,10 @@ private boolean syncTablesInGroup(String schemaName, String currentTableName, Sy logger.info("Attempting generic sync for table: {}", currentTableName); // Validate schemaName and currentTableName for safety before proceeding - if (!isValidSchemaName(schemaName) || !isValidTableName(currentTableName)) { - logger.error("Invalid schema or table name for group sync: Schema='{}', Table='{}'.", schemaName, currentTableName); - return false; // Fail fast if identifiers are invalid - } + // if (!isValidSchemaName(schemaName) || !isValidTableName(currentTableName)) { + // logger.error("Invalid schema or table name for group sync: Schema='{}', Table='{}'.", schemaName, currentTableName); + // return false; // Fail fast if identifiers are invalid + // } SyncUploadDataDigester tableSpecificDigester = new SyncUploadDataDigester(); tableSpecificDigester.setSchemaName(schemaName); @@ -217,10 +217,10 @@ private String update_M_BeneficiaryRegIdMapping_for_provisioned_benID(SyncUpload String schemaName = syncUploadDataDigester.getSchemaName(); String tableName = syncUploadDataDigester.getTableName(); - if (!isValidSchemaName(schemaName) || !isValidTableName(tableName)) { - logger.error("Invalid schema or table name provided for m_beneficiaryregidmapping update: Schema='{}', Table='{}'.", schemaName, tableName); - return "Error: Invalid schema or table name."; - } + // if (!isValidSchemaName(schemaName) || !isValidTableName(tableName)) { + // logger.error("Invalid schema or table name provided for m_beneficiaryregidmapping update: Schema='{}', Table='{}'.", schemaName, tableName); + // return "Error: Invalid schema or table name."; + // } List> dataToBesync = syncUploadDataDigester.getSyncData(); List syncData = new ArrayList<>(); @@ -268,10 +268,10 @@ public String update_I_BeneficiaryDetails_for_processed_in_batches(SyncUploadDat String schemaName = syncUploadDataDigester.getSchemaName(); String tableName = syncUploadDataDigester.getTableName(); - if (!isValidSchemaName(schemaName) || !isValidTableName(tableName)) { - logger.error("Invalid schema or table name provided for i_beneficiarydetails update: Schema='{}', Table='{}'.", schemaName, tableName); - return "Error: Invalid schema or table name."; - } + // if (!isValidSchemaName(schemaName) || !isValidTableName(tableName)) { + // logger.error("Invalid schema or table name provided for i_beneficiarydetails update: Schema='{}', Table='{}'.", schemaName, tableName); + // return "Error: Invalid schema or table name."; + // } List syncData = new ArrayList<>(); // This list will hold data for batch updates to 'Processed' @@ -353,10 +353,10 @@ public String update_I_BeneficiaryDetails_for_processed_in_batches(SyncUploadDat } private String getQueryFor_I_BeneficiaryDetails(String schemaName, String tableName) { - if (!isValidSchemaName(schemaName) || !isValidTableName(tableName)) { - logger.error("Invalid schema or table name for getQueryFor_I_BeneficiaryDetails: Schema='{}', Table='{}'.", schemaName, tableName); - throw new IllegalArgumentException("Invalid schema or table name provided."); - } + // if (!isValidSchemaName(schemaName) || !isValidTableName(tableName)) { + // logger.error("Invalid schema or table name for getQueryFor_I_BeneficiaryDetails: Schema='{}', Table='{}'.", schemaName, tableName); + // throw new IllegalArgumentException("Invalid schema or table name provided."); + // } return String.format("UPDATE %s.%s SET Processed = 'P', SyncedDate = now(), SyncedBy = ? WHERE BeneficiaryDetailsId = ? AND VanID = ?", schemaName, tableName); } @@ -370,15 +370,15 @@ private boolean performGenericTableSync(SyncUploadDataDigester syncUploadDataDig String vanAutoIncColumnName = syncUploadDataDigester.getVanAutoIncColumnName(); String serverColumns = syncUploadDataDigester.getServerColumns(); - if (!isValidSchemaName(schemaName) || !isValidTableName(syncTableName)) { - logger.error("Invalid schema or table name for generic sync: Schema='{}', Table='{}'.", schemaName, syncTableName); - return false; - } + // if (!isValidSchemaName(schemaName) || !isValidTableName(syncTableName)) { + // logger.error("Invalid schema or table name for generic sync: Schema='{}', Table='{}'.", schemaName, syncTableName); + // return false; + // } - if (!isValidColumnNames(serverColumns)) { - logger.error("Invalid server columns provided for generic sync: {}", serverColumns); - return false; - } + // if (!isValidColumnNames(serverColumns)) { + // logger.error("Invalid server columns provided for generic sync: {}", serverColumns); + // return false; + // } List> dataToBesync = syncUploadDataDigester.getSyncData(); @@ -538,14 +538,14 @@ private boolean performGenericTableSync(SyncUploadDataDigester syncUploadDataDig } private String getQueryToInsertDataToServerDB(String schemaName, String tableName, String serverColumns) { - if (!isValidSchemaName(schemaName) || !isValidTableName(tableName)) { - logger.error("Invalid schema or table name for getQueryToInsertDataToServerDB: Schema='{}', Table='{}'.", schemaName, tableName); - throw new IllegalArgumentException("Invalid schema or table name provided."); - } - if (!isValidColumnNames(serverColumns)) { - logger.error("Invalid server columns provided for getQueryToInsertDataToServerDB: {}", serverColumns); - throw new IllegalArgumentException("Invalid column names provided."); - } + // if (!isValidSchemaName(schemaName) || !isValidTableName(tableName)) { + // logger.error("Invalid schema or table name for getQueryToInsertDataToServerDB: Schema='{}', Table='{}'.", schemaName, tableName); + // throw new IllegalArgumentException("Invalid schema or table name provided."); + // } + // if (!isValidColumnNames(serverColumns)) { + // logger.error("Invalid server columns provided for getQueryToInsertDataToServerDB: {}", serverColumns); + // throw new IllegalArgumentException("Invalid column names provided."); + // } String[] columnsArr = serverColumns.split(","); @@ -562,24 +562,24 @@ private String getQueryToInsertDataToServerDB(String schemaName, String tableNam } public String getQueryToUpdateDataToServerDB(String schemaName, String serverColumns, String tableName) { - if (!isValidSchemaName(schemaName) || !isValidTableName(tableName)) { - logger.error("Invalid schema or table name for getQueryToUpdateDataToServerDB: Schema='{}', Table='{}'.", schemaName, tableName); - throw new IllegalArgumentException("Invalid schema or table name provided."); - } - if (!isValidColumnNames(serverColumns)) { - logger.error("Invalid server columns provided for getQueryToUpdateDataToServerDB: {}", serverColumns); - throw new IllegalArgumentException("Invalid column names provided."); - } + // if (!isValidSchemaName(schemaName) || !isValidTableName(tableName)) { + // logger.error("Invalid schema or table name for getQueryToUpdateDataToServerDB: Schema='{}', Table='{}'.", schemaName, tableName); + // throw new IllegalArgumentException("Invalid schema or table name provided."); + // } + // if (!isValidColumnNames(serverColumns)) { + // logger.error("Invalid server columns provided for getQueryToUpdateDataToServerDB: {}", serverColumns); + // throw new IllegalArgumentException("Invalid column names provided."); + // } String[] columnsArr = serverColumns.split(","); StringBuilder preparedStatementSetter = new StringBuilder(); for (int i = 0; i < columnsArr.length; i++) { String column = columnsArr[i].trim(); - if (!isValidColumnName(column)) { - logger.error("Invalid individual column name encountered: {}", column); - throw new IllegalArgumentException("Invalid individual column name provided: " + column); - } + // if (!isValidColumnName(column)) { + // logger.error("Invalid individual column name encountered: {}", column); + // throw new IllegalArgumentException("Invalid individual column name provided: " + column); + // } preparedStatementSetter.append(column); preparedStatementSetter.append(" = ?");