TRUNK-5373: Refactor the condition save logic. #2665
Conversation
| @@ -48,6 +48,25 @@ public ConditionDAO getConditionDAO() { | |||
| */ | |||
| @Override | |||
| public Condition saveCondition(Condition condition) { | |||
| Condition existingCondition = getConditionByUuid(condition.getUuid()); | |||
There was a problem hiding this comment.
@Arthur236 did you intentionally leave out the first three lines in the original save method of the emrapi module?
There was a problem hiding this comment.
@dkayiwa yes I did. The Condition class in the core does not have a getter method for the endReason
| if (existingCondition == null) { | ||
| return conditionDAO.saveCondition(condition); | ||
| } | ||
|
|
There was a problem hiding this comment.
Did you intentionally skip this as it was in the emrapi module? condition = Condition.newInstance(condition)
There was a problem hiding this comment.
Yes I did. I was trying to avoid having to change the original Condition class since it did not have a newInstance method. I could however add it if this is not a problem.
| @@ -15,7 +15,7 @@ | |||
| "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> | |||
| <hibernate-mapping package="org.openmrs"> | |||
|
|
|||
| <class name="Condition" table="condition"> | |||
| <class name="Condition" table="`condition`"> | |||
There was a problem hiding this comment.
Can we remove these quotes around condition? We are using a different strategy as @paradisekelechi can update you.
This reverts commit 2f33e4f.
This reverts commit 2f33e4f.
Description of what I changed
Changed 3 files for this task:
Issue I worked on
See https://issues.openmrs.org/browse/TRUNK-5373
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 --amendI 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 --amendI ran
mvn clean packageright before creating this pull request andadded 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