#240 merge: PR Merge

[Feat] #237 - 목표 걸음 수 달성 시 푸시알림 구현 및 관련 로직 SceneDelegate로 이관

Author: woongaaaa

Walkie-iOS/.package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "434e6874234260de72f92c8a7a78ffc2b0be6dcf595eba9d81ef583c1d81f71e",
+  "originHash" : "8c3e485804de5dc2d14505d69859c0cd7cd3d8ba82f4862dcfeab25f2b8f66a1",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",
@@ -109,6 +109,15 @@
         "version" : "2.24.4"
       }
     },
+    {
+      "identity" : "kingfisher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/onevcat/Kingfisher",
+      "state" : {
+        "revision" : "2015fda791daa72c8058619545a593bf8c1dd59f",
+        "version" : "8.5.0"
+      }
+    },
     {
       "identity" : "leveldb",
       "kind" : "remoteSourceControl",

Walkie-iOS/Project.swift

@@ -82,7 +82,8 @@ let project = Project(
                         "UISceneConfigurations": [:]
                     ],
                     "BGTaskSchedulerPermittedIdentifiers": [
-                        "com.walkie.ios.step"
+                        "com.walkie.ios.step",
+                        "com.walkie.ios.step-goal"
                     ],
                     "UIBackgroundModes": [
                         "fetch",
@@ -126,6 +127,7 @@ let project = Project(
             ],
             settings: .settings(
                 base: [
+                    "IPHONEOS_DEPLOYMENT_TARGET": "18.0",
                     "ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS": "YES",
                     "MARKETING_VERSION": settingVersion,
                     "OTHER_LDFLAGS": "-ObjC",
@@ -162,6 +164,7 @@ let project = Project(
             ],
             settings: .settings(
                 base: [
+                    "IPHONEOS_DEPLOYMENT_TARGET": "18.0",
                     "ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS": "YES",
                     "TARGETED_DEVICE_FAMILY": "1",
                     "MARKETING_VERSION": settingVersion
@@ -185,7 +188,12 @@ let project = Project(
                 ]
             ),
             sources: "WalkieCommon/Sources/**",
-            resources: "WalkieCommon/Resources/**"
+            resources: "WalkieCommon/Resources/**",
+            settings: .settings(
+                base: [
+                    "IPHONEOS_DEPLOYMENT_TARGET": "18.0"
+                ]
+            )
         ),
     ]
 )

Walkie-iOS/Walkie-iOS/Resources/Assets.xcassets/Main/Healthcare/ic_egg_broken.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_egg_broken.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Walkie-iOS/Walkie-iOS/Resources/Assets.xcassets/Main/Healthcare/ic_egg_broken.imageset/ic_egg_broken.png

@@ -8,21 +8,42 @@
 import Foundation
 import Firebase
 import UserNotifications
+import BackgroundTasks
+import UIKit
 
 class AppDelegate: NSObject, UIApplicationDelegate {
+    
     func application(
         _ application: UIApplication,
         didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
     ) -> Bool {
         FirebaseApp.configure()
         UNUserNotificationCenter.current().delegate = self
-        
-        let _: UNAuthorizationOptions = [.alert, .badge, .sound]
         application.registerForRemoteNotifications()
         Messaging.messaging().delegate = self
 
+        registerBackgroundTasks()
+        
         return true
     }
+    
+    func application(
+        _ application: UIApplication,
+        configurationForConnecting connectingSceneSession: UISceneSession,
+        options: UIScene.ConnectionOptions
+    ) -> UISceneConfiguration {
+        let sceneConfiguration = UISceneConfiguration(
+            name: "Default Configuration",
+            sessionRole: connectingSceneSession.role
+        )
+        sceneConfiguration.delegateClass = SceneDelegate.self
+        return sceneConfiguration
+    }
+    
+    private func registerBackgroundTasks() {
+        BGTaskManager.shared.registerBackgroundTasks(.step)
+        BGTaskManager.shared.registerBackgroundTasks(.stepGoal)
+    }
 }
 
 extension AppDelegate: UNUserNotificationCenterDelegate {

Walkie-iOS/Walkie-iOS/Resources/Assets.xcassets/Main/Healthcare/ic_egg_broken.imageset/[email protected]

@@ -14,6 +14,8 @@ import Observation
 
 extension Notification.Name {
     static let reissueFailed = Notification.Name("reissueFailed")
+    static let appDidEnterBackground = Notification.Name("appDidEnterBackground")
+    static let appWillEnterForeground = Notification.Name("appWillEnterForeground")
 }
 
 @Observable
@@ -54,13 +56,33 @@ final class AppCoordinator: Coordinator, ObservableObject {
         self.diContainer = diContainer
         self.remoteConfigManager = remoteConfigManager
         initializeCoordinator()
+        bindNotifications()
+    }
+    
+    private func bindNotifications() {
         NotificationCenter.default
             .publisher(for: .reissueFailed)
             .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in
                 self?.changeToSplash()
             }
             .store(in: &cancellables)
+        
+        NotificationCenter.default
+            .publisher(for: .appDidEnterBackground)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                self?.executeBackgroundActions()
+            }
+            .store(in: &cancellables)
+        
+        NotificationCenter.default
+            .publisher(for: .appWillEnterForeground)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                self?.executeForegroundActions()
+            }
+            .store(in: &cancellables)
     }
 
     private func initializeCoordinator() {
@@ -357,25 +379,16 @@ final class AppCoordinator: Coordinator, ObservableObject {
         stepCoordinator?.stopStepUpdates()
     }
 
-    func handleStepRefresh(task: BGAppRefreshTask) {
-        stepCoordinator?.handleStepRefresh(task: task)
-    }
-    
     func executeForegroundActions() {
         if UserManager.shared.hasUserToken {
-            // 포그라운드 실시간 걸음 수 추적 시작
             self.startStepUpdates()
-            // 백그라운드 스케줄링 모두 취소
             BGTaskManager.shared.cancelAll()
         }
     }
 
     func executeBackgroundActions() {
         if UserManager.shared.hasUserToken {
-            // 포그라운드 실시간 걸음 수 추적 종료
             self.stopStepUpdates()
-            // 백그라운드 작업 스케줄링
-            BGTaskManager.shared.scheduleAppRefresh(.step)
         }
     }
 }

Walkie-iOS/Walkie-iOS/Resources/Assets.xcassets/Main/Healthcare/ic_egg_broken.imageset/[email protected]

@@ -6,7 +6,7 @@
 //
 
 import Combine
-import BackgroundTasks
+import Foundation
 import Observation
 
 @Observable
@@ -25,7 +25,6 @@ final class StepCoordinator {
     private let updateStepForegroundUseCase: UpdateStepForegroundUseCase
     private let checkHatchConditionUseCase: CheckHatchConditionUseCase
     private let updateEggStepUseCase: UpdateEggStepUseCase
-    private let updateStepBackgroundUseCase: UpdateStepBackgroundUseCase
     private let stepStatusStore: StepStatusStore
 
     // MARK: - AppCoordinator
@@ -38,7 +37,6 @@ final class StepCoordinator {
         self.updateStepForegroundUseCase = diContainer.resolveUpdateStepForegroundUseCase()
         self.checkHatchConditionUseCase = diContainer.resolveCheckHatchConditionUseCase()
         self.updateEggStepUseCase = diContainer.resolveUpdateEggStepUseCase()
-        self.updateStepBackgroundUseCase = diContainer.resolveUpdateStepBackgroundUseCase()
         self.stepStatusStore = diContainer.stepStatusStore
     }
 
@@ -117,33 +115,4 @@ final class StepCoordinator {
         updateStepForegroundUseCase.stop()
         cancellables.removeAll()
     }
-    
-    // MARK: - Background 걸음 수 측정
-    func handleStepRefresh(task: BGAppRefreshTask) {
-        task.expirationHandler = {
-            print("⏳ 백그라운드 테스크 만료 ⏳")
-            task.setTaskCompleted(success: false)
-        }
-        
-        if stepStatusStore.getNeedStep() > 10000 {
-            task.setTaskCompleted(success: true)
-            print("⏳ 백그라운드 걸음 수 업데이트 및 스케줄링 하지 않음 : 알 없음 ⏳")
-            return
-        }
-        
-        updateStepBackgroundUseCase.execute()
-        print("⏳ 백그라운드 걸음 수 업데이트 완료 ⏳")
-        task.setTaskCompleted(success: true)
-        
-        if checkHatchCondition() {
-            print("⏳ 백그라운드 걸음 수 업데이트 스케줄링 중단 : 부화 조건 달성, 푸시 알림 전송 ⏳")
-            NotificationManager.shared.scheduleNotification(
-                title: NotificationLiterals.eggHatch.title,
-                body: NotificationLiterals.eggHatch.body
-            )
-        } else {
-            print("⏳ 백그라운드 걸음 수 업데이트 스케줄링 ⏳")
-            BGTaskManager.shared.scheduleAppRefresh(.step)
-        }
-    }
 }

Walkie-iOS/Walkie-iOS/Sources/App/AppDelegate.swift

@@ -11,20 +11,37 @@ import BackgroundTasks
 final class BGTaskManager {
     static let shared = BGTaskManager()
 
+    private var stepRefreshHandler: ((BGAppRefreshTask) -> Void)?
+    private var stepGoalHandler: ((BGAppRefreshTask) -> Void)?
+    
     public init() {}
 
-    // 백그라운드 작업 등록
-    func registerBackgroundTasks(_ task: WalkieBackgroundTask, action: @escaping (BGAppRefreshTask) async -> Void) {
-        BGTaskScheduler.shared.register(forTaskWithIdentifier: task.rawValue, using: nil) { task in
+    func registerBackgroundTasks(_ task: WalkieBackgroundTask) {
+        BGTaskScheduler.shared.register(forTaskWithIdentifier: task.rawValue, using: nil) { [weak self] task in
             guard let refreshTask = task as? BGAppRefreshTask else { return }
-            print("⏳ 백그라운드 테스크 작업 시작 : \(task) ⏳")
-            Task {
-                await action(refreshTask)
+            print("⏳ 백그라운드 테스크 작업 시작 : \(task.identifier) ⏳")
+            
+            switch task.identifier {
+            case WalkieBackgroundTask.step.rawValue:
+                if let handler = self?.stepRefreshHandler {
+                    handler(refreshTask)
+                } else {
+                    print("⚠️ step 핸들러가 설정되지 않았습니다 ⚠️")
+                    refreshTask.setTaskCompleted(success: false)
+                }
+            case WalkieBackgroundTask.stepGoal.rawValue:
+                if let handler = self?.stepGoalHandler {
+                    handler(refreshTask)
+                } else {
+                    print("⚠️ stepGoal 핸들러가 설정되지 않았습니다 ⚠️")
+                    refreshTask.setTaskCompleted(success: false)
+                }
+            default:
+                break
             }
         }
     }
 
-    // 가벼운 작업 바로 스케줄링
     func scheduleAppRefresh(_ task: WalkieBackgroundTask) {
         let request = BGAppRefreshTaskRequest(identifier: task.rawValue)
         request.earliestBeginDate = Date(timeIntervalSinceNow: .leastNonzeroMagnitude)
@@ -38,9 +55,19 @@ final class BGTaskManager {
 
     func cancelAll() {
         BGTaskScheduler.shared.cancel(taskRequestWithIdentifier: WalkieBackgroundTask.step.rawValue)
+        BGTaskScheduler.shared.cancel(taskRequestWithIdentifier: WalkieBackgroundTask.stepGoal.rawValue)
+    }
+    
+    func setStepRefreshHandler(_ handler: @escaping (BGAppRefreshTask) -> Void) {
+        stepRefreshHandler = handler
+    }
+    
+    func setStepGoalHandler(_ handler: @escaping (BGAppRefreshTask) -> Void) {
+        stepGoalHandler = handler
     }
 }
 
 enum WalkieBackgroundTask: String {
     case step = "com.walkie.ios.step"
+    case stepGoal = "com.walkie.ios.step-goal"
 }