Merge pull request #131 from zipdabang/feature/121

Feature/121 ♻️ ✨ QueryDsl refactoring, 레시피 신고 api 완성

build.gradle

@@ -35,6 +35,14 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE'
 	implementation platform("org.springframework.cloud:spring-cloud-dependencies:2021.0.5")
 
+	// queryDSL 설정
+	implementation "com.querydsl:querydsl-jpa"
+	implementation "com.querydsl:querydsl-core"
+	implementation "com.querydsl:querydsl-collections"
+	annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jpa"
+	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
 	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.mysql:mysql-connector-j'
@@ -52,4 +60,18 @@ tasks.named('test') {
 
 jar {
 	enabled = false
-}
+}
+
+//querydsl 추가 시작
+def querydslDir = "$buildDir/generated/querydsl"
+
+// java source set 에 querydsl QClass 위치 추가
+sourceSets {
+	main.java.srcDirs += [ querydslDir ]
+}
+
+// gradle clean 시에 QClass 디렉토리 삭제
+clean {
+	delete file(querydslDir)
+}
+//querydsl 추가 끝

src/main/java/zipdabang/server/config/QueryDslConfig.java

@@ -0,0 +1,20 @@
+package zipdabang.server.config;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+@Configuration
+public class QueryDslConfig {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    @Bean
+    JPAQueryFactory queryFactory(){
+        return new JPAQueryFactory(em);
+    }
+}

src/main/java/zipdabang/server/converter/RecipeConverter.java

@@ -387,18 +387,20 @@ public static RecipeResponseDto.CommentPageListDto toPagingCommentDtoList(Page<C
                 .build();
     }
 
-    public static ReportedComment toCommentReport(Report report, Comment comment, Member member) {
-        return ReportedComment.builder()
+    public static ReportedRecipe toRecipeReport(Report report, Recipe recipe, Member member) {
+        return ReportedRecipe.builder()
                 .reportId(report)
-                .reported(comment)
+                .reported(recipe)
                 .owner(member)
                 .build();
     }
 
-    public static BlockedComment toCommentBlock(Comment comment, Member member) {
-        return BlockedComment.builder()
-                .blocked(comment)
+    public static ReportedComment toCommentReport(Report report, Comment comment, Member member) {
+        return ReportedComment.builder()
+                .reportId(report)
+                .reported(comment)
                 .owner(member)
                 .build();
     }
+
 }

src/main/java/zipdabang/server/repository/recipeRepositories/ReportedCommentRepository.java

@@ -7,5 +7,4 @@
 import zipdabang.server.domain.recipe.ReportedComment;
 
 public interface ReportedCommentRepository extends JpaRepository<ReportedComment, Long> {
-    Boolean existsByReportIdAndReportedAndOwner(Report findReport, Comment findComment, Member member);
 }

src/main/java/zipdabang/server/repository/recipeRepositories/ReportedRecipeRepository.java

@@ -0,0 +1,10 @@
+package zipdabang.server.repository.recipeRepositories;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import zipdabang.server.domain.Report;
+import zipdabang.server.domain.member.Member;
+import zipdabang.server.domain.recipe.Comment;
+import zipdabang.server.domain.recipe.ReportedRecipe;
+
+public interface ReportedRecipeRepository extends JpaRepository<ReportedRecipe, Long> {
+}

src/main/java/zipdabang/server/service/RecipeService.java

@@ -53,7 +53,7 @@ public interface RecipeService {
 
     Comment updateComment(RecipeRequestDto.updateCommentDto request, Long recipeId, Long commentId, Member member);
 
-    Long reportComment(RecipeRequestDto.reportCommentDto request, Long recipeId, Long commentId, Member member);
+    Long reportComment(Long recipeId, Long commentId, Long reportId, Member member);
 
-    Long blockComment(Long recipeId, Long commentId, Member member);
+    Long reportRecipe(Long recipeId, Long reportId, Member member);
 }