From f42d1445c6f0518e7466401df3988e458a055d1c Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <contact@baptiste-arnaud.fr>
Date: Fri, 3 Feb 2023 15:59:54 +0100
Subject: [PATCH] :adhesive_bandage: Clean up typebot before updating

---
 .../builder/src/pages/api/typebots/[typebotId].ts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/builder/src/pages/api/typebots/[typebotId].ts b/apps/builder/src/pages/api/typebots/[typebotId].ts
index 39459e73d..8a03a944b 100644
--- a/apps/builder/src/pages/api/typebots/[typebotId].ts
+++ b/apps/builder/src/pages/api/typebots/[typebotId].ts
@@ -1,4 +1,4 @@
-import { CollaborationType } from 'db'
+import { CollaborationType, Prisma } from 'db'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { canReadTypebots, canWriteTypebots } from '@/utils/api/dbRules'
@@ -7,6 +7,7 @@ import { getAuthenticatedUser } from '@/features/auth/api'
 import { archiveResults } from '@/features/results/api'
 import { typebotSchema } from 'models'
 import { captureEvent } from '@sentry/nextjs'
+import { omit } from 'utils'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
@@ -82,12 +83,12 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
       return res.send({ message: 'Found newer version of typebot in database' })
     const typebots = await prisma.typebot.updateMany({
       where: canWriteTypebots(typebotId, user),
-      data: {
+      data: removeOldProperties({
         ...data,
         theme: data.theme ?? undefined,
         settings: data.settings ?? undefined,
         resultsTablePreferences: data.resultsTablePreferences ?? undefined,
-      },
+      }) as Prisma.TypebotUpdateInput,
     })
     return res.send({ typebots })
   }
@@ -102,4 +103,12 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   return methodNotAllowed(res)
 }
 
+// TODO: Remove in a month
+const removeOldProperties = (data: unknown) => {
+  if (data && typeof data === 'object' && 'publishedTypebotId' in data) {
+    return omit(data, 'publishedTypebotId')
+  }
+  return data
+}
+
 export default handler