From 13c3fa2acaf5f33498c7fe63649c5f989ba54458 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Wed, 3 Oct 2018 14:36:31 +0300 Subject: [PATCH] Move server default configurations Fix issue server settings sync not updating Add change log --- CHANGELOG.md | 12 +++ .../anc/population_characteristics.json | 87 +++++++++++++++++++ .../anc/site_characteristics.json | 37 ++++++++ .../tb-reach/view_configurations}/README.txt | 0 .../common_register_header.json | 0 .../common_register_row.json | 0 .../component_patient_details_bmi.json | 0 ...ent_patient_details_contact_screening.json | 0 ...omponent_patient_details_demographics.json | 0 .../component_patient_details_followup.json | 0 .../component_patient_details_results.json | 0 ...onent_patient_details_service_history.json | 0 .../tb-reach/view_configurations}/home.json | 0 .../intreatment_register.json | 0 .../intreatment_register_header.json | 0 .../intreatment_register_row.json | 0 .../view_configurations}/lang_en.json | 0 .../view_configurations}/lang_fr.json | 0 .../view_configurations}/lang_sw.json | 0 .../tb-reach/view_configurations}/login.json | 0 .../tb-reach/view_configurations}/main.json | 0 .../patient_details_intreatment.json | 0 .../patient_details_positive.json | 0 .../patient_details_presumptive.json | 0 .../positive_register.json | 0 .../positive_register_header.json | 0 .../positive_register_row.json | 0 .../presumptive_register.json | 0 .../presumptive_register_header.json | 0 .../presumptive_register_row.json | 0 .../setup_view_configs.sh | 0 .../postgres/SettingRepositoryImpl.java | 2 + .../org/opensrp/service/SettingService.java | 1 - 33 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG.md create mode 100644 assets/server_defaults/anc/population_characteristics.json create mode 100644 assets/server_defaults/anc/site_characteristics.json rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/README.txt (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/common_register_header.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/common_register_row.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/component_patient_details_bmi.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/component_patient_details_contact_screening.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/component_patient_details_demographics.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/component_patient_details_followup.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/component_patient_details_results.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/component_patient_details_service_history.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/home.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/intreatment_register.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/intreatment_register_header.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/intreatment_register_row.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/lang_en.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/lang_fr.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/lang_sw.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/login.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/main.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/patient_details_intreatment.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/patient_details_positive.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/patient_details_presumptive.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/positive_register.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/positive_register_header.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/positive_register_row.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/presumptive_register.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/presumptive_register_header.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/presumptive_register_row.json (100%) rename assets/{tbreach_default_view_configs => server_defaults/tb-reach/view_configurations}/setup_view_configs.sh (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..e4d0f50007 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,12 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] +### Changed +- Moved server default setting configurations to `../assets/server_defaults/` folder. Files follow a per project implementation hierachy pattern + +### Added +- Client Server sync - settings functionality and rest endpoint. `../rest/settings/sync` diff --git a/assets/server_defaults/anc/population_characteristics.json b/assets/server_defaults/anc/population_characteristics.json new file mode 100644 index 0000000000..b014faa21b --- /dev/null +++ b/assets/server_defaults/anc/population_characteristics.json @@ -0,0 +1,87 @@ +{ + "_id": 2, + "_rev": 1, + "type": "SettingConfiguration", + "identifier": "population_characteristics", + "serverVersion": null, + "settings": [ + { + "key": "pop_undernourish", + "label": "Undernourished prevalence 20% or higher", + "value": null, + "description": "The proportion of women in the adult population (18 years or older), with a BMI less than 18.5, is 20% or higher." + }, + { + "key": "pop_anaemia_40", + "label": "Anaemia prevalence 40% or higher", + "value": null, + "description": "The proportion of pregnant women in the population with anaemia (haemoglobin level less than 11 g/dl) is 40% or higher." + }, + { + "key": "pop_anaemia_20", + "label": "Anaemia prevalence 20% or lower", + "value": null, + "description": "The proportion of pregnant women in the population with anaemia (haemoglobin level less than 11 g/dl) is 20% or lower." + }, + { + "key": "pop_low_calcium", + "label": "Low dietary calcium intake", + "value": null, + "description": "Women in the population are likely to have low dietary calcium intake (less than 900 mg of calcium per day)." + }, + { + "key": "pop_tb", + "label": "TB prevalence 100/100,000 or high.", + "value": null, + "description": "The tuberculosis prevalence in the general population is 100 cases per 100,000 persons or greater." + }, + { + "key": "pop_vita", + "label": "Vitamin A deficiency 5% or higher", + "value": null, + "description": "The prevalence of night blindness is 5% or higher in pregnant women or 5% or higher in children 24–59 months of age, or the proportion of pregnant women with a serum retinol level less than 0.7 mol/L is 20% or higher. " + }, + { + "key": "pop_helminth", + "label": "Soil-transmitted helminth infection prevalence 20% or higher", + "value": null, + "description": "The percentage of individuals in the general population infected with at least one species of soil-transmitted helminth is 20% or higher." + }, + { + "key": "pop_hiv_incidence", + "label": "HIV incidence greater than 3 per 100 person-years in the absence of PrEP", + "value": null, + "description": "Women in the population have a substantial risk of HIV infection. Substantial risk of HIV infection is provisionally defined as HIV incidence greater than 3 per 100 person–years in the absence of pre-exposure prophylaxis (PrEP)." + }, + { + "key": "pop_hiv_prevalence", + "label": "HIV prevalence 5% or higher", + "value": null, + "description": "The HIV prevalence in pregnant women in the population is 5% or higher." + }, + { + "key": "pop_malaria", + "label": "Malaria-endemic setting", + "value": null, + "description": "This is a malaria-endemic setting." + }, + { + "key": "pop_syphilis", + "label": "Syphilis prevalence 5% or higher", + "value": null, + "description": "The prevalence of syphilis in pregnant women in the population is 5% or higher." + }, + { + "key": "pop_hepb", + "label": "Hep B prevalence is intermediate (2% or higher) or high (5% or higher)", + "value": null, + "description": "The proportion of Hepatitis B surface antigen (HBsAg) seroprevalance in the general population is 2% or higher." + }, + { + "key": "pop_hepc", + "label": "Hep C prevalence is intermediate (2% or higher) or high (5% or higher)", + "value": null, + "description": "The proportion of Hepatitis C virus (HCV) antibody seroprevalence in the general population is 2% or higher. " + } + ] +} \ No newline at end of file diff --git a/assets/server_defaults/anc/site_characteristics.json b/assets/server_defaults/anc/site_characteristics.json new file mode 100644 index 0000000000..7b7188a1de --- /dev/null +++ b/assets/server_defaults/anc/site_characteristics.json @@ -0,0 +1,37 @@ +{ + "_id": "1", + "_rev": "v1", + "type": "SettingConfiguration", + "identifier": "site_characteristics", + "locationId": "", + "providerId": "", + "teamId": "", + "dateCreated": "", + "serverVersion": 1, + "settings": [ + { + "key": "site_ipv_assess", + "label": "Minimum requirements for IPV assessment", + "value": null, + "description": "\"Are all of the following in place at your facility: \r\n1. A protocol or standard operating procedure for Intimate Partner Violence (IPV); \r\n2. A health worker trained on how to ask about IPV and how to provide the minimum response or beyond;\r\n3. A private setting; \r\n4. A way to ensure confidentiality; \r\n5. Time to allow for appropriate disclosure; and\r\n6. A system for referral in place. \"" + }, + { + "key": "site_anc_hiv", + "label": "Generalized HIV epidemic", + "value": null, + "description": "Is the HIV prevalence consistently > 1% in pregnant women attending antenatal clinics at your facility?" + }, + { + "key": "site_ultrasound", + "label": "Ultrasound available", + "value": null, + "description": "Is an ultrasound machine available and functional at your facility and a trained health worker available to use it?" + }, + { + "key": "site_bp_tool", + "label": "Automated BP measurement tool", + "value": null, + "description": "Does your facility use an automated blood pressure (BP) measurement tool?" + } + ] +} \ No newline at end of file diff --git a/assets/tbreach_default_view_configs/README.txt b/assets/server_defaults/tb-reach/view_configurations/README.txt similarity index 100% rename from assets/tbreach_default_view_configs/README.txt rename to assets/server_defaults/tb-reach/view_configurations/README.txt diff --git a/assets/tbreach_default_view_configs/common_register_header.json b/assets/server_defaults/tb-reach/view_configurations/common_register_header.json similarity index 100% rename from assets/tbreach_default_view_configs/common_register_header.json rename to assets/server_defaults/tb-reach/view_configurations/common_register_header.json diff --git a/assets/tbreach_default_view_configs/common_register_row.json b/assets/server_defaults/tb-reach/view_configurations/common_register_row.json similarity index 100% rename from assets/tbreach_default_view_configs/common_register_row.json rename to assets/server_defaults/tb-reach/view_configurations/common_register_row.json diff --git a/assets/tbreach_default_view_configs/component_patient_details_bmi.json b/assets/server_defaults/tb-reach/view_configurations/component_patient_details_bmi.json similarity index 100% rename from assets/tbreach_default_view_configs/component_patient_details_bmi.json rename to assets/server_defaults/tb-reach/view_configurations/component_patient_details_bmi.json diff --git a/assets/tbreach_default_view_configs/component_patient_details_contact_screening.json b/assets/server_defaults/tb-reach/view_configurations/component_patient_details_contact_screening.json similarity index 100% rename from assets/tbreach_default_view_configs/component_patient_details_contact_screening.json rename to assets/server_defaults/tb-reach/view_configurations/component_patient_details_contact_screening.json diff --git a/assets/tbreach_default_view_configs/component_patient_details_demographics.json b/assets/server_defaults/tb-reach/view_configurations/component_patient_details_demographics.json similarity index 100% rename from assets/tbreach_default_view_configs/component_patient_details_demographics.json rename to assets/server_defaults/tb-reach/view_configurations/component_patient_details_demographics.json diff --git a/assets/tbreach_default_view_configs/component_patient_details_followup.json b/assets/server_defaults/tb-reach/view_configurations/component_patient_details_followup.json similarity index 100% rename from assets/tbreach_default_view_configs/component_patient_details_followup.json rename to assets/server_defaults/tb-reach/view_configurations/component_patient_details_followup.json diff --git a/assets/tbreach_default_view_configs/component_patient_details_results.json b/assets/server_defaults/tb-reach/view_configurations/component_patient_details_results.json similarity index 100% rename from assets/tbreach_default_view_configs/component_patient_details_results.json rename to assets/server_defaults/tb-reach/view_configurations/component_patient_details_results.json diff --git a/assets/tbreach_default_view_configs/component_patient_details_service_history.json b/assets/server_defaults/tb-reach/view_configurations/component_patient_details_service_history.json similarity index 100% rename from assets/tbreach_default_view_configs/component_patient_details_service_history.json rename to assets/server_defaults/tb-reach/view_configurations/component_patient_details_service_history.json diff --git a/assets/tbreach_default_view_configs/home.json b/assets/server_defaults/tb-reach/view_configurations/home.json similarity index 100% rename from assets/tbreach_default_view_configs/home.json rename to assets/server_defaults/tb-reach/view_configurations/home.json diff --git a/assets/tbreach_default_view_configs/intreatment_register.json b/assets/server_defaults/tb-reach/view_configurations/intreatment_register.json similarity index 100% rename from assets/tbreach_default_view_configs/intreatment_register.json rename to assets/server_defaults/tb-reach/view_configurations/intreatment_register.json diff --git a/assets/tbreach_default_view_configs/intreatment_register_header.json b/assets/server_defaults/tb-reach/view_configurations/intreatment_register_header.json similarity index 100% rename from assets/tbreach_default_view_configs/intreatment_register_header.json rename to assets/server_defaults/tb-reach/view_configurations/intreatment_register_header.json diff --git a/assets/tbreach_default_view_configs/intreatment_register_row.json b/assets/server_defaults/tb-reach/view_configurations/intreatment_register_row.json similarity index 100% rename from assets/tbreach_default_view_configs/intreatment_register_row.json rename to assets/server_defaults/tb-reach/view_configurations/intreatment_register_row.json diff --git a/assets/tbreach_default_view_configs/lang_en.json b/assets/server_defaults/tb-reach/view_configurations/lang_en.json similarity index 100% rename from assets/tbreach_default_view_configs/lang_en.json rename to assets/server_defaults/tb-reach/view_configurations/lang_en.json diff --git a/assets/tbreach_default_view_configs/lang_fr.json b/assets/server_defaults/tb-reach/view_configurations/lang_fr.json similarity index 100% rename from assets/tbreach_default_view_configs/lang_fr.json rename to assets/server_defaults/tb-reach/view_configurations/lang_fr.json diff --git a/assets/tbreach_default_view_configs/lang_sw.json b/assets/server_defaults/tb-reach/view_configurations/lang_sw.json similarity index 100% rename from assets/tbreach_default_view_configs/lang_sw.json rename to assets/server_defaults/tb-reach/view_configurations/lang_sw.json diff --git a/assets/tbreach_default_view_configs/login.json b/assets/server_defaults/tb-reach/view_configurations/login.json similarity index 100% rename from assets/tbreach_default_view_configs/login.json rename to assets/server_defaults/tb-reach/view_configurations/login.json diff --git a/assets/tbreach_default_view_configs/main.json b/assets/server_defaults/tb-reach/view_configurations/main.json similarity index 100% rename from assets/tbreach_default_view_configs/main.json rename to assets/server_defaults/tb-reach/view_configurations/main.json diff --git a/assets/tbreach_default_view_configs/patient_details_intreatment.json b/assets/server_defaults/tb-reach/view_configurations/patient_details_intreatment.json similarity index 100% rename from assets/tbreach_default_view_configs/patient_details_intreatment.json rename to assets/server_defaults/tb-reach/view_configurations/patient_details_intreatment.json diff --git a/assets/tbreach_default_view_configs/patient_details_positive.json b/assets/server_defaults/tb-reach/view_configurations/patient_details_positive.json similarity index 100% rename from assets/tbreach_default_view_configs/patient_details_positive.json rename to assets/server_defaults/tb-reach/view_configurations/patient_details_positive.json diff --git a/assets/tbreach_default_view_configs/patient_details_presumptive.json b/assets/server_defaults/tb-reach/view_configurations/patient_details_presumptive.json similarity index 100% rename from assets/tbreach_default_view_configs/patient_details_presumptive.json rename to assets/server_defaults/tb-reach/view_configurations/patient_details_presumptive.json diff --git a/assets/tbreach_default_view_configs/positive_register.json b/assets/server_defaults/tb-reach/view_configurations/positive_register.json similarity index 100% rename from assets/tbreach_default_view_configs/positive_register.json rename to assets/server_defaults/tb-reach/view_configurations/positive_register.json diff --git a/assets/tbreach_default_view_configs/positive_register_header.json b/assets/server_defaults/tb-reach/view_configurations/positive_register_header.json similarity index 100% rename from assets/tbreach_default_view_configs/positive_register_header.json rename to assets/server_defaults/tb-reach/view_configurations/positive_register_header.json diff --git a/assets/tbreach_default_view_configs/positive_register_row.json b/assets/server_defaults/tb-reach/view_configurations/positive_register_row.json similarity index 100% rename from assets/tbreach_default_view_configs/positive_register_row.json rename to assets/server_defaults/tb-reach/view_configurations/positive_register_row.json diff --git a/assets/tbreach_default_view_configs/presumptive_register.json b/assets/server_defaults/tb-reach/view_configurations/presumptive_register.json similarity index 100% rename from assets/tbreach_default_view_configs/presumptive_register.json rename to assets/server_defaults/tb-reach/view_configurations/presumptive_register.json diff --git a/assets/tbreach_default_view_configs/presumptive_register_header.json b/assets/server_defaults/tb-reach/view_configurations/presumptive_register_header.json similarity index 100% rename from assets/tbreach_default_view_configs/presumptive_register_header.json rename to assets/server_defaults/tb-reach/view_configurations/presumptive_register_header.json diff --git a/assets/tbreach_default_view_configs/presumptive_register_row.json b/assets/server_defaults/tb-reach/view_configurations/presumptive_register_row.json similarity index 100% rename from assets/tbreach_default_view_configs/presumptive_register_row.json rename to assets/server_defaults/tb-reach/view_configurations/presumptive_register_row.json diff --git a/assets/tbreach_default_view_configs/setup_view_configs.sh b/assets/server_defaults/tb-reach/view_configurations/setup_view_configs.sh similarity index 100% rename from assets/tbreach_default_view_configs/setup_view_configs.sh rename to assets/server_defaults/tb-reach/view_configurations/setup_view_configs.sh diff --git a/opensrp-core/src/main/java/org/opensrp/repository/postgres/SettingRepositoryImpl.java b/opensrp-core/src/main/java/org/opensrp/repository/postgres/SettingRepositoryImpl.java index 3de5c9372d..8bd6848b10 100644 --- a/opensrp-core/src/main/java/org/opensrp/repository/postgres/SettingRepositoryImpl.java +++ b/opensrp-core/src/main/java/org/opensrp/repository/postgres/SettingRepositoryImpl.java @@ -1,6 +1,7 @@ package org.opensrp.repository.postgres; import java.util.ArrayList; +import java.util.Calendar; import java.util.List; import java.util.UUID; @@ -243,6 +244,7 @@ public SettingsMetadata saveSetting(SettingConfiguration entity, SettingsMetadat } SettingsMetadata settingsMetadata = metadata != null ? metadata : createMetadata(entity, settings.getId()); + settingsMetadata.setServerVersion(Calendar.getInstance().getTimeInMillis()); if (settingsMetadata != null) { if (settingsMetadata.getId() != null) { diff --git a/opensrp-core/src/main/java/org/opensrp/service/SettingService.java b/opensrp-core/src/main/java/org/opensrp/service/SettingService.java index a1dc9ec7b9..22a982ad05 100644 --- a/opensrp-core/src/main/java/org/opensrp/service/SettingService.java +++ b/opensrp-core/src/main/java/org/opensrp/service/SettingService.java @@ -76,7 +76,6 @@ public synchronized SettingsMetadata saveSetting(String jsonSettingConfiguration settingConfigurations.setId(String.valueOf(settings.getId())); } - return settingRepository.saveSetting(settingConfigurations, metadata); }