From a863bf371307ff1d697985a28068ffdfbf421bcd Mon Sep 17 00:00:00 2001 From: Ju Do Hyun Date: Thu, 10 Oct 2024 23:30:01 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FIX]=20=EB=82=A0=EC=A7=9C=20=EA=B8=B0?= =?UTF-8?q?=EC=A4=80=20=EC=A0=95=EB=A0=AC=20=ED=9B=84=20=EA=B3=B5=EC=A7=80?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=A0=84=EC=86=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/notice/repository/BiddingNoticeRepository.java | 2 +- .../domain/notice/repository/CareerNoticeRepository.java | 2 +- .../domain/notice/repository/RevisionNoticeRepository.java | 2 +- .../domain/notice/repository/ScholarshipNoticeRepository.java | 3 +++ .../domain/notice/repository/StudentActsNoticeRepository.java | 3 +++ .../domain/notice/service/BiddingNoticeService.java | 2 +- .../thinkerbell/domain/notice/service/CareerNoticeService.java | 2 +- .../domain/notice/service/RevisionNoticeService.java | 2 +- .../domain/notice/service/ScholarshipNoticeService.java | 2 +- .../domain/notice/service/StudentActsNoticeService.java | 2 +- 10 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/BiddingNoticeRepository.java b/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/BiddingNoticeRepository.java index 3a23aef..31ac7eb 100644 --- a/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/BiddingNoticeRepository.java +++ b/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/BiddingNoticeRepository.java @@ -15,6 +15,6 @@ public interface BiddingNoticeRepository extends JpaRepository { @Query("SELECT n FROM BiddingNotice n WHERE n.title LIKE CONCAT('%', :keyword, '%')") List searchByTitle(@Param("keyword") String keyword); - + Page findAllByOrderByPubDateDesc(Pageable pageable); BiddingNotice findOneById(Long noticeID); } diff --git a/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/CareerNoticeRepository.java b/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/CareerNoticeRepository.java index 7e8c6f2..c9cda11 100644 --- a/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/CareerNoticeRepository.java +++ b/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/CareerNoticeRepository.java @@ -17,5 +17,5 @@ public interface CareerNoticeRepository extends JpaRepository searchByTitle(@Param("keyword") String keyword); CareerNotice findOneById(Long noticeID); List findTop3ByOrderByPubDateDesc(); - + Page findAllByOrderByPubDateDesc(Pageable pageable); } diff --git a/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/RevisionNoticeRepository.java b/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/RevisionNoticeRepository.java index 58aa473..858fe45 100644 --- a/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/RevisionNoticeRepository.java +++ b/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/RevisionNoticeRepository.java @@ -15,6 +15,6 @@ public interface RevisionNoticeRepository extends JpaRepository { @Query("SELECT n FROM RevisionNotice n WHERE n.title LIKE CONCAT('%', :keyword, '%')") List searchByTitle(@Param("keyword") String keyword); - + Page findAllByOrderByPubDateDesc(Pageable pageable); RevisionNotice findOneById(Long noticeID); } diff --git a/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/ScholarshipNoticeRepository.java b/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/ScholarshipNoticeRepository.java index 800e3f0..b9e5837 100644 --- a/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/ScholarshipNoticeRepository.java +++ b/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/ScholarshipNoticeRepository.java @@ -2,6 +2,8 @@ import depth.mvp.thinkerbell.domain.notice.entity.AcademicNotice; import depth.mvp.thinkerbell.domain.notice.entity.ScholarshipNotice; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -14,6 +16,7 @@ public interface ScholarshipNoticeRepository extends JpaRepository searchByTitle(@Param("keyword") String keyword); ScholarshipNotice findOneById(Long noticeID); + Page findAllByOrderByPubDateDesc(Pageable pageable); List findTop3ByOrderByPubDateDesc(); } diff --git a/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/StudentActsNoticeRepository.java b/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/StudentActsNoticeRepository.java index 19fe8f2..3d055af 100644 --- a/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/StudentActsNoticeRepository.java +++ b/src/main/java/depth/mvp/thinkerbell/domain/notice/repository/StudentActsNoticeRepository.java @@ -1,5 +1,7 @@ package depth.mvp.thinkerbell.domain.notice.repository; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import depth.mvp.thinkerbell.domain.notice.entity.StudentActsNotice; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -13,5 +15,6 @@ public interface StudentActsNoticeRepository extends JpaRepository { @Query("SELECT n FROM StudentActsNotice n WHERE n.title LIKE CONCAT('%', :keyword, '%')") List searchByTitle(@Param("keyword") String keyword); + Page findAllByOrderByPubDateDesc(Pageable pageable); StudentActsNotice findOneById(Long noticeID); } diff --git a/src/main/java/depth/mvp/thinkerbell/domain/notice/service/BiddingNoticeService.java b/src/main/java/depth/mvp/thinkerbell/domain/notice/service/BiddingNoticeService.java index 89b39b6..8f132a2 100644 --- a/src/main/java/depth/mvp/thinkerbell/domain/notice/service/BiddingNoticeService.java +++ b/src/main/java/depth/mvp/thinkerbell/domain/notice/service/BiddingNoticeService.java @@ -28,7 +28,7 @@ public BiddingNoticeService(BookmarkService bookmarkService, BiddingNoticeReposi public PaginationDTO getAllBiddingNotices(int page, int size, String ssaid) throws NotFoundException { Pageable pageable = PageRequest.of(page, size); - Page resultPage = biddingNoticeRepository.findAll(pageable); + Page resultPage = biddingNoticeRepository.findAllByOrderByPubDateDesc(pageable); List bookmarkedNoticeIds = bookmarkService.getBookmark(ssaid, this.getClass().getSimpleName().replace("Service", "")); diff --git a/src/main/java/depth/mvp/thinkerbell/domain/notice/service/CareerNoticeService.java b/src/main/java/depth/mvp/thinkerbell/domain/notice/service/CareerNoticeService.java index 503dbf2..1c4bcc6 100644 --- a/src/main/java/depth/mvp/thinkerbell/domain/notice/service/CareerNoticeService.java +++ b/src/main/java/depth/mvp/thinkerbell/domain/notice/service/CareerNoticeService.java @@ -28,7 +28,7 @@ public CareerNoticeService(BookmarkService bookmarkService, CareerNoticeReposito public PaginationDTO getAllCareerNotices(int page, int size, String ssaid) throws NotFoundException { Pageable pageable = PageRequest.of(page, size); - Page resultPage = careerNoticeRepository.findAll(pageable); + Page resultPage = careerNoticeRepository.findAllByOrderByPubDateDesc(pageable); List bookmarkedNoticeIds = bookmarkService.getBookmark(ssaid, this.getClass().getSimpleName().replace("Service", "")); diff --git a/src/main/java/depth/mvp/thinkerbell/domain/notice/service/RevisionNoticeService.java b/src/main/java/depth/mvp/thinkerbell/domain/notice/service/RevisionNoticeService.java index 7a9025b..42c51f2 100644 --- a/src/main/java/depth/mvp/thinkerbell/domain/notice/service/RevisionNoticeService.java +++ b/src/main/java/depth/mvp/thinkerbell/domain/notice/service/RevisionNoticeService.java @@ -31,7 +31,7 @@ public RevisionNoticeService(BookmarkService bookmarkService, RevisionNoticeRepo public PaginationDTO getAllRevisionNotices(int page, int size, String ssaid) throws NotFoundException { Pageable pageable = PageRequest.of(page, size); - Page resultPage = revisionNoticeRepository.findAll(pageable); + Page resultPage = revisionNoticeRepository.findAllByOrderByPubDateDesc(pageable); List bookmarkedNoticeIds = bookmarkService.getBookmark(ssaid, this.getClass().getSimpleName().replace("Service", "")); diff --git a/src/main/java/depth/mvp/thinkerbell/domain/notice/service/ScholarshipNoticeService.java b/src/main/java/depth/mvp/thinkerbell/domain/notice/service/ScholarshipNoticeService.java index efdb9a2..b7bf050 100644 --- a/src/main/java/depth/mvp/thinkerbell/domain/notice/service/ScholarshipNoticeService.java +++ b/src/main/java/depth/mvp/thinkerbell/domain/notice/service/ScholarshipNoticeService.java @@ -28,7 +28,7 @@ public ScholarshipNoticeService(BookmarkService bookmarkService, ScholarshipNoti public PaginationDTO getAllScholarshipNotices(int page, int size, String ssaid) throws NotFoundException { Pageable pageable = PageRequest.of(page, size); - Page resultPage = scholarshipNoticeRepository.findAll(pageable); + Page resultPage = scholarshipNoticeRepository.findAllByOrderByPubDateDesc(pageable); List bookmarkedNoticeIds = bookmarkService.getBookmark(ssaid, this.getClass().getSimpleName().replace("Service", "")); diff --git a/src/main/java/depth/mvp/thinkerbell/domain/notice/service/StudentActsNoticeService.java b/src/main/java/depth/mvp/thinkerbell/domain/notice/service/StudentActsNoticeService.java index e97191b..bedc968 100644 --- a/src/main/java/depth/mvp/thinkerbell/domain/notice/service/StudentActsNoticeService.java +++ b/src/main/java/depth/mvp/thinkerbell/domain/notice/service/StudentActsNoticeService.java @@ -29,7 +29,7 @@ public StudentActsNoticeService(BookmarkService bookmarkService, StudentActsNoti public PaginationDTO getAllStudentActsNotices(int page, int size, String ssaid) throws NotFoundException { Pageable pageable = PageRequest.of(page, size); - Page resultPage = studentActsNoticeRepository.findAll(pageable); + Page resultPage = studentActsNoticeRepository.findAllByOrderByPubDateDesc(pageable); List bookmarkedNoticeIds = bookmarkService.getBookmark(ssaid, this.getClass().getSimpleName().replace("Service", "")); From da578e18147615e0a4be8f8560c55713f6f583fa Mon Sep 17 00:00:00 2001 From: Ju Do Hyun Date: Thu, 10 Oct 2024 23:30:12 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[FIX]=20=EC=95=8C=EB=A6=BC=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depth/mvp/thinkerbell/domain/user/service/FCMService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/depth/mvp/thinkerbell/domain/user/service/FCMService.java b/src/main/java/depth/mvp/thinkerbell/domain/user/service/FCMService.java index becb811..30481f4 100644 --- a/src/main/java/depth/mvp/thinkerbell/domain/user/service/FCMService.java +++ b/src/main/java/depth/mvp/thinkerbell/domain/user/service/FCMService.java @@ -41,7 +41,7 @@ public void sendScheduleMessage(User user, String title) { try{ String cutTitle = cutTitle(title, 40); - String messageBody = String.format("띡~πŸ”” μ¦κ²¨μ°ΎκΈ°ν•œ 학사일정이(κ°€) μ‹œμž‘λμ–΄μš”!\n%s", + String messageBody = String.format("띡~πŸ”” μ¦κ²¨μ°ΎκΈ°ν•œ 학사일정이 μ‹œμž‘λμ–΄μš”!\n%s", cutTitle); Message message = Message.builder()