Feat/#27 검색api연결 #32
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,6 +60,12 @@ final class AppComponent: Component<EmptyDependency>, RootDependency { | |
| ) | ||
| } | ||
| } | ||
|
|
||
| var templateSearchUsecase: TemplatesSearchUsecaseProtocol { | ||
| shared { | ||
| TemplatesSearchUsecase(travelTemplateRepository: travelTemplateRepository) | ||
| } | ||
| } | ||
|
|
||
| var authRepository: AuthRepositoryInterface { | ||
| shared { makeAuthRepository() } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // | ||
| // UIViewController+.swift | ||
| // Core | ||
| // | ||
| // Created by 최안용 on 2/18/26. | ||
| // Copyright © 2026 NDGL-iOS. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| public extension UIViewController { | ||
| func hideKeyboard() { | ||
| let tap = UITapGestureRecognizer(target: self, action: #selector(UIViewController.dismissKeyboard)) | ||
| tap.cancelsTouchesInView = false | ||
| view.addGestureRecognizer(tap) | ||
| } | ||
|
Comment on lines
+12
to
+16
There was a problem hiding this comment.
🛡️ 중복 등록 방지 수정안 func hideKeyboard() {
+ guard !(view.gestureRecognizers?.contains(where: { $0 is UITapGestureRecognizer }) ?? false) else { return }
let tap = UITapGestureRecognizer(target: self, action: `#selector`(UIViewController.dismissKeyboard))
tap.cancelsTouchesInView = false
view.addGestureRecognizer(tap)
}🤖 Prompt for AI Agents |
||
|
|
||
| @objc | ||
| func dismissKeyboard() { | ||
| view.endEditing(true) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // | ||
| // URLHelper.swift | ||
| // Core | ||
| // | ||
| // Created by 최안용 on 2/20/26. | ||
| // Copyright © 2026 NDGL-iOS. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| public struct URLHelper { | ||
| public static func openURL(_ urlString: String) { | ||
| guard let url = URL(string: urlString) else { return } | ||
| UIApplication.shared.open(url) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,9 +34,9 @@ public final class TravelTemplateRepository: TravelTemplateRepositoryInterface { | |
| } | ||
| } | ||
|
|
||
| public func searchTemplate(keyword: String, page: Int?, size: Int?) async throws -> [TripInfo] { | ||
| do { | ||
| return try await service.searchTemplate(keyword: keyword, page: page, size: size).toDomain() | ||
| } catch { | ||
| throw error.toNDGLError() | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| // | ||
| // PlaceRepositoryInterface.swift | ||
| // Domain | ||
| // | ||
| // Created by 최안용 on 2/14/26. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| // | ||
| // TravelProgramRepositoryInterface.swift | ||
| // Domain | ||
| // | ||
| // Created by 최안용 on 2/14/26. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| // | ||
| // TravelTemplateRepositoryInterface.swift | ||
| // Domain | ||
| // | ||
| // Created by 최안용 on 2/14/26. | ||
|
|
@@ -11,7 +11,7 @@ import Foundation | |
| public protocol TravelTemplateRepositoryInterface { | ||
| func fetchPlaces(travelId: Int, day: Int) async throws -> [TravelPlace] | ||
| func fetchTravelDetail(id: Int) async throws -> TravelDetail | ||
| func searchTemplate(keyword: String, page: Int?, size: Int?) async throws -> [TripInfo] | ||
| func fetchPopularTripList(id: Int?, page: Int?, size: Int?) async throws -> [TripInfo] | ||
| func fetchRecommendTripList(page: Int?, size: Int?) async throws -> [TripInfo] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| // | ||
| // UserTravelRepositoryInterface.swift | ||
| // Domain | ||
| // | ||
| // Created by 최안용 on 2/14/26. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // | ||
| // TemplatesSearchUsecase.swift | ||
| // Domain | ||
| // | ||
| // Created by 최안용 on 2/19/26. | ||
| // Copyright © 2026 NDGL-iOS. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| public protocol TemplatesSearchUsecaseProtocol { | ||
| func searchTemplate(keyword: String, page: Int?, size: Int?) async throws -> [TripInfo] | ||
| } | ||
|
|
||
| public extension TemplatesSearchUsecaseProtocol { | ||
| func searchTemplate( | ||
| keyword: String, | ||
| page: Int? = nil, | ||
| size: Int? = nil | ||
| ) async throws -> [TripInfo] { | ||
| try await self.searchTemplate(keyword: keyword, page: page, size: size) | ||
| } | ||
| } | ||
|
Comment on lines
+15
to
+23
There was a problem hiding this comment. 프로토콜 요구 메서드와 동일한 기본 시그니처를 가진 extension 기본 구현 → 무한 재귀 위험
현재 권장 해결책은 extension 내 기본 파라미터를 가진 메서드의 이름을 바꿔 프로토콜 요구 메서드와 명확히 구분하는 것입니다. 예를 들어 🐛 무한 재귀를 방지하는 수정 제안 public extension TemplatesSearchUsecaseProtocol {
- func searchTemplate(
- keyword: String,
- page: Int? = nil,
- size: Int? = nil
- ) async throws -> [TripInfo] {
- try await self.searchTemplate(keyword: keyword, page: page, size: size)
- }
+ // 편의 메서드: page/size 없이 키워드만으로 검색 (프로토콜 요구 메서드와 다른 시그니처)
+ func searchTemplate(keyword: String) async throws -> [TripInfo] {
+ try await searchTemplate(keyword: keyword, page: nil, size: nil)
+ }
}🤖 Prompt for AI Agents |
||
|
|
||
| public final class TemplatesSearchUsecase { | ||
| private let travelTemplateRepository: TravelTemplateRepositoryInterface | ||
|
|
||
| public init(travelTemplateRepository: TravelTemplateRepositoryInterface) { | ||
| self.travelTemplateRepository = travelTemplateRepository | ||
| } | ||
| } | ||
|
|
||
| extension TemplatesSearchUsecase: TemplatesSearchUsecaseProtocol { | ||
| public func searchTemplate(keyword: String, page: Int?, size: Int?) async throws -> [TripInfo] { | ||
| try await travelTemplateRepository.searchTemplate(keyword: keyword, page: page, size: size) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,7 +44,7 @@ final class HomeViewController: UIViewController, HomeViewControllable { | |
| private let loadingIndicator = UIActivityIndicatorView(style: .medium) | ||
| private let networkErrorView = NDGLErrorView() | ||
|
|
||
| private var dataSource: UICollectionViewDiffableDataSource<HomeSectionKind, HomeItem>! = nil | ||
|
|
||
| // MARK: - Lifecycle | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,10 +17,11 @@ enum HomeSectionKind: Int, CaseIterable { | |
| var headerTitle: String { | ||
| switch self { | ||
| case .category: | ||
| return "인기 여행 따라가기" | ||
| case .recommendedTrip: | ||
| let nickname = UserDefaults.standard.string(forKey: "nickname") ?? "알 수 없음" | ||
| return "\(nickname)님께 추천하는\n따라가기 여행 콘텐츠에요!" | ||
|
Comment on lines
+22
to
+23
There was a problem hiding this comment. 🛠️ Refactor suggestion | 🟠 Major 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# Search for "nickname" key usage across the codebase
rg -n '"nickname"' --type swift -A2 -B2Repository: YAPP-Github/27th-App-Team-1-iOS Length of output: 2041 🏁 Script executed: #!/bin/bash
# Examine the HomeSectionKind.swift file to confirm current state
find . -name "HomeSectionKind.swift" -type fRepository: YAPP-Github/27th-App-Team-1-iOS Length of output: 169 🏁 Script executed: #!/bin/bash
# Look for UserDefaults patterns across the codebase
rg -n 'UserDefaults\.standard' --type swift | head -30Repository: YAPP-Github/27th-App-Team-1-iOS Length of output: 1010
코드에 ♻️ 제안
- var headerTitle: String {
+ func headerTitle(nickname: String? = nil) -> String {
switch self {
case .category:
return "인기 여행 따라가기"
case .recommendedTrip:
- let nickname = UserDefaults.standard.string(forKey: "nickname") ?? "알 수 없음"
- return "\(nickname)님께 추천하는\n따라가기 여행 콘텐츠에요!"
+ let name = nickname ?? "알 수 없음"
+ return "\(name)님께 추천하는\n따라가기 여행 콘텐츠에요!"
default: return ""
}
}🤖 Prompt for AI Agents |
||
| default: return "" | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,21 +7,25 @@ | |
| // | ||
|
|
||
| import Domain | ||
| import FollowFeature | ||
| import PopularTravelFeature | ||
| import SearchFeature | ||
| import SettingFeature | ||
| import TabBarFeature | ||
|
|
||
| import RIBs | ||
|
|
||
| public protocol MainDependency: Dependency { | ||
| var homeUsecase: HomeUsecaseProtocol { get } | ||
| var followDetailUsecase: FollowDetailUsecaseProtocol { get } | ||
| var templateSearchUsecase: TemplatesSearchUsecaseProtocol { get } | ||
| } | ||
|
|
||
| final class MainComponent: Component<MainDependency>, FollowDetailDependency, PopularTravelDependency,SearchDependency, SettingDependency, TabBarDependency { | ||
| var searchUsecase: TemplatesSearchUsecaseProtocol { | ||
| dependency.templateSearchUsecase | ||
| } | ||
|
|
||
| var followDetailUsecase: FollowDetailUsecaseProtocol { | ||
| dependency.followDetailUsecase | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -91,4 +91,8 @@ final class MainInteractor: PresentableInteractor<MainPresentable>, MainInteract | |
| func routeToSearch() { | ||
| router?.attachSearch() | ||
| } | ||
|
|
||
| func attachFollowDetail(with recommendationId: Int) { | ||
| router?.attachFollow(with: recommendationId) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -107,14 +107,14 @@ final class MainRouter: ViewableRouter<MainInteractable, MainViewControllable>, | |
| let router = searchBuilder.build(withListener: interactor) | ||
| self.searchRouter = router | ||
| attachChild(router) | ||
| viewController.pushViewController(router.viewControllable, animated: false) | ||
| } | ||
|
|
||
| func detachSearch() { | ||
| guard let router = searchRouter else { return } | ||
|
|
||
| if viewController.containsInStack(router.viewControllable) { | ||
| viewController.popRootViewController(animated: false) | ||
| } | ||
|
|
||
| detachChild(router) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,11 +18,16 @@ public protocol RootDependency: Dependency { | |
| var followDetailUsecase: FollowDetailUsecaseProtocol { get } | ||
| var authRepository: AuthRepositoryInterface { get } | ||
| var tokenRepository: TokenRepositoryProtocol { get } | ||
| var templateSearchUsecase: TemplatesSearchUsecaseProtocol { get } | ||
| } | ||
|
|
||
| // MARK: - RootComponent | ||
|
|
||
| final class RootComponent: Component<RootDependency>, MainDependency { | ||
| var templateSearchUsecase: TemplatesSearchUsecaseProtocol { | ||
| dependency.templateSearchUsecase | ||
| } | ||
|
|
||
| var followDetailUsecase: FollowDetailUsecaseProtocol { | ||
| dependency.followDetailUsecase | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -70,14 +70,22 @@ final class RootInteractor: PresentableInteractor<RootPresentable>, RootInteract | |
| if let uuid = self.tokenRepository.get(.uuid) { | ||
| let loginResult = try await self.authRepository.login(uuid: uuid) | ||
| self.tokenRepository.save(loginResult.accessToken, for: .accessToken) | ||
|
|
||
| // 임시 | ||
| UserDefaults.standard.set(loginResult.uuid, forKey: "uuid") | ||
| UserDefaults.standard.set(loginResult.nickname, forKey: "nickname") | ||
| } else { | ||
| let fcmToken = self.tokenRepository.get(.fcmToken) ?? UUID().uuidString | ||
| let signupResult = try await self.authRepository.signup( | ||
| info: SignupInfo(fcmToken: fcmToken) | ||
| ) | ||
| self.tokenRepository.save(signupResult.uuid, for: .uuid) | ||
| self.tokenRepository.save(signupResult.accessToken, for: .accessToken) | ||
|
|
||
| // 임시 | ||
| UserDefaults.standard.set(signupResult.uuid, forKey: "uuid") | ||
| UserDefaults.standard.set(signupResult.nickname, forKey: "nickname") | ||
|
Comment on lines
+73
to
+87
There was a problem hiding this comment. UUID·닉네임을
"임시" 표시가 있더라도 이 패턴이 다른 모듈에 의해 의존될 경우 제거가 어려워질 수 있으니, 가능한 한 빠르게 올바른 경로(Keychain/ 🤖 Prompt for AI Agents |
||
|
|
||
| let loginResult = try await self.authRepository.login(uuid: signupResult.uuid) | ||
| self.tokenRepository.save(loginResult.accessToken, for: .accessToken) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // | ||
| // SearchResultPresentationModel.swift | ||
| // SearchFeature | ||
| // | ||
| // Created by 최안용 on 2/18/26. | ||
| // Copyright © 2026 NDGL-iOS. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| import Domain | ||
|
|
||
| struct SearchResultPresentationModel { | ||
| let resultTrip: [SearchResultPresentationModel.ResultTrip] | ||
|
|
||
| struct ResultTrip: Hashable { | ||
| let id: Int | ||
| let title: String | ||
| let thumbnailUrl: String | ||
| let creator: String | ||
| let schedule: String | ||
| let country: String | ||
| let city: String | ||
| } | ||
| } | ||
|
|
||
| extension TripInfo { | ||
| func toSearchResultModel() -> SearchResultPresentationModel.ResultTrip { | ||
| return SearchResultPresentationModel.ResultTrip( | ||
| id: self.id, | ||
| title: self.title, | ||
| thumbnailUrl: self.thumbnailUrl, | ||
| creator: self.creator, | ||
| schedule: "\(self.nights)박 \(self.days)일", | ||
| country: self.country, | ||
| city: self.city | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: YAPP-Github/27th-App-Team-1-iOS
Length of output: 361
🏁 Script executed:
Repository: YAPP-Github/27th-App-Team-1-iOS
Length of output: 2825
🏁 Script executed:
Repository: YAPP-Github/27th-App-Team-1-iOS
Length of output: 441
🏁 Script executed:
Repository: YAPP-Github/27th-App-Team-1-iOS
Length of output: 4035
X_API_KEY를 Info.plist에서 조건부로만 읽도록 수정하고, demoInfoPlist에도 추가하세요.원래 우려했던 xcconfig 보안 설정은 올바릅니다.
.gitignore에서*.xcconfig를 제대로 차단하고 있으며, CI 워크플로우에서 비공개 저장소로부터 해당 파일을 주입하고 있습니다. 그러나 두 가지 실행 문제가 있습니다:NetworkConfiguration.apiKey (Projects/Modules/Networks/Sources/Foundation/NetworkConfiguration.swift:25-26)는 모든 빌드에서
X_API_KEY를 읽으려 시도합니다. 팀의 지침에 따르면 DEBUG 모드에서만 읽어야 합니다. DEBUG가 아닐 때는 조건부로 처리하거나 경고하도록 수정하세요.demoInfoPlist (Plugins/EnvPlugin/ProjectDescriptionHelpers/InfoPlist.swift:39-64)에는
X_API_KEY가 정의되어 있지 않습니다. 반면 demo 타겟이 비-DEBUG 빌드에서 AuthAPI, TravelTemplateAPI 등을 호출하면 Info.plist 조회 실패로 런타임 크래시가 발생합니다. demoInfoPlist에도X_API_KEY항목을 추가하거나, 해당 APIs 호출을 DEBUG 모드로 제한하세요.🤖 Prompt for AI Agents