[FEAT] 종소리 관련 API V2 제작

src/main/java/com/debatetimer/config/ErrorDecoderConfig.java

@@ -0,0 +1,33 @@
+package com.debatetimer.config;
+
+import com.debatetimer.exception.decoder.H2ErrorDecoder;
+import com.debatetimer.exception.decoder.MySqlErrorDecoder;
+import com.debatetimer.exception.decoder.RepositoryErrorDecoder;
+import lombok.NoArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@NoArgsConstructor(access = lombok.AccessLevel.PRIVATE)
+public class ErrorDecoderConfig {
+
+    @Profile({"dev", "prod"})
+    @Configuration
+    public static class MySqlErrorDecoderConfig {
+
+        @Bean
+        public RepositoryErrorDecoder mySqlErrorDecoder() {
+            return new MySqlErrorDecoder();
+        }
+    }
+
+    @Profile({"test", "local"})
+    @Configuration
+    public static class H2ErrorDecoderConfig {
+
+        @Bean
+        public RepositoryErrorDecoder h2ErrorDecoder() {
+            return new H2ErrorDecoder();
+        }
+    }
+}

src/main/java/com/debatetimer/controller/poll/VoteController.java

@@ -0,0 +1,37 @@
+package com.debatetimer.controller.poll;
+
+import com.debatetimer.dto.poll.request.VoteRequest;
+import com.debatetimer.dto.poll.response.VoteCreateResponse;
+import com.debatetimer.dto.poll.response.VoterPollInfoResponse;
+import com.debatetimer.service.poll.VoteService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class VoteController {
+
+    private final VoteService voteService;
+
+    @GetMapping("/api/polls/{pollId}/votes")
+    @ResponseStatus(HttpStatus.OK)
+    public VoterPollInfoResponse getVotersPollInfo(@PathVariable long pollId) {
+        return voteService.getVoterPollInfo(pollId);
+    }
+
+    @PostMapping("/api/polls/{pollId}/votes")
+    @ResponseStatus(HttpStatus.CREATED)
+    public VoteCreateResponse votePoll(
+            @PathVariable long pollId,
+            @RequestBody @Valid VoteRequest voteRequest
+    ) {
+        return voteService.vote(pollId, voteRequest);
+    }
+}

src/main/java/com/debatetimer/domain/customize/Bell.java

@@ -9,22 +9,18 @@ public class Bell {
 
     public static final int MAX_BELL_COUNT = 3;
 
+    private final BellType type;
     private final int time;
     private final int count;
 
-    public Bell(int time, int count) {
-        validateTime(time);
+    public Bell(BellType type, int time, int count) {
+        type.validateTime(time);
         validateCount(count);
+        this.type = type;
         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/domain/customize/BellType.java

@@ -0,0 +1,25 @@
+package com.debatetimer.domain.customize;
+
+import com.debatetimer.exception.custom.DTClientErrorException;
+import com.debatetimer.exception.errorcode.ClientErrorCode;
+import java.util.function.IntPredicate;
+
+public enum BellType {
+
+    AFTER_START(time -> time >= 0),
+    BEFORE_END(time -> time >= 0),
+    AFTER_END(time -> time <= 0),
+    ;
+
+    private final IntPredicate timeValidator;
+
+    BellType(IntPredicate timeValidator) {
+        this.timeValidator = timeValidator;
+    }
+
+    public void validateTime(int time) {
+        if (!timeValidator.test(time)) {
+            throw new DTClientErrorException(ClientErrorCode.INVALID_BELL_TIME);
+        }
+    }
+}

src/main/java/com/debatetimer/domain/member/Member.java

@@ -1,6 +1,6 @@
 package com.debatetimer.domain.member;
 
-import com.debatetimer.entity.customize.BaseTimeEntity;
+import com.debatetimer.entity.BaseTimeEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

src/main/java/com/debatetimer/domain/poll/Poll.java

@@ -26,4 +26,8 @@ public Poll(Long id, long tableId, long memberId, PollStatus status,
                 String prosTeamName, String consTeamName, String agenda) {
         this(id, tableId, memberId, status, new TeamName(prosTeamName), new TeamName(consTeamName), new Agenda(agenda));
     }
+
+    public boolean isProgress() {
+        return status.isProgress();
+    }
 }

src/main/java/com/debatetimer/domain/poll/PollStatus.java

@@ -5,4 +5,8 @@ public enum PollStatus {
     PROGRESS,
     DONE,
     ;
+
+    public boolean isProgress() {
+        return this == PROGRESS;
+    }
 }

src/main/java/com/debatetimer/domain/poll/Vote.java

@@ -13,6 +13,10 @@ public class Vote {
     private final ParticipantName name;
     private final ParticipateCode code;
 
+    public Vote(long pollId, VoteTeam team, String name, String code) {
+        this(null, pollId, team, name, code);
+    }
+
     public Vote(Long id, long pollId, VoteTeam team, String name, String code) {
         this(id, pollId, team, new ParticipantName(name), new ParticipateCode(code));
     }

src/main/java/com/debatetimer/service/customize/CustomizeServiceV2.java → src/main/java/com/debatetimer/domainrepository/customize/CustomizeTableDomainRepository.java

@@ -1,10 +1,8 @@
-package com.debatetimer.service.customize;
+package com.debatetimer.domainrepository.customize;
 
 import com.debatetimer.domain.customize.CustomizeTable;
 import com.debatetimer.domain.customize.CustomizeTimeBox;
 import com.debatetimer.domain.member.Member;
-import com.debatetimer.dto.customize.request.CustomizeTableCreateRequest;
-import com.debatetimer.dto.customize.response.CustomizeTableResponse;
 import com.debatetimer.entity.customize.BellEntity;
 import com.debatetimer.entity.customize.CustomizeTableEntity;
 import com.debatetimer.entity.customize.CustomizeTimeBoxEntities;
@@ -15,84 +13,77 @@
 import java.util.List;
 import java.util.stream.IntStream;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-@Service
+@Repository
 @RequiredArgsConstructor
-public class CustomizeServiceV2 {
+public class CustomizeTableDomainRepository {
 
     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);
-        List<CustomizeTimeBox> timeBoxes = tableCreateRequest.toTimeBoxList();
-
+    public CustomizeTable save(CustomizeTable table, List<CustomizeTimeBox> timeBoxes) {
         CustomizeTableEntity savedTableEntity = tableRepository.save(new CustomizeTableEntity(table));
         saveTimeBoxes(savedTableEntity, timeBoxes);
-        return new CustomizeTableResponse(savedTableEntity.toDomain(), timeBoxes);
+
+        return savedTableEntity.toDomain();
+    }
+
+    private void saveTimeBoxes(CustomizeTableEntity tableEntity, List<CustomizeTimeBox> timeBoxes) {
+        IntStream.range(0, timeBoxes.size())
+                .forEach(i -> saveTimeBox(tableEntity, timeBoxes.get(i), i + 1));
+    }
+
+    private void saveTimeBox(CustomizeTableEntity tableEntity, CustomizeTimeBox timeBox, int sequence) {
+        CustomizeTimeBoxEntity timeBoxEntity = timeBoxRepository.save(
+                new CustomizeTimeBoxEntity(tableEntity, timeBox, sequence));
+        timeBox.getBells()
+                .forEach(bell -> bellRepository.save(new BellEntity(timeBoxEntity, bell)));
     }
 
     @Transactional(readOnly = true)
-    public CustomizeTableResponse findTable(long tableId, Member member) {
+    public CustomizeTable getByIdAndMember(long tableId, Member member) {
+        return tableRepository.getByIdAndMember(tableId, member)
+                .toDomain();
+    }
+
+    @Transactional(readOnly = true)
+    public List<CustomizeTimeBox> getCustomizeTimeBoxes(long tableId, Member member) {
         CustomizeTableEntity tableEntity = tableRepository.getByIdAndMember(tableId, member);
         List<CustomizeTimeBoxEntity> timeBoxEntityList = timeBoxRepository.findAllByCustomizeTable(tableEntity);
         List<BellEntity> bellEntityList = bellRepository.findAllByCustomizeTimeBoxIn(timeBoxEntityList);
         CustomizeTimeBoxEntities timeBoxEntities = new CustomizeTimeBoxEntities(timeBoxEntityList, bellEntityList);
-
-        return new CustomizeTableResponse(tableEntity.toDomain(), timeBoxEntities.toDomain());
+        return timeBoxEntities.toDomain();
     }
 
     @Transactional
-    public CustomizeTableResponse updateTable(
-            CustomizeTableCreateRequest tableCreateRequest,
-            long tableId,
-            Member member
-    ) {
+    public CustomizeTable update(CustomizeTable table, long tableId, Member member, List<CustomizeTimeBox> timeBoxes) {
         CustomizeTableEntity tableEntity = tableRepository.getByIdAndMember(tableId, member);
-        tableEntity.updateTable(tableCreateRequest.toTable(member));
+        tableEntity.updateTable(table);
 
         bellRepository.deleteAllByTable(tableEntity.getId());
         timeBoxRepository.deleteAllByTable(tableEntity.getId());
-        List<CustomizeTimeBox> timeBoxes = tableCreateRequest.toTimeBoxList();
+
         saveTimeBoxes(tableEntity, timeBoxes);
-        return new CustomizeTableResponse(tableEntity.toDomain(), timeBoxes);
+        return tableEntity.toDomain();
     }
 
     @Transactional
-    public CustomizeTableResponse updateUsedAt(long tableId, Member member) {
+    public CustomizeTable updateUsedAt(long tableId, Member member) {
         CustomizeTableEntity tableEntity = tableRepository.getByIdAndMember(tableId, member);
-        List<CustomizeTimeBoxEntity> timeBoxEntityList = timeBoxRepository.findAllByCustomizeTable(tableEntity);
-        List<BellEntity> bellEntityList = bellRepository.findAllByCustomizeTimeBoxIn(timeBoxEntityList);
-        CustomizeTimeBoxEntities timeBoxEntities = new CustomizeTimeBoxEntities(timeBoxEntityList, bellEntityList);
-
         tableEntity.updateUsedAt();
-        CustomizeTable table = tableEntity.toDomain();
-        List<CustomizeTimeBox> timeBoxes = timeBoxEntities.toDomain();
-        return new CustomizeTableResponse(table, timeBoxes);
+        return tableEntity.toDomain();
     }
 
     @Transactional
-    public void deleteTable(long tableId, Member member) {
+    public void delete(long tableId, Member member) {
         CustomizeTableEntity table = tableRepository.getByIdAndMember(tableId, member);
 
         bellRepository.deleteAllByTable(table.getId());
         timeBoxRepository.deleteAllByTable(table.getId());
         tableRepository.delete(table);
     }
-
-    private void saveTimeBoxes(CustomizeTableEntity tableEntity, List<CustomizeTimeBox> timeBoxes) {
-        IntStream.range(0, timeBoxes.size())
-                .forEach(i -> saveTimeBox(tableEntity, timeBoxes.get(i), i + 1));
-    }
-
-    private void saveTimeBox(CustomizeTableEntity tableEntity, CustomizeTimeBox timeBox, int sequence) {
-        CustomizeTimeBoxEntity timeBoxEntity = timeBoxRepository.save(
-                new CustomizeTimeBoxEntity(tableEntity, timeBox, sequence));
-        timeBox.getBells()
-                .forEach(bell -> bellRepository.save(new BellEntity(timeBoxEntity, bell)));
-    }
 }

src/main/java/com/debatetimer/domainrepository/poll/PollDomainRepository.java

@@ -2,8 +2,6 @@
 
 import com.debatetimer.domain.poll.Poll;
 import com.debatetimer.entity.poll.PollEntity;
-import com.debatetimer.exception.custom.DTClientErrorException;
-import com.debatetimer.exception.errorcode.ClientErrorCode;
 import com.debatetimer.repository.poll.PollRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
@@ -24,19 +22,20 @@ public Poll create(Poll poll) {
 
     @Transactional(readOnly = true)
     public Poll getByIdAndMemberId(long id, long memberId) {
-        return findPoll(id, memberId)
+        return pollRepository.getByIdAndMemberId(id, memberId)
+                .toDomain();
+    }
+
+    @Transactional(readOnly = true)
+    public Poll getById(long id) {
+        return pollRepository.getById(id)
                 .toDomain();
     }
 
     @Transactional
     public Poll finishPoll(long pollId, long memberId) {
-        PollEntity pollEntity = findPoll(pollId, memberId);
+        PollEntity pollEntity = pollRepository.getByIdAndMemberId(pollId, memberId);
         pollEntity.updateToDone();
         return pollEntity.toDomain();
     }
-
-    private PollEntity findPoll(long pollId, long memberId) {
-        return pollRepository.findByIdAndMemberId(pollId, memberId)
-                .orElseThrow(() -> new DTClientErrorException(ClientErrorCode.POLL_NOT_FOUND));
-    }
 }