Do not store empty dictionary when updating PollDTO.custom and PollOp…

…tionDTO.custom because it leads to errors in decoding later (#3551)
GetStream · Jan 4, 2025 · 9017687 · 9017687
1 parent e03357e
commit 9017687
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Sources/StreamChat/Database/DTOs/PollDTO.swift b/Sources/StreamChat/Database/DTOs/PollDTO.swift
@@ -155,14 +155,19 @@ extension NSManagedObjectContext {
         pollDto.name = payload.name
         pollDto.updatedAt = payload.updatedAt.bridgeDate
         pollDto.voteCount = payload.voteCount
-        pollDto.custom = try JSONEncoder.default.encode(payload.custom)
         pollDto.voteCountsByOption = payload.voteCountsByOption
         pollDto.isClosed = payload.isClosed ?? false
         if let maxVotesAllowed = payload.maxVotesAllowed {
             pollDto.maxVotesAllowed = NSNumber(value: maxVotesAllowed)
         }
         pollDto.votingVisibility = payload.votingVisibility
 
+        if let custom = payload.custom, !custom.isEmpty {
+            pollDto.custom = try JSONEncoder.default.encode(custom)
+        } else {
+            pollDto.custom = nil
+        }
+
         if let userPayload = payload.createdBy {
             pollDto.createdBy = try saveUser(payload: userPayload, query: nil, cache: cache)
         } else {

diff --git a/Sources/StreamChat/Database/DTOs/PollOptionDTO.swift b/Sources/StreamChat/Database/DTOs/PollOptionDTO.swift
@@ -93,7 +93,11 @@ extension NSManagedObjectContext {
             cache: cache
         )
         dto.text = payload.text
-        dto.custom = try JSONEncoder.default.encode(payload.custom)
+        if let custom = payload.custom, !custom.isEmpty {
+            dto.custom = try JSONEncoder.default.encode(custom)
+        } else {
+            dto.custom = nil
+        }
         return dto
     }