#884 | Encounter update with old nested enrolment object erased the updated encounters

Hence saved encounter with updated enrolment object.

Author: mahalakshme

packages/openchs-android/src/service/program/ProgramEncounterService.js

@@ -52,8 +52,8 @@ class ProgramEncounterService extends BaseService {
         this.getService(MediaQueueService).addMediaToQueue(programEncounter, ProgramEncounter.schema.name);
     }
 
-    saveScheduledVisit(enrolment, nextScheduledVisit, db, schedulerDate) {
-        const {encounterType: encounterTypeName, visitCreationStrategy = 'default', programEnrolment = enrolment} = nextScheduledVisit;
+    saveScheduledVisit(programEnrolment, nextScheduledVisit, db, schedulerDate) {
+        const {encounterType: encounterTypeName, visitCreationStrategy = 'default'} = nextScheduledVisit;
 
         let encountersToUpdate = programEnrolment.scheduledEncountersOfType(encounterTypeName);
         if (_.isEmpty(encountersToUpdate) || visitCreationStrategy === 'createNew') {
@@ -72,8 +72,11 @@ class ProgramEncounterService extends BaseService {
     saveScheduledVisits(enrolment, nextScheduledVisits = [], db, schedulerDate) {
         return nextScheduledVisits.map(nSV =>{
             if (nSV.programEnrolment) {
-                return this.saveScheduledVisit(nSV.programEnrolment, nSV, db, schedulerDate);
+                enrolment = this.findByUUID(nSV.programEnrolment.uuid, ProgramEnrolment.schema.name);
+                return this.saveScheduledVisit(enrolment, nSV, db, schedulerDate);
             }
+
+            enrolment = this.findByUUID(enrolment.uuid, ProgramEnrolment.schema.name);
             if (this.getService(IndividualService).determineSubjectForVisitToBeScheduled(enrolment.individual, nSV).uuid !== enrolment.individual.uuid) {
                 return this.getService(EncounterService).saveScheduledVisit(nSV.subject, nSV, db, schedulerDate);
             }

packages/openchs-android/src/service/rest/ConventionalRestClient.js

@@ -69,7 +69,6 @@ class ConventionalRestClient {
         if(apiQueryParamKey) {
             _.merge(apiQueryParamsHolder, {[apiQueryParamKey]: entityTypeUuid});
         }
-        console.log('apiQueryParams', apiQueryParams, !_.isEmpty(apiQueryParams), _.merge(apiQueryParamsHolder, apiQueryParams));
         if (!_.isEmpty(apiQueryParams)) {
             _.merge(apiQueryParamsHolder, apiQueryParams);
         }