chore: refactored the entity, Observable, ViewModel and Infrastructur…

…e classes for performance and consistency - Changed the Employee, Customer and ObservableCustomer model class's distinct FirstName, MiddleName, LastName to a single FullName field. This simplifies the model and aligns with some systems that store/display full names instead of individual name parts. - Removed redundant BSON reference tags. - Switched to ConcurrentObservableCollection from ObservableCollection in all view models for better thread-safety and performance in multi-threaded scenarios. - Introduced a new class MessageAggregator in Infrastructure layer for event publishing and subscription. Signed-off-by: Russell Camo <[email protected]>
russkyc · Aug 28, 2023 · c8235d1 · c8235d1
1 parent 26d9b82
commit c8235d1
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 45 deletions.
diff --git a/GroomWise.Application/Observables/ObservableCustomer.cs b/GroomWise.Application/Observables/ObservableCustomer.cs
@@ -14,16 +14,9 @@ public partial class ObservableCustomer
 {
  [Property(PropertyChangeType = PropertyChangeType.PropertyChanged)]
  private Guid _id;
- public string FullName => $"{FirstName} {LastName}";
 
  [Property(PropertyChangeType = PropertyChangeType.PropertyChanged)]
- private string _firstName;
-
- [Property(PropertyChangeType = PropertyChangeType.PropertyChanged)]
- private string _middleName;
-
- [Property(PropertyChangeType = PropertyChangeType.PropertyChanged)]
- private string _lastName;
+ private string _fullName;
 
  [Property(PropertyChangeType = PropertyChangeType.PropertyChanged)]
  private string _address;

diff --git a/GroomWise.Application/ViewModels/AppointmentViewModel.cs b/GroomWise.Application/ViewModels/AppointmentViewModel.cs
@@ -11,6 +11,7 @@
 using GroomWise.Infrastructure.Storage.Interfaces;
 using Injectio.Attributes;
 using MvvmGen;
+using Swordfish.NET.Collections;
 
 namespace GroomWise.Application.ViewModels;
 
@@ -26,14 +27,14 @@ public partial class AppointmentViewModel
  private ObservableAppointment _activeAppointment;
 
  [Property]
- private ObservableCollection<ObservableAppointment> _appointments;
+ private ConcurrentObservableCollection<ObservableAppointment> _appointments;
 
  [Property]
- private ObservableCollection<ObservableGroomingService> _groomingServices;
+ private ConcurrentObservableCollection<ObservableGroomingService> _groomingServices;
 
  partial void OnInitialize()
  {
- // PopulateCollections();
+ PopulateCollections();
  }
 
  private void PopulateCollections()
@@ -46,7 +47,9 @@ private void PopulateCollections()
  .GetAll()
  .Select(GroomingServiceMapper.ToObservable);
 
- Appointments = new ObservableCollection<ObservableAppointment>(appointments);
- GroomingServices = new ObservableCollection<ObservableGroomingService>(groomingServices);
+ Appointments = new ConcurrentObservableCollection<ObservableAppointment>(appointments);
+ GroomingServices = new ConcurrentObservableCollection<ObservableGroomingService>(
+ groomingServices
+ );
  }
 }
diff --git a/GroomWise.Application/ViewModels/CustomerViewModel.cs b/GroomWise.Application/ViewModels/CustomerViewModel.cs
@@ -11,6 +11,7 @@
 using GroomWise.Infrastructure.Storage.Interfaces;
 using Injectio.Attributes;
 using MvvmGen;
+using Swordfish.NET.Collections;
 
 namespace GroomWise.Application.ViewModels;
 
@@ -26,23 +27,22 @@ public partial class CustomerViewModel
  private ObservableCustomer _activeCustomer;
 
  [Property]
- private ObservableCollection<ObservableCustomer> _customers;
+ private ConcurrentObservableCollection<ObservableCustomer> _customers;
 
  partial void OnInitialize()
  {
- // PopulateCollections();
+ PopulateCollections();
  }
 
  private void PopulateCollections()
  {
  var customers = GroomWiseDbContext!.Customers.GetAll().Select(CustomerMapper.ToObservable);
- Customers = new ObservableCollection<ObservableCustomer>(customers);
+ Customers = new ConcurrentObservableCollection<ObservableCustomer>(customers);
  }
 
  private async Task CreateCustomer()
  {
- ActiveCustomer = new();
- await Task.CompletedTask;
+ await Task.Run(() => ActiveCustomer = new());
  }
 
  [Command]

diff --git a/GroomWise.Domain/Entities/Appointment.cs b/GroomWise.Domain/Entities/Appointment.cs
@@ -14,16 +14,8 @@ public class Appointment : IEntity
  public Guid Id { get; set; }
  public DateTime? Date { get; set; }
  public AppointmentStatus? Status { get; set; }
-
- [BsonRef("groomingServices")]
  public GroomingService? Service { get; set; }
-
- [BsonRef("pets")]
  public Pet? Pet { get; set; }
-
- [BsonRef("customers")]
  public Customer? Customer { get; set; }
-
- [BsonRef("employees")]
  public IList<Employee>? Employees { get; set; }
 }
diff --git a/GroomWise.Domain/Entities/Customer.cs b/GroomWise.Domain/Entities/Customer.cs
@@ -11,19 +11,10 @@ namespace GroomWise.Domain.Entities;
 public class Customer : IEntity
 {
  public Guid Id { get; set; }
-
- public string? Prefix { get; set; }
- public string? FirstName { get; set; }
- public string? MiddleName { get; set; }
- public string? LastName { get; set; }
- public string? Suffix { get; set; }
+ public string? FullName { get; set; }
  public string? Address { get; set; }
  public string? ContactNumber { get; set; }
  public string? Email { get; set; }
-
- [BsonRef("pets")]
  public IList<Pet>? Pets { get; set; }
-
- [BsonRef("appointments")]
  public IList<Appointment>? Appointments { get; set; }
 }
diff --git a/GroomWise.Domain/Entities/Employee.cs b/GroomWise.Domain/Entities/Employee.cs
@@ -13,17 +13,11 @@ public record Employee : IEntity
  public Guid Id { get; set; }
 
  public string? Prefix { get; set; }
- public string? FirstName { get; set; }
- public string? MiddleName { get; set; }
- public string? LastName { get; set; }
+ public string? FullName { get; set; }
  public string? Suffix { get; set; }
  public string? Address { get; set; }
  public string? ContactNumber { get; set; }
  public string? Email { get; set; }
-
- [BsonRef("pets")]
  public IList<Pet>? Pets { get; set; }
-
- [BsonRef("appointments")]
  public IList<Appointment>? Appointments { get; set; }
 }
diff --git a/GroomWise.Domain/Entities/Pet.cs b/GroomWise.Domain/Entities/Pet.cs
@@ -15,7 +15,5 @@ public class Pet : IEntity
  public int? Age { get; set; }
  public string? Breed { get; set; }
  public int? Gender { get; set; }
-
- [BsonRef("customers")]
  public IList<Customer> Owner { get; set; }
 }
diff --git a/GroomWise.Infrastructure/GroomWise.Infrastructure.csproj b/GroomWise.Infrastructure/GroomWise.Infrastructure.csproj
@@ -12,6 +12,10 @@
  <PackageReference Include="LiteDB" Version="5.0.17" />
  <PackageReference Include="Lombok.NET" Version="2.1.3" />
  <PackageReference Include="Mapster" Version="7.3.0" />
+ <PackageReference Include="MvvmGen.PureCodeGeneration" Version="1.2.1">
+ <PrivateAssets>all</PrivateAssets>
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ </PackageReference>
  <PackageReference Include="NETCore.Encrypt" Version="2.1.1" />
  <PackageReference Include="Russkyc.Configuration" Version="1.0.0" />
  <PackageReference Include="Russkyc.DependencyInjection" Version="2.1.0" />
@@ -36,6 +40,8 @@
 
 
 
+
+
  </ItemGroup>
 
 

diff --git a/GroomWise.Infrastructure/Messaging/MessageAggregator.cs b/GroomWise.Infrastructure/Messaging/MessageAggregator.cs
@@ -0,0 +1,12 @@
+// 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.Events;
+
+namespace GroomWise.Infrastructure.Messaging;
+
+[RegisterSingleton<IEventAggregator, MessageAggregator>]
+public class MessageAggregator : EventAggregator { }