Merge pull request #179 from SMU-SATTO/feature/#21

✨ [FEATURE] 이벤트 참여 조회 Dto 속성 추가
SMU-SATTO · Aug 28, 2024 · b696d7e · b696d7e
2 parents 1ef01b2 + 81835ee
commit b696d7e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/com/example/satto/domain/event/controller/EventController.java b/src/main/java/com/example/satto/domain/event/controller/EventController.java
@@ -35,7 +35,7 @@ public BaseResponse<List<ContestResponseDto>> getContestParticipants(
             @AuthenticationPrincipal Users user,
             @PathVariable(name = "category") String category
     ) {
-        return BaseResponse.onSuccess(eventService.getContestParticipants(category));
+        return BaseResponse.onSuccess(eventService.getContestParticipants(user, category));
     }
 
     @Operation(method = "POST", summary = "이벤트 좋아요 누르기", description = "좋아요 상태면 좋아요 취소, 좋아요 상태가 아니면 좋아요 부여")

diff --git a/src/main/java/com/example/satto/domain/event/dto/ContestResponseDto.java b/src/main/java/com/example/satto/domain/event/dto/ContestResponseDto.java
@@ -8,9 +8,12 @@
 public record ContestResponseDto(
         Long contestId,
         String name,
+        String studentId,
         String photo,
         Long likeCount,
         Long dislikeCount,
+        boolean isLiked,
+        boolean isDisliked,
         LocalDateTime createdAt,
         LocalDateTime updatedAt
 ) {

diff --git a/src/main/java/com/example/satto/domain/event/repository/ContestDislikeRepository.java b/src/main/java/com/example/satto/domain/event/repository/ContestDislikeRepository.java
@@ -11,4 +11,6 @@ public interface ContestDislikeRepository extends JpaRepository<ContestDislike,
     Optional<ContestDislike> findByUserAndContest(Users user, Contest contest);
 
     Long countByContest(Contest photoContest);
+
+    boolean existsByUserAndContest(Users user, Contest contest);
 }
diff --git a/src/main/java/com/example/satto/domain/event/repository/ContestLikeRepository.java b/src/main/java/com/example/satto/domain/event/repository/ContestLikeRepository.java
@@ -11,4 +11,6 @@ public interface ContestLikeRepository extends JpaRepository<ContestLike, Long>
     Optional<ContestLike> findByUserAndContest(Users user, Contest contest);
 
     Long countByContest(Contest photoContest);
+
+    boolean existsByUserAndContest(Users user, Contest contest);
 }
diff --git a/src/main/java/com/example/satto/domain/event/service/EventService.java b/src/main/java/com/example/satto/domain/event/service/EventService.java
@@ -11,7 +11,7 @@ public interface EventService {
     List<EventCategoryResponseDto> getEventCategoryInfoList();
 
     // Event API 하나로 통합
-    List<ContestResponseDto> getContestParticipants(String category);
+    List<ContestResponseDto> getContestParticipants(Users user, String category);
 
     String likeContest(Long contestId, Users user);
 

diff --git a/src/main/java/com/example/satto/domain/event/service/impl/EventServiceImpl.java b/src/main/java/com/example/satto/domain/event/service/impl/EventServiceImpl.java
@@ -60,18 +60,23 @@ public List<EventCategoryResponseDto> getEventCategoryInfoList() {
 
     // Event API 하나로 통합
     @Override
-    public List<ContestResponseDto> getContestParticipants(String category) {
+    public List<ContestResponseDto> getContestParticipants(Users user, String category) {
         List<Contest> contestList = contestRepository.findAllByCategory(category);
         List<ContestResponseDto> contestResponseDtoList = new ArrayList<>();
         for (Contest contest : contestList) {
             Long likeCount = contestLikeRepository.countByContest(contest);
             Long dislikeCount = contestDislikeRepository.countByContest(contest);
+            boolean isLiked = contestLikeRepository.existsByUserAndContest(user, contest);
+            boolean isDisliked = contestDislikeRepository.existsByUserAndContest(user, contest);
             String name = contest.getUser().getName();
             contestResponseDtoList.add(ContestResponseDto.builder()
                     .contestId(contest.getContestId())
                     .name(name)
+                    .studentId(contest.getUser().getStudentId())
                     .likeCount(likeCount)
                     .dislikeCount(dislikeCount)
+                    .isLiked(isLiked)
+                    .isDisliked(isDisliked)
                     .photo(contest.getImg())
                     .createdAt(contest.getCreatedAt())
                     .updatedAt(contest.getUpdatedAt())