Merge pull request #30 from GDGoC-Peakly/main

[DEPLOY] 세션 시작, 일시정지, 재개, 종료 API

Author: ownue

src/main/java/com/example/peakly/domain/focusSession/controller/FocusSessionController.java

@@ -33,17 +33,15 @@ public ApiResponse<FocusSessionPauseResponse> pause(
             @PathVariable("sessionId") Long sessionId
     ) {
         Long userId = SecurityUtil.requireUserId();
-//        FocusSessionPauseResponse res = focusSessionService.pause(userId, sessionId);
-        return ApiResponse.onSuccess(null);
+        return ApiResponse.onSuccess(focusSessionService.pause(userId, sessionId));
     }
 
     @PostMapping("/{sessionId}/resume")
     public ApiResponse<FocusSessionResumeResponse> resume(
             @PathVariable("sessionId") Long sessionId
     ) {
         Long userId = SecurityUtil.requireUserId();
-//        FocusSessionResumeResponse res = focusSessionService.resume(userId, sessionId);
-        return ApiResponse.onSuccess(null);
+        return ApiResponse.onSuccess(focusSessionService.resume(userId, sessionId));
     }
 
     @PostMapping("/{sessionId}/end")
@@ -52,8 +50,7 @@ public ApiResponse<FocusSessionEndResponse> end(
             @Valid @RequestBody FocusSessionEndRequest req
     ) {
         Long userId = SecurityUtil.requireUserId();
-//        FocusSessionEndResponse res = focusSessionService.end(userId, sessionId, req);
-        return ApiResponse.onSuccess(null);
+        return ApiResponse.onSuccess(focusSessionService.end(userId, sessionId, req));
     }
 
 }

src/main/java/com/example/peakly/domain/focusSession/entity/FocusSession.java

@@ -72,6 +72,12 @@ public class FocusSession extends BaseEntity {
     @Column(name = "is_counted_in_stats", nullable = false)
     private boolean countedInStats;
 
+    @Column(name = "is_recorded", nullable = false)
+    private boolean recorded;
+
+    @Version
+    private Long version;
+
     @OneToMany(mappedBy = "focusSession", cascade = CascadeType.ALL, orphanRemoval = true)
     private final List<SessionPause> pauses = new ArrayList<>();
 
@@ -102,10 +108,16 @@ public static FocusSession start(
 
         s.sessionStatus = SessionStatus.RUNNING;
         s.totalFocusSec = 0;
-        s.countedInStats = true;
+        s.countedInStats = false;
+
+        s.recorded = false;
         return s;
     }
 
+    public void markRecorded(boolean recorded) {
+        this.recorded = recorded;
+    }
+
     private static void validateStart(
             User user,
             FocusSessionStartCommand cmd,
@@ -139,31 +151,30 @@ public void pause(LocalDateTime pausedAt) {
         this.pauses.add(SessionPause.create(this, pausedAt));
     }
 
-    public void resume(LocalDateTime resumedAt, int pauseSec) {
-        if (resumedAt == null) throw new IllegalArgumentException("resumedAt은 필수입니다.");
-        if (pauseSec < 0) throw new IllegalArgumentException("pauseSec는 0 이상이어야 합니다.");
+    public void addFocusSec(int deltaSec) {
+        if (deltaSec < 0) throw new IllegalArgumentException("deltaSec는 0 이상이어야 합니다.");
+        this.totalFocusSec += deltaSec;
+    }
+
+    public void markRunning() {
         if (this.sessionStatus != SessionStatus.PAUSED) {
-            throw new IllegalStateException("PAUSED 상태에서만 재개가 가능합니다.");
+            throw new IllegalStateException("PAUSED 상태에서만 RUNNING으로 바꿀 수 있습니다.");
         }
-        if (pauses.isEmpty()) throw new IllegalStateException("pause 기록이 없습니다.");
-
-        SessionPause last = pauses.get(pauses.size() - 1);
-        last.resume(resumedAt, pauseSec);
-
         this.sessionStatus = SessionStatus.RUNNING;
     }
 
-    public void end(LocalDateTime endedAt, int totalFocusSec) {
+    public void end(LocalDateTime endedAt, int countedThresholdSec) {
         if (endedAt == null) throw new IllegalArgumentException("endedAt은 필수입니다.");
-        if (totalFocusSec < 0) throw new IllegalArgumentException("totalFocusSec는 0 이상이어야 합니다.");
+        if (countedThresholdSec < 0) throw new IllegalArgumentException("countedThresholdSec는 0 이상이어야 합니다.");
 
         if (this.sessionStatus == SessionStatus.ENDED || this.sessionStatus == SessionStatus.CANCELED) {
-            throw new IllegalStateException("이미 종료/취소된 세션입니다.");
+            throw new IllegalStateException("이미 종료 또는 취소된 세션입니다.");
         }
 
         this.endedAt = endedAt;
-        this.totalFocusSec = totalFocusSec;
         this.sessionStatus = SessionStatus.ENDED;
+
+        this.countedInStats = this.totalFocusSec >= countedThresholdSec;
     }
 
     public void cancel(LocalDateTime canceledAt) {

src/main/java/com/example/peakly/domain/focusSession/repository/FocusSessionRepository.java

@@ -5,7 +5,12 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
 @Repository
 public interface FocusSessionRepository extends JpaRepository<FocusSession, Long> {
+
+    Optional<FocusSession> findByIdAndUser_Id(Long sessionId, Long userId);
+
     boolean existsByUser_IdAndSessionStatusIn(Long userId, Iterable<SessionStatus> statuses);
 }

src/main/java/com/example/peakly/domain/focusSession/repository/SessionPauseRepository.java

@@ -0,0 +1,24 @@
+package com.example.peakly.domain.focusSession.repository;
+
+import com.example.peakly.domain.focusSession.entity.SessionPause;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface SessionPauseRepository extends JpaRepository<SessionPause, Long> {
+
+    boolean existsByFocusSession_IdAndResumedAtIsNull(Long sessionId);
+
+    @Query("SELECT sp FROM SessionPause sp" +
+            " WHERE sp.focusSession.id = :sessionId" +
+            " AND sp.resumedAt IS NOT NULL" +
+            " ORDER BY sp.resumedAt DESC" +
+            " LIMIT 1")
+    Optional<SessionPause> findLatestResumedPause(Long sessionId);
+
+    List<SessionPause> findAllByFocusSession_IdAndResumedAtIsNull(Long sessionId);
+}

src/main/java/com/example/peakly/domain/focusSession/service/FocusSessionService.java

@@ -1,8 +1,19 @@
 package com.example.peakly.domain.focusSession.service;
 
+import com.example.peakly.domain.focusSession.dto.request.FocusSessionEndRequest;
 import com.example.peakly.domain.focusSession.dto.request.FocusSessionStartRequest;
+import com.example.peakly.domain.focusSession.dto.response.FocusSessionEndResponse;
+import com.example.peakly.domain.focusSession.dto.response.FocusSessionPauseResponse;
+import com.example.peakly.domain.focusSession.dto.response.FocusSessionResumeResponse;
 import com.example.peakly.domain.focusSession.dto.response.FocusSessionStartResponse;
 
 public interface FocusSessionService {
+
     FocusSessionStartResponse start(Long userId, FocusSessionStartRequest req);
+
+    FocusSessionPauseResponse pause(Long userId, Long sessionId);
+
+    FocusSessionResumeResponse resume(Long userId, Long sessionId);
+
+    FocusSessionEndResponse end(Long userId, Long sessionId, FocusSessionEndRequest req);
 }