Merge pull request #318 from woowacourse-teams/fix/#314

[FIX] 중복 투표 예외 처리 및 닉네임 길이 검증 추가
woowacourse-teams · Oct 11, 2024 · 04f306c · 04f306c
2 parents 924d42c + ce5c1e7
commit 04f306c
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 107 deletions.
diff --git a/backend/src/main/java/ddangkong/domain/room/member/Member.java b/backend/src/main/java/ddangkong/domain/room/member/Member.java
@@ -2,6 +2,7 @@
 
 import ddangkong.domain.room.Room;
 import ddangkong.exception.room.member.AlreadyMasterException;
+import ddangkong.exception.room.member.InvalidNicknameException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -20,6 +21,9 @@
 @Getter
 public class Member {
 
+    private static final int NICKNAME_MIN_LENGTH = 2;
+    private static final int NICKNAME_MAX_LENGTH = 12;
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -35,11 +39,18 @@ public class Member {
     private boolean isMaster;
 
     private Member(String nickname, Room room, boolean isMaster) {
+        validateNickname(nickname);
         this.nickname = nickname;
         this.room = room;
         this.isMaster = isMaster;
     }
 
+    private void validateNickname(String nickname) {
+        if (nickname.length() < NICKNAME_MIN_LENGTH || nickname.length() > NICKNAME_MAX_LENGTH) {
+            throw new InvalidNicknameException(NICKNAME_MIN_LENGTH, NICKNAME_MAX_LENGTH);
+        }
+    }
+
     public static Member createMaster(String nickname, Room room) {
         return new Member(nickname, room, true);
     }

diff --git a/backend/src/main/java/ddangkong/exception/ClientErrorCode.java b/backend/src/main/java/ddangkong/exception/ClientErrorCode.java
@@ -35,6 +35,7 @@ public enum ClientErrorCode {
     NOT_EXIST_COMMON("일반 멤버가 존재하지 않습니다."),
     EXCEED_MAX_MEMBER_COUNT("방의 최대 인원을 초과했습니다. 현재 멤버 수: %d"),
     NOT_ROOM_MEMBER("방에 존재하지 않는 멤버입니다."),
+    INVALID_NICKNAME("닉네임은 최소 %d글자, 최대 %d글자여야 합니다."),
 
     // RoomContent
     NOT_FOUND_ROOM_CONTENT("방에 존재하지 않는 컨텐츠입니다."),

diff --git a/backend/src/main/java/ddangkong/exception/room/member/InvalidNicknameException.java b/backend/src/main/java/ddangkong/exception/room/member/InvalidNicknameException.java
@@ -0,0 +1,17 @@
+package ddangkong.exception.room.member;
+
+import static ddangkong.exception.ClientErrorCode.INVALID_NICKNAME;
+
+import ddangkong.exception.BadRequestException;
+
+public class InvalidNicknameException extends BadRequestException {
+
+    public InvalidNicknameException(int minLength, int maxLength) {
+        super(INVALID_NICKNAME.getMessage().formatted(minLength, maxLength));
+    }
+
+    @Override
+    public String getErrorCode() {
+        return INVALID_NICKNAME.name();
+    }
+}
diff --git a/backend/src/main/java/ddangkong/facade/room/dto/RoomJoinRequest.java b/backend/src/main/java/ddangkong/facade/room/dto/RoomJoinRequest.java
@@ -5,5 +5,5 @@
 public record RoomJoinRequest(
         @NotBlank
         String nickname
-) { // todo validation 닉네임 정책
+) {
 }
diff --git a/backend/src/main/java/ddangkong/service/room/balance/roomvote/RoomBalanceVoteService.java b/backend/src/main/java/ddangkong/service/room/balance/roomvote/RoomBalanceVoteService.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,11 +24,18 @@ public class RoomBalanceVoteService {
 
     @Transactional
     public RoomBalanceVote createVote(Member member, BalanceOptions balanceOptions, Long votedOptionId) {
-        for (BalanceOption option : balanceOptions.getOptions()) {
-            validDuplicatedVote(member, option);
-        }
+        validDuplicatedVotes(member, balanceOptions);
         BalanceOption votedOption = balanceOptions.getOptionById(votedOptionId);
-        return roomVoteRepository.save(new RoomBalanceVote(member, votedOption));
+        try {
+            return roomVoteRepository.save(new RoomBalanceVote(member, votedOption));
+        } catch (DataIntegrityViolationException e) {
+            throw new AlreadyVotedException(member.getNickname(), votedOption.getName());
+        }
+    }
+
+    private void validDuplicatedVotes(Member member, BalanceOptions balanceOptions) {
+        balanceOptions.getOptions()
+                .forEach(balanceOption -> validDuplicatedVote(member, balanceOption));
     }
 
     private void validDuplicatedVote(Member member, BalanceOption balanceOption) {

diff --git a/backend/src/test/java/ddangkong/controller/room/RoomControllerTest.java b/backend/src/test/java/ddangkong/controller/room/RoomControllerTest.java
@@ -5,26 +5,30 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import ddangkong.controller.BaseControllerTest;
+import ddangkong.controller.exception.ErrorResponse;
 import ddangkong.domain.balance.content.BalanceContent;
 import ddangkong.domain.balance.content.Category;
 import ddangkong.domain.room.Room;
 import ddangkong.domain.room.RoomSetting;
 import ddangkong.domain.room.RoomStatus;
 import ddangkong.domain.room.balance.roomcontent.RoomContent;
 import ddangkong.domain.room.member.Member;
+import ddangkong.exception.ClientErrorCode;
 import ddangkong.facade.room.dto.InitialRoomResponse;
 import ddangkong.facade.room.dto.RoomInfoResponse;
 import ddangkong.facade.room.dto.RoomJoinRequest;
 import ddangkong.facade.room.dto.RoomJoinResponse;
-import ddangkong.facade.room.dto.RoomStatusResponse;
 import ddangkong.facade.room.dto.RoomSettingRequest;
+import ddangkong.facade.room.dto.RoomStatusResponse;
 import ddangkong.facade.room.dto.RoundFinishedResponse;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import java.util.Map;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.http.HttpStatus;
 
 class RoomControllerTest extends BaseControllerTest {
@@ -210,38 +214,6 @@ class 방_나가기 {
                     .then().log().all()
                     .statusCode(204);
         }
-
-        @Test
-        void 방_식별자가_0이하인_경우_예외를_발생한다() {
-            // given
-            Long roomId = 0L;
-            Long memberId = 1L;
-
-            // when & then
-            RestAssured.given().log().all()
-                    .contentType(ContentType.JSON)
-                    .pathParam("roomId", roomId)
-                    .pathParam("memberId", memberId)
-                    .when().delete(ENDPOINT)
-                    .then().log().all()
-                    .statusCode(400);
-        }
-
-        @Test
-        void 멤버_식별자가_0이하인_경우_예외를_발생한다() {
-            // given
-            Long roomId = 0L;
-            Long memberId = 1L;
-
-            // when & then
-            RestAssured.given().log().all()
-                    .contentType(ContentType.JSON)
-                    .pathParam("roomId", roomId)
-                    .pathParam("memberId", memberId)
-                    .when().delete(ENDPOINT)
-                    .then().log().all()
-                    .statusCode(400);
-        }
     }
 
     @Nested
@@ -258,16 +230,6 @@ class 게임_시작 {
                     .then().log().all()
                     .statusCode(204);
         }
-
-        @Test
-        void 방의_식별자가_음수인_경우_예외를_던진다() {
-            // when & then
-            RestAssured.given().log().all()
-                    .pathParam("roomId", -1L)
-                    .when().patch("/api/balances/rooms/{roomId}/start")
-                    .then().log().all()
-                    .statusCode(400);
-        }
     }
 
     @Nested
@@ -282,16 +244,6 @@ class 다음_라운드_진행 {
                     .then().log().all()
                     .statusCode(204);
         }
-
-        @Test
-        void 방의_식별자가_음수인_경우_예외를_던진다() {
-            // when & then
-            RestAssured.given().log().all()
-                    .pathParam("roomId", -1L)
-                    .when().patch("/api/balances/rooms/{roomId}/next-round")
-                    .then().log().all()
-                    .statusCode(400);
-        }
     }
 
     @Nested

diff --git a/...rc/test/java/ddangkong/controller/room/balance/roomcontent/RoomContentControllerTest.java b/...rc/test/java/ddangkong/controller/room/balance/roomcontent/RoomContentControllerTest.java
@@ -38,15 +38,5 @@ class 현재_방의_내용_조회 {
             // then
             assertThat(actual).isEqualTo(EXPECTED_RESPONSE);
         }
-
-        @Test
-        void 방의_식별자가_음수인_경우_예외를_던진다() {
-            // when & then
-            RestAssured.given().log().all()
-                    .pathParam("roomId", -1L)
-                    .when().get("/api/balances/rooms/{roomId}/content")
-                    .then().log().all()
-                    .statusCode(400);
-        }
     }
 }
diff --git a/...c/test/java/ddangkong/controller/room/balance/roomvote/RoomBalanceVoteControllerTest.java b/...c/test/java/ddangkong/controller/room/balance/roomvote/RoomBalanceVoteControllerTest.java
@@ -88,44 +88,6 @@ class 투표_생성 {
             // then
             assertThat(actual.optionId()).isEqualTo(optionA.getId());
         }
-
-        @Test
-        void 요청_경로의_아이디가_양수가_아닌_경우_400_에러로_응답한다() {
-            // given
-            RoomBalanceVoteRequest request = new RoomBalanceVoteRequest(keochan.getId(), optionA.getId());
-            Long roomId = 0L;
-
-            // when & then
-            assertThatCreateVoteIsBadRequest(roomId, balanceContent.getId(), request);
-        }
-
-        @Test
-        void 요청_바디의_아이디가_양수가_아닌_경우_400_에러로_응답한다() {
-            // given
-            RoomBalanceVoteRequest request = new RoomBalanceVoteRequest(0L, optionA.getId());
-
-            // when & then
-            assertThatCreateVoteIsBadRequest(room.getId(), balanceContent.getId(), request);
-        }
-
-        @Test
-        void 요청_바디의_아이디가_null인_경우_400_에러로_응답한다() {
-            // given
-            RoomBalanceVoteRequest request = new RoomBalanceVoteRequest(null, optionA.getId());
-
-            // when & then
-            assertThatCreateVoteIsBadRequest(room.getId(), balanceContent.getId(), request);
-        }
-
-        void assertThatCreateVoteIsBadRequest(Long roomId, Long contentId, RoomBalanceVoteRequest request) {
-            RestAssured.given().log().all()
-                    .body(request).contentType(ContentType.JSON)
-                    .pathParam("roomId", roomId)
-                    .pathParam("contentId", contentId)
-                    .when().post("/api/balances/rooms/{roomId}/contents/{contentId}/votes")
-                    .then().log().all()
-                    .statusCode(400);
-        }
     }
 
     @Nested

diff --git a/backend/src/test/java/ddangkong/domain/room/member/MemberTest.java b/backend/src/test/java/ddangkong/domain/room/member/MemberTest.java
@@ -1,14 +1,17 @@
 package ddangkong.domain.room.member;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import ddangkong.domain.room.Room;
 import ddangkong.domain.support.EntityTestUtils;
-import ddangkong.exception.BadRequestException;
 import ddangkong.exception.room.member.AlreadyMasterException;
+import ddangkong.exception.room.member.InvalidNicknameException;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 class MemberTest {
 
@@ -63,4 +66,23 @@ class 일반_유저인지_확인 {
             assertThat(actual).isFalse();
         }
     }
+
+    @Nested
+    class 닉네임_검증 {
+
+        @ParameterizedTest
+        @ValueSource(strings = {"01", "012345678912"})
+        void 닉네임_길이가_유효한_경우_예외가_발생하지_않는다(String name) {
+            // when & then
+            assertThatNoException().isThrownBy(() -> Member.createMaster(name, ROOM));
+        }
+
+        @ParameterizedTest
+        @ValueSource(strings = {"0", "", "0123456789123"})
+        void 닉네임_길이가_유효하지_않는_경우_예외를_발생시킨다(String name) {
+            // when & then
+            assertThatThrownBy(() -> Member.createMaster(name, ROOM))
+                    .isExactlyInstanceOf(InvalidNicknameException.class);
+        }
+    }
 }