Fixed shorts list parsing

InMobiShortsSource/InMobiShortsSource.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		CD2D4C6126BD65F80016A180 /* LossyCodableList.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD2D4C6026BD65F80016A180 /* LossyCodableList.swift */; };
+		CD2D4C6326BD67790016A180 /* GlancesList.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD2D4C6226BD67790016A180 /* GlancesList.swift */; };
 		CD427D1F266F657900B4350A /* OneWeatherCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD427D1E266F657900B4350A /* OneWeatherCore.framework */; };
 		CD427D23266F715900B4350A /* OneWeatherAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD427D22266F715900B4350A /* OneWeatherAnalytics.framework */; };
 		CDAEC2092679F70600818A2A /* GlanceOverlayImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDAEC2082679F70600818A2A /* GlanceOverlayImage.swift */; };
@@ -33,6 +35,8 @@
 
 /* Begin PBXFileReference section */
 		CD2C227E2670AC6D001ADA9A /* InMobiShortsPG.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = InMobiShortsPG.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
+		CD2D4C6026BD65F80016A180 /* LossyCodableList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LossyCodableList.swift; sourceTree = "<group>"; };
+		CD2D4C6226BD67790016A180 /* GlancesList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlancesList.swift; sourceTree = "<group>"; };
 		CD427D1E266F657900B4350A /* OneWeatherCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneWeatherCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD427D22266F715900B4350A /* OneWeatherAnalytics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneWeatherAnalytics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CDAEC2082679F70600818A2A /* GlanceOverlayImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlanceOverlayImage.swift; sourceTree = "<group>"; };
@@ -129,6 +133,8 @@
 				CDAEC2082679F70600818A2A /* GlanceOverlayImage.swift */,
 				CDFE3F2B266E519E00E72910 /* PeekData.swift */,
 				CDFE3F2D266E51B400E72910 /* Peek.swift */,
+				CD2D4C6026BD65F80016A180 /* LossyCodableList.swift */,
+				CD2D4C6226BD67790016A180 /* GlancesList.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -243,6 +249,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				CDFE3F2E266E51B400E72910 /* Peek.swift in Sources */,
+				CD2D4C6126BD65F80016A180 /* LossyCodableList.swift in Sources */,
+				CD2D4C6326BD67790016A180 /* GlancesList.swift in Sources */,
 				CDFE3F23266E453500E72910 /* InMobiShortSource.swift in Sources */,
 				CDFE3F29266E489E00E72910 /* GlanceImage.swift in Sources */,
 				CDFE3F25266E45B800E72910 /* Glance.swift in Sources */,

InMobiShortsSource/InMobiShortsSource/InMobiShortSource.swift

@@ -74,15 +74,10 @@ public class InMobiShortSource: ShortSource {
                 }
                 
                 let decoder = JSONDecoder()
-                decoder.keyDecodingStrategy = .convertFromSnakeCase
+                decoder.keyDecodingStrategy = .useDefaultKeys
                 do {
-                    let glancesDict = try decoder.decode([String:[GlanceDetails]].self, from: data)
-                    if let glanceDetailsArray = glancesDict["glances"] {
-                        completion(glanceDetailsArray.map{self.toAppModel(glanceDetails: $0)}, nil)
-                    }
-                    else {
-                        completion(nil, InMobiShortSourceError.dataEncodingError("Failed to decode glance details array"))
-                    }
+                    let glancesList = try decoder.decode(GlancesList.self, from: data)
+                    completion(glancesList.glances.map{self.toAppModel(glanceDetails: $0)}, nil)
                 }
                 catch {
                     completion(nil, InMobiShortSourceError.dataEncodingError(error.localizedDescription))

InMobiShortsSource/InMobiShortsSource/Models/GlanceOverlayImage.swift

@@ -8,6 +8,6 @@
 import Foundation
 
 struct GlanceOverlayImage: Codable {
-    let id:String
-    let supportedImages:[GlanceImageFormat]
+    let id: String
+    var supportedImages: [GlanceImageFormat]
 }

InMobiShortsSource/InMobiShortsSource/Models/GlancesList.swift

+//
+//  GlancesList.swift
+//  InMobiShortsSource
+//
+//  Created by Dmitry Stepanets on 06.08.2021.
+//
+
+import Foundation
+
+struct GlancesList: Codable {
+    @LossyCodableList
+    var glances: [GlanceDetails]
+}

InMobiShortsSource/InMobiShortsSource/Models/LossyCodableList.swift

+//
+//  LossyCodableList.swift
+//  InMobiShortsSource
+//
+//  Created by Dmitry Stepanets on 06.08.2021.
+//
+
+import Foundation
+
+@propertyWrapper
+struct LossyCodableList<Element> {
+    var elements: [Element]
+
+    var wrappedValue: [Element] {
+        get { elements }
+        set { elements = newValue }
+    }
+}
+extension LossyCodableList: Decodable where Element: Decodable {
+    private struct ElementWrapper: Decodable {
+        var element: Element?
+
+        init(from decoder: Decoder) throws {
+            let container = try decoder.singleValueContainer()
+            element = try? container.decode(Element.self)
+        }
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+        let wrappers = try container.decode([ElementWrapper].self)
+        elements = wrappers.compactMap(\.element)
+    }
+}
+
+extension LossyCodableList: Encodable where Element: Encodable {
+    func encode(to encoder: Encoder) throws {
+        var container = encoder.unkeyedContainer()
+
+        for element in elements {
+            try? container.encode(element)
+        }
+    }
+}