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

Dev

Author: hoangtuanqn

backend/prisma/schema.prisma

@@ -57,13 +57,13 @@ model Team {
   topicId      String  @map("topic_id") @db.VarChar(36)
   mentorNote   String? @map("mentor_note") @db.Text
 
-  mentorship  Mentorship   @relation("MentorshipToTeam", fields: [mentorshipId], references: [id])
-  leader      Candidate?   @relation("TeamLeader", fields: [leaderId], references: [id])
-  topic       Topic        @relation(fields: [topicId], references: [id])
-  candidates  Candidate[]  @relation("CandidateToTeam")
-  submissions Submission[]
-  reports     Report[]
-  presents    Present[]
+  mentorship       Mentorship        @relation("MentorshipToTeam", fields: [mentorshipId], references: [id])
+  leader           Candidate?        @relation("TeamLeader", fields: [leaderId], references: [id])
+  topic            Topic             @relation(fields: [topicId], references: [id])
+  candidates       Candidate[]       @relation("CandidateToTeam")
+  submissions      Submission[]
+  reports          Report[]
+  schedulePresents SchedulePresent[]
 
   @@map("teams")
 }
@@ -173,20 +173,20 @@ model BaremScore {
   @@map("scores")
 }
 
-model Present {
+model SchedulePresent {
   id     String @id @default(uuid()) @db.VarChar(36)
   teamId String @map("team_id") @db.VarChar(36)
 
-  trialDate    String @unique @map("trial_date") @db.VarChar(255)
-  officialDate Json   @map("offical_date") @db.Json
+  trialDate    String  @unique @map("trial_date") @db.VarChar(255)
+  officialDate Json    @map("offical_date") @db.Json
+  finalDate    String? @unique @map("final_date") @db.VarChar(255)
 
   createdAt DateTime @default(now()) @map("created_at")
   updatedAt DateTime @updatedAt @map("updated_at")
 
-  // Quan hệ với model Team
   team Team @relation(fields: [teamId], references: [id])
 
-  @@map("presents")
+  @@map("schedule_presents")
 }
 
 enum Role {

backend/src/controllers/team.controllers.ts

@@ -32,6 +32,7 @@ export const createSchedulePresentation = async (
 ) => {
     const userId = req.userId!;
     const { teamId, trialDate, officialDate } = req.body;
+    console.log("teamId, trialDate, officialDate", teamId, trialDate, officialDate);
     try {
         const result = await teamService.createSchedulePresentation({
             userId,
@@ -47,6 +48,23 @@ export const createSchedulePresentation = async (
     }
 };
 
+export const getSchedulePresentation = async (
+    req: Request<ParamsDictionary, {}, { teamId: string }>,
+    res: Response,
+    next: NextFunction,
+) => {
+    try {
+        const userId = req.userId!;
+        const { teamId } = req.params;
+        console.log("teamId", userId, teamId);
+        // chỉ có thành viên mới get dc
+        const result = await teamService.getSchedulePresentation(userId, teamId);
+        return res.status(HTTP_STATUS.OK).json(new ResponseClient({ result }));
+    } catch (error) {
+        return next(error);
+    }
+};
+
 export const getDetail = async (req: Request<{ id: string }>, res: Response, next: NextFunction) => {
     try {
         const result = await teamService.getDetail(req.params.id, req.role as RoleType);

backend/src/repositories/team.repository.ts

@@ -2,7 +2,8 @@ import prisma from "~/configs/prisma";
 import { paginate } from "~/utils/pagination";
 import userRespository from "./user.repository";
 import { RoleType } from "~/constants/enums";
-import Present from "~/schemas/present.schema";
+import Present from "~/schemas/schedule-present.schema";
+import SchedulePresent from "~/schemas/schedule-present.schema";
 
 class TeamRepository {
     findWithPagination = async () => {
@@ -229,8 +230,20 @@ class TeamRepository {
         return !!team;
     };
 
+    isMember = async (teamId: string, userId: string) => {
+        const team = await prisma.user.findUnique({
+            where: {
+                id: userId,
+                candidate: {
+                    teamId: teamId,
+                },
+            },
+        });
+        return !!team;
+    };
+
     isTrialDateExists = async (trialDate: string) => {
-        const team = await prisma.present.findFirst({
+        const team = await prisma.schedulePresent.findFirst({
             where: {
                 trialDate,
             },
@@ -239,14 +252,22 @@ class TeamRepository {
     };
 
     createPresentationSchedule = async (data: { teamId: string; trialDate: string; officialDate: string[] }) => {
-        return prisma.present.create({
-            data: new Present({
+        return prisma.schedulePresent.create({
+            data: new SchedulePresent({
                 teamId: data.teamId,
                 trialDate: data.trialDate,
                 officialDate: data.officialDate,
             }),
         });
     };
+
+    findSchedulePresentationByTeamId = async (teamId: string) => {
+        return prisma.schedulePresent.findFirst({
+            where: {
+                teamId,
+            },
+        });
+    };
 }
 
 const teamRepository = new TeamRepository();

backend/src/routes/team.routes.ts

@@ -15,12 +15,12 @@ const teamRouter = Router();
 // teamRouter.get("/", auth, isRole([RoleType.ADMIN, RoleType.MENTOR]), validate(getAllSchema), teamController.getAll);
 teamRouter.get("/", auth, validate(getAllSchema), teamController.getAll);
 teamRouter.post("/present", auth, teamController.createSchedulePresentation);
+teamRouter.get("/get-schedule/:teamId", auth, teamController.getSchedulePresentation);
 
 teamRouter.get("/:id", auth, validate(idParamSchema), teamController.getDetail);
 
 teamRouter.get("/mentor/:id", auth, validate(idParamSchema), teamController.getTeamByUserId);
 
-// teamRouter.post("/", auth, isRole([RoleType.ADMIN]), teamController.create);
 teamRouter.patch(
     "/:id/change-name",
     auth,

backend/src/schemas/present.schema.ts …d/src/schemas/schedule-present.schema.tsbackend/src/schemas/present.schema.ts renamed to backend/src/schemas/schedule-present.schema.ts backend/src/schemas/present.schema.ts renamed to backend/src/schemas/schedule-present.schema.ts

@@ -1,29 +1,32 @@
 import { v4 as uuidv4 } from "uuid";
 
-interface PresentType {
+interface SchedulePresentType {
     id?: string;
     teamId: string;
     trialDate: string;
     officialDate: string[];
+    finalDate?: string;
     createdAt?: Date;
     updatedAt?: Date;
 }
 
-class Present {
+class SchedulePresent {
     id: string;
     teamId: string;
     trialDate: string;
     officialDate: string[];
+    finalDate?: string;
     createdAt: Date;
     updatedAt: Date;
-    constructor(present: PresentType) {
+    constructor(present: SchedulePresentType) {
         this.id = present.id || uuidv4();
         this.teamId = present.teamId;
         this.trialDate = present.trialDate;
         this.officialDate = present.officialDate;
+        this.finalDate = present.finalDate || "";
         this.createdAt = present.createdAt || new Date();
         this.updatedAt = present.updatedAt || new Date();
     }
 }
 
-export default Present;
+export default SchedulePresent;

backend/src/services/team.service.ts

@@ -161,10 +161,24 @@ class TeamService {
         });
         return created;
     };
-    // async getTeamByMentor(mentorId: string) {
-    //     const teams = await teamRepository.findByMentorId(mentorId);
-    //     return teams;
-    // }
+
+    async getSchedulePresentation(userId: string, teamId: string) {
+        const isMember = await teamRepository.isMember(teamId, userId);
+        if (!isMember) {
+            throw new ErrorWithStatus({
+                status: HTTP_STATUS.FORBIDDEN,
+                message: "Bạn không có quyền xem lịch trình thuyết trình của nhóm này.",
+            });
+        }
+        const schedule = await teamRepository.findSchedulePresentationByTeamId(teamId);
+        if (!schedule) {
+            throw new ErrorWithStatus({
+                status: HTTP_STATUS.NOT_FOUND,
+                message: "Lịch trình thuyết trình của nhóm không tồn tại.",
+            });
+        }
+        return schedule;
+    }
 }
 
 const teamService = new TeamService();

frontend/src/api-requests/team.requests.ts

@@ -1,4 +1,4 @@
-import type { ResponseDetailData, TeamType } from "~/types/team.types";
+import type { ResponseDetailData, SchedulePresentType, TeamType } from "~/types/team.types";
 import { privateApi } from "~/utils/axiosInstance";
 
 class TeamApi {
@@ -28,5 +28,22 @@ class TeamApi {
         });
         return res.data;
     }
+    static async createSchedulePresentation({
+        teamId,
+        trialDate,
+        officialDate,
+    }: {
+        teamId: string;
+        trialDate: string;
+        officialDate: string[];
+    }) {
+        const res = await privateApi.post(`/teams/present`, { teamId, trialDate, officialDate });
+        return res.data;
+    }
+
+    static async getSchedulePresentation(teamId: string) {
+        const res = await privateApi.get<ResponseDetailData<SchedulePresentType>>(`/teams/present/${teamId}`);
+        return res.data;
+    }
 }
 export default TeamApi;

frontend/src/pages/Present/ConfirmRegister.tsx

@@ -0,0 +1,94 @@
+import { Calendar, Clock } from "lucide-react";
+import {
+    AlertDialog,
+    AlertDialogAction,
+    AlertDialogCancel,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+} from "~/components/ui/alert-dialog";
+
+const ConfirmRegister = ({
+    handleConfirmSubmit,
+    showConfirmDialog,
+    setShowConfirmDialog,
+    trialSlot,
+    officialSlots,
+}: {
+    handleConfirmSubmit: () => void;
+    showConfirmDialog: boolean;
+    setShowConfirmDialog: React.Dispatch<React.SetStateAction<boolean>>;
+    trialSlot: string;
+    officialSlots: string[];
+}) => {
+    return (
+        <AlertDialog open={showConfirmDialog} onOpenChange={setShowConfirmDialog}>
+            <AlertDialogContent className="max-w-2xl">
+                <AlertDialogHeader>
+                    <AlertDialogTitle>Xác nhận đăng ký thời gian thuyết trình</AlertDialogTitle>
+                    <AlertDialogDescription>
+                        Kiểm tra lại thông tin đăng ký của bạn trước khi xác nhận.
+                    </AlertDialogDescription>
+                </AlertDialogHeader>
+
+                <div className="space-y-4 pb-4">
+                    <div className="space-y-2">
+                        <div className="flex items-center gap-2">
+                            <Clock className="h-4 w-4 text-blue-500" />
+                            <h4 className="font-semibold text-gray-900">Thuyết trình thử</h4>
+                        </div>
+                        {trialSlot ? (
+                            <div className="rounded-md border-1 border-blue-400 bg-blue-50 p-3">
+                                <div className="flex items-center gap-2 text-sm">
+                                    <Calendar className="h-3.5 w-3.5 text-blue-600" />
+                                    <span className="font-medium text-blue-900">{trialSlot.split("|")[0]}</span>
+                                    <span className="text-blue-600"> - </span>
+                                    <span className="text-blue-800">{trialSlot.split("|")[1]}</span>
+                                </div>
+                            </div>
+                        ) : (
+                            <div className="">
+                                <p className="text-sm text-gray-500 italic">Không đăng ký</p>
+                            </div>
+                        )}
+                    </div>
+
+                    <div className="space-y-2">
+                        <div className="flex items-center gap-2">
+                            <Clock className="h-4 w-4 text-green-600" />
+                            <h4 className="font-semibold text-green-700">Thuyết trình chính thức</h4>
+                        </div>
+                        <div className="space-y-2">
+                            {officialSlots.map((slot) => (
+                                <div key={slot} className="bg-primary/10 border-primary rounded-md border-1 p-3">
+                                    <div className="flex items-center gap-2 text-sm">
+                                        <Calendar className="h-3.5 w-3.5 text-green-600" />
+                                        <span className="font-medium text-green-900">{slot.split("|")[0]}</span>
+                                        <span className="text-green-600"> - </span>
+                                        <span className="text-green-800">{slot.split("|")[1]}</span>
+                                    </div>
+                                </div>
+                            ))}
+                        </div>
+                    </div>
+
+                    <div className="rounded-md border border-amber-200 bg-amber-50 p-3">
+                        <p className="text-sm text-amber-800">
+                            <span className="font-semibold">Lưu ý:</span> Sau khi xác nhận, thông tin sẽ được gửi đến
+                            ban tổ chức. Đảm bảo tất cả thành viên có thể tham gia các khung giờ đã chọn.
+                        </p>
+                    </div>
+                </div>
+
+                <AlertDialogFooter>
+                    <AlertDialogCancel>Hủy</AlertDialogCancel>
+                    <AlertDialogAction onClick={handleConfirmSubmit}>Xác nhận</AlertDialogAction>
+                </AlertDialogFooter>
+            </AlertDialogContent>
+        </AlertDialog>
+    );
+};
+
+export default ConfirmRegister;