diff --git a/src/main/java/com/kustacks/kuring/notice/adapter/in/web/dto/NoticeDepartmentNameResponse.java b/src/main/java/com/kustacks/kuring/notice/adapter/in/web/dto/NoticeDepartmentNameResponse.java index 05cd4e6d1..d4390bdcc 100644 --- a/src/main/java/com/kustacks/kuring/notice/adapter/in/web/dto/NoticeDepartmentNameResponse.java +++ b/src/main/java/com/kustacks/kuring/notice/adapter/in/web/dto/NoticeDepartmentNameResponse.java @@ -5,13 +5,15 @@ public record NoticeDepartmentNameResponse( String name, String hostPrefix, - String korName + String korName, + boolean graduateSupported ) { public static NoticeDepartmentNameResponse from(NoticeDepartmentNameResult result) { return new NoticeDepartmentNameResponse( result.name(), result.hostPrefix(), - result.korName() + result.korName(), + result.graduateSupported() ); } } diff --git a/src/main/java/com/kustacks/kuring/notice/application/port/in/dto/NoticeDepartmentNameResult.java b/src/main/java/com/kustacks/kuring/notice/application/port/in/dto/NoticeDepartmentNameResult.java index 9dbc7bcda..5a4fe421a 100644 --- a/src/main/java/com/kustacks/kuring/notice/application/port/in/dto/NoticeDepartmentNameResult.java +++ b/src/main/java/com/kustacks/kuring/notice/application/port/in/dto/NoticeDepartmentNameResult.java @@ -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()); } } diff --git a/src/main/java/com/kustacks/kuring/notice/application/service/NoticeQueryService.java b/src/main/java/com/kustacks/kuring/notice/application/service/NoticeQueryService.java index 542147719..d93d4ed3a 100644 --- a/src/main/java/com/kustacks/kuring/notice/application/service/NoticeQueryService.java +++ b/src/main/java/com/kustacks/kuring/notice/application/service/NoticeQueryService.java @@ -22,6 +22,7 @@ import com.kustacks.kuring.notice.domain.DepartmentName; import com.kustacks.kuring.user.application.port.out.RootUserQueryPort; import com.kustacks.kuring.user.domain.RootUser; +import com.kustacks.kuring.worker.scrap.deptinfo.DeptInfo; import org.springframework.data.domain.PageRequest; import org.springframework.transaction.annotation.Transactional; @@ -48,18 +49,19 @@ public class NoticeQueryService implements NoticeQueryUseCase, NoticeCommentRead private final CommentQueryPort commentQueryPort; private final RootUserQueryPort rootUserQueryPort; private final List supportedCategoryNameList; - private final List supportedDepartmentNameList; + private final List deptInfoList; public NoticeQueryService( NoticeQueryPort noticeQueryPort, CommentQueryPort commentQueryPort, - RootUserQueryPort rootUserQueryPort + RootUserQueryPort rootUserQueryPort, + List deptInfoList ) { this.noticeQueryPort = noticeQueryPort; this.commentQueryPort = commentQueryPort; this.rootUserQueryPort = rootUserQueryPort; this.supportedCategoryNameList = Arrays.asList(CategoryName.values()); - this.supportedDepartmentNameList = Arrays.asList(DepartmentName.values()); + this.deptInfoList = deptInfoList; } @Override @@ -87,7 +89,7 @@ public List lookupSupportedCategories() { @Override public List lookupSupportedDepartments() { - return convertDepartmentNameDtos(supportedDepartmentNameList); + return convertDepartmentNameDtos(deptInfoList); } @Override @@ -191,9 +193,9 @@ private List getDepartmentNoticeRangeLookup(NoticeRange .toList(); } - private List convertDepartmentNameDtos(List departmentNames) { - return departmentNames.stream() - .filter(dn -> !dn.equals(DepartmentName.COMM_DESIGN)) + private List convertDepartmentNameDtos(List deptInfos) { + return deptInfos.stream() + .filter(dept -> !dept.getDepartmentName().equals(DepartmentName.COMM_DESIGN)) .map(NoticeDepartmentNameResult::from) .toList(); } diff --git a/src/main/java/com/kustacks/kuring/notice/domain/DepartmentName.java b/src/main/java/com/kustacks/kuring/notice/domain/DepartmentName.java index 60321a65b..ebfa8311f 100644 --- a/src/main/java/com/kustacks/kuring/notice/domain/DepartmentName.java +++ b/src/main/java/com/kustacks/kuring/notice/domain/DepartmentName.java @@ -77,6 +77,7 @@ 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", "수학교육과"), @@ -84,7 +85,7 @@ public enum DepartmentName { MUSIC_EDU("music_education", "music", "음악교육과"), EDU_TECH("education_technology", "edutech", "교육공학과"), ENGLISH_EDU("english_education", "englishedu", "영어교육과"), - EDUCATION("education", "edu", "교육학과"), + EDUCATION("education", "edu", "교직과"), ELE_EDU_CENTER("elective_education_center", "sgedu", "교양교육센터"), VOLUNTEER("volunteer_center", "kuvolunteer", "사회봉사센터"), diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/architecture/ArchitectureDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/architecture/ArchitectureDept.java index 6bceb5695..ea331e766 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/architecture/ArchitectureDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/architecture/ArchitectureDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.architecture; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class ArchitectureDept extends ArchitectureCollege { public ArchitectureDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public ArchitectureDept( this.noticeScrapInfo = new NoticeScrapInfo(ARCHITECTURE.getHostPrefix(), 397); this.departmentName = ARCHITECTURE; this.noticeGraduationInfo = new NoticeScrapInfo(ARCHITECTURE.getHostPrefix(), 748); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/IndustrialDesignDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/IndustrialDesignDept.java index ad08ef9bb..c654df03b 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/IndustrialDesignDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/IndustrialDesignDept.java @@ -1,6 +1,7 @@ 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.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class IndustrialDesignDept extends ArtDesignCollege { public IndustrialDesignDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public IndustrialDesignDept( this.noticeScrapInfo = new NoticeScrapInfo(IND_DESIGN.getHostPrefix(), 4017); this.departmentName = IND_DESIGN; this.noticeGraduationInfo = new NoticeScrapInfo(IND_DESIGN.getHostPrefix(), 5683); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/LivingDesignDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/LivingDesignDept.java index 0d74bacfd..ce8933ebe 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/LivingDesignDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/LivingDesignDept.java @@ -1,6 +1,7 @@ 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.LatestPageGraduateNoticeApiClient; 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; @@ -18,7 +19,8 @@ public class LivingDesignDept extends ArtDesignCollege { public LivingDesignDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -30,5 +32,6 @@ public LivingDesignDept( this.noticeScrapInfo = new NoticeScrapInfo(LIVING_DESIGN.getHostPrefix(), 962); this.departmentName = LIVING_DESIGN; this.noticeGraduationInfo = new NoticeScrapInfo(LIVING_DESIGN.getHostPrefix(), 487); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/MediaActingDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/MediaActingDept.java new file mode 100644 index 000000000..d8fc3e18a --- /dev/null +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/MediaActingDept.java @@ -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 siteIds = List.of(11299); + this.staffScrapInfo = new StaffScrapInfo(MEDIA_ACTING.getHostPrefix(), siteIds); + this.noticeScrapInfo = new NoticeScrapInfo(MEDIA_ACTING.getHostPrefix(), 493); + this.departmentName = MEDIA_ACTING; + } +} \ No newline at end of file diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/MovingImageFilmDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/MovingImageFilmDept.java index 80681242c..29617ac34 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/MovingImageFilmDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/art_design/MovingImageFilmDept.java @@ -1,6 +1,7 @@ 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.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class MovingImageFilmDept extends ArtDesignCollege { public MovingImageFilmDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public MovingImageFilmDept( this.noticeScrapInfo = new NoticeScrapInfo(MOV_IMAGE.getHostPrefix(), 491); this.departmentName = MOV_IMAGE; this.noticeGraduationInfo = new NoticeScrapInfo(MOV_IMAGE.getHostPrefix(), 5710); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/EducationalTechnologyDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/EducationalTechnologyDept.java index 2ea220eb9..b81166739 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/EducationalTechnologyDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/EducationalTechnologyDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.education; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class EducationalTechnologyDept extends EducationCollege { public EducationalTechnologyDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public EducationalTechnologyDept( this.noticeScrapInfo = new NoticeScrapInfo(EDU_TECH.getHostPrefix(), 4020); this.departmentName = EDU_TECH; this.noticeGraduationInfo = new NoticeScrapInfo(EDU_TECH.getHostPrefix(), 4092); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/EnglishEducationDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/EnglishEducationDept.java index 8ca1a7811..df6d1f28f 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/EnglishEducationDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/EnglishEducationDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.education; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class EnglishEducationDept extends EducationCollege { public EnglishEducationDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public EnglishEducationDept( this.noticeScrapInfo = new NoticeScrapInfo(ENGLISH_EDU.getHostPrefix(), 505); this.departmentName = ENGLISH_EDU; this.noticeGraduationInfo = new NoticeScrapInfo(ENGLISH_EDU.getHostPrefix(), 990); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/PhysicalEducationDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/PhysicalEducationDept.java index 7f07403d3..de7bf0e90 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/PhysicalEducationDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/education/PhysicalEducationDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.education; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class PhysicalEducationDept extends EducationCollege { public PhysicalEducationDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public PhysicalEducationDept( this.noticeScrapInfo = new NoticeScrapInfo(PHY_EDU.getHostPrefix(), 501); this.departmentName = PHY_EDU; this.noticeGraduationInfo = new NoticeScrapInfo(PHY_EDU.getHostPrefix(), 979); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/BiologicalDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/BiologicalDept.java index e9dbf5ed3..c001f5aef 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/BiologicalDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/BiologicalDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.engineering; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class BiologicalDept extends EngineeringCollege { public BiologicalDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public BiologicalDept( this.noticeScrapInfo = new NoticeScrapInfo(BIOLOGICAL.getHostPrefix(), 790); this.departmentName = BIOLOGICAL; this.noticeGraduationInfo = new NoticeScrapInfo(BIOLOGICAL.getHostPrefix(), 417); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ChemicalDivisionDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ChemicalDivisionDept.java index 62b0c3d42..3c30c9407 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ChemicalDivisionDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ChemicalDivisionDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.engineering; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class ChemicalDivisionDept extends EngineeringCollege { public ChemicalDivisionDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public ChemicalDivisionDept( this.noticeScrapInfo = new NoticeScrapInfo(CHEMI_DIV.getHostPrefix(), 409); this.departmentName = CHEMI_DIV; this.noticeGraduationInfo = new NoticeScrapInfo(CHEMI_DIV.getHostPrefix(), 769); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/CivilEnvironmentDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/CivilEnvironmentDept.java index 6f1fc6588..47c4d4d9f 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/CivilEnvironmentDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/CivilEnvironmentDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.engineering; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class CivilEnvironmentDept extends EngineeringCollege { public CivilEnvironmentDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public CivilEnvironmentDept( this.noticeScrapInfo = new NoticeScrapInfo(CIVIL_ENV.getHostPrefix(), 401); this.departmentName = CIVIL_ENV; this.noticeGraduationInfo = new NoticeScrapInfo(CIVIL_ENV.getHostPrefix(), 756); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ComputerScienceDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ComputerScienceDept.java index 800087074..9a66b9ac3 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ComputerScienceDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ComputerScienceDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.engineering; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class ComputerScienceDept extends EngineeringCollege { public ComputerScienceDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public ComputerScienceDept( this.noticeScrapInfo = new NoticeScrapInfo(COMPUTER.getHostPrefix(), 775); this.departmentName = COMPUTER; this.noticeGraduationInfo = new NoticeScrapInfo(COMPUTER.getHostPrefix(), 411); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ElectricalElectronicsDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ElectricalElectronicsDept.java index d741aa8bf..1bb230b61 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ElectricalElectronicsDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/ElectricalElectronicsDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.engineering; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class ElectricalElectronicsDept extends EngineeringCollege { public ElectricalElectronicsDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public ElectricalElectronicsDept( this.noticeScrapInfo = new NoticeScrapInfo(ELEC_ELEC.getHostPrefix(), 407); this.departmentName = ELEC_ELEC; this.noticeGraduationInfo = new NoticeScrapInfo(ELEC_ELEC.getHostPrefix(), 767); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/IndustrialDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/IndustrialDept.java index 7be82c118..6205b1cda 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/IndustrialDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/engineering/IndustrialDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.engineering; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class IndustrialDept extends EngineeringCollege { public IndustrialDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public IndustrialDept( this.noticeScrapInfo = new NoticeScrapInfo(INDUSTRIAL.getHostPrefix(), 413); this.departmentName = INDUSTRIAL; this.noticeGraduationInfo = new NoticeScrapInfo(INDUSTRIAL.getHostPrefix(), 778); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/BioMedicalScienceDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/BioMedicalScienceDept.java index dd1a8ec79..f909efd27 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/BioMedicalScienceDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/BioMedicalScienceDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.ku_integrated_science; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class BioMedicalScienceDept extends KuIntegratedScienceCollege { public BioMedicalScienceDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public BioMedicalScienceDept( this.noticeScrapInfo = new NoticeScrapInfo(BIO_MEDICAL.getHostPrefix(), 880); this.departmentName = BIO_MEDICAL; this.noticeGraduationInfo = new NoticeScrapInfo(BIO_MEDICAL.getHostPrefix(), 883); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/CosmeticsDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/CosmeticsDept.java index 554d41997..42c13baf5 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/CosmeticsDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/CosmeticsDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.ku_integrated_science; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class CosmeticsDept extends KuIntegratedScienceCollege { public CosmeticsDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public CosmeticsDept( this.noticeScrapInfo = new NoticeScrapInfo(COSMETICS.getHostPrefix(), 457); this.departmentName = COSMETICS; this.noticeGraduationInfo = new NoticeScrapInfo(COSMETICS.getHostPrefix(), 873); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/EnergyDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/EnergyDept.java index 14dd1b1d6..e46be64ec 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/EnergyDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/ku_integrated_science/EnergyDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.ku_integrated_science; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class EnergyDept extends KuIntegratedScienceCollege { public EnergyDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public EnergyDept( this.noticeScrapInfo = new NoticeScrapInfo(ENERGY.getHostPrefix(), 451); this.departmentName = ENERGY; this.noticeGraduationInfo = new NoticeScrapInfo(ENERGY.getHostPrefix(), 848); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/ChineseDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/ChineseDept.java index 4e5cce466..e7c365928 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/ChineseDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/ChineseDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.liberal_art; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class ChineseDept extends LiberalArtCollege { public ChineseDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public ChineseDept( this.noticeScrapInfo = new NoticeScrapInfo(CHINESE.getHostPrefix(), 353); this.departmentName = CHINESE; this.noticeGraduationInfo = new NoticeScrapInfo(CHINESE.getHostPrefix(), 709); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/CultureContentDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/CultureContentDept.java index 92d574bd5..4fe03cd6b 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/CultureContentDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/CultureContentDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.liberal_art; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class CultureContentDept extends LiberalArtCollege { public CultureContentDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public CultureContentDept( this.noticeScrapInfo = new NoticeScrapInfo(CULTURE_CONT.getHostPrefix(), 661); this.departmentName = CULTURE_CONT; this.noticeGraduationInfo = new NoticeScrapInfo(CULTURE_CONT.getHostPrefix(), 379); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/EnglishDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/EnglishDept.java index f98c364fa..418a0c4ca 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/EnglishDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/EnglishDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.liberal_art; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class EnglishDept extends LiberalArtCollege { public EnglishDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public EnglishDept( this.noticeScrapInfo = new NoticeScrapInfo(ENGLISH.getHostPrefix(), 347); this.departmentName = ENGLISH; this.noticeGraduationInfo = new NoticeScrapInfo(ENGLISH.getHostPrefix(), 350); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/GeologyDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/GeologyDept.java index a0d1b1436..923b365c3 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/GeologyDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/GeologyDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.liberal_art; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class GeologyDept extends LiberalArtCollege { public GeologyDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public GeologyDept( this.noticeScrapInfo = new NoticeScrapInfo(GEOLOGY.getHostPrefix(), 373); this.departmentName = GEOLOGY; this.noticeGraduationInfo = new NoticeScrapInfo(GEOLOGY.getHostPrefix(), 716); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/HistoryDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/HistoryDept.java index c235971c6..9dcce0886 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/HistoryDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/HistoryDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.liberal_art; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class HistoryDept extends LiberalArtCollege { public HistoryDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public HistoryDept( this.noticeScrapInfo = new NoticeScrapInfo(HISTORY.getHostPrefix(), 361); this.departmentName = HISTORY; this.noticeGraduationInfo = new NoticeScrapInfo(HISTORY.getHostPrefix(), 363); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/KoreanDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/KoreanDept.java index 0ddd61b31..2e99b1032 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/KoreanDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/KoreanDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.liberal_art; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class KoreanDept extends LiberalArtCollege { public KoreanDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public KoreanDept( this.noticeScrapInfo = new NoticeScrapInfo(KOREAN.getHostPrefix(), 334); this.departmentName = KOREAN; this.noticeGraduationInfo = new NoticeScrapInfo(KOREAN.getHostPrefix(), 332); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/MediaCommunicationDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/MediaCommunicationDept.java index b7605c3a5..1bbc9fe5f 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/MediaCommunicationDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/MediaCommunicationDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.liberal_art; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class MediaCommunicationDept extends LiberalArtCollege { public MediaCommunicationDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public MediaCommunicationDept( this.noticeScrapInfo = new NoticeScrapInfo(MEDIA_COMM.getHostPrefix(), 375); this.departmentName = MEDIA_COMM; this.noticeGraduationInfo = new NoticeScrapInfo(MEDIA_COMM.getHostPrefix(), 602); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/PhilosophyDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/PhilosophyDept.java index b87f6d873..7b879a193 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/PhilosophyDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/liberal_art/PhilosophyDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.liberal_art; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class PhilosophyDept extends LiberalArtCollege { public PhilosophyDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public PhilosophyDept( this.noticeScrapInfo = new NoticeScrapInfo(PHILOSOPHY.getHostPrefix(), 356); this.departmentName = PHILOSOPHY; this.noticeGraduationInfo = new NoticeScrapInfo(PHILOSOPHY.getHostPrefix(), 360); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/real_estate/RealEstateDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/real_estate/RealEstateDept.java index 6a4bfcb14..3669edcf6 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/real_estate/RealEstateDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/real_estate/RealEstateDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.real_estate; import com.kustacks.kuring.worker.parser.notice.RealEstateNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; import com.kustacks.kuring.worker.scrap.client.notice.RealEstateNoticeApiClient; import com.kustacks.kuring.worker.scrap.client.notice.property.LatestPageNoticeProperties; import com.kustacks.kuring.worker.scrap.deptinfo.NoticeScrapInfo; @@ -16,7 +17,8 @@ public class RealEstateDept extends RealEstateCollege { public RealEstateDept(RealEstateNoticeApiClient realEstateNoticeApiClient, RealEstateNoticeHtmlParser realEstateNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties) { + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient) { super(); this.noticeApiClient = realEstateNoticeApiClient; this.htmlParser = realEstateNoticeHtmlParser; @@ -27,5 +29,6 @@ public RealEstateDept(RealEstateNoticeApiClient realEstateNoticeApiClient, this.noticeScrapInfo = new NoticeScrapInfo(REAL_ESTATE.getHostPrefix(), 1563); this.departmentName = REAL_ESTATE; this.noticeGraduationInfo = new NoticeScrapInfo(REAL_ESTATE.getHostPrefix(), 1565); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/AnimalScienceTechnologyDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/AnimalScienceTechnologyDept.java index e7b108ab9..9bf0f6299 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/AnimalScienceTechnologyDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/AnimalScienceTechnologyDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.sanghuo_biology; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class AnimalScienceTechnologyDept extends SanghuoBiologyCollege { public AnimalScienceTechnologyDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public AnimalScienceTechnologyDept( this.noticeScrapInfo = new NoticeScrapInfo(ANIMAL_SCIENCE.getHostPrefix(), 914); this.departmentName = ANIMAL_SCIENCE; this.noticeGraduationInfo = new NoticeScrapInfo(ANIMAL_SCIENCE.getHostPrefix(), 469); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/BiologicalSciencesDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/BiologicalSciencesDept.java index 5c5219fed..d4df68cbd 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/BiologicalSciencesDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/BiologicalSciencesDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.sanghuo_biology; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -18,7 +19,8 @@ public class BiologicalSciencesDept extends SanghuoBiologyCollege { public BiologicalSciencesDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -30,5 +32,6 @@ public BiologicalSciencesDept( this.noticeScrapInfo = new NoticeScrapInfo(BIO_SCIENCE.getHostPrefix(), 909); this.departmentName = BIO_SCIENCE; this.noticeGraduationInfo = new NoticeScrapInfo(BIO_SCIENCE.getHostPrefix(), 905); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/FoodMarketingSafetyDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/FoodMarketingSafetyDept.java index 4dbdc41fd..90b08b408 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/FoodMarketingSafetyDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/sanghuo_biology/FoodMarketingSafetyDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.sanghuo_biology; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class FoodMarketingSafetyDept extends SanghuoBiologyCollege { public FoodMarketingSafetyDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public FoodMarketingSafetyDept( this.noticeScrapInfo = new NoticeScrapInfo(FOOD_MARKETING.getHostPrefix(), 929); this.departmentName = FOOD_MARKETING; this.noticeGraduationInfo = new NoticeScrapInfo(FOOD_MARKETING.getHostPrefix(), 475); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/science/MathematicsDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/science/MathematicsDept.java index 65d1158a8..0e2ab383e 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/science/MathematicsDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/science/MathematicsDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.science; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class MathematicsDept extends ScienceCollege { public MathematicsDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public MathematicsDept( this.noticeScrapInfo = new NoticeScrapInfo(MATH.getHostPrefix(), 727); this.departmentName = MATH; this.noticeGraduationInfo = new NoticeScrapInfo(MATH.getHostPrefix(), 391); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/science/PhysicsDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/science/PhysicsDept.java index 2ff07d0d4..3c41218fa 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/science/PhysicsDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/science/PhysicsDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.science; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -16,7 +17,8 @@ public class PhysicsDept extends ScienceCollege { public PhysicsDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -28,5 +30,6 @@ public PhysicsDept( this.noticeScrapInfo = new NoticeScrapInfo(PHYSICS.getHostPrefix(), 393); this.departmentName = PHYSICS; this.noticeGraduationInfo = new NoticeScrapInfo(PHYSICS.getHostPrefix(), 735); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/InternationalTradeDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/InternationalTradeDept.java index 220cecedb..814e704b1 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/InternationalTradeDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/InternationalTradeDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.social_science; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class InternationalTradeDept extends SocialSciencesCollege { public InternationalTradeDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public InternationalTradeDept( this.noticeScrapInfo = new NoticeScrapInfo(INT_TRADE.getHostPrefix(), 429); this.departmentName = INT_TRADE; this.noticeGraduationInfo = new NoticeScrapInfo(INT_TRADE.getHostPrefix(), 815); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/PoliticalScienceDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/PoliticalScienceDept.java index 36be5fa70..c776d696c 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/PoliticalScienceDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/PoliticalScienceDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.social_science; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class PoliticalScienceDept extends SocialSciencesCollege { public PoliticalScienceDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public PoliticalScienceDept( this.noticeScrapInfo = new NoticeScrapInfo(POLITICS.getHostPrefix(), 803); this.departmentName = POLITICS; this.noticeGraduationInfo = new NoticeScrapInfo(POLITICS.getHostPrefix(), 421); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/PublicAdministrationDept.java b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/PublicAdministrationDept.java index 83a3187d6..f5da91654 100644 --- a/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/PublicAdministrationDept.java +++ b/src/main/java/com/kustacks/kuring/worker/scrap/deptinfo/social_science/PublicAdministrationDept.java @@ -1,6 +1,7 @@ package com.kustacks.kuring.worker.scrap.deptinfo.social_science; import com.kustacks.kuring.worker.parser.notice.LatestPageNoticeHtmlParser; +import com.kustacks.kuring.worker.scrap.client.notice.LatestPageGraduateNoticeApiClient; 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; @@ -17,7 +18,8 @@ public class PublicAdministrationDept extends SocialSciencesCollege { public PublicAdministrationDept( LatestPageNoticeApiClient latestPageNoticeApiClient, LatestPageNoticeHtmlParser latestPageNoticeHtmlParser, - LatestPageNoticeProperties latestPageNoticeProperties + LatestPageNoticeProperties latestPageNoticeProperties, + LatestPageGraduateNoticeApiClient latestPageGraduateNoticeApiClient ) { super(); this.noticeApiClient = latestPageNoticeApiClient; @@ -29,5 +31,6 @@ public PublicAdministrationDept( this.noticeScrapInfo = new NoticeScrapInfo(ADMINISTRATION.getHostPrefix(), 855); this.departmentName = ADMINISTRATION; this.noticeGraduationInfo = new NoticeScrapInfo(ADMINISTRATION.getHostPrefix(), 427); + this.latestPageGraduateNoticeApiClient = latestPageGraduateNoticeApiClient; } } diff --git a/src/main/java/com/kustacks/kuring/worker/update/notice/DepartmentGraduationNoticeUpdater.java b/src/main/java/com/kustacks/kuring/worker/update/notice/DepartmentGraduationNoticeUpdater.java index be7bda345..4b034aaf8 100644 --- a/src/main/java/com/kustacks/kuring/worker/update/notice/DepartmentGraduationNoticeUpdater.java +++ b/src/main/java/com/kustacks/kuring/worker/update/notice/DepartmentGraduationNoticeUpdater.java @@ -112,8 +112,8 @@ private List compareLatestAndUpdateDB(List saveNewNotices(List scrapResults, List savedArticleIds, DepartmentName departmentNameEnum, boolean important, boolean graduate) { - List newNotices = noticeUpdateSupport.filteringSoonSaveDepartmentNotices(scrapResults, savedArticleIds, departmentNameEnum, important, graduate); + private List saveNewNotices(List scrapResults, List savedArticleIds, DepartmentName departmentNameEnum, boolean important, boolean graduated) { + List newNotices = noticeUpdateSupport.filteringSoonSaveDepartmentNotices(scrapResults, savedArticleIds, departmentNameEnum, important, graduated); noticeCommandPort.saveAllDepartmentNotices(newNotices); return newNotices; } @@ -141,8 +141,8 @@ private void compareAllAndUpdateDB(List scrapResults, St } } - private void synchronizationWithDb(List scrapResults, List savedArticleIds, DepartmentName departmentNameEnum, boolean important, boolean graduate) { - List newNotices = noticeUpdateSupport.filteringSoonSaveDepartmentNotices(scrapResults, savedArticleIds, departmentNameEnum, important, graduate); + private void synchronizationWithDb(List scrapResults, List savedArticleIds, DepartmentName departmentNameEnum, boolean important, boolean graduated) { + List newNotices = noticeUpdateSupport.filteringSoonSaveDepartmentNotices(scrapResults, savedArticleIds, departmentNameEnum, important, graduated); List latestNoticeIds = noticeUpdateSupport.extractDepartmentNoticeIds(scrapResults); diff --git a/src/test/java/com/kustacks/kuring/acceptance/CategoryAcceptanceTest.java b/src/test/java/com/kustacks/kuring/acceptance/CategoryAcceptanceTest.java index 3a0719090..60627b49a 100644 --- a/src/test/java/com/kustacks/kuring/acceptance/CategoryAcceptanceTest.java +++ b/src/test/java/com/kustacks/kuring/acceptance/CategoryAcceptanceTest.java @@ -12,7 +12,14 @@ import java.util.List; -import static com.kustacks.kuring.acceptance.CategoryStep.*; +import static com.kustacks.kuring.acceptance.CategoryStep.사용자가_구독한_카테고리_목록_조회_요청; +import static com.kustacks.kuring.acceptance.CategoryStep.지원하는_카테고리_조회_요청; +import static com.kustacks.kuring.acceptance.CategoryStep.카테고리_구독_요청; +import static com.kustacks.kuring.acceptance.CategoryStep.카테고리_구독_요청_응답_확인; +import static com.kustacks.kuring.acceptance.CategoryStep.카테고리_수정_요청; +import static com.kustacks.kuring.acceptance.CategoryStep.카테고리_조회_요청_응답_확인; +import static com.kustacks.kuring.acceptance.CategoryStep.학과_조회_요청; +import static com.kustacks.kuring.acceptance.CategoryStep.학과_조회_응답_확인; import static com.kustacks.kuring.acceptance.CommonStep.실패_응답_확인; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -53,7 +60,7 @@ void look_up_department_list() { var 학과_조회_요청_응답 = 학과_조회_요청(); // then - 학과_조회_응답_확인(학과_조회_요청_응답, 62); + 학과_조회_응답_확인(학과_조회_요청_응답, 63); } /** diff --git a/src/test/java/com/kustacks/kuring/worker/update/notice/DepartmentNoticeUpdaterTest.java b/src/test/java/com/kustacks/kuring/worker/update/notice/DepartmentNoticeUpdaterTest.java index 4f9a82c8f..35b581135 100644 --- a/src/test/java/com/kustacks/kuring/worker/update/notice/DepartmentNoticeUpdaterTest.java +++ b/src/test/java/com/kustacks/kuring/worker/update/notice/DepartmentNoticeUpdaterTest.java @@ -64,7 +64,7 @@ private static List createDepartmentNoticesFixture() { List importantNoticeList = new ArrayList<>(); List normalNoticeList = new ArrayList<>(); - for(int i = 0; i < 30; i++) { + for (int i = 0; i < 30; i++) { CommonNoticeFormatDto importantFormatDto = CommonNoticeFormatDto.builder().articleId(String.valueOf(i)).updatedDate("2021-01-01").subject("important" + i) .postedDate("2021-01-01").fullUrl("https://library.konkuk.ac.kr/library-guide/bulletins/important/71921") .important(true).build(); @@ -79,4 +79,20 @@ private static List createDepartmentNoticesFixture() { result.add(new ComplexNoticeFormatDto(importantNoticeList, normalNoticeList)); return result; } -} + + @DisplayName("학과별(학사) 전체 공지 업데이트 테스트") + @Test + void updateAll_undergraduate_test() throws InterruptedException { + // given + doReturn(createDepartmentNoticesFixture()).when(scrapperTemplate).scrap(any(), any()); + doNothing().when(firebaseService).sendNotifications(anyList()); + + // when + departmentNoticeUpdater.updateAll(); + noticeUpdaterThreadTaskExecutor.getThreadPoolExecutor().awaitTermination(2, TimeUnit.SECONDS); + + // then + Long count = noticeQueryPort.count(); + assertThat(count).isEqualTo(3720); + } +} \ No newline at end of file