From b3b5a2f0065ffe1d13c235ea282eb55d1dcc3bd5 Mon Sep 17 00:00:00 2001 From: Marco de Jongh <1107647+marcodejongh@users.noreply.github.com> Date: Mon, 30 Dec 2024 16:58:33 +1100 Subject: [PATCH 1/2] lmao actually just forgot an await --- app/api/internal/shared-sync/[board_name]/route.ts | 2 +- app/lib/data-sync/aurora/shared-sync.ts | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/api/internal/shared-sync/[board_name]/route.ts b/app/api/internal/shared-sync/[board_name]/route.ts index cc8a3552..8f311995 100644 --- a/app/api/internal/shared-sync/[board_name]/route.ts +++ b/app/api/internal/shared-sync/[board_name]/route.ts @@ -20,7 +20,7 @@ export async function GET(request: Request, { params }: { params: BoardRoutePara } console.log(`Passed auth for ${board_name}`); - const result = syncSharedData(board_name); + const result = await syncSharedData(board_name); return NextResponse.json({ success: true, diff --git a/app/lib/data-sync/aurora/shared-sync.ts b/app/lib/data-sync/aurora/shared-sync.ts index 4de615af..31478f94 100644 --- a/app/lib/data-sync/aurora/shared-sync.ts +++ b/app/lib/data-sync/aurora/shared-sync.ts @@ -296,7 +296,7 @@ async function updateSharedSyncs( } } -export async function getLastSharedSyncTimes(boardName: BoardName, tableNames = SHARED_SYNC_TABLES) { +export async function getLastSharedSyncTimes(boardName: BoardName) { const sharedSyncsSchema = getTable('sharedSyncs', boardName); const result = await db @@ -304,8 +304,7 @@ export async function getLastSharedSyncTimes(boardName: BoardName, tableNames = table_name: sharedSyncsSchema.tableName, last_synchronized_at: sharedSyncsSchema.lastSynchronizedAt, }) - .from(sharedSyncsSchema) - .where(inArray(sharedSyncsSchema.tableName, tableNames as unknown as Array)); + .from(sharedSyncsSchema); return result; } @@ -313,8 +312,9 @@ export async function getLastSharedSyncTimes(boardName: BoardName, tableNames = export async function syncSharedData( board: BoardName, ): Promise> { - const allSyncTimes = await getLastSharedSyncTimes(board, SHARED_SYNC_TABLES); - + console.log('Entered sync shared data'); + const allSyncTimes = await getLastSharedSyncTimes(board); + console.log('Fetched previous sync times'); const syncParams: SyncOptions = { tables: [...SHARED_SYNC_TABLES], sharedSyncs: allSyncTimes.map((syncTime) => ({ @@ -323,9 +323,12 @@ export async function syncSharedData( })), }; + console.log(syncParams.); + const syncResults = await sharedSync(board, syncParams); console.log(`Received ${syncResults.PUT.climbs.length} climbs and ${syncResults.PUT.climb_stats.length} climb_stats`); + return upsertAllSharedTableData(board, syncResults); } From 060a1f315a24e10eb46faaeb12f0f189ed279c09 Mon Sep 17 00:00:00 2001 From: Marco de Jongh <1107647+marcodejongh@users.noreply.github.com> Date: Mon, 30 Dec 2024 17:01:14 +1100 Subject: [PATCH 2/2] oops --- app/lib/data-sync/aurora/shared-sync.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/lib/data-sync/aurora/shared-sync.ts b/app/lib/data-sync/aurora/shared-sync.ts index 31478f94..1c974701 100644 --- a/app/lib/data-sync/aurora/shared-sync.ts +++ b/app/lib/data-sync/aurora/shared-sync.ts @@ -323,8 +323,6 @@ export async function syncSharedData( })), }; - console.log(syncParams.); - const syncResults = await sharedSync(board, syncParams); console.log(`Received ${syncResults.PUT.climbs.length} climbs and ${syncResults.PUT.climb_stats.length} climb_stats`);