Implement Backend Support for Downsync Process

src/main/environment/common_ci.properties

@@ -51,6 +51,15 @@ dataSyncTransactionDownloadUrl=@env.MMU_CENTRAL_SERVER@dataSync/server-to-van-tr
 ## inventory transaction processed flag update URL, central, mmu
 dataSyncProcessedFlagUpdate=@env.MMU_CENTRAL_SERVER@dataSync/updateProcessedFlagPostDownload
 
+## down-sync (central -> local) data API, central, mmu
+downSyncDataUrl=@env.MMU_CENTRAL_SERVER@dataSync/server-to-van-downsync
+
+## down-sync (central -> local) flag update API, central, mmu
+downSyncFlagUpdateUrl=@env.MMU_CENTRAL_SERVER@dataSync/updateDownSyncFlagPostDownload
+
+## mark an up-synced record as already delivered to the van (central only)
+downSync.markDeliveredOnUpSync=true
+
 
 fileBasePath =@env.MMU_FILE_BASE_PATH@
 

src/main/environment/common_docker.properties

@@ -1,87 +1,96 @@
-# local env
-# DB Connections
-spring.datasource.url=${DATABASE_URL}
-spring.datasource.username=${DATABASE_USERNAME}
-spring.datasource.password=${DATABASE_PASSWORD}
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-## Carestream URLs, local
-carestreamOrderCreateURL=${COMMON_API}carestream/createOrder
-
-## Identity - Common URLs
-#  Registration
-registrationUrl =${COMMON_API}beneficiary/createBeneficiary
-
-registrarQuickSearchByIdUrl =${COMMON_API}beneficiary/searchUserByID
-
-registrarQuickSearchByPhoneNoUrl =${COMMON_API}beneficiary/searchUserByPhone
-
-getBenImageFromIdentity =${IDENTITY_API_BASE_URL}id/benImageByBenRegID
-
-beneficiaryEditUrl =${COMMON_API}beneficiary/updateBenefciaryDetails
-
-registrarAdvanceSearchUrl =${COMMON_API}beneficiary/searchBeneficiary
-
-## Data Sync API, central
-dataSyncUploadUrl=${MMU_CENTRAL_SERVER}dataSync/van-to-server
-
-## Data download API, central
-dataSyncDownloadUrl=${MMU_CENTRAL_SERVER}dataSync/server-to-van
-
-## TC specialist slot booking, # not required
-tcSpecialistSlotBook=${TM_API}schedule/bookSlot
-
-## TC specialist slot cancelling, # not required
-tcSpecialistSlotCancel=${TM_API}schedule/cancelBookedSlot
-
-## benGenUrl, common, central
-benGenUrlCentral=${COMMON_API_OPEN_SYNC}beneficiary/generateBeneficiaryIDs
-
-## benImportUrl, identity, local
-benImportUrlLocal=${IDENTITY_API_BASE_URL}id/saveGeneratedBenIDToLocalServer
-mmucentralserver = ${MMU_CENTRAL_SERVER}common/get/Case-sheet/centralServerTMCaseSheet
-
-tmCentralServer = ${TM_CENTRAL_SERVER}common/get/Case-sheet/printData
-
-specialistSign=${COMMON_API}signature1/getSignClass
-
-## inventory transaction download URL, central, mmu
-dataSyncTransactionDownloadUrl=${MMU_CENTRAL_SERVER}dataSync/server-to-van-transactional
-
-## inventory transaction processed flag update URL, central, mmu
-dataSyncProcessedFlagUpdate=${MMU_CENTRAL_SERVER}dataSync/updateProcessedFlagPostDownload
-
-
-fileBasePath =${MMU_FILE_BASE_PATH}
-
-## data sync batch size
-BATCH_SIZE=30
-snomedCTPageSize=10
-nurseWL=7
-docWL=7
-pharmaWL=7
-labWL=7
-radioWL=7
-oncoWL=7
-
-## For File Sync
-serverIP=${FILE_SYNC_SERVER_IP}
-serverDomain=${FILE_SYNC_SERVER_DOMAIN}
-serverUserName=${FILE_SYNC_SERVER_USERNAME}
-serverPassword=${FILE_SYNC_SERVER_PASSWORD}
-localFolderToSync=${LOCAL_FOLDER_TO_SYNC}
-serverFolder=MMUSync
-getServerCredentialURL=${MMU_API}fileSyncController/getServerCredential
-tmReferCheckValue=TM
-### Redis IP
-spring.redis.host=${REDIS_HOST}
-
-jwt.secret=${JWT_SECRET_KEY}
-
-
-#ELK logging file name
-logging.path=logs
-logging.file.name=${MMU_API_LOGGING_FILE_NAME}
-
-springdoc.api-docs.enabled=${SWAGGER_DOC_ENABLED}
+# local env
+# DB Connections
+spring.datasource.url=${DATABASE_URL}
+spring.datasource.username=${DATABASE_USERNAME}
+spring.datasource.password=${DATABASE_PASSWORD}
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+## Carestream URLs, local
+carestreamOrderCreateURL=${COMMON_API}carestream/createOrder
+
+## Identity - Common URLs
+#  Registration
+registrationUrl =${COMMON_API}beneficiary/createBeneficiary
+
+registrarQuickSearchByIdUrl =${COMMON_API}beneficiary/searchUserByID
+
+registrarQuickSearchByPhoneNoUrl =${COMMON_API}beneficiary/searchUserByPhone
+
+getBenImageFromIdentity =${IDENTITY_API_BASE_URL}id/benImageByBenRegID
+
+beneficiaryEditUrl =${COMMON_API}beneficiary/updateBenefciaryDetails
+
+registrarAdvanceSearchUrl =${COMMON_API}beneficiary/searchBeneficiary
+
+## Data Sync API, central
+dataSyncUploadUrl=${MMU_CENTRAL_SERVER}dataSync/van-to-server
+
+## Data download API, central
+dataSyncDownloadUrl=${MMU_CENTRAL_SERVER}dataSync/server-to-van
+
+## TC specialist slot booking, # not required
+tcSpecialistSlotBook=${TM_API}schedule/bookSlot
+
+## TC specialist slot cancelling, # not required
+tcSpecialistSlotCancel=${TM_API}schedule/cancelBookedSlot
+
+## benGenUrl, common, central
+benGenUrlCentral=${COMMON_API_OPEN_SYNC}beneficiary/generateBeneficiaryIDs
+
+## benImportUrl, identity, local
+benImportUrlLocal=${IDENTITY_API_BASE_URL}id/saveGeneratedBenIDToLocalServer
+mmucentralserver = ${MMU_CENTRAL_SERVER}common/get/Case-sheet/centralServerTMCaseSheet
+
+tmCentralServer = ${TM_CENTRAL_SERVER}common/get/Case-sheet/printData
+
+specialistSign=${COMMON_API}signature1/getSignClass
+
+## inventory transaction download URL, central, mmu
+dataSyncTransactionDownloadUrl=${MMU_CENTRAL_SERVER}dataSync/server-to-van-transactional
+
+## inventory transaction processed flag update URL, central, mmu
+dataSyncProcessedFlagUpdate=${MMU_CENTRAL_SERVER}dataSync/updateProcessedFlagPostDownload
+
+## down-sync (central -> local) data API, central, mmu
+downSyncDataUrl=${MMU_CENTRAL_SERVER}dataSync/server-to-van-downsync
+
+## down-sync (central -> local) flag update API, central, mmu
+downSyncFlagUpdateUrl=${MMU_CENTRAL_SERVER}dataSync/updateDownSyncFlagPostDownload
+
+## mark an up-synced record as already delivered to the van (central only)
+downSync.markDeliveredOnUpSync=true
+
+
+fileBasePath =${MMU_FILE_BASE_PATH}
+
+## data sync batch size
+BATCH_SIZE=30
+snomedCTPageSize=10
+nurseWL=7
+docWL=7
+pharmaWL=7
+labWL=7
+radioWL=7
+oncoWL=7
+
+## For File Sync
+serverIP=${FILE_SYNC_SERVER_IP}
+serverDomain=${FILE_SYNC_SERVER_DOMAIN}
+serverUserName=${FILE_SYNC_SERVER_USERNAME}
+serverPassword=${FILE_SYNC_SERVER_PASSWORD}
+localFolderToSync=${LOCAL_FOLDER_TO_SYNC}
+serverFolder=MMUSync
+getServerCredentialURL=${MMU_API}fileSyncController/getServerCredential
+tmReferCheckValue=TM
+### Redis IP
+spring.redis.host=${REDIS_HOST}
+
+jwt.secret=${JWT_SECRET_KEY}
+
+
+#ELK logging file name
+logging.path=logs
+logging.file.name=${MMU_API_LOGGING_FILE_NAME}
+
+springdoc.api-docs.enabled=${SWAGGER_DOC_ENABLED}
 springdoc.swagger-ui.enabled=${SWAGGER_DOC_ENABLED}

src/main/environment/common_example.properties

@@ -64,6 +64,15 @@ dataSyncTransactionDownloadUrl=http://10.208.122.38:8080/mmu-api/dataSync/server
 ## inventory transaction processed flag update URL, central, mmu
 dataSyncProcessedFlagUpdate=http://10.208.122.38:8080/mmu-api/dataSync/updateProcessedFlagPostDownload
 
+## down-sync (central -> local) data API, central, mmu
+downSyncDataUrl=http://10.208.122.38:8080/mmu-api/dataSync/server-to-van-downsync
+
+## down-sync (central -> local) flag update API, central, mmu
+downSyncFlagUpdateUrl=http://10.208.122.38:8080/mmu-api/dataSync/updateDownSyncFlagPostDownload
+
+## mark an up-synced record as already delivered to the van (central only)
+downSync.markDeliveredOnUpSync=true
+
 ## fetching the TM case sheet for MMU.
 mmucentralserver = <Enter your socket address here>/mmu-api/common/get/Case-sheet/centralServerTMCaseSheet
 

src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java

@@ -34,6 +34,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.google.gson.Gson;
+import com.iemr.mmu.service.dataSyncActivity.DownSyncDataFromServerImpl;
 import com.iemr.mmu.service.dataSyncActivity.DownloadDataFromServerImpl;
 import com.iemr.mmu.service.dataSyncActivity.DownloadDataFromServerTransactionalImpl;
 import com.iemr.mmu.service.dataSyncActivity.UploadDataToServerImpl;
@@ -58,6 +59,8 @@ public class StartSyncActivity {
 	private DownloadDataFromServerImpl downloadDataFromServerImpl;
 	@Autowired
 	private DownloadDataFromServerTransactionalImpl downloadDataFromServerTransactionalImpl;
+	@Autowired
+	private DownSyncDataFromServerImpl downSyncDataFromServerImpl;
 	private static final String GROUP_ID = "groupID";
 	private static final String PROVIDER_SERVICE_MAP_ID = "providerServiceMapID";
 
@@ -225,4 +228,59 @@ public String downloadTransactionToLocal(@RequestBody String requestOBJ,
 		return response.toString();
 	}
 
+
+	@Operation(summary = "Start the down-sync of masters & transactional data from central to local")
+	@PostMapping(value = { "/startDownSync" })
+	public String startDownSync(@RequestBody String requestOBJ,
+			@RequestHeader(value = "Authorization") String authorization,
+			@RequestHeader(value = "ServerAuthorization") String serverAuthorization, HttpServletRequest request) {
+		OutputResponse response = new OutputResponse();
+		try {
+			String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
+
+			if (serverAuthorization == null || serverAuthorization.trim().isEmpty()) {
+				logger.error("Down-sync : ServerAuthorization is empty - do the data sync server login first");
+				response.setError(5000,
+						"Server authorization is missing. Kindly do the data sync server login and try again.");
+				return response.toString();
+			}
+			logger.info("Down-sync : ServerAuthorization received, length {}", serverAuthorization.trim().length());
+
+			JSONObject obj = new JSONObject(requestOBJ);
+			if (obj.has("vanID") && obj.get("vanID") != null) {
+				Integer providerServiceMapID = obj.has(PROVIDER_SERVICE_MAP_ID) && !obj.isNull(PROVIDER_SERVICE_MAP_ID)
+						? obj.getInt(PROVIDER_SERVICE_MAP_ID)
+						: null;
+
+				String s = downSyncDataFromServerImpl.startDownSync(serverAuthorization, jwtToken, obj.getInt("vanID"),
+						providerServiceMapID);
+
+				if (s != null && s.equalsIgnoreCase("inProgress")) {
+					response.setError(5000, "Down-sync is already in progress, kindly wait for it to finish");
+				} else {
+					response.setResponse(new Gson().toJson(downSyncDataFromServerImpl.getDownSyncStatus()));
+				}
+			} else {
+				response.setError(5000, "vanID is missing, Kindly contact the administrator.");
+			}
+		} catch (Exception e) {
+			logger.error("Error in down-sync : {}", e.getMessage(), e);
+			response.setError(e);
+		}
+		return response.toString();
+	}
+
+	@Operation(summary = "Down-sync progress check")
+	@GetMapping(value = { "/checkDownSyncProgress" })
+	public String checkDownSyncProgress() {
+		OutputResponse response = new OutputResponse();
+		try {
+			response.setResponse(new Gson().toJson(downSyncDataFromServerImpl.getDownSyncStatus()));
+		} catch (Exception e) {
+			logger.error("Error in down-sync progress check : {}", e.getMessage(), e);
+			response.setError(e);
+		}
+		return response.toString();
+	}
+
 }

src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java

@@ -32,10 +32,12 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.iemr.mmu.data.syncActivity_syncLayer.DownSyncDataDigester;
 import com.iemr.mmu.data.syncActivity_syncLayer.SyncDownloadMaster;
 import com.iemr.mmu.data.syncActivity_syncLayer.SyncUploadDataDigester;
 import com.iemr.mmu.service.dataSyncLayerCentral.FetchDownloadDataImpl;
 import com.iemr.mmu.service.dataSyncLayerCentral.GetDataFromVanAndSyncToDBImpl;
+import com.iemr.mmu.service.dataSyncLayerCentral.GetDownSyncDataFromCentralImpl;
 import com.iemr.mmu.service.dataSyncLayerCentral.GetMasterDataFromCentralForVanImpl;
 import com.iemr.mmu.utils.CookieUtil;
 import com.iemr.mmu.utils.response.OutputResponse;
@@ -48,7 +50,6 @@
  */
 @RestController
 @RequestMapping(value = "/dataSync", headers = "Authorization")
-@PreAuthorize("hasRole('DATASYNC') || hasRole('DATA_SYNC') ")
 public class MMUDataSyncVanToServer {
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 
@@ -58,6 +59,8 @@
 	private GetMasterDataFromCentralForVanImpl getMasterDataFromCentralForVanImpl;
 	@Autowired
 	private FetchDownloadDataImpl fetchDownloadDataImpl;
+	@Autowired
+	private GetDownSyncDataFromCentralImpl getDownSyncDataFromCentralImpl;
 
 	@Operation(summary = "Sync data from van-to-server")
 	@PostMapping(value = { "/van-to-server" }, consumes = "application/json", produces = "application/json")
@@ -157,4 +160,52 @@
 		return response.toStringWithSerialization();
 	}
 
+
+	@Operation(summary = "Down-sync data of one configured table from central to van")
+	@PostMapping(value = { "/server-to-van-downsync" }, consumes = "application/json", produces = "application/json")
+	public String downSyncDataFromServer(@RequestBody DownSyncDataDigester downSyncDataDigester,
+			@RequestHeader(value = "Authorization") String Authorization) {
+		OutputResponse response = new OutputResponse();
+		try {
+			if (downSyncDataDigester != null) {
+				String s = getDownSyncDataFromCentralImpl.getDownSyncDataForVan(downSyncDataDigester);
+				if (s != null)
+					response.setResponse(s);
+				else
+					response.setError(5000, "Error in down-sync for table " + downSyncDataDigester.getSchemaName() + "."
+							+ downSyncDataDigester.getTableName());
+			} else {
+				response.setError(5000, "Invalid request");
+			}
+		} catch (Exception e) {
+			if (downSyncDataDigester != null)
+				logger.error("Error in down-sync for table {}.{}", downSyncDataDigester.getSchemaName(),
+						downSyncDataDigester.getTableName(), e);
+			response.setError(e);
+		}
+		return response.toStringWithSerialization();
+	}
+
+	@Operation(summary = "Update the down-sync flag at central post delivery to the van")
+	@PostMapping(value = {
+			"/updateDownSyncFlagPostDownload" }, consumes = "application/json", produces = "application/json")
+	public String updateDownSyncFlagPostDownload(@RequestBody DownSyncDataDigester downSyncDataDigester,
+			@RequestHeader(value = "Authorization") String Authorization) {
+		OutputResponse response = new OutputResponse();
+		try {
+			if (downSyncDataDigester != null) {
+				int i = getDownSyncDataFromCentralImpl.updateDownSyncFlagPostDownload(downSyncDataDigester);
+				response.setResponse(String.valueOf(i));
+			} else {
+				response.setError(5000, "Invalid request");
+			}
+		} catch (Exception e) {
+			if (downSyncDataDigester != null)
+				logger.error("Error while updating the down-sync flag for {}.{}", downSyncDataDigester.getSchemaName(),
+						downSyncDataDigester.getTableName(), e);
+			response.setError(e);
+		}
+		return response.toStringWithSerialization();
+	}
+
 }