[FEAT] 종소리 커스텀 기능

src/main/java/com/debatetimer/dto/customize/request/BellRequest.java

@@ -0,0 +1,7 @@
+package com.debatetimer.dto.customize.request;
+
+public record BellRequest(
+        int time,
+        int count
+) {
+}

src/main/java/com/debatetimer/dto/customize/request/CustomizeTimeBoxCreateRequest.java

@@ -7,6 +7,7 @@
 import com.debatetimer.entity.customize.CustomizeTimeBox;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import java.util.List;
 import org.springframework.lang.Nullable;
 
 public record CustomizeTimeBoxCreateRequest(
@@ -22,6 +23,9 @@ public record CustomizeTimeBoxCreateRequest(
         @Nullable
         Integer time,
 
+        @Nullable
+        List<BellRequest> bell,
+
         @Nullable
         Integer timePerTeam,
 

src/main/java/com/debatetimer/dto/customize/response/BellResponse.java

@@ -0,0 +1,7 @@
+package com.debatetimer.dto.customize.response;
+
+public record BellResponse(
+        int time,
+        int count
+) {
+}

src/main/java/com/debatetimer/dto/customize/response/CustomizeTableResponse.java

@@ -15,6 +15,13 @@ public CustomizeTableResponse(
                 toTimeBoxResponses(customizeTimeBoxes));
     }
 
+    public CustomizeTableResponse(
+            CustomizeTable customizeTable,
+            List<CustomizeTimeBoxResponse> timeBoxResponses
+    ) {
+        this(customizeTable.getId(), new CustomizeTableInfoResponse(customizeTable), timeBoxResponses);
+    }
+
     private static List<CustomizeTimeBoxResponse> toTimeBoxResponses(CustomizeTimeBoxes timeBoxes) {
         List<CustomizeTimeBox> customizeTimeBoxes = timeBoxes.getTimeBoxes();
         return customizeTimeBoxes

src/main/java/com/debatetimer/dto/customize/response/CustomizeTimeBoxResponse.java

@@ -3,12 +3,14 @@
 import com.debatetimer.domain.customize.CustomizeBoxType;
 import com.debatetimer.domain.customize.Stance;
 import com.debatetimer.entity.customize.CustomizeTimeBox;
+import java.util.List;
 
 public record CustomizeTimeBoxResponse(
         Stance stance,
         String speechType,
         CustomizeBoxType boxType,
         Integer time,
+        List<BellResponse> bell,
         Integer timePerTeam,
         Integer timePerSpeaking,
         String speaker
@@ -20,6 +22,20 @@ public CustomizeTimeBoxResponse(CustomizeTimeBox customizeTimeBox) {
                 customizeTimeBox.getSpeechType(),
                 customizeTimeBox.getBoxType(),
                 convertTime(customizeTimeBox),
+                null,
+                customizeTimeBox.getTimePerTeam(),
+                customizeTimeBox.getTimePerSpeaking(),
+                customizeTimeBox.getSpeaker()
+        );
+    }
+
+    public CustomizeTimeBoxResponse(CustomizeTimeBox customizeTimeBox, List<BellResponse> bell) {
+        this(
+                customizeTimeBox.getStance(),
+                customizeTimeBox.getSpeechType(),
+                customizeTimeBox.getBoxType(),
+                convertTime(customizeTimeBox),
+                bell,
                 customizeTimeBox.getTimePerTeam(),
                 customizeTimeBox.getTimePerSpeaking(),
                 customizeTimeBox.getSpeaker()

src/main/java/com/debatetimer/entity/customize/BellEntity.java

@@ -0,0 +1,60 @@
+package com.debatetimer.entity.customize;
+
+import com.debatetimer.exception.custom.DTClientErrorException;
+import com.debatetimer.exception.errorcode.ClientErrorCode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Table(name = "bell")
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class BellEntity {
+
+    public static final int MAX_BELL_COUNT = 3;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @NotNull
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "customize_time_box_id")
+    private CustomizeTimeBox customizeTimeBox;
+
+    @Column(name = "bell_time")
+    private int time;
+    private int count;
+
+    public BellEntity(CustomizeTimeBox customizeTimeBox, int time, int count) {
+        validateTime(time);
+        validateCount(count);
+
+        this.customizeTimeBox = customizeTimeBox;
+        this.time = time;
+        this.count = count;
+    }
+
+    private void validateTime(int time) {
+        if (time < 0) {
+            throw new DTClientErrorException(ClientErrorCode.INVALID_BELL_TIME);
+        }
+    }
+
+    private void validateCount(int count) {
+        if (count <= 0 || count > MAX_BELL_COUNT) {
+            throw new DTClientErrorException(ClientErrorCode.INVALID_BELL_COUNT);
+        }
+    }
+}

src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java

@@ -3,6 +3,7 @@
 import com.debatetimer.domain.customize.Agenda;
 import com.debatetimer.domain.customize.TableName;
 import com.debatetimer.domain.customize.TeamName;
+import com.debatetimer.entity.customize.BellEntity;
 import com.debatetimer.entity.customize.CustomizeTimeBox;
 import lombok.Getter;
 import org.springframework.http.HttpStatus;
@@ -65,6 +66,9 @@ public enum ClientErrorCode implements ResponseErrorCode {
     ALREADY_DISCONNECTED(HttpStatus.BAD_REQUEST, "이미 클라이언트에서 요청이 종료되었습니다."),
     NO_COOKIE_FOUND(HttpStatus.BAD_REQUEST, "필수 쿠키 값이 존재하지 않습니다."),
     FILE_UPLOAD_ERROR(HttpStatus.BAD_REQUEST, "파일 업로드에 실패했습니다."),
+
+    INVALID_BELL_TIME(HttpStatus.BAD_REQUEST, "벨 시간은 0 이상의 정수여야 합니다."),
+    INVALID_BELL_COUNT(HttpStatus.BAD_REQUEST, "벨 카운트는 1 이상 %d 이하의 정수여야 합니다.".formatted(BellEntity.MAX_BELL_COUNT)),
     ;
 
     private final HttpStatus status;

src/main/java/com/debatetimer/repository/customize/BellRepository.java

@@ -0,0 +1,17 @@
+package com.debatetimer.repository.customize;
+
+import com.debatetimer.entity.customize.BellEntity;
+import com.debatetimer.entity.customize.CustomizeTimeBox;
+import java.util.List;
+import org.springframework.data.repository.Repository;
+
+public interface BellRepository extends Repository<BellEntity, Long> {
+
+    BellEntity save(BellEntity bell);
+
+    List<BellEntity> findByCustomizeTimeBox(CustomizeTimeBox customizeTimeBox);
+
+    void deleteAllByCustomizeTimeBoxIn(List<CustomizeTimeBox> customizeTimeBoxes);
+
+    List<BellEntity> findAllByCustomizeTimeBoxIn(List<CustomizeTimeBox> timeBoxes);
+}

src/main/java/com/debatetimer/service/customize/CustomizeService.java

@@ -6,8 +6,6 @@
 import com.debatetimer.dto.customize.request.CustomizeTableCreateRequest;
 import com.debatetimer.dto.customize.response.CustomizeTableResponse;
 import com.debatetimer.entity.customize.CustomizeTableEntity;
-import com.debatetimer.exception.custom.DTClientErrorException;
-import com.debatetimer.exception.errorcode.ClientErrorCode;
 import com.debatetimer.repository.customize.CustomizeTableRepository;
 import com.debatetimer.repository.customize.CustomizeTimeBoxRepository;
 import java.util.List;
@@ -33,8 +31,7 @@ public CustomizeTableResponse save(CustomizeTableCreateRequest tableCreateReques
 
     @Transactional(readOnly = true)
     public CustomizeTableResponse findTable(long tableId, Member member) {
-        CustomizeTableEntity tableEntity = tableRepository.findByIdAndMember(tableId, member)
-                .orElseThrow(() -> new DTClientErrorException(ClientErrorCode.TABLE_NOT_FOUND));
+        CustomizeTableEntity tableEntity = tableRepository.getByIdAndMember(tableId, member);
         CustomizeTimeBoxes timeBoxes = timeBoxRepository.findTableTimeBoxes(tableEntity);
         return new CustomizeTableResponse(tableEntity.toDomain(), timeBoxes);
     }
@@ -56,8 +53,7 @@ public CustomizeTableResponse updateTable(
 
     @Transactional
     public CustomizeTableResponse updateUsedAt(long tableId, Member member) {
-        CustomizeTableEntity tableEntity = tableRepository.findByIdAndMember(tableId, member)
-                .orElseThrow(() -> new DTClientErrorException(ClientErrorCode.TABLE_NOT_FOUND));
+        CustomizeTableEntity tableEntity = tableRepository.getByIdAndMember(tableId, member);
         CustomizeTimeBoxes timeBoxes = timeBoxRepository.findTableTimeBoxes(tableEntity);
         tableEntity.updateUsedAt();
 
@@ -66,8 +62,7 @@ public CustomizeTableResponse updateUsedAt(long tableId, Member member) {
 
     @Transactional
     public void deleteTable(long tableId, Member member) {
-        CustomizeTableEntity table = tableRepository.findByIdAndMember(tableId, member)
-                .orElseThrow(() -> new DTClientErrorException(ClientErrorCode.TABLE_NOT_FOUND));
+        CustomizeTableEntity table = tableRepository.getByIdAndMember(tableId, member);
         timeBoxRepository.deleteAllByTable(table);
         tableRepository.delete(table);
     }

src/main/java/com/debatetimer/service/customize/CustomizeServiceV2.java

@@ -0,0 +1,136 @@
+package com.debatetimer.service.customize;
+
+import com.debatetimer.domain.customize.CustomizeTable;
+import com.debatetimer.domain.customize.CustomizeTimeBoxes;
+import com.debatetimer.domain.member.Member;
+import com.debatetimer.dto.customize.request.BellRequest;
+import com.debatetimer.dto.customize.request.CustomizeTableCreateRequest;
+import com.debatetimer.dto.customize.request.CustomizeTimeBoxCreateRequest;
+import com.debatetimer.dto.customize.response.BellResponse;
+import com.debatetimer.dto.customize.response.CustomizeTableResponse;
+import com.debatetimer.dto.customize.response.CustomizeTimeBoxResponse;
+import com.debatetimer.entity.customize.BellEntity;
+import com.debatetimer.entity.customize.CustomizeTableEntity;
+import com.debatetimer.entity.customize.CustomizeTimeBox;
+import com.debatetimer.repository.customize.BellRepository;
+import com.debatetimer.repository.customize.CustomizeTableRepository;
+import com.debatetimer.repository.customize.CustomizeTimeBoxRepository;
+import java.util.List;
+import java.util.stream.IntStream;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class CustomizeServiceV2 {
+
+    private final CustomizeTableRepository tableRepository;
+    private final CustomizeTimeBoxRepository timeBoxRepository;
+    private final BellRepository bellRepository;
+
+    @Transactional
+    public CustomizeTableResponse save(CustomizeTableCreateRequest tableCreateRequest, Member member) {
+        CustomizeTable table = tableCreateRequest.toTable(member);
+        CustomizeTableEntity savedTable = tableRepository.save(new CustomizeTableEntity(table));
+
+        return saveTimeBoxesAndBells(tableCreateRequest, savedTable.toDomain());
+    }
+
+    @Transactional(readOnly = true)
+    public CustomizeTableResponse findTable(long tableId, Member member) {
+        CustomizeTableEntity tableEntity = tableRepository.getByIdAndMember(tableId, member);
+        CustomizeTimeBoxes timeBoxes = timeBoxRepository.findTableTimeBoxes(tableEntity);
+        List<CustomizeTimeBoxResponse> timeBoxResponses = timeBoxes.getTimeBoxes()
+                .stream()
+                .map(this::getTimeBoxResponse)
+                .toList();
+        return new CustomizeTableResponse(tableEntity.toDomain(), timeBoxResponses);
+    }
+
+    @Transactional
+    public CustomizeTableResponse updateTable(
+            CustomizeTableCreateRequest tableCreateRequest,
+            long tableId,
+            Member member
+    ) {
+        CustomizeTableEntity existingTable = tableRepository.getByIdAndMember(tableId, member);
+        CustomizeTable renewedTable = tableCreateRequest.toTable(member);
+        existingTable.updateTable(renewedTable);
+
+        deleteBell(timeBoxRepository.findTableTimeBoxes(existingTable));
+        timeBoxRepository.deleteAllByTable(existingTable);
+        return saveTimeBoxesAndBells(tableCreateRequest, existingTable.toDomain());
+    }
+
+    @Transactional
+    public CustomizeTableResponse updateUsedAt(long tableId, Member member) {
+        CustomizeTableEntity tableEntity = tableRepository.getByIdAndMember(tableId, member);
+        CustomizeTimeBoxes timeBoxes = timeBoxRepository.findTableTimeBoxes(tableEntity);
+        tableEntity.updateUsedAt();
+        List<CustomizeTimeBoxResponse> timeBoxResponses = timeBoxes.getTimeBoxes()
+                .stream()
+                .map(this::getTimeBoxResponse)
+                .toList();
+        return new CustomizeTableResponse(tableEntity.toDomain(), timeBoxResponses);
+    }
+
+    @Transactional
+    public void deleteTable(long tableId, Member member) {
+        CustomizeTableEntity table = tableRepository.getByIdAndMember(tableId, member);
+
+        deleteBell(timeBoxRepository.findTableTimeBoxes(table));
+        timeBoxRepository.deleteAllByTable(table);
+        tableRepository.delete(table);
+    }
+
+    private CustomizeTableResponse saveTimeBoxesAndBells(
+            CustomizeTableCreateRequest tableCreateRequest,
+            CustomizeTable table
+    ) {
+        List<CustomizeTimeBoxCreateRequest> timeBoxCreateRequests = tableCreateRequest.table();
+        List<CustomizeTimeBoxResponse> timeBoxResponses = IntStream.range(0, timeBoxCreateRequests.size())
+                .mapToObj(i -> createTimeBoxResponse(timeBoxCreateRequests.get(i), table, i + 1))
+                .toList();
+        return new CustomizeTableResponse(table, timeBoxResponses);
+    }
+
+    private CustomizeTimeBoxResponse createTimeBoxResponse(
+            CustomizeTimeBoxCreateRequest request,
+            CustomizeTable table,
+            int sequence
+    ) {
+        CustomizeTimeBox savedTimeBox = timeBoxRepository.save(request.toTimeBox(table, sequence));
+        return createTimeBoxResponse(request.bell(), savedTimeBox);
+    }
+
+    private CustomizeTimeBoxResponse createTimeBoxResponse(List<BellRequest> bellRequests, CustomizeTimeBox timeBox) {
+        if (timeBox.getBoxType().isTimeBased()) {
+            return new CustomizeTimeBoxResponse(timeBox, null);
+        }
+
+        List<BellResponse> bellResponses = bellRequests
+                .stream()
+                .map(bellRequest -> new BellEntity(timeBox, bellRequest.time(), bellRequest.count()))
+                .map(bellRepository::save)
+                .map(bell -> new BellResponse(bell.getTime(), bell.getCount()))
+                .toList();
+        return new CustomizeTimeBoxResponse(timeBox, bellResponses);
+    }
+
+    private CustomizeTimeBoxResponse getTimeBoxResponse(CustomizeTimeBox timeBox) {
+        if (timeBox.getBoxType().isTimeBased()) {
+            return new CustomizeTimeBoxResponse(timeBox, null);
+        }
+
+        List<BellResponse> bellResponses = bellRepository.findByCustomizeTimeBox(timeBox)
+                .stream()
+                .map(bell -> new BellResponse(bell.getTime(), bell.getCount()))
+                .toList();
+        return new CustomizeTimeBoxResponse(timeBox, bellResponses);
+    }
+
+    private void deleteBell(CustomizeTimeBoxes savedCustomizeTimeBoxes) {
+        bellRepository.deleteAllByCustomizeTimeBoxIn(savedCustomizeTimeBoxes.getTimeBoxes());
+    }
+}

src/main/resources/db/migration/V10__add_bell_table.sql

@@ -0,0 +1,13 @@
+create table bell
+(
+    id           bigint auto_increment,
+    bell_time    bigint       not null,
+    count       bigint not null,
+    customize_time_box_id bigint not null,
+    primary key (id)
+);
+
+alter table bell
+    add constraint bell_to_customize_time_box
+        foreign key (customize_time_box_id)
+            references customize_time_box(id);

src/test/java/com/debatetimer/controller/BaseControllerTest.java

@@ -4,6 +4,7 @@
 import com.debatetimer.client.oauth.OAuthClient;
 import com.debatetimer.domain.customize.CustomizeBoxType;
 import com.debatetimer.domain.customize.Stance;
+import com.debatetimer.dto.customize.request.BellRequest;
 import com.debatetimer.dto.customize.request.CustomizeTableCreateRequest;
 import com.debatetimer.dto.customize.request.CustomizeTableInfoCreateRequest;
 import com.debatetimer.dto.customize.request.CustomizeTimeBoxCreateRequest;
@@ -97,8 +98,15 @@ private ArbitraryBuilder<CustomizeTimeBoxCreateRequest> getCustomizeTimeBoxCreat
                 .set("speechType", "입론1")
                 .set("boxType", CustomizeBoxType.NORMAL)
                 .set("time", 120)
+                .set("bell", getBellRequestBuilder().sampleList(2))
                 .set("timePerTeam", 60)
                 .set("timePerSpeaking", null)
                 .set("speaker", "발언자");
     }
+
+    private ArbitraryBuilder<BellRequest> getBellRequestBuilder() {
+        return fixtureMonkey.giveMeBuilder(BellRequest.class)
+                .set("time", 30)
+                .set("count", 1);
+    }
 }