Add Stream prefix to models used by the state layer for consistency + cleanup

sierpinskid · sierpinskid · commit 9c3520d98f09 · 2024-09-03T09:47:03.000+02:00
diff --git a/Assets/Plugins/StreamChat/Core/IStreamChatClient.cs b/Assets/Plugins/StreamChat/Core/IStreamChatClient.cs
@@ -256,7 +256,7 @@ Task<StreamDeleteChannelsResponse> DeleteMultipleChannelsAsync(IEnumerable<IStre
         /// <summary>
         /// Get current state of unread counts for the user. Unread counts mean how many messages and threads are unread in the channels and threads the user is participating in
         /// </summary>
-        /// <returns><see cref="CurrentUnreadCounts"/></returns>
-        Task<CurrentUnreadCounts> GetLatestUnreadCountsAsync();
+        /// <returns><see cref="StreamCurrentUnreadCounts"/></returns>
+        Task<StreamCurrentUnreadCounts> GetLatestUnreadCountsAsync();
     }
 }
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/API/ChannelApi.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/API/ChannelApi.cs
@@ -148,10 +148,10 @@ public async Task<SyncResponse> SyncAsync(SyncRequest syncRequest)
             return dto.ToDomain<SyncResponseInternalDTO, SyncResponse>();
         }
         
-        public async Task<CurrentUnreadCounts> GetUnreadCountsAsync()
+        public async Task<StreamCurrentUnreadCounts> GetUnreadCountsAsync()
         {
             var dto = await _internalChannelApi.GetUnreadCountsAsync();
-            return dto.ToDomain<WrappedUnreadCountsResponseInternalDTO, CurrentUnreadCounts>();
+            return dto.ToDomain<WrappedUnreadCountsResponseInternalDTO, StreamCurrentUnreadCounts>();
         }
 
         private readonly IInternalChannelApi _internalChannelApi;
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/API/DeviceApi.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/API/DeviceApi.cs
@@ -23,10 +23,10 @@ public async Task<ApiResponse> AddDeviceAsync(CreateDeviceRequest device)
             return dto.ToDomain<ResponseInternalDTO, ApiResponse>();
         }
 
-        public async Task<ListDevicesResponse> ListDevicesAsync(string userId)
+        public async Task<StreamListDevicesResponse> ListDevicesAsync(string userId)
         {
             var dto = await _internalDeviceApi.ListDevicesAsync(userId);
-            return dto.ToDomain<ListDevicesResponseInternalDTO, ListDevicesResponse>();
+            return dto.ToDomain<ListDevicesResponseInternalDTO, StreamListDevicesResponse>();
         }
 
 
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/API/IChannelApi.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/API/IChannelApi.cs
@@ -155,6 +155,6 @@ Task<MarkReadResponse> MarkReadAsync(string channelType, string channelId,
         //StreamTodo: perhaps we can skip this declaration and use the Internal one directly
         Task<SyncResponse> SyncAsync(SyncRequest syncRequest);
 
-        Task<CurrentUnreadCounts> GetUnreadCountsAsync();
+        Task<StreamCurrentUnreadCounts> GetUnreadCountsAsync();
     }
 }
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/API/IDeviceApi.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/API/IDeviceApi.cs
@@ -24,7 +24,7 @@ public interface IDeviceApi
         /// Provides a list of all devices associated with a user.
         /// </summary>
         /// <remarks>https://getstream.io/chat/docs/unity/push_devices/?language=unity</remarks>
-        Task<ListDevicesResponse> ListDevicesAsync(string userId);
+        Task<StreamListDevicesResponse> ListDevicesAsync(string userId);
 
         /// <summary>
         /// <para>Removes a device.</para>
diff --git a/Assets/Plugins/StreamChat/Core/Models/OperationType.cs b/Assets/Plugins/StreamChat/Core/Models/OperationType.cs
@@ -1,4 +1,4 @@
-﻿namespace StreamChat.Core
+﻿namespace StreamChat.Core.Models
 {
     public enum OperationType
     {
diff --git a/Assets/Plugins/StreamChat/Core/Models/OperationType.cs.meta b/Assets/Plugins/StreamChat/Core/Models/OperationType.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamChannelTypeUnreadCounts.cs b/Assets/Plugins/StreamChat/Core/Responses/StreamChannelTypeUnreadCounts.cs
@@ -3,15 +3,15 @@
 
 namespace StreamChat.Core.Responses
 {
-    public sealed class ChannelTypeUnreadCounts  : ILoadableFrom<UnreadCountsChannelTypeInternalDTO, ChannelTypeUnreadCounts>
+    public sealed class StreamChannelTypeUnreadCounts  : ILoadableFrom<UnreadCountsChannelTypeInternalDTO, StreamChannelTypeUnreadCounts>
     {
         public int ChannelCount { get; private set; }
 
         public ChannelType ChannelType { get; private set; }
 
         public int UnreadCount { get; private set; }
         
-        ChannelTypeUnreadCounts ILoadableFrom<UnreadCountsChannelTypeInternalDTO, ChannelTypeUnreadCounts>.LoadFromDto(UnreadCountsChannelTypeInternalDTO dto)
+        StreamChannelTypeUnreadCounts ILoadableFrom<UnreadCountsChannelTypeInternalDTO, StreamChannelTypeUnreadCounts>.LoadFromDto(UnreadCountsChannelTypeInternalDTO dto)
         {
             ChannelCount = dto.ChannelCount;
             ChannelType = new ChannelType(dto.ChannelType);
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamChannelTypeUnreadCounts.cs.meta b/Assets/Plugins/StreamChat/Core/Responses/StreamChannelTypeUnreadCounts.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamChannelUnreadCounts.cs b/Assets/Plugins/StreamChat/Core/Responses/StreamChannelUnreadCounts.cs
@@ -3,7 +3,7 @@
 
 namespace StreamChat.Core.Responses
 {
-    public sealed class ChannelUnreadCounts  : ILoadableFrom<UnreadCountsChannelInternalDTO, ChannelUnreadCounts>
+    public sealed class StreamChannelUnreadCounts  : ILoadableFrom<UnreadCountsChannelInternalDTO, StreamChannelUnreadCounts>
     {
         /// <summary>
         /// CID of the channel
@@ -20,7 +20,7 @@ public sealed class ChannelUnreadCounts  : ILoadableFrom<UnreadCountsChannelInte
         /// </summary>
         public int UnreadCount { get; private set; }
         
-        ChannelUnreadCounts ILoadableFrom<UnreadCountsChannelInternalDTO, ChannelUnreadCounts>.LoadFromDto(UnreadCountsChannelInternalDTO dto)
+        StreamChannelUnreadCounts ILoadableFrom<UnreadCountsChannelInternalDTO, StreamChannelUnreadCounts>.LoadFromDto(UnreadCountsChannelInternalDTO dto)
         {
             ChannelCid = dto.ChannelId;
             LastRead = dto.LastRead;
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamChannelUnreadCounts.cs.meta b/Assets/Plugins/StreamChat/Core/Responses/StreamChannelUnreadCounts.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamCurrentUnreadCounts.cs b/Assets/Plugins/StreamChat/Core/Responses/StreamCurrentUnreadCounts.cs
@@ -8,22 +8,22 @@ namespace StreamChat.Core.Responses
     /// <summary>
     /// Represents the current state of unread counts for the user. Unread counts mean how many messages and threads are unread in the channels and threads the user is participating in
     /// </summary>
-    public sealed class CurrentUnreadCounts : ILoadableFrom<WrappedUnreadCountsResponseInternalDTO, CurrentUnreadCounts>
+    public sealed class StreamCurrentUnreadCounts : ILoadableFrom<WrappedUnreadCountsResponseInternalDTO, StreamCurrentUnreadCounts>
     {
         /// <summary>
         /// Unread status grouped by <see cref="ChannelType"/>. Each entry represents a channel type with unread messages among all channels of that type
         /// </summary>
-        public IReadOnlyList<ChannelTypeUnreadCounts> UnreadChannelsByType => _unreadChannelsByType;
+        public IReadOnlyList<StreamChannelTypeUnreadCounts> UnreadChannelsByType => _unreadChannelsByType;
         
         /// <summary>
         /// Unread status per channel. Each entry represents a channel with unread messages
         /// </summary>
-        public IReadOnlyList<ChannelUnreadCounts> UnreadChannels => _unreadChannels;
+        public IReadOnlyList<StreamChannelUnreadCounts> UnreadChannels => _unreadChannels;
         
         /// <summary>
         /// Unread status per thread. Each entry represents a thread with unread messages
         /// </summary>
-        public IReadOnlyList<ThreadUnreadCounts> UnreadThreads => _unreadThreads;
+        public IReadOnlyList<StreamThreadUnreadCounts> UnreadThreads => _unreadThreads;
 
         /// <summary>
         /// Total unread messages count
@@ -35,7 +35,7 @@ public sealed class CurrentUnreadCounts : ILoadableFrom<WrappedUnreadCountsRespo
         /// </summary>
         public int TotalUnreadThreadsCount { get; private set; }
 
-        CurrentUnreadCounts ILoadableFrom<WrappedUnreadCountsResponseInternalDTO, CurrentUnreadCounts>.LoadFromDto(WrappedUnreadCountsResponseInternalDTO dto)
+        StreamCurrentUnreadCounts ILoadableFrom<WrappedUnreadCountsResponseInternalDTO, StreamCurrentUnreadCounts>.LoadFromDto(WrappedUnreadCountsResponseInternalDTO dto)
         {
             _unreadChannelsByType = _unreadChannelsByType.TryLoadFromDtoCollection(dto.ChannelType);
             _unreadChannels = _unreadChannels.TryLoadFromDtoCollection(dto.Channels);
@@ -47,8 +47,8 @@ CurrentUnreadCounts ILoadableFrom<WrappedUnreadCountsResponseInternalDTO, Curren
             return this;
         }
         
-        private List<ChannelTypeUnreadCounts> _unreadChannelsByType = new List<ChannelTypeUnreadCounts>();
-        private List<ChannelUnreadCounts> _unreadChannels = new List<ChannelUnreadCounts>();
-        private List<ThreadUnreadCounts> _unreadThreads = new List<ThreadUnreadCounts>();
+        private List<StreamChannelTypeUnreadCounts> _unreadChannelsByType = new List<StreamChannelTypeUnreadCounts>();
+        private List<StreamChannelUnreadCounts> _unreadChannels = new List<StreamChannelUnreadCounts>();
+        private List<StreamThreadUnreadCounts> _unreadThreads = new List<StreamThreadUnreadCounts>();
     }
 }
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamCurrentUnreadCounts.cs.meta b/Assets/Plugins/StreamChat/Core/Responses/StreamCurrentUnreadCounts.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamListDevicesResponse.cs b/Assets/Plugins/StreamChat/Core/Responses/StreamListDevicesResponse.cs
@@ -6,7 +6,7 @@
 
 namespace StreamChat.Core.Responses
 {
-    public partial class ListDevicesResponse : ResponseObjectBase, ILoadableFrom<ListDevicesResponseInternalDTO, ListDevicesResponse>
+    public partial class StreamListDevicesResponse : ResponseObjectBase, ILoadableFrom<ListDevicesResponseInternalDTO, StreamListDevicesResponse>
     {
         /// <summary>
         /// List of devices
@@ -18,7 +18,7 @@ public partial class ListDevicesResponse : ResponseObjectBase, ILoadableFrom<Lis
         /// </summary>
         public string Duration { get; set; }
 
-        ListDevicesResponse ILoadableFrom<ListDevicesResponseInternalDTO, ListDevicesResponse>.LoadFromDto(ListDevicesResponseInternalDTO dto)
+        StreamListDevicesResponse ILoadableFrom<ListDevicesResponseInternalDTO, StreamListDevicesResponse>.LoadFromDto(ListDevicesResponseInternalDTO dto)
         {
             Devices = Devices.TryLoadFromDtoCollection(dto.Devices);
             Duration = dto.Duration;
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamListDevicesResponse.cs.meta b/Assets/Plugins/StreamChat/Core/Responses/StreamListDevicesResponse.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamThreadUnreadCounts.cs b/Assets/Plugins/StreamChat/Core/Responses/StreamThreadUnreadCounts.cs
@@ -3,7 +3,7 @@
 
 namespace StreamChat.Core.Responses
 {
-    public sealed class ThreadUnreadCounts  : ILoadableFrom<UnreadCountsThreadInternalDTO, ThreadUnreadCounts>
+    public sealed class StreamThreadUnreadCounts  : ILoadableFrom<UnreadCountsThreadInternalDTO, StreamThreadUnreadCounts>
     {
         public System.DateTimeOffset LastRead { get; private set; }
 
@@ -13,7 +13,7 @@ public sealed class ThreadUnreadCounts  : ILoadableFrom<UnreadCountsThreadIntern
 
         public int UnreadCount { get; private set; }
         
-        ThreadUnreadCounts ILoadableFrom<UnreadCountsThreadInternalDTO, ThreadUnreadCounts>.LoadFromDto(UnreadCountsThreadInternalDTO dto)
+        StreamThreadUnreadCounts ILoadableFrom<UnreadCountsThreadInternalDTO, StreamThreadUnreadCounts>.LoadFromDto(UnreadCountsThreadInternalDTO dto)
         {
             LastRead = dto.LastRead;
             LastReadMessageId = dto.LastReadMessageId;
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamThreadUnreadCounts.cs.meta b/Assets/Plugins/StreamChat/Core/Responses/StreamThreadUnreadCounts.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/StreamChatClient.cs b/Assets/Plugins/StreamChat/Core/StreamChatClient.cs
@@ -215,10 +215,10 @@ public Task DisconnectUserAsync()
             return InternalLowLevelClient.DisconnectAsync(permanent: true);
         }
 
-        public async Task<CurrentUnreadCounts> GetLatestUnreadCountsAsync()
+        public async Task<StreamCurrentUnreadCounts> GetLatestUnreadCountsAsync()
         {
             var dto = await InternalLowLevelClient.InternalChannelApi.GetUnreadCountsAsync();
-            var response = dto.ToDomain<WrappedUnreadCountsResponseInternalDTO, CurrentUnreadCounts>();
+            var response = dto.ToDomain<WrappedUnreadCountsResponseInternalDTO, StreamCurrentUnreadCounts>();
             
             _localUserData.TryUpdateFromDto<WrappedUnreadCountsResponseInternalDTO, StreamLocalUserData>(dto, _cache);
 
diff --git a/Assets/Plugins/StreamChat/Tests/StatefulClient/ChannelMembersTests.cs b/Assets/Plugins/StreamChat/Tests/StatefulClient/ChannelMembersTests.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
 using StreamChat.Core;
+using StreamChat.Core.Models;
 using StreamChat.Core.QueryBuilders.Filters;
 using StreamChat.Core.QueryBuilders.Filters.Users;
 using StreamChat.Core.Requests;

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ Task<StreamDeleteChannelsResponse> DeleteMultipleChannelsAsync(IEnumerable<IStre`
`256`	`256`	`/// <summary>`
`257`	`257`	`/// Get current state of unread counts for the user. Unread counts mean how many messages and threads are unread in the channels and threads the user is participating in`
`258`	`258`	`/// </summary>`
`259`		`- /// <returns><see cref="CurrentUnreadCounts"/></returns>`
`260`		`- Task<CurrentUnreadCounts> GetLatestUnreadCountsAsync();`
	`259`	`+ /// <returns><see cref="StreamCurrentUnreadCounts"/></returns>`
	`260`	`+ Task<StreamCurrentUnreadCounts> GetLatestUnreadCountsAsync();`
`261`	`261`	`}`
`262`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,10 +148,10 @@ public async Task<SyncResponse> SyncAsync(SyncRequest syncRequest)`
`148`	`148`	`return dto.ToDomain<SyncResponseInternalDTO, SyncResponse>();`
`149`	`149`	`}`
`150`	`150`
`151`		`- public async Task<CurrentUnreadCounts> GetUnreadCountsAsync()`
	`151`	`+ public async Task<StreamCurrentUnreadCounts> GetUnreadCountsAsync()`
`152`	`152`	`{`
`153`	`153`	`var dto = await _internalChannelApi.GetUnreadCountsAsync();`
`154`		`- return dto.ToDomain<WrappedUnreadCountsResponseInternalDTO, CurrentUnreadCounts>();`
	`154`	`+ return dto.ToDomain<WrappedUnreadCountsResponseInternalDTO, StreamCurrentUnreadCounts>();`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`private readonly IInternalChannelApi _internalChannelApi;`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ public async Task<ApiResponse> AddDeviceAsync(CreateDeviceRequest device)`
`23`	`23`	`return dto.ToDomain<ResponseInternalDTO, ApiResponse>();`
`24`	`24`	`}`
`25`	`25`
`26`		`- public async Task<ListDevicesResponse> ListDevicesAsync(string userId)`
	`26`	`+ public async Task<StreamListDevicesResponse> ListDevicesAsync(string userId)`
`27`	`27`	`{`
`28`	`28`	`var dto = await _internalDeviceApi.ListDevicesAsync(userId);`
`29`		`- return dto.ToDomain<ListDevicesResponseInternalDTO, ListDevicesResponse>();`
	`29`	`+ return dto.ToDomain<ListDevicesResponseInternalDTO, StreamListDevicesResponse>();`
`30`	`30`	`}`
`31`	`31`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,6 @@ Task<MarkReadResponse> MarkReadAsync(string channelType, string channelId,`
`155`	`155`	`//StreamTodo: perhaps we can skip this declaration and use the Internal one directly`
`156`	`156`	`Task<SyncResponse> SyncAsync(SyncRequest syncRequest);`
`157`	`157`
`158`		`- Task<CurrentUnreadCounts> GetUnreadCountsAsync();`
	`158`	`+ Task<StreamCurrentUnreadCounts> GetUnreadCountsAsync();`
`159`	`159`	`}`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace StreamChat.Core`
	`1`	`+namespace StreamChat.Core.Models`
`2`	`2`	`{`
`3`	`3`	`public enum OperationType`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,15 @@`
`3`	`3`
`4`	`4`	`namespace StreamChat.Core.Responses`
`5`	`5`	`{`
`6`		`- public sealed class ChannelTypeUnreadCounts : ILoadableFrom<UnreadCountsChannelTypeInternalDTO, ChannelTypeUnreadCounts>`
	`6`	`+ public sealed class StreamChannelTypeUnreadCounts : ILoadableFrom<UnreadCountsChannelTypeInternalDTO, StreamChannelTypeUnreadCounts>`
`7`	`7`	`{`
`8`	`8`	`public int ChannelCount { get; private set; }`
`9`	`9`
`10`	`10`	`public ChannelType ChannelType { get; private set; }`
`11`	`11`
`12`	`12`	`public int UnreadCount { get; private set; }`
`13`	`13`
`14`		`- ChannelTypeUnreadCounts ILoadableFrom<UnreadCountsChannelTypeInternalDTO, ChannelTypeUnreadCounts>.LoadFromDto(UnreadCountsChannelTypeInternalDTO dto)`
	`14`	`+ StreamChannelTypeUnreadCounts ILoadableFrom<UnreadCountsChannelTypeInternalDTO, StreamChannelTypeUnreadCounts>.LoadFromDto(UnreadCountsChannelTypeInternalDTO dto)`
`15`	`15`	`{`
`16`	`16`	`ChannelCount = dto.ChannelCount;`
`17`	`17`	`ChannelType = new ChannelType(dto.ChannelType);`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace StreamChat.Core.Responses`
`5`	`5`	`{`
`6`		`- public sealed class ChannelUnreadCounts : ILoadableFrom<UnreadCountsChannelInternalDTO, ChannelUnreadCounts>`
	`6`	`+ public sealed class StreamChannelUnreadCounts : ILoadableFrom<UnreadCountsChannelInternalDTO, StreamChannelUnreadCounts>`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// CID of the channel`
`@@ -20,7 +20,7 @@ public sealed class ChannelUnreadCounts : ILoadableFrom<UnreadCountsChannelInte`
`20`	`20`	`/// </summary>`
`21`	`21`	`public int UnreadCount { get; private set; }`
`22`	`22`
`23`		`- ChannelUnreadCounts ILoadableFrom<UnreadCountsChannelInternalDTO, ChannelUnreadCounts>.LoadFromDto(UnreadCountsChannelInternalDTO dto)`
	`23`	`+ StreamChannelUnreadCounts ILoadableFrom<UnreadCountsChannelInternalDTO, StreamChannelUnreadCounts>.LoadFromDto(UnreadCountsChannelInternalDTO dto)`
`24`	`24`	`{`
`25`	`25`	`ChannelCid = dto.ChannelId;`
`26`	`26`	`LastRead = dto.LastRead;`