From 900146713264564b192e6e95421100e5976daf0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=80=E1=85=B5=E1=84=92?= =?UTF-8?q?=E1=85=A7=E1=86=AB?= Date: Mon, 12 May 2025 19:13:13 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix/#139:=20=EC=96=B4=EB=93=9C=EB=AF=BC?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scene/Admin/AdminViewController.swift | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/Poppool/PresentationLayer/Presentation/Presentation/Scene/Admin/AdminViewController.swift b/Poppool/PresentationLayer/Presentation/Presentation/Scene/Admin/AdminViewController.swift index 6e31f7e6..8c049ba1 100644 --- a/Poppool/PresentationLayer/Presentation/Presentation/Scene/Admin/AdminViewController.swift +++ b/Poppool/PresentationLayer/Presentation/Presentation/Scene/Admin/AdminViewController.swift @@ -178,24 +178,15 @@ final class AdminViewController: BaseViewController, View { .subscribe( onNext: { [weak self] storeDetail in guard let self = self else { return } - let updateParams = UpdateStoreParams( - id: storeDetail.id, - name: storeDetail.name, - categoryId: storeDetail.categoryId, - desc: storeDetail.description, - address: storeDetail.address, - startDate: storeDetail.startDate, - endDate: storeDetail.endDate, - mainImageUrl: storeDetail.mainImageUrl, - imageUrlList: storeDetail.images.map { $0.imageUrl }, - imagesToDelete: [], - latitude: storeDetail.latitude, - longitude: storeDetail.longitude, - markerTitle: storeDetail.markerTitle, - markerSnippet: storeDetail.markerSnippet, - startDateBeforeEndDate: true + let registerVC = PopUpStoreRegisterViewController( + nickname: self.nickname, + editingStore: store ) - let registerVC = PopUpStoreRegisterViewController(nickname: self.nickname) + + registerVC.completionHandler = { [weak self] in + self?.reactor?.action.onNext(.reloadData) + } + self.navigationController?.pushViewController(registerVC, animated: true) }, onError: { [weak self] error in @@ -206,7 +197,6 @@ final class AdminViewController: BaseViewController, View { } private func deleteStore(_ store: AdminStore) { - // 먼저 스토어 상세 정보를 가져와 모든 이미지 URL을 확인 adminUseCase.fetchStoreDetail(id: store.id) .observe(on: MainScheduler.instance) .subscribe( From 227389d2674b86dd6cfaeb51801cb6f6f24bf7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=80=E1=85=B5=E1=84=92?= =?UTF-8?q?=E1=85=A7=E1=86=AB?= Date: Mon, 12 May 2025 19:13:46 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix/#139:=20=ED=8A=B9=EC=A0=95=EC=9C=84?= =?UTF-8?q?=EC=B9=98=EC=97=90=EC=84=9C=20=ED=99=94=EB=A9=B4=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=EB=90=98=EC=A7=80=EC=95=8A=EA=B3=A0=20=EB=B0=94?= =?UTF-8?q?=EB=A1=9C=20=ED=95=B4=EB=8B=B9=EC=9C=84=EC=B9=98=EC=97=90=20?= =?UTF-8?q?=ED=8F=AC=EC=BB=A4=EC=8A=A4=EB=90=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MapGuideView/FullScreenMapViewController.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Poppool/PresentationLayer/Presentation/Presentation/Scene/Map/FindMap/MapGuideView/FullScreenMapViewController.swift b/Poppool/PresentationLayer/Presentation/Presentation/Scene/Map/FindMap/MapGuideView/FullScreenMapViewController.swift index 66be0ba2..a6cdd98d 100644 --- a/Poppool/PresentationLayer/Presentation/Presentation/Scene/Map/FindMap/MapGuideView/FullScreenMapViewController.swift +++ b/Poppool/PresentationLayer/Presentation/Presentation/Scene/Map/FindMap/MapGuideView/FullScreenMapViewController.swift @@ -106,8 +106,8 @@ class FullScreenMapViewController: MapViewController { let position = NMGLatLng(lat: store.latitude, lng: store.longitude) let cameraUpdate = NMFCameraUpdate(scrollTo: position, zoomTo: 15.0) - cameraUpdate.animation = .easeIn - cameraUpdate.animationDuration = 0.3 + mainView.mapView.cancelTransitions() + cameraUpdate.animation = .none mainView.mapView.moveCamera(cameraUpdate) if let existingMarker = initialMarker { @@ -210,8 +210,8 @@ class FullScreenMapViewController: MapViewController { mainView.setStoreCardHidden(false, animated: true) let cameraUpdate = NMFCameraUpdate(scrollTo: marker.position, zoomTo: 15.0) - cameraUpdate.animation = .easeIn - cameraUpdate.animationDuration = 0.3 + mainView.mapView.cancelTransitions() + cameraUpdate.animation = .none mainView.mapView.moveCamera(cameraUpdate) DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in From cc4e5020e770cbd280cdf1a20185ce74d1fdcdcc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 13 May 2025 06:16:57 +0000 Subject: [PATCH 3/3] style/#139: Apply SwiftLint autocorrect --- .../Presentation/Scene/Admin/AdminViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Poppool/PresentationLayer/Presentation/Presentation/Scene/Admin/AdminViewController.swift b/Poppool/PresentationLayer/Presentation/Presentation/Scene/Admin/AdminViewController.swift index 8c049ba1..4a2ce2e1 100644 --- a/Poppool/PresentationLayer/Presentation/Presentation/Scene/Admin/AdminViewController.swift +++ b/Poppool/PresentationLayer/Presentation/Presentation/Scene/Admin/AdminViewController.swift @@ -176,7 +176,7 @@ final class AdminViewController: BaseViewController, View { adminUseCase.fetchStoreDetail(id: store.id) .observe(on: MainScheduler.instance) .subscribe( - onNext: { [weak self] storeDetail in + onNext: { [weak self] _ in guard let self = self else { return } let registerVC = PopUpStoreRegisterViewController( nickname: self.nickname,