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

TRUNK-6278: Skip visit overlap validation when ending a visit #4835

Merged
merged 1 commit into from
Nov 14, 2024

Conversation

jayasanka-sack
Copy link
Member

@jayasanka-sack jayasanka-sack commented Nov 13, 2024

Description of what I changed

Currently, you can’t end a visit if there’s already an active overlapping visit. While the UI prevents this with the new overlap logic, there are situations where it could still happen, like:

  1. An instance was originally set to allow overlapping visits, but later changed to disallow them.
  2. Retrospective visit data from a database migration or another integration.

To handle these cases, it makes sense to allow ending active visits even if they overlap, if and only if:

  1. The visit being ended is currently active, and
  2. Its start date hasn’t been modified.

Check: #4834

Issue I worked on

see https://issues.openmrs.org/browse/TRUNK-6278

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

@ibacher ibacher merged commit ddba2b4 into openmrs:master Nov 14, 2024
6 checks passed
@jayasanka-sack jayasanka-sack deleted the TRUNK-6278-backport branch November 14, 2024 10:36
wikumChamith pushed a commit to wikumChamith/openmrs-core that referenced this pull request Nov 18, 2024
wikumChamith pushed a commit to wikumChamith/openmrs-core that referenced this pull request Nov 18, 2024
wikumChamith pushed a commit that referenced this pull request Nov 18, 2024
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.

2 participants