-
Notifications
You must be signed in to change notification settings - Fork 57
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
META-268: Enabled saving Term-B before importing ConceptReferenceTerm… #46
Open
reagan-meant
wants to merge
1
commit into
openmrs:master
Choose a base branch
from
reagan-meant:META-268
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
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
40 changes: 40 additions & 0 deletions
40
.../java/org/openmrs/module/metadatasharing/handler/impl/ConceptReferenceTermMapHandler.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,40 @@ | ||
| /** | ||
| * The contents of this file are subject to the OpenMRS Public License | ||
| * Version 1.0 (the "License"); you may not use this file except in | ||
| * compliance with the License. You may obtain a copy of the License at | ||
| * http://license.openmrs.org | ||
| * | ||
| * Software distributed under the License is distributed on an "AS IS" | ||
| * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing rights and limitations | ||
| * under the License. | ||
| * | ||
| * Copyright (C) OpenMRS, LLC. All Rights Reserved. | ||
| */ | ||
| package org.openmrs.module.metadatasharing.handler.impl; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import org.openmrs.ConceptReferenceTermMap; | ||
| import org.openmrs.module.metadatasharing.handler.MetadataPriorityDependenciesHandler; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component("metadatasharing.ConceptReferenceTermMapHandler") | ||
| public class ConceptReferenceTermMapHandler implements MetadataPriorityDependenciesHandler<ConceptReferenceTermMap> { | ||
|
|
||
| @Override | ||
| public int getPriority() { | ||
| return 0; | ||
| } | ||
|
|
||
| @Override | ||
| public List<Object> getPriorityDependencies(ConceptReferenceTermMap object) { | ||
| List<Object>result=new ArrayList<Object>(); | ||
| if (object.getTermB() != null) { | ||
| result.add(object.getTermB()); | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| } |
70 changes: 70 additions & 0 deletions
70
...java/org/openmrs/module/metadatasharing/handler/impl/ConceptReferenceTermHandlerTest.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,70 @@ | ||
| package org.openmrs.module.metadatasharing.handler.impl; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.util.UUID; | ||
|
|
||
| import org.apache.commons.io.FileUtils; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.openmrs.api.ConceptService; | ||
| import org.openmrs.api.context.Context; | ||
| import org.openmrs.module.metadatasharing.MetadataSharing; | ||
| import org.openmrs.module.metadatasharing.SerializedPackage; | ||
| import org.openmrs.module.metadatasharing.wrapper.PackageImporter; | ||
| import org.openmrs.test.BaseModuleContextSensitiveTest; | ||
|
|
||
| public class ConceptReferenceTermHandlerTest extends BaseModuleContextSensitiveTest { | ||
|
|
||
| private ConceptService conceptService; | ||
|
|
||
| public static final String CONCEPT_SOURCE_UUID = UUID.randomUUID().toString(); | ||
|
|
||
| public static final String CONCEPT_REFERENCE_TERMS_HEADER = "mds-concept-reference-terms-header.xml"; | ||
|
|
||
| public static final String CONCEPT_REFERENCE_TERMS_METADATA = "mds-concept-reference-terms-metadata.xml"; | ||
|
|
||
| private String headerXml; | ||
|
|
||
| private String contentXml; | ||
|
|
||
| @Before | ||
| public void before() throws IOException { | ||
| File file1 = new File(ClassLoader.getSystemResource(CONCEPT_REFERENCE_TERMS_HEADER).getPath()); | ||
| File file2 = new File(ClassLoader.getSystemResource(CONCEPT_REFERENCE_TERMS_METADATA).getPath()); | ||
|
|
||
| headerXml = FileUtils.readFileToString(file1, "UTF-8"); | ||
| contentXml = FileUtils.readFileToString(file2, "UTF-8"); | ||
|
|
||
| conceptService = Context.getConceptService(); | ||
|
|
||
| PackageImporter metadataImporter = MetadataSharing.getInstance().newPackageImporter(); | ||
| metadataImporter.loadSerializedPackage(new SerializedPackage(headerXml, contentXml)); | ||
| metadataImporter.importPackage(); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldImport() { | ||
| Assert.assertNotNull("useless concept exists?", conceptService.getConcept("useless")); | ||
| Assert.assertEquals("useless", conceptService.getConcept("useless").getName().getName()); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void shouldSaveTermA(){ | ||
| Assert.assertEquals("name-1", | ||
| conceptService.getConceptReferenceTermByUuid("e6be7ef5-29bd-487e-b13f-6749f7e6616b").getName()); | ||
| Assert.assertEquals("CODE-1", | ||
| conceptService.getConceptReferenceTermByUuid("e6be7ef5-29bd-487e-b13f-6749f7e6616b").getCode()); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldSaveTermB() { | ||
| Assert.assertEquals("name-2", | ||
| conceptService.getConceptReferenceTermByUuid("a26bea69-1102-4b38-9f7e-4aaf28a2ae44").getName()); | ||
| Assert.assertEquals("CODE-2", | ||
| conceptService.getConceptReferenceTermByUuid("a26bea69-1102-4b38-9f7e-4aaf28a2ae44").getCode()); | ||
| } | ||
|
|
||
| } | ||
132 changes: 132 additions & 0 deletions
132
api-test/src/test/resources/mds-concept-reference-terms-header.xml
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,132 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <package id="1" uuid="f380b50b-379c-402f-be40-87db9e0111db"> | ||
| <dateCreated id="2">2012-08-29 12:04:32</dateCreated> | ||
| <name>useless-concept</name> | ||
| <description>useless concept export</description> | ||
| <openmrsVersion>1.9.0 Build 27760</openmrsVersion> | ||
| <version>1</version> | ||
| <groupUuid>1d181738-f2b2-4ed8-a087-da2a67092f14</groupUuid> | ||
| <modules id="3"> | ||
| <entry> | ||
| <string>htmlwidgets</string> | ||
| <string>1.6.0</string> | ||
| </entry> | ||
| <entry> | ||
| <string>reportingcompatibility</string> | ||
| <string>1.5.7</string> | ||
| </entry> | ||
| <entry> | ||
| <string>xforms</string> | ||
| <string>4.0.9.5</string> | ||
| </entry> | ||
| <entry> | ||
| <string>htmlformentry</string> | ||
| <string>1.9.3</string> | ||
| </entry> | ||
| <entry> | ||
| <string>htmlformentry19ext</string> | ||
| <string>0.9</string> | ||
| </entry> | ||
| <entry> | ||
| <string>metadatasharing</string> | ||
| <string>1.1-SNAPSHOT</string> | ||
| </entry> | ||
| <entry> | ||
| <string>patientflags</string> | ||
| <string>1.3.4</string> | ||
| </entry> | ||
| <entry> | ||
| <string>reporting</string> | ||
| <string>0.7.1.1</string> | ||
| </entry> | ||
| <entry> | ||
| <string>logic</string> | ||
| <string>0.5.2</string> | ||
| </entry> | ||
| <entry> | ||
| <string>serialization.xstream</string> | ||
| <string>0.2.5</string> | ||
| </entry> | ||
| </modules> | ||
| <items class="linked-hash-set" id="4"> | ||
| <org.openmrs.module.metadatasharing.Item id="5" uuid="927a803f-df3c-47aa-baeb-56cd0e262692"> | ||
| <id>6099</id> | ||
| <classname>org.openmrs.Concept</classname> | ||
| <dateChanged id="6">2012-08-29 12:03:49</dateChanged> | ||
| <retired>false</retired> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| </items> | ||
| <relatedItems class="linked-hash-set" id="7"> | ||
| <org.openmrs.module.metadatasharing.Item id="8" uuid="8d4a4c94-c2cc-11de-8d13-0010c6dffd0f"> | ||
| <id>4</id> | ||
| <classname>org.openmrs.ConceptDatatype</classname> | ||
| <dateChanged id="9">2004-02-02 00:00:00</dateChanged> | ||
| <retired>false</retired> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="10" uuid="8d4907b2-c2cc-11de-8d13-0010c6dffd0f"> | ||
| <id>1</id> | ||
| <classname>org.openmrs.ConceptClass</classname> | ||
| <dateChanged id="11">2004-02-02 00:00:00</dateChanged> | ||
| <retired>false</retired> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="12" uuid="ef84bdfb-de50-4b63-93ac-8b0ce2ba7435"> | ||
| <id>3461</id> | ||
| <classname>org.openmrs.ConceptName</classname> | ||
| <dateChanged id="13">2012-08-29 12:03:49</dateChanged> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="14" uuid="f8371eab-407f-4099-8cb7-7439bf6d525c"> | ||
| <id>3462</id> | ||
| <classname>org.openmrs.ConceptName</classname> | ||
| <dateChanged id="15">2012-08-29 12:03:49</dateChanged> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="16" uuid="f2bcd078-bc33-4718-882f-227af3f87c98"> | ||
| <id>3464</id> | ||
| <classname>org.openmrs.ConceptName</classname> | ||
| <dateChanged id="17">2012-08-29 12:03:49</dateChanged> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="18" uuid="f1f6578d-b3d3-47e1-9a74-3a4917e5e254"> | ||
| <id>3463</id> | ||
| <classname>org.openmrs.ConceptName</classname> | ||
| <dateChanged id="19">2012-08-29 12:03:49</dateChanged> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="20" uuid="d22f90ab-3c30-4938-a55e-88a71454973d"> | ||
| <id>2425</id> | ||
| <classname>org.openmrs.ConceptDescription</classname> | ||
| <dateChanged id="21">2012-08-29 12:03:49</dateChanged> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="22" uuid="3a518d23-25f7-4dd7-8ccc-d4b0b257960d"> | ||
| <id>1</id> | ||
| <classname>org.openmrs.ConceptMap</classname> | ||
| <dateChanged id="23">2012-08-29 12:03:49</dateChanged> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="24" uuid="6b63176e-f96c-48ec-bbd9-e88c00b9a752"> | ||
| <id>1</id> | ||
| <classname>org.openmrs.ConceptMapType</classname> | ||
| <dateChanged id="25">2011-11-04 00:00:00</dateChanged> | ||
| <retired>false</retired> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="26" uuid="e6be7ef5-29bd-487e-b13f-6749f7e6616b"> | ||
| <id>1</id> | ||
| <classname>org.openmrs.ConceptReferenceTerm</classname> | ||
| <dateChanged id="27">2012-08-29 12:01:20</dateChanged> | ||
| <retired>false</retired> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="28" uuid="25e06cde-6b7c-4c5e-a720-20018863fb5e"> | ||
| <id>1</id> | ||
| <classname>org.openmrs.ConceptSource</classname> | ||
| <dateChanged id="29">2012-08-29 11:54:40</dateChanged> | ||
| <retired>false</retired> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="30" uuid="7b085901-a7f3-4c64-9eca-5c468a1fc153"> | ||
| <id>1</id> | ||
| <classname>org.openmrs.ConceptReferenceTermMap</classname> | ||
| <dateChanged id="31">2012-08-29 12:02:56</dateChanged> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| <org.openmrs.module.metadatasharing.Item id="32" uuid="a26bea69-1102-4b38-9f7e-4aaf28a2ae44"> | ||
| <id>2</id> | ||
| <classname>org.openmrs.ConceptReferenceTerm</classname> | ||
| <dateChanged id="33">2012-08-29 12:03:25</dateChanged> | ||
| <retired>false</retired> | ||
| </org.openmrs.module.metadatasharing.Item> | ||
| </relatedItems> | ||
| </package> |
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.
Do you have any reason as to why these are class level instead of local variables?