chore: update various aspects of the application for better maintaina…

…bility - Issues of navigating through different views (pages) of the application have been addressed in "AppViewModel.cs". - For the "IAuthenticationService.cs" file, functions 'Register' and 'Update' have been revamped to include an additional parameter 'roles'. - Registered "AccountViewModel.cs", "InventoryViewModel.cs", "PetViewModel.cs", "CustomerViewModel.cs", "EmployeeViewModel.cs", "GroomingServiceViewModel.cs" to IoC container. Signed-off-by: Russell Camo <[email protected]>
russkyc · Aug 28, 2023 · 1e31cf4 · 1e31cf4
1 parent 0e1a8a4
commit 1e31cf4
Show file tree

Hide file tree

Showing 24 changed files with 241 additions and 97 deletions.
diff --git a/GroomWise.Application/Enums/AppViews.cs b/GroomWise.Application/Enums/AppViews.cs
@@ -8,6 +8,5 @@ namespace GroomWise.Application.Enums;
 public enum AppViews
 {
  Login,
- Main,
- Dashboard
+ Main
 }
diff --git a/GroomWise.Application/ViewModels/AppViewModel.cs b/GroomWise.Application/ViewModels/AppViewModel.cs
@@ -7,6 +7,7 @@
 using GroomWise.Domain.Enums;
 using GroomWise.Infrastructure.Authentication.Enums;
 using GroomWise.Infrastructure.Authentication.Interfaces;
+using GroomWise.Infrastructure.IoC.Interfaces;
 using GroomWise.Infrastructure.Navigation.Interfaces;
 using Injectio.Attributes;
 using MvvmGen;
@@ -17,9 +18,9 @@ namespace GroomWise.Application.ViewModels;
 [Inject(typeof(IAuthenticationService))]
 [Inject(typeof(IDialogFactory))]
 [Inject(typeof(INavigationService))]
+[Inject(typeof(IAppServicesContainer))]
 [Inject(typeof(DashboardViewModel))]
 [ViewModel]
-[ViewModelGenerateInterface]
 [RegisterSingleton]
 public partial class AppViewModel
 {
@@ -50,12 +51,27 @@ private async Task Logout()
  {
  var result = AuthenticationService.Logout();
 
- await Task.Delay(500);
+ await Task.Delay(300);
  if (result.Equals(AuthenticationStatus.NotAuthenticated))
  {
  NavigationService.Navigate(AppViews.Login);
  }
  }
  });
  }
+
+ [Command]
+ private async Task NavigateToPage(object param)
+ {
+ await Task.Run(() =>
+ {
+ if (param is Type type)
+ {
+ if (AppServicesContainer.GetService(type) is ViewModelBase viewModel)
+ {
+ PageContext = viewModel;
+ }
+ }
+ });
+ }
 }
diff --git a/GroomWise.Application/ViewModels/AppointmentViewModel.cs b/GroomWise.Application/ViewModels/AppointmentViewModel.cs
@@ -9,6 +9,7 @@
 using GroomWise.Infrastructure.Database;
 using GroomWise.Infrastructure.Logging.Interfaces;
 using GroomWise.Infrastructure.Storage.Interfaces;
+using Injectio.Attributes;
 using MvvmGen;
 
 namespace GroomWise.Application.ViewModels;
@@ -18,6 +19,7 @@ namespace GroomWise.Application.ViewModels;
 [Inject(typeof(ILogger))]
 [Inject(typeof(IFileStorage))]
 [Inject(typeof(GroomWiseDbContext))]
+[RegisterSingleton]
 public partial class AppointmentViewModel
 {
  [Property]
@@ -31,7 +33,7 @@ public partial class AppointmentViewModel
 
  partial void OnInitialize()
  {
- PopulateCollections();
+ // PopulateCollections();
  }
 
  private void PopulateCollections()

diff --git a/GroomWise.Application/ViewModels/CustomerViewModel.cs b/GroomWise.Application/ViewModels/CustomerViewModel.cs
@@ -6,10 +6,10 @@
 using System.Collections.ObjectModel;
 using GroomWise.Application.Mappers;
 using GroomWise.Application.Observables;
-using GroomWise.Domain.Entities;
 using GroomWise.Infrastructure.Database;
 using GroomWise.Infrastructure.Logging.Interfaces;
 using GroomWise.Infrastructure.Storage.Interfaces;
+using Injectio.Attributes;
 using MvvmGen;
 
 namespace GroomWise.Application.ViewModels;
@@ -19,6 +19,7 @@ namespace GroomWise.Application.ViewModels;
 [Inject(typeof(ILogger))]
 [Inject(typeof(IFileStorage))]
 [Inject(typeof(GroomWiseDbContext))]
+[RegisterSingleton]
 public partial class CustomerViewModel
 {
  [Property]
@@ -29,7 +30,7 @@ public partial class CustomerViewModel
 
  partial void OnInitialize()
  {
- PopulateCollections();
+ // PopulateCollections();
  }
 
  private void PopulateCollections()

diff --git a/GroomWise.Application/ViewModels/DashboardViewModel.cs b/GroomWise.Application/ViewModels/DashboardViewModel.cs
@@ -9,6 +9,5 @@
 namespace GroomWise.Application.ViewModels;
 
 [ViewModel]
-[ViewModelGenerateInterface]
 [RegisterSingleton]
 public partial class DashboardViewModel { }
diff --git a/GroomWise.Application/ViewModels/EmployeeViewModel.cs b/GroomWise.Application/ViewModels/EmployeeViewModel.cs
@@ -1,11 +1,13 @@
 // Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
-// 
+//
 // Unauthorized copying or redistribution of all files, in source and binary forms via any medium
 // without written, signed consent from the author is strictly prohibited.
 
+using Injectio.Attributes;
+using MvvmGen;
+
 namespace GroomWise.Application.ViewModels;
 
-public class EmployeeViewModel
-{
-
-}
+[ViewModel]
+[RegisterSingleton]
+public partial class EmployeeViewModel { }
diff --git a/GroomWise.Application/ViewModels/GroomingServiceViewModel.cs b/GroomWise.Application/ViewModels/GroomingServiceViewModel.cs
@@ -1,11 +1,13 @@
 // Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
-// 
+//
 // Unauthorized copying or redistribution of all files, in source and binary forms via any medium
 // without written, signed consent from the author is strictly prohibited.
 
+using Injectio.Attributes;
+using MvvmGen;
+
 namespace GroomWise.Application.ViewModels;
 
-public class GroomingServiceViewModel
-{
-
-}
+[ViewModel]
+[RegisterSingleton]
+public partial class GroomingServiceViewModel { }
diff --git a/GroomWise.Application/ViewModels/InventoryViewModel.cs b/GroomWise.Application/ViewModels/InventoryViewModel.cs
@@ -1,11 +1,13 @@
 // Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
-// 
+//
 // Unauthorized copying or redistribution of all files, in source and binary forms via any medium
 // without written, signed consent from the author is strictly prohibited.
 
+using Injectio.Attributes;
+using MvvmGen;
+
 namespace GroomWise.Application.ViewModels;
 
-public class InventoryViewModel
-{
-
-}
+[ViewModel]
+[RegisterSingleton]
+public partial class InventoryViewModel { }
diff --git a/GroomWise.Application/ViewModels/LoginViewModel.cs b/GroomWise.Application/ViewModels/LoginViewModel.cs
@@ -84,10 +84,10 @@ private async Task Login()
  }
  );
 
- Username = string.Empty;
  Password = string.Empty;
+ Username = string.Empty;
 
- await Task.Delay(1000);
+ await Task.Delay(300);
  Notifications.RemoveLast();
  NavigationService.Navigate(AppViews.Main);
  });

diff --git a/GroomWise.Application/ViewModels/PetViewModel.cs b/GroomWise.Application/ViewModels/PetViewModel.cs
@@ -1,11 +1,13 @@
 // Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
-// 
+//
 // Unauthorized copying or redistribution of all files, in source and binary forms via any medium
 // without written, signed consent from the author is strictly prohibited.
 
+using Injectio.Attributes;
+using MvvmGen;
+
 namespace GroomWise.Application.ViewModels;
 
-public class PetViewModel
-{
-
-}
+[ViewModel]
+[RegisterSingleton]
+public partial class PetViewModel { }
diff --git a/GroomWise.Application/ViewModels/SettingsViewModel.cs b/GroomWise.Application/ViewModels/SettingsViewModel.cs
@@ -0,0 +1,13 @@
+// Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
+//
+// Unauthorized copying or redistribution of all files, in source and binary forms via any medium
+// without written, signed consent from the author is strictly prohibited.
+
+using Injectio.Attributes;
+using MvvmGen;
+
+namespace GroomWise.Application.ViewModels;
+
+[ViewModel]
+[RegisterSingleton]
+public partial class SettingsViewModel { }
diff --git a/GroomWise.Infrastructure/Authentication/AuthenticationService.cs b/GroomWise.Infrastructure/Authentication/AuthenticationService.cs
@@ -31,14 +31,18 @@ public AuthenticationService(GroomWiseDbContext dbContext, IEncryptionService en
  public void Register(
  string username,
  string password,
- Role role = Role.User,
- Guid? employeeId = null
+ Guid? employeeId = null,
+ params Role[] roles
  )
  {
  var account = new Account();
  account.Username = _encryptionService.Hash(username);
  account.Password = _encryptionService.Hash(password);
- account.Roles.Add(role);
+
+ foreach (var role in roles)
+ {
+ account.Roles.Add(role);
+ }
 
  if (employeeId is not null)
  {
@@ -53,6 +57,11 @@ public AuthenticationService(GroomWiseDbContext dbContext, IEncryptionService en
  _dbContext.Accounts.Insert(account);
  }
 
+ public void Register(string username, string password, params Role[] roles)
+ {
+ Register(username, password, null, roles);
+ }
+
  public AuthenticationStatus Login(string username, string password)
  {
  var account = _dbContext.Accounts.Get(
@@ -80,7 +89,8 @@ public AuthenticationStatus Login(string username, string password)
  string username,
  string password,
  string newUsername,
- string newPassword
+ string newPassword,
+ params Role[] roles
  )
  {
  var account = _dbContext.Accounts.Get(
@@ -111,6 +121,11 @@ string newPassword
  return UpdateStatus.Success;
  }
 
+ foreach (var role in roles)
+ {
+ account.Roles.Add(role);
+ }
+
  return UpdateStatus.Fail;
  }
 

diff --git a/GroomWise.Infrastructure/Authentication/Interfaces/IAuthenticationService.cs b/GroomWise.Infrastructure/Authentication/Interfaces/IAuthenticationService.cs
@@ -11,11 +11,23 @@ namespace GroomWise.Infrastructure.Authentication.Interfaces;
 
 public interface IAuthenticationService
 {
- void Register(string username, string password, Role role = Role.User, Guid? employeeId = null);
+ void Register(
+ string username,
+ string password,
+ Guid? employeeId = null,
+ params Role[] roles
+ );
 
+ void Register(string username, string password, params Role[] roles);
  AuthenticationStatus Login(string username, string password);
 
- UpdateStatus Update(string username, string password, string newUsername, string newPassword);
+ UpdateStatus Update(
+ string username,
+ string password,
+ string newUsername,
+ string newPassword,
+ params Role[] roles
+ );
 
  AuthenticationStatus Logout();
  SessionInfo? GetSession();

diff --git a/GroomWise.Infrastructure/GroomWise.Infrastructure.csproj b/GroomWise.Infrastructure/GroomWise.Infrastructure.csproj
@@ -30,6 +30,10 @@
 
  <ItemGroup>
  <None Remove=".env" />
+
+
+
+
  </ItemGroup>
 
 

diff --git a/GroomWise.Infrastructure/IoC/AppServicesContainer.cs b/GroomWise.Infrastructure/IoC/AppServicesContainer.cs
@@ -0,0 +1,31 @@
+// Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
+//
+// Unauthorized copying or redistribution of all files, in source and binary forms via any medium
+// without written, signed consent from the author is strictly prohibited.
+
+using GroomWise.Infrastructure.IoC.Interfaces;
+using Injectio.Attributes;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace GroomWise.Infrastructure.IoC;
+
+[RegisterSingleton<IAppServicesContainer, AppServicesContainer>]
+public class AppServicesContainer : IAppServicesContainer
+{
+ private IServiceProvider? _serviceProvider;
+
+ public void AddContainer(IServiceProvider container)
+ {
+ _serviceProvider = container;
+ }
+
+ public T? GetService<T>()
+ {
+ return _serviceProvider!.GetService<T>();
+ }
+
+ public object? GetService(Type type)
+ {
+ return _serviceProvider!.GetService(type);
+ }
+}
diff --git a/GroomWise.Infrastructure/IoC/Interfaces/IAppServicesContainer.cs b/GroomWise.Infrastructure/IoC/Interfaces/IAppServicesContainer.cs
@@ -0,0 +1,13 @@
+// Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
+// 
+// Unauthorized copying or redistribution of all files, in source and binary forms via any medium
+// without written, signed consent from the author is strictly prohibited.
+
+namespace GroomWise.Infrastructure.IoC.Interfaces;
+
+public interface IAppServicesContainer
+{
+ void AddContainer(IServiceProvider container);
+ T? GetService<T>();
+ object? GetService(Type type);
+}
diff --git a/GroomWise.Infrastructure/Logging/ConsoleLogger.cs b/GroomWise.Infrastructure/Logging/ConsoleLogger.cs
@@ -4,12 +4,11 @@
 // without written, signed consent from the author is strictly prohibited.
 
 using GroomWise.Infrastructure.Logging.Interfaces;
-using Russkyc.DependencyInjection.Attributes;
-using Russkyc.DependencyInjection.Enums;
+using Injectio.Attributes;
 
 namespace GroomWise.Infrastructure.Logging;
 
-[Service(Scope.Singleton, Registration.AsInterfaces)]
+[RegisterSingleton<ILogger, ConsoleLogger>]
 public class ConsoleLogger : ILogger
 {
  public void Log(string message, string? sender = null)