Fix dto mappings

sierpinskid · sierpinskid · commit 880dc68b0cb2 · 2025-10-30T16:41:32.000+01:00
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollClosed.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollClosed.cs
@@ -1,5 +1,6 @@
 using StreamChat.Core.Helpers;
 using StreamChat.Core.InternalDTO.Events;
+using StreamChat.Core.InternalDTO.Responses;
 using StreamChat.Core.LowLevelClient.Models;
 
 namespace StreamChat.Core.LowLevelClient.Events
@@ -22,7 +23,7 @@ EventPollClosed ILoadableFrom<PollClosedEventInternalDTO, EventPollClosed>.LoadF
             Cid = dto.Cid;
             CreatedAt = dto.CreatedAt;
             MessageId = dto.MessageId;
-            Poll = Poll.TryLoadFromDto(dto.Poll);
+            Poll = Poll.TryLoadFromDto<PollResponseDataInternalDTO, Poll>(dto.Poll);
             Type = dto.Type;
             AdditionalProperties = dto.AdditionalProperties;
 
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollDeleted.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollDeleted.cs
@@ -1,5 +1,6 @@
 using StreamChat.Core.Helpers;
 using StreamChat.Core.InternalDTO.Events;
+using StreamChat.Core.InternalDTO.Responses;
 using StreamChat.Core.LowLevelClient.Models;
 
 namespace StreamChat.Core.LowLevelClient.Events
@@ -22,7 +23,7 @@ EventPollDeleted ILoadableFrom<PollDeletedEventInternalDTO, EventPollDeleted>.Lo
             Cid = dto.Cid;
             CreatedAt = dto.CreatedAt;
             MessageId = dto.MessageId;
-            Poll = Poll.TryLoadFromDto(dto.Poll);
+            Poll = Poll.TryLoadFromDto<PollResponseDataInternalDTO, Poll>(dto.Poll);
             Type = dto.Type;
             AdditionalProperties = dto.AdditionalProperties;
 
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollUpdated.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollUpdated.cs
@@ -1,5 +1,6 @@
 using StreamChat.Core.Helpers;
 using StreamChat.Core.InternalDTO.Events;
+using StreamChat.Core.InternalDTO.Responses;
 using StreamChat.Core.LowLevelClient.Models;
 
 namespace StreamChat.Core.LowLevelClient.Events
@@ -22,7 +23,7 @@ EventPollUpdated ILoadableFrom<PollUpdatedEventInternalDTO, EventPollUpdated>.Lo
             Cid = dto.Cid;
             CreatedAt = dto.CreatedAt;
             MessageId = dto.MessageId;
-            Poll = Poll.TryLoadFromDto(dto.Poll);
+            Poll = Poll.TryLoadFromDto<PollResponseDataInternalDTO, Poll>(dto.Poll);
             Type = dto.Type;
             AdditionalProperties = dto.AdditionalProperties;
 
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollVoteCasted.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollVoteCasted.cs
@@ -1,5 +1,6 @@
 using StreamChat.Core.Helpers;
 using StreamChat.Core.InternalDTO.Events;
+using StreamChat.Core.InternalDTO.Responses;
 using StreamChat.Core.LowLevelClient.Models;
 
 namespace StreamChat.Core.LowLevelClient.Events
@@ -24,8 +25,8 @@ EventPollVoteCasted ILoadableFrom<PollVoteCastedEventInternalDTO, EventPollVoteC
             Cid = dto.Cid;
             CreatedAt = dto.CreatedAt;
             MessageId = dto.MessageId;
-            Poll = Poll.TryLoadFromDto(dto.Poll);
-            PollVote = PollVote.TryLoadFromDto(dto.PollVote);
+            Poll = Poll.TryLoadFromDto<PollResponseDataInternalDTO, Poll>(dto.Poll);
+            PollVote = PollVote.TryLoadFromDto<PollVoteResponseDataInternalDTO, PollVote>(dto.PollVote);
             Type = dto.Type;
             AdditionalProperties = dto.AdditionalProperties;
 
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollVoteChanged.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollVoteChanged.cs
@@ -1,5 +1,6 @@
 using StreamChat.Core.Helpers;
 using StreamChat.Core.InternalDTO.Events;
+using StreamChat.Core.InternalDTO.Responses;
 using StreamChat.Core.LowLevelClient.Models;
 
 namespace StreamChat.Core.LowLevelClient.Events
@@ -24,8 +25,8 @@ EventPollVoteChanged ILoadableFrom<PollVoteChangedEventInternalDTO, EventPollVot
             Cid = dto.Cid;
             CreatedAt = dto.CreatedAt;
             MessageId = dto.MessageId;
-            Poll = Poll.TryLoadFromDto(dto.Poll);
-            PollVote = PollVote.TryLoadFromDto(dto.PollVote);
+            Poll = Poll.TryLoadFromDto<PollResponseDataInternalDTO, Poll>(dto.Poll);
+            PollVote = PollVote.TryLoadFromDto<PollVoteResponseDataInternalDTO, PollVote>(dto.PollVote);
             Type = dto.Type;
             AdditionalProperties = dto.AdditionalProperties;
 
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollVoteRemoved.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Events/EventPollVoteRemoved.cs
@@ -1,5 +1,6 @@
 using StreamChat.Core.Helpers;
 using StreamChat.Core.InternalDTO.Events;
+using StreamChat.Core.InternalDTO.Responses;
 using StreamChat.Core.LowLevelClient.Models;
 
 namespace StreamChat.Core.LowLevelClient.Events
@@ -24,8 +25,8 @@ EventPollVoteRemoved ILoadableFrom<PollVoteRemovedEventInternalDTO, EventPollVot
             Cid = dto.Cid;
             CreatedAt = dto.CreatedAt;
             MessageId = dto.MessageId;
-            Poll = Poll.TryLoadFromDto(dto.Poll);
-            PollVote = PollVote.TryLoadFromDto(dto.PollVote);
+            Poll = Poll.TryLoadFromDto<PollResponseDataInternalDTO, Poll>(dto.Poll);
+            PollVote = PollVote.TryLoadFromDto<PollVoteResponseDataInternalDTO, PollVote>(dto.PollVote);
             Type = dto.Type;
             AdditionalProperties = dto.AdditionalProperties;
 
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/Poll.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/Poll.cs
@@ -9,7 +9,7 @@ namespace StreamChat.Core.LowLevelClient.Models
     /// <summary>
     /// Represents a poll
     /// </summary>
-    public partial class Poll : ILoadableFrom<PollInternalDTO, Poll>, ILoadableFrom<PollResponseDataInternalDTO, Poll>
+    public partial class Poll : ModelBase, ILoadableFrom<PollInternalDTO, Poll>, ILoadableFrom<PollResponseDataInternalDTO, Poll>
     {
         public bool AllowAnswers { get; set; }
 
@@ -19,7 +19,7 @@ public partial class Poll : ILoadableFrom<PollInternalDTO, Poll>, ILoadableFrom<
 
         public DateTimeOffset CreatedAt { get; set; }
 
-        public User CreatedBy { get; set; }
+        public User CreatedBy { get; set; } // StreamTodo: check if we can replace with IStreamUser
 
         public string CreatedById { get; set; }
 
@@ -53,15 +53,13 @@ public partial class Poll : ILoadableFrom<PollInternalDTO, Poll>, ILoadableFrom<
 
         public string VotingVisibility { get; set; }
 
-        public Dictionary<string, object> AdditionalProperties { get; set; }
-
         Poll ILoadableFrom<PollInternalDTO, Poll>.LoadFromDto(PollInternalDTO dto)
         {
             AllowAnswers = dto.AllowAnswers;
             AllowUserSuggestedOptions = dto.AllowUserSuggestedOptions;
             AnswersCount = dto.AnswersCount;
             CreatedAt = dto.CreatedAt;
-            CreatedBy = CreatedBy.TryLoadFromDto(dto.CreatedBy);
+            CreatedBy = CreatedBy.TryLoadFromDto<UserObjectInternalDTO, User>(dto.CreatedBy);
             CreatedById = dto.CreatedById;
             Custom = dto.Custom;
             Description = dto.Description;
@@ -89,7 +87,7 @@ Poll ILoadableFrom<PollResponseDataInternalDTO, Poll>.LoadFromDto(PollResponseDa
             AllowUserSuggestedOptions = dto.AllowUserSuggestedOptions;
             AnswersCount = dto.AnswersCount;
             CreatedAt = dto.CreatedAt;
-            CreatedBy = CreatedBy.TryLoadFromDto(dto.CreatedBy);
+            CreatedBy = CreatedBy.TryLoadFromDto<UserResponseInternalDTO, User>(dto.CreatedBy);
             CreatedById = dto.CreatedById;
             Custom = dto.Custom;
             Description = dto.Description;
@@ -125,6 +123,21 @@ private Dictionary<string, List<PollVote>> LoadVotesByOption(Dictionary<string,
             }
             return result;
         }
+        
+        private Dictionary<string, List<PollVote>> LoadVotesByOption(Dictionary<string, List<PollVoteInternalDTO>> dto)
+        {
+            if (dto == null)
+            {
+                return null;
+            }
+
+            var result = new Dictionary<string, List<PollVote>>();
+            foreach (var kvp in dto)
+            {
+                result[kvp.Key] = new List<PollVote>().TryLoadFromDtoCollection(kvp.Value);
+            }
+            return result;
+        }
     }
 }
 
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/PollVote.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/PollVote.cs
@@ -40,7 +40,7 @@ PollVote ILoadableFrom<PollVoteInternalDTO, PollVote>.LoadFromDto(PollVoteIntern
             OptionId = dto.OptionId;
             PollId = dto.PollId;
             UpdatedAt = dto.UpdatedAt;
-            User = User.TryLoadFromDto(dto.User);
+            User = User.TryLoadFromDto<UserObjectInternalDTO, User>(dto.User);
             UserId = dto.UserId;
             AdditionalProperties = dto.AdditionalProperties;
 
@@ -56,7 +56,7 @@ PollVote ILoadableFrom<PollVoteResponseDataInternalDTO, PollVote>.LoadFromDto(Po
             OptionId = dto.OptionId;
             PollId = dto.PollId;
             UpdatedAt = dto.UpdatedAt;
-            User = User.TryLoadFromDto(dto.User);
+            User = User.TryLoadFromDto<UserResponseInternalDTO, User>(dto.User);
             UserId = dto.UserId;
             AdditionalProperties = dto.AdditionalProperties;
 
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/User.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/User.cs
@@ -5,7 +5,7 @@
 
 namespace StreamChat.Core.LowLevelClient.Models
 {
-    //StreamTODO: Try check if this object is needed. Ideally we'd only have IStreamUser object representing a user
+    //StreamTODO: Check if this object is needed. Ideally we'd only have IStreamUser object representing a user and remove this one
     public class User : ModelBase, ILoadableFrom<UserObjectInternalDTO, User>,
         ILoadableFrom<UserResponseInternalDTO, User>, ILoadableFrom<UserEventPayloadInternalDTO, User>,
         ILoadableFrom<FullUserResponseInternalDTO, User>,
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Requests/CreatePollRequest.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Requests/CreatePollRequest.cs
@@ -45,7 +45,7 @@ CreatePollRequestInternalDTO ISavableTo<CreatePollRequestInternalDTO>.SaveToDto(
                 IsClosed = IsClosed,
                 MaxVotesAllowed = MaxVotesAllowed,
                 Name = Name,
-                Options = Options.TrySaveToDtoCollection<PollOptionInputInternalDTO>(),
+                Options = Options.TrySaveToDtoCollection<PollOptionInput, PollOptionInputInternalDTO>(),
                 VotingVisibility = VotingVisibility != null 
                     ? new CreatePollRequestVotingVisibilityInternalDTO { Value = VotingVisibility }
                     : (CreatePollRequestVotingVisibilityInternalDTO?)null,
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Requests/QueryPollVotesRequest.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Requests/QueryPollVotesRequest.cs
@@ -9,6 +9,7 @@ namespace StreamChat.Core.LowLevelClient.Requests
     /// </summary>
     public partial class QueryPollVotesRequest : RequestObjectBase, ISavableTo<QueryPollVotesRequestInternalDTO>
     {
+        //StreamTODO: replace later with filter query builder
         public Dictionary<string, object> Filter { get; set; }
 
         public int? Limit { get; set; }
@@ -26,7 +27,7 @@ QueryPollVotesRequestInternalDTO ISavableTo<QueryPollVotesRequestInternalDTO>.Sa
                 Limit = Limit,
                 Next = Next,
                 Prev = Prev,
-                Sort = Sort.TrySaveToDtoCollection<SortParamRequestInternalDTO>(),
+                Sort = Sort.TrySaveToDtoCollection<SortParamRequest, SortParamRequestInternalDTO>(),
             };
     }
 }
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Requests/QueryPollsRequest.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Requests/QueryPollsRequest.cs
@@ -26,7 +26,7 @@ QueryPollsRequestInternalDTO ISavableTo<QueryPollsRequestInternalDTO>.SaveToDto(
                 Limit = Limit,
                 Next = Next,
                 Prev = Prev,
-                Sort = Sort.TrySaveToDtoCollection<SortParamRequestInternalDTO>(),
+                Sort = Sort.TrySaveToDtoCollection<SortParamRequest, SortParamRequestInternalDTO>(),
             };
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace StreamChat.Core.LowLevelClient.Models`
`7`	`7`	`{`
`8`		`- //StreamTODO: Try check if this object is needed. Ideally we'd only have IStreamUser object representing a user`
	`8`	`+ //StreamTODO: Check if this object is needed. Ideally we'd only have IStreamUser object representing a user and remove this one`
`9`	`9`	`public class User : ModelBase, ILoadableFrom<UserObjectInternalDTO, User>,`
`10`	`10`	`ILoadableFrom<UserResponseInternalDTO, User>, ILoadableFrom<UserEventPayloadInternalDTO, User>,`
`11`	`11`	`ILoadableFrom<FullUserResponseInternalDTO, User>,`