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

RESTWS-955: Add support for person attribute of type Location #620

Merged
merged 2 commits into from
Sep 18, 2024

Conversation

mherman22
Copy link
Member

@mherman22 mherman22 commented Sep 4, 2024

Description of what I changed

Issue I worked on

see https://issues.openmrs.org/browse/RESTWS-955

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
Copy link
Member

ibacher commented Sep 17, 2024

I think the fix we need here is quite different. Specifically, I think we can leave the getter alone, but need to add logic to the setter so that if the supplied value is a UUID, we load the necessary location and set that as the attribute value. That way, we're still storing the id, but allowing the client to save by UUID.

@mherman22 mherman22 force-pushed the RESTWS-955 branch 2 times, most recently from c7be312 to 5b681a2 Compare September 18, 2024 05:26
return false;
}

private boolean isValidUUID(String value) {
Copy link
Member

Choose a reason for hiding this comment

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

Please use RestUtil.isValidUuid() for this.

Comment on lines 103 to 105
if (setLocationIfUUID(personAttribute, value)) {
return;
}
Copy link
Member

Choose a reason for hiding this comment

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

I think I'd probably just inline setLocationIfUUID() here. I don't see a lot of value in having a separate method.

@ibacher ibacher merged commit deb522d into openmrs:master Sep 18, 2024
1 check passed
@mherman22 mherman22 deleted the RESTWS-955 branch September 26, 2024 11:55
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