Use proper DI, cache service responses

Author: InfinityGhost

OpenTabletDriver.Web.Core/DependencyInjectionExtensions.cs

@@ -0,0 +1,22 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace OpenTabletDriver.Web.Core
+{
+    public static class DependencyInjectionExtensions
+    {
+        public static object CreateInstance(
+            this IServiceProvider provider,
+            Type instanceType,
+            params object[] parameters
+        )
+        {
+            return ActivatorUtilities.CreateInstance(provider, instanceType, parameters);
+        }
+
+        public static T CreateInstance<T>(this IServiceProvider provider, params object[] parameters)
+        {
+            return ActivatorUtilities.CreateInstance<T>(provider, parameters);
+        }
+    }
+}

OpenTabletDriver.Web.Core/GitHub/API/GitHubAssetGetResponse.cs

@@ -1,21 +1,34 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Octokit;
 using OpenTabletDriver.Web.Core.Contracts;
+using OpenTabletDriver.Web.Core.GitHub.Services;
+using OpenTabletDriver.Web.Core.Services;
 
-namespace OpenTabletDriver.Web.Core.GitHub.Services
+namespace OpenTabletDriver.Web.Core.GitHub
 {
     public class GitHubRelease : IRelease
     {
-        public GitHubRelease(Release release)
+        private readonly IServiceProvider serviceProvider;
+        private readonly IGitHubClient client;
+        private readonly IRepositoryService repositoryService;
+        private readonly Release release;
+
+        public GitHubRelease(
+            IServiceProvider serviceProvider,
+            IGitHubClient client,
+            IRepositoryService repositoryService,
+            Release release
+        )
         {
+            this.serviceProvider = serviceProvider;
+            this.client = client;
+            this.repositoryService = repositoryService;
             this.release = release;
         }
 
-        private Release release;
         private IEnumerable<ReleaseAsset> releaseAssets;
 
         public string Name => release.TagName;
@@ -26,14 +39,9 @@ public GitHubRelease(Release release)
 
         public async Task<IEnumerable<IReleaseAsset>> GetReleaseAssets()
         {
-            if (await GitHubCore.GetClient() is GitHubClient client)
-            {
-                var repo = await GitHubCore.GetRepository();
-                releaseAssets ??= await client.Repository.Release.GetAllAssets(repo.Id, release.Id);
-                return releaseAssets.Select(r => new GitHubReleaseAsset(r));
-            }
-
-            return Array.Empty<IReleaseAsset>();
+            var repo = await repositoryService.GetRepository();
+            releaseAssets ??= await client.Repository.Release.GetAllAssets(repo.Id, release.Id);
+            return releaseAssets.Select(r => serviceProvider.CreateInstance<GitHubReleaseAsset>(r));
         }
     }
 }

OpenTabletDriver.Web.Core/GitHub/API/GitHubAssetResponse.cs

@@ -1,19 +1,17 @@
-using System.IO;
-using System.Net.Http;
 using Octokit;
 using OpenTabletDriver.Web.Core.Contracts;
 
-namespace OpenTabletDriver.Web.Core.GitHub.Services
+namespace OpenTabletDriver.Web.Core.GitHub
 {
     public class GitHubReleaseAsset : IReleaseAsset
     {
+        private readonly ReleaseAsset asset;
+
         public GitHubReleaseAsset(ReleaseAsset asset)
         {
             this.asset = asset;
         }
 
-        private ReleaseAsset asset;
-
         public string FileName => asset.Name;
         public string Url => asset.BrowserDownloadUrl;
     }