Merge pull request #172 from UoaWDCC/GH133-edit-checker-page-endpoint

Gh133 edit checker page endpoint
UoaWDCC · Jan 12, 2024 · 7b4b7f3 · 7b4b7f3
2 parents da9f170 + 06b1834
commit 7b4b7f3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/api/index.ts b/api/index.ts
@@ -56,7 +56,7 @@ app.use('/api/auth/google', authRoutes);
 app.use('/api/sheet/columns', sheetroutes);
 app.use('/api/club', organisationRoutes);
 app.use('/api/pages', pagesRoutes);
-app.use('api/verify', verifyRoutes);
+app.use('/api/verify', verifyRoutes);
 app.use('/api/dashboard', dashboardRoutes);
 app.use('/api/user', userRoutes);
 

diff --git a/api/routes/pages/pages.ts b/api/routes/pages/pages.ts
@@ -178,13 +178,19 @@ router.post(
   auth,
   async (req: Request, res: Response) => {
     try {
-      const customization: IPageCustomization & { webLink: string } = req.body;
+      const customization: IPageCustomization & {
+        webLink: string;
+        removeLogo: boolean;
+        removeBackground: boolean;
+      } = req.body;
 
       const {
         name,
         sheetId,
         sheetTabId,
         identificationColumns,
+        removeBackground,
+        removeLogo,
         fontFamily,
         webLink,
         ...rest
@@ -279,8 +285,10 @@ router.post(
           dropDownBackgroundColor:
             rest.dropDownBackgroundColor ??
             existingPage.dropDownBackgroundColor,
-          logoLink: logoUrl ?? existingPage.logoLink,
-          backgroundImageLink: backgroundUrl ?? existingPage.backgroundColor,
+          logoLink: removeLogo ? undefined : logoUrl ?? existingPage.logoLink,
+          backgroundImageLink: removeBackground
+            ? undefined
+            : backgroundUrl ?? existingPage.backgroundColor,
           fontFamily: fontFamily ?? existingPage.fontFamily ?? 'Montserrat',
         },
       });
@@ -290,9 +298,12 @@ router.post(
         displayName?: string;
       }[] = JSON.parse(identificationColumns || '[]');
       parsedColumns!.forEach(async ({ originalName, displayName }) => {
-        await prisma.column.create({
-          data: {
+        await prisma.column.updateMany({
+          where: {
+            originalName,
             pageId: page.id,
+          },
+          data: {
             originalName: originalName,
             displayName: displayName ?? originalName,
           },