Merge pull request #122 from MrSmoke/misc-cleanup

Misc cleanup
MrSmoke · Jun 3, 2024 · 09eb9fd · 09eb9fd
2 parents 504d456 + 10298de
commit 09eb9fd
Show file tree

Hide file tree

Showing 37 changed files with 565 additions and 625 deletions.
diff --git a/src/TeaTime.Common/Abstractions/ISystemClock.cs b/src/TeaTime.Common/Abstractions/ISystemClock.cs
diff --git a/src/TeaTime.Common/DefaultSystemClock.cs b/src/TeaTime.Common/DefaultSystemClock.cs
diff --git a/src/TeaTime.Common/Features/IllMake/IllMakeCommandHandler.cs b/src/TeaTime.Common/Features/IllMake/IllMakeCommandHandler.cs
@@ -1,8 +1,8 @@
 namespace TeaTime.Common.Features.IllMake
 {
+    using System;
     using System.Threading;
     using System.Threading.Tasks;
-    using Abstractions;
     using Abstractions.Data;
     using Commands;
     using MediatR;
@@ -11,9 +11,9 @@ namespace TeaTime.Common.Features.IllMake
     public class IllMakeCommandHandler : IRequestHandler<IllMakeCommand>
     {
         private readonly IIllMakeRepository _repository;
-        private readonly ISystemClock _clock;
+        private readonly TimeProvider _clock;
 
-        public IllMakeCommandHandler(IIllMakeRepository repository, ISystemClock clock)
+        public IllMakeCommandHandler(IIllMakeRepository repository, TimeProvider clock)
         {
             _repository = repository;
             _clock = clock;
@@ -26,7 +26,7 @@ public Task Handle(IllMakeCommand request, CancellationToken cancellationToken)
                 Id = request.Id,
                 RunId = request.RunId,
                 UserId = request.UserId,
-                CreatedDate = _clock.UtcNow()
+                CreatedDate = _clock.GetUtcNow()
             };
 
             //todo: event

diff --git a/src/TeaTime.Common/Features/Options/OptionsCommandHandler.cs b/src/TeaTime.Common/Features/Options/OptionsCommandHandler.cs
@@ -1,8 +1,8 @@
 namespace TeaTime.Common.Features.Options
 {
+    using System;
     using System.Threading;
     using System.Threading.Tasks;
-    using Abstractions;
     using Abstractions.Data;
     using Commands;
     using MediatR;
@@ -12,10 +12,10 @@ public class OptionsCommandHandler :
         IRequestHandler<CreateOptionCommand>,
         IRequestHandler<DeleteOptionCommand>
     {
-        private readonly ISystemClock _clock;
+        private readonly TimeProvider _clock;
         private readonly IOptionsRepository _optionsRepository;
 
-        public OptionsCommandHandler(ISystemClock clock, IOptionsRepository optionsRepository)
+        public OptionsCommandHandler(TimeProvider clock, IOptionsRepository optionsRepository)
         {
             _clock = clock;
             _optionsRepository = optionsRepository;
@@ -28,7 +28,7 @@ public Task Handle(CreateOptionCommand request, CancellationToken cancellationTo
                 Id = request.Id,
                 Name = request.Name,
                 CreatedBy = request.UserId,
-                CreatedDate = _clock.UtcNow(),
+                CreatedDate = _clock.GetUtcNow(),
                 GroupId = request.GroupId
             };
 

diff --git a/src/TeaTime.Common/Features/Orders/OrderCommandHandler.cs b/src/TeaTime.Common/Features/Orders/OrderCommandHandler.cs
@@ -1,8 +1,8 @@
 namespace TeaTime.Common.Features.Orders
 {
+    using System;
     using System.Threading;
     using System.Threading.Tasks;
-    using Abstractions;
     using Abstractions.Data;
     using Commands;
     using Events;
@@ -15,12 +15,12 @@ public class OrderCommandHandler :
         IRequestHandler<UpdateOrderOptionCommand>
     {
         private readonly IOrderRepository _orderRepository;
-        private readonly ISystemClock _clock;
+        private readonly TimeProvider _clock;
         private readonly IEventPublisher _eventPublisher;
         private readonly ILogger<OrderCommandHandler> _logger;
 
         public OrderCommandHandler(IOrderRepository orderRepository,
-            ISystemClock clock,
+            TimeProvider clock,
             IEventPublisher eventPublisher,
             ILogger<OrderCommandHandler> logger)
         {
@@ -35,7 +35,7 @@ public async Task Handle(CreateOrderCommand request, CancellationToken cancellat
             var order = new Order
             {
                 Id = request.Id,
-                CreatedDate = _clock.UtcNow(),
+                CreatedDate = _clock.GetUtcNow(),
                 OptionId = request.OptionId,
                 RunId = request.RunId,
                 UserId = request.UserId

diff --git a/src/TeaTime.Common/Features/RoomItemGroups/RoomItemGroupCommandHandler.cs b/src/TeaTime.Common/Features/RoomItemGroups/RoomItemGroupCommandHandler.cs
@@ -1,8 +1,8 @@
 namespace TeaTime.Common.Features.RoomItemGroups
 {
+    using System;
     using System.Threading;
     using System.Threading.Tasks;
-    using Abstractions;
     using Abstractions.Data;
     using Commands;
     using Common.Models.Data;
@@ -13,9 +13,9 @@ public class RoomItemGroupCommandHandler :
         IRequestHandler<DeleteRoomItemGroupCommand>
     {
         private readonly IOptionsRepository _optionsRepository;
-        private readonly ISystemClock _clock;
+        private readonly TimeProvider _clock;
 
-        public RoomItemGroupCommandHandler(IOptionsRepository optionsRepository, ISystemClock clock)
+        public RoomItemGroupCommandHandler(IOptionsRepository optionsRepository, TimeProvider clock)
         {
             _optionsRepository = optionsRepository;
             _clock = clock;
@@ -28,7 +28,7 @@ public Task Handle(CreateRoomItemGroupCommand request, CancellationToken cancell
                 Id = request.Id,
                 Name = request.Name,
                 CreatedBy = request.UserId,
-                CreatedDate = _clock.UtcNow(),
+                CreatedDate = _clock.GetUtcNow(),
                 RoomId = request.RoomId
             };
 

diff --git a/src/TeaTime.Common/Features/Rooms/RoomCommandHandler.cs b/src/TeaTime.Common/Features/Rooms/RoomCommandHandler.cs
@@ -1,8 +1,8 @@
 namespace TeaTime.Common.Features.Rooms
 {
+    using System;
     using System.Threading;
     using System.Threading.Tasks;
-    using Abstractions;
     using Abstractions.Data;
     using Commands;
     using Events;
@@ -13,11 +13,11 @@ public class RoomCommandHandler : IRequestHandler<CreateRoomCommand>
     {
         private readonly IRoomRepository _roomRepository;
         private readonly IEventPublisher _eventPublisher;
-        private readonly ISystemClock _clock;
+        private readonly TimeProvider _clock;
 
         public RoomCommandHandler(IRoomRepository roomRepository,
             IEventPublisher eventPublisher,
-            ISystemClock clock)
+            TimeProvider clock)
         {
             _roomRepository = roomRepository;
             _eventPublisher = eventPublisher;
@@ -31,7 +31,7 @@ public async Task Handle(CreateRoomCommand request, CancellationToken cancellati
                 Id = request.Id,
                 Name = request.Name,
                 CreatedBy = request.UserId,
-                CreatedDate = _clock.UtcNow()
+                CreatedDate = _clock.GetUtcNow()
             };
 
             await _roomRepository.CreateAsync(room);

diff --git a/src/TeaTime.Common/Features/Runs/RunCommandHandler.cs b/src/TeaTime.Common/Features/Runs/RunCommandHandler.cs
@@ -1,5 +1,6 @@
 namespace TeaTime.Common.Features.Runs
 {
+    using System;
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
@@ -17,13 +18,13 @@ public class RunCommandHandler :
         private readonly IRunRepository _runRepository;
         private readonly IEventPublisher _eventPublisher;
         private readonly IRunnerRandomizer _randomizer;
-        private readonly ISystemClock _clock;
+        private readonly TimeProvider _clock;
         private readonly IIllMakeRepository _illMakeRepository;
 
         public RunCommandHandler(IRunRepository runRepository,
             IEventPublisher eventPublisher,
             IRunnerRandomizer randomizer,
-            ISystemClock clock,
+            TimeProvider clock,
             IIllMakeRepository illMakeRepository)
         {
             _runRepository = runRepository;
@@ -39,7 +40,7 @@ public async Task Handle(StartRunCommand request, CancellationToken cancellation
             var run = new Run
             {
                 Id = request.Id,
-                CreatedDate = _clock.UtcNow(),
+                CreatedDate = _clock.GetUtcNow(),
                 GroupId = request.RoomGroupId,
                 RoomId = request.RoomId,
                 StartTime = request.StartTime,
@@ -76,7 +77,7 @@ await _runRepository.UpdateAsync(request.Run with
             {
                 RunId = request.Run.Id,
                 RunnerUserId = runnerUserId,
-                EndedTime = _clock.UtcNow()
+                EndedTime = _clock.GetUtcNow()
             };
 
             await _runRepository.CreateResultAsync(runResult);

diff --git a/src/TeaTime.Common/Features/Users/UserCommandHandler.cs b/src/TeaTime.Common/Features/Users/UserCommandHandler.cs
@@ -1,8 +1,8 @@
 namespace TeaTime.Common.Features.Users
 {
+    using System;
     using System.Threading;
     using System.Threading.Tasks;
-    using Abstractions;
     using Abstractions.Data;
     using Commands;
     using MediatR;
@@ -11,9 +11,9 @@ namespace TeaTime.Common.Features.Users
     public class UserCommandHandler : IRequestHandler<CreateUserCommand>
     {
         private readonly IUserRepository _userRepository;
-        private readonly ISystemClock _clock;
+        private readonly TimeProvider _clock;
 
-        public UserCommandHandler(IUserRepository userRepository, ISystemClock clock)
+        public UserCommandHandler(IUserRepository userRepository, TimeProvider clock)
         {
             _userRepository = userRepository;
             _clock = clock;
@@ -25,7 +25,7 @@ public Task Handle(CreateUserCommand request, CancellationToken cancellationToke
             {
                 Id = request.Id,
                 Username = request.Username,
-                CreatedDate = _clock.UtcNow(),
+                CreatedDate = _clock.GetUtcNow(),
                 DisplayName = request.DisplayName
             };
 

diff --git a/src/TeaTime.Data.MySql/BaseRepository.cs b/src/TeaTime.Data.MySql/BaseRepository.cs
diff --git a/src/TeaTime.Data.MySql/Factories/IMySqlConnectionFactory.cs b/src/TeaTime.Data.MySql/Factories/IMySqlConnectionFactory.cs
@@ -0,0 +1,8 @@
+namespace TeaTime.Data.MySql.Factories;
+
+using MySqlConnector;
+
+public interface IMySqlConnectionFactory
+{
+    MySqlConnection GetConnection();
+}
diff --git a/src/TeaTime.Data.MySql/Factories/MySqlConnectionFactory.cs b/src/TeaTime.Data.MySql/Factories/MySqlConnectionFactory.cs
@@ -0,0 +1,37 @@
+namespace TeaTime.Data.MySql.Factories;
+
+using System;
+using MySqlConnector;
+
+public class MySqlConnectionFactory : IMySqlConnectionFactory
+{
+    private readonly string _connectionString;
+
+    public MySqlConnectionFactory(MySqlConnectionOptions options)
+    {
+        ArgumentNullException.ThrowIfNull(options);
+
+        _connectionString = GetConnectionString(options);
+    }
+
+    public MySqlConnection GetConnection()
+    {
+        return new MySqlConnection(_connectionString);
+    }
+
+    private static string GetConnectionString(MySqlConnectionOptions options)
+    {
+        return string.Concat(
+            GetOption("host", options.Host),
+            GetOption("port", options.Port.ToString()),
+            GetOption("username", options.Username),
+            GetOption("password", options.Password),
+            GetOption("database", options.Database),
+            "UseAffectedRows=true;",
+            "DateTimeKind=utc;"
+        );
+
+        static string GetOption(string key, string? value)
+            => string.IsNullOrWhiteSpace(value) ? string.Empty : key + "=" + value + ";";
+    }
+}
diff --git a/src/TeaTime.Data.MySql/Factories/MySqlConnectionOptions.cs b/src/TeaTime.Data.MySql/Factories/MySqlConnectionOptions.cs
@@ -0,0 +1,21 @@
+namespace TeaTime.Data.MySql.Factories;
+
+using Common.Options;
+
+public class MySqlConnectionOptions
+{
+    public string Host { get; set; } = "localhost";
+    public ushort Port { get; set; } = 3306;
+    public string? Username { get; set; }
+    public string? Password { get; set; }
+    public string Database { get; set; } = "teatime";
+
+    public void Validate()
+    {
+        if (string.IsNullOrWhiteSpace(Host))
+            throw new InvalidOptionException(nameof(Host), "MySql host has not been set");
+
+        if (string.IsNullOrWhiteSpace(Database))
+            throw new InvalidOptionException(nameof(Database), "MySql Database has not been set");
+    }
+}
diff --git a/src/TeaTime.Data.MySql/IMySqlConnectionFactory.cs b/src/TeaTime.Data.MySql/IMySqlConnectionFactory.cs