Merge pull request #1173 from academic-relations/dev

Merge dev into main

packages/api/src/feature/club/controller/club.controller.ts

@@ -18,6 +18,14 @@ import apiClb005, {
   ApiClb005RequestParam,
   ApiClb005ResponseOk,
 } from "@sparcs-clubs/interface/api/club/endpoint/apiClb005";
+import apiClb009, {
+  ApiClb009RequestParam,
+  ApiClb009ResponseOk,
+} from "@sparcs-clubs/interface/api/club/endpoint/apiClb009";
+import apiClb010, {
+  ApiClb010RequestParam,
+  ApiClb010ResponseOk,
+} from "@sparcs-clubs/interface/api/club/endpoint/apiClb010";
 import apiClb016, {
   ApiClb016ResponseOk,
 } from "@sparcs-clubs/interface/api/club/endpoint/apiClb016";
@@ -99,6 +107,34 @@ export class ClubController {
     return result;
   }
 
+  @Student()
+  @Get("/student/clubs/club/:clubId/members/semesters")
+  @UsePipes(new ZodPipe(apiClb009))
+  async getStudentClubSemesters(
+    @GetStudent() user: GetStudent,
+    @Param() param: ApiClb009RequestParam,
+  ): Promise<ApiClb009ResponseOk> {
+    const result = await this.clubService.getStudentClubSemesters(
+      user.studentId,
+      param,
+    );
+    return result;
+  }
+
+  @Student()
+  @Get("student/clubs/club/:clubId/members/semesters/semester/:semesterId")
+  @UsePipes(new ZodPipe(apiClb010))
+  async getStudentClubMembers(
+    @GetStudent() user: GetStudent,
+    @Param() param: ApiClb010RequestParam,
+  ): Promise<ApiClb010ResponseOk> {
+    const result = await this.clubService.getStudentClubMembers(
+      user.studentId,
+      param,
+    );
+    return result;
+  }
+
   @Professor()
   @Get("professor/clubs/my")
   @UsePipes(new ZodPipe(apiClb016))

packages/api/src/feature/club/delegate/delegate.service.ts

@@ -66,6 +66,7 @@ export default class ClubDelegateService {
           name: student.name,
           studentId: student.id,
           delegateEnumId: e.ClubDelegateEnumId,
+          studentNumber: student.number,
           phoneNumber:
             student.phoneNumber === null
               ? "010-0000-0000"
@@ -193,7 +194,7 @@ export default class ClubDelegateService {
           !this.clubDelegateDRepository.updateDelegate({
             clubId: param.clubId,
             clubDelegateEnumId: param.clubDelegateEnumId,
-            studentId: param.studentId,
+            studentId: param.targetStudentId,
           })
         )
           throw new HttpException(
@@ -273,11 +274,14 @@ export default class ClubDelegateService {
         semesterId,
         filterClubDelegateEnum:
           param.param.delegateEnumId === ClubDelegateEnum.Representative
-            ? [ClubDelegateEnum.Representative]
+            ? []
             : [
                 ClubDelegateEnum.Representative,
-                ClubDelegateEnum.Delegate1,
-                ClubDelegateEnum.Delegate2,
+                // ClubDelegateEnum.Delegate1,
+                // ClubDelegateEnum.Delegate2,
+                param.param.delegateEnumId === ClubDelegateEnum.Delegate1
+                  ? ClubDelegateEnum.Delegate2
+                  : ClubDelegateEnum.Delegate1,
               ],
       });
 

packages/api/src/feature/club/repository/club.club-delegate-d.repository.ts

@@ -4,7 +4,18 @@ import {
   ClubDelegateEnum,
 } from "@sparcs-clubs/interface/common/enum/club.enum";
 
-import { and, count, eq, gte, isNull, lte, notInArray, or } from "drizzle-orm";
+import {
+  and,
+  count,
+  eq,
+  gte,
+  isNotNull,
+  isNull,
+  lte,
+  not,
+  notInArray,
+  or,
+} from "drizzle-orm";
 import { MySql2Database } from "drizzle-orm/mysql2";
 
 import logger from "@sparcs-clubs/api/common/util/logger";
@@ -220,12 +231,20 @@ export class ClubDelegateDRepository {
         and(
           eq(Club.id, param.clubId),
           eq(ClubStudentT.semesterId, param.semesterId),
-          or(
-            notInArray(
-              ClubDelegateD.ClubDelegateEnumId,
-              param.filterClubDelegateEnum,
+          param.filterClubDelegateEnum.length !== 0
+            ? or(
+                notInArray(
+                  ClubDelegateD.ClubDelegateEnumId,
+                  param.filterClubDelegateEnum,
+                ),
+                isNull(ClubDelegateD.ClubDelegateEnumId),
+              )
+            : undefined,
+          not(
+            and(
+              not(eq(ClubDelegateD.clubId, param.clubId)),
+              isNotNull(ClubDelegateD.id),
             ),
-            isNull(ClubDelegateD.ClubDelegateEnumId),
           ),
           isNull(Club.deletedAt),
         ),

packages/api/src/feature/club/repository/club.club-student-t.repository.ts

@@ -240,4 +240,29 @@ export default class ClubStudentTRepository {
 
     return result;
   }
+
+  /** NOTE: (@dora)
+   * 말 그대로 semesterId 기준, 즉 해당 학기에 활동을 했느냐 기준으로 회원 목록을 반환하는 것이므로
+   * 해당 학기의 활동 기간을 다 채우지 못한 회원에 대해서 (예를 들어 중간 탈퇴) 고려하고 있지 않음.
+   * 만약 이런 회원들에 대한 처리가 필요해지면 endTerm을 고려하여 로직 수정 필요
+   */
+  async selectMemberByClubIdAndSemesterId(clubId: number, semesterId: number) {
+    return this.db
+      .select({
+        name: Student.name,
+        studentId: Student.id,
+        studentNumber: Student.number,
+        email: Student.email,
+        phoneNumber: Student.phoneNumber,
+      })
+      .from(ClubStudentT)
+      .innerJoin(Student, eq(Student.id, ClubStudentT.studentId))
+      .where(
+        and(
+          eq(ClubStudentT.clubId, clubId),
+          eq(ClubStudentT.semesterId, semesterId),
+          isNull(ClubStudentT.deletedAt),
+        ),
+      );
+  }
 }

packages/api/src/feature/club/repository/club.club-t.repository.ts

@@ -51,6 +51,26 @@ export default class ClubTRepository {
     return result;
   }
 
+  async findSemesterByClubId(clubId: number) {
+    return this.db
+      .select({
+        id: SemesterD.id,
+        name: SemesterD.name,
+        year: SemesterD.year,
+      })
+      .from(SemesterD)
+      .innerJoin(ClubT, eq(SemesterD.id, ClubT.semesterId))
+      .where(and(eq(ClubT.clubId, clubId), isNull(ClubT.deletedAt)))
+      .orderBy(desc(SemesterD.id))
+      .then(result =>
+        result.map(row => ({
+          id: row.id,
+          year: row.year,
+          name: row.name,
+        })),
+      );
+  }
+
   async findProfessorSemester(professorId: number) {
     return this.db
       .select({

packages/api/src/feature/club/service/club.service.ts

@@ -5,6 +5,15 @@ import {
   NotFoundException,
 } from "@nestjs/common";
 
+import {
+  ApiClb009RequestParam,
+  ApiClb009ResponseOk,
+} from "@sparcs-clubs/interface/api/club/endpoint/apiClb009";
+import {
+  ApiClb010RequestParam,
+  ApiClb010ResponseOk,
+} from "@sparcs-clubs/interface/api/club/endpoint/apiClb010";
+
 import { ClubDelegateDRepository } from "@sparcs-clubs/api/feature/club/repository/club.club-delegate-d.repository";
 import { ClubRoomTRepository } from "@sparcs-clubs/api/feature/club/repository/club.club-room-t.repository";
 
@@ -15,6 +24,8 @@ import { ClubGetStudentClubBrief } from "../repository/club.get-student-club-bri
 import { ClubPutStudentClubBrief } from "../repository/club.put-student-club-brief";
 import ClubRepository from "../repository/club.repository";
 
+import ClubPublicService from "./club.public.service";
+
 import type { ApiClb001ResponseOK } from "@sparcs-clubs/interface/api/club/endpoint/apiClb001";
 import type {
   ApiClb002RequestParam,
@@ -43,6 +54,7 @@ export class ClubService {
     private divisionPermanentClubDRepository: DivisionPermanentClubDRepository,
     private clubGetStudentClubBrief: ClubGetStudentClubBrief,
     private clubPutStudentClubBrief: ClubPutStudentClubBrief,
+    private clubPublicService: ClubPublicService,
   ) {}
 
   async getClubs(): Promise<ApiClb001ResponseOK> {
@@ -221,6 +233,42 @@ export class ClubService {
     return {};
   }
 
+  async getStudentClubSemesters(
+    studentId: number,
+    param: ApiClb009RequestParam,
+  ): Promise<ApiClb009ResponseOk> {
+    const { clubId } = param;
+    const isAvailableDelegate = await this.clubPublicService.isStudentDelegate(
+      studentId,
+      clubId,
+    );
+    if (!isAvailableDelegate) {
+      throw new HttpException("Delegate not available", HttpStatus.FORBIDDEN);
+    }
+    const result = await this.clubTRepository.findSemesterByClubId(clubId);
+    return { semesters: result };
+  }
+
+  async getStudentClubMembers(
+    studentId: number,
+    param: ApiClb010RequestParam,
+  ): Promise<ApiClb010ResponseOk> {
+    const { clubId, semesterId } = param;
+    const isAvailableDelegate = await this.clubPublicService.isStudentDelegate(
+      studentId,
+      clubId,
+    );
+    if (!isAvailableDelegate) {
+      throw new HttpException("Delegate not available", HttpStatus.FORBIDDEN);
+    }
+    const result =
+      await this.clubStudentTRepository.selectMemberByClubIdAndSemesterId(
+        clubId,
+        semesterId,
+      );
+    return { members: result };
+  }
+
   async getProfessorClubsMy(professorId: number): Promise<ApiClb016ResponseOk> {
     const professorSemesters =
       await this.clubTRepository.findProfessorSemester(professorId);

packages/interface/src/api/club/endpoint/apiClb006.ts

@@ -28,6 +28,7 @@ const responseBodyMap = {
       z.object({
         delegateEnumId: z.nativeEnum(ClubDelegateEnum),
         studentId: z.coerce.number().int().min(1),
+        studentNumber: z.coerce.number().int().min(1),
         name: zUserName,
         phoneNumber: zKrPhoneNumber,
       }),

packages/interface/src/api/club/endpoint/apiClb007.ts

@@ -9,7 +9,7 @@ import { ClubDelegateEnum } from "@sparcs-clubs/interface/common/enum/club.enum"
  */
 
 const url = (clubId: number) =>
-  `/student/clubs/club/${clubId}/delegates/delegate/`;
+  `/student/clubs/club/${clubId}/delegates/delegate`;
 const method = "PUT";
 
 const requestParam = z.object({

packages/interface/src/api/club/endpoint/apiClb010.ts

@@ -24,10 +24,11 @@ const responseBodyMap = {
   [HttpStatusCode.Ok]: z.object({
     members: z
       .object({
-        studentNumber: z.coerce.number().int().min(20000000).max(30000000),
         name: z.coerce.string().max(30),
+        studentId: z.coerce.number().int().min(1),
+        studentNumber: z.coerce.number().int().min(20000000).max(30000000),
         email: z.coerce.string().max(50),
-        krPhoneNumber: zKrPhoneNumber.optional(),
+        phoneNumber: zKrPhoneNumber.optional(),
       })
       .array(),
   }),

packages/web/package.json

@@ -23,6 +23,24 @@
     "@mui/material-nextjs": "5.15.11",
     "@tanstack/react-query": "^5.28.4",
     "@tanstack/react-table": "^8.17.3",
+    "@tiptap/core": "^2.7.2",
+    "@tiptap/extension-bold": "^2.7.2",
+    "@tiptap/extension-color": "^2.7.2",
+    "@tiptap/extension-document": "^2.7.2",
+    "@tiptap/extension-dropcursor": "^2.7.4",
+    "@tiptap/extension-image": "^2.7.4",
+    "@tiptap/extension-italic": "^2.7.2",
+    "@tiptap/extension-list-item": "^2.7.2",
+    "@tiptap/extension-paragraph": "^2.7.2",
+    "@tiptap/extension-placeholder": "^2.7.3",
+    "@tiptap/extension-table": "^2.7.2",
+    "@tiptap/extension-table-cell": "^2.7.2",
+    "@tiptap/extension-table-header": "^2.7.2",
+    "@tiptap/extension-table-row": "^2.7.2",
+    "@tiptap/extension-text": "^2.7.2",
+    "@tiptap/extension-text-style": "^2.7.2",
+    "@tiptap/react": "^2.7.2",
+    "@tiptap/starter-kit": "^2.7.2",
     "axios": "^1.6.7",
     "axios-mock-adapter": "^1.22.0",
     "classnames": "^2.3.2",
@@ -36,8 +54,10 @@
     "overlay-kit": "^1.2.1",
     "react": "^18",
     "react-cookie": "^7.2.0",
+    "react-datepicker": "^7.4.0",
     "react-dom": "^18",
     "react-hook-form": "^7.52.1",
+    "sass": "^1.79.3",
     "socket.io": "^4.7.5",
     "styled-components": "^6.1.8",
     "viewerjs": "^1.11.6",
@@ -49,6 +69,7 @@
     "@tanstack/react-query-devtools": "^5.28.4",
     "@types/node": "^20",
     "@types/react": "^18",
+    "@types/react-datepicker": "^7.0.0",
     "@types/react-dom": "^18",
     "typescript": "^5"
   },