♻️ refactor: RespondRequest&Response에서 직접적인 엔티티 추가를 제외하고 id값으로 대신 받아온…

… 작업(#52)
smu-nity · Mar 10, 2024 · 378a1bb · 378a1bb
1 parent f755ce9
commit 378a1bb
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 48 deletions.
diff --git a/src/main/java/com/smunity/petition/domain/petition/controller/AgreementController.java b/src/main/java/com/smunity/petition/domain/petition/controller/AgreementController.java
diff --git a/src/main/java/com/smunity/petition/domain/petition/controller/RespondController.java b/src/main/java/com/smunity/petition/domain/petition/controller/RespondController.java
@@ -21,11 +21,11 @@ public ApiResponse<RespondResponse.respondDetail> getRespondDetail(@PathVariable
         return ApiResponse.onSuccess(respondDetail);
     }
 
-    @GetMapping
-    public ApiResponse<List<RespondResponse.respondList>> getRespondList() {
-        List<RespondResponse.respondList> respondLists = respondService.getResponds();
-        return ApiResponse.onSuccess(respondLists);
-    }
+//    @GetMapping
+//    public ApiResponse<List<RespondResponse.respondList>> getRespondList() {
+//        List<RespondResponse.respondList> respondLists = respondService.getResponds();
+//        return ApiResponse.onSuccess(respondLists);
+//    }
 
     @PostMapping
     public ApiResponse<RespondResponse.respondDetail> createRespond(@RequestBody RespondRequest.CreateRespondDTO request) {

diff --git a/src/main/java/com/smunity/petition/domain/petition/dto/RespondRequest.java b/src/main/java/com/smunity/petition/domain/petition/dto/RespondRequest.java
@@ -10,13 +10,13 @@
 public class RespondRequest {
     @Getter
     public static class CreateRespondDTO {
-        private Petition petition;
+        private Long petitionId;
         private String content;
-
+        //절대 엔티티 자체를 넣지 말자
 
         public Respond toEntity() {
             return Respond.builder()
-                    .petition(petition)
+                    .petition(new Petition(petitionId))
                     .content(content)
                     .build();
         }

diff --git a/src/main/java/com/smunity/petition/domain/petition/dto/RespondResponse.java b/src/main/java/com/smunity/petition/domain/petition/dto/RespondResponse.java
@@ -15,14 +15,14 @@ public class RespondResponse {
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
     public static class respondDetail {
         private Long id;
-        private Petition petition;
+        private Long petitionId;
         private Long userId;
         private LocalDateTime createdDate;
         private LocalDateTime modifiedDate;
 
         public static respondDetail from(Respond respond) {
             return respondDetail.builder()
-                    .petition(respond.getPetition())
+                    .petitionId(respond.getPetition().getId())
                     .userId(respond.getUser().getId())
                     .createdDate(respond.getCreateDate())
                     .modifiedDate(respond.getModifyDate())
@@ -37,14 +37,13 @@ public static respondDetail from(Respond respond) {
     public static class respondList {
         private Long id;
         private Long userId;
-        private Petition petition;
-
+        private Long petitionId;
 
         public static respondList from(Respond respond) {
             return respondList.builder()
                     .id(respond.getId())
                     .userId(respond.getUser().getId())
-                    .petition(respond.getPetition())
+                    .petitionId(respond.getPetition().getId())
                     .build();
         }
         public static List<respondList> from(List<Respond> responds) {

diff --git a/src/main/java/com/smunity/petition/domain/petition/entity/Petition.java b/src/main/java/com/smunity/petition/domain/petition/entity/Petition.java
@@ -52,6 +52,10 @@ public void setUser(User user) {
         this.user.getPetitions().add(this);
     }
 
+    public Petition(Long id) {
+        this.id = id;
+    }
+
     public void updatePetition(PetitionRequest.UpdateDTO updateDTO){
         this.subject = updateDTO.getSubject();
         this.content = updateDTO.getContent();

diff --git a/src/main/java/com/smunity/petition/domain/petition/entity/Respond.java b/src/main/java/com/smunity/petition/domain/petition/entity/Respond.java
@@ -23,7 +23,8 @@ public class Respond extends BaseEntity {
 
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "petition_id")
-    private Petition petition;
+    Petition petition;
+
 
     private String content;
 

diff --git a/src/main/java/com/smunity/petition/domain/petition/repository/PetitionRepository.java b/src/main/java/com/smunity/petition/domain/petition/repository/PetitionRepository.java
@@ -15,6 +15,4 @@ public interface PetitionRepository extends JpaRepository<Petition, Long> {
 
     @Query("select p from Petition p")
     List<PetitionResponse.petitionList> findAllPetition();
-
-    List<Petition> findAll();
 }
diff --git a/src/main/java/com/smunity/petition/domain/petition/repository/RespondRepository.java b/src/main/java/com/smunity/petition/domain/petition/repository/RespondRepository.java
@@ -15,5 +15,4 @@ public interface RespondRepository extends JpaRepository<Respond, Long> {
     //RespondResponse.respondDetail -> Respond
     Respond findByPetitionId(@Param("petitionId") Long petitionId);
 
-    List<Respond> findAll();
 }