feat(RenewalInfo): enhance IRenewalInfo with renewalPrice and currenc… (

#85) * feat(RenewalInfo): enhance IRenewalInfo with renewalPrice and currency fields * apply formatting changes --------- Co-authored-by: M7md <[email protected]>
space-code · Oct 17, 2024 · af8d8ac · af8d8ac
1 parent b6dabf3
commit af8d8ac
Show file tree

Hide file tree

Showing 83 changed files with 806 additions and 534 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ All notable changes to this project will be documented in this file.
   - Updated in Pull Request [#74](https://github.com/space-code/flare/pull/74).
 - Update `README.md`
   - Updated in Pull Request [#70](https://github.com/space-code/flare/pull/70).
+- Update Transaction Model with price and currency
+ - Updated in Pull Request [#84](https://github.com/space-code/flare/pull/84)
+- Update RenewalInfo Model with renewalPrice and currency
+ - Updated in Pull Request [#85](https://github.com/space-code/flare/pull/85)
 
 #### 3.x Releases
 - `3.0.x` Releases - [`3.0.0`](#300) | [`3.0.1`](#301) | [`3.0.2`](#302)
@@ -66,8 +70,6 @@ Released on 2024-05-10.
 ## Updated
 - Update the `dependabot.yml` configuration
  - Updated in Pull Request [#34](https://github.com/space-code/flare/pull/34)
-- Update Transaction Model with price and currency
- - Updated in Pull Request [#84](https://github.com/space-code/flare/pull/84)
 
 ## Fixed
 - Fix handling of cancelling operations

diff --git a/Sources/Flare/Classes/Common/Types.swift b/Sources/Flare/Classes/Common/Types.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/Flare/Classes/Extensions/Bundle+IAppStoreReceiptProvider.swift b/Sources/Flare/Classes/Extensions/Bundle+IAppStoreReceiptProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/Flare/Classes/Extensions/FileManager+IFileManager.swift b/Sources/Flare/Classes/Extensions/FileManager+IFileManager.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/Flare/Classes/Extensions/SKProduct+.swift b/Sources/Flare/Classes/Extensions/SKProduct+.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit

diff --git a/Sources/Flare/Classes/Extensions/SKRequest+IReceiptRefreshRequest.swift b/Sources/Flare/Classes/Extensions/SKRequest+IReceiptRefreshRequest.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit

diff --git a/Sources/Flare/Classes/Extensions/SKRequest+Identifier.swift b/Sources/Flare/Classes/Extensions/SKRequest+Identifier.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit

diff --git a/Sources/Flare/Classes/Flare.swift b/Sources/Flare/Classes/Flare.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import struct Log.LogLevel

diff --git a/Sources/Flare/Classes/Generated/Strings.swift b/Sources/Flare/Classes/Generated/Strings.swift
diff --git a/Sources/Flare/Classes/Helpers/FileManager/IFileManager.swift b/Sources/Flare/Classes/Helpers/FileManager/IFileManager.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/Flare/Classes/Helpers/PaymentQueue/PaymentQueue.swift b/Sources/Flare/Classes/Helpers/PaymentQueue/PaymentQueue.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit

diff --git a/Sources/Flare/Classes/Helpers/PaymentQueue/SKPaymentQueue+PaymentQueue.swift b/Sources/Flare/Classes/Helpers/PaymentQueue/SKPaymentQueue+PaymentQueue.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit

diff --git a/Sources/Flare/Classes/Helpers/PaymentTransaction/PaymentTransaction.swift b/Sources/Flare/Classes/Helpers/PaymentTransaction/PaymentTransaction.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit

diff --git a/Sources/Flare/Classes/Helpers/ProcessInfo/ProcessInfo+.swift b/Sources/Flare/Classes/Helpers/ProcessInfo/ProcessInfo+.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/Flare/Classes/Helpers/ScenesHolder/IScenesHolder.swift b/Sources/Flare/Classes/Helpers/ScenesHolder/IScenesHolder.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 #if canImport(UIKit)

diff --git a/Sources/Flare/Classes/IFlare.swift b/Sources/Flare/Classes/IFlare.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/Flare/Classes/Models/IAPError.swift b/Sources/Flare/Classes/Models/IAPError.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit

diff --git a/Sources/Flare/Classes/Models/Internal/Protocols/IRenewalInfo.swift b/Sources/Flare/Classes/Models/Internal/Protocols/IRenewalInfo.swift
@@ -6,6 +6,8 @@
 import Foundation
 import StoreKit
 
+// MARK: - IRenewalInfo
+
 public protocol IRenewalInfo {
     /// The JSON representation of the renewal information.
     var jsonRepresentation: Data { get }
@@ -31,6 +33,12 @@ public protocol IRenewalInfo {
     /// The status of a price increase for the user.
     var priceIncreaseStatus: PriceIncreaseStatus { get }
 
+    /// The renewal price of the auto-renewable subscription that renews at the next billing period.
+    var renewalPrice: Decimal? { get }
+
+    /// The currency of the subscription's renewal price.
+    var currency: String? { get }
+
     /// Whether the subscription is in a billing retry period.
     var isInBillingRetry: Bool { get }
 
@@ -44,3 +52,10 @@ public protocol IRenewalInfo {
     /// offers and if there will be no offer applied for the next billing period.
     var offerID: String? { get }
 }
+
+/// Default implementation of the currency property for backward compatibility.
+extension IRenewalInfo {
+    var currency: String? {
+        Locale.current.currencyCodeID
+    }
+}
diff --git a/Sources/Flare/Classes/Models/Internal/Protocols/ISKProduct.swift b/Sources/Flare/Classes/Models/Internal/Protocols/ISKProduct.swift
@@ -18,7 +18,7 @@ protocol ISKProduct {
 
     /// The currency Symbol for the product's price.
     var currencySymbol: String? { get }
-    
+
     /// The  locale for the product's currency.
     var locale: Locale { get }
 

diff --git a/Sources/Flare/Classes/Models/Internal/Protocols/IStoreTransaction.swift b/Sources/Flare/Classes/Models/Internal/Protocols/IStoreTransaction.swift
@@ -5,6 +5,8 @@
 
 import Foundation
 
+// MARK: - IStoreTransaction
+
 /// A type that represents a store transaction.
 protocol IStoreTransaction {
     /// The unique identifier for the product.
@@ -23,7 +25,7 @@ protocol IStoreTransaction {
     var price: Decimal? { get }
     /// The currency of the price of the product.
     var currency: String? { get }
-    
+
     /// The raw JWS representation of the transaction.
     ///
     /// - Note: This is only available for StoreKit 2 transactions.
@@ -38,10 +40,6 @@ protocol IStoreTransaction {
 /// Default implementation of the currency property for backward compatibility.
 extension IStoreTransaction {
     var currency: String? {
-        if #available(iOS 16.0, macOS 13.0, watchOS 9.0, tvOS 16.0, *) {
-            return Locale.current.currency?.identifier
-        } else {
-            return Locale.current.currencyCode
-        }
+        Locale.current.currencyCodeID
     }
 }
diff --git a/Sources/Flare/Classes/Models/Internal/SK1StoreProduct.swift b/Sources/Flare/Classes/Models/Internal/SK1StoreProduct.swift
@@ -42,7 +42,7 @@ extension SK1StoreProduct: ISKProduct {
     var currencySymbol: String? {
         numberFormatter.currencySymbol
     }
-    
+
     var locale: Locale {
         product.priceLocale
     }

diff --git a/Sources/Flare/Classes/Models/Internal/SK1StoreTransaction.swift b/Sources/Flare/Classes/Models/Internal/SK1StoreTransaction.swift
@@ -62,9 +62,11 @@ extension SK1StoreTransaction: IStoreTransaction {
     var environment: StoreEnvironment? {
         nil
     }
+
     var price: Decimal? {
         nil
     }
+
     var currency: String? {
         nil
     }

diff --git a/Sources/Flare/Classes/Models/Internal/SK2RenewalInfo.swift b/Sources/Flare/Classes/Models/Internal/SK2RenewalInfo.swift
@@ -66,4 +66,16 @@ extension SK2RenewalInfo: IRenewalInfo {
     var priceIncreaseStatus: PriceIncreaseStatus {
         PriceIncreaseStatus(underlyingRenewalInfo.priceIncreaseStatus)
     }
+
+    var renewalPrice: Decimal? {
+        underlyingRenewalInfo.renewalPrice
+    }
+
+    var currency: String? {
+        if #available(iOS 16.0, macOS 13.0, watchOS 9.0, tvOS 16.0, *) {
+            underlyingRenewalInfo.currency?.identifier
+        } else {
+            underlyingRenewalInfo.currencyCode
+        }
+    }
 }
diff --git a/Sources/Flare/Classes/Models/Internal/SK2StoreProduct.swift b/Sources/Flare/Classes/Models/Internal/SK2StoreProduct.swift
@@ -49,7 +49,7 @@ extension SK2StoreProduct: ISKProduct {
     var currencySymbol: String? {
         numberFormatter.currencySymbol
     }
-    
+
     var locale: Locale {
         currencyFormat.locale
     }

diff --git a/Sources/Flare/Classes/Models/Internal/SK2StoreTransaction.swift b/Sources/Flare/Classes/Models/Internal/SK2StoreTransaction.swift
@@ -66,11 +66,11 @@ extension SK2StoreTransaction: IStoreTransaction {
     var environment: StoreEnvironment? {
         StoreEnvironment(transaction: transaction)
     }
-    
+
     var price: Decimal? {
         transaction.price
     }
-    
+
     var currency: String? {
         if #available(iOS 16.0, macOS 13.0, watchOS 9.0, tvOS 16.0, *) {
             transaction.currency?.identifier

diff --git a/Sources/Flare/Classes/Models/RefundError.swift b/Sources/Flare/Classes/Models/RefundError.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/Flare/Classes/Models/RefundRequestStatus.swift b/Sources/Flare/Classes/Models/RefundRequestStatus.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/Flare/Classes/Models/RenewalInfo.swift b/Sources/Flare/Classes/Models/RenewalInfo.swift
@@ -70,4 +70,12 @@ extension RenewalInfo: IRenewalInfo {
     public var priceIncreaseStatus: PriceIncreaseStatus {
         underlyingRenewalInfo.priceIncreaseStatus
     }
+
+    public var renewalPrice: Decimal? {
+        underlyingRenewalInfo.renewalPrice
+    }
+
+    public var currency: String? {
+        underlyingRenewalInfo.currency
+    }
 }
diff --git a/Sources/Flare/Classes/Models/StoreProduct.swift b/Sources/Flare/Classes/Models/StoreProduct.swift
@@ -65,7 +65,7 @@ extension StoreProduct: ISKProduct {
     public var currencySymbol: String? {
         product.currencySymbol
     }
-    
+
     public var locale: Locale {
         product.locale
     }

diff --git a/Sources/Flare/Classes/Models/StoreTransaction.swift b/Sources/Flare/Classes/Models/StoreTransaction.swift
@@ -80,10 +80,11 @@ extension StoreTransaction: IStoreTransaction {
     var environment: StoreEnvironment? {
         storeTransaction.environment
     }
+
     var price: Decimal? {
         storeTransaction.price
     }
-    
+
     var currency: String? {
         storeTransaction.currency
     }

diff --git a/Sources/Flare/Classes/Providers/AppStoreReceiptProvider/IAppStoreReceiptProvider.swift b/Sources/Flare/Classes/Providers/AppStoreReceiptProvider/IAppStoreReceiptProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/Flare/Classes/Providers/IAPProvider/IAPProvider.swift b/Sources/Flare/Classes/Providers/IAPProvider/IAPProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit

diff --git a/Sources/Flare/Classes/Providers/IAPProvider/IIAPProvider.swift b/Sources/Flare/Classes/Providers/IAPProvider/IIAPProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit

diff --git a/Sources/Flare/Classes/Providers/PaymentProvider/IPaymentProvider.swift b/Sources/Flare/Classes/Providers/PaymentProvider/IPaymentProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit

diff --git a/Sources/Flare/Classes/Providers/PaymentProvider/PaymentProvider.swift b/Sources/Flare/Classes/Providers/PaymentProvider/PaymentProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Concurrency

diff --git a/Sources/Flare/Classes/Providers/ProductProvider/IProductProvider.swift b/Sources/Flare/Classes/Providers/ProductProvider/IProductProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit

diff --git a/Sources/Flare/Classes/Providers/ProductProvider/ProductProvider.swift b/Sources/Flare/Classes/Providers/ProductProvider/ProductProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Atomic

diff --git a/...ces/Flare/Classes/Providers/ReceiptRefreshProvider/Factories/IReceiptRefreshRequest.swift b/...ces/Flare/Classes/Providers/ReceiptRefreshProvider/Factories/IReceiptRefreshRequest.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation

diff --git a/...efreshProvider/Factories/ReceiptRefreshRequestFactory/IReceiptRefreshRequestFactory.swift b/...efreshProvider/Factories/ReceiptRefreshRequestFactory/IReceiptRefreshRequestFactory.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,9 +62,11 @@ extension SK1StoreTransaction: IStoreTransaction { @@
         var environment: StoreEnvironment? {
             nil
         }
         var price: Decimal? {
             nil
         }
         var currency: String? {
             nil
         }
@@ Expand Down @@