Default to 0 and update snapshots

RevenueCat · Sep 7, 2023 · c24be7f · c24be7f
1 parent c388c4e
commit c24be7f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/Sources/Misc/Codable/DefaultDecodable.swift b/Sources/Misc/Codable/DefaultDecodable.swift
@@ -199,6 +199,10 @@ enum DefaultDecodable {
             static var defaultValue: String { "" }
         }
 
+        enum Zero: DefaultValueProvider {
+            static var defaultValue: Int { 0 }
+        }
+
         enum EmptyArray<T: List>: DefaultValueProvider {
             static var defaultValue: T { [] }
         }
@@ -226,6 +230,7 @@ enum DefaultDecodable {
  *   @DefaultDecodable.EmptyArray var values: [String]
  *   @DefaultDecodable.EmptyDictionary var dictionary: [String: Int]
  *   @DefaultDecodable.Now var date: Date
+ *   @DefaultDecodable.Zero var number: Int
  * }
  * ```
  */
@@ -237,5 +242,6 @@ extension DefaultDecodable {
     typealias EmptyArray<T: List> = DefaultValue<Sources.EmptyArray<T>>
     typealias EmptyDictionary<T: Map> = DefaultValue<Sources.EmptyDictionary<T>>
     typealias Now = DefaultValue<Sources.Now>
+    typealias Zero = DefaultValue<Sources.Zero>
 
 }
diff --git a/Sources/Paywalls/PaywallData.swift b/Sources/Paywalls/PaywallData.swift
@@ -11,7 +11,7 @@
 //
 //  Created by Nacho Soto on 7/10/23.
 
-// swiftlint:disable file_length
+// swiftlint:disable file_length identifier_name
 
 import Foundation
 
@@ -32,7 +32,13 @@ public struct PaywallData {
     public var assetBaseURL: URL
 
     /// The revision identifier for this paywall.
-    public var revision: Int
+    var revision: Int {
+        get { return self._revision }
+        set { self._revision = newValue }
+    }
+
+    @DefaultDecodable.Zero
+    internal private(set) var _revision: Int = 0
 
     @EnsureNonEmptyCollectionDecodable
     internal private(set) var localization: [String: LocalizedConfiguration]
@@ -63,8 +69,6 @@ public protocol PaywallLocalizedConfiguration {
 
 }
 
-// swiftlint:disable identifier_name
-
 extension PaywallData {
 
     /// Defines the necessary localized information for a paywall.
@@ -435,7 +439,7 @@ extension PaywallData: Codable {
         case config
         case localization = "localizedStrings"
         case assetBaseURL = "assetBaseUrl"
-        case revision
+        case _revision = "revision"
     }
 
 }

diff --git a/...kendIntegrationTests/__Snapshots__/LoadShedderIntegrationTests/testCanGetOfferings.1.json b/...kendIntegrationTests/__Snapshots__/LoadShedderIntegrationTests/testCanGetOfferings.1.json
@@ -56,6 +56,7 @@
             "title" : "Ignite your child's curiosity"
           }
         },
+        "revision" : 1,
         "template_name" : "1"
       }
     },

diff --git a/...BackendIntegrationTests/__Snapshots__/StoreKitIntegrationTests/testCanGetOfferings.1.json b/...BackendIntegrationTests/__Snapshots__/StoreKitIntegrationTests/testCanGetOfferings.1.json
@@ -70,6 +70,7 @@
             "title" : "Ignite your child's curiosity"
           }
         },
+        "revision" : 3,
         "template_name" : "2"
       }
     },

diff --git a/Tests/UnitTests/Networking/Responses/Fixtures/PaywallData-missing_current_locale.json b/Tests/UnitTests/Networking/Responses/Fixtures/PaywallData-missing_current_locale.json
@@ -24,6 +24,5 @@
             "dark": null
         }
     },
-    "asset_base_url": "https://rc-paywalls.s3.amazonaws.com",
-    "revision": 1
+    "asset_base_url": "https://rc-paywalls.s3.amazonaws.com"
 }
diff --git a/Tests/UnitTests/Networking/Responses/Fixtures/PaywallData-missing_localization.json b/Tests/UnitTests/Networking/Responses/Fixtures/PaywallData-missing_localization.json
@@ -15,6 +15,5 @@
             "dark": null
         }
     },
-    "asset_base_url": "https://rc-paywalls.s3.amazonaws.com",
-    "revision": 1
+    "asset_base_url": "https://rc-paywalls.s3.amazonaws.com"
 }