issue-3455 - adding resource info from location when return preferenc… #4130
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e is OperationOutcome Signed-off-by: PrasannaHegde1 <phegde@merative.com>
lmsurpre
reviewed
Dec 15, 2022
| * @return AuditLogEntry - an initialized audit log entry. | ||
| */ | ||
| protected static AuditLogEntry populateBundleAuditLogEntry(AuditLogEntry entry, Bundle.Entry responseEntry, HttpServletRequest request, Resource resource, | ||
| Date startTime, Date endTime, Response.Status responseStatus) { |
There was a problem hiding this comment.
minor formatting: for method signatures that span multiple lines we double-indent to offset from the first line of the implementation
Suggested change
| Date startTime, Date endTime, Response.Status responseStatus) { | |
| Date startTime, Date endTime, Response.Status responseStatus) { |
There was a problem hiding this comment.
This has been fixed.
lmsurpre
reviewed
Dec 15, 2022
fhir-server/src/main/java/org/linuxforhealth/fhir/server/util/RestAuditLogger.java
Outdated
Show resolved
Hide resolved
Signed-off-by: PrasannaHegde1 <phegde@merative.com>
Signed-off-by: PrasannaHegde1 <phegde@merative.com>
Signed-off-by: PrasannaHegde1 <phegde@merative.com>
Signed-off-by: PrasannaHegde1 <phegde@merative.com>
lmsurpre
reviewed
Jan 24, 2023
Comment on lines
+1566
to
+1569
| // history | ||
| // bundle = addRequestToBundle(null, bundle, HTTPVerb.GET, "Patient/" + patientT1.getId() + "/_history", null, null); | ||
| // search | ||
| // bundle = addRequestToBundle(null, bundle, HTTPVerb.GET, "Patient?family=Ortiz&_count=100", null, null); |
There was a problem hiding this comment.
I see the original test had these commented out too, but it makes me wonder why...
lmsurpre
reviewed
Jan 24, 2023
| for (Entry entry: responseBundle.getEntry()) { | ||
| id = entry.getResource().getId(); | ||
| Resource resourceToDelete = entry.getResource(); | ||
|
|
||
There was a problem hiding this comment.
very minor (whitespace removal)
Suggested change
lmsurpre
reviewed
Jan 24, 2023
Comment on lines
+831
to
+846
| if (HTTPReturnPreference.REPRESENTATION.equals(FHIRRequestContext.get().getReturnPreference())) { | ||
| return entry; | ||
| } | ||
| if (responseEntry.getResponse() == null || responseEntry.getResponse().getLocation() == null) { | ||
| return entry; | ||
| } | ||
| // Populate the resource id, resource type and version id from the | ||
| // Bundle response entry location when the return preference is "OperationOutcome". | ||
| String location = responseEntry.getResponse().getLocation().getValue(); | ||
| String[] parts = location.split("/"); | ||
| if (parts.length > 3) { | ||
| Collections.reverse(Arrays.asList(parts)); | ||
| entry.getContext().setData(Data.builder().build()); | ||
| entry.getContext().getData().setResourceType(parts[3]); | ||
| entry.getContext().getData().setVersionId(parts[0]); | ||
| entry.getContext().getData().setId(parts[2]); |
There was a problem hiding this comment.
is it possible to always populate the AuditLogEntry in the same way (e.g. from the response location)?
do we not set that unless the return preference is OperationOutcome?
lmsurpre
reviewed
Jan 24, 2023
| * @throws Exception | ||
| */ | ||
| protected static void logBundleDelete(AuditLogService auditLogSvc, Bundle.Entry responseEntry, HttpServletRequest request, Resource resource, | ||
| Date startTime, Date endTime, Response.Status responseStatus, String location, String description) throws Exception { |
There was a problem hiding this comment.
minor
Suggested change
| Date startTime, Date endTime, Response.Status responseStatus, String location, String description) throws Exception { | |
| Date startTime, Date endTime, Response.Status responseStatus, String location, String description) throws Exception { |
lmsurpre
reviewed
Jan 24, 2023
| for (Extension extension : responseEntry.getExtension()) { | ||
| AuditLogEntry entry = initLogEntry(AuditLogEventType.FHIR_BUNDLE); | ||
| populateAuditLogEntry(entry, request, resource, startTime, endTime, responseStatus); | ||
| String resourceInfo = extension.getValue().as(FHIR_STRING).getValue(); |
There was a problem hiding this comment.
I think we should double-check the URL of the extension instead of just assuming all extensions will be the ones we're expecting
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…e is OperationOutcome
Signed-off-by: PrasannaHegde1 phegde@merative.com