Skip to content

Commit 6cbf0e9

Browse files
committed
Added default values
1 parent 3490d88 commit 6cbf0e9

File tree

5 files changed

+19
-8
lines changed

5 files changed

+19
-8
lines changed

Sources/MultiUser/Model/Address.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public struct Address: Codable {
1818
public var latitude: CLLocationDegrees?
1919
public var longitude: CLLocationDegrees?
2020

21+
public init() {
22+
}
2123

2224
public init(from decoder: Decoder) throws {
2325
let values = try decoder.container(keyedBy: CodingKeys.self)

Sources/MultiUser/Model/Capabilities.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ import Foundation
1010
public struct Capabilities: Codable {
1111

1212
public var nativeLanguage: String?
13-
public var languages: [String]?
13+
public var languages: [String] = [String]()
1414

15+
internal init() {
16+
}
17+
1518
public init(from decoder: Decoder) throws {
1619
let values = try decoder.container(keyedBy: CodingKeys.self)
1720
self.nativeLanguage = try values.decodeIfPresent(String.self, forKey: .nativeLanguage)

Sources/MultiUser/Model/EMail.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ public struct EMail: Codable {
1212
public var label: String?
1313
public var email: String?
1414

15+
public init() {
16+
}
17+
1518
public init(from decoder: Decoder) throws {
1619
let values = try decoder.container(keyedBy: CodingKeys.self)
1720
self.label = try values.decodeIfPresent(String.self, forKey: .label)

Sources/MultiUser/Model/Phone.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ public struct Phone: Codable {
1212
public var label: String?
1313
public var phone: String?
1414

15+
public init() {
16+
}
17+
1518
public init(from decoder: Decoder) throws {
1619
let values = try decoder.container(keyedBy: CodingKeys.self)
1720
self.label = try values.decodeIfPresent(String.self, forKey: .label)

Sources/MultiUser/Model/User.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ public struct User: Codable {
1515
public var firstname: String?
1616
public var lastname: String?
1717
public var birthday: Date?
18-
public var emails: [EMail]?
19-
public var phones: [Phone]?
20-
public var addresses: [Address]?
21-
public var capabilities: Capabilities?
22-
public var attributes: [String: String]?
18+
public var emails: [EMail] = [EMail]()
19+
public var phones: [Phone] = [Phone]()
20+
public var addresses: [Address] = [Address]()
21+
public var capabilities: Capabilities = Capabilities()
22+
public var attributes: [String: String] = [String: String]()
2323
public var icon: Data?
24-
public var data: [Data]?
24+
public var data: [Data] = [Data]()
2525

2626
public init() {
2727
self.uuid = UUID()
@@ -37,7 +37,7 @@ public struct User: Codable {
3737
self.emails = try values.decodeIfPresent([EMail].self, forKey: .emails) ?? [EMail]()
3838
self.phones = try values.decodeIfPresent([Phone].self, forKey: .phones) ?? [Phone]()
3939
self.addresses = try values.decodeIfPresent([Address].self, forKey: .addresses) ?? [Address]()
40-
self.capabilities = try values.decodeIfPresent(Capabilities.self, forKey: .capabilities)
40+
self.capabilities = try values.decodeIfPresent(Capabilities.self, forKey: .capabilities) ?? Capabilities()
4141
self.attributes = try values.decodeIfPresent([String: String].self, forKey: .attributes) ?? [String: String]()
4242
self.icon = try values.decodeIfPresent(Data.self, forKey: .icon)
4343
self.data = try values.decodeIfPresent([Data].self, forKey: .data) ?? [Data]()

0 commit comments

Comments
 (0)