From df6024b8b14931167c3153cb3f2d69c392b6bcad Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Fri, 1 Mar 2024 19:56:18 -0800
Subject: [PATCH] chore: better name for ScheduledJob migration

  - also: removed unecessary transform from earlier revision
  - also: fixed off-by-1 error in move migration
---
 ...e.ts => 1709312768000_moveScheduledJob.ts} | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)
 rename packages/server/postgres/migrations/{1709312768000_scheduledJobMove.ts => 1709312768000_moveScheduledJob.ts} (78%)

diff --git a/packages/server/postgres/migrations/1709312768000_scheduledJobMove.ts b/packages/server/postgres/migrations/1709312768000_moveScheduledJob.ts
similarity index 78%
rename from packages/server/postgres/migrations/1709312768000_scheduledJobMove.ts
rename to packages/server/postgres/migrations/1709312768000_moveScheduledJob.ts
index 46f2599f052b..1a1c6950d64b 100644
--- a/packages/server/postgres/migrations/1709312768000_scheduledJobMove.ts
+++ b/packages/server/postgres/migrations/1709312768000_moveScheduledJob.ts
@@ -15,26 +15,14 @@ export async function up() {
     {table: 'ScheduledJob'}
   )
 
-  const transformRethinkRow = (row: any) => {
-    const {runAt, type, orgId, meetingId} = row
-    return {
-      runAt,
-      type,
-      orgId,
-      meetingId
-    }
-  }
-
   const getNextData = async (leftBoundCursor: Date | undefined) => {
     const startAt = leftBoundCursor || r.minval
-    const nextBatch = (
-      await r
-        .table('ScheduledJob')
-        .between(startAt, r.maxval, {index: 'runAt', leftBound: 'open'})
-        .orderBy({index: 'runAt'})
-        .limit(batchSize)
-        .run()
-    ).map(transformRethinkRow)
+    const nextBatch = await r
+      .table('ScheduledJob')
+      .between(startAt, r.maxval, {index: 'runAt', leftBound: 'open'})
+      .orderBy({index: 'runAt'})
+      .limit(batchSize)
+      .run()
     if (nextBatch.length === 0) return null
     if (nextBatch.length < batchSize) return nextBatch
     const lastItem = nextBatch.pop()
@@ -44,7 +32,7 @@ export async function up() {
         'batchSize is smaller than the number of items that share the same cursor. Increase batchSize'
       )
     }
-    return nextBatch.slice(0, lastMatchingRunAt + 1)
+    return nextBatch.slice(0, lastMatchingRunAt)
   }
 
   await pg.tx('ScheduledJob', (task) => {