[merge] : PASSU 개강행사 대응 운영 배포 (#240)

* [feat] : #183 캘린더 테이블 카테고리 enum 추가 * [feat] : #183 엔티티 설계 * [feat] : #183 일정 조회 구현 * [fix] : #183 일정추가 및 쿼리DSL 설정 확인 * [fix] : 로컬로 옮기기위한 커밋 * [fix]: #183-calendar 예외처리 불분명 * [fix] : exception 핸들러 하위 에러 처리 오류 해결 * [fix] : 레전드 import 문제 수정 * [fix] : ACL 적용 기능구현(미완성) 원격저장소를 위한 커밋 * [fix] : 권한 처리 * [fix] : 경고제거 * [fix] : 캘린더 조회 방법 수정 * [fix] #224 userId hidden * [fix] : 스테이징 * [fix] : 오타수정 * [fix] #229 질의응답게시판 이메일 발송 임시 * [feat] : 정렬 일자별 * [fix] : 수정,삭제 api 구현 * [feat] : 일정 단건 조회 * [feat] : 페이지네이션 적용 * [fix] #234 질의응답게시판 자치기구 계정 댓글 삭제 권한 추가 * [feat] #232 디스코드 웹훅, 봇 사용자수 알림 * [fix] discord 스케줄 정지 * [fix] : /user-info API 수정 및 온보딩 예외처리 * [fix] : 학과/단과대 업데이트 --------- Co-authored-by: jinseok <[email protected]> Co-authored-by: beakgugong <[email protected]>
ssu-student-union · Mar 4, 2025 · e932389 · e932389
1 parent 239aa01
commit e932389
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 8 deletions.
diff --git a/src/main/java/ussum/homepage/application/notification/service/DiscordWebhookScheduler.java b/src/main/java/ussum/homepage/application/notification/service/DiscordWebhookScheduler.java
@@ -9,6 +9,7 @@
 public class DiscordWebhookScheduler {
     private final DiscordWebhookService discordWebhookService;
 
+
     @Scheduled(cron = "0 0 0 * * ?")
     public void sendUserStatisticsPeriodically() {
         discordWebhookService.sendToDiscord();

diff --git a/src/main/java/ussum/homepage/application/user/service/dto/response/UserInfoResponse.java b/src/main/java/ussum/homepage/application/user/service/dto/response/UserInfoResponse.java
@@ -4,6 +4,7 @@
 import ussum.homepage.domain.csv_user.StudentCsv;
 import ussum.homepage.domain.member.Member;
 import ussum.homepage.domain.user.User;
+import ussum.homepage.infra.jpa.member.entity.MajorCode;
 import ussum.homepage.infra.jpa.member.entity.MemberCode;
 
 @Builder
@@ -26,7 +27,7 @@ public static UserInfoResponse of(User user, Member member){
         return UserInfoResponse.builder()
                 .name(user.getName())
                 .studentId(user.getStudentId() == null ? "null" : String.valueOf(user.getStudentId()))
-                .major(MemberCode.getEnumMemberCodeFromStringMemberCode(member.getMemberCode()).getStringMemberCode())
+                .major(MajorCode.getEnumMajorCodeFromStringMajorCode(member.getMajorCode()).getStringMajorCode())
                 .isCouncil(member.getIsAdmin())
                 .build();
     }

diff --git a/src/main/java/ussum/homepage/domain/csv_user/service/StudentCsvReader.java b/src/main/java/ussum/homepage/domain/csv_user/service/StudentCsvReader.java
@@ -6,6 +6,7 @@
 import ussum.homepage.domain.csv_user.StudentCsv;
 import ussum.homepage.domain.csv_user.StudentCsvRepository;
 import ussum.homepage.global.error.exception.GeneralException;
+import ussum.homepage.global.error.exception.InvalidValueException;
 import ussum.homepage.global.error.status.ErrorStatus;
 import ussum.homepage.infra.jpa.member.entity.MajorCode;
 import ussum.homepage.infra.jpa.member.entity.MemberCode;
@@ -34,11 +35,27 @@ private void checkStudentRight(OnBoardingRequest request, StudentCsv studentCsv)
         boolean studentId = request.getStudentId().equals(studentCsv.getStudentId().toString());
         boolean groupName = request.getMemberCode().equals(MemberCode.getEnumMemberCodeFromStringMemberCode(studentCsv.getGroupName()).getStringMemberCode());
         boolean major;
-        if (request.getMajorCode().equals(MajorCode.getEnumMajorCodeFromStringMajorCode(studentCsv.getMajor()).getStringMajorCode())){
-            major = true;
-        }else{
-            // ㅇㅇ
-            major = request.getMajorCode().equals("아무거나") | studentCsv.getMajor().equals("아무거나");
+
+
+        // TODO(inho): csv의 단과대 학과 구조랑 MajorCode, MemberCode의 구조가 달라서 예외 처리 로직 추가
+        try {
+            if (request.getMajorCode().equals(MajorCode.getEnumMajorCodeFromStringMajorCode(studentCsv.getMajor()).getStringMajorCode())){
+                major = true;
+            }else{
+                // ㅇㅇ
+                major = request.getMajorCode().equals("아무거나") | studentCsv.getMajor().equals("아무거나");
+            }
+        } catch (Exception e) {
+            if (e instanceof InvalidValueException) {
+                if (request.getMajorCode().equals(MajorCode.getEnumMajorCodeFromStringMajorCode(studentCsv.getProgram()).getStringMajorCode())){
+                    major = true;
+                }else{
+                    // ㅇㅇ
+                    major = request.getMajorCode().equals("아무거나") | studentCsv.getMajor().equals("아무거나");
+                }
+            } else {
+                throw e;  // 다른 예외는 다시 던지기
+            }
         }
 
         if(!(name && studentId && groupName && major)){

diff --git a/src/main/java/ussum/homepage/infra/jpa/member/entity/MajorCode.java b/src/main/java/ussum/homepage/infra/jpa/member/entity/MajorCode.java
@@ -3,7 +3,6 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import ussum.homepage.global.error.exception.InvalidValueException;
-import ussum.homepage.infra.jpa.group.entity.GroupCode;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -26,6 +25,18 @@ public enum MajorCode {
     // 금융학부
     FINANCE_DEPARTMENT("금융학부"),
 
+    // 벤처경영학과
+    VENTURE_MANAGEMENT_DEPARTMENT("벤처경영학과"),
+
+    // 혁신경영학과
+    INNOVATION_MANAGEMENT_DEPARTMENT("혁신경영학과"),
+
+    // 복지경영학과
+    WELFARE_MANAGEMENT_DEPARTMENT("복지경영학과"),
+
+    // 회계세무학과
+    ACCOUNTING_TAX_DEPARTMENT("회계세무학과"),
+
     // 경제통상대학
     // 경제학과
     ECONOMICS_DEPARTMENT("경제학과"),
@@ -39,6 +50,8 @@ public enum MajorCode {
     // 국제무역학과
     INTERNATIONAL_TRADE_DEPARTMENT("국제무역학과"),
 
+    TRADE_INDUSTRY_DEPARTMENT("통상산업학과"),
+
     // 공과대학
     // 화학공학과
     CHEMICAL_ENGINEERING_DEPARTMENT("화학공학과"),
@@ -156,8 +169,21 @@ public enum MajorCode {
     // 미디어경영학과
     MEDIA_MANAGEMENT_DEPARTMENT("미디어경영학과"),
 
+    // 정보보호학과
+    INFORMATION_SECURITY_DEPARTMENT("정보보호학과"),
+
     // 융합특성화자유전공학부
-    CONVERGENCE_DEPARTMENT("융합특성화자유전공학부");
+    CONVERGENCE_DEPARTMENT("융합특성화자유전공학부"),
+
+    // 차세대반도체학과
+    NEXT_GENERATION_SEMICONDUCTOR_DEPARTMENT("차세대반도체학과"),
+
+    // 베어드학부대학
+    // 자유전공학부(인문)
+    FREE_MAJOR_HUMANITIES_DEPARTMENT("자유전공학부(인문)"),
+
+    // 자유전공학부(자연)
+    FREE_MAJOR_SCIENCES_DEPARTMENT("자유전공학부(자연)");
 
     private final String stringMajorCode;
     public static MajorCode getEnumMajorCodeFromStringMajorCode(String stringMajorCode) {

diff --git a/src/main/java/ussum/homepage/infra/jpa/member/entity/MemberCode.java b/src/main/java/ussum/homepage/infra/jpa/member/entity/MemberCode.java
@@ -110,6 +110,12 @@ public enum MemberCode {
     // 학생인권위원회
     STUDENT_HUMAN_RIGHTS_COMMITTEE("학생인권위원회"),
 
+    // 차세대반도체학과
+    NEXT_GENERATION_SEMICONDUCTOR_DEPARTMENT("차세대반도체학과"),
+
+    // 베어드학부대학
+    BAIRD_SCHOOL("베어드학부대학"),
+
     // 교지편집위원회
     SCHOOL_MAGAZINE_EDITORIAL_COMMITTEE("교지편집위원회"),