Merge pull request #5 from IGRSoft/feature/restore-nothing-case

feat: add nothingToRestore case and make StoreService observable

Author: ikorich

.context/notes.md

@@ -184,7 +184,7 @@
 			mainGroup = 8B41F63C2DEDD0D5001A66F9;
 			minimizedProjectReferenceProxies = 1;
 			packageReferences = (
-				A5AEF7AC2F164C9E00186E81 /* XCLocalSwiftPackageReference "../../florence-v1" */,
+				A5AEF7AC2F164C9E00186E81 /* XCLocalSwiftPackageReference "../" */,
 			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 8B41F6462DEDD0D5001A66F9 /* Products */;
@@ -474,9 +474,9 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		A5AEF7AC2F164C9E00186E81 /* XCLocalSwiftPackageReference "../../florence-v1" */ = {
+		A5AEF7AC2F164C9E00186E81 /* XCLocalSwiftPackageReference "../" */ = {
 			isa = XCLocalSwiftPackageReference;
-			relativePath = "../../florence-v1";
+			relativePath = "../";
 		};
 /* End XCLocalSwiftPackageReference section */
 

.context/todos.md

@@ -28,14 +28,15 @@ public struct ExampleStoreConfiguration: StoreConfigurationProtocol {
 
 public struct ContentView: View {
     @State private var isStorePresented = false
-
+    @State private var storeService: StoreServiceProtocol = StoreService(isLoggingEnabled: true)
     private let configuration = ExampleStoreConfiguration()
 
     public var body: some View {
         launcherView
             .sheet(isPresented: $isStorePresented) {
                 DeveloperSupportStoreView(
                     configuration: configuration,
+                    storeService: storeService,
                     onPurchaseSuccess: { productId in
                         print("Purchase successful: \(productId)")
                     },
@@ -44,14 +45,23 @@ public struct ContentView: View {
                     }
                 )
             }
+            .task {
+                try? await storeService.syncStoreData()
+            }
     }
 
     @ViewBuilder
     private var launcherView: some View {
         VStack(spacing: 24) {
-            Image(systemName: "heart.fill")
-                .font(.system(size: 64))
-                .foregroundStyle(.pink)
+            HStack {
+                Image(systemName: "heart.fill")
+                    .font(.system(size: 64))
+                    .foregroundStyle(storeService.hasPurchasedProducts ? .green : .pink)
+                
+                Image(systemName: "heart.fill")
+                    .font(.system(size: 64))
+                    .foregroundStyle( storeService.hasActiveSubscription ? .green : .pink)
+            }
 
             Text("DeveloperSupportStore")
                 .font(.title)

Example/DeveloperSupportStoreExample.xcodeproj/project.pbxproj

@@ -9,8 +9,10 @@ import Foundation
 
 /// Represents the result of a restore purchases action.
 public enum StoreRestoreResult: Sendable, Equatable {
-    /// The restore completed successfully.
+    /// The restore completed successfully with purchases found.
     case success
     /// The restore failed with an error.
     case failure
+    /// The restore completed but no previous purchases were found.
+    case nothingToRestore
 }

Example/DeveloperSupportStoreExample/ContentView.swift

@@ -124,6 +124,23 @@
         }
       }
     },
+    "store.restore.nothingToRestore" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "No previous purchases found"
+          }
+        },
+        "uk" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Попередні покупки не знайдено"
+          }
+        }
+      }
+    },
     "store.restore.success" : {
       "extractionState" : "manual",
       "localizations" : {

Sources/DeveloperSupportStore/Models/StoreRestoreResult.swift

@@ -13,6 +13,7 @@ import StoreKit
 /// Service for handling App Store interactions using StoreHelper.
 ///
 /// Products are loaded automatically from `Products.plist` in your app bundle.
+@Observable
 @MainActor
 public final class StoreService: StoreServiceProtocol {
     private let storeHelper: StoreHelper
@@ -22,6 +23,15 @@ public final class StoreService: StoreServiceProtocol {
     private var _subscriptionProducts: [Product] = []
     private var _nonConsumableProducts: [Product] = []
 
+    /// Indicates whether the user has an active subscription.
+    public private(set) var hasActiveSubscription: Bool = false
+
+    /// Indicates whether the user has any purchased products.
+    public private(set) var hasPurchasedProducts: Bool = false
+
+    /// Task for listening to transaction updates.
+    private var transactionListenerTask: Task<Void, Never>?
+
     /// Creates a new store service.
     ///
     /// - Parameters:
@@ -30,6 +40,40 @@ public final class StoreService: StoreServiceProtocol {
     public init(storeHelper: StoreHelper = StoreHelper(), isLoggingEnabled: Bool = true) {
         self.storeHelper = storeHelper
         logger = StoreLogger(category: "StoreService", isEnabled: isLoggingEnabled)
+        startTransactionListener()
+    }
+
+    // MARK: - Purchase State
+
+    /// Updates purchase state properties from StoreHelper.
+    private func updatePurchaseState() {
+        hasPurchasedProducts = !storeHelper.purchasedProducts.isEmpty
+
+        if let subscriptionIds = storeHelper.subscriptionProductIds {
+            hasActiveSubscription = storeHelper.purchasedProducts.contains { productId in
+                subscriptionIds.contains(productId)
+            }
+        } else {
+            hasActiveSubscription = false
+        }
+
+        logger.notice("updatePurchaseState: hasPurchasedProducts=\(hasPurchasedProducts), hasActiveSubscription=\(hasActiveSubscription)")
+    }
+
+    /// Starts listening for StoreKit transaction updates.
+    private func startTransactionListener() {
+        transactionListenerTask = Task { [weak self] in
+            for await result in Transaction.updates {
+                guard let self else { return }
+
+                if case .verified = result {
+                    // Transaction verified, update purchase state
+                    await MainActor.run {
+                        self.updatePurchaseState()
+                    }
+                }
+            }
+        }
     }
 
     // MARK: - Product Collections
@@ -44,14 +88,6 @@ public final class StoreService: StoreServiceProtocol {
         _nonConsumableProducts
     }
 
-    /// Indicates whether the user has an active subscription.
-    public var hasActiveSubscription: Bool {
-        guard let subscriptionIds = storeHelper.subscriptionProductIds else { return false }
-        return storeHelper.purchasedProducts.contains { productId in
-            subscriptionIds.contains(productId)
-        }
-    }
-
     // MARK: - Actions
 
     /// Synchronizes store data with the App Store.
@@ -86,6 +122,9 @@ public final class StoreService: StoreServiceProtocol {
 
         logger.notice("_subscriptionProducts count: \(_subscriptionProducts.count)")
         logger.notice("_nonConsumableProducts count: \(_nonConsumableProducts.count)")
+
+        // Update observable purchase state
+        updatePurchaseState()
     }
 
     /// Initiates the purchase of a product.
@@ -151,9 +190,11 @@ public struct MockProductData: Sendable {
 ///
 /// This service provides mock data for previews. For full testing with actual StoreKit
 /// behavior, use a StoreKit Configuration file in your test target.
+@Observable
 @MainActor
 public final class StoreServicePreview: StoreServiceProtocol {
     public var hasActiveSubscription: Bool
+    public var hasPurchasedProducts: Bool
 
     // Internal storage for mock data
     private let mockSubscriptions: [MockProductData]
@@ -173,18 +214,21 @@ public final class StoreServicePreview: StoreServiceProtocol {
     ///
     /// - Parameters:
     ///   - hasActiveSubscription: Whether to simulate an active subscription.
+    ///   - hasPurchasedProducts: Whether to simulate having purchased products.
     ///   - mockSubscriptions: Mock subscription product data.
     ///   - mockPurchases: Mock one-time purchase product data.
     ///   - purchaseResult: The result to return from purchase attempts.
     ///   - syncDelay: Artificial delay for sync operations (simulates network).
     public init(
         hasActiveSubscription: Bool = false,
+        hasPurchasedProducts: Bool = false,
         mockSubscriptions: [MockProductData] = [],
         mockPurchases: [MockProductData] = [],
         purchaseResult: StorePurchaseResult = .success(productId: "mock.product"),
         syncDelay: Duration = .zero
     ) {
         self.hasActiveSubscription = hasActiveSubscription
+        self.hasPurchasedProducts = hasPurchasedProducts
         self.mockSubscriptions = mockSubscriptions
         self.mockPurchases = mockPurchases
         mockSubscriptionProducts = mockSubscriptions

Sources/DeveloperSupportStore/Resources/Localizable.xcstrings

@@ -25,6 +25,9 @@ public protocol StoreServiceProtocol: Sendable {
     /// Indicates whether the user has an active subscription.
     var hasActiveSubscription: Bool { get }
 
+    /// Indicates whether the user has any purchased products.
+    var hasPurchasedProducts: Bool { get }
+
     // MARK: - Actions
 
     /// Synchronizes store data with the App Store.

Sources/DeveloperSupportStore/Services/StoreService.swift

@@ -43,7 +43,7 @@ struct RestoreOverlayView: View {
                         .shadow(color: .black.opacity(0.2), radius: 8, y: 4)
                 )
                 .padding(.horizontal, layout.paddingBig)
-                .padding(.top, layout.paddingDefault)
+                .padding(.top, layout.paddingBig)
                 .offset(y: isVisible ? 0 : -100)
                 .opacity(isVisible ? 1 : 0)
 
@@ -92,19 +92,17 @@ struct RestoreOverlayView: View {
 
     private var backgroundColor: Color {
         switch result {
-        case .success:
-            return colors.selectedView.opacity(0.9)
-        case .failure:
-            return Color.red.opacity(0.9)
+        case .success: colors.selectedView.opacity(0.9)
+        case .failure: Color.red.opacity(0.9)
+        case .nothingToRestore: Color.blue.opacity(0.9)
         }
     }
 
     private var iconName: String {
         switch result {
-        case .success:
-            return "checkmark.circle.fill"
-        case .failure:
-            return "exclamationmark.triangle.fill"
+        case .success: "checkmark.circle.fill"
+        case .failure: "exclamationmark.triangle.fill"
+        case .nothingToRestore: "info.circle.fill"
         }
     }
 
@@ -114,10 +112,9 @@ struct RestoreOverlayView: View {
 
     private var messageKey: LocalizedStringKey {
         switch result {
-        case .success:
-            return "store.restore.success"
-        case .failure:
-            return "store.restore.failure"
+        case .success: "store.restore.success"
+        case .failure: "store.restore.failure"
+        case .nothingToRestore: "store.restore.nothingToRestore"
         }
     }
 
@@ -170,3 +167,17 @@ struct RestoreOverlayView: View {
         )
     }
 }
+
+#Preview("Nothing to Restore") {
+    ZStack {
+        Color.black.ignoresSafeArea()
+
+        RestoreOverlayView(
+            result: .nothingToRestore,
+            colors: .default,
+            typography: .default,
+            layout: .default,
+            onDismiss: {}
+        )
+    }
+}

Sources/DeveloperSupportStore/Services/StoreServiceProtocol.swift

@@ -126,7 +126,7 @@ public final class StoreViewModel {
             logger.notice("  nonConsumableProducts: \(nonConsumableProducts.count)")
 
             if showResult {
-                restoreResult = .success
+                restoreResult = storeService.hasPurchasedProducts ? .success : .nothingToRestore
             }
         } catch {
             logger.error("Sync error: \(error.localizedDescription)")