Release: v1.0.0 이후 주요 버그 수정 반영

.github/auto_assign.yml

@@ -0,0 +1,8 @@
+addReviewers: true
+numberOfReviewers: 2
+reviewers:
+  - soonge2
+  - yunabyte
+  - Mason-P-ark
+
+addAssignees: false

.github/workflows/pr-auto-reviewer.yml

@@ -0,0 +1,22 @@
+name: Auto assign reviewer
+
+on:
+  pull_request:
+    branches:
+      - main
+      - develop
+
+
+permissions:
+  pull-requests: write
+
+
+jobs:
+  assign-reviewer:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Assign reviewer
+        uses: kentaro-m/auto-assign-action@v1.2.1
+        with:
+          configuration-path: ".github/auto_assign.yml"

src/main/java/com/moa/moa_server/domain/feedback/controller/FeedbackController.java

@@ -0,0 +1,31 @@
+package com.moa.moa_server.domain.feedback.controller;
+
+import com.moa.moa_server.domain.feedback.dto.request.FeedbackCreateRequest;
+import com.moa.moa_server.domain.feedback.service.FeedbackService;
+import com.moa.moa_server.domain.global.dto.ApiResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/user-feedback")
+public class FeedbackController {
+
+    private final FeedbackService feedbackService;
+
+    @PostMapping
+    public ResponseEntity<ApiResponse> createFeedback(
+            @AuthenticationPrincipal Long userId,
+            @RequestBody FeedbackCreateRequest request
+    ) {
+        feedbackService.createFeedback(userId, request);
+        return ResponseEntity
+                .status(201)
+                .body(new ApiResponse("SUCCESS", null));
+    }
+}

src/main/java/com/moa/moa_server/domain/feedback/dto/request/FeedbackCreateRequest.java

@@ -0,0 +1,5 @@
+package com.moa.moa_server.domain.feedback.dto.request;
+
+public record FeedbackCreateRequest (
+        String content
+) {}

src/main/java/com/moa/moa_server/domain/feedback/entity/Feedback.java

@@ -0,0 +1,33 @@
+package com.moa.moa_server.domain.feedback.entity;
+
+import com.moa.moa_server.domain.global.entity.BaseTimeEntity;
+import com.moa.moa_server.domain.user.entity.User;
+import jakarta.persistence.*;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Builder
+public class Feedback extends BaseTimeEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @Column(length = 500, nullable = false)
+    private String content;
+
+    public static Feedback create(User user, String content) {
+        return Feedback.builder()
+                .user(user)
+                .content(content)
+                .build();
+    }
+}

src/main/java/com/moa/moa_server/domain/feedback/handler/FeedbackErrorCode.java

@@ -0,0 +1,15 @@
+package com.moa.moa_server.domain.feedback.handler;
+
+import com.moa.moa_server.domain.global.exception.BaseErrorCode;
+import org.springframework.http.HttpStatus;
+
+public enum FeedbackErrorCode implements BaseErrorCode {
+    INVALID_INPUT(HttpStatus.BAD_REQUEST);
+
+    private final HttpStatus status;
+
+    FeedbackErrorCode(HttpStatus status) { this.status = status; }
+
+    public HttpStatus getStatus() { return status; }
+
+}

src/main/java/com/moa/moa_server/domain/feedback/handler/FeedbackException.java

@@ -0,0 +1,8 @@
+package com.moa.moa_server.domain.feedback.handler;
+
+import com.moa.moa_server.domain.global.exception.BaseErrorCode;
+import com.moa.moa_server.domain.global.exception.BaseException;
+
+public class FeedbackException extends BaseException {
+    public FeedbackException(BaseErrorCode errorCode) { super(errorCode); }
+}

src/main/java/com/moa/moa_server/domain/feedback/repository/FeedbackRepository.java

@@ -0,0 +1,7 @@
+package com.moa.moa_server.domain.feedback.repository;
+
+import com.moa.moa_server.domain.feedback.entity.Feedback;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface FeedbackRepository extends JpaRepository<Feedback, Long> {
+}

src/main/java/com/moa/moa_server/domain/feedback/service/FeedbackService.java

@@ -0,0 +1,37 @@
+package com.moa.moa_server.domain.feedback.service;
+
+import com.moa.moa_server.domain.feedback.dto.request.FeedbackCreateRequest;
+import com.moa.moa_server.domain.feedback.entity.Feedback;
+import com.moa.moa_server.domain.feedback.repository.FeedbackRepository;
+import com.moa.moa_server.domain.feedback.util.FeedbackValidator;
+import com.moa.moa_server.domain.user.entity.User;
+import com.moa.moa_server.domain.user.handler.UserErrorCode;
+import com.moa.moa_server.domain.user.handler.UserException;
+import com.moa.moa_server.domain.user.repository.UserRepository;
+import com.moa.moa_server.domain.user.util.AuthUserValidator;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class FeedbackService {
+
+    private final FeedbackRepository feedbackRepository;
+    private final UserRepository userRepository;
+
+    @Transactional
+    public void createFeedback(Long userId, FeedbackCreateRequest request) {
+        // 유저 조회 및 검증
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new UserException(UserErrorCode.USER_NOT_FOUND));
+        AuthUserValidator.validateActive(user);
+
+        //
+        FeedbackValidator.validateContent(request.content());
+
+        Feedback feedback = Feedback.create(user, request.content());
+
+        feedbackRepository.save(feedback);
+    }
+}

src/main/java/com/moa/moa_server/domain/feedback/util/FeedbackValidator.java

@@ -0,0 +1,13 @@
+package com.moa.moa_server.domain.feedback.util;
+
+import com.moa.moa_server.domain.feedback.handler.FeedbackErrorCode;
+import com.moa.moa_server.domain.feedback.handler.FeedbackException;
+
+public class FeedbackValidator {
+
+    public static void validateContent(String content){
+        if (content == null || content.isBlank() || content.length() > 500 || content.length() < 2) {
+            throw new FeedbackException(FeedbackErrorCode.INVALID_INPUT);
+        }
+    }
+}

src/main/java/com/moa/moa_server/domain/vote/dto/response/VoteDetailResponse.java

@@ -9,5 +9,6 @@ public record VoteDetailResponse(
         String content,
         String imageUrl,
         LocalDateTime createdAt,
-        LocalDateTime closedAt
+        LocalDateTime closedAt,
+        int adminVote
 ) {}

src/main/java/com/moa/moa_server/domain/vote/dto/response/active/ActiveVoteItem.java

@@ -25,7 +25,7 @@ public static ActiveVoteItem from(Vote vote) {
                 vote.getImageUrl(),
                 vote.getCreatedAt(),
                 vote.getClosedAt(),
-                vote.isAdminVote() ? 1 : 0,
+                vote.isAnonymous() ? 0 : (vote.isAdminVote() ? 1 : 0),
                 vote.getVoteType().name()
         );
     }

src/main/java/com/moa/moa_server/domain/vote/dto/response/mine/MyVoteItem.java

@@ -17,11 +17,18 @@ public record MyVoteItem(
 ) {
 
     public static MyVoteItem from(Vote vote, List<VoteOptionResultWithId> results) {
+        String status;
+        if (vote.getVoteStatus() == Vote.VoteStatus.REJECTED || vote.getVoteStatus() == Vote.VoteStatus.PENDING) {
+            status = vote.getVoteStatus().name();
+        } else {
+            status = vote.getClosedAt().isAfter(LocalDateTime.now()) ? "OPEN" : "CLOSED";
+        }
+
         return new MyVoteItem(
                 vote.getId(),
                 vote.getGroup().getId(),
                 vote.getContent(),
-                vote.getVoteStatus().name(),
+                status,
                 vote.getCreatedAt(),
                 vote.getClosedAt(),
                 results

src/main/java/com/moa/moa_server/domain/vote/entity/Vote.java

@@ -75,15 +75,15 @@ public enum VoteType {
     }
 
     public static Vote createUserVote(User user, Group group, String content, String imageUrl,
-                                      LocalDateTime closedAt, boolean anonymous, boolean adminVote) {
+                                      LocalDateTime closedAt, boolean anonymous, VoteStatus status, boolean adminVote) {
         return Vote.builder()
                 .user(user)
                 .group(group)
                 .content(content)
                 .imageUrl(imageUrl)
                 .closedAt(closedAt)
                 .anonymous(anonymous)
-                .voteStatus(VoteStatus.PENDING)
+                .voteStatus(status)
                 .adminVote(adminVote)
                 .voteType(VoteType.USER)
                 .lastAnonymousNumber(0)

src/main/java/com/moa/moa_server/domain/vote/repository/impl/VoteRepositoryImpl.java

@@ -97,6 +97,7 @@ public List<Vote> findSubmittedVotes(User user, List<Group> groups, @Nullable Cl
 
         BooleanBuilder builder = new BooleanBuilder()
                 .and(voteResponse.user.eq(user))
+                .and(voteResponse.optionNumber.ne(0)) // 기권 제외
                 .and(vote.group.in(groups));
 
         if (cursor != null) {

src/main/java/com/moa/moa_server/domain/vote/service/VoteService.java

@@ -33,10 +33,15 @@
 import com.moa.moa_server.domain.vote.util.VoteValidator;
 import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
@@ -45,6 +50,9 @@
 @RequiredArgsConstructor
 public class VoteService {
 
+    @Value("${spring.profiles.active:}")
+    private String activeProfile;
+
     private static final int DEFAULT_PAGE_SIZE = 10;
     private static final int DEFAULT_UNAUTHENTICATED_PAGE_SIZE = 3;
 
@@ -82,22 +90,32 @@ public Long createVote(Long userId, VoteCreateRequest request) {
         VoteValidator.validateContent(request.content());
         VoteValidator.validateImageUrl(request.imageUrl());
         String imageUrl = request.imageUrl().isBlank() ? null : request.imageUrl().trim();
-        VoteValidator.validateClosedAt(request.closedAt());
+
+        // 투표 종료 시간 변환
+        ZonedDateTime koreaTime = request.closedAt().atZone(ZoneId.of("Asia/Seoul"));
+        LocalDateTime utcTime = koreaTime.withZoneSameInstant(ZoneOffset.UTC).toLocalDateTime();
+        VoteValidator.validateClosedAt(utcTime);
+
+        // VoteStatus 결정
+        Vote.VoteStatus status = "local".equals(activeProfile) ? Vote.VoteStatus.OPEN : Vote.VoteStatus.PENDING;
 
         // Vote 생성 및 저장
         Vote vote = Vote.createUserVote(
                 user,
                 group,
                 request.content(),
                 imageUrl,
-                request.closedAt(),
+                utcTime,
                 request.anonymous(),
+                status,
                 adminVote
         );
         voteRepository.save(vote);
 
-        // AI 서버로 검열 요청
-        voteModerationService.requestModeration(vote.getId(), vote.getContent());
+        // AI 서버로 검열 요청 (로컬 환경 제외)
+        if (!"local".equals(activeProfile)) {
+            voteModerationService.requestModeration(vote.getId(), vote.getContent());
+        }
 
         return vote.getId();
     }
@@ -170,7 +188,8 @@ public VoteDetailResponse getVoteDetail(Long userId, Long voteId) {
                 vote.getContent(),
                 vote.getImageUrl(),
                 vote.getCreatedAt(),
-                vote.getClosedAt()
+                vote.getClosedAt(),
+                vote.isAnonymous() ? 0 : (vote.isAdminVote() ? 1 : 0)
         );
     }
 

src/main/java/com/moa/moa_server/domain/vote/util/VoteValidator.java

@@ -4,6 +4,7 @@
 import com.moa.moa_server.domain.vote.handler.VoteException;
 
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 
 public class VoteValidator {
 
@@ -23,7 +24,7 @@ public static void validateImageUrl(String imageUrl) {
     }
 
     public static void validateClosedAt(LocalDateTime closedAt) {
-        if (closedAt == null || !closedAt.isAfter(LocalDateTime.now())) {
+        if (closedAt == null || !closedAt.isAfter(LocalDateTime.now(ZoneOffset.UTC))) {
             throw new VoteException(VoteErrorCode.INVALID_TIME);        }
     }
 }