#1290 | Fix merge over-written change and save individual as is

avniproject · Feb 8, 2024 · 17715d7 · 17715d7
1 parent 8f8a6b6
commit 17715d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/packages/openchs-android/src/service/IndividualService.js b/packages/openchs-android/src/service/IndividualService.js
@@ -109,10 +109,7 @@ class IndividualService extends BaseService {
         const db = this.db;
         this.db.write(() => {
             ObservationsHolder.convertObsForSave(individual.observations);
-            db.create(Individual.schema.name, {
-                uuid: individual.uuid,
-                observations: individual.observations
-            }, true);
+            db.create(Individual.schema.name, individual, true);
             db.create(EntityQueue.schema.name, EntityQueue.create(individual, Individual.schema.name));
         });
     }

diff --git a/packages/openchs-android/src/service/MediaQueueService.js b/packages/openchs-android/src/service/MediaQueueService.js
@@ -201,6 +201,7 @@ class MediaQueueService extends BaseService {
             })
             .then(() => this.uploadToUrl(uploadUrl, mediaQueueItem))
             .then(() => this.replaceObservation(mediaQueueItem, uploadUrl))
+            .then(() => this.popItem(mediaQueueItem))
             .catch((error) => {
                 General.logError("MediaQueueService", `Error while uploading ${mediaQueueItem.uuid} - ${mediaQueueItem.fileName}`);
                 General.logError("MediaQueueService", error);