Epic/inquiry 문의하기 정렬처리 (#105)

Kyoungwoong · web-flow · commit 83f718798f70 · 2025-02-08T00:54:53.000+09:00
diff --git a/src/main/java/org/myteam/server/global/exception/ErrorCode.java b/src/main/java/org/myteam/server/global/exception/ErrorCode.java
@@ -54,11 +54,14 @@ public enum ErrorCode {
     NEWS_NOT_FOUND(HttpStatus.NOT_FOUND, "News not found"),
     NEWS_COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "New Comment not found"),
     NEWS_REPLY_NOT_FOUND(HttpStatus.NOT_FOUND, "New Reply not found"),
+    INQUIRY_NOT_FOUND(HttpStatus.NOT_FOUND, "Inquiry not found"),
+    INQUIRY_ANSWER_NOT_FOUND(HttpStatus.NOT_FOUND, "Inquiry answer not found"),
     NEWS_COUNT_NOT_FOUND(HttpStatus.NOT_FOUND, "News Count not found"),
 
     // 409 Conflict,
     USER_ALREADY_EXISTS(HttpStatus.CONFLICT, "User already exists"),
-    BAN_ALREADY_EXISTS(HttpStatus.CONFLICT, "This user already exists");
+    BAN_ALREADY_EXISTS(HttpStatus.CONFLICT, "This user already exists"),
+    INQUIRY_ANSWER_ALREADY_EXISTS(HttpStatus.CONFLICT, "This inquiry already exists");
 
     private final HttpStatus status;
     private final String msg;
diff --git a/src/main/java/org/myteam/server/global/security/config/SecurityConfig.java b/src/main/java/org/myteam/server/global/security/config/SecurityConfig.java
@@ -89,6 +89,7 @@ public class SecurityConfig {
             /** @brief Check Access Admin */"/test/admin/**",
 
             "/api/admin/**",
+            "/api/inquiries/answers/**",
     };
     /* member 접근 권한 */
     private static final String[] PERMIT_MEMBER_URLS = new String[]{
diff --git a/src/main/java/org/myteam/server/inquiry/controller/InquiryAnswerController.java b/src/main/java/org/myteam/server/inquiry/controller/InquiryAnswerController.java
@@ -0,0 +1,52 @@
+package org.myteam.server.inquiry.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.myteam.server.global.page.request.PageInfoRequest;
+import org.myteam.server.global.web.response.ResponseDto;
+import org.myteam.server.inquiry.service.InquiryAnswerReadService;
+import org.myteam.server.inquiry.service.InquiryAnswerWriteService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import static org.myteam.server.global.web.response.ResponseStatus.SUCCESS;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/inquiries/answers")
+@RequiredArgsConstructor
+public class InquiryAnswerController {
+
+    private final InquiryAnswerWriteService inquiryAnswerWriteService;
+
+    @PostMapping("/{inquiryId}")
+    public ResponseEntity<ResponseDto<String>> addAnswer(@PathVariable Long inquiryId, @RequestBody String answerContent) {
+        inquiryAnswerWriteService.createAnswer(inquiryId, answerContent);
+        return ResponseEntity.ok(new ResponseDto<>(
+                SUCCESS.name(),
+                "답변이 성공적으로 등록되었습니다.",
+                null
+        ));
+    }
+
+    @PutMapping("/{inquiryId}")
+    public ResponseEntity<ResponseDto<String>> updateAnswer(@PathVariable Long inquiryId, @RequestBody String updateContent) {
+        inquiryAnswerWriteService.updateAnswer(inquiryId, updateContent);
+        return ResponseEntity.ok(new ResponseDto<>(
+                SUCCESS.name(),
+                "답변이 성공적으로 수정되었습니다.",
+                null
+        ));
+    }
+
+    @DeleteMapping("/{inquiryId}")
+    public ResponseEntity<ResponseDto<String>> deleteAnswer(@PathVariable Long inquiryId) {
+        inquiryAnswerWriteService.deleteAnswer(inquiryId);
+        return ResponseEntity.ok(new ResponseDto<>(
+                SUCCESS.name(),
+                "답변이 성공적으로 삭제되었습니다.",
+                null
+        ));
+    }
+
+}
diff --git a/src/main/java/org/myteam/server/inquiry/controller/InquiryController.java b/src/main/java/org/myteam/server/inquiry/controller/InquiryController.java
@@ -7,7 +7,7 @@
 import org.myteam.server.global.page.request.PageInfoRequest;
 import org.myteam.server.global.page.response.PageCustomResponse;
 import org.myteam.server.global.web.response.ResponseDto;
-import org.myteam.server.inquiry.domain.Inquiry;
+import org.myteam.server.inquiry.dto.request.InquiryFindRequest;
 import org.myteam.server.inquiry.dto.request.InquiryRequest;
 import org.myteam.server.inquiry.dto.response.InquiryResponse;
 import org.myteam.server.inquiry.service.InquiryReadService;
@@ -28,7 +28,7 @@ public class InquiryController {
     private final InquiryReadService inquiryReadService;
     private final InquiryWriteService inquiryWriteService;
 
-    @PostMapping()
+    @PostMapping
     public ResponseEntity<ResponseDto<String>> createInquiry(@Valid @RequestBody InquiryRequest inquiryRequest,
                                                      HttpServletRequest request) {
         String clientIp = ClientUtils.getRemoteIP(request);
@@ -42,8 +42,8 @@ public ResponseEntity<ResponseDto<String>> createInquiry(@Valid @RequestBody Inq
     }
 
     @GetMapping("/my")
-    public ResponseEntity<ResponseDto<PageCustomResponse<InquiryResponse>>> getMyInquiries(@RequestParam UUID memberPublicId, PageInfoRequest pageInfoRequest) {
-        PageCustomResponse<InquiryResponse> content = inquiryReadService.getInquiriesByMember(memberPublicId, pageInfoRequest);
+    public ResponseEntity<ResponseDto<PageCustomResponse<InquiryResponse>>> getMyInquiries(@ModelAttribute @Valid InquiryFindRequest request) {
+        PageCustomResponse<InquiryResponse> content = inquiryReadService.getInquiriesByMember(request);
 
         return ResponseEntity.ok(new ResponseDto<>(
                 SUCCESS.name(),
diff --git a/src/main/java/org/myteam/server/inquiry/domain/Inquiry.java b/src/main/java/org/myteam/server/inquiry/domain/Inquiry.java
@@ -18,6 +18,7 @@ public class Inquiry {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @NotNull(message = "문의 내용이 없으면 안됩니다.")
     private String content;
 
     @ManyToOne(optional = true, cascade = CascadeType.REMOVE)
@@ -28,4 +29,11 @@ public class Inquiry {
 
     @Column(name = "created_at", nullable = false, updatable = false)
     private LocalDateTime createdAt;
+
+    @OneToOne(mappedBy = "inquiry", cascade = CascadeType.ALL, orphanRemoval = true)
+    private InquiryAnswer inquiryAnswer;
+
+    public void addAnswer(InquiryAnswer inquiryAnswer) {
+        this.inquiryAnswer = inquiryAnswer;
+    }
 }
diff --git a/src/main/java/org/myteam/server/inquiry/domain/InquiryAnswer.java b/src/main/java/org/myteam/server/inquiry/domain/InquiryAnswer.java
@@ -0,0 +1,44 @@
+package org.myteam.server.inquiry.domain;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class InquiryAnswer {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @OneToOne
+    @JoinColumn(name = "inquiry_id", nullable = false, unique = true)
+    private Inquiry inquiry;
+
+    @Column(nullable = false)
+    private String content;
+
+    @Column(name = "answered_at", nullable = false)
+    private LocalDateTime answeredAt;
+
+    public static InquiryAnswer createAnswer(Inquiry inquiry, String content) {
+        return InquiryAnswer.builder()
+                .inquiry(inquiry)
+                .content(content)
+                .answeredAt(LocalDateTime.now())
+                .build();
+    }
+
+    public void updateContent(String content) {
+        this.content = content;
+        this.answeredAt = LocalDateTime.now();
+    }
+}
diff --git a/src/main/java/org/myteam/server/inquiry/domain/InquiryOrderType.java b/src/main/java/org/myteam/server/inquiry/domain/InquiryOrderType.java
@@ -0,0 +1,6 @@
+package org.myteam.server.inquiry.domain;
+
+public enum InquiryOrderType {
+    RECENT,
+    ANSWERED
+}
diff --git a/src/main/java/org/myteam/server/inquiry/dto/request/InquiryFindRequest.java b/src/main/java/org/myteam/server/inquiry/dto/request/InquiryFindRequest.java
@@ -0,0 +1,31 @@
+package org.myteam.server.inquiry.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.myteam.server.global.page.request.PageInfoRequest;
+import org.myteam.server.global.page.request.PageInfoServiceRequest;
+import org.myteam.server.inquiry.domain.InquiryOrderType;
+
+import java.util.UUID;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class InquiryFindRequest extends PageInfoServiceRequest {
+
+    @NotNull(message = "멤버 id는 필수입니다.")
+    private UUID memberPublicId;
+
+    @NotNull(message = "문의하기 정렬 타입은 필수입니다.")
+    private InquiryOrderType orderType;
+
+    @Builder
+    public InquiryFindRequest(UUID memberPublicId, InquiryOrderType orderType, int page, int size) {
+        super(page, size);
+        this.memberPublicId = memberPublicId;
+        this.orderType = orderType;
+    }
+}
diff --git a/src/main/java/org/myteam/server/inquiry/dto/response/InquiryResponse.java b/src/main/java/org/myteam/server/inquiry/dto/response/InquiryResponse.java
@@ -5,6 +5,7 @@
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
 import org.myteam.server.inquiry.domain.Inquiry;
+import org.myteam.server.inquiry.domain.InquiryAnswer;
 
 import java.time.LocalDateTime;
 
@@ -18,14 +19,20 @@ public class InquiryResponse {
     private String memberNickname;
     private String clientIp;
     private LocalDateTime createdAt;
+    private String answerContent;
+    private LocalDateTime answeredAt;
 
     // Entity -> DTO 변환 메서드
     public static InquiryResponse createInquiryResponse(Inquiry inquiry) {
+        InquiryAnswer inquiryAnswer = inquiry.getInquiryAnswer();
+
         return InquiryResponse.builder()
                 .id(inquiry.getId())
                 .content(inquiry.getContent())
                 .memberNickname(inquiry.getMember().getNickname())
                 .createdAt(inquiry.getCreatedAt())
+                .answerContent(inquiryAnswer != null ? inquiryAnswer.getContent() : "답변 없음")
+                .answeredAt(inquiryAnswer != null ? inquiryAnswer.getAnsweredAt() : null)
                 .build();
     }
 }
diff --git a/src/main/java/org/myteam/server/inquiry/repository/InquiryAnswerRepository.java b/src/main/java/org/myteam/server/inquiry/repository/InquiryAnswerRepository.java
@@ -0,0 +1,11 @@
+package org.myteam.server.inquiry.repository;
+
+import org.myteam.server.inquiry.domain.Inquiry;
+import org.myteam.server.inquiry.domain.InquiryAnswer;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface InquiryAnswerRepository extends JpaRepository<InquiryAnswer, Long> {
+    InquiryAnswer findByInquiryId(Long inquiryId);
+}
diff --git a/src/main/java/org/myteam/server/inquiry/repository/InquiryQueryRepository.java b/src/main/java/org/myteam/server/inquiry/repository/InquiryQueryRepository.java
@@ -0,0 +1,70 @@
+package org.myteam.server.inquiry.repository;
+
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.Projections;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.myteam.server.inquiry.domain.InquiryOrderType;
+import org.myteam.server.inquiry.domain.QInquiry;
+import org.myteam.server.inquiry.domain.QInquiryAnswer;
+import org.myteam.server.inquiry.dto.response.InquiryResponse;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+@Repository
+@RequiredArgsConstructor
+public class InquiryQueryRepository {
+
+    private final JPAQueryFactory queryFactory;
+
+    public Page<InquiryResponse> getInquiryList(UUID memberPublicId,
+                                                InquiryOrderType orderType,
+                                                Pageable pageable) {
+        QInquiry inquiry = QInquiry.inquiry;
+        QInquiryAnswer inquiryAnswer = QInquiryAnswer.inquiryAnswer;
+
+        // 정렬 조건 설정
+        OrderSpecifier<?> orderSpecifier = getOrderSpecifier(orderType, inquiry, inquiryAnswer);
+
+        // 문의 리스트 조회
+        List<InquiryResponse> inquiries = queryFactory
+                .select(Projections.constructor(InquiryResponse.class,
+                        inquiry.id,
+                        inquiry.content,
+                        inquiry.member.nickname,
+                        inquiry.clientIp,
+                        inquiry.createdAt,
+                        inquiryAnswer.content,
+                        inquiryAnswer.answeredAt
+                ))
+                .from(inquiry)
+                .leftJoin(inquiryAnswer).on(inquiry.id.eq(inquiryAnswer.inquiry.id))
+                .where(inquiry.member.publicId.eq(memberPublicId))
+                .orderBy(orderSpecifier)
+                .offset(pageable.getOffset())
+                .limit(pageable.getPageSize())
+                .fetch();
+
+        // 전체 개수 조회
+        long total = Optional.ofNullable(queryFactory
+                .select(inquiry.count())
+                .from(inquiry)
+                .where(inquiry.member.publicId.eq(memberPublicId))
+                .fetchOne()).orElse(0L);
+
+        return new PageImpl<>(inquiries, pageable, total);
+    }
+
+    private OrderSpecifier<?> getOrderSpecifier(InquiryOrderType orderType, QInquiry inquiry, QInquiryAnswer inquiryAnswer) {
+        if (orderType == InquiryOrderType.ANSWERED) {
+            return inquiryAnswer.answeredAt.desc().nullsLast();
+        }
+        return inquiry.createdAt.desc();
+    }
+}
diff --git a/src/main/java/org/myteam/server/inquiry/service/InquiryAnswerReadService.java b/src/main/java/org/myteam/server/inquiry/service/InquiryAnswerReadService.java
@@ -0,0 +1,32 @@
+package org.myteam.server.inquiry.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.myteam.server.global.exception.ErrorCode;
+import org.myteam.server.global.exception.PlayHiveException;
+import org.myteam.server.inquiry.domain.Inquiry;
+import org.myteam.server.inquiry.domain.InquiryAnswer;
+import org.myteam.server.inquiry.repository.InquiryAnswerRepository;
+import org.myteam.server.inquiry.repository.InquiryRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class InquiryAnswerReadService {
+
+    private final InquiryRepository inquiryRepository;
+    private final InquiryAnswerRepository inquiryAnswerRepository;
+
+    public void getAnswer(Long inquiryId) {
+        if (inquiryRepository.existsById(inquiryId)) {
+            throw new PlayHiveException(ErrorCode.INQUIRY_NOT_FOUND);
+        }
+
+        inquiryAnswerRepository.findByInquiryId(inquiryId);
+
+        log.info("성공적으로 문의내역Id: {} 조회되었습니다.", inquiryId);
+    }
+}
diff --git a/src/main/java/org/myteam/server/inquiry/service/InquiryAnswerWriteService.java b/src/main/java/org/myteam/server/inquiry/service/InquiryAnswerWriteService.java
diff --git a/src/main/java/org/myteam/server/inquiry/service/InquiryReadService.java b/src/main/java/org/myteam/server/inquiry/service/InquiryReadService.java
diff --git a/src/test/java/org/myteam/server/inquiry/service/InquiryReadServiceTest.java b/src/test/java/org/myteam/server/inquiry/service/InquiryReadServiceTest.java
diff --git a/src/test/java/org/myteam/server/inquiry/service/InquiryWriteServiceTest.java b/src/test/java/org/myteam/server/inquiry/service/InquiryWriteServiceTest.java
