Merge pull request #14 from GOSOPT-SOPKATHON-5/feat/#12-get-main

#12 get main

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

@@ -6,6 +6,7 @@
 import com.sopkathon.server.service.AnswerService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -18,7 +19,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/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/service/AnswerService.java

@@ -3,6 +3,7 @@
 import com.sopkathon.server.domain.User;
 import com.sopkathon.server.dto.request.DeleteResultRequestDto;
 import com.sopkathon.server.repository.AnswerRepository;
+import com.sopkathon.server.repository.ResultRepository;
 import com.sopkathon.server.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -14,15 +15,16 @@
 public class AnswerService {
     private final AnswerRepository answerRepository;
     private final UserRepository userRepository;
+    private final ResultRepository resultRepository;
 
+    @Transactional
     public void deleteAnswer(Long userId, DeleteResultRequestDto requestDto){
 
         User user = userRepository.findById(userId).orElseThrow();
 
-        System.out.println("삭제 완료");
+        System.out.println(requestDto.getId());
 
-        answerRepository.deleteById(requestDto.getId());
-        System.out.println("삭제 !완료");
+        resultRepository.deleteById(requestDto.getId());
 
     }
 }

src/main/java/com/sopkathon/server/service/MainService.java

@@ -24,10 +24,9 @@ public class MainService {
 
     public GetMainDto getMain(Long userId) {
         User user = userRepository.findById(userId).orElseThrow();
-        System.out.println("11");
+
         List<Result> byReceiver = resultRepository.findAllByReceiver(user);
 
-        System.out.println("11");
         List<UserAnswers> userAnswers = byReceiver.stream()
                 .map(m -> new UserAnswers(
                         m.getId(),