Started implementing services

LANCommander/Controllers/GamesController.cs

@@ -11,6 +11,7 @@ using LANCommander.Data.Models;
 using Microsoft.AspNetCore.Authorization;
 using LANCommander.Services;
 using System.Drawing;
+using LANCommander.Models;
 
 namespace LANCommander.Controllers
 {
@@ -18,10 +19,18 @@ namespace LANCommander.Controllers
     public class GamesController : Controller
     {
         private readonly DatabaseContext Context;
+        private readonly GameService GameService;
+        private readonly CategoryService CategoryService;
+        private readonly TagService TagService;
+        private readonly GenreService GenreService;
 
-        public GamesController(DatabaseContext context)
+        public GamesController(DatabaseContext context, GameService gameService, CategoryService categoryService, TagService tagService, GenreService genreService)
         {
             Context = context;
+            GameService = gameService;
+            CategoryService = categoryService;
+            TagService = tagService;
+            GenreService = genreService;
         }
 
         // GET: Games

LANCommander/Program.cs

@@ -1,5 +1,6 @@
 using LANCommander.Data;
 using LANCommander.Data.Models;
+using LANCommander.Services;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
@@ -57,6 +58,13 @@ builder.Services.AddControllersWithViews().AddJsonOptions(x =>
     x.JsonSerializerOptions.ReferenceHandler = System.Text.Json.Serialization.ReferenceHandler.IgnoreCycles;
 });
 
+builder.Services.AddScoped<ArchiveService>();
+builder.Services.AddScoped<CategoryService>();
+builder.Services.AddScoped<GameService>();
+builder.Services.AddScoped<GenreService>();
+builder.Services.AddScoped<KeyService>();
+builder.Services.AddScoped<TagService>();
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.

LANCommander/Services/ArchiveService.cs

@@ -1,12 +1,18 @@
-using LANCommander.Models;
+using LANCommander.Data;
+using LANCommander.Data.Models;
+using LANCommander.Models;
 using System.IO.Compression;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
 namespace LANCommander.Services
 {
-    public static class ArchiveService
+    public class ArchiveService : BaseDatabaseService<Archive>
     {
+        public ArchiveService(DatabaseContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
+        {
+        }
+
         public static GameManifest ReadManifest(string objectKey)
         {
             var upload = Path.Combine("Upload", objectKey);

LANCommander/Services/BaseDatabaseService.cs

@@ -0,0 +1,69 @@
+using LANCommander.Data;
+using LANCommander.Data.Models;
+using System.Linq.Expressions;
+
+namespace LANCommander.Services
+{
+    public class BaseDatabaseService<T> where T : BaseModel
+    {
+        public DatabaseContext Context { get; set; }
+        public HttpContext HttpContext { get; set; }
+
+        public BaseDatabaseService(DatabaseContext dbContext, IHttpContextAccessor httpContextAccessor) {
+            Context = dbContext;
+            HttpContext = httpContextAccessor.HttpContext;
+        }
+
+        public ICollection<T> Get()
+        {
+            return Get(x => true).ToList();
+        }
+
+        public async Task<T> Get(Guid id)
+        {
+            using (var repo = new Repository<T>(Context, HttpContext))
+            {
+                return await repo.Find(id);
+            }
+        }
+
+        public IQueryable<T> Get(Expression<Func<T, bool>> predicate)
+        {
+            using (var repo = new Repository<T>(Context, HttpContext))
+            {
+                return repo.Get(predicate);
+            }
+        }
+
+        public async Task<T> Add(T entity)
+        {
+            using (var repo = new Repository<T>(Context, HttpContext))
+            {
+                entity = await repo.Add(entity);
+                await repo.SaveChanges();
+
+                return entity;
+            }
+        }
+
+        public async Task<T> Update(T entity)
+        {
+            using (var repo = new Repository<T>(Context, HttpContext))
+            {
+                entity = repo.Update(entity);
+                await repo.SaveChanges();
+
+                return entity;
+            }
+        }
+
+        public async Task Delete(T entity)
+        {
+            using (var repo = new Repository<T>(Context, HttpContext))
+            {
+                repo.Delete(entity);
+                await repo.SaveChanges();
+            }
+        }
+    }
+}

LANCommander/Services/CategoryService.cs

@@ -0,0 +1,12 @@
+using LANCommander.Data;
+using LANCommander.Data.Models;
+
+namespace LANCommander.Services
+{
+    public class CategoryService : BaseDatabaseService<Category>
+    {
+        public CategoryService(DatabaseContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
+        {
+        }
+    }
+}

LANCommander/Services/GameService.cs

@@ -0,0 +1,12 @@
+using LANCommander.Data;
+using LANCommander.Data.Models;
+
+namespace LANCommander.Services
+{
+    public class GameService : BaseDatabaseService<Game>
+    {
+        public GameService(DatabaseContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
+        {
+        }
+    }
+}

LANCommander/Services/GenreService.cs

@@ -0,0 +1,12 @@
+using LANCommander.Data;
+using LANCommander.Data.Models;
+
+namespace LANCommander.Services
+{
+    public class GenreService : BaseDatabaseService<Genre>
+    {
+        public GenreService(DatabaseContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
+        {
+        }
+    }
+}

LANCommander/Services/KeyService.cs

@@ -0,0 +1,32 @@
+using LANCommander.Data;
+using LANCommander.Data.Models;
+
+namespace LANCommander.Services
+{
+    public class KeyService : BaseDatabaseService<Key>
+    {
+        public KeyService(DatabaseContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
+        {
+        }
+
+        public async Task<Key> Allocate(Key key, User user)
+        {
+            key.ClaimedByUser = user;
+            key.AllocationMethod = KeyAllocationMethod.UserAccount;
+
+            key = await Update(key);
+
+            return key;
+        }
+
+        public async Task<Key> Allocate(Key key, string macAddress)
+        {
+            key.ClaimedByMacAddress = macAddress;
+            key.AllocationMethod = KeyAllocationMethod.MacAddress;
+
+            key = await Update(key);
+
+            return key;
+        }
+    }
+}

LANCommander/Services/TagService.cs

@@ -0,0 +1,12 @@
+using LANCommander.Data;
+using LANCommander.Data.Models;
+
+namespace LANCommander.Services
+{
+    public class TagService : BaseDatabaseService<Tag>
+    {
+        public TagService(DatabaseContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
+        {
+        }
+    }
+}