[698] Resolve comments

Author: thinh2k1310

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

@@ -50,9 +50,4 @@ extension Container {
     public var ratingPromptStorage: Factory<RatingPromptStorageProtocol> {
         self { RatingPromptStorage(userDefaultsManager: self.userDefaultsManager()) }.singleton
     }
-
-    public var ratingPromptPresenter: Factory<RatingPromptPresenterProtocol> {
-        self { DefaultRatingPromptPresenter() }.singleton
-    }
-
 }

template/Modules/Data/Sources/Repositories/RatingPromptStorage.swift

@@ -4,6 +4,7 @@ import Foundation
 final class RatingPromptStorage: RatingPromptStorageProtocol, @unchecked Sendable {
 
     private let userDefaultsManager: UserDefaultsManagerProtocol
+    private let lock = NSLock()
 
     init(userDefaultsManager: UserDefaultsManagerProtocol) {
         self.userDefaultsManager = userDefaultsManager
@@ -29,11 +30,12 @@ final class RatingPromptStorage: RatingPromptStorageProtocol, @unchecked Sendabl
     }
 
     func recordAppLaunch() {
-        // Increment launch count
+        lock.lock()
+        defer { lock.unlock() }
+        
         let currentCount = userDefaultsManager.getIntValue(for: UserDefaultsKey.ratingPromptAppLaunchCount.rawValue)
         userDefaultsManager.set(currentCount + 1, for: UserDefaultsKey.ratingPromptAppLaunchCount.rawValue)
 
-        // Set first launch date if not already set
         if userDefaultsManager.getDataValue(for: UserDefaultsKey.ratingPromptFirstLaunchDate.rawValue) == nil {
             let now = Date()
             if let dateData = try? JSONEncoder().encode(now) {
@@ -45,6 +47,9 @@ final class RatingPromptStorage: RatingPromptStorageProtocol, @unchecked Sendabl
     }
 
     func recordSignificantEvent() {
+        lock.lock()
+        defer { lock.unlock() }
+        
         let currentCount = userDefaultsManager.getIntValue(for: UserDefaultsKey.ratingPromptSignificantEventCount.rawValue)
         userDefaultsManager.set(currentCount + 1, for: UserDefaultsKey.ratingPromptSignificantEventCount.rawValue)
         userDefaultsManager.synchronize()

template/Modules/Data/Sources/Services/DefaultRatingPromptPresenter.swift

@@ -4,46 +4,19 @@
 
 import Domain
 import StoreKit
-import UIKit
 
 // MARK: - DefaultRatingPromptPresenter
 
 public final class DefaultRatingPromptPresenter: RatingPromptPresenterProtocol, @unchecked Sendable {
 
     private let storeReviewController: any StoreReviewControllerProtocol
 
-    public convenience init() {
-        self.init(storeReviewController: DefaultStoreReviewController())
-    }
-
-    init(storeReviewController: any StoreReviewControllerProtocol) {
+    public init(storeReviewController: any StoreReviewControllerProtocol) {
         self.storeReviewController = storeReviewController
     }
 
     @MainActor
-    public func show() async {
-        await storeReviewController.requestReview()
-    }
-}
-
-// MARK: - StoreReviewControllerProtocol
-
-protocol StoreReviewControllerProtocol: Sendable {
-
-    @MainActor
-    func requestReview() async
-}
-
-struct DefaultStoreReviewController: StoreReviewControllerProtocol, Sendable {
-
-    @MainActor
-    func requestReview() async {
-        guard let windowScene = UIApplication.shared.connectedScenes
-            .compactMap({ $0 as? UIWindowScene })
-            .first(where: { $0.activationState == .foregroundActive })
-        else {
-            return
-        }
-        SKStoreReviewController.requestReview(in: windowScene)
+    public func show() async -> Bool {
+        return await storeReviewController.requestReview()
     }
 }

template/Modules/Domain/Sources/Interfaces/RatingPromptPresenterProtocol.swift

@@ -5,5 +5,5 @@
 public protocol RatingPromptPresenterProtocol: Sendable {
 
     @MainActor
-    func show() async
+    func show() async -> Bool
 }

template/Modules/Domain/Sources/Interfaces/StoreReviewViewControllerProtocol.swift

@@ -0,0 +1,9 @@
+//
+//  StoreReviewViewControllerProtocol.swift
+//
+
+public protocol StoreReviewControllerProtocol: Sendable {
+
+    @MainActor
+    func requestReview() async -> Bool
+}

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

@@ -37,7 +37,8 @@ public struct RequestRatingPromptUseCase: RequestRatingPromptUseCaseProtocol {
     public func callAsFunction(configuration: RatingPromptConfiguration) async -> Bool {
         guard shouldShowRatingPromptUseCase(configuration: configuration) else { return false }
 
-        await presenter.show()
+        let didRequestPrompt = await presenter.show()
+        guard didRequestPrompt else { return false }
 
         storage.recordPromptShown(for: currentVersion())
 

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

@@ -28,24 +28,18 @@ public struct ShouldShowRatingPromptUseCase: ShouldShowRatingPromptUseCaseProtoc
     public func callAsFunction(configuration: RatingPromptConfiguration) -> Bool {
         let data = storage.getRatingPromptData()
 
-        if data.hasBeenPromptedForCurrentVersion(currentVersion) {
+        guard !data.hasBeenPromptedForCurrentVersion(currentVersion) else {
             return false
         }
 
-        let daysSinceFirstLaunch = data.daysSinceFirstLaunch
-        guard daysSinceFirstLaunch >= configuration.minimumDaysSinceFirstLaunch else {
+        guard data.daysSinceFirstLaunch >= configuration.minimumDaysSinceFirstLaunch else {
             return false
         }
 
-        guard data.appLaunchCount >= configuration.minimumAppLaunches else {
-            return false
-        }
-        
-        guard data.significantEventCount >= configuration.minimumSignificantEvents else {
-            return false
-        }
+        let hasEnoughAppLaunches = data.appLaunchCount >= configuration.minimumAppLaunches
+        let hasEnoughSignificantEvents = data.significantEventCount >= configuration.minimumSignificantEvents
 
-        return true
+        return hasEnoughAppLaunches || hasEnoughSignificantEvents
     }
 }
 

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

@@ -25,4 +25,8 @@ extension Container {
             )
         }
     }
+
+    var ratingPromptPresenter: Factory<RatingPromptPresenterProtocol> {
+        self { DefaultRatingPromptPresenter(storeReviewController: StoreReviewController()) }.singleton
+    }
 }

template/Tuist/Interfaces/SwiftUI/Sources/Application/Services/StoreReviewController.swift

@@ -0,0 +1,22 @@
+//
+//  StoreReviewController.swift
+//
+
+import Domain
+import StoreKit
+import UIKit
+
+final class StoreReviewController: StoreReviewControllerProtocol, Sendable {
+
+    @MainActor
+    func requestReview() async -> Bool {
+        guard let windowScene = UIApplication.shared.connectedScenes
+            .compactMap({ $0 as? UIWindowScene })
+            .first(where: { $0.activationState == .foregroundActive })
+        else {
+            return false
+        }
+        SKStoreReviewController.requestReview(in: windowScene)
+        return true
+    }
+}