Skip to content

Abdm v3 #114

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
helenKaryamsetty merged 18 commits into from
Oct 14, 2025
Merged

Abdm v3 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3814860
Abdm Facility fetch services changes
Sep 19, 2024
a2224b4
facility save after carecontext and patientcarecontextx update
Sep 26, 2024
1a28c2b
FacilityId save in mongo db and Variable declaration correction
Oct 8, 2024
fea418b
Mongo carecontext save query logic changes
Oct 8, 2024
9d30d46
ABHA Creation M1 V3 API changes
Oct 18, 2024
583594a
Abha V3 changes
Dec 9, 2024
8d206ef
resolved merge conflicts
Dec 9, 2024
4c76193
removed unused code
helenKaryamsetty Dec 9, 2024
c07d839
v3- verify auth by abdm API changes
Dec 12, 2024
d26eeda
Merge branch 'PSMRI:develop' into abdmV3
helenKaryamsetty Dec 12, 2024
5e93901
resolved merge conflicts
Dec 12, 2024
e669df1
fix pulled latest develop
helenKaryamsetty Oct 6, 2025
7a5c0d4
feat: Abdm M2 V3 changes
helenKaryamsetty Oct 6, 2025
43683a2
feat: mongo query change fetch for linktoken
helenKaryamsetty Oct 13, 2025
8ead599
Merge branch 'abdmV3' into abdmV3
helenKaryamsetty Oct 13, 2025
c1c5d38
fix: link carecontext authorization error
helenKaryamsetty Oct 14, 2025
497b3ff
Merge branch 'PSMRI:abdmV3' into abdmV3
helenKaryamsetty Oct 14, 2025
d748156
Merge branch 'abdmV3' of https://github.com/helenKaryamsetty/FHIR-API…
helenKaryamsetty Oct 14, 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
5 changes: 5 additions & 0 deletions src/main/java/com/wipro/fhir/service/ndhm/Common_NDHMServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import java.util.TimeZone;
import java.util.UUID;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
Expand All @@ -48,6 +50,8 @@ public class Common_NDHMServiceImpl implements Common_NDHMService {
@Autowired
private GenerateTokenAbdmResponsesRepo generateTokenAbdmResponsesRepo;

private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());

/***
* @author SH20094090
* @return headers for the NDHM API's
Expand Down Expand Up @@ -158,6 +162,7 @@ NDHMResponse getResponseMongo(String reqID) {
@Override
public GenerateTokenAbdmResponses getLinkToken(String requestId) throws FHIRException {
GenerateTokenAbdmResponses res = generateTokenAbdmResponsesRepo.findByRequestId(requestId);
logger.info("Mongo response returned " + res);
if(res != null) {
return res;
} else {
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/wipro/fhir/service/v3/careContext/CareContextLinkingServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,14 @@ public String generateTokenForCareContext(String request) throws FHIRException {
if (linkTokenElement != null && !linkTokenElement.isJsonNull()) {
linkToken = linkTokenElement.getAsString();
responseMap.put("X-LINK-TOKEN", linkToken);
logger.info("Mongo has link token");
} else {
if (jsonObject.has("Error") && !jsonObject.get("Error").isJsonNull()) {
JsonObject errorObject = jsonObject.getAsJsonObject("Error");
responseMap.put("Error", errorObject.toString());
logger.info("Mongo has no link token other message - " + errorObject.toString());
responseMap.put("error", errorObject.toString());
} else {
responseMap.put("Error", "Unknown error");
responseMap.put("error", "Unknown error");
}
}
} catch (Exception e) {
Expand All @@ -179,9 +181,7 @@ public String generateTokenForCareContext(String request) throws FHIRException {
}

@Override
public String linkCareContext(String request) throws FHIRException {
String res = null;
String linkToken = null;
public String linkCareContext(String request) throws FHIRException { String linkToken = null;
Map<String, String> responseMap = new HashMap<>();
RestTemplate restTemplate = new RestTemplate();

Expand Down Expand Up @@ -210,9 +210,9 @@ public String linkCareContext(String request) throws FHIRException {
} else {
if (jsonObject.has("Error") && !jsonObject.get("Error").isJsonNull()) {
JsonObject errorObject = jsonObject.getAsJsonObject("Error");
responseMap.put("Error", errorObject.toString());
responseMap.put("error", errorObject.toString());
} else {
responseMap.put("Error", "Unknown error");
responseMap.put("error", "Unknown error");
}
}
} catch (Exception e) {
Expand All @@ -222,7 +222,7 @@ public String linkCareContext(String request) throws FHIRException {

}

if (linkToken != null) {
if (linkToken != null) {

headers.add("Content-Type", MediaType.APPLICATION_JSON + ";charset=utf-8");
headers.add("REQUEST-ID", UUID.randomUUID().toString());
Expand Down Expand Up @@ -277,7 +277,7 @@ public String linkCareContext(String request) throws FHIRException {
logger.info("ABDM response for generate token link for carecontext : " + responseEntity);
String responseStrLogin = common_NDHMService.getBody(responseEntity);
if (responseEntity.getStatusCode() == HttpStatusCode.valueOf(202)) {
res = "Care Context added successfully";
responseMap.put("message", "Care Context added successfully");

} else {
throw new FHIRException(responseEntity.getBody());
Expand All @@ -287,7 +287,7 @@ public String linkCareContext(String request) throws FHIRException {
throw new FHIRException(e.getMessage());
}

return res;
return responseMap.toString();
}

public String checkRecordExisits(String abhaAddress) {
Expand Down
Loading