Scores fixed

Author: JKSANJAY27

src/api/fetchScores.ts

@@ -17,13 +17,17 @@ const scoresResponseSchema = z.object({
   message: z.string(),
  data: z.object({
     message: z.string(),
-    scores: z.array(scoreSchema),
+    scores: z.array(scoreSchema).optional(),
   }),
 });
+const createUpdateResponseSchema = z.object({
+  status: z.string(),
+  message: z.string(),
+});
 
-const deleteSchema = z.object({
+const deleteResponseSchema = z.object({
   status: z.string(),
-  data: z.record(z.unknown()), 
+    message: z.string()
 });
 
 
@@ -37,24 +41,25 @@ export const fetchScores = async (teamId: string) => {
     const response = await axios.get<{
       status: string;
       message: string;
-      data: {
-        message: string;
-        scores: ScoreResponse[];
+      data?: {
+        message?: string;
+        scores?: ScoreResponse[];
       };
     }>(`panel/getscore/${teamId}`, {
       withCredentials: true,
     });
       const parsedResponse = scoresResponseSchema.parse(response.data);
-      return parsedResponse.data.scores;
-  } catch (err) {
-    console.error(err)
+      return parsedResponse.data?.scores ?? [];
+  } catch (err:any) {
+    if (err.response.status === 404) {
+          return [];
+      }
     throw err;
   }
 };
 const createResponseSchema = z.object({
-
+  status: z.string(),
   message: z.string(),
-
 });
 
 export const createScore = async ({
@@ -98,20 +103,14 @@ export const deleteScore = async (scoreId: string) => {
           withCredentials: true,
         });
 
-        const parsedResponse = deleteSchema.parse(response.data);
+        const parsedResponse = deleteResponseSchema.parse(response.data);
         return parsedResponse;
   } catch (err) {
     console.error(err);
     throw err;
   }
 };
 
-const updateResponseSchema = z.object({
-
-  message: z.string(),
-
-});
-
 export const updateScore = async ({
     scoreId,
     design,
@@ -120,7 +119,8 @@ export const updateScore = async ({
     innovation,
    teamwork,
    comment,
-   round
+   round,
+   team_id
 }: {
     scoreId:string,
     design:number,
@@ -130,6 +130,7 @@ export const updateScore = async ({
    teamwork:number,
    comment:string,
      round:number,
+     team_id:string
 }) => {
   try {
     const response = await axios.put(`panel/updatescore/${scoreId}`,
@@ -140,14 +141,15 @@ export const updateScore = async ({
             innovation,
           teamwork,
           comment,
-            round
+            round,
+            team_id
        },
       {
         withCredentials: true,
       }
     );
 
-    const parsedResponse = updateResponseSchema.parse(response.data);
+    const parsedResponse = createUpdateResponseSchema.parse(response.data);
         return parsedResponse;
   } catch (err) {
     console.error(err);

src/app/team/[id]/page.tsx

@@ -108,7 +108,8 @@ function ScoreSection({ teamId }: { teamId: string }) {
       innovation,
       teamwork,
       comment,
-      round
+      round,
+      team_id: teamId || ''
     }),
     onError: (err: ApiError) => {
       create(`Error updating score: ${err?.message ?? "unknown error"}`, "error");
@@ -144,31 +145,35 @@ function ScoreSection({ teamId }: { teamId: string }) {
     setEditMode(true);
   };
 
-  const handleSubmit = () => {
+  const handleSubmit = async() => {
     if (!teamId) return;
 
-    if (editMode && currentScoreId) {
-      void updateScoreMutation.mutateAsync({
-        scoreId: currentScoreId,
-        design,
-        implementation,
-        presentation,
-        innovation,
-        teamwork,
-        comment,
-        round
-      });
-    } else {
-      void createScoreMutation.mutateAsync({
-        teamId,
-        design,
-        implementation,
-        presentation,
-        innovation,
-        teamwork,
-        comment,
-        round
-      });
+    try {
+      if (editMode && currentScoreId) {
+        await updateScoreMutation.mutateAsync({
+          scoreId: currentScoreId,
+          design,
+          implementation,
+          presentation,
+          innovation,
+          teamwork,
+          comment,
+          round
+        });
+      } else {
+        await createScoreMutation.mutateAsync({
+          teamId,
+          design,
+          implementation,
+          presentation,
+          innovation,
+          teamwork,
+          comment,
+          round
+        });
+      }
+    } catch (error) {
+      console.error('Error submitting score:', error);
     }
   };
 
@@ -186,11 +191,13 @@ function ScoreSection({ teamId }: { teamId: string }) {
   if (scoresLoading) return <div>Loading scores...</div>;
   if (scoresError) return <div>Error loading scores</div>;
 
+  const showForm = !scores || scores.length === 0 || editMode;
+
   return (
     <div className="mt-8">
       <h2 className="text-xl font-bold mb-4">Team Scores</h2>
 
-      {((!scores || scores.length === 0) || editMode) && (
+      {showForm && (
         <div className="space-y-4 bg-gray-900 p-4 rounded-lg mb-4">
           <h3 className="text-lg font-semibold">{editMode ? "Edit Score" : "Add Score"}</h3>
           <div className="grid grid-cols-2 gap-4">
@@ -228,19 +235,28 @@ function ScoreSection({ teamId }: { teamId: string }) {
             />
           </div>
           <div className="space-x-2">
-            <Button onClick={handleSubmit}>
+            <Button 
+              onClick={handleSubmit}
+              disabled={updateScoreMutation.isPending || createScoreMutation.isPending}
+            >
               {editMode ? "Update Score" : "Add Score"}
             </Button>
             {editMode && (
-              <Button variant="secondary" onClick={resetForm}>
+              <Button 
+                variant="secondary" 
+                onClick={() => {
+                  resetForm();
+                  setEditMode(false);
+                }}
+              >
                 Cancel
               </Button>
             )}
           </div>
         </div>
       )}
 
-      {scores.map((score: Score) => (
+      {scores && scores.length > 0 && !editMode && scores.map((score: Score) => (
         <div key={score.id} className="bg-gray-800 rounded-lg p-4 space-y-4 mt-4">
           <div className="flex justify-between items-center">
             <div className="text-xl font-bold">