Fix vod pagination #62

laurencee · Jan 1, 2021 · 30b2f56 · 30b2f56
1 parent 26ea5dc
commit 30b2f56
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/GlobalAssemblyInfo.cs b/GlobalAssemblyInfo.cs
@@ -22,5 +22,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.13.1.0")]
-[assembly: AssemblyFileVersion("2.13.1.0")]
+[assembly: AssemblyVersion("2.13.2.0")]
+[assembly: AssemblyFileVersion("2.13.2.0")]
diff --git a/Livestream.Monitor/Model/ApiClients/TwitchApiClient.cs b/Livestream.Monitor/Model/ApiClients/TwitchApiClient.cs
@@ -267,7 +267,8 @@ public async Task<List<VodDetails>> GetVods(VodQuery vodQuery)
             {
                 StreamId = vodQuery.StreamId,
                 Skip = vodQuery.Skip + vodQuery.Take,
-                Take = vodQuery.Take
+                Take = vodQuery.Take,
+                VodTypes = vodQuery.VodTypes
             };
             vodsPaginationKeyMap[nextPageKeyLookup] = videosRoot.Pagination.Cursor;
             var vods = videosRoot.Videos.Select(video =>

diff --git a/Livestream.Monitor/Model/ApiClients/VodQuery.cs b/Livestream.Monitor/Model/ApiClients/VodQuery.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using ExternalAPIs;
 
 namespace Livestream.Monitor.Model.ApiClients
@@ -26,13 +27,13 @@ public string StreamId
         /// <summary> 
         /// Arbitrary filtering for vod types. The available types are defined in the <see cref="IApiClient.VodTypes"/> property 
         /// </summary>
-        public List<string> VodTypes { get; } = new List<string>();
+        public List<string> VodTypes { get; set; } = new List<string>();
 
         public bool Equals(VodQuery other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
-            return base.Equals(other) && streamId == other.streamId && Equals(VodTypes, other.VodTypes);
+            return base.Equals(other) && streamId == other.streamId && VodTypes.SequenceEqual(other.VodTypes);
         }
 
         public override bool Equals(object obj)
@@ -49,7 +50,13 @@ public override int GetHashCode()
             {
                 int hashCode = base.GetHashCode();
                 hashCode = (hashCode * 397) ^ (streamId != null ? streamId.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (VodTypes != null ? VodTypes.GetHashCode() : 0);
+                if (VodTypes != null)
+                {
+                    foreach (var vodType in VodTypes)
+                    {
+                        hashCode = (hashCode * 397) ^ (vodType != null ? vodType.GetHashCode() : 0);
+                    }
+                }
                 return hashCode;
             }
         }