Merge pull request #57 from F-Code-Project-Mini/dev

hoangtuanqn · web-flow · commit 7a709a40e279 · 2026-01-09T01:20:16.000+07:00
Dev
diff --git a/backend/src/controllers/team.controllers.ts b/backend/src/controllers/team.controllers.ts
@@ -61,15 +61,18 @@ export const getTeamByUserId = async (req: Request<{ id: string }>, res: Respons
 //     }
 // };
 
-export const update = async (req: Request<{ id: string }>, res: Response, next: NextFunction) => {
+export const update = async (
+    req: Request<{ id: string }, any, { note: string }>,
+    res: Response,
+    next: NextFunction,
+) => {
     try {
         const { id } = req.params;
-        const { topic_id, mentorship_id } = req.body as {
-            topic_id?: string;
-            mentorship_id?: string;
-        };
-        const result = await teamService.update(id, { topic_id, mentorship_id });
-        return res.status(HTTP_STATUS.OK).json(new ResponseClient({ message: "Cập nhật team thành công!", result }));
+        const { note } = req.body;
+        const result = await teamService.update(id, { note });
+        return res
+            .status(HTTP_STATUS.OK)
+            .json(new ResponseClient({ message: "Cập nhật thông tin thành công!", result }));
     } catch (error) {
         return next(error);
     }
diff --git a/backend/src/repositories/team.repository.ts b/backend/src/repositories/team.repository.ts
@@ -77,7 +77,7 @@ class TeamRepository {
             where: { id },
             include,
             omit: {
-                mentorNote: true,
+                // mentorNote: true,
             },
         });
 
@@ -132,13 +132,12 @@ class TeamRepository {
         return data;
     };
 
-    update = async (id: string, data: { name?: string; topicId?: string; mentorshipId?: string }) => {
+    update = async (id: string, data: { name?: string; note?: string }) => {
         return prisma.team.update({
             where: { id },
             data: {
-                ...(data.topicId ? { topicId: data.topicId } : {}),
-                ...(data.mentorshipId ? { mentorshipId: data.mentorshipId } : {}),
                 ...(data.name ? { name: data.name } : {}),
+                ...(data.note ? { mentorNote: data.note } : {}),
             },
         });
     };
diff --git a/backend/src/routes/team.routes.ts b/backend/src/routes/team.routes.ts
@@ -3,7 +3,13 @@ import { validate } from "~/utils/validation";
 import { RoleType } from "~/constants/enums";
 import * as teamController from "~/controllers/team.controllers";
 import { auth, isRole } from "~/middlewares/auth.middlewares";
-import { changeNameSchema, getAllSchema, idParamSchema, uuidParamsAndBodySchema } from "~/rules/auth/auth.schema";
+import {
+    changeNameSchema,
+    getAllSchema,
+    idParamSchema,
+    noteBodySchema,
+    uuidParamsAndBodySchema,
+} from "~/rules/auth/auth.schema";
 const teamRouter = Router();
 
 // teamRouter.get("/", auth, isRole([RoleType.ADMIN, RoleType.MENTOR]), validate(getAllSchema), teamController.getAll);
@@ -22,7 +28,14 @@ teamRouter.patch(
     validate(changeNameSchema),
     teamController.changeName,
 );
-teamRouter.patch("/:id", auth, isRole([RoleType.ADMIN]), validate(idParamSchema), teamController.update);
+teamRouter.patch(
+    "/:id",
+    auth,
+    isRole([RoleType.MENTOR]),
+    validate(idParamSchema),
+    validate(noteBodySchema),
+    teamController.update,
+);
 teamRouter.delete("/:id", auth, isRole([RoleType.ADMIN]), validate(idParamSchema), teamController.deleteTeam);
 
 teamRouter.patch(
diff --git a/backend/src/rules/auth/auth.schema.ts b/backend/src/rules/auth/auth.schema.ts
@@ -64,3 +64,9 @@ export const changeNameSchema = z.object({
             .max(50, "Tên nhóm không được vượt quá 50 ký tự!"),
     }),
 });
+
+export const noteBodySchema = z.object({
+    body: z.object({
+        note: z.string().trim().nonempty("Ghi chú không được để trống!"),
+    }),
+});
diff --git a/backend/src/services/team.service.ts b/backend/src/services/team.service.ts
@@ -67,7 +67,7 @@ class TeamService {
     //     return team;
     // }
 
-    async update(id: string, body: { topic_id?: string; mentorship_id?: string }) {
+    async update(id: string, body: { note: string }) {
         const existed = await teamRepository.findById(id);
         if (!existed) {
             throw new ErrorWithStatus({
@@ -77,8 +77,7 @@ class TeamService {
         }
 
         const updated = await teamRepository.update(id, {
-            topicId: body.topic_id ?? existed.topicId,
-            mentorshipId: body.mentorship_id ?? existed.mentorshipId,
+            note: body.note,
         });
         return updated;
     }
diff --git a/frontend/src/api-requests/mentor.requests.ts b/frontend/src/api-requests/mentor.requests.ts
@@ -7,8 +7,8 @@ class MentorApi {
         const res = await privateApi.get<ResponseDetailData<BaremResultItem[]>>(`/mentor/get-barem/${candidateId}`);
         return res.data;
     }
-    static async updateNote(candidateId: string, note: string, codeBarem: string) {
-        const res = await privateApi.patch(`/mentor/candidates/${candidateId}/note`, { note, codeBarem });
+    static async updateNoteTeam(teamId: string, note: string) {
+        const res = await privateApi.patch(`/teams/${teamId}`, { note });
         return res.data;
     }
 }
diff --git a/frontend/src/pages/Mentor/Barem/index.tsx b/frontend/src/pages/Mentor/Barem/index.tsx
@@ -34,7 +34,7 @@ const MentorBaremPage = () => {
         },
         enabled: !!params.id,
     });
-    const isLeader = params?.candidateId === candidates?.leader.id;
+    const isLeader = params?.candidateId === candidates?.leader?.id;
     // console.log("isLeader", params?.candidateId, isLeader);
 
     const [candidateActive, setcandidateActive] = useState<CandidateType | undefined>(undefined);
diff --git a/frontend/src/pages/Mentor/Note.tsx b/frontend/src/pages/Mentor/Note.tsx
@@ -0,0 +1,84 @@
+import { useMutation } from "@tanstack/react-query";
+import type { AxiosError } from "axios";
+import { Check, NotebookPen } from "lucide-react";
+import { useState } from "react";
+import MentorApi from "~/api-requests/mentor.requests";
+
+import {
+    AlertDialog,
+    AlertDialogAction,
+    AlertDialogCancel,
+    AlertDialogContent,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+    AlertDialogTrigger,
+} from "~/components/ui/alert-dialog";
+
+import { Textarea } from "~/components/ui/textarea";
+import Notification from "~/utils/notification";
+type NoteProps = {
+    note: string;
+    teamId: string;
+};
+export function NoteTeam({ note, teamId }: NoteProps) {
+    const [noteValue, setNoteValue] = useState(note || "");
+    const noteUpdateMutation = useMutation({
+        mutationKey: ["update-mentor-note", teamId],
+        mutationFn: (newNote: string) => MentorApi.updateNoteTeam(teamId, newNote),
+        onSuccess: () => {
+            Notification.success({
+                text: "Thay đổi ghi chú nhóm thành công!",
+            });
+        },
+        onError: (error: AxiosError<{ message?: string }>) => {
+            Notification.error({
+                text: error.response?.data?.message || "Thay đổi ghi chú nhóm thất bại!",
+            });
+        },
+    });
+    return (
+        <AlertDialog>
+            <AlertDialogTrigger asChild>
+                <div className="relative cursor-pointer rounded-xl border-2 px-4 py-2">
+                    <div className="flex items-center gap-1">
+                        {note ? (
+                            <div className="absolute -top-2 -right-2 flex h-3 w-3 items-center justify-center rounded-full bg-green-500 text-white">
+                                <Check />
+                            </div>
+                        ) : null}
+                        <span className="text-sm font-semibold">Ghi chú nhóm</span>
+                        <NotebookPen size={20} />
+                    </div>
+                </div>
+            </AlertDialogTrigger>
+            <AlertDialogContent>
+                <AlertDialogHeader>
+                    <AlertDialogTitle>Ghi chú</AlertDialogTitle>
+
+                    <Textarea
+                        placeholder="Ghi chú ...."
+                        onChange={(e) => {
+                            setNoteValue(e.target.value);
+                        }}
+                        value={noteValue}
+                        className="min-h-[120px] text-base"
+                    />
+                    <span className="text-sm italic">
+                        Ghi chú này giúp CLB đánh giá hiệu quả làm việc của nhóm. Các bạn vui lòng nhận xét công tâm để
+                        CLB chọn lọc được những thành viên phù hợp nhất.
+                    </span>
+                </AlertDialogHeader>
+                <AlertDialogFooter>
+                    <AlertDialogCancel>Đóng</AlertDialogCancel>
+                    <AlertDialogAction
+                        className="bg-black text-white"
+                        onClick={() => noteUpdateMutation.mutate(noteValue)}
+                    >
+                        Lưu
+                    </AlertDialogAction>
+                </AlertDialogFooter>
+            </AlertDialogContent>
+        </AlertDialog>
+    );
+}
diff --git a/frontend/src/pages/Mentor/Team.tsx b/frontend/src/pages/Mentor/Team.tsx
@@ -7,6 +7,7 @@ import NotifyNotLeader from "~/components/NotifyNotLeader";
 import { ShowTopic } from "../Candidate/ShowTopic";
 import Helper from "~/utils/helper";
 import BadgeLeader from "~/components/BadgeLeader";
+import { NoteTeam } from "./Note";
 const Team = ({ team }: { team: TeamType }) => {
     return (
         <section className="col-span-1 lg:col-span-8" id="members">
@@ -35,6 +36,7 @@ const Team = ({ team }: { team: TeamType }) => {
                     <div className="flex flex-wrap items-center gap-2">
                         <ShowTopic urlPdf={team.topic.filePath} name={team.topic.title} />
                         <ChoiceLeader team={team} />
+                        <NoteTeam note={team.mentorNote || ""} teamId={team.id} />
 
                         {/* <Link to={`/mentor/team/${team.id}`}>
                             <Button

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ class MentorApi {`
`7`	`7`	const res = await privateApi.get<ResponseDetailData<BaremResultItem[]>>(`/mentor/get-barem/${candidateId}`);
`8`	`8`	`return res.data;`
`9`	`9`	`}`
`10`		`- static async updateNote(candidateId: string, note: string, codeBarem: string) {`
`11`		- const res = await privateApi.patch(`/mentor/candidates/${candidateId}/note`, { note, codeBarem });
	`10`	`+ static async updateNoteTeam(teamId: string, note: string) {`
	`11`	+ const res = await privateApi.patch(`/teams/${teamId}`, { note });
`12`	`12`	`return res.data;`
`13`	`13`	`}`
`14`	`14`	`}`