[SCRUM-103] LiveActivity 개선

Plugins/DependencyPlugin/ProjectDescriptionHelpers/Module/Core.swift

@@ -19,4 +19,5 @@ public enum Core: String, Modulable {
   case StreamListener
   case LiveActivityClient
   case AudioClient
+  case BackgroundTaskClient
 }

Projects/Core/BackgroundTaskClient/Interface/BackgroundTaskClientInterface.swift

@@ -0,0 +1,29 @@
+//
+//  BackgroundTaskClientInterface.swift
+//  BackgroundTaskClient
+//
+//  Created by MinseokKang on 12/5/24.
+//
+
+import Foundation
+import BackgroundTasks
+
+import Dependencies
+import DependenciesMacros
+
+@DependencyClient
+public struct BackgroundTaskClient {
+  public var registerTask: @Sendable (
+    _ identifier: String,
+    _ queue: DispatchQueue?,
+    _ launchHandler: @escaping (BGTask) -> Void
+  ) -> Bool = { _, _, _ in false }
+
+  public var submit: @Sendable (_ taskRequest: BGTaskRequest) throws -> Void
+
+  public var cancel: @Sendable (_ identifier: String) -> Void
+
+  public var cancelAllTaskRequests: @Sendable () -> Void
+
+  public var pendingTaskRequests: () async -> [BGTaskRequest] = { [] }
+}

Projects/Core/BackgroundTaskClient/Interface/TestKey.swift

@@ -0,0 +1,14 @@
+//
+//  TestKey.swift
+//  BackgroundTaskClientInterface
+//
+//  Created by devMinseok on 12/5/24.
+//  Copyright © 2024 PomoNyang. All rights reserved.
+//
+
+import Dependencies
+
+extension BackgroundTaskClient: TestDependencyKey {
+  public static let previewValue = Self()
+  public static let testValue = Self()
+}

Projects/Core/BackgroundTaskClient/Project.swift

@@ -0,0 +1,27 @@
+//
+//  Project.swift
+//  BackgroundTaskClientManifests
+//
+//  Created by MinseokKang on 12/5/24.
+//
+
+import ProjectDescription
+import ProjectDescriptionHelpers
+
+@_spi(Core)
+@_spi(Shared)
+import DependencyPlugin
+
+let project: Project = .makeTMABasedProject(
+  module: Core.BackgroundTaskClient,
+  scripts: [],
+  targets: [
+    .sources,
+    .interface
+  ],
+  dependencies: [
+    .interface: [
+      .dependency(rootModule: Shared.self)
+    ]
+  ]
+)

Projects/Core/BackgroundTaskClient/Sources/BackgroundTaskClient.swift

@@ -0,0 +1,39 @@
+//
+//  BackgroundTaskClient.swift
+//  BackgroundTaskClient
+//
+//  Created by MinseokKang on 12/5/24.
+//
+
+import Foundation
+import BackgroundTasks
+
+import BackgroundTaskClientInterface
+
+import Dependencies
+
+extension BackgroundTaskClient: DependencyKey {
+  public static let liveValue: BackgroundTaskClient = .live()
+
+  public static func live() -> BackgroundTaskClient {
+    let backgroundTaskScheduler = BGTaskScheduler.shared
+
+    return .init(
+      registerTask: { identifier, queue, handler in
+        return backgroundTaskScheduler.register(forTaskWithIdentifier: identifier, using: queue, launchHandler: handler)
+      },
+      submit: { request in
+        try backgroundTaskScheduler.submit(request)
+      },
+      cancel: { identifier in
+        backgroundTaskScheduler.cancel(taskRequestWithIdentifier: identifier)
+      },
+      cancelAllTaskRequests: {
+        backgroundTaskScheduler.cancelAllTaskRequests()
+      },
+      pendingTaskRequests: {
+        await backgroundTaskScheduler.pendingTaskRequests()
+      }
+    )
+  }
+}

Projects/Core/LiveActivityClient/Interface/LiveActivityClientInterface.swift

@@ -46,4 +46,6 @@ public protocol LiveActivityClientProtocol {
   func endAllActivityImmediately<T: ActivityAttributes>(
     type: T.Type
   ) async
+
+  func getActivities<T: ActivityAttributes>(type: T.Type) -> [Activity<T>]
 }

Projects/Core/LiveActivityClient/Interface/TestKey.swift

@@ -44,4 +44,8 @@ class LiveActivityClientImplTest: LiveActivityClientProtocol {
   func endAllActivityImmediately<T: ActivityAttributes>(
     type: T.Type
   ) async {}
+
+  func getActivities<T: ActivityAttributes>(type: T.Type) -> [Activity<T>] {
+    return []
+  }
 }

Projects/Core/LiveActivityClient/Sources/LiveActivityClient.swift

@@ -66,4 +66,8 @@ final class LiveActivityClientImpl: LiveActivityClientProtocol {
       await activity.end(nil, dismissalPolicy: .immediate)
     }
   }
+
+  func getActivities<T: ActivityAttributes>(type: T.Type) -> [Activity<T>] {
+    return Activity<T>.activities
+  }
 }

Projects/Core/UserNotificationClient/Interface/Interface.swift

@@ -20,7 +20,9 @@ public struct UserNotificationClient {
   }
   public var removeDeliveredNotificationsWithIdentifiers: @Sendable ([String]) async -> Void
   public var removePendingNotificationRequestsWithIdentifiers: @Sendable ([String]) async -> Void
+  public var removeAllPendingNotificationRequests: @Sendable () async -> Void
   public var requestAuthorization: @Sendable (UNAuthorizationOptions) async throws -> Bool
+  public var setBadgeCount: @Sendable (Int) async throws -> Void
 
   @CasePathable
   public enum DelegateEvent {

Projects/Core/UserNotificationClient/Sources/Implementation.swift

@@ -38,8 +38,14 @@ extension UserNotificationClient: DependencyKey {
     removePendingNotificationRequestsWithIdentifiers: {
       UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: $0)
     },
+    removeAllPendingNotificationRequests: {
+      UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
+    },
     requestAuthorization: {
       try await UNUserNotificationCenter.current().requestAuthorization(options: $0)
+    },
+    setBadgeCount: { badgeCount in
+      try await UNUserNotificationCenter.current().setBadgeCount(badgeCount)
     }
   )
 }

Projects/Domain/PomodoroService/Interface/Model/PomodoroActivityAttributes.swift

@@ -15,8 +15,8 @@ public struct PomodoroActivityAttributes: Equatable, ActivityAttributes {
     public var goalDatetime: Date
     public var isRest: Bool
 
-    public var dateRange: ClosedRange<Date> {
-      return Date.now...goalDatetime
+    public func isTimerOver() -> Bool {
+      return Date() >= goalDatetime
     }
 
     public init(

Projects/Domain/PomodoroService/Interface/PomodoroServiceInterface.swift

@@ -8,6 +8,8 @@
 import UserDefaultsClientInterface
 import DatabaseClientInterface
 import APIClientInterface
+import BackgroundTaskClientInterface
+import LiveActivityClientInterface
 
 import Dependencies
 import DependenciesMacros
@@ -21,6 +23,8 @@ public struct PomodoroService {
   public var changeCategoryTime: @Sendable (_ apiClient: APIClient, _ categoryID: Int, _ request: EditCategoryRequest) async throws -> Void
   public var saveFocusTimeHistory: @Sendable (_ apiClient: APIClient, _ databaseClient: DatabaseClient, _ request: [FocusTimeHistory]) async throws -> Void
   public var getFocusTimeSummaries: @Sendable (_ apiClient: APIClient) async throws -> FocusTimeSummary
+
+  public var registerBGTaskToUpdateTimer: @Sendable (_ bgTaskClient: BackgroundTaskClient, _ liveActivityClient: LiveActivityClient) -> Bool = { _, _ in false }
 }
 
 extension PomodoroService: TestDependencyKey {

Projects/Domain/PomodoroService/Sources/PomodoroService.swift

@@ -8,6 +8,7 @@
 @_spi(Internal)
 import PomodoroServiceInterface
 import APIClientInterface
+import Foundation
 
 import Dependencies
 
@@ -18,7 +19,8 @@ extension PomodoroService: DependencyKey {
 
   private static func live() -> PomodoroService {
     return .init(
-      syncCategoryList: { apiClient, databaseClient in
+      syncCategoryList: {
+        apiClient, databaseClient in
         let api = CategoryAPI.getCategoryList
         let categoryList = try await apiClient.apiRequest(request: api, as: [PomodoroCategory].self)
         for category in categoryList {
@@ -50,6 +52,23 @@ extension PomodoroService: DependencyKey {
       getFocusTimeSummaries: { apiClient in
         let api = FocusTimeAPI.getSummaries
         return try await apiClient.apiRequest(request: api, as: FocusTimeSummary.self)
+      },
+      registerBGTaskToUpdateTimer: { bgTaskClient, liveActivityClient in
+        bgTaskClient.registerTask(
+          identifier: "com.pomonyang.mohanyang.update_LiveActivity",
+          queue: nil
+        ) { task in
+          task.expirationHandler = {
+            task.setTaskCompleted(success: false)
+          }
+          let pomodoroActivities = liveActivityClient.protocolAdapter.getActivities(type: PomodoroActivityAttributes.self)
+          Task {
+            if let firstActivity = pomodoroActivities.first {
+              await firstActivity.update(firstActivity.content)
+            }
+            task.setTaskCompleted(success: true)
+          }
+        }
       }
     )
   }

Projects/Feature/Feature/Sources/AppCore.swift

@@ -19,11 +19,16 @@ import UserDefaultsClientInterface
 import UserNotificationClientInterface
 import CatServiceInterface
 import UserServiceInterface
+import PomodoroServiceInterface
 import DatabaseClientInterface
 import StreamListenerInterface
+import BackgroundTaskClientInterface
+import LiveActivityClientInterface
 
 import ComposableArchitecture
 
+import BackgroundTasks
+
 @Reducer
 public struct AppCore {
   @ObservableState
@@ -34,9 +39,9 @@ public struct AppCore {
     var onboarding: OnboardingCore.State?
     @Presents var networkError: NetworkErrorCore.State?
     @Presents var requestError: RequestErrorCore.State?
-
+    
     var isLoading: Bool = false
-
+    
     public init() {}
   }
 
@@ -58,7 +63,9 @@ public struct AppCore {
   @Dependency(UserService.self) var userService
   @Dependency(DatabaseClient.self) var databaseClient
   @Dependency(StreamListener.self) var streamListener
-
+  @Dependency(BackgroundTaskClient.self) var backgroundTaskClient
+  @Dependency(LiveActivityClient.self) var liveActivityClient
+
   public init() {}
 
   public var body: some ReducerOf<Self> {
@@ -97,51 +104,73 @@ public struct AppCore {
           await send(.serverState(serverState))
         }
       }
-
+      
     case .appDelegate:
       return .none
 
+    case .didChangeScenePhase(.background):
+      return .run { send in
+        let pomodoroActivity = liveActivityClient.protocolAdapter.getActivities(type: PomodoroActivityAttributes.self).first
+        let pendingBGTaskRequest = await backgroundTaskClient.pendingTaskRequests().first
+
+        if let pomodoroActivity {
+          if let pendingBGTaskRequest {
+            if pendingBGTaskRequest.earliestBeginDate != pomodoroActivity.content.state.goalDatetime {
+              backgroundTaskClient.cancel(identifier: pendingBGTaskRequest.identifier)
+              await pomodoroActivity.update(pomodoroActivity.content)
+              try submitUpdateLiveActivityBGTask(earliestBeginDate: pomodoroActivity.content.state.goalDatetime)
+            }
+          } else {
+            try submitUpdateLiveActivityBGTask(earliestBeginDate: pomodoroActivity.content.state.goalDatetime)
+          }
+        } else {
+          if let pendingBGTaskRequest {
+            backgroundTaskClient.cancel(identifier: pendingBGTaskRequest.identifier)
+          }
+        }
+      }
+
     case .didChangeScenePhase:
       return .none
-
+      
     case .splash(.moveToHome):
       state.splash = nil
       state.home = HomeCore.State()
       return .none
-
+      
     case .splash(.moveToOnboarding):
       state.splash = nil
       state.onboarding = OnboardingCore.State()
       return .none
-
+      
     case .splash:
       return .none
-
+      
     case .home:
       return .none
-
+      
     case .onboarding(.selectCat(.presented(.namingCat(.presented(.moveToHome))))):
       state.onboarding = nil
       state.home = HomeCore.State()
       return .none
-
+      
     case .onboarding:
       return .none
-
+      
     case .networkError:
       return .none
-
+      
     case .requestError(.presented(.moveToHome)):
       if state.onboarding != nil {
         state.onboarding = OnboardingCore.State()
       } else if state.home != nil {
         state.home = HomeCore.State()
       }
       return .none
-
+      
     case .requestError:
       return .none
-
+      
     case .serverState(let serverState):
       switch serverState {
       case .requestStarted:
@@ -158,4 +187,12 @@ public struct AppCore {
       return .none
     }
   }
+
+  func submitUpdateLiveActivityBGTask(earliestBeginDate: Date) throws {
+    let request = BGProcessingTaskRequest(identifier: "com.pomonyang.mohanyang.update_LiveActivity")
+    request.requiresExternalPower = false
+    request.requiresNetworkConnectivity = false
+    request.earliestBeginDate = earliestBeginDate
+    try backgroundTaskClient.submit(taskRequest: request)
+  }
 }