Merge remote-tracking branch 'origin/dev' into feature/kakao-api

Author: leesanghuu

src/main/java/com/workingdead/timepoll/controller/TimePollController.java

@@ -0,0 +1,84 @@
+package com.workingdead.meet.controller;
+
+import com.workingdead.meet.dto.request.TimePollCreateRequest;
+import com.workingdead.meet.dto.request.TimePollSubmitRequest;
+import com.workingdead.meet.dto.response.TimePollResponse;
+import com.workingdead.meet.dto.response.TimePollStatusResponse;
+import com.workingdead.meet.dto.response.TimePollStatusResponse;
+import com.workingdead.meet.entity.TimePoll;
+import com.workingdead.meet.service.TimePollService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/time-polls")
+@RequiredArgsConstructor
+public class TimePollController {
+
+    private final TimePollService timePollService;
+
+    /**
+     * API #1 - 시간 투표 생성
+     * POST /time-polls
+     */
+    @PostMapping
+    public ResponseEntity<Map<String, Long>> create(@RequestBody TimePollCreateRequest request) {
+        TimePoll timePoll = timePollService.create(request);
+        return ResponseEntity.ok(Map.of("timePollId", timePoll.getId()));
+    }
+
+    /**
+     * API #2 - 투표 페이지 조회
+     * GET /time-polls/{pollId}?participantId=123
+     */
+    @GetMapping("/{pollId}")
+    public ResponseEntity<TimePollResponse> getTimePoll(
+            @PathVariable Long pollId,
+            @RequestParam Long participantId) {
+        return ResponseEntity.ok(timePollService.getTimePoll(pollId, participantId));
+    }
+
+    /**
+     * API #3 - 투표 제출
+     * POST /time-polls/{pollId}/submit
+     */
+    @PostMapping("/{pollId}/submit")
+    public ResponseEntity<TimePollStatusResponse> submit(
+            @PathVariable Long pollId,
+            @RequestBody TimePollSubmitRequest request) {
+        return ResponseEntity.ok(timePollService.submit(pollId, request));
+    }
+
+    /**
+     * API #4 - 투표 현황 조회
+     * GET /time-polls/{pollId}/status
+     */
+    @GetMapping("/{pollId}/status")
+    public ResponseEntity<TimePollStatusResponse> getStatus(@PathVariable Long pollId) {
+        return ResponseEntity.ok(timePollService.getStatus(pollId));
+    }
+
+    /**
+     * API #5 - "저도 그때 좋아요" 수락
+     * POST /time-polls/{pollId}/accept
+     */
+    @PostMapping("/{pollId}/accept")
+    public ResponseEntity<TimePollStatusResponse> accept(
+            @PathVariable Long pollId,
+            @RequestParam Long participantId) {
+        return ResponseEntity.ok(timePollService.accept(pollId, participantId));
+    }
+
+    /**
+     * API #6 - 투표 확정 (내부용이지만 수동 트리거 가능)
+     * POST time-polls/{pollId}/finalize
+     */
+    @PostMapping("/{pollId}/finalize")
+    public ResponseEntity<Void> finalize(@PathVariable Long pollId) {
+        timePollService.finalize(pollId);
+        return ResponseEntity.ok().build();
+    }
+}

src/main/java/com/workingdead/timepoll/dto/request/TimePollCreateRequest.java

@@ -0,0 +1,12 @@
+package com.workingdead.meet.dto.request;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class TimePollCreateRequest {
+
+    private Long voteId;           // 어떤 날짜 투표에서 파생됐는지
+    private String confirmedDate;  // 확정된 날짜 ("1월 28일 저녁")
+}

src/main/java/com/workingdead/timepoll/dto/request/TimePollSubmitRequest.java

@@ -0,0 +1,14 @@
+package com.workingdead.meet.dto.request;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalTime;
+
+@Getter
+@NoArgsConstructor
+public class TimePollSubmitRequest {
+
+    private Long participantId;
+    private LocalTime selectedTime;   // "18:00", "16:30"
+}

src/main/java/com/workingdead/timepoll/dto/response/TimePollResponse.java

@@ -0,0 +1,23 @@
+package com.workingdead.meet.dto.response;
+
+import com.workingdead.meet.entity.TimePollStatus;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalTime;
+
+@Getter
+@Builder
+@AllArgsConstructor
+public class TimePollResponse {
+
+    private Long id;
+    private String confirmedDate;
+    private TimePollStatus status;
+    private LocalTime finalizedTime;
+    private int totalParticipants;
+    private int submittedCount;
+    private boolean alreadySubmitted;
+    private LocalTime mySelection;
+}

src/main/java/com/workingdead/timepoll/dto/response/TimePollStatusResponse.java

@@ -0,0 +1,33 @@
+package com.workingdead.meet.dto.response;
+
+import com.workingdead.meet.entity.TimePollStatus;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalTime;
+import java.util.List;
+
+@Getter
+@Builder
+@AllArgsConstructor
+public class TimePollStatusResponse {
+
+    private Long timePollId;
+    private String confirmedDate;
+    private TimePollStatus status;
+    private LocalTime finalizedTime;
+    private int totalParticipants;
+    private int submittedCount;
+    private boolean allSubmitted;
+    private List<EntryDto> entries;          // 투표 현황 (늦은 시간순)
+    private List<String> pendingNames;       // 미투표자 이름 목록
+
+    @Getter
+    @Builder
+    @AllArgsConstructor
+    public static class EntryDto {
+        private String displayName;
+        private LocalTime selectedTime;
+    }
+}

src/main/java/com/workingdead/timepoll/entity/TimePoll.java

@@ -0,0 +1,60 @@
+package com.workingdead.meet.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.Instant;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Entity
+@Table(name = "time_poll")
+public class TimePoll {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    // 어떤 Vote(날짜 투표)에서 파생됐는지
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "vote_id", nullable = false)
+    private Vote vote;
+
+    // 확정된 날짜 (날짜 투표 결과)
+    @Column(name = "confirmed_date", nullable = false)
+    private String confirmedDate; // "1월 28일 저녁" 같은 형태
+
+    // 투표 상태
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    @Builder.Default
+    private TimePollStatus status = TimePollStatus.ONGOING;
+
+    // 최종 확정된 시간 (투표 완료 후)
+    @Column(name = "finalized_time")
+    private LocalTime finalizedTime;
+
+    // 최후통첩 발송 시각
+    @Column(name = "ultimatum_sent_at")
+    private Instant ultimatumSentAt;
+
+    // 마지막 독촉 단계 (0=안함, 1=30분, 2=2시간, 3=6시간, 4=12시간)
+    @Column(name = "last_reminder_step")
+    @Builder.Default
+    private Integer lastReminderStep = 0;
+
+    @Column(name = "created_at", nullable = false, updatable = false)
+    @Builder.Default
+    private Instant createdAt = Instant.now();
+
+    // 개별 투표 응답들
+    @OneToMany(mappedBy = "timePoll", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
+    private List<TimePollEntry> entries = new ArrayList<>();
+}

src/main/java/com/workingdead/timepoll/entity/TimePollEntry.java

@@ -0,0 +1,40 @@
+package com.workingdead.meet.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.Instant;
+import java.time.LocalTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Entity
+@Table(name = "time_poll_entry",
+       uniqueConstraints = {
+           @UniqueConstraint(columnNames = {"time_poll_id", "participant_id"})
+       })
+public class TimePollEntry {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "time_poll_id", nullable = false)
+    private TimePoll timePoll;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "participant_id", nullable = false)
+    private Participant participant;
+
+    // 선택한 시간 (예: 18:00, 16:30)
+    @Column(name = "selected_time", nullable = false)
+    private LocalTime selectedTime;
+
+    @Column(name = "submitted_at", nullable = false, updatable = false)
+    @Builder.Default
+    private Instant submittedAt = Instant.now();
+}

src/main/java/com/workingdead/timepoll/entity/TimePollStatus.java

@@ -0,0 +1,7 @@
+package com.workingdead.meet.entity;
+
+public enum TimePollStatus {
+    ONGOING,      
+    ULTIMATUM,    
+    FINALIZED     
+}

src/main/java/com/workingdead/timepoll/repository/TimePollEntryRepository.java

@@ -0,0 +1,19 @@
+package com.workingdead.meet.repository;
+
+import com.workingdead.meet.entity.TimePollEntry;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface TimePollEntryRepository extends JpaRepository<TimePollEntry, Long> {
+
+    // 특정 투표의 모든 응답 조회
+    List<TimePollEntry> findByTimePollId(Long timePollId);
+
+    // 특정 투표 + 특정 참여자의 응답 조회 (중복 제출 체크 / 수정용)
+    Optional<TimePollEntry> findByTimePollIdAndParticipantId(Long timePollId, Long participantId);
+
+    // 특정 투표의 응답 수 (과반 체크용)
+    long countByTimePollId(Long timePollId);
+}

src/main/java/com/workingdead/timepoll/repository/TimePollRepository.java

@@ -0,0 +1,29 @@
+package com.workingdead.meet.repository;
+
+import com.workingdead.meet.entity.TimePoll;
+import com.workingdead.meet.entity.TimePollStatus;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
+
+public interface TimePollRepository extends JpaRepository<TimePoll, Long> {
+
+    // Vote ID로 시간 투표 조회
+    Optional<TimePoll> findByVoteId(Long voteId);
+
+    // 진행 중인 투표 중 특정 시각 이전에 생성된 것들 (스케줄러용)
+    List<TimePoll> findByStatusAndCreatedAtBefore(TimePollStatus status, Instant before);
+
+    // 최후통첩 상태에서 특정 시각 이전에 발송된 것들 (60분 타임아웃 체크용)
+    List<TimePoll> findByStatusAndUltimatumSentAtBefore(TimePollStatus status, Instant before);
+
+    // 독촉 대상 조회: 진행 중 + 특정 독촉 단계 미만
+    @Query("SELECT tp FROM TimePoll tp WHERE tp.status = :status AND tp.lastReminderStep < :step AND tp.createdAt < :before")
+    List<TimePoll> findRemindTargets(@Param("status") TimePollStatus status,
+                                     @Param("step") int step,
+                                     @Param("before") Instant before);
+}