Skip to content

Pass the token from controller to fix the issue in data sync #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2025
Merged

Pass the token from controller to fix the issue in data sync #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11a23cf
(fix): Pass the token from controller to fix the issue in data sync
vanitha1822 Jul 1, 2025
21e6898
(fix): Add the token in missing parts
vanitha1822 Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@
import com.iemr.mmu.service.dataSyncActivity.DownloadDataFromServerTransactionalImpl;
import com.iemr.mmu.service.dataSyncActivity.UploadDataToServerImpl;
import com.iemr.mmu.utils.response.OutputResponse;
import com.iemr.mmu.utils.CookieUtil;

import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletRequest;

/***
* @purpose Class used for data sync from van-to-server & server-to-van
Expand All @@ -62,13 +64,15 @@ public class StartSyncActivity {
@PostMapping(value = { "/van-to-server" })
public String dataSyncToServer(@RequestBody String requestOBJ,
@RequestHeader(value = "Authorization") String authorization,
@RequestHeader(value = "ServerAuthorization") String serverAuthorization) {
@RequestHeader(value = "ServerAuthorization") String serverAuthorization, HttpServletRequest request) {
OutputResponse response = new OutputResponse();
try {
String jwtToken = CookieUtil.getJwtTokenFromCookie(request);

JSONObject obj = new JSONObject(requestOBJ);
if (obj.has("user") && obj.get("user") != null && obj.has("vanID") && obj.get("vanID") != null) {
String s = uploadDataToServerImpl.getDataToSyncToServer(obj.getInt("vanID"), obj.getString("user"),
serverAuthorization);
serverAuthorization, jwtToken);
// if (s != null)
response.setResponse(s);
// else
Expand Down Expand Up @@ -107,13 +111,17 @@ public String getSyncGroupDetails() {
@PostMapping(value = { "/startMasterDownload" })
public String startMasterDownload(@RequestBody String requestOBJ,
@RequestHeader(value = "Authorization") String authorization,
@RequestHeader(value = "ServerAuthorization") String serverAuthorization) {
@RequestHeader (value = "ServerAuthorization") String serverAuthorization, HttpServletRequest request) {
OutputResponse response = new OutputResponse();
try {

String jwtToken = CookieUtil.getJwtTokenFromCookie(request);


JSONObject obj = new JSONObject(requestOBJ);
if (obj.has("vanID") && obj.get("vanID") != null && obj.has(PROVIDER_SERVICE_MAP_ID)
&& obj.get(PROVIDER_SERVICE_MAP_ID) != null) {
String s = downloadDataFromServerImpl.downloadMasterDataFromServer(serverAuthorization,
String s = downloadDataFromServerImpl.downloadMasterDataFromServer(serverAuthorization,jwtToken,
obj.getInt("vanID"), obj.getInt(PROVIDER_SERVICE_MAP_ID));
if (s != null) {
if (s.equalsIgnoreCase("inProgress"))
Expand Down Expand Up @@ -169,11 +177,12 @@ public String getVanDetailsForMasterDownload() {
@PostMapping(value = { "/callCentralAPIToGenerateBenIDAndimportToLocal" })
public String callCentralAPIToGenerateBenIDAndimportToLocal(@RequestBody String requestOBJ,
@RequestHeader(value = "Authorization") String authorization,
@RequestHeader(value = "ServerAuthorization") String serverAuthorization) {
@RequestHeader(value = "ServerAuthorization") String serverAuthorization, HttpServletRequest request) {
OutputResponse response = new OutputResponse();
try {
String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
int i = downloadDataFromServerImpl.callCentralAPIToGenerateBenIDAndimportToLocal(requestOBJ, authorization,
serverAuthorization);
serverAuthorization, jwtToken);
if (i == 0) {
response.setError(5000, "Error while generating UNIQUE_ID at central server");
} else {
Expand All @@ -192,13 +201,14 @@ public String callCentralAPIToGenerateBenIDAndimportToLocal(@RequestBody String
@Operation(summary = "Call central API to download transaction data to local")
@PostMapping(value = { "/downloadTransactionToLocal" })
public String downloadTransactionToLocal(@RequestBody String requestOBJ,
@RequestHeader(value = "ServerAuthorization") String serverAuthorization) {
@RequestHeader(value = "ServerAuthorization") String serverAuthorization, HttpServletRequest request) {
OutputResponse response = new OutputResponse();
try {
String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
JSONObject obj = new JSONObject(requestOBJ);
if (obj.has("vanID") && obj.get("vanID") != null) {
int i = downloadDataFromServerTransactionalImpl.downloadTransactionalData(obj.getInt("vanID"),
serverAuthorization);
serverAuthorization, jwtToken);

if (i > 0)
response.setResponse("Success");
Expand Down
28 changes: 18 additions & 10 deletions src/main/java/com/iemr/mmu/controller/registrar/main/RegistrarController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,13 @@
import com.iemr.mmu.service.common.transaction.CommonNurseServiceImpl;
import com.iemr.mmu.service.nurse.NurseServiceImpl;
import com.iemr.mmu.service.registrar.RegistrarServiceImpl;
import com.iemr.mmu.utils.CookieUtil;
import com.iemr.mmu.utils.mapper.InputMapper;
import com.iemr.mmu.utils.response.OutputResponse;

import io.swagger.annotations.ApiParam;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletRequest;

@RestController
@RequestMapping(value = "/registrar", headers = "Authorization", consumes = "application/json", produces = "application/json")
Expand Down Expand Up @@ -227,11 +229,12 @@ public String getBeneficiaryImage(
@Operation(summary = "Search beneficiary for beneficiary id or beneficiary phone no")
@PostMapping(value = { "/quickSearchNew" })
public String quickSearchNew(@RequestBody String requestObj,
@RequestHeader(value = "Authorization") String authorization) {
@RequestHeader(value = "Authorization") String authorization, HttpServletRequest request) {
String searchList = null;
OutputResponse response = new OutputResponse();
try {
searchList = registrarServiceImpl.beneficiaryQuickSearch(requestObj, authorization);
String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
searchList = registrarServiceImpl.beneficiaryQuickSearch(requestObj, authorization, jwtToken);
if (searchList == null) {
response.setError(5000, "Invalid request");
return response.toString();
Expand All @@ -249,11 +252,12 @@ public String quickSearchNew(@RequestBody String requestObj,
@Operation(summary = "Search beneficiary advance search new")
@PostMapping(value = { "/advanceSearchNew" })
public String advanceSearchNew(@RequestBody String requestObj,
@RequestHeader(value = "Authorization") String authorization) {
@RequestHeader(value = "Authorization") String authorization, HttpServletRequest request) {
String searchList = null;
OutputResponse response = new OutputResponse();
try {
searchList = registrarServiceImpl.beneficiaryAdvanceSearch(requestObj, authorization);
String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
searchList = registrarServiceImpl.beneficiaryAdvanceSearch(requestObj, authorization, jwtToken);
if (searchList == null) {
response.setError(5000, "Invalid request");
return response.toString();
Expand Down Expand Up @@ -301,10 +305,12 @@ public String getBenDetailsForLeftSidePanelByRegID(
@Operation(summary = "Get beneficiary image")
@PostMapping(value = { "/getBenImage" })
public String getBenImage(@RequestBody String requestObj,
@RequestHeader(value = "Authorization") String authorization) {
@RequestHeader(value = "Authorization") String authorization, HttpServletRequest request) {
OutputResponse response = new OutputResponse();
try {
return registrarServiceMasterDataImpl.getBenImageFromIdentityAPI(authorization, requestObj);
String jwtToken = CookieUtil.getJwtTokenFromCookie(request);

return registrarServiceMasterDataImpl.getBenImageFromIdentityAPI(authorization, requestObj, jwtToken);
} catch (Exception e) {
logger.error("Error ben image fetch" + e);
response.setError(5000, "Error while getting beneficiary image");
Expand Down Expand Up @@ -378,11 +384,12 @@ public String createBeneficiary(
@Operation(summary = "Register a new beneficiary API")
@PostMapping(value = { "/registrarBeneficaryRegistrationNew" })
public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq,
@RequestHeader(value = "Authorization") String authorization) {
@RequestHeader(value = "Authorization") String authorization, HttpServletRequest request) {
String s;
OutputResponse response = new OutputResponse();
try {
s = registrarServiceImpl.registerBeneficiary(comingReq, authorization);
String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
s = registrarServiceImpl.registerBeneficiary(comingReq, authorization, jwtToken);
return s;
} catch (Exception e) {
logger.error("Error in registration" + e);
Expand Down Expand Up @@ -474,11 +481,12 @@ public String createReVisitForBenToNurse(@RequestBody String requestOBJ) {
@Operation(summary = "Beneficiary edit, save or submit")
@PostMapping(value = { "/update/BeneficiaryUpdate" })
public String beneficiaryUpdate(@RequestBody String requestOBJ,
@RequestHeader(value = "Authorization") String authorization) {
@RequestHeader(value = "Authorization") String authorization, HttpServletRequest request) {
OutputResponse response = new OutputResponse();
Integer s = null;
try {
s = registrarServiceImpl.updateBeneficiary(requestOBJ, authorization);
String jwtToken = CookieUtil.getJwtTokenFromCookie(request);
s = registrarServiceImpl.updateBeneficiary(requestOBJ, authorization, jwtToken);
if (s != null) {
if (s == 1)
response.setResponse("Beneficiary details updated successfully");
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/com/iemr/mmu/controller/teleconsultation/TeleConsultationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.iemr.mmu.service.tele_consultation.TeleConsultationServiceImpl;
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;

@RestController
@RequestMapping(value = "/tc", headers = "Authorization", consumes = "application/json", produces = "application/json")
Expand Down Expand Up @@ -70,11 +72,13 @@ public String benArrivalStatusUpdater(@RequestBody String requestOBJ) {
@Operation(summary = "Update beneficiary status based on request")
@PostMapping(value = { "/cancel/benTCRequest" })
public String updateBeneficiaryStatusToCancelTCRequest(@RequestBody String requestOBJ,
@RequestHeader String Authorization) {
@RequestHeader String Authorization, HttpServletRequest request) {
OutputResponse response = new OutputResponse();
try {
String jwtToken = CookieUtil.getJwtTokenFromCookie(request);

if (requestOBJ != null) {
int i = teleConsultationServiceImpl.updateBeneficiaryStatusToCancelTCRequest(requestOBJ, Authorization);
int i = teleConsultationServiceImpl.updateBeneficiaryStatusToCancelTCRequest(requestOBJ, Authorization, jwtToken);
if (i > 0)
response.setResponse("Beneficiary TC request cancelled successfully.");
else
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/mmu/service/cancerScreening/CSCarestreamServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public int createMamographyRequest(ArrayList<Object[]> benDataForCareStream, lon
RestTemplate restTemplate = new RestTemplate();
try {
String requestOBJ = getOrderCreationRequestOBJ(benDataForCareStream, benRegID, benVisitID);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization, "");
// System.out.println("hello");
ResponseEntity<String> response = restTemplate.exchange(carestreamOrderCreateURL, HttpMethod.POST, request,
String.class);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/iemr/mmu/service/common/master/RegistrarServiceMasterDataImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@ public String getBenDetailsForLeftSideByRegIDNew(Long beneficiaryRegID, Long ben
return new Gson().toJson(returnBenFlowOBJ);
}

public String getBenImageFromIdentityAPI(String Authorization, String comingRequest) throws Exception {
public String getBenImageFromIdentityAPI(String Authorization, String comingRequest, String token) throws Exception {
String returnOBJ = null;
RestTemplate restTemplate = new RestTemplate();
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(comingRequest, Authorization);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(comingRequest, Authorization, token);
ResponseEntity<String> response = restTemplate.exchange(getBenImageFromIdentity, HttpMethod.POST, request,
String.class);
// if()
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/mmu/service/common/transaction/CommonDoctorServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@ public int callTmForSpecialistSlotBook(TcSpecialistSlotBookingRequestOBJ tcSpeci
String requestOBJ = OutputMapper.gson().toJson(tcSpecialistSlotBookingRequestOBJ);

RestTemplate restTemplate = new RestTemplate();
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization,"");
ResponseEntity<String> response = restTemplate.exchange(tcSpecialistSlotBook, HttpMethod.POST, request,
String.class);
// System.out.println(response.getBody());
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/iemr/mmu/service/common/transaction/CommonServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ public ArrayList<String> getTmCaseSheet(BeneficiaryFlowStatus TmBenFlowOBJ, Bene
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);

// get TM case sheet by passing TM details
ResponseEntity<String> response = restTemplatePost(tmCentralServer, Authorization, new Gson().toJson(tmReqObj));
ResponseEntity<String> response = restTemplatePost(tmCentralServer, Authorization, new Gson().toJson(tmReqObj), jwtTokenFromCookie);

if (response.getStatusCodeValue() == 200 & response.hasBody()) {
JsonObject jsnOBJ = getJsonObj(response);
Expand All @@ -666,7 +666,7 @@ public ArrayList<String> getTmCaseSheet(BeneficiaryFlowStatus TmBenFlowOBJ, Bene
int specialistUserID = jsnOBJ.getAsJsonObject("data").getAsJsonObject("BeneficiaryData")
.get("tCSpecialistUserID").getAsInt();
ResponseEntity<String> responseSign = restTemplateGet(specialistSign + "/" + specialistUserID,
Authorization);
Authorization, jwtTokenFromCookie);
JsonObject signJsonResponse = getJsonObj(responseSign);
if (signJsonResponse.get("statusCode").getAsLong() == 200) {
// adding sign response to array
Expand Down Expand Up @@ -719,7 +719,7 @@ public String getCaseSheetFromCentralServer(String mmuBenFlowReq, String authCen
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);

ResponseEntity<String> response = restTemplatePost(mmuCentralServer, authCentralServer, mmuBenFlowReq);
ResponseEntity<String> response = restTemplatePost(mmuCentralServer, authCentralServer, mmuBenFlowReq, jwtTokenFromCookie);

if (response.getStatusCodeValue() == 200 & response.hasBody()) {

Expand Down Expand Up @@ -822,16 +822,16 @@ public String getCaseSheetOfTm(String mmuBenFlowReq, String authCentralServer) t

}

public ResponseEntity<String> restTemplatePost(String URL, String authorization, String reqObj) {
public ResponseEntity<String> restTemplatePost(String URL, String authorization, String reqObj, String token) {
RestTemplate restTemplate = new RestTemplate();
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(reqObj, authorization);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(reqObj, authorization, token);
ResponseEntity<String> response = restTemplate.exchange(URL, HttpMethod.POST, request, String.class);
return response;
}

public ResponseEntity<String> restTemplateGet(String URL, String authorization) {
public ResponseEntity<String> restTemplateGet(String URL, String authorization, String token) {
RestTemplate restTemplate = new RestTemplate();
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity("", authorization);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity("", authorization, token);
ResponseEntity<String> response = restTemplate.exchange(URL, HttpMethod.GET, request, String.class);
return response;
}
Expand Down
Loading
Loading