TRUNK-5842-ProgramWorkflow-Domain-Switching-from-Hibernate-Mappings to annotations #4888
+40
−61
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ManojLL
suggested changes
Jan 15, 2025
There was a problem hiding this comment.
@Isabirye1515 before you create the PR make sure to run mav clean install.
| @Column(name = "name", nullable = false, length = 255) | ||
| @Column(name = "name", length = 255) |
| @@ -399,16 +399,19 @@ public void saveProgram_shouldCreateProgramWorkflows() { | |||
|
|
|||
| ProgramWorkflow workflow = new ProgramWorkflow(); | |||
| workflow.setConcept(cs.getConcept(4)); | |||
| workflow.setName("CIVIL STATUS"); // Set a valid name | |||
There was a problem hiding this comment.
is there any reason to update this tests?
| program.addWorkflow(workflow); | ||
|
|
||
| ProgramWorkflowState state1 = new ProgramWorkflowState(); | ||
| state1.setConcept(cs.getConcept(5)); | ||
| state1.setName("SINGLE"); // Set a valid name |
There was a problem hiding this comment.
is there any reason to update this test?
| state1.setInitial(true); | ||
| state1.setTerminal(false); | ||
| workflow.addState(state1); | ||
|
|
||
| ProgramWorkflowState state2 = new ProgramWorkflowState(); | ||
| state2.setConcept(cs.getConcept(6)); | ||
| state2.setName("MARRIED"); // Set a valid name |
There was a problem hiding this comment.
is there any reason to update this tests?
| @@ -422,7 +425,7 @@ public void saveProgram_shouldCreateProgramWorkflows() { | |||
| assertEquals(1, p.getWorkflows().size(), "Wrong number of workflows"); | |||
|
|
|||
| ProgramWorkflow wf = p.getWorkflowByName("CIVIL STATUS"); | |||
| assertNotNull(wf); | |||
| assertNotNull(wf, "Workflow 'CIVIL STATUS' not found"); | |||
There was a problem hiding this comment.
is there any reason to update this tests?
| @@ -387,9 +387,9 @@ public void savePatientProgram_shouldSetEndDateOfAllRecentStatesOnTransitionToTe | |||
| * | |||
| * @see ProgramWorkflowService#saveProgram(Program) | |||
| */ | |||
| @SuppressWarnings("null") | |||
| @@ -109,6 +109,7 @@ | |||
| <mapping resource="org/openmrs/api/db/hibernate/ClobDatatypeStorage.hbm.xml" /> | |||
|
|
|||
| <!-- These mappings are required because of rerefences in Obs & Concept --> | |||
| <mapping class="org.openmrs.ProgramWorkflow" /> | |||
| @@ -80,7 +80,7 @@ | |||
| <mapping resource="org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml" /> | |||
| <mapping resource="org/openmrs/api/db/hibernate/EncounterRole.hbm.xml" /> | |||
| <mapping resource="org/openmrs/api/db/hibernate/Program.hbm.xml" /> | |||
| <mapping resource="org/openmrs/api/db/hibernate/ProgramWorkflow.hbm.xml" /> | |||
|
|
|||
| @@ -585,7 +589,6 @@ public void getWorkflowByUuid_shouldReturnNullIfNoObjectFoundWithGivenUuid() { | |||
| public void getSortedStates_shouldSortNamesContainingNumbersIntelligently() { | |||
|
|
|||
| ProgramWorkflow program = new ProgramWorkflow(); | |||
|
|
|||
Comment on lines
+50
to
+52
| @Id | ||
| @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "program_workflow_program_workflow_id_seq") | ||
| @Column(name = "program_workflow_id") |
There was a problem hiding this comment.
Suggested change
| @Id | |
| @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "program_workflow_program_workflow_id_seq") | |
| @Column(name = "program_workflow_id") | |
| @Id | |
| @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "program_workflow_id_seq") | |
| @GenericGenerator( | |
| name = "program_workflow_id_seq", | |
| strategy = "native", | |
| parameters = @Parameter(name = "sequence", value = "program_workflow_program_workflow_id_seq") | |
| ) | |
| @Column(name = ""program_workflow_id") |
|
@Isabirye1515 rename the PR title as |
Isabirye1515
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…o-Annotations
Description of what I changed
Issue I worked on
see https://issues.openmrs.org/browse/TRUNK-
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 --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