feat: minor fixes

Pratham-Mishra04 · Pratham-Mishra04 · commit d53d14fa9201 · 2023-06-07T15:03:09.000+05:30
diff --git a/src/constants.ts b/src/constants.ts
@@ -2,4 +2,4 @@ export const NO_OF_EVENTS = 35;
 
 export const LOCK_SUBMISSIONS = false;
 
-export const CURRENT_ROUND = 0;
+export const CURRENT_ROUND = 1;
diff --git a/src/pages/api/admin/submission/[id].ts b/src/pages/api/admin/submission/[id].ts
@@ -28,25 +28,38 @@ const editSubmission = async (req: NextApiRequest, res: NextApiResponse) => {
     try {
         const query = req.query;
         const { id } = query;
-        const submission = await Submission.findById(id);
-        if (submission.status !== req.body.status - 1)
-            res.status(400).json({
-                status: 'error',
-                message: 'Invalid attempt to change the submission status',
-            });
-        else if (submission.status !== CURRENT_ROUND - 1) {
+        const team = await Team.findById(id).populate('submission');
+        const submission = team.submission;
+        if (!submission) {
             res.status(400).json({
                 status: 'error',
-                message: 'Invalid attempt to change the submission status',
+                message: 'No submission for the team found.',
             });
         } else {
-            await Submission.findByIdAndUpdate(id, req.body);
-            res.status(200).json({
-                status: 'success',
-                message: 'Submission updated.',
-            });
+            if (submission.status !== req.body.status - 1)
+                res.status(400).json({
+                    status: 'error',
+                    message: 'Invalid attempt to change the submission status',
+                });
+            else if (submission.status !== CURRENT_ROUND - 1) {
+                res.status(400).json({
+                    status: 'error',
+                    message: 'Invalid attempt to change the submission status',
+                });
+            } else {
+                const editedSubmission = await Submission.findByIdAndUpdate(
+                    id,
+                    req.body
+                );
+                res.status(200).json({
+                    status: 'success',
+                    message: 'Submission updated.',
+                    submission: editedSubmission,
+                });
+            }
         }
-    } catch {
+    } catch (err) {
+        console.log(err);
         res.status(500).json({
             status: 'success',
             message: 'Internal Server Error',
diff --git a/src/pages/hack/admin/team/[id].tsx b/src/pages/hack/admin/team/[id].tsx
@@ -13,6 +13,7 @@ import { GetServerSidePropsContext } from 'next';
 import getHandler from '@/handlers/getHandler';
 import patchHandler from '@/handlers/patchHandler';
 import InputField from '@/components/common/InputField';
+import { CURRENT_ROUND } from '@/constants';
 
 interface Props {
     id: string;
@@ -70,20 +71,30 @@ const ProjectReviewPage = ({ id }: Props) => {
         setRounds(updatedRounds);
     };
 
-    const SaveRoundChangesHandler = () => {
-        const formData = {
-            round1Score: rounds[0].score,
-            round1Judge: session?.user.name,
-            round2Score: rounds[1].score,
-            round2Judge: session?.user.name,
-            round3Score: rounds[2].score,
-            round3Judge: session?.user.name,
-        };
-        const data = patchHandler(
+    const SaveRoundChangesHandler = async () => {
+        let formData = {};
+        if (CURRENT_ROUND === 1) {
+            formData = {
+                round1Score: rounds[0].score,
+                round1Judge: session?.user.name,
+            };
+        } else if (CURRENT_ROUND === 2) {
+            formData = {
+                round2Score: rounds[1].score,
+                round2Judge: session?.user.name,
+            };
+        } else if (CURRENT_ROUND === 3) {
+            formData = {
+                round3Score: rounds[2].score,
+                round3Judge: session?.user.name,
+            };
+        }
+
+        const data = await patchHandler(
             `${process.env.NEXT_PUBLIC_BASE_URL}/api/admin/submission/${id}`,
             formData
         );
-        console.log(rounds);
+        console.log(data);
     };
 
     const handleScoreChange = (index: number, value: number) => {
@@ -247,14 +258,18 @@ const ProjectReviewPage = ({ id }: Props) => {
 
                         {/* STRONGLY SUGGESTED MAKE NEW DUPLICATE 2 COMPONENTS BELOW JUST FOR ADMIN PANEL SOLO PROJECT VIEW PAGE CUZ IT WILL HAVE A NEW CHECK KI EVEN SUPER USER CAN VIEW ALL */}
                         <div className="w-full lg:w-[50%] h-full">
-                            {toggleEdit === 0 ? (
+                            {/* {toggleEdit === 0 ? (
                                 <ViewSubmission
                                     id={id}
                                     toggleEdit={setToggleEdit}
                                 />
                             ) : (
                                 <EditSubmission id={id} />
-                            )}
+                            )} */}
+                            <ViewSubmission
+                                id={id}
+                                toggleEdit={setToggleEdit}
+                            />
                         </div>
                     </>
                 )}

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ export const NO_OF_EVENTS = 35;`
`2`	`2`
`3`	`3`	`export const LOCK_SUBMISSIONS = false;`
`4`	`4`
`5`		`-export const CURRENT_ROUND = 0;`
	`5`	`+export const CURRENT_ROUND = 1;`