Merge pull request #181 from GetStream/PBE-5254-Convert-enums-in-generated-DTOs-from-the-OpenAPI-spec-to-custom-structs

Pbe 5254 convert enums in generated dt os from the open api spec to custom structs

Author: sierpinskid

.github/workflows/main.ci.cd.workflow.yml

@@ -126,7 +126,7 @@ jobs:
         with:
           customParameters: -streamBase64TestDataSet "${{ secrets.STREAM_AUTH_TEST_DATA_BASE64 }}" -testDataSetIndex ${{ env.SEQUENTIAL_INDEX }}
           customImage: ${{ env.DOCKER_TAG }}
-        timeout-minutes: 20
+        timeout-minutes: 40
         continue-on-error: true
 
       - name: Run Tests (Attempt 2)
@@ -140,7 +140,7 @@ jobs:
         with:
           customParameters: -streamBase64TestDataSet "${{ secrets.STREAM_AUTH_TEST_DATA_BASE64 }}" -testDataSetIndex ${{ env.SEQUENTIAL_INDEX }}
           customImage: ${{ env.DOCKER_TAG }}
-        timeout-minutes: 20
+        timeout-minutes: 50
         continue-on-error: true
 
       - name: Run Tests (Attempt 3)
@@ -154,7 +154,7 @@ jobs:
         with:
           customParameters: -streamBase64TestDataSet "${{ secrets.STREAM_AUTH_TEST_DATA_BASE64 }}" -testDataSetIndex ${{ env.SEQUENTIAL_INDEX }}
           customImage: ${{ env.DOCKER_TAG }}
-        timeout-minutes: 20
+        timeout-minutes: 60
         continue-on-error: true
 
       - name: Run Tests (Attempt 4)
@@ -168,7 +168,7 @@ jobs:
         with:
           customParameters: -streamBase64TestDataSet "${{ secrets.STREAM_AUTH_TEST_DATA_BASE64 }}" -testDataSetIndex ${{ env.SEQUENTIAL_INDEX }}
           customImage: ${{ env.DOCKER_TAG }}
-        timeout-minutes: 20
+        timeout-minutes: 60
         continue-on-error: true
 
       - name: Run Tests (Attempt 5)
@@ -182,7 +182,7 @@ jobs:
         with:
           customParameters: -streamBase64TestDataSet "${{ secrets.STREAM_AUTH_TEST_DATA_BASE64 }}" -testDataSetIndex ${{ env.SEQUENTIAL_INDEX }}
           customImage: ${{ env.DOCKER_TAG }}
-        timeout-minutes: 20
+        timeout-minutes: 60
 
       - name: Upload Test Results as Artifact
         uses: actions/upload-artifact@v4

Assets/Plugins/StreamChat/Core/Helpers/EnumeratedStructExt.cs

@@ -0,0 +1,30 @@
+using System;
+using StreamChat.Core.LowLevelClient;
+
+namespace StreamChat.Core.Helpers
+{
+    /// <summary>
+    /// Extensions for <see cref="IEnumeratedStruct{TType}"/>
+    /// </summary>
+    internal static class EnumeratedStructExt
+    {
+        public static TDomain? TryLoadNullableStructFromDto<TDomain, TDto>(this TDomain? domain, TDto? dto)
+            where TDomain : struct, IEquatable<TDomain>, ILoadableFrom<TDto, TDomain>
+            where TDto : struct, IEnumeratedStruct<TDto>
+        {
+            if (!dto.HasValue)
+            {
+                return null;
+            }
+
+            return domain?.LoadFromDto(dto.Value) ?? default(TDomain).LoadFromDto(dto.Value);
+        }
+        
+        public static TDTO? TrySaveNullableStructToDto<TDomain, TDTO>(this TDomain? domain)
+            where TDomain : struct, IEquatable<TDomain>, ISavableTo<TDTO>
+            where TDTO : struct, IEnumeratedStruct<TDTO>
+        {
+            return domain?.SaveToDto();
+        }
+    }
+}

Assets/Plugins/StreamChat/Core/Helpers/EnumeratedStructExt.cs.meta

@@ -1,4 +1,5 @@
 using System;
+using StreamChat.Core.LowLevelClient;
 
 namespace StreamChat.Core.Helpers
 {
@@ -7,24 +8,26 @@ namespace StreamChat.Core.Helpers
     /// </summary>
     internal static class ILoadableFromExt
     {
-        //StreamTodo: rename to TryCreateFromDto? It's misleading because it creates new instance which you need to replace
+        /// <summary>
+        /// Load domain object from the DTO. If the loadable is null, creates a new instance of the domain object.
+        /// </summary>
         public static TDomain TryLoadFromDto<TDto, TDomain>(this ILoadableFrom<TDto, TDomain> loadable, TDto dto)
-            where TDomain : class, ILoadableFrom<TDto, TDomain>, new()
+            where TDomain : ILoadableFrom<TDto, TDomain>, new()
         {
             if (dto == null)
             {
-                return null;
+                return default;
             }
 
-            return new TDomain().LoadFromDto(dto);
+            return loadable != null ? loadable.LoadFromDto(dto) : new TDomain().LoadFromDto(dto);
         }
 
         public static TDomain UpdateFromDto<TDto, TDomain>(this ILoadableFrom<TDto, TDomain> loadable, TDto dto)
-            where TDomain : class, ILoadableFrom<TDto, TDomain>, new()
+            where TDomain : ILoadableFrom<TDto, TDomain>, new()
         {
             if (dto == null)
             {
-                return null;
+                return default;
             }
 
             if (loadable == null)

Assets/Plugins/StreamChat/Core/Helpers/ILoadableFromExt.cs

@@ -8,7 +8,6 @@ namespace StreamChat.Core.Helpers
     internal static class ISavableToExt
     {
         public static TDto TrySaveToDto<TDto>(this ISavableTo<TDto> source)
-            where TDto : class
-            => source?.SaveToDto();
+            => source != default ? source.SaveToDto() : default;
     }
 }

Assets/Plugins/StreamChat/Core/Helpers/ISavableToExt.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();
     }
 }

Assets/Plugins/StreamChat/Core/ILoadableFrom.cs.meta

@@ -20,7 +20,7 @@ internal partial class NotificationChannelMutesUpdatedEventInternalDTO
         public System.DateTimeOffset CreatedAt { get; set; }
 
         [Newtonsoft.Json.JsonProperty("me", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
-        public OwnUserInternalDTO Me { get; set; }
+        public OwnUserInternalDTO Me { get; set; } = new OwnUserInternalDTO();
 
         [Newtonsoft.Json.JsonProperty("type", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string Type { get; set; } = "notification.channel_mutes_updated";

Assets/Plugins/StreamChat/Core/IStreamChatClient.cs

@@ -17,7 +17,7 @@ namespace StreamChat.Core.InternalDTO.Events
     /// The discriminator object for all websocket events, it maps events' payload to the final type
     /// </summary>
     [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.1.0.0 (NJsonSchema v11.0.2.0 (Newtonsoft.Json v13.0.0.0))")]
-    internal partial class AnyEventInternalDTO
+    internal partial class WebhookEventInternalDTO
     {
 
         private System.Collections.Generic.Dictionary<string, object> _additionalProperties;