Merge pull request #196 from limgahyun/main

feat: management part, role에 advisor 추가

Author: limbs713

src/main/java/ceos/backend/domain/management/domain/ManagementPart.java

@@ -13,6 +13,7 @@ public enum ManagementPart {
     CHAIRMAN("회장"),
     VICE_CHAIRMAN("부회장"),
     CO_PRESIDENT("공동회장"),
+    ADVISOR("고문"),
     PLAN("기획"),
     DESIGN("디자인"),
     FRONTEND("프론트엔드"),

src/main/java/ceos/backend/domain/management/domain/ManagementRole.java

@@ -11,6 +11,7 @@
 @RequiredArgsConstructor
 public enum ManagementRole {
     PRESIDENCY("회장단"),
+    ADVISOR("고문"),
     GENERAL_AFFAIRS("총무"),
     PART_LEADER("파트장"),
     MANAGEMENT("운영진"),

src/main/java/ceos/backend/domain/management/dto/response/GetAllPartManagementsResponse.java

@@ -1,6 +1,5 @@
 package ceos.backend.domain.management.dto.response;
 
-
 import ceos.backend.domain.management.dto.ManagementDto;
 import java.util.List;
 import lombok.Builder;
@@ -10,29 +9,34 @@
 public class GetAllPartManagementsResponse {
 
     List<ManagementDto> presidency;
+    List<ManagementDto> advisors;
     List<ManagementDto> generalAffairs;
     List<ManagementDto> partLeaders;
     List<ManagementDto> managers;
 
     @Builder
     public GetAllPartManagementsResponse(
             List<ManagementDto> presidency,
+            List<ManagementDto> advisors,
             List<ManagementDto> generalAffairs,
             List<ManagementDto> partLeaders,
             List<ManagementDto> managers) {
         this.presidency = presidency;
+        this.advisors = advisors;
         this.generalAffairs = generalAffairs;
         this.partLeaders = partLeaders;
         this.managers = managers;
     }
 
     public static GetAllPartManagementsResponse of(
             List<ManagementDto> presidency,
+            List<ManagementDto> advisors,
             List<ManagementDto> generalAffairs,
             List<ManagementDto> partLeaders,
             List<ManagementDto> managers) {
         return GetAllPartManagementsResponse.builder()
                 .presidency(presidency)
+                .advisors(advisors)
                 .generalAffairs(generalAffairs)
                 .partLeaders(partLeaders)
                 .managers(managers)

src/main/java/ceos/backend/domain/management/mapper/ManagementMapper.java

@@ -30,15 +30,17 @@ public GetAllManagementsResponse toManagementsPage(
 
     public GetAllPartManagementsResponse toPartManagementList(
             List<Management> presidency,
+            List<Management> advisors,
             List<Management> generalAffairs,
             List<Management> partLeaders,
             List<Management> managements) {
         List<ManagementDto> presidencyList = toManagementDtoList(toOrderByPart(presidency));
+        List<ManagementDto> advisorsList = toManagementDtoList(toOrderByPart(advisors));
         List<ManagementDto> generalAffairsList = toManagementDtoList(toOrderByPart(generalAffairs));
         List<ManagementDto> partLeadersList = toManagementDtoList(toOrderByPart(partLeaders));
         List<ManagementDto> managementsList = toManagementDtoList(toOrderByPart(managements));
         return GetAllPartManagementsResponse.of(
-                presidencyList, generalAffairsList, partLeadersList, managementsList);
+                presidencyList, advisorsList, generalAffairsList, partLeadersList, managementsList);
     }
 
     public List<ManagementDto> toManagementDtoList(List<Management> managements) {

src/main/java/ceos/backend/domain/management/service/ManagementService.java

@@ -66,6 +66,9 @@ public GetAllPartManagementsResponse getAllPartManagements() {
         List<Management> findPresidency =
                 managementRepository.findManagementAllByRoleOrderByNameAsc(
                         ManagementRole.PRESIDENCY);
+        List<Management> findAdvisors =
+                managementRepository.findManagementAllByRoleOrderByNameAsc(
+                        ManagementRole.ADVISOR);
         List<Management> findGeneralAffairs =
                 managementRepository.findManagementAllByRoleOrderByNameAsc(
                         ManagementRole.GENERAL_AFFAIRS);
@@ -78,7 +81,7 @@ public GetAllPartManagementsResponse getAllPartManagements() {
 
         GetAllPartManagementsResponse response =
                 managementMapper.toPartManagementList(
-                        findPresidency, findGeneralAffairs, findPartLeaders, findManagements);
+                        findPresidency, findAdvisors, findGeneralAffairs, findPartLeaders, findManagements);
 
         return response;
     }

src/main/java/ceos/backend/domain/management/vo/ManagementVo.java

@@ -18,11 +18,11 @@ public class ManagementVo {
     @NotEmpty(message = "임원진 이름을 입력해주세요")
     private String name;
 
-    @Schema(defaultValue = "회장단", description = "임원진 역할(회장단/총무/파트장/운영진/멘토)")
+    @Schema(defaultValue = "회장단", description = "임원진 역할(회장단/고문/총무/파트장/운영진/멘토)")
     @ValidEnum(target = ManagementRole.class)
     private ManagementRole role;
 
-    @Schema(defaultValue = "기획", description = "임원진 파트(회장/부회장/공동회장/기획/디자인/프론트엔드/백엔드)")
+    @Schema(defaultValue = "기획", description = "임원진 파트(회장/부회장/공동회장/고문/기획/디자인/프론트엔드/백엔드)")
     @ValidEnum(target = ManagementPart.class)
     private ManagementPart part;