Merge pull request #161 from UMC-WOWMARKET/feat/manageAddtionalQuestion-160

[feat] 등록폼 관리 추가 질문

Author: yunji118

src/main/java/wowmarket/wow_server/mypage/myproject/MyDemandProject/controller/MyDemandProjectController.java

@@ -32,6 +32,7 @@ public ResponseEntity updateMyDemandFormStatus(@PathVariable Long demand_project
         return new ResponseEntity(HttpStatus.OK);
     }
 
+    //수요조사 등록폼 상세보기
     @GetMapping("/detail/{demand_project_id}")
     public MyDemandDetailResponseDto getMyDemandDetailForm(@PathVariable Long demand_project_id, @AuthenticationPrincipal User user){
         return myDemandProjectService.findMyDemandFormDetail(demand_project_id, user);

src/main/java/wowmarket/wow_server/mypage/myproject/MyDemandProject/dto/DemandAddtionalQuestionDto.java

@@ -0,0 +1,16 @@
+package wowmarket.wow_server.mypage.myproject.MyDemandProject.dto;
+
+import lombok.Getter;
+import wowmarket.wow_server.domain.DemandQuestion;
+import wowmarket.wow_server.domain.OrderQuestion;
+
+@Getter
+public class DemandAddtionalQuestionDto {
+    private String question;
+    private boolean essential;
+
+    public DemandAddtionalQuestionDto(DemandQuestion demandQuestion){
+        this.question = demandQuestion.getQuestion();
+        this.essential = demandQuestion.isEssential();
+    }
+}

src/main/java/wowmarket/wow_server/mypage/myproject/MyDemandProject/dto/MyDemandDetailResponseDto.java

@@ -31,8 +31,9 @@ public class MyDemandDetailResponseDto {
     private String image2;
     private String image3;
 
+    private List<DemandAddtionalQuestionDto> demandQuestionList;
 
-    public MyDemandDetailResponseDto(List<MyDemandItemDto> itemList, DemandProject demandProject){
+    public MyDemandDetailResponseDto(List<MyDemandItemDto> itemList, DemandProject demandProject, List<DemandAddtionalQuestionDto> demandAddtionalQuestionList){
         this.projectId = demandProject.getId();
         this.projectName = demandProject.getProjectName();
         this.description = demandProject.getDescription();
@@ -53,6 +54,7 @@ public MyDemandDetailResponseDto(List<MyDemandItemDto> itemList, DemandProject d
         this.image2 = demandProject.getImage2();
         this.image3 = demandProject.getImage3();
 
+        this.demandQuestionList = demandAddtionalQuestionList;
     }
 
 }

src/main/java/wowmarket/wow_server/mypage/myproject/MyDemandProject/service/MyDemandProjectService.java

@@ -11,10 +11,7 @@
 import wowmarket.wow_server.domain.*;
 import wowmarket.wow_server.global.jwt.SecurityUtil;
 import wowmarket.wow_server.mypage.myproject.MyDemandProject.dto.*;
-import wowmarket.wow_server.repository.CategoryRepository;
-import wowmarket.wow_server.repository.DemandItemRepository;
-import wowmarket.wow_server.repository.DemandProjectRepository;
-import wowmarket.wow_server.repository.UserRepository;
+import wowmarket.wow_server.repository.*;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -25,6 +22,7 @@ public class MyDemandProjectService {
     private final DemandProjectRepository demandProjectRepository;
     private final DemandItemRepository demandItemRepository;
     private final CategoryRepository categoryRepository;
+    private final DemandQuestionRepository demandQuestionRepository;
 
     @Transactional(readOnly = true)
     public MyDemandResponseDto findAllMyDemandForm(Pageable pageable, User user){
@@ -52,7 +50,11 @@ public MyDemandDetailResponseDto findMyDemandFormDetail(Long demand_project_id,
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST);
         List<DemandItem> demandItems = demandItemRepository.findDemandItemByDemandProject_Id(demand_project_id);
         List<MyDemandItemDto> itemList = demandItems.stream().map(MyDemandItemDto::new).collect(Collectors.toList());
-        MyDemandDetailResponseDto responseDto = new MyDemandDetailResponseDto(itemList, project);
+
+        List<DemandQuestion> demandQuestions = demandQuestionRepository.findByDemandProject_Id(demand_project_id).stream().toList();
+        List<DemandAddtionalQuestionDto> demandAddtionalQuestionDtos = demandQuestions.stream().map(DemandAddtionalQuestionDto::new).collect(Collectors.toList());
+
+        MyDemandDetailResponseDto responseDto = new MyDemandDetailResponseDto(itemList, project, demandAddtionalQuestionDtos);
         return responseDto;
     }
 

src/main/java/wowmarket/wow_server/mypage/myproject/MySalesProject/dto/MySalesDetailResponseDto.java

@@ -4,7 +4,6 @@
 import lombok.NoArgsConstructor;
 import wowmarket.wow_server.domain.Project;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -32,10 +31,10 @@ public class MySalesDetailResponseDto {
     private String sellerPhoneNumber;
     private String sellerEmail;
     private String sellerEtc;
-    private List<AdditionalQuestionDto> orderQuestionList;
+    private List<SalesAdditionalQuestionDto> orderQuestionList;
 
 
-    public MySalesDetailResponseDto(Project project, List<MySalesItemDto> itemDtos, List<AdditionalQuestionDto> orderQuestionList){
+    public MySalesDetailResponseDto(Project project, List<MySalesItemDto> itemDtos, List<SalesAdditionalQuestionDto> orderQuestionList){
         this.projectId = project.getId();
         this.projectName = project.getProjectName();
         this.description = project.getDescription();

src/main/java/wowmarket/wow_server/mypage/myproject/MySalesProject/dto/AdditionalQuestionDto.java renamed to src/main/java/wowmarket/wow_server/mypage/myproject/MySalesProject/dto/SalesAdditionalQuestionDto.java

@@ -4,11 +4,11 @@
 import wowmarket.wow_server.domain.OrderQuestion;
 
 @Getter
-public class AdditionalQuestionDto {
+public class SalesAdditionalQuestionDto {
     private String question;
     private boolean essential;
 
-    public AdditionalQuestionDto(OrderQuestion orderQuestion){
+    public SalesAdditionalQuestionDto(OrderQuestion orderQuestion){
         this.question = orderQuestion.getQuestion();
         this.essential = orderQuestion.isEssential();
     }

src/main/java/wowmarket/wow_server/mypage/myproject/MySalesProject/service/MySalesProjectService.java

@@ -1,6 +1,5 @@
 package wowmarket.wow_server.mypage.myproject.MySalesProject.service;
 
-import com.nimbusds.oauth2.sdk.Response;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -10,7 +9,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.server.ResponseStatusException;
 import wowmarket.wow_server.domain.*;
-import wowmarket.wow_server.global.jwt.SecurityUtil;
 import wowmarket.wow_server.mypage.myproject.MySalesProject.dto.*;
 import wowmarket.wow_server.repository.*;
 
@@ -58,7 +56,7 @@ public MySalesDetailResponseDto findMySalesDetail(Long project_id, User user){
         List<MySalesItemDto> itemDtos = itemList.stream().map(MySalesItemDto::new).collect(Collectors.toList());
 
         List<OrderQuestion> orderQuestionList = orderQuestionRepository.findByProject_Id(project_id).stream().toList();
-        List<AdditionalQuestionDto> additionalQuestionDtos = orderQuestionList.stream().map(AdditionalQuestionDto::new).collect(Collectors.toList());
+        List<SalesAdditionalQuestionDto> additionalQuestionDtos = orderQuestionList.stream().map(SalesAdditionalQuestionDto::new).collect(Collectors.toList());
 
         MySalesDetailResponseDto responseDto = new MySalesDetailResponseDto(project, itemDtos, additionalQuestionDtos);
         return responseDto;

src/main/java/wowmarket/wow_server/repository/DemandQuestionRepository.java

@@ -5,9 +5,12 @@
 import wowmarket.wow_server.domain.DemandQuestion;
 import java.util.List;
 
+import java.util.List;
+
 public interface DemandQuestionRepository extends JpaRepository<DemandQuestion, Long> {
     List<DemandQuestion> findByDemandProject_Id(Long demand_project_id);
 
     @Query(nativeQuery = true, value = "select * from demand_question where demand_question_id =?")
     DemandQuestion findByQuestion_Id(Long questionId);
+
 }