Fix the DataSync with SyncFailureReason (#121)

* Fix the issue in retrieving the Casesheet Print Data for Cancer Screening (#96)

* fix: change the return type to object to get the details

* fix: remove commented lines

* fix: add the column for NumberperWeek to store and fetch the data (#94)

* Update version in pom.xml to 3.4.0

* chore: add Lombok @DaTa to BenClinicalObservations (#97)

* fix: add file path in cancer gynecological examination (#98)

* Fix the data sync issue  (#93)

* fix: Data Sync batch processing for large data

* fix: use parameterized query

* fix: revert the updated query

* fix: add token if it is missing while calling restTemplate

* fix: update the properties

* fix: sync group wise

* fix: enable logger in pom.xml

* fix: coderabbit comments

* fix: remove logger and replace the license

* fix: remove the logs

* fix: resolve code scanning alert

* fix: resolve code scanning alert

* fix: resolve code scanning alert

* fix: resolve code scanning alert

* fix: add comment for code violation

* fix: use syncuploaddataDigester class to load the deatils

* fix: add syncuploaddigestor in implementation file too

* fix: sonarcube comments

* fix: add functionality to save the file ID's uploaded from doctor screen (#99)

* story: amm-1668 task - 1754

* story: amm-1754 updated response including father name and phone no of the beneficiary (#102)

* fix: amm-1754 changing the query to get the expected response similar to hwc

* fix: amm-1754 compilation error fix

* fix: amm-1754 argument issue fix

* fix: amm-1754 argument issue fix

* fix: amm-1754 argument issue fix

* Save the files uploaded from Doctor Screen (#100)

* fix: add file path in cancer gynecological examination

* fix: save the files uploaded from the doctor portal

* fix: get file names in the response of gynecological examination

* fix: cherry-pick the commits from develop

* fix: cherry-pick commits from develop

* Fix the Download Masters issue (#103)

* fix: resolve the conflicts

* fix: fix the issue in download masters table

* fix: remove the validation (#105)

* fix: replace the old working code (#106)

* Fix the datasync upload issue (#107)

* fix: add the schemas

* fix: remove logger

* fix: revert the old code for repository

* Fixing the datasync from local to central (#110)

* fix: datasync from local to central

* fix: fix the token

* fix: remove the token for server authorization (#111)

* Fix the datasync Demographics Issue (#112)

* fix: remove condition for i_beneficiarydetails

* fix: add logs

* fix: add logs

* fix: remove db_iemr

* fix: add log for show column names too

* fix: add date-format condition

* fix: change valid column name

* fix: change valid column name

* fix: change valid column name

* fix: change valid column name

* fix: update insert query

* fix: update cleaned column list

* fix: date conversion

* fix: conversion date-time

* fix: add date conversion

* fix: logs added

* fix: new logger

* fix: revert the date condition

* fix: revert insert code

* fix: revert insert code

* fix: date format issue

* fix: logs add

* fix: log for group and group lsit

* fix: clean the code

---------

Co-authored-by: vishwab1 <vishwanath@navadhiti.com>

* Fix the token issue for Ben-gen id generation (#114)

* fix: update server authorization for bengen

* fix: update server authorization for bengen

* fix: replace authorization for local api call (#116)

* fix: add logs (#117)

* Fix the BenGen ID Issue (#118)

* fix: add logs to check the identity-api

* fix: add logs

* fix: add logs

* fix: add logs

* fix: add logs for checking

* fix: update the prepare statement

* fix: add log

* fix: add log

* fix: add logs

* fix: add Sync Result

* fix: add logs

* fix: add syncResults

* fix: add syncResults

* fix: update processed flag

* fix: update the response

* fix: update the exception block

* fix: upload fix

* fix: address duplication issue

* fix: datasync issue

* fix: remove reason and add dataaccess exception

* fix: revert the server exception

* fix: remove unwanted code

* fix: exception message

* fix: fix the error message

* fix: update the version

---------

Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com>
Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com>
Co-authored-by: vishwab1 <vishwanath@navadhiti.com>

Author: 3 people

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.mmu</groupId>
 	<artifactId>mmu-api</artifactId>
-	<version>3.4.0</version>
+	<version>3.4.1</version>
 	<packaging>war</packaging>
 
 	<name>MMU-API</name>

src/main/java/com/iemr/mmu/data/doctor/CancerGynecologicalExamination.java

@@ -39,7 +39,6 @@
 import com.google.gson.annotations.Expose;
 import lombok.Data;
 
-import lombok.Data;
 
 @Entity
 @Data

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

@@ -98,25 +98,25 @@ public List<Map<String, Object>> getDataForGivenSchemaAndTable(String schema, St
 		return resultSetList;
 	}
 
-	public int updateProcessedFlagInVan(String schemaName, String tableName, StringBuilder vanSerialNos,
-			String autoIncreamentColumn, String user) throws Exception {
+	public int updateProcessedFlagInVan(String schemaName, String tableName, List<String> vanSerialNos,
+			String autoIncreamentColumn, String user, String status, String reason) throws Exception {
 		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 + ")";
+					+ " SET created_date = ? , processed = ?, SyncedDate = ?, Syncedby = ? , SyncFailureReason = ? "
+					+ "WHERE " + autoIncreamentColumn + " IN (" + String.join(",", vanSerialNos) + ")";
 		} else {
 			query = "UPDATE " + schemaName + "." + tableName
-					+ " SET CreatedDate = ? , processed = 'P', SyncedDate = ?, Syncedby = ? "
-					+ "WHERE " + autoIncreamentColumn + " IN (" + vanSerialNos + ")";
+					+ " SET CreatedDate = ? , processed = ?, SyncedDate = ?, Syncedby = ? , SyncFailureReason = ? "
+					+ "WHERE " + autoIncreamentColumn + " IN (" + String.join(",", vanSerialNos) + ")";
 		}
 
 		Timestamp syncedDate = new Timestamp(System.currentTimeMillis());
-		int updatedRows = jdbcTemplate.update(query, syncedDate, syncedDate, user);
+		int updatedRows = jdbcTemplate.update(query, syncedDate, status, syncedDate, user, reason);
 		return updatedRows;
 
 	}

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

@@ -0,0 +1,46 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology
+* Integrated EHR (Electronic Health Records) Solution
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute"
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.mmu.service.dataSyncActivity;
+
+import lombok.Data;
+
+@Data
+public class SyncResult {
+    private String schemaName;
+    private String tableName;
+    private String vanSerialNo;
+    private String syncedBy;
+    private boolean success;
+    private String reason; // Failure reason if any
+
+    // Constructor
+    public SyncResult(String schemaName, String tableName, String vanSerialNo, String syncedBy, boolean success, String reason) {
+        this.schemaName = schemaName;
+        this.tableName = tableName;
+        this.vanSerialNo = vanSerialNo;
+        this.syncedBy = syncedBy;
+        this.success = success;
+        this.reason = reason;
+    }
+
+    // Getters & setters omitted for brevity
+}