Fix updating poll object from the WS event object + log warning (in debug mode) if event got ignored because of channel ID not found

sierpinskid · sierpinskid · commit 714aa55cfc03 · 2025-10-31T19:26:08.000+01:00
diff --git a/Assets/Plugins/StreamChat/Core/StreamChatClient.cs b/Assets/Plugins/StreamChat/Core/StreamChatClient.cs
@@ -1388,14 +1388,14 @@ private void OnPollClosed(PollClosedEventInternalDTO eventDto)
         {
             if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))
             {
+#if STREAM_DEBUG_ENABLED
+                _logs.Warning($"[{nameof(OnPollClosed)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");
+#endif
                 return;
             }
 
-            if (!_cache.Polls.TryGet(eventDto.Poll.Id, out var streamPoll))
-            {
-                streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
-                streamPoll.InternalSetChannel(streamChannel);
-            }
+            var streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
+            streamPoll.InternalSetChannel(streamChannel);
 
             streamPoll.HandlePollClosedEvent(eventDto);
         }
@@ -1404,6 +1404,9 @@ private void OnPollDeleted(PollDeletedEventInternalDTO eventDto)
         {
             if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))
             {
+#if STREAM_DEBUG_ENABLED
+                _logs.Warning($"[{nameof(OnPollDeleted)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");
+#endif
                 return;
             }
 
@@ -1418,14 +1421,14 @@ private void OnPollUpdated(PollUpdatedEventInternalDTO eventDto)
         {
             if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))
             {
+#if STREAM_DEBUG_ENABLED
+                _logs.Warning($"[{nameof(OnPollUpdated)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");
+#endif
                 return;
             }
 
-            if (!_cache.Polls.TryGet(eventDto.Poll.Id, out var streamPoll))
-            {
-                streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
-                streamPoll.InternalSetChannel(streamChannel);
-            }
+            var streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
+            streamPoll.InternalSetChannel(streamChannel);
 
             streamPoll.HandlePollUpdatedEvent(eventDto);
         }
@@ -1434,14 +1437,14 @@ private void OnPollVoteCasted(PollVoteCastedEventInternalDTO eventDto)
         {
             if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))
             {
+#if STREAM_DEBUG_ENABLED
+                _logs.Warning($"[{nameof(OnPollVoteCasted)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");
+#endif
                 return;
             }
 
-            if (!_cache.Polls.TryGet(eventDto.Poll.Id, out var streamPoll))
-            {
-                streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
-                streamPoll.InternalSetChannel(streamChannel);
-            }
+            var streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
+            streamPoll.InternalSetChannel(streamChannel);
 
             streamPoll.HandlePollVoteCastedEvent(eventDto);
         }
@@ -1450,14 +1453,14 @@ private void OnPollVoteChanged(PollVoteChangedEventInternalDTO eventDto)
         {
             if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))
             {
+#if STREAM_DEBUG_ENABLED
+                _logs.Warning($"[{nameof(OnPollVoteChanged)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");
+#endif
                 return;
             }
 
-            if (!_cache.Polls.TryGet(eventDto.Poll.Id, out var streamPoll))
-            {
-                streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
-                streamPoll.InternalSetChannel(streamChannel);
-            }
+            var streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
+            streamPoll.InternalSetChannel(streamChannel);
 
             streamPoll.HandlePollVoteChangedEvent(eventDto);
         }
@@ -1466,14 +1469,14 @@ private void OnPollVoteRemoved(PollVoteRemovedEventInternalDTO eventDto)
         {
             if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))
             {
+#if STREAM_DEBUG_ENABLED
+                _logs.Warning($"[{nameof(OnPollVoteRemoved)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");
+#endif
                 return;
             }
 
-            if (!_cache.Polls.TryGet(eventDto.Poll.Id, out var streamPoll))
-            {
-                streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
-                streamPoll.InternalSetChannel(streamChannel);
-            }
+            var streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
+            streamPoll.InternalSetChannel(streamChannel);
 
             streamPoll.HandlePollVoteRemovedEvent(eventDto);
         }

Original file line number	Diff line number	Diff line change
`@@ -1388,14 +1388,14 @@ private void OnPollClosed(PollClosedEventInternalDTO eventDto)`
`1388`	`1388`	`{`
`1389`	`1389`	`if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))`
`1390`	`1390`	`{`
	`1391`	`+#if STREAM_DEBUG_ENABLED`
	`1392`	`+ _logs.Warning($"[{nameof(OnPollClosed)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");`
	`1393`	`+#endif`
`1391`	`1394`	`return;`
`1392`	`1395`	`}`
`1393`	`1396`
`1394`		`- if (!_cache.Polls.TryGet(eventDto.Poll.Id, out var streamPoll))`
`1395`		`- {`
`1396`		`- streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);`
`1397`		`- streamPoll.InternalSetChannel(streamChannel);`
`1398`		`- }`
	`1397`	`+ var streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);`
	`1398`	`+ streamPoll.InternalSetChannel(streamChannel);`
`1399`	`1399`
`1400`	`1400`	`streamPoll.HandlePollClosedEvent(eventDto);`
`1401`	`1401`	`}`
`@@ -1404,6 +1404,9 @@ private void OnPollDeleted(PollDeletedEventInternalDTO eventDto)`
`1404`	`1404`	`{`
`1405`	`1405`	`if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))`
`1406`	`1406`	`{`
	`1407`	`+#if STREAM_DEBUG_ENABLED`
	`1408`	`+ _logs.Warning($"[{nameof(OnPollDeleted)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");`
	`1409`	`+#endif`
`1407`	`1410`	`return;`
`1408`	`1411`	`}`
`1409`	`1412`
`@@ -1418,14 +1421,14 @@ private void OnPollUpdated(PollUpdatedEventInternalDTO eventDto)`
`1418`	`1421`	`{`
`1419`	`1422`	`if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))`
`1420`	`1423`	`{`
	`1424`	`+#if STREAM_DEBUG_ENABLED`
	`1425`	`+ _logs.Warning($"[{nameof(OnPollUpdated)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");`
	`1426`	`+#endif`
`1421`	`1427`	`return;`
`1422`	`1428`	`}`
`1423`	`1429`
`1424`		`- if (!_cache.Polls.TryGet(eventDto.Poll.Id, out var streamPoll))`
`1425`		`- {`
`1426`		`- streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);`
`1427`		`- streamPoll.InternalSetChannel(streamChannel);`
`1428`		`- }`
	`1430`	`+ var streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);`
	`1431`	`+ streamPoll.InternalSetChannel(streamChannel);`
`1429`	`1432`
`1430`	`1433`	`streamPoll.HandlePollUpdatedEvent(eventDto);`
`1431`	`1434`	`}`
`@@ -1434,14 +1437,14 @@ private void OnPollVoteCasted(PollVoteCastedEventInternalDTO eventDto)`
`1434`	`1437`	`{`
`1435`	`1438`	`if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))`
`1436`	`1439`	`{`
	`1440`	`+#if STREAM_DEBUG_ENABLED`
	`1441`	`+ _logs.Warning($"[{nameof(OnPollVoteCasted)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");`
	`1442`	`+#endif`
`1437`	`1443`	`return;`
`1438`	`1444`	`}`
`1439`	`1445`
`1440`		`- if (!_cache.Polls.TryGet(eventDto.Poll.Id, out var streamPoll))`
`1441`		`- {`
`1442`		`- streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);`
`1443`		`- streamPoll.InternalSetChannel(streamChannel);`
`1444`		`- }`
	`1446`	`+ var streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);`
	`1447`	`+ streamPoll.InternalSetChannel(streamChannel);`
`1445`	`1448`
`1446`	`1449`	`streamPoll.HandlePollVoteCastedEvent(eventDto);`
`1447`	`1450`	`}`
`@@ -1450,14 +1453,14 @@ private void OnPollVoteChanged(PollVoteChangedEventInternalDTO eventDto)`
`1450`	`1453`	`{`
`1451`	`1454`	`if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))`
`1452`	`1455`	`{`
	`1456`	`+#if STREAM_DEBUG_ENABLED`
	`1457`	`+ _logs.Warning($"[{nameof(OnPollVoteChanged)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");`
	`1458`	`+#endif`
`1453`	`1459`	`return;`
`1454`	`1460`	`}`
`1455`	`1461`
`1456`		`- if (!_cache.Polls.TryGet(eventDto.Poll.Id, out var streamPoll))`
`1457`		`- {`
`1458`		`- streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);`
`1459`		`- streamPoll.InternalSetChannel(streamChannel);`
`1460`		`- }`
	`1462`	`+ var streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);`
	`1463`	`+ streamPoll.InternalSetChannel(streamChannel);`
`1461`	`1464`
`1462`	`1465`	`streamPoll.HandlePollVoteChangedEvent(eventDto);`
`1463`	`1466`	`}`
`@@ -1466,14 +1469,14 @@ private void OnPollVoteRemoved(PollVoteRemovedEventInternalDTO eventDto)`
`1466`	`1469`	`{`
`1467`	`1470`	`if (!_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))`
`1468`	`1471`	`{`
	`1472`	`+#if STREAM_DEBUG_ENABLED`
	`1473`	`+ _logs.Warning($"[{nameof(OnPollVoteRemoved)}] Poll WS event received but ignored because channel with ID {eventDto.Cid} was not found in cache");`
	`1474`	`+#endif`
`1469`	`1475`	`return;`
`1470`	`1476`	`}`
`1471`	`1477`
`1472`		`- if (!_cache.Polls.TryGet(eventDto.Poll.Id, out var streamPoll))`
`1473`		`- {`
`1474`		`- streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);`
`1475`		`- streamPoll.InternalSetChannel(streamChannel);`
`1476`		`- }`
	`1478`	`+ var streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);`
	`1479`	`+ streamPoll.InternalSetChannel(streamChannel);`
`1477`	`1480`
`1478`	`1481`	`streamPoll.HandlePollVoteRemovedEvent(eventDto);`
`1479`	`1482`	`}`