From efac19d639e8b7cb7dfc56e78a0b81551a112c18 Mon Sep 17 00:00:00 2001 From: Mingyu Song <100754581+mikekks@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:39:37 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=08chore:=20=EB=B2=88=EA=B0=9C=20->=20?= =?UTF-8?q?=EB=B2=88=EC=A9=8D=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20(#5?= =?UTF-8?q?02)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(MeetingCategory): 번개 -> 번쩍으로 변경 * style(MeetingCategory): 코드 포맷터 적용 * chore: 메이커스 리드 삭제 --- .../entity/meeting/enums/MeetingCategory.java | 35 ++++++++++--------- .../crew/main/entity/user/enums/UserPart.java | 4 +-- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/main/src/main/java/org/sopt/makers/crew/main/entity/meeting/enums/MeetingCategory.java b/main/src/main/java/org/sopt/makers/crew/main/entity/meeting/enums/MeetingCategory.java index c81c8f65..8bdf0522 100644 --- a/main/src/main/java/org/sopt/makers/crew/main/entity/meeting/enums/MeetingCategory.java +++ b/main/src/main/java/org/sopt/makers/crew/main/entity/meeting/enums/MeetingCategory.java @@ -1,28 +1,29 @@ package org.sopt.makers.crew.main.entity.meeting.enums; import java.util.Arrays; + import org.sopt.makers.crew.main.global.exception.BadRequestException; public enum MeetingCategory { - STUDY("스터디"), - LECTURE("강연"), - LIGHTNING("번개"), - EVENT("행사"), - SEMINAR("세미나"); + STUDY("스터디"), + LECTURE("강연"), + LIGHTNING("번쩍"), + EVENT("행사"), + SEMINAR("세미나"); - private final String value; + private final String value; - MeetingCategory(String value) { - this.value = value; - } + MeetingCategory(String value) { + this.value = value; + } - public static MeetingCategory ofValue(String dbData) { - return Arrays.stream(MeetingCategory.values()).filter(v -> v.getValue().equals(dbData)) - .findFirst().orElseThrow(() -> new BadRequestException( - String.format("MeetingCategory 클래스에 value = [%s] 값을 가진 enum 객체가 없습니다.", dbData))); - } + public static MeetingCategory ofValue(String dbData) { + return Arrays.stream(MeetingCategory.values()).filter(v -> v.getValue().equals(dbData)) + .findFirst().orElseThrow(() -> new BadRequestException( + String.format("MeetingCategory 클래스에 value = [%s] 값을 가진 enum 객체가 없습니다.", dbData))); + } - public String getValue() { - return value; - } + public String getValue() { + return value; + } } \ No newline at end of file diff --git a/main/src/main/java/org/sopt/makers/crew/main/entity/user/enums/UserPart.java b/main/src/main/java/org/sopt/makers/crew/main/entity/user/enums/UserPart.java index 6ffa4c33..27a4868f 100644 --- a/main/src/main/java/org/sopt/makers/crew/main/entity/user/enums/UserPart.java +++ b/main/src/main/java/org/sopt/makers/crew/main/entity/user/enums/UserPart.java @@ -30,9 +30,7 @@ public enum UserPart { GENERAL_AFFAIRS("총무"), OPERATION_LEADER("운영 팀장"), MEDIA_LEADER("미디어 팀장"), - MAKERS_LEADER("메이커스 팀장"), - // 메이커스 리드는 임시조치 입니다. 플그와의 싱크 맞춘 후에는 삭제 필요 - MAKERS_LEADER_TEMP("메이커스 리드"); + MAKERS_LEADER("메이커스 팀장"); private final String value; From d567a5adeaf2924bb5629482abcaab408663f5f6 Mon Sep 17 00:00:00 2001 From: DongHoon Lee <125895298+hoonyworld@users.noreply.github.com> Date: Fri, 27 Dec 2024 15:03:32 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor(SecurityConfig):=20prometheus=20ac?= =?UTF-8?q?tuator=20=EA=B2=BD=EB=A1=9C=20=ED=99=94=EC=9D=B4=ED=8A=B8?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=20=EC=B6=94=EA=B0=80=20(#5?= =?UTF-8?q?11)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/makers/crew/main/global/config/SecurityConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/main/src/main/java/org/sopt/makers/crew/main/global/config/SecurityConfig.java b/main/src/main/java/org/sopt/makers/crew/main/global/config/SecurityConfig.java index 1e6bf5f9..77f76a48 100644 --- a/main/src/main/java/org/sopt/makers/crew/main/global/config/SecurityConfig.java +++ b/main/src/main/java/org/sopt/makers/crew/main/global/config/SecurityConfig.java @@ -53,6 +53,7 @@ private String[] getAuthWhitelist() { "/auth/v2", "/auth/v2/**", actuatorEndPoint + "/health", + actuatorEndPoint + "/prometheus", "/internal/**" }; }