Merge pull request #204 from CEOS-Developers/main

version update

Author: limgahyun

.github/workflows/deploy_prod.yml

@@ -4,6 +4,16 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
+    inputs:
+      name:
+        description: 'admin'
+        required: true
+        default: 'user'
+      message:
+        description: 'message'
+        required: false
+        default: '수동 워크플로우 트리거'
 
 permissions:
   contents: read
@@ -61,10 +71,10 @@ jobs:
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.EC2_HOST_PROD }}
-          username: ec2-user #  ubuntu 에서 변경
+          username: ubuntu #  ec2-user 에서 변경
           key: ${{ secrets.EC2_KEY_PROD }}
           script: |
-            cd /home/ec2-user/ceos
+            cd /home/ubuntu/ceos
             
             sudo touch .env
             echo "${{ secrets.ENV_PROD }}" | sudo tee .env > /dev/null
@@ -75,7 +85,7 @@ jobs:
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos-backend
             sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos-nginx
-            docker-compose -f docker-compose.yml --env-file ./.env up -d
+            docker compose -f docker-compose.yml --env-file .env up -d
             docker image prune -f
 
 #name: Deploy to EC2

src/main/java/ceos/backend/domain/application/dto/response/GetResultResponse.java

@@ -5,6 +5,7 @@
 import ceos.backend.domain.application.domain.Pass;
 import ceos.backend.domain.recruitment.domain.Recruitment;
 import ceos.backend.global.common.dto.ParsedDuration;
+import ceos.backend.global.common.entity.Part;
 import ceos.backend.global.util.ParsedDurationConvertor;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import java.time.LocalDate;
@@ -19,6 +20,8 @@ public class GetResultResponse {
 
     private String name;
 
+    private Part part;
+
     @JsonUnwrapped private ParsedDuration parsedDuration;
 
     private LocalDate otDate;
@@ -32,13 +35,15 @@ private GetResultResponse(
             Pass pass,
             int generation,
             String name,
+            Part part,
             ParsedDuration parsedDuration,
             LocalDate otDate,
             boolean attendanceStatus,
             String openChatUrl) {
         this.pass = pass;
         this.generation = generation;
         this.name = name;
+        this.part = part;
         this.parsedDuration = parsedDuration;
         this.otDate = otDate;
         this.attendanceStatus = attendanceStatus;
@@ -57,6 +62,7 @@ public static GetResultResponse toDocumentResult(
                 .pass(application.getDocumentPass())
                 .generation(recruitment.getGeneration())
                 .name(application.getApplicantInfo().getName())
+                .part(application.getApplicationDetail().getPart())
                 .parsedDuration(duration)
                 .otDate(recruitment.getOtDate())
                 .attendanceStatus(application.isInterviewCheck())
@@ -70,6 +76,7 @@ public static GetResultResponse toFinalResult(
                 .pass(application.getFinalPass())
                 .generation(recruitment.getGeneration())
                 .name(application.getApplicantInfo().getName())
+                .part(application.getApplicationDetail().getPart())
                 .parsedDuration(
                         ParsedDurationConvertor.parsingDuration(application.getInterviewDatetime()))
                 .otDate(recruitment.getOtDate())

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

@@ -1,6 +1,5 @@
 package ceos.backend.domain.management.domain;
 
-
 import ceos.backend.domain.management.dto.request.UpdateManagementRequest;
 import ceos.backend.domain.management.vo.ManagementVo;
 import ceos.backend.global.common.entity.BaseEntity;

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("고문"), // advisor, presidency 분리할지 논의 필요
     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;
 

src/main/resources/templates/component/copyright.html

@@ -21,7 +21,7 @@
         font-size: 20px;
         line-height: 150%;
         color: #D6DADF;">
-        © 2016-2024 Ceos ALL RIGHTS RESERVED.
+        © 2016-2025 Ceos ALL RIGHTS RESERVED.
     </span>
 </div>
 </html>