Fix the datasync Demographics Issue

src/main/java/com/iemr/mmu/repo/location/DistrictBlockMasterRepo.java

@@ -36,7 +36,7 @@ public interface DistrictBlockMasterRepo extends CrudRepository<DistrictBlock, I
 	@Query(" SELECT blockID, blockName FROM DistrictBlock WHERE districtID = :districtID AND deleted != true ")
 	public ArrayList<Object[]> getDistrictBlockMaster(@Param("districtID") Integer districtID);
 
-	@Query(value = " SELECT distinct StateID, StateName,WorkingDistrictID,WorkingDistrictName,blockid,blockname,villageid,villagename FROM db_iemr.v_userservicerolemapping WHERE UserID = :userId and UserServciceRoleDeleted is false",nativeQuery = true)
+	@Query(value = " SELECT distinct StateID, StateName,WorkingDistrictID,WorkingDistrictName,blockid,blockname,villageid,villagename FROM v_userservicerolemapping WHERE UserID = :userId and UserServciceRoleDeleted is false",nativeQuery = true)
 	public List<Object[]> getUserservicerolemapping(@Param("userId") Integer userId);
 
 }

src/main/java/com/iemr/mmu/service/dataSyncActivity/DataSyncRepository.java

@@ -88,7 +88,12 @@ public List<Map<String, Object>> getDataForGivenSchemaAndTable(String schema, St
 			}
 
 		}
-
+
+		logger.info("Select Query started:");
+		logger.info("Table Name: {}", table);
+
+		logger.info("Select Query: {}", baseQuery);
+
 		resultSetList = jdbcTemplate.queryForList(baseQuery);
 		return resultSetList;
 	}
@@ -98,14 +103,16 @@ public int updateProcessedFlagInVan(String schemaName, String tableName, StringB
 		jdbcTemplate = getJdbcTemplate();
 		String query = "";
 
+		logger.info("Updating processed flag in table: " + tableName + " for vanSerialNos: " + vanSerialNos);
+
 		if (tableName != null && tableName.toLowerCase().equals("i_ben_flow_outreach")) {
-    		query = "UPDATE " + schemaName + "." + tableName
-            	+ " SET created_date = ? , processed = 'P', SyncedDate = ?, Syncedby = ? "
-            	+ "WHERE " + autoIncreamentColumn + " IN (" + vanSerialNos + ")";
+			query = "UPDATE " + schemaName + "." + tableName
+					+ " SET created_date = ? , processed = 'P', SyncedDate = ?, Syncedby = ? "
+					+ "WHERE " + autoIncreamentColumn + " IN (" + vanSerialNos + ")";
 		} else {
-    		query = "UPDATE " + schemaName + "." + tableName
-            	+ " SET CreatedDate = ? , processed = 'P', SyncedDate = ?, Syncedby = ? "
-            	+ "WHERE " + autoIncreamentColumn + " IN (" + vanSerialNos + ")";
+			query = "UPDATE " + schemaName + "." + tableName
+					+ " SET CreatedDate = ? , processed = 'P', SyncedDate = ?, Syncedby = ? "
+					+ "WHERE " + autoIncreamentColumn + " IN (" + vanSerialNos + ")";
 		}
 
 		Timestamp syncedDate = new Timestamp(System.currentTimeMillis());

src/main/java/com/iemr/mmu/service/dataSyncActivity/UploadDataToServerImpl.java

@@ -115,7 +115,7 @@ public String getDataToSyncToServer(int vanID, String user, String Authorization
 	public String syncIntercepter(int vanID, String user, String Authorization, String token) throws Exception {
 
 		// sync activity trigger
-		
+
 		String serverAcknowledgement = startDataSync(vanID, user, Authorization, token);
 
 		return serverAcknowledgement;
@@ -226,7 +226,7 @@ private String startDataSync(int vanID, String user, String Authorization, Strin
 			Map<String, Object> response = new HashMap<>();
 			response.put("response", "Data sync failed");
 			response.put("groupsProgress", responseStatus);
-					objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(response);
+			objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(response);
 			return objectMapper.writerWithDefaultPrettyPrinter()
 					.writeValueAsString(Collections.singletonMap("data", response));
 		} else {
@@ -275,6 +275,7 @@ public List<SyncUtilityClass> getVanAndServerColumnList(Integer groupID) throws
 
 	private List<Map<String, Object>> getDataToSync(String schemaName, String tableName, String columnNames)
 			throws Exception {
+				logger.info("Fetching data to sync for schema: {}, table: {}, columns: {}", schemaName, tableName, columnNames);
 		List<Map<String, Object>> resultSetList = dataSyncRepository.getDataForGivenSchemaAndTable(schemaName,
 				tableName, columnNames);
 		if (resultSetList != null) {
@@ -316,11 +317,11 @@ private List<Map<String, Object>> getBatchOfAskedSizeDataToSync(List<Map<String,
 	 */
 
 	public String syncDataToServer(int vanID, String schemaName, String tableName, String vanAutoIncColumnName,
-			String serverColumns, List<Map<String, Object>> dataToBesync, String user, String Authorization, String token)
+			String serverColumns, List<Map<String, Object>> dataToBesync, String user, String Authorization,
+			String token)
 			throws Exception {
-		
+
 		RestTemplate restTemplate = new RestTemplate();
-
 
 		Integer facilityID = masterVanRepo.getFacilityID(vanID);
 
@@ -340,10 +341,10 @@ public String syncDataToServer(int vanID, String schemaName, String tableName, S
 			dataMap.put("facilityID", facilityID);
 
 		String requestOBJ = gson.toJson(dataMap);
-		HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization,"datasync");
+		HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization, "datasync");
 		ResponseEntity<String> response = restTemplate.exchange(dataSyncUploadUrl, HttpMethod.POST, request,
 				String.class);
-		
+
 		int i = 0;
 		if (response != null && response.hasBody()) {
 			JSONObject obj = new JSONObject(response.getBody());
@@ -392,4 +393,4 @@ public String getDataSyncGroupDetails() {
 			return null;
 	}
 
-}
+}

src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DataSyncRepositoryCentral.java

@@ -88,19 +88,33 @@ private boolean isValidTableName(String tableName) {
     }
 
     private boolean isValidColumnNamesList(String columnNames) {
-        if (columnNames == null || columnNames.trim().isEmpty()) {
-            return false;
-        }
-        for (String col : columnNames.split(",")) {
-            if (!isValidDatabaseIdentifierCharacter(col.trim())) {
-                return false;
+    if (columnNames == null || columnNames.trim().isEmpty()) {
+        return false;
+    }
+    logger.info("Validating column names: {}", columnNames);
+    for (String col : columnNames.split(",")) {
+        String trimmed = col.trim();
+
+        // Handle date_format(...) style
+        if (trimmed.toLowerCase().startsWith("date_format(")) {
+            int openParenIndex = trimmed.indexOf("(");
+            int commaIndex = trimmed.indexOf(",", openParenIndex);
+            if (commaIndex > 0) {
+                trimmed = trimmed.substring(openParenIndex + 1, commaIndex).trim();
             }
         }
-        return true;
+
+        if (!isValidDatabaseIdentifierCharacter(trimmed)) {
+            return false;
+        }
     }
+    return true;
+}
+
 
     public int checkRecordIsAlreadyPresentOrNot(String schemaName, String tableName, String vanSerialNo, String vanID,
             String vanAutoIncColumnName, int syncFacilityID) {
+
         jdbcTemplate = getJdbcTemplate();
         List<Object> params = new ArrayList<>();