[Feat] Block api

src/main/java/com/umc/timeto/block/controller/BlockController.java

@@ -0,0 +1,125 @@
+package com.umc.timeto.block.controller;
+
+import com.umc.timeto.block.dto.BlockAddDTO;
+import com.umc.timeto.block.dto.BlockResponseNumDTO;
+import com.umc.timeto.block.service.BlockService;
+import com.umc.timeto.global.apiPayload.code.ResponseCode;
+import com.umc.timeto.global.apiPayload.dto.ResponseDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.YearMonth;
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/block")
+public class BlockController {
+
+    private final BlockService blockService;
+
+    private Long getMemberId(Authentication authentication) {
+        return (Long) authentication.getPrincipal();
+    }
+
+    @Operation(summary = "타임블럭 저장", description = "할 일 시작 시간을 받아서 블록을 저장합니다. 블록에는 일정 겹침 검사가 존재합니다." +
+            "(ex: 일정 1이 7:30~8:30 일떄, 일정2의 생성/이동은 8:30분 이상부터 가능)")
+    @PatchMapping("/{todoId}")
+    public ResponseEntity<?> createBlock(
+            @PathVariable Long todoId,
+            @RequestBody BlockAddDTO req,
+            Authentication authentication
+    ) {
+        var res= blockService.createBlock(todoId, req, getMemberId(authentication));
+
+        return ResponseEntity
+                .status(ResponseCode.SUCCESS_ADD_BLOCK.getStatus().value())
+                .body(new ResponseDTO<>(ResponseCode.SUCCESS_ADD_BLOCK, res));
+    }
+
+    @Operation(summary = "날짜별 타임블럭 조회", description = "입력받은 날짜(yyyy-MM-DD)에 생성된 타임 블럭들을 조회합니다 블록 조회 기본(메인) 화면에 사용합니다. ")
+    @GetMapping("/day")
+    public ResponseEntity<?> getBlockByDay(
+            // 기본 format: yyyy-MM-DD
+            @RequestParam LocalDate date,
+            Authentication authentication
+    ) {
+        var res= blockService.getBlockByDay(date, getMemberId(authentication));
+
+        return ResponseEntity
+                .status(ResponseCode.SUCCESS_GET_BLOCKLIST.getStatus().value())
+                .body(new ResponseDTO<>(ResponseCode.SUCCESS_GET_BLOCKLIST, res));
+    }
+
+    @Operation(summary = "한달 날짜별 타임블럭 수",
+            description = "입력받은 날짜(YYYY-MM)에 생성된 타임 블럭 수를 조회합니다")
+    @GetMapping("/month")
+    public ResponseEntity<ResponseDTO<List<BlockResponseNumDTO>>> getBlockNumByMonth(
+            @RequestParam
+            @DateTimeFormat(pattern = "yyyy-MM")
+            YearMonth yearMonth,
+            Authentication authentication
+    ) {
+
+        var res = blockService.getBlockNumByMonth(yearMonth, getMemberId(authentication));
+
+        return ResponseEntity
+                .status(ResponseCode.SUCCESS_GET_BLOCK_NUMBER.getStatus().value())
+                .body(new ResponseDTO<>(ResponseCode.SUCCESS_GET_BLOCK_NUMBER, res));
+    }
+
+    @Operation(summary = "블록 소요시간 변경",
+            description = "블록 소요시간 변경 시 사용합니다. 할 일 내부에서만 소요시간 변경이 가능하다면 사용하지 않아도 됩니다. ")
+    @PatchMapping("/{blockId}/duration")
+    public ResponseEntity<ResponseDTO<Void>> updateDuration(
+            @PathVariable Long blockId,
+            @RequestParam LocalTime duration,
+            Authentication authentication
+    ) {
+
+        blockService.updateBlockDuration(
+                blockId,
+                getMemberId(authentication),
+                duration
+        );
+
+        return ResponseEntity.ok(
+                new ResponseDTO<>(ResponseCode.SUCCESS_UPDATE_BLOCK, null)
+        );
+    }
+
+
+    @Operation(summary = "블록 이동",
+            description = "블록을 드래그&드롭으로 이동했을 때 정보를 갱신합니다. 변경된 시작 시간을 입력으로 받습니다. " +
+                    "이동된 시간이 다른 일정과 겹칠 경우 갱신되지 않습니다. startAt format: yyyy-MM-dd'T'HH:mm")
+    @PatchMapping("/{blockId}/move")
+    public ResponseEntity<ResponseDTO<Void>> moveBlock(
+            @PathVariable Long blockId,
+            @RequestParam
+            @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
+            LocalDateTime startAt,
+            Authentication authentication
+    ) {
+
+        blockService.moveBlock(
+                blockId,
+                getMemberId(authentication),
+                startAt
+        );
+
+        return ResponseEntity.ok(
+                new ResponseDTO<>(ResponseCode.SUCCESS_UPDATE_BLOCK, null)
+        );
+    }
+
+
+
+
+}

src/main/java/com/umc/timeto/block/dto/BlockAddDTO.java

@@ -0,0 +1,21 @@
+package com.umc.timeto.block.dto;
+
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BlockAddDTO {
+    @NotBlank(message = "startAt은 필수 입력 값입니다.")
+    @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
+    private LocalDateTime startAt;
+}

src/main/java/com/umc/timeto/block/dto/BlockResponseDTO.java

@@ -0,0 +1,18 @@
+package com.umc.timeto.block.dto;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BlockResponseDTO {
+    private Long blockId;
+    private Long todoId;
+    private LocalDateTime startAt;
+    private LocalDateTime endAt;
+}

src/main/java/com/umc/timeto/block/dto/BlockResponseDetailDTO.java

@@ -0,0 +1,28 @@
+package com.umc.timeto.block.dto;
+
+import com.umc.timeto.todo.domain.enums.TodoPriority;
+import com.umc.timeto.todo.domain.enums.TodoState;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BlockResponseDetailDTO {
+    private Long blockId;
+    private Long todoId;
+    private LocalDateTime startAt;
+    private LocalDateTime endAt;
+    private String todoName;
+    private TodoPriority priority;
+    private TodoState state;
+    private String goalName;
+    private String color;
+
+
+}

src/main/java/com/umc/timeto/block/dto/BlockResponseNumDTO.java

@@ -0,0 +1,18 @@
+package com.umc.timeto.block.dto;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BlockResponseNumDTO {
+    private LocalDate date;
+    private Long count;
+}

src/main/java/com/umc/timeto/block/entity/Block.java

@@ -0,0 +1,68 @@
+package com.umc.timeto.block.entity;
+
+import com.umc.timeto.todo.domain.Todo;
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+@Entity
+@Getter
+@NoArgsConstructor
+public class Block {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long blockId;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "todo_id")
+    private Todo todo;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
+    private LocalDateTime startAt;
+    @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
+    private LocalDateTime endAt;
+    // block에서는 startAt, endAt 입력받고 todoo 에 startAt 저장 및 duration update
+    //Duration: localtime
+
+    public Block(Todo todo, LocalDateTime startAt) {
+        this.todo=todo;
+
+        LocalDateTime normalizedStart = normalize(startAt);
+        this.startAt = normalizedStart;
+        LocalTime duration = todo.getDuration();
+
+        LocalDateTime calculatedEnd = normalizedStart
+                .plusHours(duration.getHour())
+                .plusMinutes(duration.getMinute());
+
+        this.endAt = normalize(calculatedEnd);
+    }
+
+    public void updateTime(LocalDateTime startAt, LocalDateTime endAt) {
+        this.startAt = normalize(startAt);
+        this.endAt = normalize(endAt);
+    }
+
+    private LocalDateTime normalize(LocalDateTime time) {
+        return time.withSecond(0).withNano(0);
+    }
+
+    @PrePersist
+    @PreUpdate
+    private void trimSeconds() {
+        if (startAt != null) {
+            startAt = startAt.withSecond(0).withNano(0);
+        }
+        if (endAt != null) {
+            endAt = endAt.withSecond(0).withNano(0);
+        }
+    }
+
+
+
+}

src/main/java/com/umc/timeto/block/repository/BlockRepository.java

@@ -0,0 +1,40 @@
+package com.umc.timeto.block.repository;
+
+import com.umc.timeto.block.entity.Block;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+public interface BlockRepository extends JpaRepository<Block, Long> {
+    Optional<Block> findByTodo_TodoId(Long todoId);
+
+
+    List<Block> findByTodo_Folder_Goal_Member_MemberIdAndStartAtBetween(
+            Long memberId,
+            LocalDateTime start,
+            LocalDateTime end
+    );
+    List<Block> findByTodo_Folder_Goal_Member_MemberIdAndStartAtGreaterThanEqualAndStartAtLessThan(
+            Long memberId,
+            LocalDateTime start,
+            LocalDateTime end
+    );
+
+
+    List<Block> findByTodo_Folder_Goal_Member_MemberIdAndStartAtLessThanAndEndAtGreaterThan(
+            Long memberId,
+            LocalDateTime endAt,
+            LocalDateTime startAt
+    );
+
+    List<Block> findByTodo_Folder_Goal_Member_MemberIdAndBlockIdNotAndStartAtLessThanAndEndAtGreaterThan(
+            Long memberId,
+            Long blockId,
+            LocalDateTime endAt,
+            LocalDateTime startAt
+    );
+
+    Optional<Block> findByBlockIdAndTodo_Folder_Goal_Member_MemberId(Long blockId, Long memberId);
+}

src/main/java/com/umc/timeto/block/service/BlockService.java

@@ -0,0 +1,33 @@
+package com.umc.timeto.block.service;
+
+import com.umc.timeto.block.dto.BlockAddDTO;
+import com.umc.timeto.block.dto.BlockResponseDTO;
+import com.umc.timeto.block.dto.BlockResponseDetailDTO;
+import com.umc.timeto.block.dto.BlockResponseNumDTO;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.YearMonth;
+import java.util.List;
+
+public interface BlockService {
+    BlockResponseDTO createBlock(Long todoId, BlockAddDTO req, Long memberId);
+
+
+    List<BlockResponseDetailDTO> getBlockByDay(LocalDate date, Long memberId);
+
+    List<BlockResponseNumDTO> getBlockNumByMonth(YearMonth yearMonth, Long memberId);
+
+    BlockResponseDTO updateBlockDuration(Long blockId, Long memberId, LocalTime newDuration);
+    void updateBlockDurationByTodo(Long todoId, Long memberId, LocalTime newDuration);
+
+
+    BlockResponseDTO moveBlock(Long blockId, Long memberId, LocalDateTime newStart);
+
+
+
+
+
+
+}