Merge pull request #65 from F-Code-Project-Mini/pages/submissions

Pages/submissions

Author: hoangtuanqn

backend/prisma/schema.prisma

@@ -51,7 +51,7 @@ model Candidate {
 model Team {
   id           String  @id @default(uuid()) @db.VarChar(36)
   group        Int     @unique @db.Int
-  name         String?  @unique  @db.VarChar(255)
+  name         String? @unique @db.VarChar(255)
   mentorshipId String  @map("mentorship_id") @db.VarChar(36)
   leaderId     String? @unique @map("leader_id") @db.VarChar(36)
   topicId      String  @map("topic_id") @db.VarChar(36)
@@ -63,6 +63,7 @@ model Team {
   candidates  Candidate[]  @relation("CandidateToTeam")
   submissions Submission[]
   reports     Report[]
+  presents    Present[]
 
   @@map("teams")
 }
@@ -172,6 +173,22 @@ model BaremScore {
   @@map("scores")
 }
 
+model Present {
+  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
+
+  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")
+}
+
 enum Role {
   CANDIDATE
   HOST

backend/src/controllers/team.controllers.ts

@@ -1,8 +1,10 @@
+import { ParamsDictionary } from "express-serve-static-core";
 import { NextFunction, Request, Response } from "express";
 import { RoleType } from "~/constants/enums";
 import { HTTP_STATUS } from "~/constants/httpStatus";
 import { ResponseClient } from "~/rules/response";
 import teamService from "~/services/team.service";
+import { CreateSchedulePresent } from "~/rules/requests/team.request";
 
 export const getAll = async (req: Request, res: Response, next: NextFunction) => {
     try {
@@ -23,6 +25,27 @@ export const getAll = async (req: Request, res: Response, next: NextFunction) =>
         return next(error);
     }
 };
+export const createSchedulePresentation = async (
+    req: Request<ParamsDictionary, {}, CreateSchedulePresent>,
+    res: Response,
+    next: NextFunction,
+) => {
+    const userId = req.userId!;
+    const { teamId, trialDate, officialDate } = req.body;
+    try {
+        const result = await teamService.createSchedulePresentation({
+            userId,
+            teamId,
+            trialDate,
+            officialDate,
+        });
+        return res
+            .status(HTTP_STATUS.CREATED)
+            .json(new ResponseClient({ message: "Tạo lịch trình thuyết trình thành công!", result }));
+    } catch (error) {
+        return next(error);
+    }
+};
 
 export const getDetail = async (req: Request<{ id: string }>, res: Response, next: NextFunction) => {
     try {

backend/src/repositories/team.repository.ts

@@ -2,6 +2,7 @@ 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";
 
 class TeamRepository {
     findWithPagination = async () => {
@@ -227,6 +228,25 @@ class TeamRepository {
         });
         return !!team;
     };
+
+    isTrialDateExists = async (trialDate: string) => {
+        const team = await prisma.present.findFirst({
+            where: {
+                trialDate,
+            },
+        });
+        return !!team;
+    };
+
+    createPresentationSchedule = async (data: { teamId: string; trialDate: string; officialDate: string[] }) => {
+        return prisma.present.create({
+            data: new Present({
+                teamId: data.teamId,
+                trialDate: data.trialDate,
+                officialDate: data.officialDate,
+            }),
+        });
+    };
 }
 
 const teamRepository = new TeamRepository();

backend/src/routes/team.routes.ts

@@ -14,6 +14,7 @@ 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("/:id", auth, validate(idParamSchema), teamController.getDetail);
 
@@ -59,4 +60,5 @@ teamRouter.get(
     // validate(uuidParamsAndBodySchema),
     teamController.getTeamsByMentor,
 );
+
 export default teamRouter;

backend/src/rules/requests/team.request.ts

@@ -0,0 +1,5 @@
+export interface CreateSchedulePresent {
+    teamId: string;
+    trialDate: string;
+    officialDate: string[];
+}

backend/src/schemas/present.schema.ts

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

backend/src/services/team.service.ts

@@ -127,6 +127,40 @@ class TeamService {
         const updated = await teamRepository.update(teamId, { name });
         return updated;
     }
+    createSchedulePresentation = async ({
+        userId,
+        teamId,
+        trialDate,
+        officialDate,
+    }: {
+        userId: string;
+        teamId: string;
+        trialDate: string;
+        officialDate: string[];
+    }) => {
+        // trial_date: chỉ có 1 nhóm được đăng ký, nên là check sự trùng lặp
+        // check trial_date có bị trùng với nhóm khác không
+        const isTrialDateExist = await teamRepository.isTrialDateExists(trialDate);
+        if (isTrialDateExist) {
+            throw new ErrorWithStatus({
+                status: HTTP_STATUS.BAD_REQUEST,
+                message: "Ngày thuyết trình thử đã được đăng ký bởi nhóm khác, vui lòng chọn ngày khác.",
+            });
+        }
+        const isLeader = await teamRepository.isLeader(teamId, userId);
+        if (!isLeader) {
+            throw new ErrorWithStatus({
+                status: HTTP_STATUS.FORBIDDEN,
+                message: "Chỉ trưởng nhóm mới có quyền đăng ký lịch trình thuyết trình.",
+            });
+        }
+        const created = await teamRepository.createPresentationSchedule({
+            teamId,
+            trialDate,
+            officialDate,
+        });
+        return created;
+    };
     // async getTeamByMentor(mentorId: string) {
     //     const teams = await teamRepository.findByMentorId(mentorId);
     //     return teams;

frontend/package-lock.json

@@ -11,7 +11,9 @@
   },
   "dependencies": {
     "@radix-ui/react-alert-dialog": "^1.1.15",
+    "@radix-ui/react-checkbox": "^1.3.3",
     "@radix-ui/react-dialog": "^1.1.15",
+    "@radix-ui/react-label": "^2.1.8",
     "@radix-ui/react-radio-group": "^1.3.8",
     "@radix-ui/react-select": "^2.2.6",
     "@radix-ui/react-slot": "^1.2.4",

frontend/package.json

@@ -16,6 +16,7 @@ import AdminPage from "./pages/Admin";
 import ReportsPage from "./pages/Admin/Reports";
 import CandidatePages from "./pages/Admin/Candidates";
 import TeamPage from "./pages/Teams";
+import PresentPage from "./pages/Present";
 const App = () => {
     return (
         <BrowserRouter>
@@ -26,6 +27,7 @@ const App = () => {
                     <Route path="teams" element={<TeamPage />} />
                     <Route path="active/token/:token" element={<ActivePage />} />
                     <Route path="submissions" element={<SubmissionsPage />} />
+                    <Route path="presents" element={<PresentPage />} />
 
                     {/* Role Judge */}
                     <Route path="judge" element={<ProtectedRoute roleAccess={[USER_ROLE.JUDGE]} />}>