🌟 Feature : 월 별 생성된 하이라이트 조회 - 캘린더형

build.gradle

@@ -98,6 +98,8 @@ dependencies {
 	testCompileOnly 'org.projectlombok:lombok'
 	testAnnotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+	implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0'
+
 
 	//redisson
 	implementation 'org.redisson:redisson-spring-boot-starter:3.18.0'

src/main/java/com/midas/shootpointer/batch/reader/ranking/RankingReader.java

@@ -80,7 +80,6 @@ private PagingQueryProvider pagingQueryProvider(){
 
         /**
          *  1. 시간 조건
-         *     + is_selected = true
          *     + is_aggregation_agreed = true
          */
         queryProvider.setSelectClause("""
@@ -103,7 +102,6 @@ private PagingQueryProvider pagingQueryProvider(){
         queryProvider.setWhereClause("""
                 WHERE
                   m.is_aggregation_agreed = true
-                  AND h.is_selected = true
                   AND h.created_at BETWEEN :begin AND :end
                 """);
 

src/main/java/com/midas/shootpointer/domain/highlight/business/HighlightManager.java

@@ -18,7 +18,9 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.List;
+import java.util.TreeMap;
 import java.util.UUID;
 
 @Component
@@ -31,36 +33,6 @@ public class HighlightManager {
     private final HighlightFactory factory;
     private final MemberHelper memberHelper;
 
-    /*==========================
-    *
-    *HighlightManager
-    * 여러개의 하이라이트 영상 중 유저가 선택하는 메서드
-    * @parm request : 요청 dto memberId : 멤버 Id
-    * @return 선택된 하이라이트 영상 Id 리스트
-    * @author kimdoyeon
-    * @version 1.0.0
-    * @date 25. 10. 7.
-    *
-    ==========================**/
-    @Transactional
-    @CustomLog
-    public HighlightSelectResponse selectHighlight(HighlightSelectRequest request, Member member){
-        List<UUID> selectedIds=request.getSelectedHighlightIds();
-        /**
-         * 1. 유저가 선택 요청한 하이라이트 Id 리스트 -> 엔티티로 가져오기
-         */
-        List<HighlightEntity> highlights = selectedIds.stream()
-                .map(highlightHelper::findHighlightByHighlightId)
-                .toList();
-
-        /*
-         * 2. 선택 수행
-         */
-        highlights.forEach(entity -> entity.select(member));
-
-        return mapper.entityToResponse(selectedIds);
-    }
-
     /*==========================
     *
     *HighlightManager
@@ -89,7 +61,7 @@ public void saveHighlights(HighlightRequest request, UUID memberId) {
         /*
         *   2. 하이라이트 엔티티 생성
          */
-        List<HighlightEntity> entities=factory.createHighlightEntities(request.getHighlightUrls(),request.getHighlightIdentifier(),member,backNumber);
+        List<HighlightEntity> entities=factory.createHighlightEntities(request.getHighlightUrls(),request.getHighlightIdentifier(),member,backNumber,request.getCreatedAt());
 
         /*
             3. DB 저장
@@ -118,4 +90,28 @@ public List<PeriodHighlightResponse> fetchAllMembersHighlights(String period){
         PeriodType convertedType=PeriodType.valueOf(period);
         return highlightHelper.fetchAllMembersHighlights(convertedType);
     }
+
+    public HighlightCalendarResponse fetchCalendar(int year, int month,UUID memberId) {
+        /**
+         * 1. year,month 입력 값 검증
+         */
+        highlightHelper.isValidDateRange(year,month);
+
+        /**
+         * 2.년 월 기간 내 생성된 하이라이트 영상 조회 - flat data 조회
+         */
+        List<HighlightInfoResponse> flatHighlightList=highlightHelper.fetchFlatHighlightList(year,month,memberId);
+
+        /**
+         * 3. flat data 그룹핑한 데이터 조회
+         */
+        TreeMap<LocalDate,List<HighlightInfoResponse>> groupingHighlights=highlightHelper.groupingHighlights(flatHighlightList);
+
+        /**
+         * 4.date와 매핑된 데이터 반환
+         */
+        List<HighlightCalendarDaysResponse> daysResponses=mapper.groupingHighlightToDaysResponse(groupingHighlights);
+
+        return new HighlightCalendarResponse(year,month,daysResponses);
+    }
 }

src/main/java/com/midas/shootpointer/domain/highlight/business/command/HighlightCommandService.java

@@ -1,15 +1,9 @@
 package com.midas.shootpointer.domain.highlight.business.command;
 
 import com.midas.shootpointer.domain.highlight.dto.HighlightRequest;
-import com.midas.shootpointer.domain.highlight.dto.HighlightSelectRequest;
-import com.midas.shootpointer.domain.highlight.dto.HighlightSelectResponse;
-import com.midas.shootpointer.domain.member.entity.Member;
 
 import java.util.UUID;
 
 public interface HighlightCommandService {
-    HighlightSelectResponse selectHighlight(HighlightSelectRequest request, Member member);
-
     void uploadHighlights(HighlightRequest highlights, UUID memberId);
 }
-////

src/main/java/com/midas/shootpointer/domain/highlight/business/command/HighlightCommandServiceImpl.java

@@ -16,21 +16,6 @@
 @Slf4j
 public class HighlightCommandServiceImpl implements HighlightCommandService {
     private final HighlightManager manager;
-    /*==========================
-    *
-    *HighlightCommandServiceImpl
-    *
-    * @parm HighlightSelectRequest : 하이라이트 선택 요청 Dto , token : JWT
-    * @return 하이라이트 선택 성공 시 선택한 하이라이트 id 반환 dto
-    * @author kimdoyeon
-    * @version 1.0.0
-    * @date 6/23/25
-    *
-    ==========================**/
-    @Override
-    public HighlightSelectResponse selectHighlight(HighlightSelectRequest request, Member member) {
-        return manager.selectHighlight(request,member);
-    }
 
     /*==========================
     *

src/main/java/com/midas/shootpointer/domain/highlight/controller/HighlightCommandController.java

@@ -2,11 +2,7 @@
 
 import com.midas.shootpointer.domain.highlight.business.command.HighlightCommandService;
 import com.midas.shootpointer.domain.highlight.dto.HighlightRequest;
-import com.midas.shootpointer.domain.highlight.dto.HighlightSelectRequest;
-import com.midas.shootpointer.domain.highlight.dto.HighlightSelectResponse;
-import com.midas.shootpointer.domain.member.entity.Member;
 import com.midas.shootpointer.global.dto.ApiResponse;
-import com.midas.shootpointer.global.security.SecurityUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -24,15 +20,6 @@
 public class HighlightCommandController {
     private final HighlightCommandService highlightCommandService;
 
-    @PostMapping("/select")
-    public ResponseEntity<ApiResponse<HighlightSelectResponse>> selectHighlight(
-            @RequestBody HighlightSelectRequest request
-    ) {
-        Member member = SecurityUtils.getCurrentMember();
-
-        return ResponseEntity.ok(ApiResponse.ok(highlightCommandService.selectHighlight(request, member)));
-    }
-
     @Operation(
             summary = "하이라이트 URL 전송 API (OpenCV 에서 사용) - [담당자 : 김도연]",
             responses = {

src/main/java/com/midas/shootpointer/domain/highlight/controller/HighlightQueryController.java

@@ -1,6 +1,7 @@
 package com.midas.shootpointer.domain.highlight.controller;
 
 import com.midas.shootpointer.domain.highlight.business.HighlightManager;
+import com.midas.shootpointer.domain.highlight.dto.HighlightCalendarResponse;
 import com.midas.shootpointer.domain.highlight.dto.HighlightInfoResponse;
 import com.midas.shootpointer.domain.highlight.dto.PeriodHighlightResponse;
 import com.midas.shootpointer.global.dto.ApiResponse;
@@ -31,8 +32,26 @@ public ResponseEntity<ApiResponse<Page<HighlightInfoResponse>>> highlightList(
         return ResponseEntity.ok(ApiResponse.ok( manager.listByPaging(page,size,memberId)));
     }
 
+    /**
+     * @param period WEEKLY : 이번 주 / MONTHLY : 이번 달
+     * @return 이번 주 / 이번 달 인기 하이라이트 조회
+     */
     @GetMapping
     public ResponseEntity<ApiResponse<List<PeriodHighlightResponse>>> periodHighlight(@RequestParam(value = "period")String period){
         return ResponseEntity.ok(ApiResponse.ok(manager.fetchAllMembersHighlights(period)));
     }
+
+    /**
+     * @param year 조회 연도
+     * @param month 조회 달
+     * @return 캘린더형 유저의 날짜별 하이라이트 영상 리스트 조회
+     */
+    @GetMapping("/calendar")
+    public ResponseEntity<ApiResponse<HighlightCalendarResponse>> fetchCalendar(
+            @RequestParam(value = "year") int year,
+            @RequestParam(value = "month")int month
+    ){
+        UUID memberId=SecurityUtils.getCurrentMemberId();
+        return ResponseEntity.ok(ApiResponse.ok(manager.fetchCalendar(year,month,memberId)));
+    }
 }

src/main/java/com/midas/shootpointer/domain/highlight/dto/DateTimeRange.java

@@ -0,0 +1,6 @@
+package com.midas.shootpointer.domain.highlight.dto;
+
+import java.time.LocalDateTime;
+
+public record DateTimeRange(LocalDateTime start,LocalDateTime end) {
+}

src/main/java/com/midas/shootpointer/domain/highlight/dto/HighlightCalendarDaysResponse.java

@@ -0,0 +1,13 @@
+package com.midas.shootpointer.domain.highlight.dto;
+
+import jakarta.validation.constraints.NotNull;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public record HighlightCalendarDaysResponse(
+        @NotNull LocalDate date,
+        @NotNull Integer count,
+        @NotNull List<HighlightInfoResponse> highlights
+) {
+}

src/main/java/com/midas/shootpointer/domain/highlight/dto/HighlightCalendarResponse.java

@@ -0,0 +1,13 @@
+package com.midas.shootpointer.domain.highlight.dto;
+
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public record HighlightCalendarResponse(
+        @NotNull Integer year,
+        @NotNull Integer month,
+        @NotNull List<HighlightCalendarDaysResponse> days
+) {
+}
+

src/main/java/com/midas/shootpointer/domain/highlight/dto/HighlightSelectRequest.java

@@ -1,14 +1,12 @@
 package com.midas.shootpointer.domain.highlight.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
 import java.util.UUID;
 
 @AllArgsConstructor
@@ -18,9 +16,8 @@
 @Schema(description = "하이라이트 선택 요청 DTO 입니다.")
 public class HighlightSelectRequest {
     /**
-     * 3가지 중 2개 선택
+     * 게시물 - 3가지 중 1개 선택
      */
-    @NotEmpty
-    @Size(min = 2,max = 2,message = "하이라이트를 정확히 2개를 선택해주세요.")
-    private List<UUID> selectedHighlightIds;
+    @NotNull
+    private UUID selectedHighlightIds;
 }

src/main/java/com/midas/shootpointer/domain/highlight/entity/HighlightEntity.java

@@ -2,9 +2,7 @@
 
 import com.midas.shootpointer.domain.backnumber.entity.BackNumberEntity;
 import com.midas.shootpointer.domain.member.entity.Member;
-import com.midas.shootpointer.global.common.ErrorCode;
 import com.midas.shootpointer.global.entity.BaseEntity;
-import com.midas.shootpointer.global.exception.CustomException;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -13,6 +11,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.annotations.UuidGenerator;
 
+import java.time.LocalDateTime;
 import java.util.UUID;
 
 @Entity
@@ -34,10 +33,6 @@ public class HighlightEntity extends BaseEntity {
     @Column(name = "highlight_key",nullable = false,columnDefinition = "uuid")
     private UUID highlightKey;
 
-    @Column(name = "is_selected")
-    @Builder.Default
-    private Boolean isSelected=false;
-
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_id",nullable = false, columnDefinition = "uuid")
     private Member member;
@@ -55,20 +50,12 @@ public class HighlightEntity extends BaseEntity {
     @Builder.Default
     private Integer threePointCount=0;
 
+    @Column(name = "video_created_at")
+    private LocalDateTime videoCreatedAt;
+
     /*
     =========== [ 도메인-행위 ] ==============
      */
-    public void select(Member actor){
-        //유저의 하이라이트 영상이 아닌경우
-        if (!actor.getMemberId().equals(member.getMemberId())){
-            throw new CustomException(ErrorCode.IS_NOT_CORRECT_MEMBERS_HIGHLIGHT_ID);
-        }
-        //이미 선택된 하이라이트 영상인 경우
-        if (Boolean.TRUE.equals(this.isSelected)){
-            throw new CustomException(ErrorCode.EXISTED_SELECTED);
-        }
-        this.isSelected=true;
-    }
 
     //2점 슛 계산
     public int totalTwoPoint(){

src/main/java/com/midas/shootpointer/domain/highlight/helper/HighlightHelperImpl.java

@@ -1,5 +1,7 @@
 package com.midas.shootpointer.domain.highlight.helper;
 
+import com.midas.shootpointer.domain.highlight.dto.DateTimeRange;
+import com.midas.shootpointer.domain.highlight.dto.HighlightInfoResponse;
 import com.midas.shootpointer.domain.highlight.dto.PeriodHighlightResponse;
 import com.midas.shootpointer.domain.highlight.dto.PeriodType;
 import com.midas.shootpointer.domain.highlight.entity.HighlightEntity;
@@ -9,8 +11,10 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.TreeMap;
 import java.util.UUID;
 
 @Component
@@ -44,13 +48,23 @@ public List<PeriodHighlightResponse> fetchAllMembersHighlights(PeriodType period
     }
 
     @Override
-    public LocalDateTime calculateStartDate(PeriodType type, LocalDateTime now) {
-        return highlightUtil.calculateStartDate(type,now);
+    public DateTimeRange calculateDateTimeRange(PeriodType type, LocalDateTime now) {
+        return highlightUtil.calculateDateTimeRange(type,now);
     }
 
     @Override
-    public LocalDateTime calculateEndDate(PeriodType type, LocalDateTime now) {
-        return highlightUtil.calculateEndDate(type,now);
+    public TreeMap<LocalDate, List<HighlightInfoResponse>> groupingHighlights(List<HighlightInfoResponse> flatHighlightList) {
+        return highlightUtil.groupingHighlights(flatHighlightList);
+    }
+
+    @Override
+    public List<HighlightInfoResponse> fetchFlatHighlightList(int year, int month, UUID memberId) {
+        return highlightUtil.fetchFlatHighlightList(year,month,memberId);
+    }
+
+    @Override
+    public DateTimeRange getMonthDateTimeRange(int year, int month) {
+        return highlightUtil.getMonthDateTimeRange(year,month);
     }
 
     @Override
@@ -87,4 +101,9 @@ public boolean isExistDirectory(String directory) {
     public void areValidFiles(List<MultipartFile> files) {
         highlightValidator.areValidFiles(files);
     }
+
+    @Override
+    public void isValidDateRange(int year, int month) {
+        highlightValidator.isValidDateRange(year,month);
+    }
 }