[Chore] #221 - 컨벤션 준수, 낙관적 업데이트 정합성 제어

Author: Remaked-Swain

Neki-iOS/Features/Pose/Sources/Presentation/Sources/Feature/PoseDetailFeature.swift

@@ -26,7 +26,7 @@ struct PoseDetailFeature {
         case didTapBackButton
 
         // Internal Actions
-        case scrapResponse(PoseID, Result<Void, Error>)
+        case scrapResponse(Pose, Result<Void, Error>)
 
         // Delegate Actions
         case delegate(Delegate)
@@ -49,17 +49,17 @@ struct PoseDetailFeature {
                 // MARK: - View Actions
             case .onTapScrap:
                 guard var pose = state.currentPose else { return .none }
+                let originalPose = pose
                 pose.isScrapped.toggle()
                 state.poses[id: pose.id] = pose
 
-                let trackingEffect: Effect<Action> = .run { _ in analytics.logEvent(event: PoseAnalyticsEvent.poseBookmark) }
-                let scrapEffect: Effect<Action> = .run { [pose] send in
-                    await send(.delegate(.poseUpdated(pose)))
-                    await send(.scrapResponse(pose.id, Result { try await poseClient.scrapPose(poseID: pose.id) }))
+                let scrapEffect: Effect<Action> = .run { [originalPose, updatedPose = pose] send in
+                    await send(.delegate(.poseUpdated(updatedPose)))
+                    await send(.scrapResponse(originalPose, Result { try await poseClient.scrapPose(poseID: originalPose.id) }))
                 }
                 .cancellable(id: CancelID.scrap(pose.id), cancelInFlight: true)
 
-                return .merge(trackingEffect, scrapEffect)
+                return scrapEffect
 
             case let .pageChanged(newID):
                 state.selectedID = newID
@@ -69,18 +69,18 @@ struct PoseDetailFeature {
                 return .run { _ in await dismiss() }
 
                 // MARK: - Internal Actions
-            case let .scrapResponse(id, .failure(error)):
+            case .scrapResponse(_, .success):
+                return .run { _ in analytics.logEvent(PoseAnalyticsEvent.poseBookmark) }
+                
+            case let .scrapResponse(originalPose, .failure(error)):
                 if error is CancellationError { return .none }
+                Logger.presentation.error("Error occured while scrapping pose: ID-\(id) / Error: \(error)")
 
-                if var pose = state.poses[id: id] {
-                    pose.isScrapped.toggle()
-                    state.poses[id: id] = pose
-                    return .send(.delegate(.poseUpdated(pose)))
+                if state.poses[id: originalPose.id] != nil {
+                    state.poses[id: originalPose.id] = originalPose
+                    return .send(.delegate(.poseUpdated(originalPose)))
                 }
-                Logger.presentation.error("Error occured while scrapping pose: ID-\(id) / Error: \(error)")
-                return .none
 
-            case .scrapResponse:
                 return .none
 
             case .delegate:

Neki-iOS/Features/Pose/Sources/Presentation/Sources/Feature/RandomPoseCarouselFeature.swift

@@ -13,7 +13,10 @@ import os
 struct RandomPoseCarouselFeature {
     enum SlideDirection { case previous, next, none }
 
-    private enum CancelID { case poseRequest }
+    private enum CancelID: Hashable {
+        case poseRequest
+        case scrap(PoseID)
+    }
 
     @ObservableState
     struct State {
@@ -43,7 +46,7 @@ struct RandomPoseCarouselFeature {
 
         // Internal Actions
         case poseResponse(Result<Pose, Error>)
-        case scrapResponse(PoseID, Result<Void, Error>)
+        case scrapResponse(Pose, Result<Void, Error>)
         case flushResources
 
         // Delegate Actions
@@ -63,10 +66,7 @@ struct RandomPoseCarouselFeature {
             switch action {
                 // MARK: - Lifecycle & View Actions
             case .onAppear:
-                if state.currentPose != nil {
-                    return .none
-                }
-                
+                guard state.currentPose == nil else { return .none }
                 state.isLoading = true
                 return .run { [count = state.activePeopleCount] send in
                     await send(.poseResponse(Result { try await poseClient.initializeRandomPose(peopleCount: count) }))
@@ -105,16 +105,17 @@ struct RandomPoseCarouselFeature {
                 // MARK: - Scrap Logic (Optimistic)
             case .onTapScrap:
                 guard var pose = state.currentPose else { return .none }
+                let originalPose = pose
                 pose.isScrapped.toggle()
                 state.currentPose = pose
 
-                let trackingEffect: Effect<Action> = .run { _ in analytics.logEvent(event: PoseAnalyticsEvent.poseBookmark) }
-                let scrapEffect: Effect<Action> = .run { [id = pose.id, pose] send in
-                    await send(.delegate(.poseUpdated(pose)))
-                    await send(.scrapResponse(id, Result { try await poseClient.scrapPose(poseID: id) }))
+                let scrapEffect: Effect<Action> = .run { [originalPose, updatedPose = pose] send in
+                    await send(.delegate(.poseUpdated(updatedPose)))
+                    await send(.scrapResponse(originalPose, Result { try await poseClient.scrapPose(poseID: originalPose.id) }))
                 }
+                .cancellable(id: CancelID.scrap(pose.id), cancelInFlight: true)
 
-                return .merge(trackingEffect, scrapEffect)
+                return scrapEffect
 
                 // MARK: - Internal Actions
             case let .poseResponse(.success(pose)):
@@ -127,18 +128,18 @@ struct RandomPoseCarouselFeature {
                 Logger.presentation.error("Random Pose Fetching Failed: \(error)")
                 return .none
 
-            case let .scrapResponse(id, .failure(error)):
+            case .scrapResponse(_, .success):
+                return .run { _ in analytics.logEvent(PoseAnalyticsEvent.poseBookmark) }
+                
+            case let .scrapResponse(originalPose, .failure(error)):
                 if error is CancellationError { return .none }
+                Logger.presentation.error("Error occured while scrapping pose: ID-\(id) / Error: \(error)")
 
-                if var pose = state.currentPose, pose.id == id {
-                    pose.isScrapped.toggle()
-                    state.currentPose = pose
-                    return .send(.delegate(.poseUpdated(pose)))
+                if state.currentPose?.id == originalPose.id {
+                    state.currentPose = originalPose
+                    return .send(.delegate(.poseUpdated(originalPose)))
                 }
-                Logger.presentation.error("Error occured while scrapping pose: ID-\(id) / Error: \(error)")
-                return .none
 
-            case .scrapResponse:
                 return .none
 
                 // MARK: - Navigation