[#698] Resolve comments

Author: thinh2k1310

template/Modules/Data/Sources/Extensions/Container+Data.swift

@@ -47,7 +47,7 @@ extension Container {
             .singleton
     }
 
-    public var ratingPromptStorage: Factory<RatingPromptStorageProtocol> {
-        self { RatingPromptStorage(userDefaultsManager: self.userDefaultsManager()) }.singleton
+    public var ratingPromptRepository: Factory<RatingPromptRepositoryProtocol> {
+        self { RatingPromptRepository(userDefaultsManager: self.userDefaultsManager()) }.singleton
     }
 }

…s/Repositories/RatingPromptStorage.swift …epositories/RatingPromptRepository.swifttemplate/Modules/Data/Sources/Repositories/RatingPromptStorage.swift renamed to template/Modules/Data/Sources/Repositories/RatingPromptRepository.swift template/Modules/Data/Sources/Repositories/RatingPromptStorage.swift renamed to template/Modules/Data/Sources/Repositories/RatingPromptRepository.swift

@@ -1,64 +1,64 @@
 import Domain
 import Foundation
 
-actor RatingPromptStorage: RatingPromptStorageProtocol {
-    
+actor RatingPromptRepository: RatingPromptRepositoryProtocol {
+
     private let userDefaultsManager: UserDefaultsManagerProtocol
-    
+
     init(userDefaultsManager: UserDefaultsManagerProtocol) {
         self.userDefaultsManager = userDefaultsManager
     }
-    
+
     func getRatingPromptData() async -> RatingPromptData {
         let appLaunchCount = userDefaultsManager.getIntValue(for: UserDefaultsKey.ratingPromptAppLaunchCount.rawValue)
         let firstLaunchDateData = userDefaultsManager.getDataValue(for: UserDefaultsKey.ratingPromptFirstLaunchDate.rawValue)
         let lastPromptedVersion = userDefaultsManager.getStringValue(for: UserDefaultsKey.ratingPromptLastPromptedVersion.rawValue)
         let significantEventCount = userDefaultsManager.getIntValue(for: UserDefaultsKey.ratingPromptSignificantEventCount.rawValue)
-        
+
         var firstLaunchDate: Date?
         if let dateData = firstLaunchDateData {
             firstLaunchDate = try? JSONDecoder().decode(Date.self, from: dateData)
         }
-        
+
         return RatingPromptData(
             appLaunchCount: appLaunchCount,
             firstLaunchDate: firstLaunchDate,
             lastPromptedVersion: lastPromptedVersion,
             significantEventCount: significantEventCount
         )
     }
-    
+
     func recordAppLaunch() async {
         let currentCount = userDefaultsManager.getIntValue(for: UserDefaultsKey.ratingPromptAppLaunchCount.rawValue)
         userDefaultsManager.set(currentCount + 1, for: UserDefaultsKey.ratingPromptAppLaunchCount.rawValue)
-        
+
         if userDefaultsManager.getDataValue(for: UserDefaultsKey.ratingPromptFirstLaunchDate.rawValue) == nil {
             let now = Date()
             if let dateData = try? JSONEncoder().encode(now) {
                 userDefaultsManager.set(dateData, for: UserDefaultsKey.ratingPromptFirstLaunchDate.rawValue)
             }
         }
-        
+
         userDefaultsManager.synchronize()
     }
-    
+
     func recordSignificantEvent() async {
         let currentCount = userDefaultsManager.getIntValue(for: UserDefaultsKey.ratingPromptSignificantEventCount.rawValue)
         userDefaultsManager.set(currentCount + 1, for: UserDefaultsKey.ratingPromptSignificantEventCount.rawValue)
         userDefaultsManager.synchronize()
     }
-    
+
     func recordPromptShown(for appVersion: String) async {
         userDefaultsManager.set(appVersion, for: UserDefaultsKey.ratingPromptLastPromptedVersion.rawValue)
         userDefaultsManager.synchronize()
     }
-    
+
     func resetCounters() async {
         userDefaultsManager.set(0, for: UserDefaultsKey.ratingPromptAppLaunchCount.rawValue)
         userDefaultsManager.set(0, for: UserDefaultsKey.ratingPromptSignificantEventCount.rawValue)
         userDefaultsManager.synchronize()
     }
-    
+
     func clearAllData() async {
         let keys = [
             UserDefaultsKey.ratingPromptAppLaunchCount.rawValue,

template/Modules/Domain/Sources/Extensions/Bundle+Info.swift

@@ -0,0 +1,19 @@
+import Foundation
+
+extension Bundle {
+
+    public var info: BundleInfo { BundleInfo(bundle: self) }
+}
+
+public struct BundleInfo: Sendable {
+
+    fileprivate let bundle: Bundle
+
+    fileprivate init(bundle: Bundle) {
+        self.bundle = bundle
+    }
+
+    public var shortVersion: String? {
+        bundle.infoDictionary?["CFBundleShortVersionString"] as? String
+    }
+}

…rfaces/RatingPromptStorageProtocol.swift …ces/RatingPromptRepositoryProtocol.swifttemplate/Modules/Domain/Sources/Interfaces/RatingPromptStorageProtocol.swift renamed to template/Modules/Domain/Sources/Interfaces/RatingPromptRepositoryProtocol.swift template/Modules/Domain/Sources/Interfaces/RatingPromptStorageProtocol.swift renamed to template/Modules/Domain/Sources/Interfaces/RatingPromptRepositoryProtocol.swift

@@ -1,23 +1,23 @@
 import Foundation
 
 /// Protocol for managing rating prompt data persistence
-public protocol RatingPromptStorageProtocol: Sendable {
-    
+public protocol RatingPromptRepositoryProtocol: Sendable {
+
     /// Retrieves current rating prompt data
     func getRatingPromptData() async -> RatingPromptData
-    
+
     /// Increments app launch count and sets first launch date if needed
     func recordAppLaunch() async
-    
+
     /// Increments significant event count
     func recordSignificantEvent() async
-    
+
     /// Records that user was prompted for rating on current version
     func recordPromptShown(for appVersion: String) async
-    
+
     /// Resets tracking counters (typically called after prompt is shown)
     func resetCounters() async
-    
+
     /// Clears all rating prompt related data
     func clearAllData() async
 }

template/Modules/Domain/Sources/UseCases/CheckForceUpdateUseCase.swift

@@ -33,7 +33,7 @@ public struct CheckForceUpdateUseCase: CheckForceUpdateUseCaseProtocol, Sendable
 extension CheckForceUpdateUseCase {
 
     public static func defaultCurrentVersion() -> AppVersion {
-        let string = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? ""
+        let string = Bundle.main.info.shortVersion ?? ""
         return AppVersion(string: string) ?? AppVersion(major: 1, minor: 0, patch: 0)
     }
 }

template/Modules/Domain/Sources/UseCases/RequestRatingPromptUseCase.swift

@@ -14,20 +14,20 @@ public protocol RequestRatingPromptUseCaseProtocol: Sendable {
 
 public struct RequestRatingPromptUseCase: RequestRatingPromptUseCaseProtocol {
 
-    private let storage: any RatingPromptStorageProtocol
+    private let repository: any RatingPromptRepositoryProtocol
     private let shouldShowRatingPromptUseCase: any ShouldShowRatingPromptUseCaseProtocol
     private let presenter: any RatingPromptPresenterProtocol
     private let currentVersion: @Sendable () -> String
 
     public init(
-        storage: any RatingPromptStorageProtocol,
+        repository: any RatingPromptRepositoryProtocol,
         shouldShowRatingPromptUseCase: any ShouldShowRatingPromptUseCaseProtocol,
         presenter: any RatingPromptPresenterProtocol,
         currentVersion: @Sendable @escaping () -> String = {
-            Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0.0"
+            Bundle.main.info.shortVersion ?? "1.0.0"
         }
     ) {
-        self.storage = storage
+        self.repository = repository
         self.shouldShowRatingPromptUseCase = shouldShowRatingPromptUseCase
         self.presenter = presenter
         self.currentVersion = currentVersion
@@ -40,10 +40,10 @@ public struct RequestRatingPromptUseCase: RequestRatingPromptUseCaseProtocol {
         let didRequestPrompt = await presenter.show()
         guard didRequestPrompt else { return false }
 
-        await storage.recordPromptShown(for: currentVersion())
+        await repository.recordPromptShown(for: currentVersion())
 
         if configuration.resetCounterAfterPrompt {
-            await storage.resetCounters()
+            await repository.resetCounters()
         }
 
         return true

template/Modules/Domain/Sources/UseCases/ShouldShowRatingPromptUseCase.swift

@@ -13,20 +13,20 @@ public protocol ShouldShowRatingPromptUseCaseProtocol: Sendable {
 }
 
 public struct ShouldShowRatingPromptUseCase: ShouldShowRatingPromptUseCaseProtocol, Sendable {
-    
-    private let storage: any RatingPromptStorageProtocol
+
+    private let repository: any RatingPromptRepositoryProtocol
     private let currentVersion: String
-    
+
     public init(
-        storage: any RatingPromptStorageProtocol,
-        currentVersion: String = Self.defaultCurrentVersion()
+        repository: any RatingPromptRepositoryProtocol,
+        currentVersion: String = Bundle.main.info.shortVersion ?? "1.0.0"
     ) {
-        self.storage = storage
+        self.repository = repository
         self.currentVersion = currentVersion
     }
-    
+
     public func callAsFunction(configuration: RatingPromptConfiguration) async -> Bool {
-        let data = await storage.getRatingPromptData()
+        let data = await repository.getRatingPromptData()
 
         guard !data.hasBeenPromptedForCurrentVersion(currentVersion) else {
             return false
@@ -42,10 +42,3 @@ public struct ShouldShowRatingPromptUseCase: ShouldShowRatingPromptUseCaseProtoc
         return hasEnoughAppLaunches || hasEnoughSignificantEvents
     }
 }
-
-extension ShouldShowRatingPromptUseCase {
-    
-    public static func defaultCurrentVersion() -> String {
-        Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0.0"
-    }
-}

template/Tuist/Interfaces/SwiftUI/Sources/Application/Dependencies/Container+Application.swift

@@ -13,13 +13,13 @@ extension Container {
     }
 
     var shouldShowRatingPromptUseCase: Factory<ShouldShowRatingPromptUseCaseProtocol> {
-        self { ShouldShowRatingPromptUseCase(storage: self.ratingPromptStorage()) }
+        self { ShouldShowRatingPromptUseCase(repository: self.ratingPromptRepository()) }
     }
 
     var requestRatingPromptUseCase: Factory<RequestRatingPromptUseCaseProtocol> {
         self {
             RequestRatingPromptUseCase(
-                storage: self.ratingPromptStorage(),
+                repository: self.ratingPromptRepository(),
                 shouldShowRatingPromptUseCase: self.shouldShowRatingPromptUseCase(),
                 presenter: self.ratingPromptPresenter()
             )