Added adresses and capabilites

Author: smuellner

Sources/MultiUser/Model/Address.swift

@@ -0,0 +1,47 @@
+//
+//  Address.swift
+//  
+//
+//  Created by Sascha Müllner on 11.03.20.
+//
+
+import Foundation
+import CoreLocation
+
+public struct Address : Codable {
+
+    public var label: String?
+    public var street: String?
+    public var city: String?
+    public var postcode: String?
+    public var country: String?
+    public var latitude: CLLocationDegrees?
+    public var longitude: CLLocationDegrees?
+
+
+    public init(from decoder: Decoder) throws {
+        let values = try decoder.container(keyedBy: CodingKeys.self)
+        self.label = try values.decodeIfPresent(String.self, forKey: .label)
+        self.street = try values.decodeIfPresent(String.self, forKey: .street)
+        self.city = try values.decodeIfPresent(String.self, forKey: .city)
+        self.postcode = try values.decodeIfPresent(String.self, forKey: .postcode)
+        self.country = try values.decodeIfPresent(String.self, forKey: .country)
+        self.latitude = try values.decodeIfPresent(CLLocationDegrees.self, forKey: .latitude)
+        self.longitude = try values.decodeIfPresent(CLLocationDegrees.self, forKey: .longitude)
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(self.label, forKey: .label)
+        try container.encodeIfPresent(self.street, forKey: .street)
+        try container.encodeIfPresent(self.city, forKey: .city)
+        try container.encodeIfPresent(self.postcode, forKey: .postcode)
+        try container.encodeIfPresent(self.country, forKey: .country)
+        try container.encodeIfPresent(self.latitude, forKey: .latitude)
+        try container.encodeIfPresent(self.longitude, forKey: .longitude)
+    }
+
+    private enum CodingKeys: String, CodingKey {
+        case label, street, city, postcode, country, latitude, longitude
+    }
+}

Sources/MultiUser/Model/Capabilities.swift

@@ -0,0 +1,30 @@
+//
+//  Capabilities.swift
+//  
+//
+//  Created by Sascha Müllner on 11.03.20.
+//
+
+import Foundation
+
+public struct Capabilities : Codable {
+
+    public var nativeLanguage: String?
+    public var languages: [String]?
+
+    public init(from decoder: Decoder) throws {
+        let values = try decoder.container(keyedBy: CodingKeys.self)
+        self.nativeLanguage = try values.decodeIfPresent(String.self, forKey: .nativeLanguage)
+        self.languages = try values.decodeIfPresent([String].self, forKey: .languages)
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(self.nativeLanguage, forKey: .nativeLanguage)
+        try container.encodeIfPresent(self.languages, forKey: .languages)
+    }
+
+    private enum CodingKeys: String, CodingKey {
+        case nativeLanguage, languages
+    }
+}

Sources/MultiUser/Model/EMail.swift

@@ -0,0 +1,30 @@
+//
+//  EMail.swift
+//  
+//
+//  Created by Sascha Müllner on 11.03.20.
+//
+
+import Foundation
+
+public struct EMail : Codable {
+
+    public var label: String?
+    public var email: String?
+
+    public init(from decoder: Decoder) throws {
+        let values = try decoder.container(keyedBy: CodingKeys.self)
+        self.label = try values.decodeIfPresent(String.self, forKey: .label)
+        self.email = try values.decodeIfPresent(String.self, forKey: .email)
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(self.label, forKey: .label)
+        try container.encodeIfPresent(self.email, forKey: .email)
+    }
+
+    private enum CodingKeys: String, CodingKey {
+        case label, email
+    }
+}

Sources/MultiUser/Model/Phone.swift

@@ -0,0 +1,30 @@
+//
+//  Phone.swift
+//  
+//
+//  Created by Sascha Müllner on 11.03.20.
+//
+
+import Foundation
+
+public struct Phone : Codable {
+
+    public var label: String?
+    public var phone: String?
+
+    public init(from decoder: Decoder) throws {
+        let values = try decoder.container(keyedBy: CodingKeys.self)
+        self.label = try values.decodeIfPresent(String.self, forKey: .label)
+        self.phone = try values.decodeIfPresent(String.self, forKey: .phone)
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(self.label, forKey: .label)
+        try container.encodeIfPresent(self.phone, forKey: .phone)
+    }
+
+    private enum CodingKeys: String, CodingKey {
+        case label, phone
+    }
+}

Sources/MultiUser/Model/User.swift

@@ -6,15 +6,19 @@
 //
 
 import Foundation
+import CoreImage
 
 public struct User : Codable {
-    private var uuid:UUID
+    private var uuid: UUID
 
     public var username: String?
     public var firstname: String?
     public var lastname: String?
     public var birthday: Date?
-    public var emails: [String]?
+    public var emails: [EMail]?
+    public var phones: [Phone]?
+    public var addresses: [Address]?
+    public var capabilities: Capabilities?
     public var attributes: [String: String]?
     public var icon: Data?
     public var data: [Data]?
@@ -26,27 +30,31 @@ public struct User : Codable {
     public init(from decoder: Decoder) throws {
         let values = try decoder.container(keyedBy: CodingKeys.self)
         self.uuid = try values.decode(UUID.self, forKey: .uuid)
-        self.username = try values.decode(String.self, forKey: .username)
-        self.firstname = try values.decode(String.self, forKey: .firstname)
-        self.lastname = try values.decode(String.self, forKey: .lastname)
-        self.birthday = try values.decode(Date.self, forKey: .birthday)
-        self.emails = try values.decode([String].self, forKey: .emails)
-        self.attributes = try values.decode([String: String].self, forKey: .attributes)
-        self.icon = try values.decode(Data.self, forKey: .icon)
-        self.data = try values.decode([Data].self, forKey: .data)
+        self.username = try values.decodeIfPresent(String.self, forKey: .username)
+        self.firstname = try values.decodeIfPresent(String.self, forKey: .firstname)
+        self.lastname = try values.decodeIfPresent(String.self, forKey: .lastname)
+        self.birthday = try values.decodeIfPresent(Date.self, forKey: .birthday)
+        self.emails = try values.decodeIfPresent([EMail].self, forKey: .emails)
+        self.phones = try values.decodeIfPresent([Phone].self, forKey: .phones)
+        self.addresses = try values.decodeIfPresent([Address].self, forKey: .addresses)
+        self.attributes = try values.decodeIfPresent([String: String].self, forKey: .attributes)
+        self.icon = try values.decodeIfPresent(Data.self, forKey: .icon)
+        self.data = try values.decodeIfPresent([Data].self, forKey: .data)
     }
 
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(self.uuid, forKey: .uuid)
-        try container.encode(self.username, forKey: .username)
-        try container.encode(self.firstname, forKey: .firstname)
-        try container.encode(self.lastname, forKey: .lastname)
-        try container.encode(self.birthday, forKey: .birthday)
-        try container.encode(self.emails, forKey: .emails)
-        try container.encode(self.attributes, forKey: .attributes)
-        try container.encode(self.icon, forKey: .icon)
-        try container.encode(self.data, forKey: .data)
+        try container.encodeIfPresent(self.username, forKey: .username)
+        try container.encodeIfPresent(self.firstname, forKey: .firstname)
+        try container.encodeIfPresent(self.lastname, forKey: .lastname)
+        try container.encodeIfPresent(self.birthday, forKey: .birthday)
+        try container.encodeIfPresent(self.emails, forKey: .emails)
+        try container.encodeIfPresent(self.phones, forKey: .phones)
+        try container.encodeIfPresent(self.addresses, forKey: .addresses)
+        try container.encodeIfPresent(self.attributes, forKey: .attributes)
+        try container.encodeIfPresent(self.icon, forKey: .icon)
+        try container.encodeIfPresent(self.data, forKey: .data)
     }
 
     public var id: UUID {
@@ -56,6 +64,6 @@ public struct User : Codable {
     }
 
     private enum CodingKeys: String, CodingKey {
-        case uuid, username, firstname, lastname, birthday, emails, attributes, icon, data
+        case uuid, username, firstname, lastname, birthday, emails, phones, addresses, attributes, icon, data
     }
 }