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-755: Modify user resource to include email property which would enable a user email to be edited from reference application #404

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

tenas97
Copy link

@tenas97 tenas97 commented Aug 22, 2019

Allow user email to be edited from reference application

Description of what I changed

Modify user resource to include email property which would enable a user email to be edited from reference application

Issue I worked on

https://issues.openmrs.org/browse/RESTWS-755?filter=-2

Checklist: I completed these to help reviewers :)

  • My pull request only contains ONE single commit
    (the number above, next to the 'Commits' tab is 1).

    No? -> read here on how to squash multiple commits into one

  • 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

}
else if (rep instanceof FullRepresentation) {
description.addProperty("email");
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Whats the purpose of adding these if else conditions ? Both conditions are doing the same thing.

Copy link
Author

Choose a reason for hiding this comment

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

The first condition checks for defaultRepresentation, second condition checks for Full representation

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah but after checking its doing the same thing description.addProperty("email");

ModelImpl model = (ModelImpl) super.getGETModel(rep);
if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
model
.property("email", new StringProperty());
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this code formatted properly ?

Copy link
Author

Choose a reason for hiding this comment

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

I don't know why it displayed that way. I'd have to fix it

…ser email to be edited from reference application, fixed failing tests.
@tenas97 tenas97 changed the title Modify user resource to include email property which would enable a user email to be edited from reference application RESTWS-755: Modify user resource to include email property which would enable a user email to be edited from reference application Aug 24, 2019
@ibacher ibacher force-pushed the master branch 2 times, most recently from f9c73bb to 2a4407f Compare December 14, 2020 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants