wip: make holdouts array empty if no key presented

Author: muzahidul-opti

Sources/Data Model/Project.swift

@@ -47,8 +47,7 @@ struct Project: Codable, Equatable {
     var sdkKey: String?
     var environmentKey: String?
     // Holdouts
-    // This would be non optional once API is completed
-    var holdouts: [Holdout]?
+    var holdouts: [Holdout]
     let logger = OPTLoggerFactory.getLogger()
 
     // Required since logger is not decodable
@@ -63,6 +62,37 @@ struct Project: Codable, Equatable {
         case holdouts
     }
 
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        
+        // V2
+        version = try container.decode(String.self, forKey: .version)
+        projectId = try container.decode(String.self, forKey: .projectId)
+        experiments = try container.decode([Experiment].self, forKey: .experiments)
+        audiences = try container.decode([Audience].self, forKey: .audiences)
+        groups = try container.decode([Group].self, forKey: .groups)
+        attributes = try container.decode([Attribute].self, forKey: .attributes)
+        accountId = try container.decode(String.self, forKey: .accountId)
+        events = try container.decode([Event].self, forKey: .events)
+        revision = try container.decode(String.self, forKey: .revision)
+        
+        // V3
+        anonymizeIP = try container.decode(Bool.self, forKey: .anonymizeIP)
+        
+        // V4
+        rollouts = try container.decode([Rollout].self, forKey: .rollouts)
+        integrations = try container.decodeIfPresent([Integration].self, forKey: .integrations)
+        typedAudiences = try container.decodeIfPresent([Audience].self, forKey: .typedAudiences)
+        featureFlags = try container.decode([FeatureFlag].self, forKey: .featureFlags)
+        botFiltering = try container.decodeIfPresent(Bool.self, forKey: .botFiltering)
+        sendFlagDecisions = try container.decodeIfPresent(Bool.self, forKey: .sendFlagDecisions)
+        sdkKey = try container.decodeIfPresent(String.self, forKey: .sdkKey)
+        environmentKey = try container.decodeIfPresent(String.self, forKey: .environmentKey)
+        
+        // Holdouts - defaults to empty array if key is not present
+        holdouts = try container.decodeIfPresent([Holdout].self, forKey: .holdouts) ?? []
+    }
+    
     // Required since logger is not equatable
     static func == (lhs: Project, rhs: Project) -> Bool {
         return lhs.version == rhs.version && lhs.projectId == rhs.projectId && lhs.experiments == rhs.experiments && lhs.holdouts == rhs.holdouts &&

Sources/Data Model/ProjectConfig.swift

@@ -78,7 +78,7 @@ class ProjectConfig {
 
         holdoutIdMap = {
             var map = [String : Holdout]()
-            project.holdouts?.forEach { map[$0.id] = $0 }
+            project.holdouts.forEach { map[$0.id] = $0 }
             return map
         }()