-
Notifications
You must be signed in to change notification settings - Fork 24
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
(fix) O3-3066 update queue entries accordingly after merging patients #69
Closed
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
58 changes: 58 additions & 0 deletions
58
api/src/main/java/org/openmrs/module/queue/api/MergePatientsWithQueueEntriesSaveHandler.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * This Source Code Form is subject to the terms of the Mozilla Public License, | ||
| * v. 2.0. If a copy of the MPL was not distributed with this file, You can | ||
| * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http://openmrs.org/license. | ||
| * | ||
| * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS | ||
| * graphic logo is a trademark of OpenMRS Inc. | ||
| */ | ||
| package org.openmrs.module.queue.api; | ||
|
|
||
| import java.util.Date; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.commons.logging.Log; | ||
| import org.apache.commons.logging.LogFactory; | ||
| import org.openmrs.Patient; | ||
| import org.openmrs.Person; | ||
| import org.openmrs.User; | ||
| import org.openmrs.annotation.Handler; | ||
| import org.openmrs.api.context.Context; | ||
| import org.openmrs.api.handler.SaveHandler; | ||
| import org.openmrs.module.queue.api.search.QueueEntrySearchCriteria; | ||
| import org.openmrs.module.queue.model.QueueEntry; | ||
| import org.openmrs.person.PersonMergeLog; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.beans.factory.annotation.Qualifier; | ||
|
|
||
| @Handler(supports = PersonMergeLog.class) | ||
| public class MergePatientsWithQueueEntriesSaveHandler implements SaveHandler<PersonMergeLog> { | ||
|
|
||
| private final Log log = LogFactory.getLog(getClass()); | ||
|
|
||
| private final QueueEntryService queueEntryService; | ||
|
|
||
| @Autowired | ||
| public MergePatientsWithQueueEntriesSaveHandler( | ||
| @Qualifier("queue.QueueEntryService") QueueEntryService queueEntryService) { | ||
| this.queueEntryService = queueEntryService; | ||
| } | ||
|
|
||
| @Override | ||
| public void handle(PersonMergeLog mergeLog, User creator, Date dateCreated, String other) { | ||
| Person winner = mergeLog.getWinner(); | ||
| Person loser = mergeLog.getLoser(); | ||
| Patient winnerPatient = Context.getPatientService().getPatient(winner.getPersonId()); | ||
| Patient loserPatient = Context.getPatientService().getPatient(loser.getPersonId()); | ||
|
|
||
| QueueEntrySearchCriteria criteria = new QueueEntrySearchCriteria(); | ||
| criteria.setPatient(loserPatient); | ||
| List<QueueEntry> queueEntries = queueEntryService.getQueueEntries(criteria); | ||
| for (QueueEntry qe : queueEntries) { | ||
| qe.setPatient(winnerPatient); | ||
| queueEntryService.saveQueueEntry(qe); | ||
| log.trace("Changed queue entry " + qe.getUuid() + ", setting patient to " + winner.getUuid()); | ||
| } | ||
| } | ||
| } | ||
73 changes: 73 additions & 0 deletions
73
.../test/java/org/openmrs/module/queue/api/MergePatientsWithQueueEntriesSaveHandlerTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * This Source Code Form is subject to the terms of the Mozilla Public License, | ||
| * v. 2.0. If a copy of the MPL was not distributed with this file, You can | ||
| * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http://openmrs.org/license. | ||
| * | ||
| * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS | ||
| * graphic logo is a trademark of OpenMRS Inc. | ||
| */ | ||
| package org.openmrs.module.queue.api; | ||
|
|
||
| import static org.hamcrest.Matchers.is; | ||
| import static org.junit.Assert.assertThat; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Date; | ||
| import java.util.List; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.openmrs.Patient; | ||
| import org.openmrs.api.PatientService; | ||
| import org.openmrs.api.context.Context; | ||
| import org.openmrs.module.queue.SpringTestConfiguration; | ||
| import org.openmrs.module.queue.model.QueueEntry; | ||
| import org.openmrs.test.BaseModuleContextSensitiveTest; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.beans.factory.annotation.Qualifier; | ||
| import org.springframework.test.context.ContextConfiguration; | ||
|
|
||
| @ContextConfiguration(classes = SpringTestConfiguration.class, inheritLocations = false) | ||
| public class MergePatientsWithQueueEntriesSaveHandlerTest extends BaseModuleContextSensitiveTest { | ||
|
|
||
| private static final List<String> INITIAL_DATASET_XML = Arrays.asList( | ||
| "org/openmrs/module/queue/api/dao/QueueDaoTest_locationInitialDataset.xml", | ||
| "org/openmrs/module/queue/api/dao/QueueEntryDaoTest_conceptsInitialDataset.xml", | ||
| "org/openmrs/module/queue/api/dao/QueueEntryDaoTest_patientInitialDataset.xml", | ||
| "org/openmrs/module/queue/api/dao/VisitQueueEntryDaoTest_visitInitialDataset.xml", | ||
| "org/openmrs/module/queue/api/dao/QueueDaoTest_initialDataset.xml", | ||
| "org/openmrs/module/queue/api/dao/QueueEntryDaoTest_initialDataset.xml", | ||
| "org/openmrs/module/queue/validators/QueueEntryValidatorTest_globalPropertyInitialDataset.xml"); | ||
|
|
||
| @Autowired | ||
| @Qualifier("queue.QueueEntryService") | ||
| private QueueEntryService queueEntryService; | ||
|
|
||
| @Before | ||
| public void setup() { | ||
| INITIAL_DATASET_XML.forEach(this::executeDataSet); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldChangeQueueEntryPatientOnMergingPatient() throws Exception { | ||
| PatientService ps = Context.getPatientService(); | ||
| Patient winnerPatient = ps.getPatient(100); | ||
| Patient loserPatient = ps.getPatient(101); | ||
|
|
||
| // set up queue entry for loserPatient | ||
| QueueEntry queueEntryToCloneFrom = queueEntryService.getQueueEntryById(1).get(); | ||
| QueueEntry queueEntry = new QueueEntry(); | ||
| queueEntry.setPatient(loserPatient); | ||
| queueEntry.setQueue(queueEntryToCloneFrom.getQueue()); | ||
| queueEntry.setStatus(queueEntryToCloneFrom.getStatus()); | ||
| queueEntry.setPriority(queueEntryToCloneFrom.getPriority()); | ||
| queueEntry.setStartedAt(new Date()); | ||
| queueEntryService.saveQueueEntry(queueEntry); | ||
|
|
||
| assertThat(queueEntry.getPatient().getPatientId(), is(loserPatient.getPatientId())); | ||
| ps.mergePatients(winnerPatient, loserPatient); | ||
| queueEntry = queueEntryService.getQueueEntryById(11).get(); | ||
| assertThat(queueEntry.getPatient().getPatientId(), is(winnerPatient.getPatientId())); | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should Autowire the patient service in through the constructor as you are doing with the QueueEntryService