From 0c457d5157841e83fd2b56984d6e5332b4c37aeb Mon Sep 17 00:00:00 2001
From: Owen <91054189+satanakorn@users.noreply.github.com>
Date: Wed, 27 Nov 2024 22:30:42 +0700
Subject: [PATCH 1/6] update rating

---
 frontend/src/Rating.jsx             | 87 +++++++++++++++++------------
 src/controllers/ratingController.ts |  7 ++-
 src/controllers/teamController.ts   | 53 ++++++++----------
 src/controllers/userController.ts   | 40 +++++++------
 4 files changed, 103 insertions(+), 84 deletions(-)

diff --git a/frontend/src/Rating.jsx b/frontend/src/Rating.jsx
index 2d612c5..7f9576e 100644
--- a/frontend/src/Rating.jsx
+++ b/frontend/src/Rating.jsx
@@ -41,6 +41,7 @@ const Rating = () => {
           console.error('Error fetching users:', error);
         }
       }
+      console.log(selectedTeam)
     };
 
     fetchUsers();
@@ -58,9 +59,9 @@ const Rating = () => {
         return;
       }
 
-      // ดึง TeamID จาก TeamName
-      const teamResponse = await Axios.get(`http://localhost:3000/team/getTeamID`, {
-        params: { TeamName: selectedTeam },
+      // Fetch TeamID from TeamName
+      const teamResponse = await Axios.get(`http://localhost:3000/team/getTeam`, {
+        params: { TeamID: selectedTeam },
       });
 
       const TeamID = teamResponse.data.TeamID;
@@ -70,22 +71,28 @@ const Rating = () => {
         return;
       }
 
-      // ดึง UserID จาก Username 
-      const userResponse = await Axios.get(`http://localhost:3000/user/getUserID`, {
-        params: { Username: selectedUser },
-      });
+      // // Store TeamID in local storage
+      // localStorage.setItem('TeamID', TeamID);
+
+      // Fetch UserID from Username
+      const userResponse = await Axios.get(`http://localhost:3000/user/getUserID/${selectedUser}`);
 
-      const ratedUserID = userResponse.data.userID;
+      console.log(userResponse.data);
 
+      
+      const ratedUserID = userResponse.data.UserID;
+      
       if (!ratedUserID) {
         setErrorMessage('ไม่พบ UserID ของ Username นี้');
         return;
       }
 
-      // ตรวจสอบว่าคนให้คะแนนอยู่ในทีมเดียวกันคนถูกให้คะแนนมั้ย
-      const checkTeam = await Axios.post(`http://localhost:3000/team/checkteam`, {
-        Teamname: selectedTeam,
-        userID: ratedUserID, // ตรวจสอบ UserID ในทีม
+      // Check if the user is part of the team
+      const checkTeam = await Axios.get(`http://localhost:3000/team/checkteam`, {
+        params: {
+          TeamID: TeamID,
+          UserID: ratedUserID,
+        },
       });
 
       if (!checkTeam.data.valid) {
@@ -93,31 +100,37 @@ const Rating = () => {
         return;
       }
 
-      // เพิ่มข้อมูลลงในตาราง userteam
-      await Axios.post(`http://localhost:3000/rating/rateuser`, {
-          ratedByID: UserID,
-          ratedUserID,
-          RatingValue: RatingValue,
-          Comment,
-        },
-        {
-          headers: {
-            Authorization: `Bearer ${localStorage.getItem('token')}`,
+      console.log(UserID)
+      console.log(ratedUserID)
+      console.log(RatingValue)
+      console.log(Comment)
+
+      // Add rating
+           // Add rating
+           await Axios.post(`http://localhost:3000/rating/rateuser`, {
+            ratedByID: UserID,
+            ratedUserID: ratedUserID,
+            ratingValue: RatingValue,
+            comment: Comment,
           },
-        }
-      );
-
-      // รีเซ็ตฟอร์ม
-      setSelectedTeam('');
-      setSelectedUser('');
-      setRatingValue('');
-      setComment('');
-      setErrorMessage('');
-      alert('บันทึกคะแนนสำเร็จ');
-    } catch (error) {
-      console.error('Error:', error);
-      setErrorMessage('เกิดข้อผิดพลาดในการบันทึกข้อมูล');
-    }
+          {
+            headers: {
+              Authorization: `Bearer ${localStorage.getItem('token')}`,
+            },
+          }
+        );
+  
+        // Reset form
+        setSelectedTeam('');
+        setSelectedUser('');
+        setRatingValue('');
+        setComment('');
+        setErrorMessage('');
+        alert('บันทึกคะแนนสำเร็จ');
+      } catch (error) {
+        console.error('Error:', error);
+        setErrorMessage('เกิดข้อผิดพลาดในการบันทึกข้อมูล');
+      }
   };
 
   return (
@@ -148,7 +161,7 @@ const Rating = () => {
             >
               <option value="" disabled>Select User</option>
               {users.map((user) => (
-                <option key={user.UserID} value={user.UserName}>
+                <option key={user.UserID} value={user.UserID}>
                   {user.UserName}
                 </option>
               ))}
diff --git a/src/controllers/ratingController.ts b/src/controllers/ratingController.ts
index 81a4395..6451882 100644
--- a/src/controllers/ratingController.ts
+++ b/src/controllers/ratingController.ts
@@ -28,7 +28,8 @@ export const ratingController = new Elysia({ prefix: "/rating" })
     }),
 })
 
-// Rating to someone
+
+// Rate someone
 .post("/rateuser", async ({ body, error }) => {
     const { ratedByID, ratedUserID, ratingValue, comment } = body;
 
@@ -71,6 +72,8 @@ export const ratingController = new Elysia({ prefix: "/rating" })
     }),
 })
 
+// Other endpoints...
+
 // Update rating
 .put("/:userRatingID", async ({ params, body, error }) => {
     const { userRatingID } = params;
@@ -103,4 +106,4 @@ export const ratingController = new Elysia({ prefix: "/rating" })
         ratingValue: t.Optional(t.Number()),
         comment: t.Optional(t.String()),
     }),
-});
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/src/controllers/teamController.ts b/src/controllers/teamController.ts
index 5ba67d0..615bd84 100644
--- a/src/controllers/teamController.ts
+++ b/src/controllers/teamController.ts
@@ -19,7 +19,7 @@ export const teamController = new Elysia({ prefix: "/team" })
         },
     });
 
-    if (!users) {
+    if (!users || users.length === 0) {
         return error(404, "Users not found");
     }
 
@@ -30,14 +30,11 @@ export const teamController = new Elysia({ prefix: "/team" })
     }),
 })
 
-
-
-// Get TeamID from name and hackathon
-.get("/find", async ({ query: { teamName, hackathonID }, error }) => {
+// Get Team by TeamID
+.get("/getTeam", async ({ query: { TeamID }, error }) => {
     const team = await prisma.team.findFirst({
         where: {
-            TeamName: teamName,
-            HackathonID: hackathonID,
+          TeamID: TeamID,
         },
     });
 
@@ -48,43 +45,41 @@ export const teamController = new Elysia({ prefix: "/team" })
     return team;
 }, {
     query: t.Object({
-        teamName: t.String(),
-        hackathonID: t.Number(),
+        TeamID: t.Number(),
     }),
 })
 
-// check TeamName and UserID in rating
-.get("/checkteam", async ({ query: { TeamID, userID }, error }) => {
-      // ตรวจสอบ input ว่ามีค่าหรือไม่
-      if (!TeamID || !userID) {
-        return error(400, "teamID and userID are required");
-      }
+// Check if a user is part of a team
+.get("/checkteam", async ({ query: { TeamID, UserID }, error }) => {
+    if (!TeamID || !UserID) {
+        return error(400, "TeamID and UserID are required");
+    }
 
-      const teamMember = await prisma.userTeam.findFirst({
+    const teamMember = await prisma.userTeam.findFirst({
         where: {
-          TeamID: TeamID,
-          UserID: userID,
+            TeamID: TeamID,
+            UserID: UserID,
         },
-      });
+    });
 
-      if (!teamMember) {
+    if (!teamMember) {
         return error(404, "User is not part of the team");
-      }
+    }
 
-      return "User is part of the team";
-    },
-    {
-      query: t.Object({
+    return { valid: true };
+}, {
+    query: t.Object({
         TeamID: t.Number(),
-        userID: t.String(),
-      }),
-    })
+        UserID: t.String(),
+    }),
+})
 
+// Other endpoints...
 // Get TeamID from TeamName
 .get("/getTeamID", async ({ query: { TeamName }, error }) => {
     const team = await prisma.team.findFirst({
         where: {
-          TeamName: TeamName,
+            TeamName: TeamName,
         },
     });
 
diff --git a/src/controllers/userController.ts b/src/controllers/userController.ts
index 0973f36..39a795e 100644
--- a/src/controllers/userController.ts
+++ b/src/controllers/userController.ts
@@ -255,24 +255,26 @@ export const userController = new Elysia({ prefix: "/user" })
       return users; // Return all users with related skills and notifications
     })
 
-  // Get UserID from Username
-  .get("/getUserID", async ({ query: { UserName }, error }) => {
-    const user = await prisma.user.findFirst({
-        where: {
-          UserName: UserName,
-        },
-    });
-  
-    if (!user) {
-        return error(404, "User not found");
-    }
-  
-    return {userID: user.UserID};
+    
+    // Get user details from Username
+    .get("/getUserID/:UserID", async ({params,  error }) => {
+      const user = await prisma.user.findFirst({
+          where: {
+            UserID: params.UserID,
+          },
+      });
+    
+      if (!user) {
+          return error(404, "User not found");
+      }
+    
+      return { UserID : user.UserID , UserName : user.UserName};
     }, {
-    query: t.Object({
-        UserName: t.String(),
+      params: t.Object({
+          UserID: t.String(),
       }),
     })
+    
 
   // Delete user profile
   .delete(
@@ -299,4 +301,10 @@ export const userController = new Elysia({ prefix: "/user" })
         userID: t.String(),
       }),
     }
-  );
\ No newline at end of file
+  );
+
+
+
+  // .get (
+  //   "/GetId", 
+  // )
\ No newline at end of file

From 60b4a35622c27de088a0da237001b2444b64679f Mon Sep 17 00:00:00 2001
From: Pongrawee Sripetpong <pongrawee.sripe@mail.kmutt.ac.th>
Date: Wed, 27 Nov 2024 22:31:37 +0700
Subject: [PATCH 2/6] fixsomethingineventdetail

---
 frontend/src/eventdetail.jsx      | 127 ++++++++++++++++++++++++++----
 src/controllers/teamController.ts |  61 +++++++++++---
 2 files changed, 163 insertions(+), 25 deletions(-)

diff --git a/frontend/src/eventdetail.jsx b/frontend/src/eventdetail.jsx
index b7d6fe7..f8d92af 100644
--- a/frontend/src/eventdetail.jsx
+++ b/frontend/src/eventdetail.jsx
@@ -26,7 +26,74 @@ const EventDetail = () => {
    useEffect(() => {
     console.log('member:', member);
   }, [member]);
+
+  const checkteam = async (TeamID) => {
+    try {
+      const responsed = await Axios.get(`http://localhost:3000/team/finduserteam/${TeamID}`);
+      const team = responsed.data;
+      const currentUser = team.find(member => member.UserID === UserID);
+      if (currentUser) {
+        Swal.fire({
+          title: "Sorry",
+          text: "You are in the team !",
+          icon: "error"
+        });
+        setTimeout(() => {
+          Swal.close();
+        }, 3000);
+  
+        await new Promise(resolve => setTimeout(resolve, 2000));
   
+        window.location.href = `/EventDetail/${HackathonID}`;}
+    } catch (error) {
+      console.error("Error deleting from team:", error);
+    }
+  }
+
+
+  const deleteteam = async (TeamID) => {
+    try {
+      const responsed = await Axios.get(`http://localhost:3000/team/finduserteam/${TeamID}`);
+      const team = responsed.data;
+      const currentUser = team.find(member => member.UserID === UserID);
+      if (currentUser) {
+         setCurrentUserRole(currentUser.role)}
+      
+      if (currentUserRole === 'head'){
+      const response = await Axios.delete(`http://localhost:3000/team/delete/${TeamID}`,TeamID);
+      console.log('Delete response:', response.data);
+      Swal.fire({
+        title: "Congratulation",
+        text: "Delete team success !",
+        icon: "success"
+      });
+      setTimeout(() => {
+        Swal.close();
+      }, 3000);
+
+      await new Promise(resolve => setTimeout(resolve, 2000));
+
+      window.location.href = `/EventDetail/${HackathonID}`;
+    }
+    else{
+      Swal.fire({
+        title: "Sorry",
+        text: "You don't have permission to delete team !",
+        icon: "error"
+      });
+      setTimeout(() => {
+        Swal.close();
+      }, 3000);
+
+      await new Promise(resolve => setTimeout(resolve, 2000));
+
+      window.location.href = `/EventDetail/${HackathonID}`;
+    }} catch (error) {
+      console.error("Error deleting from team:", error);
+    }
+  }
+
+  //delete members from team
   const deletefromteam = async (TeamID, UserID) => {
     try {
       const response = await Axios.delete(`http://localhost:3000/team/removeMember`, {
@@ -43,9 +110,9 @@ const EventDetail = () => {
       });
       setTimeout(() => {
         Swal.close();
-      }, 3000);
+      }, 1000);
 
-      await new Promise(resolve => setTimeout(resolve, 2000));
+      await new Promise(resolve => setTimeout(resolve, 1000));
 
       window.location.href = `/EventDetail/${HackathonID}`;
     } catch (error) {
@@ -99,6 +166,19 @@ const EventDetail = () => {
         window.location.href = `/EventDetail/${HackathonID}`;
       }
       else{
+        
+      const payloadt = {
+            teamID: TeamID,
+            userID: UserID,
+            role: role
+            };
+        console.log('Payload:', payloadt);
+        await Axios.post('http://localhost:3000/team/addMember', payloadt);
+        setuserTeamlist((prev) => [
+            ...prev,
+            { teamID: TeamID, userID: UserID, role: role },
+        ]);
+
         Swal.fire({
           title: "Good job!",
           text: "Join team Sucessful!",
@@ -112,18 +192,6 @@ const EventDetail = () => {
     
         // localStorage.setItem('UserID', JSON.stringify(response.data.UserID));
         window.location.href = `/EventDetail/${HackathonID}`;
-      
-      const payloadt = {
-            teamID: TeamID,
-            userID: UserID,
-            role: role
-            };
-        console.log('Payload:', payloadt);
-        await Axios.post('http://localhost:3000/team/addMember', payloadt);
-        setuserTeamlist((prev) => [
-            ...prev,
-            { teamID: TeamID, userID: UserID, role: role },
-        ]);
       }
     } catch (error) {
         console.error("Error joining team:", error);
@@ -166,6 +234,18 @@ const addteam = async () => {
       ]);
 
       console.log('Team created successfully');
+      Swal.fire({
+        title: "Congratulation",
+        text: "Create team success !",
+        icon: "success"
+      });
+      setTimeout(() => {
+        Swal.close();
+      }, 3000);
+
+      await new Promise(resolve => setTimeout(resolve, 2000));
+
+      window.location.href = `/EventDetail/${HackathonID}`;
   } catch (error) {
       console.error('Error creating team:', error.response?.data || error.message);
   }
@@ -264,6 +344,19 @@ const addteam = async () => {
                 <span>👥 {val.CurrentMember}/{val.MaxMember}</span>
               </div>
               <h3 className="text-xl font-semibold text-gray-700 mt-8">Team {val.TeamName}</h3>
+
+               
+              <div className="absolute top-4 right-4">
+                <button
+                  onClick={() => deleteteam(val.TeamID)}
+                  className="ml-2 bg-red-500/80 text-white rounded-full p-1.5
+                           hover:bg-red-600 transition-all duration-300 transform hover:rotate-180"
+                >
+                  ✖
+                </button>
+              </div>
+              
+
               <div className="absolute bottom-4 right-4 flex space-x-2">
                 <button
                   onClick={async () => {
@@ -274,8 +367,12 @@ const addteam = async () => {
                 >
                   Delete Member
                 </button>
+
                 <button
-                  onClick={() => setIsjoinTeamModalOpen([true, val.TeamID, val.CurrentMember, val.MaxMember])}
+                  onClick={async () => {
+                    await setIsjoinTeamModalOpen([true, val.TeamID, val.CurrentMember, val.MaxMember])
+                    checkteam(val.TeamID)
+                  }}
                   className="px-3 py-1 bg-gradient-to-r from-blue-400 to-blue-500 text-white font-semibold rounded-full shadow-md hover:from-blue-500 hover:to-blue-600 transition-transform transform hover:-translate-y-1 hover:scale-105"
                 >
                   Join Team
diff --git a/src/controllers/teamController.ts b/src/controllers/teamController.ts
index f4d61d5..cd94c5b 100644
--- a/src/controllers/teamController.ts
+++ b/src/controllers/teamController.ts
@@ -29,6 +29,26 @@ export const teamController = new Elysia({ prefix: "/team" })
     }),
 })
 
+.get("/findteambyuser/:userID", async ({ params, error }) => {
+
+    const team = await prisma.userTeam.findMany({
+        where: {
+            UserID: params.userID,
+        },
+    });
+
+    if (!team || team.length === 0) {
+        return error(404, "Team not found");
+    }
+
+    return team;
+}, {
+    params: t.Object({
+        userID: t.String(), // userID is a string in the URL params
+    }),
+})
+
+
 .get("/finduserteam/:teamID", async ({ params, error }) => {
     const teamID = parseInt(params.teamID, 10); // Ensure teamID is a number
     if (isNaN(teamID)) {
@@ -132,19 +152,40 @@ export const teamController = new Elysia({ prefix: "/team" })
     }),
 })
 
-.delete("/delete/:teamID", async ({ params, error }) => {
+.delete('/delete/:teamID', async ({ params, error }) => {
     const { teamID } = params;
-
-    const team = await prisma.team.delete({
-        where: { TeamID: teamID },
-    });
-
-    return team;
-}, {
+  
+    try {
+      const teamIDNumber = parseInt(teamID, 10); // Ensure teamID is a number
+      if (isNaN(teamIDNumber)) {
+        return error(400, 'Invalid teamID');
+      }
+  
+      const team = await prisma.team.findUnique({
+        where: { TeamID: teamIDNumber },
+      });
+      
+  
+      if (!team) {
+        return error(404, 'Team not found');
+      }
+      await prisma.userTeam.deleteMany({
+        where: { TeamID: teamIDNumber },
+      })
+      await prisma.team.delete({
+        where: { TeamID: teamIDNumber },
+      });
+  
+      return { message: 'Team deleted successfully' };
+    } catch (err) {
+      console.error('Error deleting team:', err);
+      return error(500, 'Internal Server Error');
+    }
+  }, {
     params: t.Object({
-        teamID: t.Number(),
+      teamID: t.String(), // teamID is a string in the URL params
     }),
-})
+  })
 
 .post("/addMember", async ({ body, error }) => {
     const { teamID, userID, role } = body;

From 549e62239f82b0f40d94c70b9023a7f7825818da Mon Sep 17 00:00:00 2001
From: Owen <91054189+satanakorn@users.noreply.github.com>
Date: Wed, 27 Nov 2024 22:47:34 +0700
Subject: [PATCH 3/6] update rating

---
 frontend/src/Rating.jsx | 49 ++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/frontend/src/Rating.jsx b/frontend/src/Rating.jsx
index 7f9576e..f04b879 100644
--- a/frontend/src/Rating.jsx
+++ b/frontend/src/Rating.jsx
@@ -102,35 +102,34 @@ const Rating = () => {
 
       console.log(UserID)
       console.log(ratedUserID)
-      console.log(RatingValue)
+      console.log(typeof RatingValue);
       console.log(Comment)
 
       // Add rating
-           // Add rating
-           await Axios.post(`http://localhost:3000/rating/rateuser`, {
-            ratedByID: UserID,
-            ratedUserID: ratedUserID,
-            ratingValue: RatingValue,
-            comment: Comment,
-          },
-          {
-            headers: {
-              Authorization: `Bearer ${localStorage.getItem('token')}`,
-            },
-          }
-        );
-  
-        // Reset form
-        setSelectedTeam('');
-        setSelectedUser('');
-        setRatingValue('');
-        setComment('');
-        setErrorMessage('');
-        alert('บันทึกคะแนนสำเร็จ');
-      } catch (error) {
-        console.error('Error:', error);
-        setErrorMessage('เกิดข้อผิดพลาดในการบันทึกข้อมูล');
+      await Axios.post(`http://localhost:3000/rating/rateuser`, {
+        ratedByID: UserID,
+        ratedUserID: ratedUserID,
+        ratingValue: parseInt(RatingValue),
+        comment: Comment,
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem('token')}`,
+        },
       }
+        );
+
+    // Reset form
+    setSelectedTeam('');
+    setSelectedUser('');
+    setRatingValue('');
+    setComment('');
+    setErrorMessage('');
+    alert('บันทึกคะแนนสำเร็จ');
+  } catch (error) {
+    console.error('Error:', error);
+    setErrorMessage('เกิดข้อผิดพลาดในการบันทึกข้อมูล');
+  }
   };
 
   return (

From a5ec4f0e64d2cf289e1ff1d7f2a7878b2adb0b46 Mon Sep 17 00:00:00 2001
From: Owen <91054189+satanakorn@users.noreply.github.com>
Date: Wed, 27 Nov 2024 22:54:42 +0700
Subject: [PATCH 4/6] update rating

---
 src/controllers/teamController.ts | 189 ++++++++++++++++++------------
 1 file changed, 115 insertions(+), 74 deletions(-)

diff --git a/src/controllers/teamController.ts b/src/controllers/teamController.ts
index 615bd84..913897b 100644
--- a/src/controllers/teamController.ts
+++ b/src/controllers/teamController.ts
@@ -8,91 +8,45 @@ export const teamController = new Elysia({ prefix: "/team" })
     return teams;
 })
 
-// Get users in a team
-.get("/users/:teamID", async ({ params: { teamID }, error }) => {
-    const users = await prisma.userTeam.findMany({
-        where: {
-            TeamID: parseInt(teamID, 10),
-        },
-        include: {
-            User: true,
-        },
-    });
 
-    if (!users || users.length === 0) {
-        return error(404, "Users not found");
-    }
 
-    return users.map(userTeam => userTeam.User);
-}, {
-    params: t.Object({
-        teamID: t.String(),
-    }),
-})
 
-// Get Team by TeamID
-.get("/getTeam", async ({ query: { TeamID }, error }) => {
-    const team = await prisma.team.findFirst({
-        where: {
-          TeamID: TeamID,
-        },
-    });
 
-    if (!team) {
-        return error(404, "Team not found");
-    }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-    return team;
-}, {
-    query: t.Object({
-        TeamID: t.Number(),
-    }),
-})
 
-// Check if a user is part of a team
-.get("/checkteam", async ({ query: { TeamID, UserID }, error }) => {
-    if (!TeamID || !UserID) {
-        return error(400, "TeamID and UserID are required");
-    }
 
-    const teamMember = await prisma.userTeam.findFirst({
-        where: {
-            TeamID: TeamID,
-            UserID: UserID,
-        },
-    });
 
-    if (!teamMember) {
-        return error(404, "User is not part of the team");
-    }
 
-    return { valid: true };
-}, {
-    query: t.Object({
-        TeamID: t.Number(),
-        UserID: t.String(),
-    }),
-})
 
-// Other endpoints...
-// Get TeamID from TeamName
-.get("/getTeamID", async ({ query: { TeamName }, error }) => {
-    const team = await prisma.team.findFirst({
-        where: {
-            TeamName: TeamName,
-        },
-    });
 
-    if (!team) {
-        return error(404, "Team not found");
-    }
 
-    return {TeamID: team.TeamID};
-  }, {
-    query: t.Object({
-        TeamName: t.String(),
-    }),
-  })
 .get("/finduserteam/:teamID", async ({ params, error }) => {
     const teamID = parseInt(params.teamID, 10); // Ensure teamID is a number
     if (isNaN(teamID)) {
@@ -306,4 +260,91 @@ export const teamController = new Elysia({ prefix: "/team" })
         teamID: t.Number(),
         userID: t.String(),
     }),
-})
\ No newline at end of file
+})
+
+
+// Get users in a team
+.get("/users/:teamID", async ({ params: { teamID }, error }) => {
+    const users = await prisma.userTeam.findMany({
+        where: {
+            TeamID: parseInt(teamID, 10),
+        },
+        include: {
+            User: true,
+        },
+    });
+
+    if (!users || users.length === 0) {
+        return error(404, "Users not found");
+    }
+
+    return users.map(userTeam => userTeam.User);
+}, {
+    params: t.Object({
+        teamID: t.String(),
+    }),
+})
+
+// Get Team by TeamID
+.get("/getTeam", async ({ query: { TeamID }, error }) => {
+    const team = await prisma.team.findFirst({
+        where: {
+          TeamID: TeamID,
+        },
+    });
+
+    if (!team) {
+        return error(404, "Team not found");
+    }
+
+    return team;
+}, {
+    query: t.Object({
+        TeamID: t.Number(),
+    }),
+})
+
+// Check if a user is part of a team
+.get("/checkteam", async ({ query: { TeamID, UserID }, error }) => {
+    if (!TeamID || !UserID) {
+        return error(400, "TeamID and UserID are required");
+    }
+
+    const teamMember = await prisma.userTeam.findFirst({
+        where: {
+            TeamID: TeamID,
+            UserID: UserID,
+        },
+    });
+
+    if (!teamMember) {
+        return error(404, "User is not part of the team");
+    }
+
+    return { valid: true };
+}, {
+    query: t.Object({
+        TeamID: t.Number(),
+        UserID: t.String(),
+    }),
+})
+
+// Other endpoints...
+// Get TeamID from TeamName
+.get("/getTeamID", async ({ query: { TeamName }, error }) => {
+    const team = await prisma.team.findFirst({
+        where: {
+            TeamName: TeamName,
+        },
+    });
+
+    if (!team) {
+        return error(404, "Team not found");
+    }
+
+    return {TeamID: team.TeamID};
+  }, {
+    query: t.Object({
+        TeamName: t.String(),
+    }),
+  })
\ No newline at end of file

From e46220c0dba44ee729f7131233114213b8a801b6 Mon Sep 17 00:00:00 2001
From: Pongrawee Sripetpong <pongrawee.sripe@mail.kmutt.ac.th>
Date: Wed, 27 Nov 2024 23:09:54 +0700
Subject: [PATCH 5/6] Merge branch 'main' of
 https://github.com/Celesca/hacka-backend-elysia into owen

---
 src/controllers/teamController.ts | 111 ++++++------------------------
 1 file changed, 21 insertions(+), 90 deletions(-)

diff --git a/src/controllers/teamController.ts b/src/controllers/teamController.ts
index 7800cab..ae9fd3b 100644
--- a/src/controllers/teamController.ts
+++ b/src/controllers/teamController.ts
@@ -8,33 +8,12 @@ export const teamController = new Elysia({ prefix: "/team" })
     return teams;
 })
 
-// Get users in a team
-.get("/users/:teamID", async ({ params: { teamID }, error }) => {
-    const users = await prisma.userTeam.findMany({
-        where: {
-            TeamID: parseInt(teamID, 10),
-        },
-        include: {
-            User: true,
-        },
-    });
-
-    if (!users || users.length === 0) {
-        return error(404, "Users not found");
-    }
-
-    return users.map(userTeam => userTeam.User);
-}, {
-    params: t.Object({
-        teamID: t.String(),
-    }),
-})
-
-// Get Team by TeamID
-.get("/getTeam", async ({ query: { TeamID }, error }) => {
+// Get TeamID from name and hackathon
+.get("/find", async ({ query: { teamName, hackathonID }, error }) => {
     const team = await prisma.team.findFirst({
         where: {
-          TeamID: TeamID,
+            TeamName: teamName,
+            HackathonID: hackathonID,
         },
     });
 
@@ -45,77 +24,29 @@ export const teamController = new Elysia({ prefix: "/team" })
     return team;
 }, {
     query: t.Object({
-        TeamID: t.Number(),
-    }),
-})
-
-<<<<<<< HEAD
-.get("/findteambyuser/:userID", async ({ params, error }) => {
-
-    const team = await prisma.userTeam.findMany({
-        where: {
-            UserID: params.userID,
-        },
-    });
-
-    if (!team || team.length === 0) {
-        return error(404, "Team not found");
-    }
-
-    return team;
-}, {
-    params: t.Object({
-        userID: t.String(), // userID is a string in the URL params
+        teamName: t.String(),
+        hackathonID: t.Number(),
     }),
 })
 
+// .get("/findteambyuser/:userID", async ({ params, error }) => {
 
-=======
-// Check if a user is part of a team
-.get("/checkteam", async ({ query: { TeamID, UserID }, error }) => {
-    if (!TeamID || !UserID) {
-        return error(400, "TeamID and UserID are required");
-    }
-
-    const teamMember = await prisma.userTeam.findFirst({
-        where: {
-            TeamID: TeamID,
-            UserID: UserID,
-        },
-    });
-
-    if (!teamMember) {
-        return error(404, "User is not part of the team");
-    }
-
-    return { valid: true };
-}, {
-    query: t.Object({
-        TeamID: t.Number(),
-        UserID: t.String(),
-    }),
-})
-
-// Other endpoints...
-// Get TeamID from TeamName
-.get("/getTeamID", async ({ query: { TeamName }, error }) => {
-    const team = await prisma.team.findFirst({
-        where: {
-            TeamName: TeamName,
-        },
-    });
+//     const team = await prisma.userTeam.findMany({
+//         where: {
+//             UserID: params.userID,
+//         },
+//     });
 
-    if (!team) {
-        return error(404, "Team not found");
-    }
+//     if (!team || team.length === 0) {
+//         return error(404, "Team not found");
+//     }
 
-    return {TeamID: team.TeamID};
-  }, {
-    query: t.Object({
-        TeamName: t.String(),
-    }),
-  })
->>>>>>> 0c457d5157841e83fd2b56984d6e5332b4c37aeb
+//     return team;
+// }, {
+//     params: t.Object({
+//         userID: t.String(), // userID is a string in the URL params
+//     }),
+// })
 .get("/finduserteam/:teamID", async ({ params, error }) => {
     const teamID = parseInt(params.teamID, 10); // Ensure teamID is a number
     if (isNaN(teamID)) {

From f66e3b720f742277c00214da0c1f1e250f0ceda9 Mon Sep 17 00:00:00 2001
From: Owen <91054189+satanakorn@users.noreply.github.com>
Date: Thu, 28 Nov 2024 01:53:02 +0700
Subject: [PATCH 6/6] add rathing and check member of team in yet?

---
 frontend/src/Rating.jsx | 50 ++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/frontend/src/Rating.jsx b/frontend/src/Rating.jsx
index f04b879..8d20cb5 100644
--- a/frontend/src/Rating.jsx
+++ b/frontend/src/Rating.jsx
@@ -1,5 +1,6 @@
 import { useState, useEffect } from 'react';
 import Axios from 'axios';
+import Swal from 'sweetalert2'
 
 const Rating = () => {
   const [teams, setTeams] = useState([]);
@@ -72,7 +73,7 @@ const Rating = () => {
       }
 
       // // Store TeamID in local storage
-      // localStorage.setItem('TeamID', TeamID);
+      localStorage.setItem('TeamID', TeamID);
 
       // Fetch UserID from Username
       const userResponse = await Axios.get(`http://localhost:3000/user/getUserID/${selectedUser}`);
@@ -81,29 +82,33 @@ const Rating = () => {
 
       
       const ratedUserID = userResponse.data.UserID;
+
+
       
       if (!ratedUserID) {
         setErrorMessage('ไม่พบ UserID ของ Username นี้');
         return;
       }
 
+      console.log(ratedUserID)
+      console.log(UserID)
+
       // Check if the user is part of the team
       const checkTeam = await Axios.get(`http://localhost:3000/team/checkteam`, {
         params: {
           TeamID: TeamID,
-          UserID: ratedUserID,
+          UserID: UserID,
         },
       });
 
+
+ 
       if (!checkTeam.data.valid) {
-        setErrorMessage('คุณไม่ได้อยู่ทีมเดียวกัน กรุณาลองใหม่อีกครั้ง');
+        setErrorMessage('คุณไม่ได้เป็นสมาชิกของทีมนี้');
         return;
       }
 
-      console.log(UserID)
-      console.log(ratedUserID)
-      console.log(typeof RatingValue);
-      console.log(Comment)
+
 
       // Add rating
       await Axios.post(`http://localhost:3000/rating/rateuser`, {
@@ -125,10 +130,35 @@ const Rating = () => {
     setRatingValue('');
     setComment('');
     setErrorMessage('');
-    alert('บันทึกคะแนนสำเร็จ');
+
+    Swal.fire({
+      title: "Good job!",
+      text: " Add rating sucessfully!",
+      icon: "success"
+    });
+    setTimeout(() => {
+      Swal.close();
+    }, 3000);
+
+    await new Promise(resolve => setTimeout(resolve, 2000));
+
+    window.location.href = '/Rating';
+    
+
   } catch (error) {
-    console.error('Error:', error);
-    setErrorMessage('เกิดข้อผิดพลาดในการบันทึกข้อมูล');
+    console.error('Error adding rating:', error);
+    Swal.fire({
+      title: "Error!",
+      text: "ํYou're not a member of this team!",
+      icon: "error"
+    });
+    setTimeout(() => {
+      Swal.close();
+    }, 3000);
+
+    await new Promise(resolve => setTimeout(resolve, 2000));
+
+    window.location.href = '/Rating';
   }
   };