Merge pull request #346 from prgrms-web-devcourse-final-project/develop

tlswltjq · web-flow · commit 571ac5df5fbd · 2025-10-14T17:56:58.000+09:00
Feat : 좋아요 상태 추가 (#344)
diff --git a/back/src/main/java/com/back/domain/mentoring/mentoring/repository/ReviewRepository.java b/back/src/main/java/com/back/domain/mentoring/mentoring/repository/ReviewRepository.java
@@ -34,7 +34,6 @@ Double calculateMentoringAverageRating(
         SELECT r
         FROM Review r
         WHERE r.reservation.mentoring.id = :mentoringId
-        ORDER BY r.createDate DESC
         """)
     Page<Review> findAllByMentoringId(
         @Param("mentoringId") Long mentoringId,
diff --git a/back/src/main/java/com/back/domain/mentoring/mentoring/service/ReviewService.java b/back/src/main/java/com/back/domain/mentoring/mentoring/service/ReviewService.java
@@ -14,6 +14,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,7 +27,11 @@ public class ReviewService {
 
     @Transactional(readOnly = true)
     public Page<ReviewResponse> getReviews(Long mentoringId, int page, int size) {
-        Pageable pageable = PageRequest.of(page, size);
+        Pageable pageable = PageRequest.of(
+            page,
+            size,
+            Sort.by(Sort.Direction.DESC, "createDate")
+        );
 
         return reviewRepository.findAllByMentoringId(mentoringId, pageable)
             .map(ReviewResponse::from);
diff --git a/back/src/main/java/com/back/domain/mentoring/reservation/repository/ReservationRepository.java b/back/src/main/java/com/back/domain/mentoring/reservation/repository/ReservationRepository.java
@@ -33,7 +33,6 @@ Optional<Reservation> findByIdAndMember(
         SELECT r
         FROM Reservation r
         WHERE r.mentor.member.id = :memberId
-        ORDER BY r.mentorSlot.startDateTime DESC
         """)
     Page<Reservation> findAllByMentorMember(
         @Param("memberId") Long memberId,
@@ -44,7 +43,6 @@ Page<Reservation> findAllByMentorMember(
         SELECT r
         FROM Reservation r
         WHERE r.mentee.member = :member
-        ORDER BY r.mentorSlot.startDateTime DESC
         """)
     Page<Reservation> findAllByMenteeMember(
         @Param("member") Member member,
diff --git a/back/src/main/java/com/back/domain/mentoring/reservation/service/ReservationService.java b/back/src/main/java/com/back/domain/mentoring/reservation/service/ReservationService.java
@@ -23,6 +23,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,7 +40,11 @@ public class ReservationService {
 
     @Transactional(readOnly = true)
     public Page<ReservationDto> getReservations(Member member, int page, int size) {
-        Pageable pageable = PageRequest.of(page, size);
+        Pageable pageable = PageRequest.of(
+            page,
+            size,
+            Sort.by(Sort.Direction.DESC, "mentorSlot.startDateTime")
+        );
 
         Page<Reservation> reservations;
 
diff --git a/back/src/main/java/com/back/domain/mentoring/slot/service/MentorSlotService.java b/back/src/main/java/com/back/domain/mentoring/slot/service/MentorSlotService.java
@@ -157,15 +157,13 @@ private LocalDate findNextOrSameDayOfWeek(LocalDate startDate, DayOfWeek targetD
      * 매 시간 30분에 지난 슬롯 만기 처리
      * - AVAILABLE -> EXPIRED
      */
-    @Scheduled(cron = "0 */30 * * * *")
+    @Scheduled(cron = "0 */30 * * * *", zone = "Asia/Seoul")
     @Transactional
     public void expirePassedSlots() {
         LocalDateTime now = LocalDateTime.now();
-
         int updateCount = mentorSlotRepository.expirePassedSlots(now);
-        if (updateCount > 0) {
-            log.info("만료된 슬롯 {}개 업데이트 완료 at {}", updateCount, now);
-        }
+
+        log.info("만료된 슬롯 {}개 업데이트 완료 at {}", updateCount, now);
     }
 
 
diff --git a/back/src/main/java/com/back/domain/news/like/service/NewsLikeService.java b/back/src/main/java/com/back/domain/news/like/service/NewsLikeService.java
@@ -33,4 +33,10 @@ public long getLikeCount(Long newsId) {
                 .orElseThrow(() -> new ServiceException("404", "해당 뉴스를 찾을 수 없습니다."));
         return newsLikeRepository.countByNews(news);
     }
+
+    public boolean hasUserLikedNews(Member member, Long newsId) {
+        News news = newsRepository.findById(newsId)
+                .orElseThrow(() -> new ServiceException("404", "해당 뉴스를 찾을 수 없습니다."));
+        return newsLikeRepository.findByMemberAndNews(member, news).isPresent();
+    }
 }
diff --git a/back/src/main/java/com/back/domain/news/news/controller/NewsController.java b/back/src/main/java/com/back/domain/news/news/controller/NewsController.java
@@ -43,10 +43,19 @@ public RsData<NewsCreateResponse> createNews(@RequestBody NewsCreateRequest requ
 
     @GetMapping("{newsId}")
     @Operation(summary = "뉴스 단건 조회", description = "특정 ID의 뉴스를 읽어옵니다.")
-    public RsData<NewsGetResponse> getNews(@PathVariable("newsId") Long newsId) {
+    public RsData<NewsGetWithLikeResponse> getNews(@PathVariable("newsId") Long newsId) {
+        Member member = rq.getActorFromDb().get();
+        if (member == null) {
+            return new RsData<>("401", "로그인 후 이용해주세요.", null);
+        }
+        if (member.getRole() != Member.Role.ADMIN) {
+            return new RsData<>("403", "권한이 없습니다.", null);
+        }
+        boolean hasUserLikedNews = newsLikeService.hasUserLikedNews(member, newsId);
+
         News news = newsService.getNewsById(newsId);
         newsService.incrementViews(news);
-        NewsGetResponse response = new NewsGetResponse(news);
+        NewsGetWithLikeResponse response = new NewsGetWithLikeResponse(news, hasUserLikedNews);
         return new RsData<>("200", "뉴스 읽어오기 완료", response);
     }
 
@@ -55,6 +64,13 @@ public RsData<NewsGetResponse> getNews(@PathVariable("newsId") Long newsId) {
     public RsData<List<NewsGetResponse>> getNewsList(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size) {
+        Member member = rq.getActorFromDb().get();
+        if (member == null) {
+            return new RsData<>("401", "로그인 후 이용해주세요.", null);
+        }
+        if (member.getRole() != Member.Role.ADMIN) {
+            return new RsData<>("403", "권한이 없습니다.", null);
+        }
 
         Page<News> newsPage = newsService.getNewsByPage(page, size);
 
@@ -106,7 +122,7 @@ public RsData<NewsUpdateResponse> modifyNews(@PathVariable("newsId") Long newsId
     @Operation(summary = "뉴스 삭제", description = "특정 ID의 뉴스를 삭제합니다. ADMIN 사용자만 접근할 수 있습니다.")
     public RsData<?> deleteNews(@PathVariable("newsId") Long newsId) {
         Member member = rq.getActorFromDb().get();
-        if (member == null){
+        if (member == null) {
             return new RsData<>("401", "로그인 후 이용해주세요.", null);
         }
         if (member.getRole() != Member.Role.ADMIN) {
diff --git a/back/src/main/java/com/back/domain/news/news/dto/NewsGetWithLikeResponse.java b/back/src/main/java/com/back/domain/news/news/dto/NewsGetWithLikeResponse.java
@@ -0,0 +1,29 @@
+package com.back.domain.news.news.dto;
+
+import com.back.domain.news.news.entity.News;
+
+import java.time.LocalDateTime;
+
+public record NewsGetWithLikeResponse(
+        Long id,
+        String title,
+        String videoUuid,
+        String content,
+        String authorId,
+        boolean userLikeStatus,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt
+) {
+    public NewsGetWithLikeResponse(News news, boolean userLikeStatus) {
+        this(
+                news.getId(),
+                news.getTitle(),
+                news.getVideo().getUuid(),
+                news.getContent(),
+                news.getMember().getName(),
+                userLikeStatus,
+                news.getCreateDate(),
+                news.getModifyDate()
+        );
+    }
+}
diff --git a/back/src/test/java/com/back/domain/mentoring/reservation/service/ReservationServiceTest.java b/back/src/test/java/com/back/domain/mentoring/reservation/service/ReservationServiceTest.java
@@ -33,10 +33,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.*;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import java.time.LocalDateTime;
@@ -96,16 +93,16 @@ void getReservations() {
             // given
             int page = 1;
             int size = 5;
-            Pageable pageable = PageRequest.of(page, size);
-
             Page<Reservation> reservationPage = new PageImpl<>(
                 List.of(reservation),
-                pageable,
+                PageRequest.of(page, size),
                 10
             );
 
-            when(reservationRepository.findAllByMentorMember(mentor.getMember().getId(), pageable))
-                .thenReturn(reservationPage);
+            when(reservationRepository.findAllByMentorMember(
+                eq(mentor.getMember().getId()),
+                any(Pageable.class)
+            )).thenReturn(reservationPage);
 
             // when
             Page<ReservationDto> result = reservationService.getReservations(
@@ -119,7 +116,10 @@ void getReservations() {
             assertThat(result.getSize()).isEqualTo(5);
             assertThat(result.getTotalElements()).isEqualTo(10);
             assertThat(result.getTotalPages()).isEqualTo(2);
-            verify(reservationRepository).findAllByMentorMember(mentor.getMember().getId(), pageable);
+            verify(reservationRepository).findAllByMentorMember(
+                eq(mentor.getMember().getId()),
+                any(Pageable.class)
+            );
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,10 @@ public long getLikeCount(Long newsId) {`
`33`	`33`	`.orElseThrow(() -> new ServiceException("404", "해당 뉴스를 찾을 수 없습니다."));`
`34`	`34`	`return newsLikeRepository.countByNews(news);`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ public boolean hasUserLikedNews(Member member, Long newsId) {`
	`38`	`+ News news = newsRepository.findById(newsId)`
	`39`	`+ .orElseThrow(() -> new ServiceException("404", "해당 뉴스를 찾을 수 없습니다."));`
	`40`	`+ return newsLikeRepository.findByMemberAndNews(member, news).isPresent();`
	`41`	`+ }`
`36`	`42`	`}`