Mege Develop (#36)

Merge Develop
S3bt3r · Oct 25, 2018 · 4ff6421 · 4ff6421
1 parent 3c18840
commit 4ff6421
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 11 deletions.
diff --git a/src/Zammad.Client/GroupClient.cs b/src/Zammad.Client/GroupClient.cs
@@ -23,7 +23,7 @@ public Task<IList<Group>> GetGroupListAsync()
 
         public Task<IList<Group>> GetGroupListAsync(int page, int count)
         {
-            return GetAsync<IList<Group>>("/api/v1/groups", $"page={page},per_page={count}");
+            return GetAsync<IList<Group>>("/api/v1/groups", $"page={page}&per_page={count}");
         }
 
         public Task<Group> GetGroupAsync(int id)

diff --git a/src/Zammad.Client/OnlineNotificationClient.cs b/src/Zammad.Client/OnlineNotificationClient.cs
@@ -23,7 +23,7 @@ public Task<IList<OnlineNotification>> GetOnlineNotificationListAsync()
 
         public Task<IList<OnlineNotification>> GetOnlineNotificationListAsync(int page, int count)
         {
-            return GetAsync<IList<OnlineNotification>>("/api/v1/online_notifications", $"page={page},per_page={count}");
+            return GetAsync<IList<OnlineNotification>>("/api/v1/online_notifications", $"page={page}&per_page={count}");
         }
 
         public Task<OnlineNotification> GetOnlineNotificationAsync(int id)

diff --git a/src/Zammad.Client/OrganizationClient.cs b/src/Zammad.Client/OrganizationClient.cs
@@ -23,7 +23,7 @@ public Task<IList<Organization>> GetOrganizationListAsync()
 
         public Task<IList<Organization>> GetOrganizationListAsync(int page, int count)
         {
-            return GetAsync<IList<Organization>>("/api/v1/organizations", $"page={page},per_page={count}");
+            return GetAsync<IList<Organization>>("/api/v1/organizations", $"page={page}&per_page={count}");
         }
 
         public Task<IList<Organization>> SearchOrganizationAsync(string query, int limit)

diff --git a/src/Zammad.Client/Resources/Internal/StringTagList.cs b/src/Zammad.Client/Resources/Internal/StringTagList.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Zammad.Client.Resources.Internal
+{
+    [JsonObject]
+    public class StringTagList
+    {
+        [JsonProperty("tags")]
+        public IList<string> Tags { get; set; } = new List<string>();
+    }
+}
diff --git a/src/Zammad.Client/Services/ITagService.cs b/src/Zammad.Client/Services/ITagService.cs
@@ -6,7 +6,7 @@ namespace Zammad.Client.Services
 {
     public interface ITagService
     {
-        Task<IList<Tag>> GetTagListAsync(string objectName, int objectId);
+        Task<IList<string>> GetTagListAsync(string objectName, int objectId);
         Task<IList<Tag>> SearchTagAsync(string term);
         Task<bool> AddTagAsync(string objectName, int objectId, string tagName);
         Task<bool> RemoveTagAsync(string objectName, int objectId, string tagName);

diff --git a/src/Zammad.Client/TagClient.cs b/src/Zammad.Client/TagClient.cs
@@ -17,9 +17,9 @@ public TagClient(ZammadAccount account)
 
         #region ITagService
 
-        public async Task<IList<Tag>> GetTagListAsync(string objectName, int objectId)
+        public async Task<IList<string>> GetTagListAsync(string objectName, int objectId)
         {
-            var tagList = await GetAsync<TagList>("/api/v1/tags", $"object={objectName}&o_id={objectId}");
+            var tagList = await GetAsync<StringTagList>("/api/v1/tags", $"object={objectName}&o_id={objectId}");
             return tagList.Tags;
         }
 

diff --git a/src/Zammad.Client/TicketClient.cs b/src/Zammad.Client/TicketClient.cs
@@ -25,7 +25,7 @@ public Task<IList<Ticket>> GetTicketListAsync()
 
         public Task<IList<Ticket>> GetTicketListAsync(int page, int count)
         {
-            return GetAsync<IList<Ticket>>("/api/v1/tickets", $"page={page},per_page={count}");
+            return GetAsync<IList<Ticket>>("/api/v1/tickets", $"page={page}&per_page={count}");
         }
 
         public Task<IList<Ticket>> SearchTicketAsync(string query, int limit)
@@ -64,7 +64,7 @@ public Task<IList<TicketArticle>> GetTicketArticleListAsync()
 
         public Task<IList<TicketArticle>> GetTicketArticleListAsync(int page, int count)
         {
-            return GetAsync<IList<TicketArticle>>("/api/v1/ticket_articles", $"page={page},per_page={count}");
+            return GetAsync<IList<TicketArticle>>("/api/v1/ticket_articles", $"page={page}&per_page={count}");
         }
 
         public Task<IList<TicketArticle>> GetTicketArticleListForTicketAsync(int ticketId)
@@ -98,7 +98,7 @@ public Task<IList<TicketPriority>> GetTicketPriorityListAsync()
 
         public Task<IList<TicketPriority>> GetTicketPriorityListAsync(int page, int count)
         {
-            return GetAsync<IList<TicketPriority>>("/api/v1/ticket_priorities", $"page={page},per_page={count}");
+            return GetAsync<IList<TicketPriority>>("/api/v1/ticket_priorities", $"page={page}&per_page={count}");
         }
 
         public Task<TicketPriority> GetTicketPriorityAsync(int id)
@@ -132,7 +132,7 @@ public Task<IList<TicketState>> GetTicketStateListAsync()
 
         public Task<IList<TicketState>> GetTicketStateListAsync(int page, int count)
         {
-            return GetAsync<IList<TicketState>>("/api/v1/ticket_states", $"page={page},per_page={count}");
+            return GetAsync<IList<TicketState>>("/api/v1/ticket_states", $"page={page}&per_page={count}");
         }
 
         public Task<TicketState> GetTicketStateAsync(int id)

diff --git a/src/Zammad.Client/UserClient.cs b/src/Zammad.Client/UserClient.cs
@@ -28,7 +28,7 @@ public Task<IList<User>> GetUserListAsync()
 
         public Task<IList<User>> GetUserListAsync(int page, int count)
         {
-            return GetAsync<IList<User>>("/api/v1/users", $"page={page},per_page={count}");
+            return GetAsync<IList<User>>("/api/v1/users", $"page={page}&per_page={count}");
         }
 
         public Task<IList<User>> SearchUserAsync(string query, int limit)

diff --git a/src/Zammad.Client/ZammadAccount.cs b/src/Zammad.Client/ZammadAccount.cs
@@ -146,6 +146,15 @@ public OrganizationClient CreateOrganizationClient()
             return new OrganizationClient(this);
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TagClient"/> class.
+        /// </summary>
+        /// <returns>A new instance of the <see cref="TagClient"/> class.</returns>
+        public TagClient CreateTagClient()
+        {
+            return new TagClient(this);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TicketClient"/> class.
         /// </summary>

diff --git a/test/Zammad.Client.IntegrationTests/TagClientTest.cs b/test/Zammad.Client.IntegrationTests/TagClientTest.cs
@@ -0,0 +1,19 @@
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Zammad.Client.IntegrationTests
+{
+    [TestCaseOrderer("Zammad.Client.IntegrationTests.TestOrderer", "Zammad.Client.IntegrationTests")]
+    public class TagClientTest
+    {
+        [Fact, Order(TestOrder.TagGetTagList)]
+        public async Task Tag_TagGetTagList_Test()
+        {
+            var account = TestHelper.CreateTestAccount();
+            var client = account.CreateTagClient();
+
+            var tagList = await client.GetTagListAsync("Ticket", 1);
+            Assert.NotNull(tagList);
+        }
+    }
+}
diff --git a/test/Zammad.Client.IntegrationTests/TestOrder.cs b/test/Zammad.Client.IntegrationTests/TestOrder.cs
@@ -14,5 +14,7 @@ public class TestOrder
 
         public const int TicketCreate = OrganizationDelete + 1;
         public const int TicketSearch = TicketCreate + 1;
+
+        public const int TagGetTagList = TicketSearch + 1;
     }
 }