🛠️ Merge : main->dev 브랜치 최신화

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

@@ -122,7 +122,7 @@ public HighlightCalendarResponse fetchCalendar(int year, int month,UUID memberId
         return new HighlightCalendarResponse(year,month,daysResponses);
     }
 
-    public List<HighlightInfoResponse> fetchLatestCreatedHighlights(UUID jobId,UUID memberId){
+    public List<HighlightInfoResponse> fetchLatestCreatedHighlights(String jobId,UUID memberId){
         List<HighlightEntity> highlightList=highlightHelper.fetchLastestCreatedHighlights(jobId,memberId);
 
         return highlightList.stream()

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

@@ -57,7 +57,7 @@ public ResponseEntity<ApiResponse<HighlightCalendarResponse>> fetchCalendar(
 
     @GetMapping("/latest")
     public ResponseEntity<ApiResponse<List<HighlightInfoResponse>>> latestCreatedHighlights(
-            @RequestParam(value = "jobId") UUID jobId
+            @RequestParam(value = "jobId") String jobId
     ){
         UUID memberId=SecurityUtils.getCurrentMemberId();
         return ResponseEntity.ok(ApiResponse.ok(manager.fetchLatestCreatedHighlights(jobId,memberId)));

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

@@ -29,5 +29,5 @@ public class HighlightRequest {
     private LocalDateTime createdAt;
 
     @NotNull(message = "하이라이트 JobId는 필수입니다.")
-    private UUID jobId;
+    private String jobId;
 }

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

@@ -50,8 +50,8 @@ public class HighlightEntity extends BaseEntity {
     @Column(name = "video_created_at")
     private LocalDateTime videoCreatedAt;
 
-    @Column(name = "job_id",columnDefinition = "uuid")
-    private UUID jobId;
+    @Column(name = "job_id")
+    private String jobId;
 
     /*
     =========== [ 도메인-행위 ] ==============

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

@@ -68,7 +68,7 @@ public DateTimeRange getMonthDateTimeRange(int year, int month) {
     }
 
     @Override
-    public List<HighlightEntity> fetchLastestCreatedHighlights(UUID jobId, UUID memberId) {
+    public List<HighlightEntity> fetchLastestCreatedHighlights(String jobId, UUID memberId) {
         return highlightUtil.fetchLastestCreatedHighlights(jobId,memberId);
     }
 

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

@@ -24,5 +24,5 @@ public interface HighlightUtil {
     TreeMap<LocalDate,List<HighlightInfoResponse>> groupingHighlights(List<HighlightInfoResponse> flatHighlightList);
     List<HighlightInfoResponse> fetchFlatHighlightList(int year,int month,UUID memberId);
     DateTimeRange getMonthDateTimeRange(int year, int month);
-    List<HighlightEntity> fetchLastestCreatedHighlights(UUID jobId,UUID memberId);
+    List<HighlightEntity> fetchLastestCreatedHighlights(String jobId,UUID memberId);
 }

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

@@ -164,7 +164,7 @@ public DateTimeRange getMonthDateTimeRange(int year, int month) {
     }
 
     @Override
-    public List<HighlightEntity> fetchLastestCreatedHighlights(UUID jobId, UUID memberId) {
+    public List<HighlightEntity> fetchLastestCreatedHighlights(String jobId, UUID memberId) {
         return highlightQueryRepository.fetchHighlightsByJobId(jobId,memberId);
     }
 

src/main/java/com/midas/shootpointer/domain/highlight/mapper/HighlightFactory.java

@@ -22,7 +22,7 @@ public List<HighlightEntity> createHighlightEntities(List<HighlightInfo> highlig
                                                          Member member,
                                                          BackNumberEntity backNumber,
                                                          LocalDateTime createAt,
-                                                         UUID jobId
+                                                         String jobId
     ){
         return highlightInfos.stream()
                 .map(info -> HighlightEntity.builder()

src/main/java/com/midas/shootpointer/domain/highlight/repository/HighlightQueryRepository.java

@@ -107,15 +107,15 @@ SELECT EXISTS(
 
 
     @Query(value = """
-                SELECT *
+                SELECT h.*
                 FROM
                     highlight AS h
                 INNER JOIN
                     member AS m ON h.member_id = :memberId
                 WHERE
-                    h.job_id = :jobId
+                    h.job_id = :jobId AND m.member_id =:memberId
                 """,nativeQuery = true)
-    List<HighlightEntity> fetchHighlightsByJobId(UUID jobId,UUID memberId);
+    List<HighlightEntity> fetchHighlightsByJobId(String jobId,UUID memberId);
     /**
      * ===========================
      * <p>

src/main/java/com/midas/shootpointer/domain/like/helper/LikeUtilImpl.java

@@ -5,17 +5,11 @@
 import com.midas.shootpointer.domain.like.repository.LikeQueryRepository;
 import com.midas.shootpointer.domain.member.entity.Member;
 import com.midas.shootpointer.domain.post.entity.PostEntity;
-import com.midas.shootpointer.domain.post.repository.PostCommandRepository;
-import com.midas.shootpointer.domain.post.repository.PostQueryRepository;
-import com.midas.shootpointer.global.annotation.DistributedLock;
 import com.midas.shootpointer.global.common.ErrorCode;
 import com.midas.shootpointer.global.exception.CustomException;
-import jakarta.persistence.OptimisticLockException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.UUID;
 

src/main/java/com/midas/shootpointer/domain/like/repository/LikeQueryRepository.java

@@ -18,4 +18,12 @@ public interface LikeQueryRepository extends JpaRepository<LikeEntity,Long> {
             nativeQuery = true
     )
     Optional<LikeEntity> findByPostIdAndMemberId(@Param("postId") Long postId,@Param("memberId") UUID memberId);
+
+
+    @Query(value = """
+            SELECT 1 FROM like_table AS l
+            WHERE l.member_id = :memberId
+                    AND l.post_id = :postId
+     """,nativeQuery = true)
+    Boolean isLiked(UUID memberId,Long postId);
 }

src/main/java/com/midas/shootpointer/domain/post/dto/response/PostResponse.java

@@ -2,10 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -33,6 +30,10 @@ public class PostResponse {
     //좋아요 개수
     private Long likeCnt;
 
+    //좋아요 여부
+    @Setter
+    private boolean isLiked=false;
+
     //게시 시간
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "Asia/Seoul")
     private LocalDateTime createdAt;

src/main/java/com/midas/shootpointer/domain/progress/controller/ProgressController.java

@@ -3,9 +3,11 @@
 import com.midas.shootpointer.domain.progress.service.ProgressSseEmitter;
 import com.midas.shootpointer.global.security.SecurityUtils;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
+import java.util.Map;
 import java.util.UUID;
 
 @RestController
@@ -14,12 +16,22 @@
 public class ProgressController {
     private final ProgressSseEmitter progressSseEmitter;
 
-    @GetMapping("/subscribe")
+    @GetMapping(value = "/subscribe",produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public SseEmitter subscribe(
             @RequestHeader(value = "Last-Event-ID", required = false, defaultValue = "") final String lastEventId,
             @RequestParam String jobId
     ) {
         UUID memberId = SecurityUtils.getCurrentMemberId();
         return progressSseEmitter.createEmitter(memberId.toString(),lastEventId,jobId);
     }
+
+    @GetMapping
+    public Object progress(@RequestParam String jobId) {
+        Object data=progressSseEmitter.getLatestProgress(jobId);
+
+        if (data==null){
+            return Map.of("type","NONE","progress",0);
+        }
+        return data;
+    }
 }

src/main/java/com/midas/shootpointer/domain/progress/dto/SseEvent.java

@@ -4,7 +4,6 @@
 
 public record SseEvent(
         @NotNull long eventId,
-        @NotNull String name,
         @NotNull Object data
 ) {
 }

src/main/java/com/midas/shootpointer/domain/progress/service/ProgressSseEmitter.java

@@ -12,9 +12,7 @@
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.time.Instant;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Component
@@ -24,23 +22,21 @@ public class ProgressSseEmitter {
     @Value("${sse.ttl}")
     private long ttlMillis;
 
-    @Value("${sse.event-name}")
-    private String name;
-
     //유저당 보관 가능 최대 이벤트 수 : 360(5초당 이벤트 발행 -> 30분 : 360개)
     @Value("${sse.cache-max-size}")
     private int cacheMaxSize;
 
     @PostConstruct
     private void init(){
-        log.info("ProgressSseEmitter start : {} {} {}",ttlMillis,name,cacheMaxSize);
+        log.info("ProgressSseEmitter start : {} {}",ttlMillis,cacheMaxSize);
     }
     //memberId -> emitter
     private static Map<String, SseEmitter> emitters=new ConcurrentHashMap<>();
 
     //memberId -> 최근 이벤트 (오름차순 : 맨 뒤가 최신)
     private static Map<String, Deque<SseEvent>> eventCache=new ConcurrentHashMap<>();
 
+    private static final Map<String,Object> latestProgressMap=new ConcurrentHashMap<>();
     /**
      * 구독 생성
      * @param memberId : 멤버 Id
@@ -49,8 +45,22 @@ private void init(){
     public SseEmitter createEmitter(String memberId, String lastEventId, String jobId){
         SseEmitter emitter=new SseEmitter(ttlMillis);
         String sseKey=buildKey(memberId,jobId);
+        log.info("[SSE-createEmitter] key : {} / memberId = {} / jobId = {} ",sseKey,memberId,jobId);
         emitters.put(sseKey,emitter);
 
+        // 연결 확인용 초기 이벤트 전송
+        try {
+            emitter.send(SseEmitter.event()
+                .data(Map.of(
+                    "type", "CONNECTED",
+                    "jobId", jobId,
+                    "timestamp", Instant.now().toEpochMilli()
+                )));
+            log.info("SSE initial event sent: {}", sseKey);
+        } catch (Exception e) {
+            log.warn("Failed to send initial event: {}", e.getMessage());
+        }
+
         emitter.onCompletion(()-> {
             emitters.remove(sseKey);
             log.debug("SSE completed and removed {}",sseKey);
@@ -90,9 +100,11 @@ public SseEmitter createEmitter(String memberId, String lastEventId, String jobI
     public void sendToClient(String jobId,String memberId,Object data){
         //Event Id는 TimeMillis() 사용
         String sseKey=buildKey(memberId,jobId);
+        log.info("[SSE-sendToClient] key : {} / memberId = {} / jobId = {} ",sseKey,memberId,jobId);
         long eventId= Instant.now().toEpochMilli();
-        SseEvent event=new SseEvent(eventId,name,data);
+        SseEvent event=new SseEvent(eventId,data);
 
+        latestProgressMap.put(jobId,data);//REST API 통신을 위한 임시 메서드
         /**
          * 1. 캐시에 저장.
          */
@@ -121,28 +133,37 @@ public void sendToClient(String jobId,String memberId,Object data){
      * cache 정리
      */
     @Scheduled(fixedRateString = "${sse.clean-up-interval}")
-    public void cleanUp(){
-        long expireBefore=Instant.now().toEpochMilli()-ttlMillis;
-        eventCache.forEach((memberId,deque)->{
-            synchronized (deque){
-                while (!deque.isEmpty() && deque.peekFirst().eventId() < expireBefore){
-                    deque.removeFirst();
-                }
-                if (deque.isEmpty() && !emitters.containsKey(memberId)){
-                    eventCache.remove(memberId);
-                }
+    public void cleanUp() {
+    long expireBefore = Instant.now().toEpochMilli() - ttlMillis;
+
+    // 삭제할 키 임시 보관
+    List<String> keysToRemove = new ArrayList<>();
+
+    eventCache.forEach((key, deque) -> {
+        synchronized (deque) {
+            // 오래된 이벤트 정리
+            while (!deque.isEmpty() && deque.peekFirst().eventId() < expireBefore) {
+                deque.removeFirst();
             }
-        });
-    }
+
+            // emitter도 없고 deque도 비었으면 지우기 대상
+            if (deque.isEmpty() && !emitters.containsKey(key)) {
+                keysToRemove.add(key);
+            }
+        }
+    });
+
+    // forEach 종료 후 삭제
+    keysToRemove.forEach(eventCache::remove);
+}
 
     private void sendToEvent(SseEmitter emitter,SseEvent event){
         try {
             emitter.send(SseEmitter.event()
                     .id(String.valueOf(event.eventId()))
-                    .name(event.name())
                     .data(event.data()));
         } catch (Exception e){
-            log.warn("Failed to send SSE event id = {} name = {} message = {}",event.eventId(),event.name(),e.getMessage());
+            log.warn("Failed to send SSE event id = {} message = {}",event.eventId(),e.getMessage());
             emitter.complete();
         }
     }
@@ -151,4 +172,7 @@ private String buildKey(String memberId,String jobId){
         return String.format("%s:%s",memberId,jobId);
     }
 
+    public Object getLatestProgress(String jobId) {
+        return latestProgressMap.get(jobId);
+    }
 }