Tests for ToValueString util

ubisoft · Jan 20, 2025 · 10fc71d · 10fc71d
1 parent e0fa60d
commit 10fc71d
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 24 deletions.
diff --git a/NGitLab.Mock/Clients/ProjectClient.cs b/NGitLab.Mock/Clients/ProjectClient.cs
@@ -421,7 +421,7 @@ public UploadedProjectFile UploadFile(string id, FormDataContent data)
         throw new NotImplementedException();
     }
 
-    public GitLabCollectionResponse<ProjectTemplate> GetProjectTemplatesAsync(ProjectId projectId, DynamicEnum<ProjectTemplateType> projectTemplateType)
+    public GitLabCollectionResponse<ProjectTemplate> GetProjectTemplatesAsync(ProjectId projectId, ProjectTemplateType projectTemplateType)
     {
         throw new NotImplementedException();
     }

diff --git a/NGitLab.Tests/Impl/UtilsTests.cs b/NGitLab.Tests/Impl/UtilsTests.cs
@@ -15,4 +15,13 @@ public void AddParameter_ConsidersEnumMemberAttribute(EventAction value, string
 
         Assert.That(url, Is.EqualTo($"{basePath}?event_action={expectedQueryParamValue}"));
     }
+
+    [TestCase(EventAction.PushedTo, "pushed to")]
+    [TestCase(EventAction.Accepted, "accepted")]
+    public void ToValueString_ConsidersEnumMemberAttribute(EventAction value, string expectedValueResult)
+    {
+        var valueMember = NGitLab.Impl.Utils.ToValueString(value);
+
+        Assert.That(valueMember, Is.EqualTo(expectedValueResult));
+    }
 }
diff --git a/NGitLab/IProjectClient.cs b/NGitLab/IProjectClient.cs
@@ -85,7 +85,7 @@ public interface IProjectClient
     /// <returns>All ancestor groups.</returns>
     GitLabCollectionResponse<Group> GetGroupsAsync(ProjectId projectId, ProjectGroupsQuery query);
 
-    GitLabCollectionResponse<ProjectTemplate> GetProjectTemplatesAsync(ProjectId projectId, DynamicEnum<ProjectTemplateType> projectTemplateType);
+    GitLabCollectionResponse<ProjectTemplate> GetProjectTemplatesAsync(ProjectId projectId, ProjectTemplateType projectTemplateType);
 
     Task<ProjectMergeRequestTemplate> GetProjectMergeRequestTemplateAsync(ProjectId projectId, string name, CancellationToken cancellationToken = default);
 

diff --git a/NGitLab/Impl/ProjectClient.cs b/NGitLab/Impl/ProjectClient.cs
@@ -178,15 +178,14 @@ public GitLabCollectionResponse<Group> GetGroupsAsync(ProjectId id, ProjectGroup
         return _api.Get().GetAllAsync<Group>(url);
     }
 
-    public GitLabCollectionResponse<ProjectTemplate> GetProjectTemplatesAsync(ProjectId projectId, DynamicEnum<ProjectTemplateType> projectTemplateType)
+    public GitLabCollectionResponse<ProjectTemplate> GetProjectTemplatesAsync(ProjectId projectId, ProjectTemplateType projectTemplateType)
     {
-        return _api.Get().GetAllAsync<ProjectTemplate>($"{Project.Url}/{projectId.ValueAsUriParameter()}/templates/{projectTemplateType.StringValue}");
+        return _api.Get().GetAllAsync<ProjectTemplate>($"{Project.Url}/{projectId.ValueAsUriParameter()}/templates/{Utils.ToValueString(projectTemplateType)}");
     }
 
     public Task<ProjectMergeRequestTemplate> GetProjectMergeRequestTemplateAsync(ProjectId projectId, string name, CancellationToken cancellationToken = default)
     {
-        var mergeRequestTemplateType = new DynamicEnum<ProjectTemplateType>(ProjectTemplateType.MergeRequests);
-        return _api.Get().ToAsync<ProjectMergeRequestTemplate>($"{Project.Url}/{projectId.ValueAsUriParameter()}/templates/{mergeRequestTemplateType.StringValue}/{name}", cancellationToken);
+        return _api.Get().ToAsync<ProjectMergeRequestTemplate>($"{Project.Url}/{projectId.ValueAsUriParameter()}/templates/{Utils.ToValueString(ProjectTemplateType.MergeRequests)}/{name}", cancellationToken);
     }
 
     private static string CreateGetGroupsUrl(ProjectId projectId, ProjectGroupsQuery query)

diff --git a/NGitLab/Impl/Utils.cs b/NGitLab/Impl/Utils.cs
@@ -9,27 +9,29 @@ namespace NGitLab.Impl;
 internal static class Utils
 {
     public static string AddParameter<T>(string url, string parameterName, T value)
+    {
+        return value is not null ? AddParameterInternal(url, parameterName, ToValueString(value)) : url;
+    }
+
+    public static string ToValueString<T>(T value)
     {
         if (value is null)
-            return url;
+            return string.Empty;
 
         var valueString = value.ToString();
         var type = Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T);
-        if (type.IsEnum)
-        {
-            var enumField = type.GetFields().FirstOrDefault(f => string.Equals(f.Name, valueString, StringComparison.Ordinal));
-            if (enumField is not null)
-            {
-                var enumMemberValue = enumField.GetCustomAttributes(typeof(EnumMemberAttribute), inherit: true)
-                    .Cast<EnumMemberAttribute>()
-                    .FirstOrDefault()?
-                    .Value;
-                if (enumMemberValue is not null)
-                    return AddParameterInternal(url, parameterName, enumMemberValue);
-            }
-        }
-
-        return AddParameterInternal(url, parameterName, valueString);
+        if (!type.IsEnum)
+            return valueString;
+
+        var enumField = type.GetFields().FirstOrDefault(f => string.Equals(f.Name, valueString, StringComparison.Ordinal));
+        if (enumField is null)
+            return valueString;
+
+        var enumMemberValue = enumField.GetCustomAttributes(typeof(EnumMemberAttribute), inherit: true)
+            .Cast<EnumMemberAttribute>()
+            .FirstOrDefault()?
+            .Value;
+        return enumMemberValue ?? valueString;
     }
 
     public static string AddParameter(string url, string parameterName, int? value)

diff --git a/NGitLab/PublicAPI.Unshipped.txt b/NGitLab/PublicAPI.Unshipped.txt
@@ -814,7 +814,7 @@ NGitLab.Impl.ProjectClient.GetForksAsync(string id, NGitLab.Models.ForkedProject
 NGitLab.Impl.ProjectClient.GetGroupsAsync(NGitLab.Models.ProjectId id, NGitLab.Models.ProjectGroupsQuery query) -> NGitLab.GitLabCollectionResponse<NGitLab.Models.Group>
 NGitLab.Impl.ProjectClient.GetLanguages(string id) -> System.Collections.Generic.Dictionary<string, double>
 NGitLab.Impl.ProjectClient.GetProjectMergeRequestTemplateAsync(NGitLab.Models.ProjectId projectId, string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<NGitLab.Models.ProjectMergeRequestTemplate>
-NGitLab.Impl.ProjectClient.GetProjectTemplatesAsync(NGitLab.Models.ProjectId projectId, NGitLab.DynamicEnum<NGitLab.Impl.ProjectTemplateType> projectTemplateType) -> NGitLab.GitLabCollectionResponse<NGitLab.Models.ProjectTemplate>
+NGitLab.Impl.ProjectClient.GetProjectTemplatesAsync(NGitLab.Models.ProjectId projectId, NGitLab.Impl.ProjectTemplateType projectTemplateType) -> NGitLab.GitLabCollectionResponse<NGitLab.Models.ProjectTemplate>
 NGitLab.Impl.ProjectClient.Owned.get -> System.Collections.Generic.IEnumerable<NGitLab.Models.Project>
 NGitLab.Impl.ProjectClient.ProjectClient(NGitLab.Impl.API api) -> void
 NGitLab.Impl.ProjectClient.this[long id].get -> NGitLab.Models.Project
@@ -1030,7 +1030,7 @@ NGitLab.IProjectClient.GetForksAsync(string id, NGitLab.Models.ForkedProjectQuer
 NGitLab.IProjectClient.GetGroupsAsync(NGitLab.Models.ProjectId projectId, NGitLab.Models.ProjectGroupsQuery query) -> NGitLab.GitLabCollectionResponse<NGitLab.Models.Group>
 NGitLab.IProjectClient.GetLanguages(string id) -> System.Collections.Generic.Dictionary<string, double>
 NGitLab.IProjectClient.GetProjectMergeRequestTemplateAsync(NGitLab.Models.ProjectId projectId, string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<NGitLab.Models.ProjectMergeRequestTemplate>
-NGitLab.IProjectClient.GetProjectTemplatesAsync(NGitLab.Models.ProjectId projectId, NGitLab.DynamicEnum<NGitLab.Impl.ProjectTemplateType> projectTemplateType) -> NGitLab.GitLabCollectionResponse<NGitLab.Models.ProjectTemplate>
+NGitLab.IProjectClient.GetProjectTemplatesAsync(NGitLab.Models.ProjectId projectId, NGitLab.Impl.ProjectTemplateType projectTemplateType) -> NGitLab.GitLabCollectionResponse<NGitLab.Models.ProjectTemplate>
 NGitLab.IProjectClient.Owned.get -> System.Collections.Generic.IEnumerable<NGitLab.Models.Project>
 NGitLab.IProjectClient.this[long id].get -> NGitLab.Models.Project
 NGitLab.IProjectClient.this[string fullName].get -> NGitLab.Models.Project