Skip to content

Commit

Permalink
U4X-530: Remove form duplication in the json form deployment process (m…
Browse files Browse the repository at this point in the history
  • Loading branch information
slubwama authored Apr 12, 2024
1 parent d46d9c3 commit df3bc7c
Show file tree
Hide file tree
Showing 51 changed files with 376 additions and 208 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ protected void load(File file) throws Exception {
throw new Exception("Form Version is required");
}

String uuid = generateUuidFromObjects(AMPATH_FORMS_UUID, formName, formVersion);
String uuid = (String) jsonFile.get("uuid");
// Process Form
// ISSUE-150 If form with uuid present then update it
Form form = formService.getFormByUuid(uuid);
Expand Down Expand Up @@ -181,21 +181,14 @@ protected void load(File file) throws Exception {
if (needToSaveForm) {
formService.saveForm(form);
}
} else if (formService.getForm(formName) != null) { // ISSUE-150 If form with name present then retire it and
// create a new one
form = formService.getForm(formName);
formService.retireForm(form, "Replaced with new version by Iniz");
createNewForm(uuid, formName, formDescription, formPublished, formRetired, encounterType, formVersion,
jsonString);
} else {// ISSUE-150 Create new form
}else {
createNewForm(uuid, formName, formDescription, formPublished, formRetired, encounterType, formVersion,
jsonString);
}
}

private void createNewForm(String uuid, String formName, String formDescription, Boolean formPublished,
Boolean formRetired, EncounterType encounterType, String formVersion, String jsonString) {
DatatypeService datatypeService = Context.getDatatypeService();
FormService formService = Context.getFormService();
String clobUuid = UUID.randomUUID().toString();
Form newForm = new Form();
Expand All @@ -206,7 +199,6 @@ private void createNewForm(String uuid, String formName, String formDescription,
newForm.setRetired(formRetired);
newForm.setPublished(formPublished);
newForm.setEncounterType(encounterType);

newForm = formService.saveForm(newForm);
createFormResource(newForm, clobUuid, jsonString);
}
Expand All @@ -222,19 +214,12 @@ private void createFormResource(Form form, String clobUuid, String jsonString) {
formResource.setValueReferenceInternal(clobUuid);
formResource.setDatatypeClassname("AmpathJsonSchema");
formService.saveFormResource(formResource);

ClobDatatypeStorage clobData = new ClobDatatypeStorage();
clobData.setUuid(clobUuid);
clobData.setValue(jsonString);
datatypeService.saveClobDatatypeStorage(clobData);
}

private static String generateUuidFromObjects(Object... args) {
String seed = Arrays.stream(args).map(arg -> arg == null ? "null" : arg.toString()).collect(Collectors.joining("_"));
String uuid = UUID.nameUUIDFromBytes(seed.getBytes()).toString();
return uuid;
}

public String getProviderName() {
return this.providerName;
}
Expand Down
12 changes: 12 additions & 0 deletions api/src/main/resources/liquibase.xml
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,18 @@ VALUES
UPDATE drug SET name = 'Abacavir 300 mg', dosage_form = 1513,concept_id = 814 WHERE drug_id = 3 and concept_id=165507;
</sql>
</changeSet>

<changeSet id="ugandaemr-20240411-1655" author="slubwama">
<preConditions onFail="CONTINUE">
<sqlCheck expectedResult="1">
select count(*) from concept where concept_id=175384;
</sqlCheck>
</preConditions>
<comment>Migrate data from other patient decision concept to rightful TB refferrall concept</comment>
<sql>
UPDATE obs SET concept_id = 175384 where concept_id=164435;
</sql>
</changeSet>
</databaseChangeLog>


Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
<concept concept_id="163149" retired="false" datatype_id="2" class_id="4" is_set="false" creator="1" date_created="2017-03-31 04:08:26.0" uuid="ddab2f41-b188-4fde-b2e2-b6f0c9b47e0c"/>
<concept concept_id="164433" retired="false" datatype_id="2" class_id="1" is_set="false" creator="1" date_created="2017-04-04 13:41:49.0" uuid="18f97e54-9f02-437e-bb67-35761f04531c"/>
<concept concept_id="164434" retired="false" datatype_id="2" class_id="5" is_set="false" creator="1" date_created="2017-04-04 13:45:03.0" uuid="d6205784-0634-4a2b-b561-a51ed2668bb7"/>
<concept concept_id="164435" retired="false" datatype_id="2" class_id="5" is_set="false" creator="1" date_created="2017-04-04 13:55:09.0" uuid="73c78325-fb9f-4473-a387-ef193e3a2a95"/>
<concept concept_id="175384" retired="false" datatype_id="2" class_id="5" is_set="false" creator="1" date_created="2017-04-04 13:55:09.0" uuid="d383ee86-50d8-4d43-b236-80cdf3e31a77"/>
<concept concept_id="164436" retired="false" datatype_id="3" class_id="5" is_set="false" creator="1" date_created="2017-04-04 14:01:50.0" uuid="9bf35577-f802-437d-8ca3-84ab15191d6e"/>
<concept concept_id="164437" retired="false" datatype_id="4" class_id="11" is_set="false" creator="1" date_created="2017-04-04 14:05:29.0" uuid="05fdf5a3-442a-40d3-bd9c-e79a275217e5"/>
<concept concept_id="164924" retired="false" datatype_id="2" class_id="7" is_set="false" creator="1" date_created="2017-05-15 09:20:56.0" uuid="70d0c3e5-20c6-48f7-ab82-4ecdd86874d4"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@
<concept_answer concept_answer_id="6610" concept_id="164434" answer_concept="664" creator="1" date_created="2017-04-04 13:47:09.0" sort_weight="2.0" uuid="395a0687-8262-4b90-bf9c-ea11d3de0ca9"/>
<concept_answer concept_answer_id="6611" concept_id="164434" answer_concept="1118" creator="1" date_created="2017-04-04 13:47:09.0" sort_weight="3.0" uuid="9a08324d-fe3d-4af3-98aa-94c46a8e3f16"/>
<concept_answer concept_answer_id="6612" concept_id="164435" answer_concept="1066" creator="1" date_created="2017-04-04 13:55:09.0" sort_weight="2.0" uuid="9f025518-8135-450e-ba1a-9e9c19504ab3"/>
<concept_answer concept_answer_id="6613" concept_id="164435" answer_concept="1065" creator="1" date_created="2017-04-04 13:55:09.0" sort_weight="1.0" uuid="cc88b8e6-359a-4595-a336-f1f07adff0d9"/>
<concept_answer concept_answer_id="6613" concept_id="175384" answer_concept="1065" creator="1" date_created="2017-04-04 13:55:09.0" sort_weight="1.0" uuid="cc88b8e6-359a-4595-a336-f1f07adff0d9"/>
<concept_answer concept_answer_id="6777" concept_id="164924" answer_concept="1065" creator="1" date_created="2017-05-15 09:22:40.0" sort_weight="1.0" uuid="b57c7aa5-1ede-417f-9330-097b8f0666f7"/>
<concept_answer concept_answer_id="6778" concept_id="164924" answer_concept="1066" creator="1" date_created="2017-05-15 09:22:40.0" sort_weight="2.0" uuid="db413fd2-cde3-4a08-bc4f-90c556725d15"/>
<concept_answer concept_answer_id="1498" concept_id="139071" answer_concept="1067" creator="1" date_created="2009-06-23 21:48:05" uuid="1498CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" sort_weight="1498"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
<concept_description concept_description_id="17590" concept_id="163149" description="A list of HMIS 105 outpatient diagnosis" locale="en" creator="1" date_created="2017-03-31 04:08:26.0" uuid="2a7216b4-00f0-463d-88c7-ab000d4f2181"/>
<concept_description concept_description_id="18305" concept_id="164433" description="Kind of malaria test done" locale="en" creator="1" date_created="2017-04-04 13:41:49.0" uuid="4bab498d-f8df-4611-a381-85950c5e819d"/>
<concept_description concept_description_id="18306" concept_id="164434" description="Results from the malaria test done" locale="en" creator="1" date_created="2017-04-04 13:45:03.0" uuid="fdb08917-34a7-4363-bc35-9c52e0a791ac"/>
<concept_description concept_description_id="18307" concept_id="164435" description="Is patient linked to the TB clinic or treatment after diagnosed with TB." locale="en" creator="1" date_created="2017-04-04 13:55:09.0" uuid="cfbfa7fe-2650-4fe4-878c-9b9a1fbc9328"/>
<concept_description concept_description_id="18307" concept_id="175384" description="Is patient linked to the TB clinic or treatment after diagnosed with TB." locale="en" creator="1" date_created="2017-04-04 13:55:09.0" uuid="cfbfa7fe-2650-4fe4-878c-9b9a1fbc9328"/>
<concept_description concept_description_id="18308" concept_id="164436" description="The referral number given to a patient when first referred to current facility" locale="en" creator="1" date_created="2017-04-04 14:01:50.0" uuid="4673c8d8-d796-4e5a-bc2b-df959098503a"/>
<concept_description concept_description_id="18312" concept_id="164924" description="does patient need palliative care." locale="en" creator="1" date_created="2017-05-15 09:22:40.0" uuid="8b9c234d-0a7c-4c26-82f8-e42098abe861"/>
<concept_description concept_description_id="3789" concept_id="113705" description="Tumors or cancer of the MOUTH." locale="en" creator="1" date_created="2007-10-18 04:28:24.0" uuid="3789FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1199,11 +1199,11 @@
<concept_name concept_name_id="140501" concept_id="164434" name="Malaria test result" locale="en" locale_preferred="true" creator="1" date_created="2017-04-04 13:45:03.0" concept_name_type="FULLY_SPECIFIED" voided="false" uuid="e234ff2f-cc16-487e-880e-9c034eba37d9"/>
<concept_name concept_name_id="140502" concept_id="164434" name="Test" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 13:45:03.0" concept_name_type="INDEX_TERM" voided="false" uuid="ddbb16e4-99d7-4eac-a627-276a7b71e692"/>
<concept_name concept_name_id="140503" concept_id="164434" name="Result" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 13:47:09.0" concept_name_type="INDEX_TERM" voided="false" uuid="b9f8ad7a-31d7-403a-a497-5f2d2237d1e0"/>
<concept_name concept_name_id="140504" concept_id="164435" name="Tb clinic" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 13:55:09.0" concept_name_type="INDEX_TERM" voided="false" uuid="8f5d27cc-5d03-407a-875b-5f362e4ba191"/>
<concept_name concept_name_id="140505" concept_id="164435" name="Linked" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 13:55:09.0" concept_name_type="INDEX_TERM" voided="false" uuid="405eeb80-b533-4858-a0e9-1765e126996e"/>
<concept_name concept_name_id="140506" concept_id="164435" name="Referred for Tuberculosis treatment" locale="en" locale_preferred="true" creator="1" date_created="2017-04-04 13:55:09.0" concept_name_type="FULLY_SPECIFIED" voided="false" uuid="0ccdec7a-ab2a-437a-95c3-50fba7e025ee"/>
<concept_name concept_name_id="140507" concept_id="164435" name="Linked to Tuberculosis treatment" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 13:55:09.0" voided="false" uuid="9a7b4fb5-27d3-4d28-bc30-067ee3a5f4d0"/>
<concept_name concept_name_id="140508" concept_id="164435" name="Linked TB Clinic" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 13:55:09.0" concept_name_type="SHORT" voided="false" uuid="1d69c99b-d9d9-46b3-9b74-c41aa6d67f08"/>
<concept_name concept_name_id="140504" concept_id="175384" name="Tb clinic" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 13:55:09.0" concept_name_type="INDEX_TERM" voided="false" uuid="8f5d27cc-5d03-407a-875b-5f362e4ba191"/>
<concept_name concept_name_id="140505" concept_id="175384" name="Linked" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 13:55:09.0" concept_name_type="INDEX_TERM" voided="false" uuid="405eeb80-b533-4858-a0e9-1765e126996e"/>
<concept_name concept_name_id="140506" concept_id="175384" name="Referred for Tuberculosis treatment" locale="en" locale_preferred="true" creator="1" date_created="2017-04-04 13:55:09.0" concept_name_type="FULLY_SPECIFIED" voided="false" uuid="0ccdec7a-ab2a-437a-95c3-50fba7e025ee"/>
<concept_name concept_name_id="140507" concept_id="175384" name="Linked to Tuberculosis treatment" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 13:55:09.0" voided="false" uuid="9a7b4fb5-27d3-4d28-bc30-067ee3a5f4d0"/>
<concept_name concept_name_id="140508" concept_id="175384" name="Linked TB Clinic" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 13:55:09.0" concept_name_type="SHORT" voided="false" uuid="1d69c99b-d9d9-46b3-9b74-c41aa6d67f08"/>
<concept_name concept_name_id="140509" concept_id="164436" name="Transfer In Number" locale="en" locale_preferred="true" creator="1" date_created="2017-04-04 14:01:50.0" concept_name_type="FULLY_SPECIFIED" voided="false" uuid="5098ce3e-5f8a-4933-8346-4ea6182c32eb"/>
<concept_name concept_name_id="140510" concept_id="164436" name="Transfer In" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 14:01:50.0" concept_name_type="INDEX_TERM" voided="false" uuid="e0216806-2d9f-41e8-b986-af4ee68b9ad5"/>
<concept_name concept_name_id="140511" concept_id="164436" name="Referral In Number" locale="en" locale_preferred="false" creator="1" date_created="2017-04-04 14:01:50.0" voided="false" uuid="189f59dc-b679-4f19-b452-db13f15db858"/>
Expand Down Expand Up @@ -5491,7 +5491,6 @@

<!-- Drug Concepts -->
<concept_name concept_name_id="160867" concept_id="165506" name="Dispersible tablet" locale="en" locale_preferred="true" creator="1" date_created="2020-02-20 10:34:50" concept_name_type="FULLY_SPECIFIED" voided="0" uuid="e30e4076-bc47-4ada-a957-d1df21857284"/>
<concept_name concept_name_id="160869" concept_id="165508" name="Abacavir and Lamivudine" locale="en" locale_preferred="true" creator="1" date_created="2020-02-20 10:34:51" concept_name_type="FULLY_SPECIFIED" voided="0" uuid="cb27e9c3-dc7d-4237-ac45-ed5b561e9722"/>
<concept_name concept_name_id="160870" concept_id="165509" name="Acetic acid" locale="en" locale_preferred="true" creator="1" date_created="2020-02-20 10:34:51" concept_name_type="FULLY_SPECIFIED" voided="0" uuid="82264721-b206-4a60-bc16-a48238cd1afe"/>
<concept_name concept_name_id="160871" concept_id="165510" name="Solution" locale="en" locale_preferred="true" creator="1" date_created="2020-02-20 10:34:52" concept_name_type="FULLY_SPECIFIED" voided="0" uuid="0908f10f-7100-45c7-a5fe-f6a12fcb34a2"/>
<concept_name concept_name_id="160872" concept_id="165511" name="Acetyl salicylic acid" locale="en" locale_preferred="true" creator="1" date_created="2020-02-20 10:34:52" concept_name_type="FULLY_SPECIFIED" voided="0" uuid="48084555-a5c1-4ab0-b9ac-c9730a2aeedd"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@
<concept_reference_term concept_reference_term_id="283698" concept_source_id="4" name="abacavir" code="190521" creator="1" date_created="2020-02-20 10:34:50" retired="0" uuid="cece93ba-479b-44d3-a715-5702d940763b"/>
<concept_reference_term concept_reference_term_id="283699" concept_source_id="4" name="abacavir 600 MG" code="602392" creator="1" date_created="2020-02-20 10:34:50" retired="0" uuid="8a8c9c9b-f332-4ff9-9f1d-04aeaf00593b"/>
<concept_reference_term concept_reference_term_id="283700" concept_source_id="4" name="abacavir sulfate" code="221052" creator="1" date_created="2020-02-20 10:34:50" retired="0" uuid="5ed6c0b5-ae4a-44d4-956d-b7a826dcaf99"/>
<concept_reference_term concept_reference_term_id="283701" concept_source_id="4" name="abacavir and Lamivudine" code="614534" creator="1" date_created="2020-02-20 10:34:51" retired="0" uuid="c5152ded-1ead-4e89-b24d-9379ade27570"/>
<concept_reference_term concept_reference_term_id="283702" concept_source_id="4" name="abacavir 600 MG and Lamivudine 300 MG Oral Tablet" code="602393" creator="1" date_created="2020-02-20 10:34:51" retired="0" uuid="1a0d9f9c-a5da-47e5-8dd8-f548a4ec9eab"/>
<concept_reference_term concept_reference_term_id="283703" concept_source_id="4" name="Acetic Acid" code="168" creator="1" date_created="2020-02-20 10:34:51" retired="0" uuid="3e827961-b1a2-4126-a574-bd7e3c63ebd4"/>
<concept_reference_term concept_reference_term_id="283704" concept_source_id="4" name="Aspirin 300 MG Oral Tablet" code="199281" creator="1" date_created="2020-02-20 10:34:52" retired="0" uuid="86bd48af-80e2-43b5-a112-5500c5864c87"/>
<concept_reference_term concept_reference_term_id="283705" concept_source_id="4" name="Aspirin 75 MG" code="315429" creator="1" date_created="2020-02-20 10:34:52" retired="0" uuid="46b9e868-9a2c-4027-9a5b-cb0de12292ce"/>
Expand Down Expand Up @@ -614,8 +612,6 @@


<concept_reference_map concept_map_id="283698" concept_reference_term_id="283700" concept_map_type_id="1" creator="1" date_created="2020-02-20 10:34:51" concept_id="165507" uuid="fcd4a4a5-5b05-4c8b-be69-8dac50e22461"/>
<concept_reference_map concept_map_id="283699" concept_reference_term_id="283701" concept_map_type_id="3" creator="1" date_created="2020-02-20 10:34:51" concept_id="165508" uuid="74052127-6a67-48e8-aadc-4a404118887a"/>
<concept_reference_map concept_map_id="283700" concept_reference_term_id="283702" concept_map_type_id="1" creator="1" date_created="2020-02-20 10:34:51" concept_id="165508" uuid="9d5b1e85-abe8-4ac7-b005-2eaafb23e19e"/>
<concept_reference_map concept_map_id="283701" concept_reference_term_id="283703" concept_map_type_id="3" creator="1" date_created="2020-02-20 10:34:51" concept_id="165509" uuid="784f341f-0061-4bf5-9393-2dd1948b8a8e"/>
<concept_reference_map concept_map_id="283702" concept_reference_term_id="283704" concept_map_type_id="1" creator="1" date_created="2020-02-20 10:34:52" concept_id="165511" uuid="44186168-699f-4c36-863d-e9c503442f0e"/>
<concept_reference_map concept_map_id="283703" concept_reference_term_id="283705" concept_map_type_id="1" creator="1" date_created="2020-02-20 10:34:52" concept_id="165511" uuid="c7fb5cc2-44d8-4e00-bc89-663b9baf7867"/>
Expand Down
2 changes: 0 additions & 2 deletions api/src/main/resources/metadata/concepts_and_drugs/Drug.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<drug drug_id="1" concept_id="814" name="Abacavir Dispersible tablet 60 mg" combination="0" dosage_form="165506" creator="1" date_created="2020-02-20 10:34:50" retired="0" uuid="b6c01020-3cb3-4255-803c-ea483199be47" strength="60 mg"/>
<drug drug_id="2" concept_id="814" name="Abacavir Dispersible tablet 600 mg" combination="0" dosage_form="165506" creator="1" date_created="2020-02-20 10:34:50" retired="0" uuid="b8bca046-ad82-4410-8355-42a7767abae8" strength="600 mg"/>
<drug drug_id="3" concept_id="814" name="Abacavir 300 mg" combination="0" dosage_form="1513" creator="1" date_created="2020-02-20 10:34:51" retired="0" uuid="d2b02268-5bdb-44e3-a246-58d4953dd862" strength="300 mg"/>
<drug drug_id="4" concept_id="165508" name="Abacavir and Lamivudine Dispersible tablet 120 mg and 60 mg" combination="0" dosage_form="165506" creator="1" date_created="2020-02-20 10:34:51" retired="0" uuid="7db8eff7-75cf-40b1-a740-a10ede40a267" strength="120 mg and 60 mg"/>
<drug drug_id="5" concept_id="165508" name="Abacavir and lamivudine Tablet 600 mg and 300 mg" combination="0" dosage_form="1513" creator="1" date_created="2020-02-20 10:34:51" retired="0" uuid="d9805a29-c108-4417-9057-81f4baaef164" strength="600 mg and 300 mg"/>
<drug drug_id="6" concept_id="165509" name="Acetic acid Solution 5%" combination="0" dosage_form="165510" creator="1" date_created="2020-02-20 10:34:52" retired="0" uuid="62556b18-0f92-4c41-880e-dc00cfb8014e" strength="5%"/>
<drug drug_id="7" concept_id="165511" name="Acetyl salicylic acid Tablet 300 mg" combination="0" dosage_form="1513" creator="1" date_created="2020-02-20 10:34:52" retired="0" uuid="dbff2ab7-c417-4967-92cf-fcc0b3cb46c2" strength="300 mg"/>
<drug drug_id="8" concept_id="165511" name="Acetyl salicylic acid Tablet 75 mg" combination="0" dosage_form="1513" creator="1" date_created="2020-02-20 10:34:52" retired="0" uuid="8a2537a7-51fe-4250-bbf5-bca0a02d841d" strength="75 mg"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
formDescription="Summary entry form for patients enrolled for ART"
formEncounterType="591cba6a-5c5f-11ee-8c99-0242ac120002"
formUuid="f2722150-5c5f-11ee-8c99-0242ac120002"
formVersion="3.4.2"
formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="1"
Expand Down
Loading

0 comments on commit df3bc7c

Please sign in to comment.