From a9624ae994c5784c7b01d1362d68e76325ffdf60 Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Fri, 13 Dec 2024 18:46:44 +0530 Subject: [PATCH] Modified tnxId keyword to txnId (#55) Co-authored-by: KA40094929 --- .../java/com/wipro/fhir/data/v3/abhaCard/LoginMethod.java | 2 +- .../wipro/fhir/data/v3/abhaCard/RequestOTPEnrollment.java | 2 +- .../ndhm/CreateHealthID_Aadhaar_NDHMServiceImpl.java | 8 ++++---- .../fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java | 8 ++++---- .../fhir/service/v3/abha/LoginAbhaV3ServiceImpl.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/wipro/fhir/data/v3/abhaCard/LoginMethod.java b/src/main/java/com/wipro/fhir/data/v3/abhaCard/LoginMethod.java index 2536f29..bde1e58 100644 --- a/src/main/java/com/wipro/fhir/data/v3/abhaCard/LoginMethod.java +++ b/src/main/java/com/wipro/fhir/data/v3/abhaCard/LoginMethod.java @@ -8,7 +8,7 @@ public class LoginMethod { private String loginId; private String loginMethod; private String pId; - private String tnxId; + private String txnId; private String mobileNumber; private String createdBy; private int providerServiceMapId; diff --git a/src/main/java/com/wipro/fhir/data/v3/abhaCard/RequestOTPEnrollment.java b/src/main/java/com/wipro/fhir/data/v3/abhaCard/RequestOTPEnrollment.java index 8eefe19..b49cd0a 100644 --- a/src/main/java/com/wipro/fhir/data/v3/abhaCard/RequestOTPEnrollment.java +++ b/src/main/java/com/wipro/fhir/data/v3/abhaCard/RequestOTPEnrollment.java @@ -5,7 +5,7 @@ @Data public class RequestOTPEnrollment { - String tnxId; + String txnId; String[] scope; String loginHint; String loginId; diff --git a/src/main/java/com/wipro/fhir/service/ndhm/CreateHealthID_Aadhaar_NDHMServiceImpl.java b/src/main/java/com/wipro/fhir/service/ndhm/CreateHealthID_Aadhaar_NDHMServiceImpl.java index 5a43aa2..0a676d7 100644 --- a/src/main/java/com/wipro/fhir/service/ndhm/CreateHealthID_Aadhaar_NDHMServiceImpl.java +++ b/src/main/java/com/wipro/fhir/service/ndhm/CreateHealthID_Aadhaar_NDHMServiceImpl.java @@ -177,7 +177,7 @@ public String verifyOTP(String request) throws FHIRException { JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(responseStrLogin); jsnOBJ = jsnElmnt.getAsJsonObject(); - resMap.put("tnxId", jsnOBJ.get("txnId").getAsString()); + resMap.put("txnId", jsnOBJ.get("txnId").getAsString()); res = new Gson().toJson(resMap); } else throw new FHIRException("NDHM_FHIR Error while verifying the OTP"); @@ -210,7 +210,7 @@ public String checkAndGenerateMobileOTP(String request) throws FHIRException { jsnOBJ = jsnElmnt.getAsJsonObject(); //String mobileLinked = jsnOBJ.get("mobileLinked").getAsString(); resMap.put("mobileLinked", jsnOBJ.get("mobileLinked").getAsString()); - resMap.put("tnxId", jsnOBJ.get("txnId").getAsString()); + resMap.put("txnId", jsnOBJ.get("txnId").getAsString()); res = new Gson().toJson(resMap); } else @@ -242,7 +242,7 @@ public String verifyMobileOTP(String request) throws FHIRException { JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(responseStrLogin); jsnOBJ = jsnElmnt.getAsJsonObject(); - resMap.put("tnxId", jsnOBJ.get("txnId").getAsString()); + resMap.put("txnId", jsnOBJ.get("txnId").getAsString()); res = new Gson().toJson(resMap); } else throw new FHIRException("NDHM_FHIR Error while verifiying mobile OTP"); @@ -367,7 +367,7 @@ public String generateMobileOTP(String request) throws FHIRException { jsnOBJ = jsnElmnt.getAsJsonObject(); // String mobileLinked = jsnOBJ.get("mobileLinked").getAsString(); // resMap.put("mobileLinked", jsnOBJ.get("mobileLinked").getAsString()); - resMap.put("tnxId", jsnOBJ.get("txnId").getAsString()); + resMap.put("txnId", jsnOBJ.get("txnId").getAsString()); res = new Gson().toJson(resMap); } else diff --git a/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java b/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java index 40cdb4e..727231b 100644 --- a/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java +++ b/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java @@ -114,7 +114,7 @@ public String getOtpForEnrollment(String request) throws FHIRException { reqOtpEnrollment.setScope(new String[] { "abha-enrol" }); } else if ("MOBILE".equalsIgnoreCase(loginMethod.getLoginMethod())) { reqOtpEnrollment.setLoginId(encryptedLoginId); - reqOtpEnrollment.setTnxId(loginMethod.getTnxId()); + reqOtpEnrollment.setTxnId(loginMethod.getTxnId()); reqOtpEnrollment.setOtpSystem("abdm"); reqOtpEnrollment.setLoginHint("mobile"); reqOtpEnrollment.setScope(new String[] { "abha-enrol", "mobile-verify" }); @@ -276,7 +276,7 @@ public String verifyAuthByAbdm(String request) throws FHIRException { String formattedTimestamp = now.format(formatter); otp.setTimestamp(formattedTimestamp); - otp.setTxnId(loginMethod.getTnxId()); + otp.setTxnId(loginMethod.getTxnId()); otp.setOtpValue(encryptedLoginId); String[] scope; @@ -327,7 +327,7 @@ public String formAadharEnrollReqObjByAadhar(LoginMethod loginData, String encry String formattedTimestamp = now.format(formatter); otp.setTimestamp(formattedTimestamp); - otp.setTxnId(loginData.getTnxId()); + otp.setTxnId(loginData.getTxnId()); otp.setOtpValue(encryptedLoginId); otp.setMobile(loginData.getMobileNumber()); @@ -359,7 +359,7 @@ public String formAadharEnrollReqObjByBiometric(LoginMethod loginData, String en String formattedTimestamp = now.format(formatter); bio.setTimestamp(formattedTimestamp); - bio.setTxnId(loginData.getTnxId()); + bio.setTxnId(loginData.getTxnId()); bio.setAadhaar(encryptedLoginId); bio.setFingerPrintAuthPid(loginData.getPId()); diff --git a/src/main/java/com/wipro/fhir/service/v3/abha/LoginAbhaV3ServiceImpl.java b/src/main/java/com/wipro/fhir/service/v3/abha/LoginAbhaV3ServiceImpl.java index e33fc6a..3263912 100644 --- a/src/main/java/com/wipro/fhir/service/v3/abha/LoginAbhaV3ServiceImpl.java +++ b/src/main/java/com/wipro/fhir/service/v3/abha/LoginAbhaV3ServiceImpl.java @@ -170,7 +170,7 @@ public String verifyAbhaLogin(String request) throws FHIRException { OtpRequest otp = new OtpRequest(); - otp.setTxnId(loginData.getTnxId()); + otp.setTxnId(loginData.getTxnId()); otp.setOtpValue(encryptedLoginId); Map authDataMap = new HashMap<>();