Move review to separate model

server/api/admin/answer/[answerId]/review.post.ts

@@ -45,23 +45,30 @@ export default defineEventHandler(async (event) => {
   if (!answer) {
     throw createError({ status: 404, statusText: 'Not found!' });
   }
-  const { score, review } = await useValidatedBody(
+  const data = await useValidatedBody(
     event,
     z.object({
       score: z.int().min(0).max(32767).nullable(),
-      review: z.string().max(256).nullable()
+      review: z.string().max(256).nullable(),
+      showcase: z.boolean().nullable().default(false),
+      internalNote: z.string().max(256).nullable(),
+      rankingValue: z.int().nullable()
     })
   );
 
-  await prisma.questAnswer.update({
+  await prisma.review.upsert({
     where: {
-      id: answerId
+      answerId
     },
-    data: {
-      score,
-      review,
+    update: {
+      ...data,
+      reviewerId: userId
+    },
+    create: {
+      ...data,
       reviewerId: userId
     }
   });
+
   return answer;
 });

server/api/admin/hunt/[huntId]/showcase.get.ts

@@ -56,7 +56,9 @@ export default defineEventHandler(async (event) => {
               members: true,
               answers: {
                 where: {
-                  score: { gt: 0 }
+                  review: {
+                    score: { gt: 0 }
+                  }
                 }
               }
             }
@@ -66,10 +68,16 @@ export default defineEventHandler(async (event) => {
           description: true,
           answers: {
             select: {
-              score: true
+              review: {
+                select: {
+                  score: true
+                }
+              }
             },
             where: {
-              score: { not: null }
+              review: {
+                score: { not: null }
+              }
             }
           }
         }
@@ -88,7 +96,11 @@ export default defineEventHandler(async (event) => {
             select: {
               id: true,
               text: true,
-              score: true,
+              review: {
+                select: {
+                  score: true
+                }
+              },
 
               picture: {
                 select: {
@@ -110,11 +122,21 @@ export default defineEventHandler(async (event) => {
               }
             },
             where: {
-              showcase: true
+              review: {
+                showcase: true
+              }
             },
             orderBy: [
-              { rankingValue: { sort: 'asc', nulls: 'last' } },
-              { score: { sort: 'asc', nulls: 'last' } },
+              {
+                review: {
+                  rankingValue: { sort: 'asc', nulls: 'last' }
+                }
+              },
+              {
+                review: {
+                  score: { sort: 'asc', nulls: 'last' }
+                }
+              },
               { createdAt: 'asc' }
             ]
           }
@@ -124,7 +146,9 @@ export default defineEventHandler(async (event) => {
             {
               answers: {
                 some: {
-                  showcase: true
+                  review: {
+                    showcase: true
+                  }
                 }
               }
             }
@@ -155,7 +179,7 @@ export default defineEventHandler(async (event) => {
       id,
       description,
       answers: _count.answers,
-      score: answers.reduce((sum, a) => sum + (a.score || 0), 0)
+      score: answers.reduce((sum, a) => sum + (a.review?.score || 0), 0)
     }))
     .toSorted((a, b) => b.score - a.score);
 

server/api/admin/hunt/[huntId]/teamless.get.ts

@@ -43,7 +43,7 @@ export default defineEventHandler(async (event) => {
   const { email } = await useValidatedQuery(
     event,
     z.object({
-      email: z.string().min(3).trim()
+      email: z.string().trim().default('')
     })
   );
 

server/api/admin/quest/[questId]/index.get.ts

@@ -51,6 +51,7 @@ export default defineEventHandler(async (event) => {
         select: {
           id: true,
           text: true,
+          final: true,
           updatedAt: true,
           team: {
             select: {
@@ -58,15 +59,19 @@ export default defineEventHandler(async (event) => {
               name: true
             }
           },
-          score: true,
-          review: true,
-          internalNote: true,
-          rankingValue: true,
-          showcase: true,
-          reviewer: {
+          review: {
             select: {
-              name: true,
-              id: true
+              score: true,
+              review: true,
+              internalNote: true,
+              rankingValue: true,
+              showcase: true,
+              reviewer: {
+                select: {
+                  name: true,
+                  id: true
+                }
+              }
             }
           },
           member: {
@@ -83,8 +88,9 @@ export default defineEventHandler(async (event) => {
           }
         },
         orderBy: [
-          { rankingValue: { sort: 'desc', nulls: 'last' } },
-          { score: { sort: 'desc', nulls: 'last' } },
+          { final: 'desc' },
+          { review: { rankingValue: { sort: 'desc', nulls: 'last' } } },
+          { review: { score: { sort: 'desc', nulls: 'last' } } },
           {
             updatedAt: 'desc'
           }