From 5a61e90c4ed0936c3f05c2d87c4d21079ea40322 Mon Sep 17 00:00:00 2001
From: Gautam Sheth <gautamdsheth@outlook.com>
Date: Sun, 5 Jun 2022 23:38:01 +0300
Subject: [PATCH] Improve Graph methods

---
 .../Utilities/ServiceHealthUtility.cs         | 42 +++----------------
 src/Commands/Utilities/TeamsUtility.cs        |  2 +-
 2 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/src/Commands/Utilities/ServiceHealthUtility.cs b/src/Commands/Utilities/ServiceHealthUtility.cs
index 84d0e6550..3f7f9612f 100644
--- a/src/Commands/Utilities/ServiceHealthUtility.cs
+++ b/src/Commands/Utilities/ServiceHealthUtility.cs
@@ -19,18 +19,8 @@ internal static class ServiceHealthUtility
         /// <returns>List with <see cref="ServiceUpdateMessage"> objects</returns>
         public static async Task<IEnumerable<ServiceUpdateMessage>> GetServiceUpdateMessagesAsync(HttpClient httpClient, string accessToken)
         {
-            var returnCollection = new List<ServiceUpdateMessage>();
-            var collection = await GraphHelper.GetAsync<RestResultCollection<ServiceUpdateMessage>>(httpClient, $"v1.0/admin/serviceAnnouncement/messages", accessToken);
-            if (collection != null && collection.Items.Any())
-            {
-                returnCollection = collection.Items.ToList();
-                while (!string.IsNullOrEmpty(collection.NextLink))
-                {
-                    collection = await GraphHelper.GetAsync<RestResultCollection<ServiceUpdateMessage>>(httpClient, collection.NextLink, accessToken);
-                    returnCollection.AddRange(collection.Items);
-                }
-            }
-            return returnCollection;
+            var collection = await GraphHelper.GetResultCollectionAsync<ServiceUpdateMessage>(httpClient, $"v1.0/admin/serviceAnnouncement/messages", accessToken);            
+            return collection;
         }
 
         /// <summary>
@@ -214,18 +204,8 @@ public static async Task<bool> SetServiceUpdateMessageAsNotfavoriteByIdAsync(str
         /// <returns>List with <see cref="ServiceHealthIssue"> objects</returns>
         public static async Task<IEnumerable<ServiceHealthIssue>> GetServiceHealthIssuesAsync(HttpClient httpClient, string accessToken)
         {
-            var returnCollection = new List<ServiceHealthIssue>();
-            var collection = await GraphHelper.GetAsync<RestResultCollection<ServiceHealthIssue>>(httpClient, $"v1.0/admin/serviceAnnouncement/issues", accessToken);
-            if (collection != null && collection.Items.Any())
-            {
-                returnCollection = collection.Items.ToList();
-                while (!string.IsNullOrEmpty(collection.NextLink))
-                {
-                    collection = await GraphHelper.GetAsync<RestResultCollection<ServiceHealthIssue>>(httpClient, collection.NextLink, accessToken);
-                    returnCollection.AddRange(collection.Items);
-                }
-            }
-            return returnCollection;
+            var collection = await GraphHelper.GetResultCollectionAsync<ServiceHealthIssue>(httpClient, $"v1.0/admin/serviceAnnouncement/issues", accessToken);            
+            return collection;
         }
 
         /// <summary>
@@ -253,18 +233,8 @@ public static async Task<ServiceHealthIssue> GetServiceHealthIssueByIdAsync(stri
         /// <returns>List with <see cref="ServiceHealthCurrent"> objects</returns>
         public static async Task<IEnumerable<ServiceHealthCurrent>> GetServiceCurrentHealthAsync(HttpClient httpClient, string accessToken)
         {
-            var returnCollection = new List<ServiceHealthCurrent>();
-            var collection = await GraphHelper.GetAsync<RestResultCollection<ServiceHealthCurrent>>(httpClient, $"v1.0/admin/serviceAnnouncement/healthOverviews", accessToken);
-            if (collection != null && collection.Items.Any())
-            {
-                returnCollection = collection.Items.ToList();
-                while (!string.IsNullOrEmpty(collection.NextLink))
-                {
-                    collection = await GraphHelper.GetAsync<RestResultCollection<ServiceHealthCurrent>>(httpClient, collection.NextLink, accessToken);
-                    returnCollection.AddRange(collection.Items);
-                }
-            }
-            return returnCollection;
+            var collection = await GraphHelper.GetResultCollectionAsync<ServiceHealthCurrent>(httpClient, $"v1.0/admin/serviceAnnouncement/healthOverviews", accessToken);            
+            return collection;
         }
 
         /// <summary>
diff --git a/src/Commands/Utilities/TeamsUtility.cs b/src/Commands/Utilities/TeamsUtility.cs
index ced2b994d..47a6d3f4d 100644
--- a/src/Commands/Utilities/TeamsUtility.cs
+++ b/src/Commands/Utilities/TeamsUtility.cs
@@ -674,7 +674,7 @@ public static async Task<TeamChannelMessageReply> GetMessageReplyAsync(HttpClien
 
         public static async Task<TeamChannel> UpdateChannelAsync(HttpClient httpClient, string accessToken, string groupId, string channelId, TeamChannel channel)
         {
-            return await GraphHelper.PatchAsync(httpClient, accessToken, $"beta/teams/{groupId}/channels/{channelId}", channel);
+            return await GraphHelper.PatchAsync(httpClient, accessToken, $"v1.0/teams/{groupId}/channels/{channelId}", channel);
         }
         #endregion