[hotfix] 회원가입 / 닉네임 변경 / 투표하기 api 수정

src/main/java/konkuk/thip/config/OpenApiConfig.java

@@ -46,14 +46,24 @@ public class OpenApiConfig {
 
     @Value("${server.http-url}") private String httpUrl;
 
+    @Value(("${server.profile}")) private String profile;
+
     @Bean
     public OpenAPI openAPI() {
+        List<Server> serverList = switch (profile) {
+            case "prod" -> List.of(new Server().url(httpsUrl).description("HTTPS 배포 서버"));
+            case "dev" -> List.of(
+                    new Server().url(httpUrl).description("HTTP 개발 서버"),
+                    new Server().url(httpsUrl).description("HTTPS 배포 서버"),
+                    new Server().url("http://localhost:8080").description("로컬 개발 서버")
+            );
+            default -> List.of(
+                    new Server().url("http://localhost:8080").description("로컬 개발 서버")
+            );
+        };
+
         return new OpenAPI()
-                .servers(List.of(
-                        new Server().url(httpsUrl).description("HTTPS 배포 서버"),
-                        new Server().url(httpUrl).description("HTTP IP"),
-                        new Server().url("http://localhost:8080").description("로컬 개발 서버")
-                ))
+                .servers(serverList)
                 .components(setComponents())
                 .addSecurityItem(setSecurityItems());
     }

src/main/java/konkuk/thip/user/adapter/in/web/request/UserSignupRequest.java

@@ -2,6 +2,7 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 import konkuk.thip.user.application.port.in.dto.UserSignupCommand;
@@ -12,8 +13,9 @@ public record UserSignupRequest(
         @NotBlank(message = "aliasName은 필수입니다.")
         String aliasName,
 
-        @Schema(description = "사용자 닉네임", example = "홍길동_123")
-        @Pattern(regexp = "[가-힣a-zA-Z0-9]+", message = "닉네임은 한글, 영어, 숫자로만 구성되어야 합니다.(공백불가)")
+        @Schema(description = "사용자 닉네임", example = "thip")
+        @NotNull(message = "닉네임은 필수입니다.")
+        @Pattern(regexp = "[가-힣a-z0-9]+", message = "닉네임은 한글, 영어 소문자, 숫자로만 구성되어야 합니다.(공백불가)")
         @Size(max = 10, message = "닉네임은 최대 10자 입니다.")
         String nickname
 ) {

src/main/java/konkuk/thip/user/adapter/out/jpa/UserJpaEntity.java

@@ -24,7 +24,7 @@ public class UserJpaEntity extends BaseJpaEntity {
     @Column(length = 60, nullable = false)
     private String nickname;
 
-    @Column(name = "nickname_updated_at", nullable = false)
+    @Column(name = "nickname_updated_at", nullable = true) // 회원가입 시에는 null
     private LocalDate nicknameUpdatedAt; // 날짜 형식으로 저장 (예: "2023-10-01")
 
     @Column(name = "oauth2_id", length = 50, nullable = false)

src/main/java/konkuk/thip/user/application/service/UserSignupService.java

@@ -11,8 +11,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
-
 import static konkuk.thip.user.adapter.out.jpa.UserRole.USER;
 
 
@@ -29,7 +27,7 @@ public class UserSignupService implements UserSignupUseCase {
     public UserSignupResult signup(UserSignupCommand command) {
         Alias alias = Alias.from(command.aliasName());
         User user = User.withoutId(
-                command.nickname(), LocalDate.now(), USER.getType(), command.oauth2Id(), alias
+                command.nickname(), USER.getType(), command.oauth2Id(), alias
         );
         Long userId = userCommandPort.save(user);
         String accessToken = jwtUtil.createAccessToken(userId);

src/main/java/konkuk/thip/user/domain/User.java

@@ -26,11 +26,11 @@ public class User extends BaseDomainEntity {
 
     private Alias alias;
 
-    public static User withoutId(String nickname, LocalDate nicknameUpdatedAt, String userRole, String oauth2Id, Alias alias) {
+    public static User withoutId(String nickname, String userRole, String oauth2Id, Alias alias) {
         return User.builder()
                 .id(null)
                 .nickname(nickname)
-                .nicknameUpdatedAt(nicknameUpdatedAt)
+                .nicknameUpdatedAt(null)
                 .userRole(userRole)
                 .oauth2Id(oauth2Id)
                 .followerCount(0)

src/main/java/konkuk/thip/vote/adapter/in/web/VoteCommandController.java

@@ -13,6 +13,7 @@
 import konkuk.thip.vote.adapter.in.web.response.VoteResponse;
 import konkuk.thip.vote.application.port.in.VoteCreateUseCase;
 import konkuk.thip.vote.application.port.in.VoteUseCase;
+import konkuk.thip.vote.application.port.in.dto.VoteResult;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -55,8 +56,7 @@ public BaseResponse<VoteResponse> vote(
             @Parameter(description = "투표를 진행할 방 ID", example = "1") @PathVariable Long roomId,
             @Parameter(description = "투표할 투표 ID", example = "1") @PathVariable Long voteId,
             @Valid @RequestBody VoteRequest request) {
-        return BaseResponse.ok(VoteResponse.of(
-                        voteUseCase.vote(request.toCommand(userId, roomId, voteId)))
-        );
+        VoteResult voteResult = voteUseCase.vote(request.toCommand(userId, roomId, voteId));
+        return BaseResponse.ok(VoteResponse.of(voteResult.postId(), voteResult.roomId(), voteResult.voteItems()));
     }
 }

src/main/java/konkuk/thip/vote/adapter/in/web/response/VoteResponse.java

@@ -2,12 +2,15 @@
 
 import konkuk.thip.vote.application.port.in.dto.VoteResult;
 
+import java.util.List;
+
 public record VoteResponse(
-        Long voteItemId,
+        Long postId,
         Long roomId,
-        Boolean type
+        List<VoteResult.VoteItemDto> voteItems
 ) {
-    public static VoteResponse of(VoteResult voteResult) {
-        return new VoteResponse(voteResult.voteItemId(), voteResult.roomId(), voteResult.type());
+
+    public static VoteResponse of(Long postId, Long roomId, List<VoteResult.VoteItemDto> voteItems) {
+        return new VoteResponse(postId, roomId, voteItems);
     }
 }

src/main/java/konkuk/thip/vote/adapter/out/persistence/VoteQueryPersistenceAdapter.java

@@ -37,4 +37,9 @@ public Map<Long, List<VoteItemQueryDto>> findVoteItemsByVoteIds(Set<Long> voteId
                         )
                 );
     }
+
+    @Override
+    public List<VoteItemQueryDto> findVoteItemsByVoteId(Long voteId, Long userId) {
+        return voteJpaRepository.findVoteItemsByVoteId(voteId, userId);
+    }
 }

src/main/java/konkuk/thip/vote/adapter/out/persistence/repository/VoteQueryRepository.java

@@ -14,4 +14,6 @@ public interface VoteQueryRepository {
     List<RoomPlayingDetailViewResponse.CurrentVote> findTopParticipationVotesByRoom(Long roomId, int count);
 
     List<VoteItemQueryDto> mapVoteItemsByVoteIds(Set<Long> voteIds, Long userId);
+
+    List<VoteItemQueryDto> findVoteItemsByVoteId(Long voteId, Long userId);
 }

src/main/java/konkuk/thip/vote/adapter/out/persistence/repository/VoteQueryRepositoryImpl.java

@@ -112,4 +112,30 @@ public List<VoteItemQueryDto> mapVoteItemsByVoteIds(Set<Long> voteIds, Long user
                 .where(voteItem.voteJpaEntity.postId.in(voteIds))
                 .fetch();
     }
+
+    @Override
+    public List<VoteItemQueryDto> findVoteItemsByVoteId(Long voteId, Long userId) {
+        QVoteItemJpaEntity voteItem = QVoteItemJpaEntity.voteItemJpaEntity;
+        QVoteParticipantJpaEntity voteParticipant = QVoteParticipantJpaEntity.voteParticipantJpaEntity;
+
+        return jpaQueryFactory
+                .select(new QVoteItemQueryDto(
+                        voteItem.voteJpaEntity.postId,
+                        voteItem.voteItemId,
+                        voteItem.itemName,
+                        voteItem.count,
+                        JPAExpressions
+                                .selectOne()
+                                .from(voteParticipant)
+                                .where(
+                                        voteParticipant.voteItemJpaEntity.eq(voteItem),
+                                        voteParticipant.userJpaEntity.userId.eq(userId)
+                                )
+                                .exists() // isVoted : 로그인한 사용자가 해당 투표 아이템에 투표했는지 여부 서브 쿼리
+                ))
+                .from(voteItem)
+                .where(voteItem.voteJpaEntity.postId.eq(voteId))
+                .orderBy(voteItem.count.desc(), voteItem.voteItemId.asc())
+                .fetch();
+    }
 }

src/main/java/konkuk/thip/vote/application/port/in/dto/VoteResult.java

@@ -1,11 +1,24 @@
 package konkuk.thip.vote.application.port.in.dto;
 
+import java.util.List;
+
 public record VoteResult(
-        Long voteItemId,
+        Long postId,
         Long roomId,
-        Boolean type
+        List<VoteItemDto> voteItems
 ) {
-    public static VoteResult of(Long voteItemId, Long roomId, Boolean type) {
-        return new VoteResult(voteItemId, roomId, type);
+    public record VoteItemDto(
+            Long voteItemId,
+            String itemName,
+            int percentage,
+            Boolean isVoted
+    ) {
+        public static VoteItemDto of(Long voteItemId, String itemName, int percentage, Boolean isVoted) {
+            return new VoteItemDto(voteItemId, itemName, percentage, isVoted);
+        }
+    }
+
+    public static VoteResult of(Long postId, Long roomId, List<VoteItemDto> voteItems) {
+        return new VoteResult(postId, roomId, voteItems);
     }
 }

src/main/java/konkuk/thip/vote/application/port/out/VoteQueryPort.java

@@ -13,4 +13,6 @@ public interface VoteQueryPort {
     List<RoomPlayingDetailViewResponse.CurrentVote> findTopParticipationVotesByRoom(Room room, int count);
 
     Map<Long, List<VoteItemQueryDto>> findVoteItemsByVoteIds(Set<Long> voteIds, Long userId);
+
+    List<VoteItemQueryDto> findVoteItemsByVoteId(Long voteId, Long userId);
 }

src/main/java/konkuk/thip/vote/application/service/VoteService.java

@@ -4,22 +4,30 @@
 import konkuk.thip.common.exception.code.ErrorCode;
 import konkuk.thip.room.application.service.validator.RoomParticipantValidator;
 import konkuk.thip.vote.application.port.in.VoteUseCase;
-import konkuk.thip.vote.application.port.out.VoteCommandPort;
 import konkuk.thip.vote.application.port.in.dto.VoteCommand;
 import konkuk.thip.vote.application.port.in.dto.VoteResult;
+import konkuk.thip.vote.application.port.out.VoteCommandPort;
+import konkuk.thip.vote.application.port.out.VoteQueryPort;
+import konkuk.thip.vote.application.port.out.dto.VoteItemQueryDto;
 import konkuk.thip.vote.domain.VoteItem;
 import konkuk.thip.vote.domain.VoteParticipant;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.IntStream;
 
 @Service
 @RequiredArgsConstructor
 public class VoteService implements VoteUseCase {
 
     private final VoteCommandPort voteCommandPort;
+    private final VoteQueryPort voteQueryPort;
     private final RoomParticipantValidator roomParticipantValidator;
 
     @Override
+    @Transactional
     public VoteResult vote(VoteCommand command) {
         // 1. 방 참가자 검증
         roomParticipantValidator.validateUserIsRoomMember(command.roomId(), command.userId());
@@ -32,7 +40,24 @@ public VoteResult vote(VoteCommand command) {
             cancelVote(command.userId(), command.voteItemId());
         }
 
-        return VoteResult.of(command.voteItemId(), command.roomId(), command.type());
+        // 2. 투표 결과 반환
+        List<VoteItemQueryDto> voteItems = voteQueryPort.findVoteItemsByVoteId(command.voteId(), command.userId());
+        List<Integer> counts = voteItems.stream()
+                .map(VoteItemQueryDto::voteCount)
+                .toList();
+
+        List<Integer> percentages = VoteItem.calculatePercentages(counts);
+
+        var voteItemDtos = IntStream.range(0, voteItems.size())
+                .mapToObj(i -> VoteResult.VoteItemDto.of(
+                        voteItems.get(i).voteItemId(),
+                        voteItems.get(i).itemName(),
+                        percentages.get(i),
+                        voteItems.get(i).isVoted()
+                ))
+                .toList();
+
+        return VoteResult.of(command.voteId(), command.roomId(), voteItemDtos);
     }
 
     private void voteOrUpdate(Long userId, Long voteId, Long voteItemId) {

src/test/java/konkuk/thip/user/adapter/in/web/UserSignupControllerTest.java

@@ -125,7 +125,27 @@ void signup_nickname_blank() throws Exception {
                 .content(objectMapper.writeValueAsString(request)))
                 .andExpect(status().isBadRequest())
                 .andExpect(jsonPath("$.code").value(API_INVALID_PARAM.getCode()))
-                .andExpect(jsonPath("$.message", containsString("닉네임은 한글, 영어, 숫자로만 구성되어야 합니다.(공백불가)")));
+                .andExpect(jsonPath("$.message", containsString("닉네임은 한글, 영어 소문자, 숫자로만 구성되어야 합니다.(공백불가)")));
+    }
+
+    @Test
+    @DisplayName("[닉네임]값이 null일 경우, 400 error가 발생한다.")
+    void signup_nickname_null() throws Exception {
+        //given: nickname blank
+        UserSignupRequest request = new UserSignupRequest(
+                "문학가",
+                null
+        );
+
+        //when //then
+        String testToken = jwtUtil.createSignupToken("kakao_12345678");
+        mockMvc.perform(post("/users/signup")
+                        .header("Authorization", "Bearer " + testToken)  //헤더 추가
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(request)))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.code").value(API_INVALID_PARAM.getCode()))
+                .andExpect(jsonPath("$.message", containsString("닉네임은 필수입니다.")));
     }
 
     @Test
@@ -145,7 +165,7 @@ void signup_nickname_invalid_pattern() throws Exception {
                         .content(objectMapper.writeValueAsString(request)))
                 .andExpect(status().isBadRequest())
                 .andExpect(jsonPath("$.code").value(API_INVALID_PARAM.getCode()))
-                .andExpect(jsonPath("$.message", containsString("닉네임은 한글, 영어, 숫자로만 구성되어야 합니다.(공백불가)")));
+                .andExpect(jsonPath("$.message", containsString("닉네임은 한글, 영어 소문자, 숫자로만 구성되어야 합니다.(공백불가)")));
     }
 
     @Test

src/test/java/konkuk/thip/vote/adapter/in/web/VoteApiTest.java

@@ -91,12 +91,15 @@ void vote_first_success() throws Exception {
                         .requestAttr("userId", user.getUserId())
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(request)))
-                .andExpect(status().isOk());
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.data.postId").value(vote.getPostId()))
+                .andExpect(jsonPath("$.data.roomId").value(room.getRoomId()))
+                .andExpect(jsonPath("$.data.voteItems[0].voteItemId").value(item.getVoteItemId()))
+                .andExpect(jsonPath("$.data.voteItems[0].isVoted").value(true));
 
         assertThat(voteParticipantJpaRepository.findAll())
                 .hasSize(1)
                 .allMatch(vp -> vp.getVoteItemJpaEntity().getVoteItemId().equals(item.getVoteItemId()));
-
         voteItemJpaRepository.findById(item.getVoteItemId())
                 .ifPresent(voteItem -> assertThat(voteItem.getCount()).isEqualTo(1));
     }
@@ -121,12 +124,13 @@ void vote_alreadyVoted_change_success() throws Exception {
                         .requestAttr("userId", user.getUserId())
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(request)))
-                .andExpect(status().isOk());
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.data.voteItems[?(@.voteItemId == %s)].isVoted", item2.getVoteItemId()).value(true))
+                .andExpect(jsonPath("$.data.voteItems[?(@.voteItemId == %s)].isVoted", item1.getVoteItemId()).value(false));
 
         assertThat(voteParticipantJpaRepository.findAll())
                 .hasSize(1)
                 .allMatch(vp -> vp.getVoteItemJpaEntity().getVoteItemId().equals(item2.getVoteItemId()));
-
         voteItemJpaRepository.findById(item1.getVoteItemId())
                 .ifPresent(voteItem -> assertThat(voteItem.getCount()).isEqualTo(0));
         voteItemJpaRepository.findById(item2.getVoteItemId())
@@ -167,7 +171,8 @@ void vote_cancel_success() throws Exception {
                         .requestAttr("userId", user.getUserId())
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(request)))
-                .andExpect(status().isOk());
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.data.voteItems[?(@.voteItemId == %s)].isVoted", item.getVoteItemId()).value(false));
 
         assertThat(voteParticipantJpaRepository.findAll()).isEmpty();
         voteItemJpaRepository.findById(item.getVoteItemId())
@@ -208,4 +213,5 @@ void vote_userNotRoomMember_fail() throws Exception {
                 .andExpect(status().isForbidden())
                 .andExpect(jsonPath("$.code").value(ROOM_ACCESS_FORBIDDEN.getCode()));
     }
+
 }