-
Notifications
You must be signed in to change notification settings - Fork 0
Fix: 학과 공지 업데이트 오류 수정, 학과 목록 조회 api 수정 #310
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
ebe8a6b
[feat]: 학과별(학사) 전체 공지 업데이트 테스트 구현
jiyun921 dded893
[refactor]: 변수 이름 graduated로 수정
jiyun921 1500013
[fix]: latestPageGraduateNoticeApiClient 주입 누락 수정
jiyun921 daab412
[feat]: 학과 목록 조회 - graduateSupported 추가
jiyun921 a9d107f
[refactor]: 학과 목록 조회 - DeptInfo 주입 방식으로 수정
jiyun921 e880cbc
[feat]: 매체연기학과 추가 구현
jiyun921 b365d03
[refactor]: import 수정
jiyun921 6482cd0
[fix]: 학과 개수 변경 반영
jiyun921 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 6 additions & 3 deletions
9
...n/java/com/kustacks/kuring/notice/application/port/in/dto/NoticeDepartmentNameResult.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,16 @@ | ||
| package com.kustacks.kuring.notice.application.port.in.dto; | ||
|
|
||
| import com.kustacks.kuring.notice.domain.DepartmentName; | ||
| import com.kustacks.kuring.worker.scrap.deptinfo.DeptInfo; | ||
|
|
||
| public record NoticeDepartmentNameResult( | ||
| String name, | ||
| String hostPrefix, | ||
| String korName | ||
| String korName, | ||
| boolean graduateSupported | ||
| ) { | ||
| public static NoticeDepartmentNameResult from(DepartmentName name) { | ||
| return new NoticeDepartmentNameResult(name.getName(), name.getHostPrefix(), name.getKorName()); | ||
| public static NoticeDepartmentNameResult from(DeptInfo deptInfo) { | ||
| DepartmentName name = deptInfo.getDepartmentName(); | ||
| return new NoticeDepartmentNameResult(name.getName(), name.getHostPrefix(), name.getKorName(), deptInfo.isSupportGraduateScrap()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -77,14 +77,15 @@ public enum DepartmentName { | |
| LIVING_DESIGN("living_design", "livingdesign", "리빙디자인학과"), | ||
| CONT_ART("contemporary_art", "contemporaryart", "현대미술학과"), | ||
| MOV_IMAGE("moving_image_film", "movingimages", "영상학과"), | ||
| MEDIA_ACTING("media_acting", "mediaacting", "매체연기학과"), | ||
|
|
||
| JAPANESE_EDU("japanese_education", "japan", "일어교육과"), | ||
| MATH_EDU("mathematics_education", "mathedu", "수학교육과"), | ||
| PHY_EDU("physical_education", "kupe", "체육교육과"), | ||
| MUSIC_EDU("music_education", "music", "음악교육과"), | ||
| EDU_TECH("education_technology", "edutech", "교육공학과"), | ||
| ENGLISH_EDU("english_education", "englishedu", "영어교육과"), | ||
| EDUCATION("education", "edu", "교육학과"), | ||
| EDUCATION("education", "edu", "교직과"), | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 오잉 이거 한글명 교직과가 맞나유?? |
||
|
|
||
| ELE_EDU_CENTER("elective_education_center", "sgedu", "교양교육센터"), | ||
| VOLUNTEER("volunteer_center", "kuvolunteer", "사회봉사센터"), | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/MediaActingDept.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package com.kustacks.kuring.worker.scrap.deptinfo.art_design; | ||
|
|
||
| import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; | ||
| import com.kustacks.kuring.worker.scrap.client.notice.LatestPageNoticeApiClient; | ||
| import com.kustacks.kuring.worker.scrap.client.notice.property.LatestPageNoticeProperties; | ||
| import com.kustacks.kuring.worker.scrap.deptinfo.NoticeScrapInfo; | ||
| import com.kustacks.kuring.worker.scrap.deptinfo.RegisterDepartmentMap; | ||
| import com.kustacks.kuring.worker.scrap.deptinfo.StaffScrapInfo; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static com.kustacks.kuring.notice.domain.DepartmentName.MEDIA_ACTING; | ||
|
|
||
| @RegisterDepartmentMap(key = MEDIA_ACTING) | ||
| public class MediaActingDept extends ArtDesignCollege { | ||
|
|
||
| public MediaActingDept( | ||
| LatestPageNoticeApiClient latestPageNoticeApiClient, | ||
| LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, | ||
| LatestPageNoticeProperties latestPageNoticeProperties | ||
| ) { | ||
| super(); | ||
| this.noticeApiClient = latestPageNoticeApiClient; | ||
| this.htmlParser = latestPageNoticeHtmlParser; | ||
| this.latestPageNoticeProperties = latestPageNoticeProperties; | ||
|
|
||
| List<Integer> siteIds = List.of(11299); | ||
| this.staffScrapInfo = new StaffScrapInfo(MEDIA_ACTING.getHostPrefix(), siteIds); | ||
| this.noticeScrapInfo = new NoticeScrapInfo(MEDIA_ACTING.getHostPrefix(), 493); | ||
| this.departmentName = MEDIA_ACTING; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(질문) DepartmentName 에서 DeptInfo쪽으로 바뀐 이유가 졸업여부 정보 떄문인가요??
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
넵 DepartmentName은 graduated 필드가 없어서 여기에 새로 추가하는거보다 원래 있던 DeptInfo의 isSupportGraduateScrap()를 쓰는게 나을 것 같아서 DeptInfo로 바꿨습니다!