Merge branch 'develop' of https://github.com/prgrms-web-devcourse-final-project/WEB6_8_FiveLogic_BE into feat/164

Author: dooongdaeng

back/build.gradle.kts

@@ -66,8 +66,12 @@ dependencies {
 	implementation ("software.amazon.awssdk:s3:2.25.0")
 
 	implementation ("org.springframework.kafka:spring-kafka")
+	implementation("org.springframework.boot:spring-boot-starter-websocket")
 
 	runtimeOnly("com.mysql:mysql-connector-j")
+
+	// Sentry
+	implementation("io.sentry:sentry-spring-boot-starter-jakarta:8.19.1")
 }
 
 tasks.withType<Test> {

back/src/main/java/com/back/domain/file/video/controller/VideoController.java

@@ -6,6 +6,7 @@
 import com.back.global.rsData.RsData;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,15 +17,16 @@ public class VideoController {
     private final FileManager fileManager;
 
     @GetMapping("/videos/upload")
-    @Operation(summary="업로드용 URL 요청", description="파일 업로드를 위한 Presigned URL을 발급받습니다.")
+    @PreAuthorize("hasRole('ADMIN')")
+    @Operation(summary = "업로드용 URL 요청", description = "파일 업로드를 위한 Presigned URL을 발급받습니다.")
     public RsData<UploadUrlGetResponse> getUploadUrl() {
         PresignedUrlResponse uploadUrl = fileManager.getUploadUrl();
         UploadUrlGetResponse response = new UploadUrlGetResponse(uploadUrl.url().toString(), uploadUrl.expiresAt());
         return new RsData<>("200", "업로드용 URL 요청완료", response);
     }
 
     @GetMapping("/videos/download")
-    @Operation(summary="다운로드용 URL 요청", description="파일 다운로드를 위한 Presigned URL을 발급받습니다.")
+    @Operation(summary = "다운로드용 URL 요청", description = "파일 다운로드를 위한 Presigned URL을 발급받습니다.")
     public RsData<UploadUrlGetResponse> getDownloadUrls(@RequestParam String objectKey) {
         PresignedUrlResponse downloadUrl = fileManager.getDownloadUrl(objectKey);
         UploadUrlGetResponse response = new UploadUrlGetResponse(downloadUrl.url().toString(), downloadUrl.expiresAt());

back/src/main/java/com/back/domain/member/member/service/MemberStorage.java

@@ -2,6 +2,7 @@
 
 import com.back.domain.member.member.entity.Member;
 import com.back.domain.member.member.error.MemberErrorCode;
+import com.back.domain.member.member.repository.MemberRepository;
 import com.back.domain.member.mentee.entity.Mentee;
 import com.back.domain.member.mentee.repository.MenteeRepository;
 import com.back.domain.member.mentor.entity.Mentor;
@@ -13,7 +14,7 @@
 @Component
 @RequiredArgsConstructor
 public class MemberStorage {
-
+    private final MemberRepository memberRepository;
     private final MentorRepository mentorRepository;
     private final MenteeRepository menteeRepository;
 
@@ -39,4 +40,9 @@ public Mentee findMenteeByMember(Member member) {
     public boolean existsMentorById(Long mentorId) {
         return mentorRepository.existsById(mentorId);
     }
+
+    public Member findMemberByEmail(String email) {
+        return memberRepository.findByEmail(email)
+            .orElseThrow(() -> new ServiceException(MemberErrorCode.NOT_FOUND_MEMBER));
+    }
 }

back/src/main/java/com/back/domain/mentoring/mentoring/controller/ReviewController.java

@@ -25,7 +25,7 @@ public class ReviewController {
     private final ReviewService reviewService;
 
     @GetMapping("/mentorings/{mentoringId}/reviews")
-    @Operation(summary = "멘토링 리뷰 조회", description = "멘토링 리뷰 목록을 조회합니다.")
+    @Operation(summary = "멘토링 리뷰 목록 조회", description = "멘토링 리뷰 목록을 조회합니다.")
     public RsData<ReviewPagingResponse> getReviews(
         @PathVariable Long mentoringId,
         @RequestParam(defaultValue = "0") int page,

back/src/main/java/com/back/domain/mentoring/mentoring/dto/MentoringDetailDto.java

@@ -17,6 +17,8 @@ public record MentoringDetailDto(
     String bio,
     @Schema(description = "멘토링 썸네일")
     String thumb,
+    @Schema(description = "멘토링 평점")
+    Double rating,
     @Schema(description = "생성일")
     LocalDateTime createDate,
     @Schema(description = "수정일")
@@ -26,9 +28,10 @@ public static MentoringDetailDto from(Mentoring mentoring) {
         return new MentoringDetailDto(
             mentoring.getId(),
             mentoring.getTitle(),
-            mentoring.getTags(),
+            mentoring.getTagNames(),
             mentoring.getBio(),
             mentoring.getThumb(),
+            mentoring.getRating(),
             mentoring.getCreateDate(),
             mentoring.getModifyDate()
         );

back/src/main/java/com/back/domain/mentoring/mentoring/dto/MentoringWithTagsDto.java

@@ -21,7 +21,7 @@ public static MentoringWithTagsDto from(Mentoring mentoring) {
         return new MentoringWithTagsDto(
             mentoring.getId(),
             mentoring.getTitle(),
-            mentoring.getTags(),
+            mentoring.getTagNames(),
             mentoring.getMentor().getId(),
             mentoring.getMentor().getMember().getNickname()
         );

back/src/main/java/com/back/domain/mentoring/mentoring/dto/request/MentoringRequest.java

@@ -7,18 +7,18 @@
 import java.util.List;
 
 public record MentoringRequest(
-    @Schema(description = "멘토링 제목")
+    @Schema(description = "멘토링 제목", example = "title")
     @NotNull @Size(max = 100)
     String title,
 
     @Schema(description = "멘토링 태그", example = "[\"Java\", \"Spring\"]")
     List<String> tags,
 
-    @Schema(description = "멘토링 소개")
+    @Schema(description = "멘토링 소개", example = "bio")
     @NotNull
     String bio,
 
-    @Schema(description = "멘토링 썸네일")
+    @Schema(description = "멘토링 썸네일", example = "test.png")
     String thumb
 ) {
 }

back/src/main/java/com/back/domain/mentoring/mentoring/dto/request/ReviewRequest.java

@@ -11,7 +11,7 @@ public record ReviewRequest(
     Double rating,
 
     @Size(max = 1000)
-    @Schema(description = "리뷰 내용")
+    @Schema(description = "리뷰 내용", example = "review content")
     String content
 ) {
 }

back/src/main/java/com/back/domain/mentoring/mentoring/entity/Mentoring.java

@@ -1,7 +1,6 @@
 package com.back.domain.mentoring.mentoring.entity;
 
 import com.back.domain.member.mentor.entity.Mentor;
-import com.back.global.converter.StringListConverter;
 import com.back.global.jpa.BaseEntity;
 import jakarta.persistence.*;
 import lombok.Builder;
@@ -25,30 +24,52 @@ public class Mentoring extends BaseEntity {
     @Column(columnDefinition = "TEXT")
     private String bio;
 
-    @Convert(converter = StringListConverter.class)
-    @Column(columnDefinition = "JSON")
-    private List<String> tags;
+    @OneToMany(mappedBy = "mentoring", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<MentoringTag> mentoringTags = new ArrayList<>();
 
     @Column(length = 255)
     private String thumb;
 
+    @Column
+    private double rating = 0.0;
+
     @Builder
-    public Mentoring(Mentor mentor, String title, String bio, List<String> tags, String thumb) {
+    public Mentoring(Mentor mentor, String title, String bio, String thumb) {
         this.mentor = mentor;
         this.title = title;
         this.bio = bio;
-        this.tags = tags != null ? tags : new ArrayList<>();
         this.thumb = thumb;
     }
 
-    public void update(String title, String bio, List<String> tags, String thumb) {
+    public void update(String title, String bio, List<Tag> tags, String thumb) {
         this.title = title;
         this.bio = bio;
-        this.tags = tags != null ? tags : new ArrayList<>();
         this.thumb = thumb;
+
+        updateTags(tags);
+    }
+
+    public void updateTags(List<Tag> tags) {
+        this.mentoringTags.clear();
+
+        if (tags != null) {
+            tags.forEach(tag ->
+                this.mentoringTags.add(new MentoringTag(this, tag))
+            );
+        }
+    }
+
+    public void updateRating(double averageRating) {
+        this.rating = averageRating;
     }
 
     public boolean isOwner(Mentor mentor) {
         return this.mentor.equals(mentor);
     }
+
+    public List<String> getTagNames() {
+        return mentoringTags.stream()
+            .map(mentoringTag -> mentoringTag.getTag().getName())
+            .toList();
+    }
 }

back/src/main/java/com/back/domain/mentoring/mentoring/entity/MentoringTag.java

@@ -0,0 +1,27 @@
+package com.back.domain.mentoring.mentoring.entity;
+
+import com.back.global.jpa.BaseEntity;
+import jakarta.persistence.*;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor
+@Table(name = "mentoring_tag")
+public class MentoringTag extends BaseEntity {
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "mentoring_id")
+    private Mentoring mentoring;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "tag_id")
+    private Tag tag;
+
+    @Builder
+    public MentoringTag(Mentoring mentoring, Tag tag) {
+        this.mentoring = mentoring;
+        this.tag = tag;
+    }
+}