Skip to content

[MERGE] TF 1.0.6 #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzangzzangguy merged 2 commits into from
Feb 10, 2025
Merged

[MERGE] TF 1.0.6 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7ac5a8
[FEAT]: 지역필터적용과 뱃지라벨 및 툴팁 적용
zzangzzangguy Feb 10, 2025
f65f1eb
[FIX] : 툴팁적용시 버그 수정 및 마커 표기 부드러운전환으로 수정
zzangzzangguy Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Poppool/Poppool.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@
4E7823A92D2E84FB00AC5110 /* AdminStoreCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E755B262D2B9C7C00ADFB21 /* AdminStoreCell.swift */; };
4E78706E2D37CB1900465FC9 /* ProfileEditListButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 081898BF2D2FBD130067BF01 /* ProfileEditListButton.swift */; };
4E78706F2D37CB2200465FC9 /* PopUpStoreRegisterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E9C12802D2BE0A6006744D6 /* PopUpStoreRegisterViewController.swift */; };
4E8AA29D2D59A2340029DF75 /* MarkerTooltipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E8AA29C2D59A2340029DF75 /* MarkerTooltipView.swift */; };
4E9790C52D40E13500210499 /* MapGuideViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E9790C42D40E13500210499 /* MapGuideViewController.swift */; };
4E9A465E2D50B2DB0010578A /* AdminStoreCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E755B262D2B9C7C00ADFB21 /* AdminStoreCell.swift */; };
4E9A46602D55D1270010578A /* MapUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E9A465F2D55D1270010578A /* MapUtilities.swift */; };
Expand All @@ -424,7 +425,6 @@
4EA2C93F2D424D7400F4D97C /* MapDirectionUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EA2C93E2D424D7400F4D97C /* MapDirectionUseCase.swift */; };
4EA2C9412D424D8400F4D97C /* GetPopUpDirectionResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EA2C9402D424D8400F4D97C /* GetPopUpDirectionResponseDTO.swift */; };
4EA2C9432D424DF900F4D97C /* FindDirectionEndPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EA2C9422D424DF900F4D97C /* FindDirectionEndPoint.swift */; };
4EA2E3CD2D572C18006FB885 /* MicroClusterMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EA2E3CC2D572C18006FB885 /* MicroClusterMarkerView.swift */; };
4EA9989A2D21C2FC009DC30B /* StoreListSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EA998992D21C2FC009DC30B /* StoreListSection.swift */; };
4EA9989D2D21C404009DC30B /* RxDataSources in Frameworks */ = {isa = PBXBuildFile; productRef = 4EA9989C2D21C404009DC30B /* RxDataSources */; };
4EAB809D2D3F78AA0041AF30 /* GMSMapViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EAB809C2D3F78AA0041AF30 /* GMSMapViewDelegateProxy.swift */; };
Expand Down Expand Up @@ -901,6 +901,7 @@
4E755B282D2BA65A00ADFB21 /* AdminReactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdminReactor.swift; sourceTree = "<group>"; };
4E755B2A2D2BA76E00ADFB21 /* AdminUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdminUseCase.swift; sourceTree = "<group>"; };
4E755B2E2D2BA7FB00ADFB21 /* AdminRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdminRepository.swift; sourceTree = "<group>"; };
4E8AA29C2D59A2340029DF75 /* MarkerTooltipView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerTooltipView.swift; sourceTree = "<group>"; };
4E9790C42D40E13500210499 /* MapGuideViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapGuideViewController.swift; sourceTree = "<group>"; };
4E9A465F2D55D1270010578A /* MapUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapUtilities.swift; sourceTree = "<group>"; };
4E9C12772D2BC7A0006744D6 /* AdminBottomSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdminBottomSheetView.swift; sourceTree = "<group>"; };
Expand All @@ -910,7 +911,6 @@
4EA2C93E2D424D7400F4D97C /* MapDirectionUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapDirectionUseCase.swift; sourceTree = "<group>"; };
4EA2C9402D424D8400F4D97C /* GetPopUpDirectionResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetPopUpDirectionResponseDTO.swift; sourceTree = "<group>"; };
4EA2C9422D424DF900F4D97C /* FindDirectionEndPoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindDirectionEndPoint.swift; sourceTree = "<group>"; };
4EA2E3CC2D572C18006FB885 /* MicroClusterMarkerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicroClusterMarkerView.swift; sourceTree = "<group>"; };
4EA998992D21C2FC009DC30B /* StoreListSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreListSection.swift; sourceTree = "<group>"; };
4EAB809C2D3F78AA0041AF30 /* GMSMapViewDelegateProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GMSMapViewDelegateProxy.swift; sourceTree = "<group>"; };
4EAB809E2D3F8EF50041AF30 /* ViewportBounds.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewportBounds.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2750,8 +2750,8 @@
4E685EC02D12CEB6001EF91C /* MapPopupCardView */,
4E685EC52D12CEB6001EF91C /* StoreListView */,
4E685EC62D12CEB6001EF91C /* MapFilterChips.swift */,
4E8AA29C2D59A2340029DF75 /* MarkerTooltipView.swift */,
4E685EC72D12CEB6001EF91C /* MapMarker.swift */,
4EA2E3CC2D572C18006FB885 /* MicroClusterMarkerView.swift */,
4E685EC82D12CEB6001EF91C /* MapReactor.swift */,
4E685EC92D12CEB6001EF91C /* MapSearchInput.swift */,
4E685ECB2D12CEB6001EF91C /* MapView.swift */,
Expand Down Expand Up @@ -3335,7 +3335,6 @@
088DE2562D144A830030FA9E /* DetailCommentSectionCell.swift in Sources */,
08B1919E2CF4A7830057BC04 /* TagSectionCell.swift in Sources */,
081899142D34CAEA0067BF01 /* GetNoticeDetailResponse.swift in Sources */,
4EA2E3CD2D572C18006FB885 /* MicroClusterMarkerView.swift in Sources */,
081898D22D30F57D0067BF01 /* CategoryEditModalView.swift in Sources */,
083C860B2D073A15003F441C /* DetailView.swift in Sources */,
086F89C52D1E347E00CA4FC9 /* CommentUserInfoController.swift in Sources */,
Expand Down Expand Up @@ -3569,6 +3568,7 @@
4E685EDE2D12CEB6001EF91C /* MapPopupCarouselView.swift in Sources */,
08B1917D2CF46DE30057BC04 /* TermsDetailController.swift in Sources */,
08CBEA0B2D38DBD600248007 /* LastLoginView.swift in Sources */,
4E8AA29D2D59A2340029DF75 /* MarkerTooltipView.swift in Sources */,
0841BAB12CFA38F500049E31 /* HomeCardSectionCell.swift in Sources */,
4E685EE32D12CEB6001EF91C /* StoreListViewController.swift in Sources */,
0818990A2D34B3620067BF01 /* MyPageNoticeController.swift in Sources */,
Expand Down
195 changes: 195 additions & 0 deletions Poppool/Poppool.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 18 additions & 19 deletions Poppool/Poppool/Infrastructure/NetworkLayer/Provider/ProviderImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,28 @@ final class ProviderImpl: Provider {
/// 1) endpoint -> urlRequest 생성
let urlRequest = try endpoint.getUrlRequest()

// [중요] 실제 최종 URL 로깅
// Logger.log(
// message: """
// [Provider] 최종 요청 URL:
// - URL: \(urlRequest.url?.absoluteString ?? "URL이 없습니다.")
// - Method: \(urlRequest.httpMethod ?? "알 수 없음")
// - Headers: \(urlRequest.allHTTPHeaderFields ?? [:])
// 요청 시각: \(Date())
// """,
// category: .debug
// )
Logger.log(
message: """
[Provider] 최종 요청 URL:
- URL: \(urlRequest.url?.absoluteString ?? "URL이 없습니다.")
- Method: \(urlRequest.httpMethod ?? "알 수 없음")
- Headers: \(urlRequest.allHTTPHeaderFields ?? [:])
요청 시각: \(Date())
""",
category: .debug
)

let request = AF.request(urlRequest, interceptor: interceptor)
.validate()
.responseData { [weak self] response in
// Logger.log(
// message: """
// [Provider] 응답 수신:
// - URL: \(urlRequest.url?.absoluteString ?? "URL이 없습니다.")
// - 응답 시각: \(Date())
// """,
// category: .network
// )
Logger.log(
message: """
[Provider] 응답 수신:
- URL: \(urlRequest.url?.absoluteString ?? "URL이 없습니다.")
- 응답 시각: \(Date())
""",
category: .network
)
switch response.result {
case .success(let data):
// 빈 응답 처리
Expand Down
6 changes: 6 additions & 0 deletions Poppool/Poppool/Presentation/Admin/AdminViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,12 @@ final class AdminViewController: BaseViewController, View {
adminUseCase: adminUseCase,
editingStore: store
)

// 수정할 때도 completionHandler 추가
registerVC.completionHandler = { [weak self] in
self?.reactor?.action.onNext(.reloadData)
}

navigationController?.pushViewController(registerVC, animated: true)
}

Expand Down
30 changes: 27 additions & 3 deletions Poppool/Poppool/Presentation/Admin/Data/Repository/AdminRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,41 @@ final class DefaultAdminRepository: AdminRepository {

func updateStore(request: UpdatePopUpStoreRequestDTO) -> Observable<EmptyResponse> {
let endpoint = AdminAPIEndpoint.updateStore(request: request)

Logger.log(message: """
Store Update 요청:
URL: \(endpoint.baseURL + endpoint.path)
Method: PUT
Request: \(request)
""", category: .debug)

return provider.requestData(
with: endpoint,
interceptor: tokenInterceptor
)
.catch { error -> Observable<EmptyResponse> in
if case .responseSerializationFailed(let reason) = error as? AFError,
case .inputDataNilOrZeroLength = reason {
return Observable.just(EmptyResponse())
Logger.log(message: "Update Store Error 발생: \(error)", category: .error)

if let afError = error as? AFError {
switch afError {
case .responseSerializationFailed(let reason):
Logger.log(message: "Serialization 실패 reason: \(reason)", category: .error)
if case .inputDataNilOrZeroLength = reason {
Logger.log(message: "빈 응답 데이터 - 성공으로 처리", category: .info)
return Observable.just(EmptyResponse())
}
default:
Logger.log(message: "기타 AFError: \(afError)", category: .error)
}
}

throw error
}
.do(onNext: { _ in
Logger.log(message: "Store Update 성공", category: .info)
}, onError: { error in
Logger.log(message: "Store Update 최종 실패: \(error)", category: .error)
})
}


Expand Down
11 changes: 11 additions & 0 deletions Poppool/Poppool/Presentation/Admin/Domain/AdminUseCase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,18 @@ final class DefaultAdminUseCase: AdminUseCase {
}

func updateStore(request: UpdatePopUpStoreRequestDTO) -> Observable<EmptyResponse> {
Logger.log(message: """
Updating store with location:
Latitude: \(request.location.latitude)
Longitude: \(request.location.longitude)
""", category: .debug)

return repository.updateStore(request: request)
.do(onNext: { _ in
Logger.log(message: "Store update successful", category: .debug)
}, onError: { error in
Logger.log(message: "Store update failed: \(error)", category: .error)
})
}

func deleteStore(id: Int64) -> Observable<EmptyResponse> {
Expand Down
Loading