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.

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

(fix) Set encounter and default role for encounter provider entity #542

Merged
merged 11 commits into from
Jul 12, 2024

Conversation

icrc-psousa
Copy link
Contributor

@icrc-psousa icrc-psousa commented Jun 25, 2024

Description of what I changed

This PR resolves the SQLIntegrityConstraintViolationException when creating an encounter via the FHIR API with a participant. The root cause was the EncounterProvider entity being flushed to the database before the Encounter was created, resulting in a null encounter_id. This update ensures the EncounterProvider entity is properly linked to the Encounter before being persisted.

Issue I worked on

see https://issues.openmrs.org/browse/FM2-639

Checklist: I completed these to help reviewers :)

  • My IDE is configured to follow the code style of this project.

    No? Unsure? -> configure your IDE, format the code and add the changes with git add . && git commit --amend

  • I have added tests to cover my changes. (If you refactored
    existing code that was well tested you do not have to add tests)

    No? -> write tests and add them to this commit git add . && git commit --amend

  • I ran mvn clean package right before creating this pull request and
    added all formatting changes to my commit.

    No? -> execute above command

  • All new and existing tests passed.

    No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.

  • My pull request is based on the latest changes of the master branch.

    No? Unsure? -> execute command git pull --rebase upstream master

@icrc-psousa icrc-psousa marked this pull request as draft June 25, 2024 16:22
@dkayiwa
Copy link
Member

dkayiwa commented Jun 25, 2024

@icrc-psousa did you see the above build failure?

Copy link

codecov bot commented Jun 26, 2024

Codecov Report

Attention: Patch coverage is 75.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 77.89%. Comparing base (c7f2ec2) to head (06b85c3).
Report is 4 commits behind head on master.

Current head 06b85c3 differs from pull request most recent head f109d6f

Please upload reports for the commit f109d6f to get more accurate results.

Files Patch % Lines
.../api/translators/impl/EncounterTranslatorImpl.java 75.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##             master     #542      +/-   ##
============================================
+ Coverage     77.84%   77.89%   +0.04%     
- Complexity     2683     2706      +23     
============================================
  Files           239      239              
  Lines          7452     7507      +55     
  Branches        901      916      +15     
============================================
+ Hits           5801     5847      +46     
- Misses         1115     1116       +1     
- Partials        536      544       +8     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@icrc-psousa icrc-psousa requested review from ibacher and dkayiwa June 28, 2024 16:33
@icrc-psousa
Copy link
Contributor Author

icrc-psousa commented Jun 28, 2024

@icrc-psousa did you see the above build failure?

Issue was now addressed. Thanks for the heads-up @dkayiwa
I've also added some more info and linked an issue. I'm not sure who can give more insights on this. Feel free to add reviewers.

@icrc-psousa icrc-psousa marked this pull request as ready for review June 28, 2024 16:41
Copy link
Member

@ibacher ibacher left a comment

Choose a reason for hiding this comment

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

Thanks @icrc-psousa! A few suggestions on how to better integrate this with the code base here.

@ibacher ibacher merged commit 5866889 into master Jul 12, 2024
2 checks passed
@ibacher ibacher deleted the fix/encounter-provider-entity branch July 12, 2024 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants