From cbdebf1c70a0f30529069933af13edfa4b258b2b Mon Sep 17 00:00:00 2001
From: Tan Su Yin <e0425292@u.nus.edu>
Date: Sun, 9 Oct 2022 16:32:51 +0800
Subject: [PATCH] [resumes][refactor] Change to filtering on FE for comments

---
 .../resumes/comments/CommentsList.tsx         | 25 +++++++++----------
 .../server/router/resumes-reviews-router.ts   |  4 +--
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/apps/portal/src/components/resumes/comments/CommentsList.tsx b/apps/portal/src/components/resumes/comments/CommentsList.tsx
index 54843bca..7e15e4d8 100644
--- a/apps/portal/src/components/resumes/comments/CommentsList.tsx
+++ b/apps/portal/src/components/resumes/comments/CommentsList.tsx
@@ -21,10 +21,7 @@ export default function CommentsList({
   const { data: session } = useSession();
 
   // Fetch the most updated comments to render
-  const commentsQuery = trpc.useQuery([
-    'resumes.reviews.list',
-    { resumeId, section: tab },
-  ]);
+  const commentsQuery = trpc.useQuery(['resumes.reviews.list', { resumeId }]);
 
   // TODO: Add loading prompt
 
@@ -39,15 +36,17 @@ export default function CommentsList({
       />
 
       <div className="m-2 flow-root h-[calc(100vh-20rem)] w-full flex-col space-y-3 overflow-y-scroll">
-        {commentsQuery.data?.map((comment) => {
-          return (
-            <Comment
-              key={comment.id}
-              comment={comment}
-              userId={session?.user?.id}
-            />
-          );
-        })}
+        {commentsQuery.data
+          ?.filter((c) => c.section === tab)
+          .map((comment) => {
+            return (
+              <Comment
+                key={comment.id}
+                comment={comment}
+                userId={session?.user?.id}
+              />
+            );
+          })}
       </div>
     </div>
   );
diff --git a/apps/portal/src/server/router/resumes-reviews-router.ts b/apps/portal/src/server/router/resumes-reviews-router.ts
index 8219edce..f0a8d03c 100644
--- a/apps/portal/src/server/router/resumes-reviews-router.ts
+++ b/apps/portal/src/server/router/resumes-reviews-router.ts
@@ -8,11 +8,10 @@ import type { ResumeComment } from '~/types/resume-comments';
 export const resumeReviewsRouter = createRouter().query('list', {
   input: z.object({
     resumeId: z.string(),
-    section: z.nativeEnum(ResumesSection),
   }),
   async resolve({ ctx, input }) {
     const userId = ctx.session?.user?.id;
-    const { resumeId, section } = input;
+    const { resumeId } = input;
 
     // For this resume, we retrieve every comment's information, along with:
     // The user's name and image to render
@@ -42,7 +41,6 @@ export const resumeReviewsRouter = createRouter().query('list', {
       },
       where: {
         resumeId,
-        section,
       },
     });