From 8a7eb8f989708f6e0a904e21d94ebaf76bc4ff0f Mon Sep 17 00:00:00 2001 From: sunohkim Date: Thu, 20 Feb 2025 18:31:00 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Chore:=20=EC=88=98=EC=97=85=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=EC=8B=9C=20keyword=EA=B0=80=20=EB=B9=84=EC=96=B4?= =?UTF-8?q?=20=EC=9E=88=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EB=AA=85=EC=8B=9C?= =?UTF-8?q?=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EC=B2=98=EB=A6=AC=ED=95=98?= =?UTF-8?q?=EA=B2=8C=EB=81=94=20=EC=88=98=EC=A0=95=20#187?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/course/ProfessorCourseService.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/back-end/reacton/src/main/java/com/softeer/reacton/domain/course/ProfessorCourseService.java b/back-end/reacton/src/main/java/com/softeer/reacton/domain/course/ProfessorCourseService.java index bba0b33..0970cd6 100644 --- a/back-end/reacton/src/main/java/com/softeer/reacton/domain/course/ProfessorCourseService.java +++ b/back-end/reacton/src/main/java/com/softeer/reacton/domain/course/ProfessorCourseService.java @@ -109,9 +109,15 @@ public List searchCourses(String oauthId, String keyword) log.debug("검색 결과를 조회합니다."); Professor professor = getProfessorByOauthId(oauthId); - String escapedKeyword = escapeWildcard(keyword); - String searchKeyword = "%" + escapedKeyword + "%"; - List searchCourses = courseRepository.findCoursesWithSchedulesByProfessorAndKeyword(professor, searchKeyword); + List searchCourses; + if (keyword == null || keyword.isEmpty()) { + searchCourses = courseRepository.findCoursesWithSchedulesByProfessor(professor); + } + else { + String escapedKeyword = escapeWildcard(keyword); + String searchKeyword = "%" + escapedKeyword + "%"; + searchCourses = courseRepository.findCoursesWithSchedulesByProfessorAndKeyword(professor, searchKeyword); + } return getAllCoursesResponse(searchCourses); } From becfe97b5c8933f87e91a8fae5580f3199eabed6 Mon Sep 17 00:00:00 2001 From: sunohkim Date: Thu, 20 Feb 2025 18:31:35 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Chore:=20=EC=A4=84=EB=B0=94=EA=BF=88=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20#187?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../softeer/reacton/domain/course/ProfessorCourseService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/back-end/reacton/src/main/java/com/softeer/reacton/domain/course/ProfessorCourseService.java b/back-end/reacton/src/main/java/com/softeer/reacton/domain/course/ProfessorCourseService.java index 0970cd6..a80315b 100644 --- a/back-end/reacton/src/main/java/com/softeer/reacton/domain/course/ProfessorCourseService.java +++ b/back-end/reacton/src/main/java/com/softeer/reacton/domain/course/ProfessorCourseService.java @@ -112,8 +112,7 @@ public List searchCourses(String oauthId, String keyword) List searchCourses; if (keyword == null || keyword.isEmpty()) { searchCourses = courseRepository.findCoursesWithSchedulesByProfessor(professor); - } - else { + } else { String escapedKeyword = escapeWildcard(keyword); String searchKeyword = "%" + escapedKeyword + "%"; searchCourses = courseRepository.findCoursesWithSchedulesByProfessorAndKeyword(professor, searchKeyword);