Merge pull request #59 from F-Code-Project-Mini/chore/change-logic

Chore/change logic

Author: hoangtuanqn

backend/src/controllers/team.controllers.ts

@@ -26,7 +26,7 @@ export const getAll = async (req: Request, res: Response, next: NextFunction) =>
 
 export const getDetail = async (req: Request<{ id: string }>, res: Response, next: NextFunction) => {
     try {
-        const result = await teamService.getDetail(req.params.id);
+        const result = await teamService.getDetail(req.params.id, req.role as RoleType);
         return res.status(HTTP_STATUS.OK).json(new ResponseClient({ result }));
     } catch (error) {
         return next(error);
@@ -117,7 +117,6 @@ export const getTeamsByMentor = async (req: Request, res: Response, next: NextFu
     }
 };
 export const changeName = async (req: Request<{ id: string }>, res: Response, next: NextFunction) => {
-    console.log("req.body", "Đã ghi nhanan n");
     const { name } = req.body;
     const { userId } = req;
     try {

backend/src/repositories/team.repository.ts

@@ -1,20 +1,34 @@
 import prisma from "~/configs/prisma";
 import { paginate } from "~/utils/pagination";
 import userRespository from "./user.repository";
+import { RoleType } from "~/constants/enums";
 
 class TeamRepository {
-    findWithPagination = async ({ page, limit, mentorId }: { page?: number; limit?: number; mentorId?: string }) => {
+    findWithPagination = async () => {
         const includeUser = {
             omit: {
                 password: true,
                 candidateId: true,
+                email: true,
+                role: true,
+                createdAt: true,
+                updatedAt: true,
             },
         };
         const include = {
             candidates: {
                 include: {
                     user: includeUser,
                 },
+                omit: {
+                    phone: true,
+                    // major: true,
+                    semester: true,
+                    mentorNote: true,
+                    createdAt: true,
+                    updatedAt: true,
+                    teamId: true,
+                },
             },
             mentorship: {
                 select: {
@@ -31,17 +45,27 @@ class TeamRepository {
             topic: true,
         };
 
-        const { data, meta } = await paginate<any>(prisma.team, {
-            page,
-            limit,
-            orderBy: { id: "desc" },
+        // const { data, meta } = await paginate<any>(prisma.team, {
+        //     page,
+        //     limit,
+        //     orderBy: { id: "desc" },
+        //     include,
+        //     omit: {
+        //         mentorNote: true,
+        //     },
+        // });
+        const data = prisma.team.findMany({
+            orderBy: { group: "asc" },
             include,
+            omit: {
+                mentorNote: true,
+            },
         });
 
-        return { teams: data, meta };
+        return data;
     };
 
-    findByIdWithMembers = async (id: string, displayScore: boolean = false) => {
+    findByIdWithMembers = async (id: string, displayScore: boolean = false, role: RoleType) => {
         const include = {
             candidates: {
                 omit: {
@@ -72,12 +96,13 @@ class TeamRepository {
             },
             topic: true,
         };
+        console.log("role", role);
 
         let team = await prisma.team.findUnique({
             where: { id },
             include,
             omit: {
-                // mentorNote: true,
+                ...([RoleType.MENTOR, RoleType.ADMIN].includes(role) ? {} : { mentorNote: true }),
             },
         });
 
@@ -127,7 +152,7 @@ class TeamRepository {
         const data = [];
         console.log("mentorTeams", mentorTeams);
         for (const t of mentorTeams) {
-            data.push(await this.findByIdWithMembers(t.id, displayScore));
+            data.push(await this.findByIdWithMembers(t.id, displayScore, RoleType.MENTOR));
         }
         return data;
     };

backend/src/services/team.service.ts

@@ -21,24 +21,13 @@ class TeamService {
         const safeLimit = Number.isFinite(limitNum) && limitNum > 0 ? limitNum : 10;
 
         const mentorId = role === RoleType.MENTOR ? userId : undefined;
-        const { teams, meta } = await teamRepository.findWithPagination({
-            page: safePage,
-            limit: safeLimit,
-            mentorId,
-        });
+        const data = await teamRepository.findWithPagination();
 
-        return {
-            data: teams,
-            pagination: {
-                total: meta.total,
-                page: meta.page,
-                limit: meta.limit,
-            },
-        };
+        return data;
     }
 
-    async getDetail(id: string) {
-        const team = await teamRepository.findByIdWithMembers(id);
+    async getDetail(id: string, role: RoleType) {
+        const team = await teamRepository.findByIdWithMembers(id, false, role);
         if (!team) {
             throw new ErrorWithStatus({
                 status: HTTP_STATUS.NOT_FOUND,

frontend/src/App.tsx

@@ -15,13 +15,15 @@ import MentorBaremPage from "./pages/Mentor/Barem";
 import AdminPage from "./pages/Admin";
 import ReportsPage from "./pages/Admin/Reports";
 import CandidatePages from "./pages/Admin/Candidates";
+import TeamPage from "./pages/Teams";
 const App = () => {
     return (
         <BrowserRouter>
             <Routes>
                 <Route path="/" element={<MainLayout />}>
                     <Route index element={<IndexPage />} />
                     <Route path="login" element={<LoginPage />} />
+                    <Route path="teams" element={<TeamPage />} />
                     <Route path="active/token/:token" element={<ActivePage />} />
                     <Route path="submissions" element={<SubmissionsPage />} />
 

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

@@ -1,9 +1,9 @@
-import type { ResponseDetailData, ResponsePaginate, TeamType } from "~/types/team.types";
+import type { ResponseDetailData, TeamType } from "~/types/team.types";
 import { privateApi } from "~/utils/axiosInstance";
 
 class TeamApi {
     static async getAllTeams() {
-        const res = await privateApi.get<ResponsePaginate<TeamType[]>>("/teams");
+        const res = await privateApi.get<ResponseDetailData<TeamType[]>>("/teams");
         return res.data;
     }
 

frontend/src/components/Header/Candidate.tsx

@@ -1,21 +1,10 @@
 import { NavLink } from "./NavLink";
 import { ServerCrash } from "lucide-react";
-// import { useLocation } from "react-router";
-// import Helper from "~/utils/helper";
 
 const CandidateHeader = () => {
     // const location = useLocation();
     return (
         <>
-            {/* <li id="submissions">
-                <NavLink
-                    url="/submissions"
-                    name="Nộp đề tài"
-                    Icon={Send}
-                    active={Helper.isActive(location.pathname, "/submissions")}
-                />
-            </li> */}
-
             <li>
                 <NavLink url="https://discord.gg/WvudrJaYD" name="Hỗ trợ" Icon={ServerCrash} target="_blank" />
             </li>

frontend/src/components/Header/index.tsx

@@ -1,4 +1,4 @@
-import { BadgeQuestionMark, ChevronDown, House, Menu, X } from "lucide-react";
+import { BadgeQuestionMark, ChevronDown, House, Menu, Users, X } from "lucide-react";
 import { Link, useLocation } from "react-router";
 import useAuth from "~/hooks/useAuth";
 import { useState, useRef, useEffect } from "react";
@@ -61,6 +61,14 @@ const Header = () => {
                                 active={Helper.isActive(location.pathname, "/")}
                             />
                         </li>
+                        <li id="submissions">
+                            <NavLink
+                                url="/teams"
+                                name="Danh sách nhóm"
+                                Icon={Users}
+                                active={Helper.isActive(location.pathname, "/teams")}
+                            />
+                        </li>
                         {isLogin && user.role === USER_ROLE.CANDIDATE && <CandidateHeader />}
                         {isLogin && user.role === USER_ROLE.ADMIN && <AdminHeader />}
                     </ul>