Skip to content

Commit 7a22ad1

Browse files
limgahyunlimgahyun
authored
Merge pull request #204 from CEOS-Developers/main
version update
2 parents 317c3f6 + 8483d5e commit 7a22ad1

12 files changed

Lines changed: 63 additions & 16 deletions

File tree

‎.github/workflows/deploy_prod.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ on:
44
push:
55
branches:
66
- main
7+
workflow_dispatch:
8+
inputs:
9+
name:
10+
description: 'admin'
11+
required: true
12+
default: 'user'
13+
message:
14+
description: 'message'
15+
required: false
16+
default: '수동 워크플로우 트리거'
717

818
permissions:
919
contents: read
@@ -61,10 +71,10 @@ jobs:
6171
uses: appleboy/ssh-action@master
6272
with:
6373
host: ${{ secrets.EC2_HOST_PROD }}
64-
username: ec2-user # ubuntu 에서 변경
74+
username: ubuntu # ec2-user 에서 변경
6575
key: ${{ secrets.EC2_KEY_PROD }}
6676
script: |
67-
cd /home/ec2-user/ceos
77+
cd /home/ubuntu/ceos
6878
6979
sudo touch .env
7080
echo "${{ secrets.ENV_PROD }}" | sudo tee .env > /dev/null
@@ -75,7 +85,7 @@ jobs:
7585
sudo docker rm -f $(docker ps -qa)
7686
sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos-backend
7787
sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos-nginx
78-
docker-compose -f docker-compose.yml --env-file ./.env up -d
88+
docker compose -f docker-compose.yml --env-file .env up -d
7989
docker image prune -f
8090
8191
#name: Deploy to EC2

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import ceos.backend.domain.application.domain.Pass;
66
import ceos.backend.domain.recruitment.domain.Recruitment;
77
import ceos.backend.global.common.dto.ParsedDuration;
8+
import ceos.backend.global.common.entity.Part;
89
import ceos.backend.global.util.ParsedDurationConvertor;
910
import com.fasterxml.jackson.annotation.JsonUnwrapped;
1011
import java.time.LocalDate;
@@ -19,6 +20,8 @@ public class GetResultResponse {
1920

2021
private String name;
2122

23+
private Part part;
24+
2225
@JsonUnwrapped private ParsedDuration parsedDuration;
2326

2427
private LocalDate otDate;
@@ -32,13 +35,15 @@ private GetResultResponse(
3235
Pass pass,
3336
int generation,
3437
String name,
38+
Part part,
3539
ParsedDuration parsedDuration,
3640
LocalDate otDate,
3741
boolean attendanceStatus,
3842
String openChatUrl) {
3943
this.pass = pass;
4044
this.generation = generation;
4145
this.name = name;
46+
this.part = part;
4247
this.parsedDuration = parsedDuration;
4348
this.otDate = otDate;
4449
this.attendanceStatus = attendanceStatus;
@@ -57,6 +62,7 @@ public static GetResultResponse toDocumentResult(
5762
.pass(application.getDocumentPass())
5863
.generation(recruitment.getGeneration())
5964
.name(application.getApplicantInfo().getName())
65+
.part(application.getApplicationDetail().getPart())
6066
.parsedDuration(duration)
6167
.otDate(recruitment.getOtDate())
6268
.attendanceStatus(application.isInterviewCheck())
@@ -70,6 +76,7 @@ public static GetResultResponse toFinalResult(
7076
.pass(application.getFinalPass())
7177
.generation(recruitment.getGeneration())
7278
.name(application.getApplicantInfo().getName())
79+
.part(application.getApplicationDetail().getPart())
7380
.parsedDuration(
7481
ParsedDurationConvertor.parsingDuration(application.getInterviewDatetime()))
7582
.otDate(recruitment.getOtDate())

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package ceos.backend.domain.management.domain;
22

3-
43
import ceos.backend.domain.management.dto.request.UpdateManagementRequest;
54
import ceos.backend.domain.management.vo.ManagementVo;
65
import ceos.backend.global.common.entity.BaseEntity;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public enum ManagementPart {
1313
CHAIRMAN("회장"),
1414
VICE_CHAIRMAN("부회장"),
1515
CO_PRESIDENT("공동회장"),
16+
ADVISOR("고문"),
1617
PLAN("기획"),
1718
DESIGN("디자인"),
1819
FRONTEND("프론트엔드"),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
@RequiredArgsConstructor
1212
public enum ManagementRole {
1313
PRESIDENCY("회장단"),
14+
ADVISOR("고문"), // advisor, presidency 분리할지 논의 필요
1415
GENERAL_AFFAIRS("총무"),
1516
PART_LEADER("파트장"),
1617
MANAGEMENT("운영진"),

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package ceos.backend.domain.management.dto.response;
22

3-
43
import ceos.backend.domain.management.dto.ManagementDto;
54
import java.util.List;
65
import lombok.Builder;
@@ -10,29 +9,34 @@
109
public class GetAllPartManagementsResponse {
1110

1211
List<ManagementDto> presidency;
12+
List<ManagementDto> advisors;
1313
List<ManagementDto> generalAffairs;
1414
List<ManagementDto> partLeaders;
1515
List<ManagementDto> managers;
1616

1717
@Builder
1818
public GetAllPartManagementsResponse(
1919
List<ManagementDto> presidency,
20+
List<ManagementDto> advisors,
2021
List<ManagementDto> generalAffairs,
2122
List<ManagementDto> partLeaders,
2223
List<ManagementDto> managers) {
2324
this.presidency = presidency;
25+
this.advisors = advisors;
2426
this.generalAffairs = generalAffairs;
2527
this.partLeaders = partLeaders;
2628
this.managers = managers;
2729
}
2830

2931
public static GetAllPartManagementsResponse of(
3032
List<ManagementDto> presidency,
33+
List<ManagementDto> advisors,
3134
List<ManagementDto> generalAffairs,
3235
List<ManagementDto> partLeaders,
3336
List<ManagementDto> managers) {
3437
return GetAllPartManagementsResponse.builder()
3538
.presidency(presidency)
39+
.advisors(advisors)
3640
.generalAffairs(generalAffairs)
3741
.partLeaders(partLeaders)
3842
.managers(managers)

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,17 @@ public GetAllManagementsResponse toManagementsPage(
3030

3131
public GetAllPartManagementsResponse toPartManagementList(
3232
List<Management> presidency,
33+
List<Management> advisors,
3334
List<Management> generalAffairs,
3435
List<Management> partLeaders,
3536
List<Management> managements) {
3637
List<ManagementDto> presidencyList = toManagementDtoList(toOrderByPart(presidency));
38+
List<ManagementDto> advisorsList = toManagementDtoList(toOrderByPart(advisors));
3739
List<ManagementDto> generalAffairsList = toManagementDtoList(toOrderByPart(generalAffairs));
3840
List<ManagementDto> partLeadersList = toManagementDtoList(toOrderByPart(partLeaders));
3941
List<ManagementDto> managementsList = toManagementDtoList(toOrderByPart(managements));
4042
return GetAllPartManagementsResponse.of(
41-
presidencyList, generalAffairsList, partLeadersList, managementsList);
43+
presidencyList, advisorsList, generalAffairsList, partLeadersList, managementsList);
4244
}
4345

4446
public List<ManagementDto> toManagementDtoList(List<Management> managements) {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ public GetAllPartManagementsResponse getAllPartManagements() {
6666
List<Management> findPresidency =
6767
managementRepository.findManagementAllByRoleOrderByNameAsc(
6868
ManagementRole.PRESIDENCY);
69+
List<Management> findAdvisors =
70+
managementRepository.findManagementAllByRoleOrderByNameAsc(
71+
ManagementRole.ADVISOR);
6972
List<Management> findGeneralAffairs =
7073
managementRepository.findManagementAllByRoleOrderByNameAsc(
7174
ManagementRole.GENERAL_AFFAIRS);
@@ -78,7 +81,7 @@ public GetAllPartManagementsResponse getAllPartManagements() {
7881

7982
GetAllPartManagementsResponse response =
8083
managementMapper.toPartManagementList(
81-
findPresidency, findGeneralAffairs, findPartLeaders, findManagements);
84+
findPresidency, findAdvisors, findGeneralAffairs, findPartLeaders, findManagements);
8285

8386
return response;
8487
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ public class ManagementVo {
1818
@NotEmpty(message = "임원진 이름을 입력해주세요")
1919
private String name;
2020

21-
@Schema(defaultValue = "회장단", description = "임원진 역할(회장단/총무/파트장/운영진/멘토)")
21+
@Schema(defaultValue = "회장단", description = "임원진 역할(회장단/고문/총무/파트장/운영진/멘토)")
2222
@ValidEnum(target = ManagementRole.class)
2323
private ManagementRole role;
2424

25-
@Schema(defaultValue = "기획", description = "임원진 파트(회장/부회장/공동회장/기획/디자인/프론트엔드/백엔드)")
25+
@Schema(defaultValue = "기획", description = "임원진 파트(회장/부회장/공동회장/고문/기획/디자인/프론트엔드/백엔드)")
2626
@ValidEnum(target = ManagementPart.class)
2727
private ManagementPart part;
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
font-size: 20px;
2222
line-height: 150%;
2323
color: #D6DADF;">
24-
© 2016-2024 Ceos ALL RIGHTS RESERVED.
24+
© 2016-2025 Ceos ALL RIGHTS RESERVED.
2525
</span>
2626
</div>
2727
</html>

0 commit comments

Comments
 (0)