From 31cc35d5d3658918db23fe0a22867c346cee861c Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 8 Sep 2023 09:46:17 -0500 Subject: [PATCH] added new id property to models Signed-off-by: Matt Bruce --- JSONCreator_iOS/JSONCreator/MF/Order Tracker/LinksModel.swift | 2 ++ .../JSONCreator/MF/Order Tracker/OrderTrackerModel.swift | 4 +++- JSONCreator_iOS/JSONCreator/MF/Order Tracker/StepModel.swift | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/JSONCreator_iOS/JSONCreator/MF/Order Tracker/LinksModel.swift b/JSONCreator_iOS/JSONCreator/MF/Order Tracker/LinksModel.swift index 1e364c2..d6ce8ba 100644 --- a/JSONCreator_iOS/JSONCreator/MF/Order Tracker/LinksModel.swift +++ b/JSONCreator_iOS/JSONCreator/MF/Order Tracker/LinksModel.swift @@ -9,11 +9,13 @@ import MVMCoreUI @objcMembers public class LinksModel: MoleculeModelProtocol { + @DecodableDefault.UUIDString public var id: String public static var identifier: String = "links" public var backgroundColor: Color? public var links: [LinkModel] private enum CodingKeys: String, CodingKey { + case id case moleculeName case backgroundColor case links diff --git a/JSONCreator_iOS/JSONCreator/MF/Order Tracker/OrderTrackerModel.swift b/JSONCreator_iOS/JSONCreator/MF/Order Tracker/OrderTrackerModel.swift index a58621f..14696b2 100644 --- a/JSONCreator_iOS/JSONCreator/MF/Order Tracker/OrderTrackerModel.swift +++ b/JSONCreator_iOS/JSONCreator/MF/Order Tracker/OrderTrackerModel.swift @@ -13,7 +13,8 @@ open class OrderTrackerModel: MoleculeModelProtocol { //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- - + @DecodableDefault.UUIDString public var id: String + public var backgroundColor: Color? public static var identifier: String = "orderTracker" @@ -24,6 +25,7 @@ open class OrderTrackerModel: MoleculeModelProtocol { //-------------------------------------------------- private enum CodingKeys: String, CodingKey { + case id case moleculeName case backgroundColor case steps diff --git a/JSONCreator_iOS/JSONCreator/MF/Order Tracker/StepModel.swift b/JSONCreator_iOS/JSONCreator/MF/Order Tracker/StepModel.swift index 979bfa7..6e9b3ed 100644 --- a/JSONCreator_iOS/JSONCreator/MF/Order Tracker/StepModel.swift +++ b/JSONCreator_iOS/JSONCreator/MF/Order Tracker/StepModel.swift @@ -13,7 +13,7 @@ open class StepModel: MoleculeModelProtocol { //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- - + @DecodableDefault.UUIDString public var id: String public var backgroundColor: Color? public static var identifier: String = "step" @@ -71,6 +71,7 @@ open class StepModel: MoleculeModelProtocol { //-------------------------------------------------- private enum CodingKeys: String, CodingKey { + case id case moleculeName case backgroundColor case state