REF: Make offset temperature optional in Bed and Tool object

3DprintFIT · May 13, 2017 · b43caf6 · b43caf6
1 parent 4c02c97
commit b43caf6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/OctoPhone/Networking/Model Mapping/Bed+JSONAble.swift b/OctoPhone/Networking/Model Mapping/Bed+JSONAble.swift
@@ -12,12 +12,13 @@ extension Bed: JSONAble {
     static func fromJSON(json: [String : Any]) throws -> Bed {
         guard
             let actual = json["actual"] as? Double,
-            let offset = json["offset"] as? Double,
             let target = json["target"] as? Double
         else {
             throw JSONAbleError.errorMappingJSONToObject(json: json)
         }
 
+        let offset = json["offset"] as? Double ?? 0.0
+
         return Bed(actualTemperature: actual, targetTemperature: target, offsetTemperature: offset)
     }
 }
diff --git a/OctoPhone/Networking/Model Mapping/Tool+JSONAble.swift b/OctoPhone/Networking/Model Mapping/Tool+JSONAble.swift
@@ -13,12 +13,13 @@ extension Tool: JSONAble {
     static func fromJSON(json: [String : Any]) throws -> Tool {
         guard
             let actual = json["actual"] as? Double,
-            let offset = json["offset"] as? Double,
             let target = json["target"] as? Double
         else {
             throw JSONAbleError.errorMappingJSONToObject(json: json)
         }
 
+        let offset = json["offset"] as? Double ?? 0.0
+
         return Tool(actual: actual, offset: offset, target: target)
     }
 }