Skip to content
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

Jump to bottom

Create endpoint for resending an EhrExtract #990

Merged
merged 28 commits into from
Nov 26, 2024
Merged

Create endpoint for resending an EhrExtract #990

merged 28 commits into from
Nov 26, 2024

Conversation

adrianclay
Copy link
Collaborator

@adrianclay adrianclay commented Nov 12, 2024 •
edited by ole4ryb
Loading

What

Please include a summary of the changes and the related issue

Why

Please include details of the reasoning for these changes

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Internal change (non-breaking change with no effect on the functionality affecting end users)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • I have performed a self-review of my code
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I have updated the Changelog with details of my change in the UNRELEASED section if this change will affect end users

@adrianclay adrianclay force-pushed the NIAD-3234-create-endpoint branch from f2d4dd5 to 24da3bb Compare November 12, 2024 13:56
ole4ryb added 15 commits November 12, 2024 14:33
@ole4ryb
marking EhrExtractStatus as failed in a test scenario
b8e0173
@ole4ryb
the endpoint returns operationOutcome populated with more information
49dd7e8
@ole4ryb
adding a test for GpcStructureTask scheduler
8b42391
@ole4ryb
Merge branch 'main' into NIAD-3234-create-endpoint
8a1a8f5
@ole4ryb
using a refactored code instead of a stub implementation
7a4ab0e
@ole4ryb
small refactoring and adding logging to indicate a resend
830622d
@ole4ryb
Covering a scenario where GP2GP transfer hasn't failed but another re…
9cd5301 
…quest to resend has arrived
@ole4ryb
converting integration tests into unit tests
1346972
@ole4ryb
converting all Ehr resend integration tests into unit tests
b417275
@ole4ryb
adjusting tests for pitest to pass
28600ed
@ole4ryb
making EhrExtractStatus GpcAccessDocument null before resending
5838168
@ole4ryb
converting operationOutcome into json before sending it in ResponseEn…
af7598e 
…tity
@ole4ryb
test refactoring
02bfa50
@ole4ryb
addressing sonarQube improvement suggestion
c86cf77
@ole4ryb
tests refactoring
d07b5c7
@ole4ryb ole4ryb marked this pull request as ready for review November 21, 2024 15:59
MartinWheelerMT
MartinWheelerMT reviewed Nov 22, 2024
View reviewed changes
service/src/test/java/uk/nhs/adaptors/gp2gp/common/service/FhirParseServiceTest.java
String operationOutcomeUrl = rootNode.path("meta").path("profile").get(0).asText();

assertEquals(INVALID_IDENTIFIER_VALUE, code);
assertEquals(OPERATION_OUTCOME_URL, operationOutcomeUrl);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

really we should be using assertJ here for readability (assertThat(code).isEqualTo(INVALID_IDENTIFIER_VALUE))

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For me it is the other way around, I find "assertEquals" to be short, clean and readable.

MartinWheelerMT
MartinWheelerMT reviewed Nov 22, 2024
View reviewed changes
service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/EhrResendControllerTest.java

var response = ehrResendController.scheduleEhrExtractResend(CONVERSATION_ID);

JsonNode rootNode = objectMapper.readTree(response.getBody());
Copy link
Collaborator

@MartinWheelerMT MartinWheelerMT Nov 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really not sure what is going on with this? Why are we using a JsonTree and navigating it, rather than just reading the value into an object? The rootNode makes it a whole less readable

var operationOutcome = objectMapper.readValue(response.getBody(), OperationOutcome.class);

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I chose to work with JSON and assess via the prism of JSON as it is what we get in the end when "scheduleEhrExtractResend" returns a result.
They are all comparable technique (assessing JSON or operationOutcome object), just thought it would be more concise to do it that way via JSON because before I had to create an expected boilerplate operationOutcome objects etc.

MartinWheelerMT
MartinWheelerMT reviewed Nov 22, 2024
View reviewed changes
service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/EhrResendControllerTest.java

var response = ehrResendController.scheduleEhrExtractResend(CONVERSATION_ID);

JsonNode rootNode = objectMapper.readTree(response.getBody());
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, not sure why it is being done this way as not as a concrete type

MartinWheelerMT
MartinWheelerMT previously requested changes Nov 22, 2024
View reviewed changes
Copy link
Collaborator

@MartinWheelerMT MartinWheelerMT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see the comments left

adrianclay
adrianclay commented Nov 26, 2024
View reviewed changes
service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/EhrResendController.java
new Coding("http://fhir.nhs.net/ValueSet/gpconnect-error-or-warning-code-1", codeableConceptCode, null));
}

private static boolean hasNoErrorsInEhrReceivedAcknowledgement(EhrExtractStatus ehrExtractStatus) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor comment, but this doesn't really feel like it belongs in the Controller. Can refactor this in a later PR though.

@adrianclay adrianclay enabled auto-merge (squash) November 26, 2024 11:47
@adrianclay
Copy link
Collaborator Author

Paired with @ole4ryb reviewing this change, and we're both happy with this change.

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
96.7% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@NHSDigital NHSDigital deleted a comment from github-actions bot Nov 26, 2024
@adrianclay adrianclay merged commit bde8dcc into main Nov 26, 2024
14 checks passed
@adrianclay adrianclay deleted the NIAD-3234-create-endpoint branch November 26, 2024 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ole4ryb ole4ryb ole4ryb approved these changes

@MartinWheelerMT MartinWheelerMT Awaiting requested review from MartinWheelerMT

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@adrianclay @ole4ryb @MartinWheelerMT