diff --git a/pom.xml b/pom.xml
index 70859837..8733a6ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,12 +47,22 @@
org.springframework.boot
spring-boot-starter
-
+
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+ org.slf4j
+ slf4j-simple
+ ${slf4j.version}
co.elastic.logging
diff --git a/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java b/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java
index dedad0eb..eeb54e9f 100644
--- a/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java
+++ b/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java
@@ -36,9 +36,11 @@
import com.iemr.mmu.service.dataSyncLayerCentral.FetchDownloadDataImpl;
import com.iemr.mmu.service.dataSyncLayerCentral.GetDataFromVanAndSyncToDBImpl;
import com.iemr.mmu.service.dataSyncLayerCentral.GetMasterDataFromCentralForVanImpl;
+import com.iemr.mmu.utils.CookieUtil;
import com.iemr.mmu.utils.response.OutputResponse;
import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletRequest;
/***
* @operation Class used for data sync from van-to-server & server-to-van
@@ -58,10 +60,15 @@ public class MMUDataSyncVanToServer {
@Operation(summary = "Sync data from van-to-server")
@PostMapping(value = { "/van-to-server" }, consumes = "application/json", produces = "application/json")
public String dataSyncToServer(@RequestBody String requestOBJ,
- @RequestHeader(value = "Authorization") String Authorization) {
+ @RequestHeader(value = "Authorization") String Authorization, HttpServletRequest request) {
OutputResponse response = new OutputResponse();
+
+ logger.info("test: vanto server auth="+Authorization);
try {
- String s = getDataFromVanAndSyncToDBImpl.syncDataToServer(requestOBJ, Authorization);
+ String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
+ logger.info("test: vanto server token="+jwtToken);
+
+ String s = getDataFromVanAndSyncToDBImpl.syncDataToServer(requestOBJ, Authorization, jwtToken);
if (s != null)
response.setResponse(s);
else
diff --git a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DataSyncRepositoryCentral.java b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DataSyncRepositoryCentral.java
index 6b62af69..175de980 100644
--- a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DataSyncRepositoryCentral.java
+++ b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DataSyncRepositoryCentral.java
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.sql.DataSource;
@@ -34,175 +35,186 @@
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
-/***
- *
- * @author NE298657
- *
- */
+import com.iemr.mmu.data.syncActivity_syncLayer.SyncUploadDataDigester;
@Service
public class DataSyncRepositoryCentral {
- @Autowired
- private DataSource dataSource;
-
- private JdbcTemplate jdbcTemplate;
-
- private JdbcTemplate getJdbcTemplate() {
- return new JdbcTemplate(dataSource);
-
- }
-
- private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
-
- // Data Upload Repository
- public int checkRecordIsAlreadyPresentOrNot(String schemaName, String tableName, String vanSerialNo, String vanID,
- String vanAutoIncColumnName, int syncFacilityID) {
- jdbcTemplate = getJdbcTemplate();
-
- List