fix/#367 약속 수정하기 아무것도 고치지 않았을 때 서버 통신 안되는 문제 해결

OMZigak · Sep 10, 2024 · 7621155 · 7621155
1 parent 0836832
commit 7621155
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 13 deletions.
diff --git a/KkuMulKum/Source/Promise/EditPromise/ViewController/ChooseContentViewController.swift b/KkuMulKum/Source/Promise/EditPromise/ViewController/ChooseContentViewController.swift
@@ -54,7 +54,22 @@ class ChooseContentViewController: BaseViewController {
         rootView.confirmButton.setTitle("수정하기", style: .body03, color: .white)
 
         for button in self.rootView.levelButtons {
-            button.isSelected = (button.titleLabel?.text == viewModel.dressUpLevel?.value)
+            let levels = ["LV1", "LV2", "LV3", "LV4", "FREE"]
+
+            if var dressUpLevel = button.titleLabel?.text {
+                if dressUpLevel.contains("마음대로 입고 오기") {
+                    dressUpLevel = "FREE"
+                }
+                else {
+                    if let matched = levels.first(where: {
+                        level in dressUpLevel.replacingOccurrences(of: " ", with: "").contains(level)
+                    }) {
+                        dressUpLevel = matched
+                    }
+                }
+
+                button.isSelected = (dressUpLevel == viewModel.dressUpLevel?.value)
+            }
         }
 
         for button in self.rootView.penaltyButtons {

diff --git a/KkuMulKum/Source/Promise/PromiseInfo/ViewController/PromiseInfoViewController.swift b/KkuMulKum/Source/Promise/PromiseInfo/ViewController/PromiseInfoViewController.swift
@@ -71,19 +71,38 @@ class PromiseInfoViewController: BaseViewController {
 extension PromiseInfoViewController {
     @objc
     func editButtonDidTap() {
-        let viewController = EditPromiseViewController(
-            viewModel: EditPromiseViewModel(
-                promiseID: viewModel.promiseID,
-                promiseName: viewModel.promiseInfo.value?.promiseName,
-                placeName: viewModel.promiseInfo.value?.placeName,
-                time: viewModel.promiseInfo.value?.time,
-                dressUpLevel: viewModel.promiseInfo.value?.dressUpLevel,
-                penalty: viewModel.promiseInfo.value?.penalty,
-                service: PromiseService()
+        if var dressUpLevel = viewModel.promiseInfo.value?.dressUpLevel {
+            let levels = ["LV1", "LV2", "LV3", "LV4", "FREE"]
+
+            if dressUpLevel.contains("마음대로 입고 오기") {
+                dressUpLevel = "FREE"
+            }
+            else {
+                if let matched = levels.first(where: {
+                    level in dressUpLevel.replacingOccurrences(of: " ", with: "").contains(level)
+                }) {
+                    dressUpLevel = matched
+                }
+            }
+
+            let viewController = EditPromiseViewController(
+                viewModel: EditPromiseViewModel(
+                    promiseID: viewModel.promiseID,
+                    promiseName: viewModel.promiseInfo.value?.promiseName,
+                    placeName: viewModel.promiseInfo.value?.placeName,
+                    xCoordinate: viewModel.promiseInfo.value?.x,
+                    yCoordinate: viewModel.promiseInfo.value?.y,
+                    address: viewModel.promiseInfo.value?.address,
+                    roadAddress: viewModel.promiseInfo.value?.roadAddress,
+                    time: viewModel.promiseInfo.value?.time,
+                    dressUpLevel: dressUpLevel,
+                    penalty: viewModel.promiseInfo.value?.penalty,
+                    service: PromiseService()
+                )
             )
-        )
-
-        navigationController?.pushViewController(viewController, animated: true)
+            
+            navigationController?.pushViewController(viewController, animated: true)
+        }
     }
 
     func setupBinding() {