feat: 일정찾기 - 키워드로 검색기능

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+src/main/generated/**
 
 ### STS ###
 .apt_generated

build.gradle

@@ -58,6 +58,12 @@ dependencies {
 	//s3
 	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 
+	//QueryDsl
+	implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+	annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
+	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
 	//jwt
 	implementation("io.jsonwebtoken:jjwt-api:0.11.5")
 	runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5")
@@ -68,8 +74,4 @@ dependencyManagement {
 	imports {
 		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
 	}
-}
-
-tasks.named('test') {
-	useJUnitPlatform()
-}
+}

src/main/java/com/catcher/core/db/ScheduleRepository.java

@@ -0,0 +1,21 @@
+package com.catcher.core.db;
+
+import com.catcher.core.domain.entity.Schedule;
+
+import java.util.List;
+
+public interface ScheduleRepository {
+
+    /**
+     * 키워드로 스케줄 검색
+     *
+     * @param keyword
+     * @return
+     */
+    List<Schedule> findScheduleByKeywordAndFilter(
+            final String keyword
+//            final Long budget,
+//            final ZonedDateTime startAt,
+//            final ZonedDateTime endAt
+    );
+}

src/main/java/com/catcher/core/domain/entity/Schedule.java

@@ -57,4 +57,4 @@ public class Schedule extends BaseTimeEntity {
 
     @Column(name = "participate_end_at", nullable = false)
     private ZonedDateTime participateEndAt; // 모집 종료
-}
+}

src/main/java/com/catcher/core/domain/entity/ScheduleDetail.java

@@ -39,4 +39,4 @@ public class ScheduleDetail extends BaseTimeEntity {
     private ZonedDateTime endAt;
 
     private ZonedDateTime deletedAt;
-}
+}

src/main/java/com/catcher/core/domain/entity/UploadFile.java

@@ -28,4 +28,4 @@ public class UploadFile {
 
     @Column(name = "deleted_at")
     private ZonedDateTime deletedAt;
-}
+}

src/main/java/com/catcher/core/domain/entity/enums/ContentType.java

@@ -2,4 +2,4 @@
 
 public enum ContentType {
     COMMENT, COMMENTREPLY, SCHEDULEDETAIL, SCHEDULE
-}
+}

src/main/java/com/catcher/core/dto/ScheduleCondition.java

@@ -0,0 +1,23 @@
+package com.catcher.core.dto;
+
+import com.catcher.core.domain.entity.Location;
+import lombok.Data;
+
+import java.time.ZonedDateTime;
+
+@Data
+public class ScheduleCondition {
+
+    private  String keyword;
+
+//    private String them;
+
+    private Long budget;
+
+    private ZonedDateTime startAt;
+
+    private ZonedDateTime endAt;
+
+    private Location location;
+
+}

src/main/java/com/catcher/core/service/ScheduleService.java

@@ -0,0 +1,30 @@
+package com.catcher.core.service;
+
+import com.catcher.core.db.ScheduleRepository;
+import com.catcher.core.domain.entity.Schedule;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class ScheduleService {
+    private final ScheduleRepository scheduleRepository;
+
+    public List<Schedule> getScheduleByKeywordAndFilter(
+            final String keyword
+//            final Long budget,
+//            final ZonedDateTime startAt,
+//            final ZonedDateTime endAt
+
+    ){
+        final List<Schedule> schedules = scheduleRepository.findScheduleByKeywordAndFilter(
+                keyword
+//                budget,
+//                startAt,
+//                endAt
+        );
+        return schedules;
+    }
+}

src/main/java/com/catcher/datasource/config/QuerydslConfig.java

@@ -0,0 +1,19 @@
+package com.catcher.datasource.config;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class QuerydslConfig {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Bean
+    public JPAQueryFactory jpaQueryFactory() {
+        return new JPAQueryFactory(entityManager);
+    }
+}

src/main/java/com/catcher/datasource/schedule/ScheduleJpaRepository.java

@@ -0,0 +1,10 @@
+package com.catcher.datasource.schedule;
+
+import com.catcher.core.domain.entity.Schedule;
+import com.catcher.core.db.ScheduleRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+public interface ScheduleJpaRepository extends JpaRepository<Schedule, Long> {
+
+}

src/main/java/com/catcher/datasource/schedule/ScheduleRepositoryImpl.java

@@ -0,0 +1,45 @@
+package com.catcher.datasource.schedule;
+
+import com.catcher.core.db.ScheduleRepository;
+import com.catcher.core.domain.entity.QSchedule;
+import com.catcher.core.domain.entity.Schedule;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class ScheduleRepositoryImpl extends QuerydslRepositorySupport implements ScheduleRepository {
+
+    private final JPAQueryFactory jpaQueryFactory;
+    private static final QSchedule SCHEDULE = QSchedule.schedule;
+
+    public ScheduleRepositoryImpl(JPAQueryFactory queryFactory) {
+        super(Schedule.class);
+        this.jpaQueryFactory = queryFactory;
+    }
+
+    @Override
+    public List<Schedule> findScheduleByKeywordAndFilter(
+            final String keyword
+//            final Long budget,
+//            final ZonedDateTime startAt,
+//            final ZonedDateTime endAt
+    ) {
+        return jpaQueryFactory
+                .select(SCHEDULE)
+                .from(SCHEDULE)
+                .where(
+                        containsKeywordInTitle(keyword)
+                )
+                .fetch();
+    }
+
+    private BooleanExpression containsKeywordInTitle(final String keyword) {
+        return SCHEDULE.title.contains(keyword);
+    }
+
+}

src/main/java/com/catcher/resource/ScheduleController.java

@@ -0,0 +1,26 @@
+package com.catcher.resource;
+
+import com.catcher.common.response.CommonResponse;
+import com.catcher.core.domain.entity.Schedule;
+import com.catcher.core.service.ScheduleService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+@RestController
+@RequestMapping("/schedule")
+@RequiredArgsConstructor
+public class ScheduleController {
+
+    private final ScheduleService scheduleService;
+
+
+    @GetMapping("/list")
+    public CommonResponse<List<Schedule>> getScheduleByKeywordAndFilter(
+            @RequestParam(defaultValue = "") String keyword
+    ){
+        List<Schedule> scheduleByKeywordAndFilter = scheduleService.getScheduleByKeywordAndFilter(keyword);
+
+        return CommonResponse.success(200, scheduleByKeywordAndFilter);
+    }
+}