Merge pull request #24 from 2024-capstone-project/fix/#1

fix : infinite recursion

Author: doleebest

src/main/java/djj/spitching_be/Controller/PresentationController.java

@@ -29,11 +29,12 @@ public PresentationController(PresentationService presentationService, Presentat
 
     // 발표 생성
     @PostMapping("/presentations")
-    public ResponseEntity<Presentation> createPresentation(
+    public ResponseEntity<PresentationResponseDto> createPresentation(
             @RequestBody PresentationRequestDto requestDto,
             @AuthenticationPrincipal OAuth2User principal) {
         String email = principal.getAttribute("email");
-        return ResponseEntity.ok(presentationService.createPresentation(requestDto, email));
+        Presentation presentation = presentationService.createPresentation(requestDto, email);
+        return ResponseEntity.ok(new PresentationResponseDto(presentation));
     }
 
     // 특정 사용자가 자신의 발표 연습 목록 조회하기

src/main/java/djj/spitching_be/Domain/Presentation.java

@@ -5,6 +5,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import net.minidev.json.annotate.JsonIgnore;
 
 import java.util.List;
 
@@ -32,6 +33,7 @@ public class Presentation extends Timestamped{
     @OneToMany(mappedBy = "presentation", cascade = CascadeType.ALL)
     private List<PresentationSlide> slides;
 
+    @JsonIgnore
     // 하나의 유저는 여러 발표 연습을 가질 수 있다.
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name= "user_id", nullable = false)

src/main/java/djj/spitching_be/Domain/User.java

@@ -4,6 +4,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import net.minidev.json.annotate.JsonIgnore;
 import org.hibernate.annotations.DynamicUpdate;
 
 import java.util.ArrayList;
@@ -32,6 +33,7 @@ public class User {
     @Column(nullable = false)
     private String picture;
 
+    @JsonIgnore
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
     private List<Presentation> presentations = new ArrayList<>();
 

src/main/java/djj/spitching_be/Dto/PresentationResponseDto.java

@@ -11,21 +11,24 @@
 public class PresentationResponseDto {
 
     // presentation에서 값을 가져올 때 (응답 시) presentation(직접적인 entity) 대신 앞에 서줌
+    private Long id;
     private String title;
     private String description;
     private LocalDateTime createdAt;
     private LocalDateTime updatedAt;
     private LocalDateTime deletedAt;
     private Integer practiceCount;
+    private UserResponseDto user;
 
     // presentation의 정보를 받아 presentationResponseDto 생성
     public PresentationResponseDto(Presentation presentation){
+        this.id= presentation.getId();
         this.title = presentation.getTitle();
         this.description = presentation.getDescription();
         this.practiceCount = presentation.getPracticeCount();
         this.createdAt = presentation.getCreatedAt();
         this.updatedAt = presentation.getUpdatedAt();
         this.deletedAt = presentation.getDeletedAt();
-
+        this.user = new UserResponseDto(presentation.getUser());
     }
 }

src/main/java/djj/spitching_be/Dto/UserResponseDto.java

@@ -0,0 +1,23 @@
+package djj.spitching_be.Dto;
+
+import djj.spitching_be.Domain.User;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class UserResponseDto {
+    private Long id;
+    private String name;
+    private String email;
+    private String role;
+    private String picture;
+
+    public UserResponseDto(User user){
+        this.id = user.getId();
+        this.name = user.getName();
+        this.email = user.getEmail();
+        this.role = user.getRole().toString();
+        this.picture = user.getPicture();
+    }
+}