Skip to content

Add explicit uuid support to forms schema to enable deterministic create/upate behavior across systems #312

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.

Sign up for GitHub

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

Open
makombe wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add explicit uuid support to forms schema to enable deterministic create/upate behavior across systems #312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 49 additions & 10 deletions api/src/main/java/org/openmrs/module/initializer/api/loaders/AmpathFormsLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ protected void load(File file) throws Exception {
}

String formDescription = (String) jsonFile.get("description");
String formUuid = (String) jsonFile.get("uuid");
boolean formPublished = (Boolean) jsonFile.get("published");
boolean formRetired = (Boolean) jsonFile.get("retired");

Expand Down Expand Up @@ -104,21 +105,59 @@ protected void load(File file) throws Exception {
String uuid = Utils.generateUuidFromObjects(AMPATH_FORMS_UUID, formName, formVersion);
// Process Form
// ISSUE-150 If form with uuid present then update it
if (formService.getFormByUuid(uuid) != null) {
Form form = formService.getFormByUuid(uuid);
if (formService.getFormByUuid(formUuid) != null) {
Form form = formService.getFormByUuid(formUuid);

if (OpenmrsUtil.nullSafeEquals(form.getUuid(), uuid)) {
ClobDatatypeStorage clobData = datatypeService
.getClobDatatypeStorageByUuid(formService.getFormResource(form, "JSON schema").getValueReference());
clobData.setValue(jsonString);
datatypeService.saveClobDatatypeStorage(clobData);
if (OpenmrsUtil.nullSafeEquals(form.getUuid(), formUuid)) {

// Form resource name for forms resulting from HtmlFormEntry is hffeXMPath (HtmlFormEntry)
FormResource formRes = formService.getFormResource(form, "JSON schema");
if (formRes != null) {

// Retrieve the form resource and update with the JSON schema and create clob data.
ClobDatatypeStorage clobData = datatypeService.getClobDatatypeStorageByUuid(formService.getFormResource(
form, "JSON schema").getValueReference());
if (clobData != null) {
clobData.setValue(jsonString);
datatypeService.saveClobDatatypeStorage(clobData);

}

} else {
String clobUuid = UUID.randomUUID().toString();
FormResource formResource;
formResource = new FormResource();
formResource.setName("JSON schema");
formResource.setForm(form);
formResource.setValueReferenceInternal(clobUuid);
formResource.setDatatypeClassname("AmpathJsonSchema");
formService.saveFormResource(formResource);

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

}

boolean needToSaveForm = false;
// Description
if (!OpenmrsUtil.nullSafeEquals(form.getDescription(), formDescription)) {
form.setDescription(formDescription);
needToSaveForm = true;
}

// uuid
if (!OpenmrsUtil.nullSafeEquals(form.getUuid(), formUuid)) {
form.setUuid(formUuid);
needToSaveForm = true;
}

// name
if (!OpenmrsUtil.nullSafeEquals(form.getName(), formName)) {
form.setName(formName);
needToSaveForm = true;
}
// Version
if (!OpenmrsUtil.nullSafeEquals(form.getVersion(), formVersion)) {
form.setVersion(formVersion);
Expand Down Expand Up @@ -150,13 +189,13 @@ protected void load(File file) throws Exception {
}
}
} else if (formService.getForm(formName) != null) { // ISSUE-150 If form with name present then retire it and
// create a new one
// create a new one
Form form = formService.getForm(formName);
formService.retireForm(form, "Replaced with new version by Iniz");
createNewForm(uuid, formName, formDescription, formPublished, formRetired, encounterType, formVersion,
createNewForm(formUuid, formName, formDescription, formPublished, formRetired, encounterType, formVersion,
jsonString);
} else {// ISSUE-150 Create new form
createNewForm(uuid, formName, formDescription, formPublished, formRetired, encounterType, formVersion,
createNewForm(formUuid, formName, formDescription, formPublished, formRetired, encounterType, formVersion,
jsonString);
}
}
Expand Down