Fix poll updating

Author: sierpinskid

Assets/Plugins/StreamChat/Core/LowLevelClient/API/IPollsApi.cs

@@ -22,7 +22,7 @@ public interface IPollsApi
         /// <summary>
         /// Updates a poll
         /// </summary>
-        Task<PollResponse> UpdatePollAsync(string pollId, UpdatePollRequest updatePollRequest);
+        Task<PollResponse> UpdatePollAsync(UpdatePollRequest updatePollRequest);
 
         /// <summary>
         /// Partially updates a poll

Assets/Plugins/StreamChat/Core/LowLevelClient/API/Internal/IInternalPollsApi.cs

@@ -22,7 +22,7 @@ internal interface IInternalPollsApi
         /// <summary>
         /// Update a poll
         /// </summary>
-        Task<PollResponseInternalDTO> UpdatePollAsync(string pollId, UpdatePollRequestInternalDTO updatePollRequest);
+        Task<PollResponseInternalDTO> UpdatePollAsync(UpdatePollRequestInternalDTO updatePollRequest);
 
         /// <summary>
         /// Partial update a poll

Assets/Plugins/StreamChat/Core/LowLevelClient/API/Internal/InternalPollsApi.cs

@@ -25,8 +25,8 @@ public Task<PollResponseInternalDTO> CreatePollAsync(CreatePollRequestInternalDT
         public Task<PollResponseInternalDTO> GetPollAsync(string pollId)
             => Get<PollResponseInternalDTO>($"polls/{pollId}");
 
-        public Task<PollResponseInternalDTO> UpdatePollAsync(string pollId, UpdatePollRequestInternalDTO updatePollRequest)
-            => Put<UpdatePollRequestInternalDTO, PollResponseInternalDTO>($"polls/{pollId}", updatePollRequest);
+        public Task<PollResponseInternalDTO> UpdatePollAsync(UpdatePollRequestInternalDTO updatePollRequest)
+            => Put<UpdatePollRequestInternalDTO, PollResponseInternalDTO>("polls", updatePollRequest);
 
         public Task<PollResponseInternalDTO> UpdatePollPartialAsync(string pollId, UpdatePollPartialRequestInternalDTO updatePollPartialRequest)
             => Patch<UpdatePollPartialRequestInternalDTO, PollResponseInternalDTO>($"polls/{pollId}", updatePollPartialRequest);

Assets/Plugins/StreamChat/Core/LowLevelClient/API/PollsApi.cs

@@ -30,9 +30,9 @@ public async Task<PollResponse> GetPollAsync(string pollId)
             return dto.ToDomain<PollResponseInternalDTO, PollResponse>();
         }
 
-        public async Task<PollResponse> UpdatePollAsync(string pollId, UpdatePollRequest updatePollRequest)
+        public async Task<PollResponse> UpdatePollAsync(UpdatePollRequest updatePollRequest)
         {
-            var dto = await _internalPollsApi.UpdatePollAsync(pollId, updatePollRequest.TrySaveToDto());
+            var dto = await _internalPollsApi.UpdatePollAsync(updatePollRequest.TrySaveToDto());
             return dto.ToDomain<PollResponseInternalDTO, PollResponse>();
         }
 

Assets/Plugins/StreamChat/Core/Requests/StreamUpdatePollRequest.cs

@@ -37,11 +37,6 @@ public class StreamUpdatePollRequest : ISavableTo<UpdatePollRequestInternalDTO>
         /// </summary>
         public bool? EnforceUniqueVote { get; set; }
 
-        /// <summary>
-        /// Poll ID
-        /// </summary>
-        public string Id { get; set; }
-
         /// <summary>
         /// Whether the poll is closed
         /// </summary>
@@ -71,7 +66,7 @@ UpdatePollRequestInternalDTO ISavableTo<UpdatePollRequestInternalDTO>.SaveToDto(
                 AllowUserSuggestedOptions = AllowUserSuggestedOptions,
                 Description = Description,
                 EnforceUniqueVote = EnforceUniqueVote,
-                Id = Id,
+                //Id = Id, Omitted, ID is set internally, not by a user
                 IsClosed = IsClosed,
                 MaxVotesAllowed = MaxVotesAllowed,
                 Name = Name,

Assets/Plugins/StreamChat/Core/StatefulModels/StreamPoll.cs

@@ -114,8 +114,9 @@ public async Task UpdateAsync(StreamUpdatePollRequest updateRequest)
             StreamAsserts.AssertNotNull(updateRequest, nameof(updateRequest));
 
             var requestDto = updateRequest.TrySaveToDto();
+            requestDto.Id = Id;
 
-            var response = await LowLevelClient.InternalPollsApi.UpdatePollAsync(Id, requestDto);
+            var response = await LowLevelClient.InternalPollsApi.UpdatePollAsync(requestDto);
 
             this.TryUpdateFromDto(response.Poll, Cache);
         }
@@ -146,7 +147,13 @@ public async Task<StreamPollOption> AddOptionAsync(string text)
 
             var response = await LowLevelClient.InternalPollsApi.CreatePollOptionAsync(Id, request);
 
-            return new StreamPollOption().TryLoadFromDto<PollOptionResponseDataInternalDTO, StreamPollOption>(response.PollOption, Cache);
+            var newOption = new StreamPollOption().TryLoadFromDto<PollOptionResponseDataInternalDTO, StreamPollOption>(response.PollOption, Cache);
+            
+            // The response does not return the full poll, so we need to fetch the latest state
+            var pollResponseDto = await LowLevelClient.InternalPollsApi.GetPollAsync(Id);
+            this.TryUpdateFromDto(pollResponseDto.Poll, Cache);
+
+            return newOption;
         }
 
         public async Task<StreamPollOption> UpdateOptionAsync(string optionId, string text)