Merge branch 'main' into feat/#10-saveQuestionAndAnswer

Author: sung-silver

src/main/java/com/sopkathon/server/common/exception/SuccessStatus.java

@@ -12,7 +12,7 @@ public enum SuccessStatus {
     user
      */
     SIGNUP_SUCCESS(HttpStatus.CREATED, "회원가입이 완료되었습니다."),
-
+    GET_RESULT(HttpStatus.OK, "조회 성공하였습니다."),
     /*
     answer
      */

src/main/java/com/sopkathon/server/controller/AnswerController.java

@@ -10,6 +10,7 @@
 import org.springframework.web.bind.annotation.*;
 
 
+
 @RestController
 @RequiredArgsConstructor
 public class AnswerController {
@@ -19,7 +20,7 @@ public class AnswerController {
     @DeleteMapping("/answer")
     public ApiResponseDto deleteAnswer(
             @RequestHeader("user-id") Long userId,
-            DeleteResultRequestDto requestDto
+            @RequestBody DeleteResultRequestDto requestDto
     ) {
         answerService.deleteAnswer(userId, requestDto);
         return ApiResponseDto.success(SuccessStatus.DELETE_RESULT);

src/main/java/com/sopkathon/server/controller/MainController.java

@@ -0,0 +1,24 @@
+package com.sopkathon.server.controller;
+
+import com.sopkathon.server.common.dto.ApiResponseDto;
+import com.sopkathon.server.common.exception.SuccessStatus;
+import com.sopkathon.server.dto.response.GetMainDto;
+import com.sopkathon.server.service.MainService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class MainController {
+    private final MainService mainService;
+
+    @GetMapping("/main")
+    public ApiResponseDto<GetMainDto> getQuestion(
+            @RequestHeader("user-id") Long userId) {
+        System.out.println("안녕");
+        return ApiResponseDto.success(SuccessStatus.GET_RESULT, mainService.getMain(userId));
+
+    }
+}

src/main/java/com/sopkathon/server/controller/QuestionController.java

@@ -0,0 +1,23 @@
+package com.sopkathon.server.controller;
+
+import com.sopkathon.server.common.dto.ApiResponseDto;
+import com.sopkathon.server.common.exception.SuccessStatus;
+import com.sopkathon.server.dto.response.GetQuestionDto;
+import com.sopkathon.server.service.QuestionService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+@RestController
+@RequiredArgsConstructor
+public class QuestionController {
+    private final QuestionService questionService;
+
+    @GetMapping("/question")
+    public ApiResponseDto<GetQuestionDto> getQuestion(
+            @RequestHeader("user-id") Long userId) {
+        return ApiResponseDto.success(SuccessStatus.GET_RESULT, questionService.getQuestion(userId));
+
+    }
+}

src/main/java/com/sopkathon/server/dto/request/DeleteResultRequestDto.java

@@ -1,8 +1,14 @@
 package com.sopkathon.server.dto.request;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
+@Getter
 public class DeleteResultRequestDto {
     private Long id;
+
 }

src/main/java/com/sopkathon/server/dto/response/AnswerDto.java

@@ -0,0 +1,12 @@
+package com.sopkathon.server.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class AnswerDto {
+    private Long id;
+    private String answer;
+}

src/main/java/com/sopkathon/server/dto/response/GetMainDto.java

@@ -0,0 +1,14 @@
+package com.sopkathon.server.dto.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class GetMainDto {
+    private String userName;
+    private Long userPoint;
+    List<UserAnswers> userAnswers;
+}

src/main/java/com/sopkathon/server/dto/response/GetQuestionDto.java

@@ -0,0 +1,15 @@
+package com.sopkathon.server.dto.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class GetQuestionDto {
+    private Long receiverId;
+    private String receiverName;
+    private String question;
+    private List<AnswerDto> answers;
+}

src/main/java/com/sopkathon/server/dto/response/UserAnswers.java

@@ -0,0 +1,12 @@
+package com.sopkathon.server.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class UserAnswers {
+    private Long id;
+    private String answer;
+    private String createdAt;
+}

src/main/java/com/sopkathon/server/repository/AnswerRepository.java

@@ -1,6 +1,10 @@
 package com.sopkathon.server.repository;
 
 import com.sopkathon.server.domain.Answer;
+
+import com.sopkathon.server.domain.Question;
+import com.sopkathon.server.domain.User;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;