From f59370e27c3f572d743b2c23dabd963b26b359ac Mon Sep 17 00:00:00 2001
From: eeeeeaaan <wjdwjddla73@naver.com>
Date: Sat, 5 Jul 2025 09:42:10 +0900
Subject: [PATCH 1/7] =?UTF-8?q?[FEAT]=20=EC=9D=B4=EC=9A=A9=EB=8C=80?=
 =?UTF-8?q?=EC=83=81=20=EC=A0=84=EC=B2=B4=20=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OptionServiceController.java   |  4 +++
 .../controller/TargetAudienceController.java  | 31 ++++++++++++++++++
 .../converter/OptionServiceConverter.java     | 10 ++++++
 .../converter/TargetAudienceConverter.java    | 32 +++++++++++++++++++
 .../guesthouse/dto/OptionResponseDTO.java     | 30 +++++++++++++++++
 .../guesthouse/entity/OptionServices.java     |  4 +++
 .../repository/TargetAudienceRepository.java  |  3 ++
 .../service/OptionQueryService.java           |  5 +++
 .../service/TargetQeuryService.java           | 28 ++++++++++++++++
 9 files changed, 147 insertions(+)
 create mode 100644 src/main/java/com/sumte/guesthouse/controller/OptionServiceController.java
 create mode 100644 src/main/java/com/sumte/guesthouse/controller/TargetAudienceController.java
 create mode 100644 src/main/java/com/sumte/guesthouse/converter/OptionServiceConverter.java
 create mode 100644 src/main/java/com/sumte/guesthouse/converter/TargetAudienceConverter.java
 create mode 100644 src/main/java/com/sumte/guesthouse/dto/OptionResponseDTO.java
 create mode 100644 src/main/java/com/sumte/guesthouse/service/OptionQueryService.java
 create mode 100644 src/main/java/com/sumte/guesthouse/service/TargetQeuryService.java

diff --git a/src/main/java/com/sumte/guesthouse/controller/OptionServiceController.java b/src/main/java/com/sumte/guesthouse/controller/OptionServiceController.java
new file mode 100644
index 0000000..d7f1ceb
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/controller/OptionServiceController.java
@@ -0,0 +1,4 @@
+package com.sumte.guesthouse.controller;
+
+public class OptionServiceController {
+}
diff --git a/src/main/java/com/sumte/guesthouse/controller/TargetAudienceController.java b/src/main/java/com/sumte/guesthouse/controller/TargetAudienceController.java
new file mode 100644
index 0000000..1e2a0bf
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/controller/TargetAudienceController.java
@@ -0,0 +1,31 @@
+package com.sumte.guesthouse.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.sumte.apiPayload.ApiResponse;
+import com.sumte.guesthouse.dto.OptionResponseDTO;
+import com.sumte.guesthouse.service.TargetQeuryService;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@Tag(name = "이용대상 조회 api", description = "게스트하우스의 이용대상을 조회하는 api 입니다.")
+@RequiredArgsConstructor
+@RequestMapping("/target")
+public class TargetAudienceController {
+
+	private final TargetQeuryService targetQeuryService;
+
+	@GetMapping
+	@Operation(summary = "이용대상 조회", description = "필터링 시 게스트 하우스의 이용대상 목록을 전체 조회합니다")
+	public ApiResponse<OptionResponseDTO.TargetList> getTargetAudience() {
+		OptionResponseDTO.TargetList targetAudienceList = targetQeuryService.getAllTargetAudience();
+
+		return ApiResponse.success(targetAudienceList);
+
+	}
+}
diff --git a/src/main/java/com/sumte/guesthouse/converter/OptionServiceConverter.java b/src/main/java/com/sumte/guesthouse/converter/OptionServiceConverter.java
new file mode 100644
index 0000000..c38ecb4
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/converter/OptionServiceConverter.java
@@ -0,0 +1,10 @@
+package com.sumte.guesthouse.converter;
+
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class OptionServiceConverter {
+}
diff --git a/src/main/java/com/sumte/guesthouse/converter/TargetAudienceConverter.java b/src/main/java/com/sumte/guesthouse/converter/TargetAudienceConverter.java
new file mode 100644
index 0000000..f342ee9
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/converter/TargetAudienceConverter.java
@@ -0,0 +1,32 @@
+package com.sumte.guesthouse.converter;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Component;
+
+import com.sumte.guesthouse.dto.OptionResponseDTO;
+import com.sumte.guesthouse.entity.TargetAudience;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class TargetAudienceConverter {
+	public static OptionResponseDTO.Target toTarget(TargetAudience targetAudience) {
+		return OptionResponseDTO.Target.builder()
+			.name(targetAudience.getName())
+			.build();
+	}
+
+	public static OptionResponseDTO.TargetList toTargetList(List<TargetAudience> targetAudiences) {
+
+		List<OptionResponseDTO.Target> optionList = targetAudiences.stream()
+			.map(TargetAudienceConverter::toTarget).collect(Collectors.toList());
+
+		return OptionResponseDTO.TargetList.builder()
+			.targets(optionList)
+			.build();
+
+	}
+}
diff --git a/src/main/java/com/sumte/guesthouse/dto/OptionResponseDTO.java b/src/main/java/com/sumte/guesthouse/dto/OptionResponseDTO.java
new file mode 100644
index 0000000..2dd8a47
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/dto/OptionResponseDTO.java
@@ -0,0 +1,30 @@
+package com.sumte.guesthouse.dto;
+
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+public class OptionResponseDTO {
+
+	@Builder
+	@Getter
+	@NoArgsConstructor
+	@AllArgsConstructor
+	public static class Target {
+		String name;
+	}
+
+	// 페이징 처리 안한 이유는 어차피 targetAudience 나 OptionService같은 경우엔
+	// 굳이 필요 없을 것 같기 때문입니다. 전체 조회 api 이기도 하구요
+	@Builder
+	@Getter
+	@NoArgsConstructor
+	@AllArgsConstructor
+	public static class TargetList {
+		List<Target> targets;
+	}
+
+}
diff --git a/src/main/java/com/sumte/guesthouse/entity/OptionServices.java b/src/main/java/com/sumte/guesthouse/entity/OptionServices.java
index 541deea..0d2a642 100644
--- a/src/main/java/com/sumte/guesthouse/entity/OptionServices.java
+++ b/src/main/java/com/sumte/guesthouse/entity/OptionServices.java
@@ -4,12 +4,16 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
 @NoArgsConstructor
+@Builder
+@AllArgsConstructor
 public class OptionServices {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/sumte/guesthouse/repository/TargetAudienceRepository.java b/src/main/java/com/sumte/guesthouse/repository/TargetAudienceRepository.java
index 7760ebb..5ed8821 100644
--- a/src/main/java/com/sumte/guesthouse/repository/TargetAudienceRepository.java
+++ b/src/main/java/com/sumte/guesthouse/repository/TargetAudienceRepository.java
@@ -1,5 +1,6 @@
 package com.sumte.guesthouse.repository;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -8,4 +9,6 @@
 
 public interface TargetAudienceRepository extends JpaRepository<TargetAudience, Long> {
 	Optional<TargetAudience> findByName(String name);
+
+	List<TargetAudience> findAll();
 }
diff --git a/src/main/java/com/sumte/guesthouse/service/OptionQueryService.java b/src/main/java/com/sumte/guesthouse/service/OptionQueryService.java
new file mode 100644
index 0000000..034bc11
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/service/OptionQueryService.java
@@ -0,0 +1,5 @@
+package com.sumte.guesthouse.service;
+
+public class OptionQueryService {
+
+}
diff --git a/src/main/java/com/sumte/guesthouse/service/TargetQeuryService.java b/src/main/java/com/sumte/guesthouse/service/TargetQeuryService.java
new file mode 100644
index 0000000..da8eaca
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/service/TargetQeuryService.java
@@ -0,0 +1,28 @@
+package com.sumte.guesthouse.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.sumte.guesthouse.converter.TargetAudienceConverter;
+import com.sumte.guesthouse.dto.OptionResponseDTO;
+import com.sumte.guesthouse.entity.TargetAudience;
+import com.sumte.guesthouse.repository.TargetAudienceRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class TargetQeuryService {
+
+	private final TargetAudienceRepository targetAudienceRepository;
+	private final TargetAudienceConverter targetAudienceConverter;
+
+	public OptionResponseDTO.TargetList getAllTargetAudience() {
+		List<TargetAudience> targetAudienceList = targetAudienceRepository.findAll();
+
+		OptionResponseDTO.TargetList targetList = targetAudienceConverter.toTargetList(targetAudienceList);
+
+		return targetList;
+	}
+}

From cd7b184b185877f8ed8c30c6ef230d6c920c9dd9 Mon Sep 17 00:00:00 2001
From: eeeeeaaan <wjdwjddla73@naver.com>
Date: Sat, 5 Jul 2025 09:57:55 +0900
Subject: [PATCH 2/7] =?UTF-8?q?[FEAT]=20=EB=B6=80=EA=B0=80=EC=84=9C?=
 =?UTF-8?q?=EB=B9=84=EC=8A=A4=20=EC=A0=84=EC=B2=B4=20=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OptionServiceController.java   | 27 +++++++++++++++++++
 .../converter/OptionServiceConverter.java     | 22 +++++++++++++++
 .../guesthouse/dto/OptionResponseDTO.java     | 18 +++++++++++++
 .../repository/OptionServicesRepository.java  |  3 +++
 .../service/OptionQueryService.java           | 24 +++++++++++++++++
 5 files changed, 94 insertions(+)

diff --git a/src/main/java/com/sumte/guesthouse/controller/OptionServiceController.java b/src/main/java/com/sumte/guesthouse/controller/OptionServiceController.java
index d7f1ceb..6be9b27 100644
--- a/src/main/java/com/sumte/guesthouse/controller/OptionServiceController.java
+++ b/src/main/java/com/sumte/guesthouse/controller/OptionServiceController.java
@@ -1,4 +1,31 @@
 package com.sumte.guesthouse.controller;
 
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.sumte.apiPayload.ApiResponse;
+import com.sumte.guesthouse.dto.OptionResponseDTO;
+import com.sumte.guesthouse.service.OptionQueryService;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@Tag(name = "부가서비스 조회 api", description = "부가서비스 리스트를 조회하는 api 입니다.")
+@RequiredArgsConstructor
+@RequestMapping("/option")
 public class OptionServiceController {
+
+	private final OptionQueryService optionQueryService;
+
+	@GetMapping
+	@Operation(summary = "부가서비스 목록 조회", description = "부가서비스 목록을 전체 조회합니다")
+	public ApiResponse<OptionResponseDTO.OptionList> getOptionServices() {
+		OptionResponseDTO.OptionList optionServiceList = optionQueryService.getAllOptionServices();
+
+		return ApiResponse.success(optionServiceList);
+
+	}
 }
diff --git a/src/main/java/com/sumte/guesthouse/converter/OptionServiceConverter.java b/src/main/java/com/sumte/guesthouse/converter/OptionServiceConverter.java
index c38ecb4..d78f465 100644
--- a/src/main/java/com/sumte/guesthouse/converter/OptionServiceConverter.java
+++ b/src/main/java/com/sumte/guesthouse/converter/OptionServiceConverter.java
@@ -1,10 +1,32 @@
 package com.sumte.guesthouse.converter;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.springframework.stereotype.Component;
 
+import com.sumte.guesthouse.dto.OptionResponseDTO;
+import com.sumte.guesthouse.entity.OptionServices;
+
 import lombok.RequiredArgsConstructor;
 
 @Component
 @RequiredArgsConstructor
 public class OptionServiceConverter {
+	public static OptionResponseDTO.Option toOption(OptionServices optionServices) {
+		return OptionResponseDTO.Option.builder()
+			.name(optionServices.getName())
+			.build();
+	}
+
+	public static OptionResponseDTO.OptionList toOptionList(List<OptionServices> optionServices) {
+
+		List<OptionResponseDTO.Option> optionList = optionServices.stream()
+			.map(OptionServiceConverter::toOption).collect(Collectors.toList());
+
+		return OptionResponseDTO.OptionList.builder()
+			.options(optionList)
+			.build();
+
+	}
 }
diff --git a/src/main/java/com/sumte/guesthouse/dto/OptionResponseDTO.java b/src/main/java/com/sumte/guesthouse/dto/OptionResponseDTO.java
index 2dd8a47..f64b137 100644
--- a/src/main/java/com/sumte/guesthouse/dto/OptionResponseDTO.java
+++ b/src/main/java/com/sumte/guesthouse/dto/OptionResponseDTO.java
@@ -27,4 +27,22 @@ public static class TargetList {
 		List<Target> targets;
 	}
 
+	@Builder
+	@Getter
+	@NoArgsConstructor
+	@AllArgsConstructor
+	public static class Option {
+		String name;
+	}
+
+	// 페이징 처리 안한 이유는 어차피 targetAudience 나 OptionService같은 경우엔
+	// 굳이 필요 없을 것 같기 때문입니다. 전체 조회 api 이기도 하구요
+	@Builder
+	@Getter
+	@NoArgsConstructor
+	@AllArgsConstructor
+	public static class OptionList {
+		List<Option> options;
+	}
+
 }
diff --git a/src/main/java/com/sumte/guesthouse/repository/OptionServicesRepository.java b/src/main/java/com/sumte/guesthouse/repository/OptionServicesRepository.java
index 559d820..7c53f1f 100644
--- a/src/main/java/com/sumte/guesthouse/repository/OptionServicesRepository.java
+++ b/src/main/java/com/sumte/guesthouse/repository/OptionServicesRepository.java
@@ -1,5 +1,6 @@
 package com.sumte.guesthouse.repository;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -8,4 +9,6 @@
 
 public interface OptionServicesRepository extends JpaRepository<OptionServices, Long> {
 	Optional<OptionServices> findByName(String name);
+
+	List<OptionServices> findAll();
 }
diff --git a/src/main/java/com/sumte/guesthouse/service/OptionQueryService.java b/src/main/java/com/sumte/guesthouse/service/OptionQueryService.java
index 034bc11..747c4b5 100644
--- a/src/main/java/com/sumte/guesthouse/service/OptionQueryService.java
+++ b/src/main/java/com/sumte/guesthouse/service/OptionQueryService.java
@@ -1,5 +1,29 @@
 package com.sumte.guesthouse.service;
 
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.sumte.guesthouse.converter.OptionServiceConverter;
+import com.sumte.guesthouse.dto.OptionResponseDTO;
+import com.sumte.guesthouse.entity.OptionServices;
+import com.sumte.guesthouse.repository.OptionServicesRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
 public class OptionQueryService {
 
+	private final OptionServicesRepository optionServicesRepository;
+	private final OptionServiceConverter optionServiceConverter;
+
+	public OptionResponseDTO.OptionList getAllOptionServices() {
+		List<OptionServices> optionServicesList = optionServicesRepository.findAll();
+
+		OptionResponseDTO.OptionList optionList = optionServiceConverter.toOptionList(optionServicesList);
+
+		return optionList;
+	}
+
 }

From 8baa1969ad132d3651986f58a1580d078e914da9 Mon Sep 17 00:00:00 2001
From: eeeeeaaan <wjdwjddla73@naver.com>
Date: Mon, 7 Jul 2025 22:04:45 +0900
Subject: [PATCH 3/7] =?UTF-8?q?[FEAT]=20=EA=B2=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=ED=95=98=EC=9A=B0=EC=8A=A4=20=ED=95=84=ED=84=B0=EB=A7=81=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C(=EA=B2=80=EC=A6=9D=20=EC=A0=84)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   4 +-
 build.gradle                                  |  18 ++
 .../controller/GuesthouseController.java      |  30 ++-
 .../guesthouse/dto/GuesthousePreviewDTO.java  |  30 +++
 .../dto/GuesthouseSearchRequestDTO.java       |  54 ++++++
 .../GuesthouseRepositoryCustom.java           |  11 ++
 .../repository/GuesthouseRepositoryImpl.java  | 183 ++++++++++++++++++
 .../service/GuesthouseQueryService.java       |  12 ++
 .../service/GuesthouseQueryServiceImpl.java   |  26 +++
 9 files changed, 366 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/sumte/guesthouse/dto/GuesthousePreviewDTO.java
 create mode 100644 src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
 create mode 100644 src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryCustom.java
 create mode 100644 src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
 create mode 100644 src/main/java/com/sumte/guesthouse/service/GuesthouseQueryService.java
 create mode 100644 src/main/java/com/sumte/guesthouse/service/GuesthouseQueryServiceImpl.java

diff --git a/.gitignore b/.gitignore
index 71ee9e4..dab71af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,6 @@ out/
 .vscode/
 
 ### application.properties ###
-src/main/resources/application-local.yml
\ No newline at end of file
+src/main/resources/application-local.yml
+
+src/main/generated/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 1bcbf3b..08f8da4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,6 +59,24 @@ dependencies {
 //	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 }
 
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src/main/java', 'src/main/resources']
+        }
+    }
+}
+
 tasks.named('test') {
     useJUnitPlatform()
 }
+
+def querydslSrcDir = 'src/main/generated'
+
+clean {
+    delete file(querydslSrcDir)
+}
+
+tasks.withType(JavaCompile) {
+    options.generatedSourceOutputDirectory = file(querydslSrcDir)
+}
\ No newline at end of file
diff --git a/src/main/java/com/sumte/guesthouse/controller/GuesthouseController.java b/src/main/java/com/sumte/guesthouse/controller/GuesthouseController.java
index 12b8144..29eb7ed 100644
--- a/src/main/java/com/sumte/guesthouse/controller/GuesthouseController.java
+++ b/src/main/java/com/sumte/guesthouse/controller/GuesthouseController.java
@@ -1,16 +1,27 @@
 package com.sumte.guesthouse.controller;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.sumte.apiPayload.ApiResponse;
+import com.sumte.apiPayload.exception.annotation.CheckPage;
+import com.sumte.apiPayload.exception.annotation.CheckPageSize;
+import com.sumte.guesthouse.dto.GuesthousePreviewDTO;
 import com.sumte.guesthouse.dto.GuesthouseRequestDTO;
+import com.sumte.guesthouse.dto.GuesthouseSearchRequestDTO;
 import com.sumte.guesthouse.service.GuesthouseCommandService;
+import com.sumte.guesthouse.service.GuesthouseQueryService;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -20,11 +31,12 @@
 import lombok.RequiredArgsConstructor;
 
 @RestController
-@Tag(name = "게스트 하우스 관련 api", description = "게스트하우스 생성/수정/삭제 api 입니다.")
+@Tag(name = "게스트 하우스 관련 api", description = "게스트하우스 생성/수정/조회/삭제 api 입니다.")
 @RequiredArgsConstructor
 @RequestMapping("/guesthouse")
 public class GuesthouseController {
 	private final GuesthouseCommandService guesthouseCommandService;
+	private final GuesthouseQueryService guesthouseQueryService;
 
 	@Operation(summary = "게스트하우스 등록", description = "게스트하우스를 등록합니다.")
 	@PostMapping
@@ -61,4 +73,20 @@ public ApiResponse<Void> updateGuesthouse(
 
 	}
 
+	@GetMapping("/search")
+	@Operation(summary = "게스트 하우스 필터링 조회", description = "게스트 하우스를 검색 조건에 맞게 조회합니다.")
+	@Parameters({
+		@Parameter(name = "page", description = "몇 번째 페이지를 조회할지 입력해주세요(1 이상의 정수)"),
+		@Parameter(name = "size", description = "한번에 몇개의 게스트 하우스를 조회할지 입력해주세요(1 이상의 정수) ")
+	})
+	public ResponseEntity<ApiResponse<Page<GuesthousePreviewDTO>>> searchGuesthouse(
+		@RequestBody @Valid GuesthouseSearchRequestDTO dto,
+		@CheckPage @RequestParam(name = "page", defaultValue = "1") int page,
+		@CheckPageSize @RequestParam(name = "size", defaultValue = "10") int size) {
+		Pageable pageable = PageRequest.of(page, size);
+		Page<GuesthousePreviewDTO> result = guesthouseQueryService.getFilteredGuesthouse(dto, pageable);
+		return ResponseEntity.ok(ApiResponse.success(result));
+
+	}
+
 }
diff --git a/src/main/java/com/sumte/guesthouse/dto/GuesthousePreviewDTO.java b/src/main/java/com/sumte/guesthouse/dto/GuesthousePreviewDTO.java
new file mode 100644
index 0000000..b99abc2
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/dto/GuesthousePreviewDTO.java
@@ -0,0 +1,30 @@
+package com.sumte.guesthouse.dto;
+
+import java.time.LocalTime;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class GuesthousePreviewDTO {
+	private Long id;
+	private String name;
+	private Double averageScore;
+	private Long reviewCount;
+	private Long lowerPrice;
+	private String addressRegion;
+	private LocalTime checkinTime;
+
+	public void setAverageScore(Double averageScore) {
+		this.averageScore = averageScore;
+	}
+
+	public void setReviewCount(Long reviewCount) {
+		this.reviewCount = reviewCount;
+	}
+}
diff --git a/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java b/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
new file mode 100644
index 0000000..30af79c
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
@@ -0,0 +1,54 @@
+package com.sumte.guesthouse.dto;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class GuesthouseSearchRequestDTO {
+	@NotNull
+	@Schema(description = "체크인 날짜 (yyyy-MM-dd)", required = true)
+	private LocalDate checkIn;
+
+	@NotNull
+	@Schema(description = "체크아웃 날짜 (yyyy-MM-dd)", required = true)
+	private LocalDate checkOut;
+
+	@NotNull
+	@Schema(description = "인원 수", required = true)
+	private Long people;
+
+	@Schema(description = "최소 가격(필터링 시 입력)", required = false)
+	private Long minPrice;
+
+	@Schema(description = "최대 가격(필터링 시 입력)", required = false)
+	private Long maxPrice;
+
+	@Schema(description = "최소 인원(필터링 시 입력)", required = false)
+	private Long minPeople;
+
+	@Schema(description = "최대 인원(필터링 시 입력)", required = false)
+	private Long maxPeople;
+
+	@Schema(description = "검색 키워드 입력 (제주 애월 끌림 게스트하우스)", required = false)
+	private String keyword;
+
+	@Schema(description = "원하는 부가 서비스를 조회후 해당 목록에 있는 값들 중 원하는 것들을 list형태로 입력", required = false)
+	private List<String> optionService;
+
+	@Schema(description = "원하는 이용대상을 조회후 해당 목록에 있는 값들 중 원하는 것들을 list형태로 입력", required = false)
+	private List<String> targetAudience;
+
+	@Schema(description = "지역 키워드를 선택하여 ", required = false)
+	private List<String> region;
+}
+
diff --git a/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryCustom.java b/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryCustom.java
new file mode 100644
index 0000000..31c52ec
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryCustom.java
@@ -0,0 +1,11 @@
+package com.sumte.guesthouse.repository;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import com.sumte.guesthouse.dto.GuesthousePreviewDTO;
+import com.sumte.guesthouse.dto.GuesthouseSearchRequestDTO;
+
+public interface GuesthouseRepositoryCustom {
+	Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto, Pageable pageable);
+}
diff --git a/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java b/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
new file mode 100644
index 0000000..aae1073
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
@@ -0,0 +1,183 @@
+package com.sumte.guesthouse.repository;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+import org.springframework.util.StringUtils;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.JPAExpressions;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import com.sumte.guesthouse.dto.GuesthousePreviewDTO;
+import com.sumte.guesthouse.dto.GuesthouseSearchRequestDTO;
+import com.sumte.guesthouse.entity.QGuesthouse;
+import com.sumte.guesthouse.entity.QOptionServices;
+import com.sumte.guesthouse.entity.QTargetAudience;
+import com.sumte.guesthouse.entity.mapping.QGuesthouseOptionServices;
+import com.sumte.guesthouse.entity.mapping.QGuesthouseTargetAudience;
+import com.sumte.reservation.entity.QReservation;
+import com.sumte.review.entity.QReview;
+import com.sumte.room.entity.QRoom;
+
+import lombok.RequiredArgsConstructor;
+
+@Repository
+@RequiredArgsConstructor
+public class GuesthouseRepositoryImpl implements GuesthouseRepositoryCustom {
+	private final JPAQueryFactory queryFactory;
+
+	@Override
+	public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto, Pageable pageable) {
+
+		QGuesthouse guesthouse = QGuesthouse.guesthouse;
+		QRoom room = QRoom.room;
+		QReservation reservation = QReservation.reservation;
+		QReview review = QReview.review;
+		QGuesthouseOptionServices guesthouseOptionServices = QGuesthouseOptionServices.guesthouseOptionServices;
+		QGuesthouseTargetAudience guesthouseTargetAudience = QGuesthouseTargetAudience.guesthouseTargetAudience;
+		QOptionServices optionService = QOptionServices.optionServices;
+		QTargetAudience targetAudience = QTargetAudience.targetAudience;
+
+		// 고정 조건들은 BooleanExpression으로 처리하는 게 좋다고 합니다.
+		// 동적 조건은 BooleanBuilder를 사용하여 처리
+		BooleanBuilder condition = new BooleanBuilder();
+
+		BooleanBuilder roomFilter = new BooleanBuilder();
+
+		// 1차 필터링 -> 인원, 날짜
+		// 예약 날짜와 겹치는 예약 데이터를 가진 room을 거르기
+		// 2차 필터링 -> 인원, 날짜, 키워드
+		// StringUtils.hasText() : 공백만 있는 문자열, null값을 전부 false로 처리해줌.
+		if (StringUtils.hasText(dto.getKeyword())) {
+			String[] keywords = dto.getKeyword().split("\\s+");
+			BooleanBuilder keywordCondition = new BooleanBuilder();
+			for (String word : keywords) {
+				BooleanExpression name = guesthouse.name.containsIgnoreCase(word);
+				BooleanExpression region = guesthouse.addressRegion.containsIgnoreCase(word);
+				keywordCondition.or(name).or(region);
+			}
+
+			condition.and(keywordCondition);
+		}
+
+		// 3차 필터링 -> 가격대, 객실정원, 부가서비스, 이용대상, 지역 설정
+
+		if (dto.getMinPrice() != null && dto.getMaxPrice() != null) {
+			roomFilter.and(room.price.between(dto.getMinPrice(), dto.getMaxPrice()));
+		}
+
+		if (dto.getMinPeople() != null) {
+			roomFilter.and(room.standardCount.goe(dto.getMinPeople()));
+		}
+
+		if (dto.getMaxPeople() != null) {
+			roomFilter.and(room.totalCount.loe(dto.getMaxPeople()));
+		}
+
+		if (dto.getRegion() != null && !dto.getRegion().isEmpty()) {
+			condition.and(guesthouse.addressRegion.in(dto.getRegion()));
+		}
+
+		if (dto.getOptionService() != null && !dto.getOptionService().isEmpty()) {
+			condition.and(guesthouse.id.in(
+				JPAExpressions.select(guesthouseOptionServices.guesthouse.id)
+					.from(guesthouseOptionServices)
+					.join(guesthouseOptionServices.optionServices, optionService)
+					.where(optionService.name.in(dto.getOptionService()))
+			));
+		}
+
+		// 입력 인원이 최대 인원보다 작아야 하는 조건
+		roomFilter.and(room.totalCount.goe(dto.getPeople()));
+
+		// 예약 일자 필터링
+		roomFilter.and(room.id.notIn(
+			JPAExpressions.select(reservation.room.id)
+				.from(reservation)
+				.where(reservation.startDate.before(dto.getCheckOut()) // 사용자가 원하는 체크아웃 보다 전에 시작되고
+					.and(reservation.endDate.after(dto.getCheckIn())) // 사용자가 원하는 체크인 보다 나중에 끝나는 예약이 있는 room.id를 거르기
+				)
+		));
+
+		// List<Long> availabeReservationRoomIds = queryFactory
+		// 	.select(room.id)
+		// 	.from(room)
+		// 	.where(roomFilter)
+		// 	.fetch();
+
+		if (dto.getTargetAudience() != null && !dto.getTargetAudience().isEmpty()) {
+			condition.and(guesthouse.id.in(
+				JPAExpressions.select(guesthouseTargetAudience.guesthouse.id)
+					.from(guesthouseTargetAudience)
+					.join(guesthouseTargetAudience.guesthouse, guesthouse)
+					.where(targetAudience.name.in(dto.getTargetAudience()))
+			));
+		}
+
+		// 리뷰 부분 필드만 따로 조회
+		// 리스트 순회보다 서브쿼리가 더 효율적이라 하여
+		List<Tuple> reviewStatics = queryFactory.select(
+				room.guesthouse.id,
+				review.score.avg(),
+				review.id.count()
+			).from(review).join(review.room, room)
+			.where(room.id.in(
+				JPAExpressions
+					.select(room.id)
+					.from(room)
+					.where(roomFilter)
+			))
+			.fetch();
+
+		Map<Long, Tuple> reviewStatMap = reviewStatics.stream()
+			.collect(Collectors.toMap(
+				tuple -> tuple.get(room.guesthouse.id),
+				Function.identity()
+			));
+
+		List<GuesthousePreviewDTO> guesthouses = queryFactory
+			.select(Projections.constructor(
+				GuesthousePreviewDTO.class,
+				guesthouse.id,
+				guesthouse.name,
+				Expressions.constant(0.0),       // 평균 점수는 나중에 덮어씀
+				Expressions.constant(0L),        // 리뷰 수는 나중에 덮어씀
+				room.price.min(),
+				guesthouse.addressRegion,
+				room.checkin.min()
+			))
+			.from(guesthouse)
+			.join(guesthouse.rooms, room)
+			.where(condition)
+			.groupBy(guesthouse.id)
+			.offset(pageable.getOffset())
+			.limit(pageable.getPageSize())
+			.fetch();
+
+		guesthouses.forEach(preview -> {
+			Tuple stats = reviewStatMap.get(preview.getId());
+			if (stats != null) {
+				Double avg = stats.get(review.score.avg());
+				Long count = stats.get(review.id.count());
+				preview.setAverageScore(avg != null ? avg : 0.0);
+				preview.setReviewCount(count != null ? count : 0L);
+			} else {
+				preview.setAverageScore(0.0);
+				preview.setReviewCount(0L);
+			}
+		});
+
+		return new PageImpl<>(guesthouses, pageable, guesthouses.size());
+
+	}
+}
diff --git a/src/main/java/com/sumte/guesthouse/service/GuesthouseQueryService.java b/src/main/java/com/sumte/guesthouse/service/GuesthouseQueryService.java
new file mode 100644
index 0000000..df88d3a
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/service/GuesthouseQueryService.java
@@ -0,0 +1,12 @@
+package com.sumte.guesthouse.service;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import com.sumte.guesthouse.dto.GuesthousePreviewDTO;
+import com.sumte.guesthouse.dto.GuesthouseSearchRequestDTO;
+
+public interface GuesthouseQueryService {
+	Page<GuesthousePreviewDTO> getFilteredGuesthouse(GuesthouseSearchRequestDTO dto, Pageable pageable);
+
+}
diff --git a/src/main/java/com/sumte/guesthouse/service/GuesthouseQueryServiceImpl.java b/src/main/java/com/sumte/guesthouse/service/GuesthouseQueryServiceImpl.java
new file mode 100644
index 0000000..92edf72
--- /dev/null
+++ b/src/main/java/com/sumte/guesthouse/service/GuesthouseQueryServiceImpl.java
@@ -0,0 +1,26 @@
+package com.sumte.guesthouse.service;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import com.sumte.guesthouse.dto.GuesthousePreviewDTO;
+import com.sumte.guesthouse.dto.GuesthouseSearchRequestDTO;
+import com.sumte.guesthouse.repository.GuesthouseRepositoryCustom;
+
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class GuesthouseQueryServiceImpl implements GuesthouseQueryService {
+	private final GuesthouseRepositoryCustom guesthouseRepositoryCustom;
+
+	@Override
+	@Transactional
+	public Page<GuesthousePreviewDTO> getFilteredGuesthouse(GuesthouseSearchRequestDTO dto, Pageable pageable) {
+
+		return guesthouseRepositoryCustom.searchFiltered(dto, pageable);
+	}
+
+}

From ae86a6f61dade0da822f0220abc8fa8c1e7bdb70 Mon Sep 17 00:00:00 2001
From: eeeeeaaan <wjdwjddla73@naver.com>
Date: Wed, 9 Jul 2025 14:29:44 +0900
Subject: [PATCH 4/7] =?UTF-8?q?[FEAT]=20=EA=B2=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=ED=95=98=EC=9A=B0=EC=8A=A4=20=ED=95=84=ED=84=B0=EB=A7=81=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95(=EA=B2=80=EC=A6=9D=20?=
 =?UTF-8?q?=EC=A0=84)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/GuesthouseSearchRequestDTO.java       |   4 +
 .../repository/GuesthouseRepositoryImpl.java  | 118 +++++++++---------
 2 files changed, 66 insertions(+), 56 deletions(-)

diff --git a/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java b/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
index 30af79c..67ed84b 100644
--- a/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
+++ b/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
@@ -15,6 +15,10 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class GuesthouseSearchRequestDTO {
+
+	@NotNull
+	private Boolean viewEnableReservation;
+
 	@NotNull
 	@Schema(description = "체크인 날짜 (yyyy-MM-dd)", required = true)
 	private LocalDate checkIn;
diff --git a/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java b/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
index aae1073..a9c269a 100644
--- a/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
+++ b/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
@@ -14,7 +14,7 @@
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Projections;
-import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.SubQueryExpression;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -25,7 +25,9 @@
 import com.sumte.guesthouse.entity.QTargetAudience;
 import com.sumte.guesthouse.entity.mapping.QGuesthouseOptionServices;
 import com.sumte.guesthouse.entity.mapping.QGuesthouseTargetAudience;
+import com.sumte.reservation.converter.ReservationConverter;
 import com.sumte.reservation.entity.QReservation;
+import com.sumte.reservation.entity.ReservationStatus;
 import com.sumte.review.entity.QReview;
 import com.sumte.room.entity.QRoom;
 
@@ -35,6 +37,7 @@
 @RequiredArgsConstructor
 public class GuesthouseRepositoryImpl implements GuesthouseRepositoryCustom {
 	private final JPAQueryFactory queryFactory;
+	private final ReservationConverter reservationConverter;
 
 	@Override
 	public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto, Pageable pageable) {
@@ -50,28 +53,25 @@ public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto,
 
 		// 고정 조건들은 BooleanExpression으로 처리하는 게 좋다고 합니다.
 		// 동적 조건은 BooleanBuilder를 사용하여 처리
-		BooleanBuilder condition = new BooleanBuilder();
-
 		BooleanBuilder roomFilter = new BooleanBuilder();
+		BooleanBuilder condition = new BooleanBuilder();
 
-		// 1차 필터링 -> 인원, 날짜
-		// 예약 날짜와 겹치는 예약 데이터를 가진 room을 거르기
-		// 2차 필터링 -> 인원, 날짜, 키워드
 		// StringUtils.hasText() : 공백만 있는 문자열, null값을 전부 false로 처리해줌.
-		if (StringUtils.hasText(dto.getKeyword())) {
-			String[] keywords = dto.getKeyword().split("\\s+");
-			BooleanBuilder keywordCondition = new BooleanBuilder();
-			for (String word : keywords) {
-				BooleanExpression name = guesthouse.name.containsIgnoreCase(word);
-				BooleanExpression region = guesthouse.addressRegion.containsIgnoreCase(word);
-				keywordCondition.or(name).or(region);
-			}
 
-			condition.and(keywordCondition);
+		if (dto.getViewEnableReservation()) {
+			SubQueryExpression<Long> reservedPeopleSum = JPAExpressions
+				.select(reservation.adultCount.add(reservation.childCount).sum().coalesce(0L))
+				.from(reservation)
+				.where(
+					reservation.room.id.eq(room.id),
+					reservation.reservationStatus.ne(ReservationStatus.CANCELED),
+					reservation.startDate.before(dto.getCheckOut()),
+					reservation.endDate.after(dto.getCheckIn())
+				);
+
+			roomFilter.and(room.totalCount.subtract(reservedPeopleSum).goe(dto.getPeople()));
 		}
 
-		// 3차 필터링 -> 가격대, 객실정원, 부가서비스, 이용대상, 지역 설정
-
 		if (dto.getMinPrice() != null && dto.getMaxPrice() != null) {
 			roomFilter.and(room.price.between(dto.getMinPrice(), dto.getMaxPrice()));
 		}
@@ -81,7 +81,34 @@ public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto,
 		}
 
 		if (dto.getMaxPeople() != null) {
-			roomFilter.and(room.totalCount.loe(dto.getMaxPeople()));
+			roomFilter.and(room.totalCount.lt(dto.getMaxPeople()));
+		}
+
+		// roomFilter조건에 맞는 room.id 를 통해 guesthouse.id 를 추린다.
+		List<Long> validRoomIds = queryFactory
+			.select(room.id)
+			.from(room)
+			.where(roomFilter)
+			.fetch();
+
+		List<Long> validGuesthouseIds = queryFactory.select(room.guesthouse.id)
+			.from(room)
+			.where(room.id.in(validRoomIds))
+			.distinct()
+			.fetch();
+
+		// guesthouse 조건 마저 설정하기
+		condition.and(guesthouse.id.in(validGuesthouseIds));
+
+		if (StringUtils.hasText(dto.getKeyword())) {
+			String[] kewords = dto.getKeyword().split("\\s+");
+			BooleanBuilder keywordCondition = new BooleanBuilder();
+
+			for (String word : kewords) {
+				keywordCondition.or(guesthouse.name.containsIgnoreCase(word));
+				keywordCondition.or(guesthouse.addressRegion.containsIgnoreCase(word));
+			}
+			condition.and(keywordCondition);
 		}
 
 		if (dto.getRegion() != null && !dto.getRegion().isEmpty()) {
@@ -97,61 +124,39 @@ public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto,
 			));
 		}
 
-		// 입력 인원이 최대 인원보다 작아야 하는 조건
-		roomFilter.and(room.totalCount.goe(dto.getPeople()));
-
-		// 예약 일자 필터링
-		roomFilter.and(room.id.notIn(
-			JPAExpressions.select(reservation.room.id)
-				.from(reservation)
-				.where(reservation.startDate.before(dto.getCheckOut()) // 사용자가 원하는 체크아웃 보다 전에 시작되고
-					.and(reservation.endDate.after(dto.getCheckIn())) // 사용자가 원하는 체크인 보다 나중에 끝나는 예약이 있는 room.id를 거르기
-				)
-		));
-
-		// List<Long> availabeReservationRoomIds = queryFactory
-		// 	.select(room.id)
-		// 	.from(room)
-		// 	.where(roomFilter)
-		// 	.fetch();
-
 		if (dto.getTargetAudience() != null && !dto.getTargetAudience().isEmpty()) {
 			condition.and(guesthouse.id.in(
 				JPAExpressions.select(guesthouseTargetAudience.guesthouse.id)
 					.from(guesthouseTargetAudience)
-					.join(guesthouseTargetAudience.guesthouse, guesthouse)
+					.join(guesthouseTargetAudience.targetAudience, targetAudience)
 					.where(targetAudience.name.in(dto.getTargetAudience()))
 			));
 		}
 
-		// 리뷰 부분 필드만 따로 조회
-		// 리스트 순회보다 서브쿼리가 더 효율적이라 하여
-		List<Tuple> reviewStatics = queryFactory.select(
+		// 리뷰 통계 조회
+		Map<Long, Tuple> reviewStatMap = queryFactory.select(
 				room.guesthouse.id,
 				review.score.avg(),
 				review.id.count()
-			).from(review).join(review.room, room)
-			.where(room.id.in(
-				JPAExpressions
-					.select(room.id)
-					.from(room)
-					.where(roomFilter)
-			))
-			.fetch();
-
-		Map<Long, Tuple> reviewStatMap = reviewStatics.stream()
+			).from(review)
+			.join(review.room, room)
+			.where(room.id.in(validRoomIds))
+			.groupBy(room.guesthouse.id)
+			.fetch()
+			.stream()
 			.collect(Collectors.toMap(
-				tuple -> tuple.get(room.guesthouse.id),
+				t -> t.get(room.guesthouse.id),
 				Function.identity()
 			));
 
+		// Step 5. guesthouse 리스트 조회 (room도 조인하여 최소 가격 등 포함)
 		List<GuesthousePreviewDTO> guesthouses = queryFactory
 			.select(Projections.constructor(
 				GuesthousePreviewDTO.class,
 				guesthouse.id,
 				guesthouse.name,
-				Expressions.constant(0.0),       // 평균 점수는 나중에 덮어씀
-				Expressions.constant(0L),        // 리뷰 수는 나중에 덮어씀
+				Expressions.constant(0.0),
+				Expressions.constant(0L),
 				room.price.min(),
 				guesthouse.addressRegion,
 				room.checkin.min()
@@ -160,15 +165,17 @@ public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto,
 			.join(guesthouse.rooms, room)
 			.where(condition)
 			.groupBy(guesthouse.id)
+			.orderBy(review.id.count().desc())
 			.offset(pageable.getOffset())
 			.limit(pageable.getPageSize())
 			.fetch();
 
+		// Step 6. 리뷰 평균/갯수 덮어쓰기
 		guesthouses.forEach(preview -> {
 			Tuple stats = reviewStatMap.get(preview.getId());
 			if (stats != null) {
-				Double avg = stats.get(review.score.avg());
-				Long count = stats.get(review.id.count());
+				Double avg = stats.get(0, Double.class);
+				Long count = stats.get(1, Long.class);
 				preview.setAverageScore(avg != null ? avg : 0.0);
 				preview.setReviewCount(count != null ? count : 0L);
 			} else {
@@ -178,6 +185,5 @@ public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto,
 		});
 
 		return new PageImpl<>(guesthouses, pageable, guesthouses.size());
-
 	}
 }

From bdcb09bd569f1c295f2d2ad567f28e18df51f41d Mon Sep 17 00:00:00 2001
From: eeeeeaaan <wjdwjddla73@naver.com>
Date: Mon, 14 Jul 2025 12:06:49 +0900
Subject: [PATCH 5/7] =?UTF-8?q?[FEAT]=20=EA=B2=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=ED=95=98=EC=9A=B0=EC=8A=A4=20=EC=A1=B0=ED=9A=8C=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=95=20=EC=88=98=EC=A0=95=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GuesthouseController.java      |   5 +-
 .../dto/GuesthouseSearchRequestDTO.java       |   1 +
 .../repository/GuesthouseRepositoryImpl.java  | 127 ++++++++++++------
 3 files changed, 87 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/sumte/guesthouse/controller/GuesthouseController.java b/src/main/java/com/sumte/guesthouse/controller/GuesthouseController.java
index 29eb7ed..21dd9fe 100644
--- a/src/main/java/com/sumte/guesthouse/controller/GuesthouseController.java
+++ b/src/main/java/com/sumte/guesthouse/controller/GuesthouseController.java
@@ -5,7 +5,6 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -73,7 +72,7 @@ public ApiResponse<Void> updateGuesthouse(
 
 	}
 
-	@GetMapping("/search")
+	@PostMapping("/search")
 	@Operation(summary = "게스트 하우스 필터링 조회", description = "게스트 하우스를 검색 조건에 맞게 조회합니다.")
 	@Parameters({
 		@Parameter(name = "page", description = "몇 번째 페이지를 조회할지 입력해주세요(1 이상의 정수)"),
@@ -83,7 +82,7 @@ public ResponseEntity<ApiResponse<Page<GuesthousePreviewDTO>>> searchGuesthouse(
 		@RequestBody @Valid GuesthouseSearchRequestDTO dto,
 		@CheckPage @RequestParam(name = "page", defaultValue = "1") int page,
 		@CheckPageSize @RequestParam(name = "size", defaultValue = "10") int size) {
-		Pageable pageable = PageRequest.of(page, size);
+		Pageable pageable = PageRequest.of(page - 1, size);
 		Page<GuesthousePreviewDTO> result = guesthouseQueryService.getFilteredGuesthouse(dto, pageable);
 		return ResponseEntity.ok(ApiResponse.success(result));
 
diff --git a/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java b/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
index 67ed84b..74fdd1f 100644
--- a/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
+++ b/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
@@ -54,5 +54,6 @@ public class GuesthouseSearchRequestDTO {
 
 	@Schema(description = "지역 키워드를 선택하여 ", required = false)
 	private List<String> region;
+
 }
 
diff --git a/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java b/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
index a9c269a..be56778 100644
--- a/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
+++ b/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
@@ -1,9 +1,6 @@
 package com.sumte.guesthouse.repository;
 
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -12,10 +9,10 @@
 import org.springframework.util.StringUtils;
 
 import com.querydsl.core.BooleanBuilder;
-import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.SubQueryExpression;
 import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberTemplate;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.sumte.guesthouse.dto.GuesthousePreviewDTO;
@@ -58,6 +55,19 @@ public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto,
 
 		// StringUtils.hasText() : 공백만 있는 문자열, null값을 전부 false로 처리해줌.
 
+		// if (dto.getViewEnableReservation()) {
+		// 	SubQueryExpression<Long> reservedPeopleSum = JPAExpressions
+		// 		.select(reservation.adultCount.add(reservation.childCount).sum().coalesce(0L))
+		// 		.from(reservation)
+		// 		.where(
+		// 			reservation.room.id.eq(room.id),
+		// 			reservation.reservationStatus.ne(ReservationStatus.CANCELED),
+		// 			reservation.startDate.before(dto.getCheckOut()),
+		// 			reservation.endDate.after(dto.getCheckIn())
+		// 		);
+		//
+		// 	roomFilter.and(room.totalCount.subtract(reservedPeopleSum).goe(dto.getPeople()));
+		// }
 		if (dto.getViewEnableReservation()) {
 			SubQueryExpression<Long> reservedPeopleSum = JPAExpressions
 				.select(reservation.adultCount.add(reservation.childCount).sum().coalesce(0L))
@@ -69,7 +79,24 @@ public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto,
 					reservation.endDate.after(dto.getCheckIn())
 				);
 
-			roomFilter.and(room.totalCount.subtract(reservedPeopleSum).goe(dto.getPeople()));
+			BooleanBuilder reservationCondition = new BooleanBuilder();
+			reservationCondition.or(
+				JPAExpressions
+					.selectOne()
+					.from(reservation)
+					.where(
+						reservation.room.id.eq(room.id),
+						reservation.reservationStatus.ne(ReservationStatus.CANCELED),
+						reservation.startDate.before(dto.getCheckOut()),
+						reservation.endDate.after(dto.getCheckIn())
+					)
+					.notExists()
+			);
+			reservationCondition.or(
+				room.totalCount.subtract(reservedPeopleSum).goe(dto.getPeople())
+			);
+
+			roomFilter.and(reservationCondition);
 		}
 
 		if (dto.getMinPrice() != null && dto.getMaxPrice() != null) {
@@ -91,12 +118,22 @@ public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto,
 			.where(roomFilter)
 			.fetch();
 
+		System.out.println("validRoomIds = " + validRoomIds);
+
 		List<Long> validGuesthouseIds = queryFactory.select(room.guesthouse.id)
 			.from(room)
 			.where(room.id.in(validRoomIds))
 			.distinct()
 			.fetch();
 
+		System.out.println("validGuesthouseIds = " + validGuesthouseIds);
+
+		if (validGuesthouseIds.isEmpty()) {
+			System.out.println("guesthouse 조건에 맞는 게 없음");
+		} else {
+			System.out.println("guesthouse 조건에 맞는 것 있음: " + validGuesthouseIds);
+		}
+
 		// guesthouse 조건 마저 설정하기
 		condition.and(guesthouse.id.in(validGuesthouseIds));
 
@@ -133,57 +170,61 @@ public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto,
 			));
 		}
 
-		// 리뷰 통계 조회
-		Map<Long, Tuple> reviewStatMap = queryFactory.select(
-				room.guesthouse.id,
-				review.score.avg(),
-				review.id.count()
-			).from(review)
-			.join(review.room, room)
-			.where(room.id.in(validRoomIds))
-			.groupBy(room.guesthouse.id)
-			.fetch()
-			.stream()
-			.collect(Collectors.toMap(
-				t -> t.get(room.guesthouse.id),
-				Function.identity()
-			));
+		// List<GuesthousePreviewDTO> guesthouses = queryFactory
+		// 	.select(Projections.constructor(
+		// 		GuesthousePreviewDTO.class,
+		// 		guesthouse.id,
+		// 		guesthouse.name,
+		// 		// review.score.avg().coalesce(0.0),
+		// 		// review.id.count().coalesce(0L),
+		// 		JPAExpressions.select(
+		// 			Expressions.numberTemplate(Double.class, "coalesce(avg({0}), {1})", review.score, 0.0)
+		// 		).from(review).where(review.room.guesthouse.id.eq(guesthouse.id)),
+		//
+		// 		JPAExpressions.select(
+		// 			Expressions.numberTemplate(Long.class, "coalesce(count({0}), {1})", review.id, 0L)
+		// 		).from(review).where(review.room.guesthouse.id.eq(guesthouse.id)),
+		// 		Expressions.numberTemplate(Long.class, "min({0})", room.price),
+		// 		guesthouse.addressRegion,
+		// 		room.checkin.min()
+		// 	))
+		// 	.from(room)
+		// 	.join(room.guesthouse, guesthouse)
+		// 	.leftJoin(review).on(review.room.id.eq(room.id))
+		// 	.where(condition)
+		// 	.groupBy(guesthouse.id)
+		// 	.orderBy(review.id.count().desc())
+		// 	.offset(pageable.getOffset())
+		// 	.limit(pageable.getPageSize())
+		// 	.fetch();
+		NumberTemplate<Double> avgScore = Expressions.numberTemplate(Double.class,
+			"coalesce((select avg(r.score) from Review r where r.room.guesthouse.id = {0}), {1})",
+			guesthouse.id, 0.0);
+
+		NumberTemplate<Long> reviewCount = Expressions.numberTemplate(Long.class,
+			"coalesce((select count(r.id) from Review r where r.room.guesthouse.id = {0}), {1})",
+			guesthouse.id, 0L);
 
-		// Step 5. guesthouse 리스트 조회 (room도 조인하여 최소 가격 등 포함)
 		List<GuesthousePreviewDTO> guesthouses = queryFactory
 			.select(Projections.constructor(
 				GuesthousePreviewDTO.class,
 				guesthouse.id,
 				guesthouse.name,
-				Expressions.constant(0.0),
-				Expressions.constant(0L),
-				room.price.min(),
+				avgScore,
+				reviewCount,
+				Expressions.numberTemplate(Long.class, "min({0})", room.price),
 				guesthouse.addressRegion,
 				room.checkin.min()
 			))
-			.from(guesthouse)
-			.join(guesthouse.rooms, room)
+			.from(room)
+			.join(room.guesthouse, guesthouse)
 			.where(condition)
-			.groupBy(guesthouse.id)
-			.orderBy(review.id.count().desc())
+			.groupBy(guesthouse.id, guesthouse.name, guesthouse.addressRegion)
+			.orderBy(reviewCount.desc()) // ← SubQuery로 만든 count를 기준으로 정렬
 			.offset(pageable.getOffset())
 			.limit(pageable.getPageSize())
 			.fetch();
 
-		// Step 6. 리뷰 평균/갯수 덮어쓰기
-		guesthouses.forEach(preview -> {
-			Tuple stats = reviewStatMap.get(preview.getId());
-			if (stats != null) {
-				Double avg = stats.get(0, Double.class);
-				Long count = stats.get(1, Long.class);
-				preview.setAverageScore(avg != null ? avg : 0.0);
-				preview.setReviewCount(count != null ? count : 0L);
-			} else {
-				preview.setAverageScore(0.0);
-				preview.setReviewCount(0L);
-			}
-		});
-
 		return new PageImpl<>(guesthouses, pageable, guesthouses.size());
 	}
-}
+}
\ No newline at end of file

From 7936c0c7d301fcaadef665107d0e50a5f47acb22 Mon Sep 17 00:00:00 2001
From: eeeeeaaan <wjdwjddla73@naver.com>
Date: Tue, 15 Jul 2025 15:09:59 +0900
Subject: [PATCH 6/7] =?UTF-8?q?[MOD]=20Room=20api=20dto=20=EB=A7=A4?=
 =?UTF-8?q?=ED=95=91=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sumte/room/controller/RoomController.java  |  4 ++--
 .../com/sumte/room/converter/RoomConverter.java    | 14 +++++++-------
 .../java/com/sumte/room/dto/RoomRequestDTO.java    |  4 ++--
 .../java/com/sumte/room/dto/RoomResponseDTO.java   |  6 +++---
 src/main/java/com/sumte/room/entity/Room.java      |  2 +-
 .../com/sumte/room/service/RoomCommandService.java |  6 +++---
 .../sumte/room/service/RoomCommandServiceImpl.java |  8 ++++----
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/sumte/room/controller/RoomController.java b/src/main/java/com/sumte/room/controller/RoomController.java
index 9d43b72..b342482 100644
--- a/src/main/java/com/sumte/room/controller/RoomController.java
+++ b/src/main/java/com/sumte/room/controller/RoomController.java
@@ -33,7 +33,7 @@ public class RoomController {
 	})
 	public ApiResponse<Void> registerRoom(
 		@PathVariable Long guesthouseId,
-		@RequestBody @Valid RoomRequestDTO.Register dto) {
+		@RequestBody @Valid RoomRequestDTO.RegisterRoom dto) {
 		roomCommandService.registerRoom(dto, guesthouseId);
 
 		return ApiResponse.successWithNoData();
@@ -63,7 +63,7 @@ public ApiResponse<Void> deleteRoom(
 	})
 	public ApiResponse<Void> updateRoom(
 		@PathVariable Long guesthouseId, @PathVariable Long roomId,
-		@RequestBody @Valid RoomRequestDTO.Update dto
+		@RequestBody @Valid RoomRequestDTO.UpdateRoom dto
 	) {
 		roomCommandService.updateRoom(dto, guesthouseId, roomId);
 		return ApiResponse.successWithNoData();
diff --git a/src/main/java/com/sumte/room/converter/RoomConverter.java b/src/main/java/com/sumte/room/converter/RoomConverter.java
index b94f465..5caccae 100644
--- a/src/main/java/com/sumte/room/converter/RoomConverter.java
+++ b/src/main/java/com/sumte/room/converter/RoomConverter.java
@@ -12,27 +12,27 @@
 @RequiredArgsConstructor
 public class RoomConverter {
 
-	public Room toRegisterEntity(RoomRequestDTO.Register dto) {
+	public Room toRegisterEntity(RoomRequestDTO.RegisterRoom dto) {
 		Room room = Room.createRoomEntity(dto);
 
 		return room;
 	}
 
-	public RoomResponseDTO.Register toRegisterDTO(Room room) {
-		return RoomResponseDTO.Register.builder()
+	public RoomResponseDTO.Registered toRegisterDTO(Room room) {
+		return RoomResponseDTO.Registered.builder()
 			.name(room.getName())
 			.roomId(room.getId())
 			.build();
 	}
 
-	public RoomResponseDTO.Delete toDeleteEntity(Room room) {
-		return RoomResponseDTO.Delete.builder()
+	public RoomResponseDTO.Deleted toDeleteEntity(Room room) {
+		return RoomResponseDTO.Deleted.builder()
 			.name(room.getName())
 			.build();
 	}
 
-	public RoomResponseDTO.Update toUpdateEntity(Room room) {
-		return RoomResponseDTO.Update.builder()
+	public RoomResponseDTO.Updated toUpdateEntity(Room room) {
+		return RoomResponseDTO.Updated.builder()
 			.roomId(room.getId())
 			.build();
 	}
diff --git a/src/main/java/com/sumte/room/dto/RoomRequestDTO.java b/src/main/java/com/sumte/room/dto/RoomRequestDTO.java
index 8340669..8f35472 100644
--- a/src/main/java/com/sumte/room/dto/RoomRequestDTO.java
+++ b/src/main/java/com/sumte/room/dto/RoomRequestDTO.java
@@ -10,7 +10,7 @@
 
 public class RoomRequestDTO {
 	@Getter
-	public static class Register {
+	public static class RegisterRoom {
 		@NotBlank(message = "이름을 입력해주세요")
 		String name;
 
@@ -38,7 +38,7 @@ public static class Register {
 	}
 
 	@Getter
-	public static class Update {
+	public static class UpdateRoom {
 		String name;
 		String content;
 		Long price;
diff --git a/src/main/java/com/sumte/room/dto/RoomResponseDTO.java b/src/main/java/com/sumte/room/dto/RoomResponseDTO.java
index 92dcc34..0fef6bf 100644
--- a/src/main/java/com/sumte/room/dto/RoomResponseDTO.java
+++ b/src/main/java/com/sumte/room/dto/RoomResponseDTO.java
@@ -10,7 +10,7 @@ public class RoomResponseDTO {
 	@Getter
 	@NoArgsConstructor
 	@AllArgsConstructor
-	public static class Register {
+	public static class Registered {
 		Long roomId;
 		String name;
 	}
@@ -19,7 +19,7 @@ public static class Register {
 	@Getter
 	@NoArgsConstructor
 	@AllArgsConstructor
-	public static class Update {
+	public static class Updated {
 		Long roomId;
 	}
 
@@ -27,7 +27,7 @@ public static class Update {
 	@Getter
 	@NoArgsConstructor
 	@AllArgsConstructor
-	public static class Delete {
+	public static class Deleted {
 		String name;
 	}
 
diff --git a/src/main/java/com/sumte/room/entity/Room.java b/src/main/java/com/sumte/room/entity/Room.java
index 924a6c1..6cf7d4b 100644
--- a/src/main/java/com/sumte/room/entity/Room.java
+++ b/src/main/java/com/sumte/room/entity/Room.java
@@ -37,7 +37,7 @@ public class Room extends BaseTimeEntity {
 	private Long totalCount;
 	private String imageUrl;
 
-	public static Room createRoomEntity(RoomRequestDTO.Register dto) {
+	public static Room createRoomEntity(RoomRequestDTO.RegisterRoom dto) {
 		Room room = new Room();
 		room.name = dto.getName();
 		room.contents = dto.getContent();
diff --git a/src/main/java/com/sumte/room/service/RoomCommandService.java b/src/main/java/com/sumte/room/service/RoomCommandService.java
index 4daec5f..4393072 100644
--- a/src/main/java/com/sumte/room/service/RoomCommandService.java
+++ b/src/main/java/com/sumte/room/service/RoomCommandService.java
@@ -4,9 +4,9 @@
 import com.sumte.room.dto.RoomResponseDTO;
 
 public interface RoomCommandService {
-	RoomResponseDTO.Register registerRoom(RoomRequestDTO.Register dto, Long guesthouseId);
+	RoomResponseDTO.Registered registerRoom(RoomRequestDTO.RegisterRoom dto, Long guesthouseId);
 
-	RoomResponseDTO.Update updateRoom(RoomRequestDTO.Update dto, Long guesthouseId, Long roomId);
+	RoomResponseDTO.Updated updateRoom(RoomRequestDTO.UpdateRoom dto, Long guesthouseId, Long roomId);
 
-	RoomResponseDTO.Delete deleteRoom(Long roomId, Long guesthouseId);
+	RoomResponseDTO.Deleted deleteRoom(Long roomId, Long guesthouseId);
 }
diff --git a/src/main/java/com/sumte/room/service/RoomCommandServiceImpl.java b/src/main/java/com/sumte/room/service/RoomCommandServiceImpl.java
index 88ae10b..22c4afd 100644
--- a/src/main/java/com/sumte/room/service/RoomCommandServiceImpl.java
+++ b/src/main/java/com/sumte/room/service/RoomCommandServiceImpl.java
@@ -24,7 +24,7 @@ public class RoomCommandServiceImpl implements RoomCommandService {
 	private final GuesthouseRepository guesthouseRepository;
 
 	@Override
-	public RoomResponseDTO.Register registerRoom(RoomRequestDTO.Register dto, Long guesthouseId) {
+	public RoomResponseDTO.Registered registerRoom(RoomRequestDTO.RegisterRoom dto, Long guesthouseId) {
 		Room registerRoom = roomConverter.toRegisterEntity(dto);
 		Guesthouse guesthouse = guesthouseRepository.findById(guesthouseId)
 			.orElseThrow(() -> new SumteException(CommonErrorCode.NOT_EXIST));
@@ -38,12 +38,12 @@ public RoomResponseDTO.Register registerRoom(RoomRequestDTO.Register dto, Long g
 			});
 
 		roomRepository.save(registerRoom);
-		RoomResponseDTO.Register result = roomConverter.toRegisterDTO(registerRoom);
+		RoomResponseDTO.Registered result = roomConverter.toRegisterDTO(registerRoom);
 		return result;
 	}
 
 	@Override
-	public RoomResponseDTO.Delete deleteRoom(Long roomId, Long guesthouseId) {
+	public RoomResponseDTO.Deleted deleteRoom(Long roomId, Long guesthouseId) {
 		Room room = roomRepository.findById(roomId)
 			.orElseThrow(() -> new SumteException(CommonErrorCode.NOT_EXIST));
 
@@ -54,7 +54,7 @@ public RoomResponseDTO.Delete deleteRoom(Long roomId, Long guesthouseId) {
 
 	@Override
 	@Transactional
-	public RoomResponseDTO.Update updateRoom(RoomRequestDTO.Update dto, Long guesthouseId, Long roomId) {
+	public RoomResponseDTO.Updated updateRoom(RoomRequestDTO.UpdateRoom dto, Long guesthouseId, Long roomId) {
 		Room room = roomRepository.findById(roomId)
 			.orElseThrow(() -> new SumteException(CommonErrorCode.NOT_EXIST_ROOM));
 

From 92dea4e29936c0a0922fe883d9c2e31a08655842 Mon Sep 17 00:00:00 2001
From: eeeeeaaan <wjdwjddla73@naver.com>
Date: Mon, 21 Jul 2025 11:07:40 +0900
Subject: [PATCH 7/7] =?UTF-8?q?[MOD]=20=EC=A7=80=EC=97=AD=20=ED=95=84?=
 =?UTF-8?q?=ED=84=B0=EB=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java    | 2 +-
 .../guesthouse/repository/GuesthouseRepositoryImpl.java     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java b/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
index 74fdd1f..dd8e1db 100644
--- a/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
+++ b/src/main/java/com/sumte/guesthouse/dto/GuesthouseSearchRequestDTO.java
@@ -52,7 +52,7 @@ public class GuesthouseSearchRequestDTO {
 	@Schema(description = "원하는 이용대상을 조회후 해당 목록에 있는 값들 중 원하는 것들을 list형태로 입력", required = false)
 	private List<String> targetAudience;
 
-	@Schema(description = "지역 키워드를 선택하여 ", required = false)
+	@Schema(description = "지역 키워드를 선택하여 list형태로 입력 (피그마에 나와있는 키워드 그대로 입력) ", required = false)
 	private List<String> region;
 
 }
diff --git a/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java b/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
index be56778..125b16c 100644
--- a/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
+++ b/src/main/java/com/sumte/guesthouse/repository/GuesthouseRepositoryImpl.java
@@ -149,7 +149,11 @@ public Page<GuesthousePreviewDTO> searchFiltered(GuesthouseSearchRequestDTO dto,
 		}
 
 		if (dto.getRegion() != null && !dto.getRegion().isEmpty()) {
-			condition.and(guesthouse.addressRegion.in(dto.getRegion()));
+			List<String> regions = dto.getRegion();
+
+			if (!regions.contains("제주도 전체")) {
+				condition.and(guesthouse.addressRegion.in(regions));
+			}
 		}
 
 		if (dto.getOptionService() != null && !dto.getOptionService().isEmpty()) {