Merge pull request #60 from Team-baebae/feature/answer/#39

Feature/answer/#39
Team-baebae · May 13, 2024 · 2c29a44 · 2c29a44
2 parents b24d90c + e6201ce
commit 2c29a44
Show file tree

Hide file tree

Showing 34 changed files with 376 additions and 584 deletions.
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/application/answer/AnswerApplication.java b/baebae-BE/src/main/java/com/web/baebaeBE/application/answer/AnswerApplication.java
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/application/question/QuestionApplication.java b/baebae-BE/src/main/java/com/web/baebaeBE/application/question/QuestionApplication.java
diff --git a/...presentation/answer/AnswerController.java → ...n/answer/controller/AnswerController.java b/...presentation/answer/AnswerController.java → ...n/answer/controller/AnswerController.java
@@ -1,14 +1,11 @@
-package com.web.baebaeBE.presentation.answer;
+package com.web.baebaeBE.domain.answer.controller;
 
-import com.google.firebase.database.annotations.NotNull;
-import com.web.baebaeBE.application.answer.AnswerApplication;
-import com.web.baebaeBE.infra.answer.entity.Answer;
-import com.web.baebaeBE.presentation.answer.api.AnswerApi;
-import com.web.baebaeBE.presentation.answer.dto.AnswerCreateRequest;
-import com.web.baebaeBE.presentation.answer.dto.AnswerDetailResponse;
-import com.web.baebaeBE.presentation.answer.dto.AnswerResponse;
+import com.web.baebaeBE.domain.answer.controller.api.AnswerApi;
+import com.web.baebaeBE.domain.answer.dto.AnswerCreateRequest;
+import com.web.baebaeBE.domain.answer.dto.AnswerDetailResponse;
+import com.web.baebaeBE.domain.answer.dto.AnswerResponse;
+import com.web.baebaeBE.domain.answer.service.AnswerService;
 import io.swagger.v3.oas.annotations.Operation;
-import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -24,52 +21,49 @@
 @AllArgsConstructor
 @RequestMapping("/api/answers")
 public class AnswerController implements AnswerApi {
-    private final AnswerApplication answerApplication;
+    private final AnswerService answerService;
 
     @PostMapping(value = "/{memberId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<AnswerDetailResponse> createAnswer(@PathVariable Long memberId,
                                                              @RequestPart(value = "imageFile") MultipartFile imageFile,
                                                              @RequestPart AnswerCreateRequest request) {
-        AnswerDetailResponse createdAnswer = answerApplication.createAnswer(request, memberId, imageFile);
+        AnswerDetailResponse createdAnswer = answerService.createAnswer(request, memberId, imageFile);
         return ResponseEntity.status(HttpStatus.CREATED).body(createdAnswer);
     }
 
     @GetMapping("/member/{memberId}")
     public ResponseEntity<List<AnswerResponse>> getAnswersByMemberId(@PathVariable Long memberId) {
-        List<AnswerResponse> answers = answerApplication.getAnswersByMemberId(memberId);
+        List<AnswerResponse> answers = answerService.getAnswersByMemberId(memberId);
         return ResponseEntity.ok(answers);
     }
 
-    @GetMapping(value = "/{answerId}")
+    @GetMapping()
     public ResponseEntity<List<AnswerDetailResponse>> getAllAnswers(@RequestParam Long memberId, Pageable pageable) {
-        Page<AnswerDetailResponse> answers = answerApplication.getAllAnswers(memberId, pageable);
+        Page<AnswerDetailResponse> answers = answerService.getAllAnswers(memberId, pageable);
         return ResponseEntity.ok(answers.getContent());
     }
 
     @PutMapping(value = "/{answerId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseEntity<AnswerDetailResponse> updateAnswer(
-            @PathVariable Long answerId,
-            @RequestPart(value = "imageFile") MultipartFile imageFile,
-            @RequestPart AnswerCreateRequest request) {
-        AnswerDetailResponse updatedAnswer = answerApplication.updateAnswer(answerId, request, imageFile);
+    public ResponseEntity<AnswerDetailResponse> updateAnswer(@PathVariable Long answerId,
+                                                             @RequestPart(value = "imageFile") MultipartFile imageFile,
+                                                             @RequestPart AnswerCreateRequest request) {
+        AnswerDetailResponse updatedAnswer = answerService.updateAnswer(answerId, request, imageFile);
         return ResponseEntity.ok(updatedAnswer);
     }
 
     @DeleteMapping("/{answerId}")
-    public ResponseEntity<Void> deleteAnswer( @PathVariable Long answerId) {
-        answerApplication.deleteAnswer(answerId);
+    public ResponseEntity<Void> deleteAnswer(@PathVariable Long answerId) {
+        answerService.deleteAnswer(answerId);
         return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
     }
 
     @Operation(summary = "반응 알림")
     @PatchMapping("/{answerId}/react")
-    public ResponseEntity<Void> updateAnswerReactions(
-            @PathVariable Long answerId,
-            @RequestParam int heartCount,
-            @RequestParam int curiousCount,
-            @RequestParam int sadCount
-    ) {
-        answerApplication.updateReactionCounts(answerId, heartCount, curiousCount, sadCount);
+    public ResponseEntity<Void> updateAnswerReactions(@PathVariable Long answerId,
+                                                      @RequestParam int heartCount,
+                                                      @RequestParam int curiousCount,
+                                                      @RequestParam int sadCount) {
+        answerService.updateReactionCounts(answerId, heartCount, curiousCount, sadCount);
         return ResponseEntity.ok().build();
     }
 }
diff --git a/...BE/presentation/answer/api/AnswerApi.java → ...main/answer/controller/api/AnswerApi.java b/...BE/presentation/answer/api/AnswerApi.java → ...main/answer/controller/api/AnswerApi.java
@@ -1,9 +1,8 @@
-package com.web.baebaeBE.presentation.answer.api;
+package com.web.baebaeBE.domain.answer.controller.api;
 
-import com.google.firebase.database.annotations.NotNull;
-import com.web.baebaeBE.presentation.answer.dto.AnswerCreateRequest;
-import com.web.baebaeBE.presentation.answer.dto.AnswerDetailResponse;
-import com.web.baebaeBE.presentation.answer.dto.AnswerResponse;
+import com.web.baebaeBE.domain.answer.dto.AnswerCreateRequest;
+import com.web.baebaeBE.domain.answer.dto.AnswerDetailResponse;
+import com.web.baebaeBE.domain.answer.dto.AnswerResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
@@ -12,7 +11,6 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.MediaType;

diff --git a/...ation/answer/dto/AnswerCreateRequest.java → ...omain/answer/dto/AnswerCreateRequest.java b/...ation/answer/dto/AnswerCreateRequest.java → ...omain/answer/dto/AnswerCreateRequest.java
@@ -1,6 +1,5 @@
-package com.web.baebaeBE.presentation.answer.dto;
+package com.web.baebaeBE.domain.answer.dto;
 
-import org.springframework.web.multipart.MultipartFile;
 import lombok.*;
 
 import java.util.List;

diff --git a/...tion/answer/dto/AnswerDetailResponse.java → ...main/answer/dto/AnswerDetailResponse.java b/...tion/answer/dto/AnswerDetailResponse.java → ...main/answer/dto/AnswerDetailResponse.java
@@ -1,4 +1,4 @@
-package com.web.baebaeBE.presentation.answer.dto;
+package com.web.baebaeBE.domain.answer.dto;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...esentation/answer/dto/AnswerResponse.java → ...eBE/domain/answer/dto/AnswerResponse.java b/...esentation/answer/dto/AnswerResponse.java → ...eBE/domain/answer/dto/AnswerResponse.java
@@ -1,6 +1,6 @@
-package com.web.baebaeBE.presentation.answer.dto;
+package com.web.baebaeBE.domain.answer.dto;
 
-import com.web.baebaeBE.infra.answer.entity.Answer;
+import com.web.baebaeBE.domain.answer.entity.Answer;
 import lombok.Getter;
 import lombok.Setter;
 

diff --git a/.../baebaeBE/infra/answer/entity/Answer.java → ...baebaeBE/domain/answer/entity/Answer.java b/.../baebaeBE/infra/answer/entity/Answer.java → ...baebaeBE/domain/answer/entity/Answer.java
@@ -1,8 +1,8 @@
-package com.web.baebaeBE.infra.answer.entity;
+package com.web.baebaeBE.domain.answer.entity;
 
 import com.web.baebaeBE.domain.categorized.answer.entity.CategorizedAnswer;
 import com.web.baebaeBE.domain.member.entity.Member;
-import com.web.baebaeBE.infra.question.entity.Question;
+import com.web.baebaeBE.domain.question.entity.Question;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.OnDelete;

diff --git a/...omain23/answer/exception/AnswerError.java → .../domain/answer/exception/AnswerError.java b/...omain23/answer/exception/AnswerError.java → .../domain/answer/exception/AnswerError.java
@@ -1,4 +1,4 @@
-package com.web.baebaeBE.domain23.answer.exception;
+package com.web.baebaeBE.domain.answer.exception;
 
 import com.web.baebaeBE.global.error.ErrorCode;
 import lombok.Getter;

diff --git a/...nswer/repository/AnswerJpaRepository.java → ...nswer/repository/AnswerJpaRepository.java b/...nswer/repository/AnswerJpaRepository.java → ...nswer/repository/AnswerJpaRepository.java
@@ -1,6 +1,6 @@
-package com.web.baebaeBE.infra.answer.repository;
+package com.web.baebaeBE.domain.answer.repository;
 
-import com.web.baebaeBE.infra.answer.entity.Answer;
+import com.web.baebaeBE.domain.answer.entity.Answer;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

diff --git a/...infra/answer/repository/AnswerMapper.java → ...omain/answer/repository/AnswerMapper.java b/...infra/answer/repository/AnswerMapper.java → ...omain/answer/repository/AnswerMapper.java
@@ -1,10 +1,11 @@
-package com.web.baebaeBE.infra.answer.repository;
+package com.web.baebaeBE.domain.answer.repository;
 
-import com.web.baebaeBE.infra.answer.entity.Answer;
+import com.web.baebaeBE.domain.answer.dto.AnswerResponse;
+import com.web.baebaeBE.domain.answer.entity.Answer;
 import com.web.baebaeBE.domain.member.entity.Member;
-import com.web.baebaeBE.infra.question.entity.Question;
-import com.web.baebaeBE.presentation.answer.dto.AnswerCreateRequest;
-import com.web.baebaeBE.presentation.answer.dto.AnswerDetailResponse;
+import com.web.baebaeBE.domain.question.entity.Question;
+import com.web.baebaeBE.domain.answer.dto.AnswerCreateRequest;
+import com.web.baebaeBE.domain.answer.dto.AnswerDetailResponse;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
@@ -48,4 +49,8 @@ public AnswerDetailResponse toDomain(Answer answer, String fcmtoken) {
                 fcmtoken
         );
     }
+
+    public AnswerResponse toResponse(Answer answer) {
+        return AnswerResponse.of(answer);
+    }
 }
diff --git a/...a/answer/repository/AnswerRepository.java → ...n/answer/repository/AnswerRepository.java b/...a/answer/repository/AnswerRepository.java → ...n/answer/repository/AnswerRepository.java
@@ -1,6 +1,6 @@
-package com.web.baebaeBE.infra.answer.repository;
+package com.web.baebaeBE.domain.answer.repository;
 
-import com.web.baebaeBE.infra.answer.entity.Answer;
+import com.web.baebaeBE.domain.answer.entity.Answer;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

diff --git a/...swer/repository/AnswerRepositoryImpl.java → ...swer/repository/AnswerRepositoryImpl.java b/...swer/repository/AnswerRepositoryImpl.java → ...swer/repository/AnswerRepositoryImpl.java
@@ -1,6 +1,8 @@
-package com.web.baebaeBE.infra.answer.repository;
+package com.web.baebaeBE.domain.answer.repository;
 
-import com.web.baebaeBE.infra.answer.entity.Answer;
+import com.web.baebaeBE.domain.answer.entity.Answer;
+import com.web.baebaeBE.domain.answer.repository.AnswerJpaRepository;
+import com.web.baebaeBE.domain.answer.repository.AnswerRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.data.domain.Page;
@@ -12,7 +14,7 @@
 
 @Repository
 @Primary
-public class AnswerRepositoryImpl implements AnswerRepository{
+public class AnswerRepositoryImpl implements AnswerRepository {
     private final AnswerJpaRepository jpaRepository;
 
     @Autowired