Add Practitioner Details

build.gradle

@@ -77,7 +77,7 @@ subprojects {
 
     ext.androidToolsBuildGradle = '30.0.3'
     ext.androidBuildToolsVersion = '30.0.3'
-    ext.androidMinSdkVersion = 21
+    ext.androidMinSdkVersion = 18
     ext.androidCompileSdkVersion = 31
     ext.androidTargetSdkVersion = 31
     ext.androidAnnotationsVersion = '3.0.1'

opensrp-anc/src/main/java/org/smartregister/anc/library/repository/PartialContactRepository.java

@@ -8,8 +8,12 @@
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.smartregister.anc.library.AncLibrary;
 import org.smartregister.anc.library.model.PartialContact;
 import org.smartregister.anc.library.util.ConstantsUtils;
+import org.smartregister.repository.AllSharedPreferences;
 import org.smartregister.repository.BaseRepository;
 
 import java.util.ArrayList;
@@ -75,12 +79,15 @@ else if (partialContact.getUpdatedAt() == null) {
                     partialContact.setFormJson(existingContact.getFormJson());
                 }
                 partialContact.setCreatedAt(existingContact.getCreatedAt());
+                addPractitionerDetails(partialContact);
                 update(partialContact);
             } else {
                 partialContact.setCreatedAt(Calendar.getInstance().getTimeInMillis());
+                addPractitionerDetails(partialContact);
                 getWritableDatabase().insert(TABLE_NAME, null, createValuesFor(partialContact));
             }
         } else {
+            addPractitionerDetails(partialContact);
             update(partialContact);
         }
     }
@@ -216,4 +223,37 @@ public void deletePartialContact(Long id) {
     public void clearPartialRepository() {
         getWritableDatabase().delete(TABLE_NAME, "_id IS NOT NULL", null);
     }
+
+    private void addPractitionerDetails(PartialContact partialContact) {
+        if (StringUtils.isNotBlank(partialContact.getFormJson()) || StringUtils.isNotBlank(partialContact.getFormJsonDraft())) {
+            try {
+                JSONArray practitionerArray = new JSONArray();
+
+                JSONObject practitionerObject = new JSONObject();
+                String jsonFormString = StringUtils.isNotBlank(partialContact.getFormJson()) ? partialContact.getFormJson() : partialContact.getFormJsonDraft();
+                if (StringUtils.isNotBlank(jsonFormString)) {
+                    JSONObject partialContactJson = new JSONObject(jsonFormString);
+                    AllSharedPreferences allSharedPreferences = AncLibrary.getInstance().getContext().allSharedPreferences();
+                    String practitioner = allSharedPreferences.fetchRegisteredANM();
+                    practitionerObject.put(ConstantsUtils.PractitionerConstants.PRACTITIONERID, allSharedPreferences.getUserId(practitioner));
+                    practitionerObject.put(ConstantsUtils.PractitionerConstants.PRACTITIONERNAME, practitioner);
+                    practitionerObject.put(ConstantsUtils.PractitionerConstants.TEAMID, allSharedPreferences.fetchDefaultTeamId(practitioner));
+                    practitionerObject.put(ConstantsUtils.PractitionerConstants.TEAM, allSharedPreferences.fetchDefaultTeam(practitioner));
+                    practitionerObject.put(ConstantsUtils.PractitionerConstants.LOCATIONID, allSharedPreferences.fetchDefaultLocalityId(practitioner));
+                    if (partialContactJson.has(ConstantsUtils.PractitionerConstants.PRACTITIONERDETAILS)) {
+                        partialContactJson.remove(ConstantsUtils.PractitionerConstants.PRACTITIONERDETAILS);
+                    }
+                    partialContactJson.put(ConstantsUtils.PractitionerConstants.PRACTITIONERDETAILS, practitionerArray.put(practitionerObject));
+                    if (StringUtils.isNotBlank(partialContact.getFormJson())) {
+                        partialContact.setFormJson(partialContactJson.toString());
+                    } else {
+                        partialContact.setFormJsonDraft(partialContactJson.toString());
+                    }
+                }
+            } catch (Exception e) {
+                Timber.e(e);
+            }
+        }
+
+    }
 }

opensrp-anc/src/main/java/org/smartregister/anc/library/util/ConstantsUtils.java

@@ -297,4 +297,12 @@ public static final class LocationConstants {
         public static final String FACILITY = "FACILITY";
         public static final String VILLAGE = "VILLAGE";
     }
+    public static final class PractitionerConstants {
+        public static final String PRACTITIONERID = "providerBaseEntityId";
+        public static final String PRACTITIONERNAME = "providerId";
+        public static final String TEAMID = "teamId";
+        public static final String TEAM = "team";
+        public static final String LOCATIONID = "locationId";
+        public static final String PRACTITIONERDETAILS = "providerDetails";
+    }
 }