Merge pull request #1530 from opensrp/fix-prefix-ec-member

Fix population of prefix field during edit of member registration
opensrp · Oct 8, 2021 · 320b6bc · 320b6bc
2 parents 4c2856f + bba9aa2
commit 320b6bc
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/opensrp-reveal/build.gradle b/opensrp-reveal/build.gradle
@@ -146,7 +146,7 @@ android {
             zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             resValue "string", 'opensrp_base_url', '"https://reveal-zm.smartregister.org/opensrp/"'
-            buildConfigField "Integer", "DATABASE_VERSION", '14'
+            buildConfigField "Integer", "DATABASE_VERSION", '15'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
@@ -165,7 +165,7 @@ android {
 
         debug {
             resValue "string", 'opensrp_base_url', '"https://reveal-stage.smartregister.org/opensrp/"'
-            buildConfigField "Integer", "DATABASE_VERSION", '14'
+            buildConfigField "Integer", "DATABASE_VERSION", '15'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'

diff --git a/opensrp-reveal/src/main/assets/ec_client_fields.json b/opensrp-reveal/src/main/assets/ec_client_fields.json
@@ -314,6 +314,14 @@
             "concept": "159635AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
           }
         },
+        {
+          "column_name": "prefix",
+          "type": "Event",
+          "json_mapping": {
+            "field": "obs.fieldCode",
+            "concept": "Prefix"
+          }
+        },
         {
           "column_name": "occupation",
           "type": "Event",

diff --git a/opensrp-reveal/src/main/java/org/smartregister/reveal/repository/RevealRepository.java b/opensrp-reveal/src/main/java/org/smartregister/reveal/repository/RevealRepository.java
@@ -31,6 +31,7 @@
 import org.smartregister.reveal.util.Constants;
 import org.smartregister.reveal.util.Constants.DatabaseKeys;
 import org.smartregister.reveal.util.Country;
+import org.smartregister.reveal.util.FamilyConstants;
 import org.smartregister.reveal.util.FamilyConstants.EventType;
 import org.smartregister.reveal.util.Utils;
 import org.smartregister.util.DatabaseMigrationUtils;
@@ -146,6 +147,9 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                 case 14:
                     upgradeToVersion14(db);
                     break;
+                case 15:
+                    upgradeToVersion15(db);
+                    break;
                 default:
                     break;
             }
@@ -309,6 +313,12 @@ private void upgradeToVersion14(SQLiteDatabase db) {
         db.execSQL(String.format("UPDATE %s set %s = ? WHERE %s like ?  OR %s not like ?", STRUCTURE_TABLE, DatabaseKeys.TASK_SYNC_STATUS, DatabaseKeys.GEOJSON, DatabaseKeys.GEOJSON), new String[]{BaseRepository.TYPE_Created, "%serverVersion\":0%", "%serverVersion%"});
     }
 
+    private void upgradeToVersion15(SQLiteDatabase db) {
+        if (!isColumnExists(db, FAMILY_MEMBER, FamilyConstants.DatabaseKeys.PREFIX)) {
+            db.execSQL(String.format("ALTER TABLE %s ADD COLUMN %s VARCHAR", FAMILY_MEMBER, FamilyConstants.DatabaseKeys.PREFIX));
+        }
+    }
+
     private void clientProcessEvents(List<String> eventTypes) {
         //client process events after 5 seconds so that get calls to getDatabase return
         new Timer().schedule(new TimerTask() {

diff --git a/opensrp-reveal/src/main/java/org/smartregister/reveal/util/FamilyConstants.java b/opensrp-reveal/src/main/java/org/smartregister/reveal/util/FamilyConstants.java
@@ -72,6 +72,7 @@ interface DatabaseKeys {
         String SLEEPS_OUTDOORS = "sleeps_outdoors";
         String PHONE_NUMBER = "phone_number";
         String IS_FAMILY_HEAD = "is_family_head";
+        String PREFIX = "prefix";
     }
 
     interface FormKeys {

diff --git a/opensrp-reveal/src/main/java/org/smartregister/reveal/util/FamilyJsonFormUtils.java b/opensrp-reveal/src/main/java/org/smartregister/reveal/util/FamilyJsonFormUtils.java
@@ -78,6 +78,7 @@ private void initMap() {
         jsonDbMap.put(DatabaseKeys.SLEEPS_OUTDOORS, DatabaseKeys.SLEEPS_OUTDOORS);
         jsonDbMap.put(DatabaseKeys.PHONE_NUMBER, DatabaseKeys.PHONE_NUMBER);
         jsonDbMap.put(FormKeys.SURNAME, LAST_NAME);
+        jsonDbMap.put(DatabaseKeys.PREFIX, DatabaseKeys.PREFIX);
 
     }