From ac3033fe0ef5f8d9f46446114df840770935d1c4 Mon Sep 17 00:00:00 2001
From: Thomas Bonnin <233326+TBonnin@users.noreply.github.com>
Date: Fri, 22 Mar 2024 12:16:36 -0400
Subject: [PATCH] fix: discard records with deleted_at in
 getAddedKeys/getUpdatedKeys

---
 .../lib/services/sync/data/data.service.ts    | 14 +++++++++----
 .../sync/run.service.integration.test.ts      | 20 ++++++++++---------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/packages/shared/lib/services/sync/data/data.service.ts b/packages/shared/lib/services/sync/data/data.service.ts
index 28933944fb..7d8a9c6d9e 100644
--- a/packages/shared/lib/services/sync/data/data.service.ts
+++ b/packages/shared/lib/services/sync/data/data.service.ts
@@ -188,8 +188,11 @@ export async function getAddedKeys(response: DataRecord[], nangoConnectionId: nu
 
     const knownKeys: string[] = (await schema()
         .from(RECORDS_TABLE)
-        .where('nango_connection_id', nangoConnectionId)
-        .where('model', model)
+        .where({
+            nango_connection_id: nangoConnectionId,
+            model,
+            external_deleted_at: null
+        })
         .whereIn('external_id', keys)
         .pluck('external_id')) as unknown as string[];
 
@@ -212,8 +215,11 @@ export async function getUpdatedKeys(response: DataRecord[], nangoConnectionId:
     const rowsToUpdate = await schema()
         .from(RECORDS_TABLE)
         .pluck('external_id')
-        .where('nango_connection_id', nangoConnectionId)
-        .where('model', model)
+        .where({
+            nango_connection_id: nangoConnectionId,
+            model,
+            external_deleted_at: null
+        })
         .whereIn('external_id', keys)
         .whereNotIn(['external_id', 'data_hash'], keysWithHash);
 
diff --git a/packages/shared/lib/services/sync/run.service.integration.test.ts b/packages/shared/lib/services/sync/run.service.integration.test.ts
index c9929a54b2..162d47f280 100644
--- a/packages/shared/lib/services/sync/run.service.integration.test.ts
+++ b/packages/shared/lib/services/sync/run.service.integration.test.ts
@@ -146,7 +146,8 @@ describe('Running sync', () => {
             expect(record._nango_metadata.last_action).toEqual('DELETED');
 
             // records '2' should be back
-            await runJob(initialRecords, activityLogId, model, connection, sync, trackDeletes, false);
+            const result = await runJob(initialRecords, activityLogId, model, connection, sync, trackDeletes, false);
+            expect(result).toEqual({ added: 1, updated: 0, deleted: 0 });
 
             const recordsAfter = await getRecords(connection, model);
             const recordAfter = recordsAfter.find((record) => record.id == 2);
@@ -308,7 +309,7 @@ const runJob = async (
     sync: Sync,
     trackDeletes: boolean,
     softDelete: boolean
-) => {
+): Promise<SyncResult> => {
     // create new sync job
     const syncJob = (await jobService.createSyncJob(sync.id, SyncType.INCREMENTAL, SyncStatus.RUNNING, 'test-job-id', connection)) as SyncJob;
     if (!syncJob) {
@@ -345,6 +346,13 @@ const runJob = async (
     await jobService.updateSyncJobResult(syncJob.id, updatedResults, model);
     // finish the sync
     await syncRun.finishSync([model], new Date(), `v1`, 10, trackDeletes);
+
+    const syncJobResult = await jobService.getLatestSyncJob(sync.id);
+    return {
+        added: syncJobResult?.result?.[model]?.added || 0,
+        updated: syncJobResult?.result?.[model]?.updated || 0,
+        deleted: syncJobResult?.result?.[model]?.deleted || 0
+    };
 };
 
 const verifySyncRun = async (
@@ -358,14 +366,8 @@ const verifySyncRun = async (
     const { connection, model, sync, activityLogId } = await dataMocks.upsertRecords(initialRecords);
 
     // Run job to save new records
-    await runJob(newRecords, activityLogId, model, connection, sync, trackDeletes, softDelete);
+    const result = await runJob(newRecords, activityLogId, model, connection, sync, trackDeletes, softDelete);
 
-    const syncJobResult = await jobService.getLatestSyncJob(sync.id);
-    const result = {
-        added: syncJobResult?.result?.[model]?.added || 0,
-        updated: syncJobResult?.result?.[model]?.updated || 0,
-        deleted: syncJobResult?.result?.[model]?.deleted || 0
-    };
     expect(result).toEqual(expectedResult);
 
     const records = await getRecords(connection, model);