Skip to content
This repository was archived by the owner on Aug 25, 2023. It is now read-only.

Core: Fix - Decode properties only if present. #368

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Core: Fix - Decode properties only if present. #368

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Sources/Core/Models/User/UserModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ extension UserModel: Codable {

// de-nest properties to top level
let propertiesContainer = try items.nestedContainer(keyedBy: PropertiesCodingKeys.self, forKey: .properties)
firstName = try propertiesContainer.decode(String.self, forKey: .firstName)
lastName = try propertiesContainer.decode(String.self, forKey: .lastName)
isNamePublic = try propertiesContainer.decode(Bool.self, forKey: .isNamePublic)
isAvatarPublic = try propertiesContainer.decode(Bool.self, forKey: .isAvatarPublic)
birthday = try propertiesContainer.decode(String.self, forKey: .birthday)
guestID = try propertiesContainer.decode(String.self, forKey: .guestID)
nonPushNotification = try propertiesContainer.decode(Bool.self, forKey: .nonPushNotification)
language = try propertiesContainer.decode(String.self, forKey: .language)
firstName = try propertiesContainer.decodeIfPresent(String.self, forKey: .firstName) ?? ""
lastName = try propertiesContainer.decodeIfPresent(String.self, forKey: .lastName) ?? ""
isNamePublic = try propertiesContainer.decodeIfPresent(Bool.self, forKey: .isNamePublic) ?? false
isAvatarPublic = try propertiesContainer.decodeIfPresent(Bool.self, forKey: .isAvatarPublic) ?? false
birthday = try propertiesContainer.decodeIfPresent(String.self, forKey: .birthday) ?? ""
guestID = try propertiesContainer.decodeIfPresent(String.self, forKey: .guestID) ?? ""
nonPushNotification = try propertiesContainer.decodeIfPresent(Bool.self, forKey: .nonPushNotification) ?? false
language = try propertiesContainer.decodeIfPresent(String.self, forKey: .language) ?? "en"

userConsents = try propertiesContainer.decodeSafelyIfPresentArray(of: ConsentModel.self, forKey: .userConsents) ?? []
isPasswordSet = try propertiesContainer.decodeIfPresent(Bool.self, forKey: .isPasswordSet) ?? false
Expand Down