From b08aaf2d7b7ccafe175e9c1c18d6563a9f5a4223a794d80de01fa506ac280613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
 <93217193+Daniel-Garmig@users.noreply.github.com>
Date: Sun, 30 Aug 2026 20:20:03 +0200
Subject: [PATCH] Moved and renamed Db/Entity services for better organization.

---
 .../Components/Controls/GuestDocumentSearchDialog.razor   | 3 ++-
 .../Components/Pages/GuestDocuments/GuestDocDetail.razor  | 4 ++--
 .../Components/Pages/GuestDocuments/GuestDocList.razor    | 2 +-
 .../Components/Pages/GuestDocuments/GuestDocNew.razor     | 2 +-
 .../Components/Pages/StayEntries/StayEntryDetail.razor    | 4 ++--
 .../Components/Pages/StayEntries/StayEntryList.razor      | 2 +-
 .../Components/Pages/StayEntries/StayEntryNew.razor       | 2 +-
 src/Somnia.GuestLog/Components/Pages/_Imports.razor       | 3 ++-
 src/Somnia.GuestLog/Program.cs                            | 5 +++--
 .../GuestDocumentEntityService.cs}                        | 8 ++++----
 .../IGuestDocumentEntityService.cs}                       | 4 ++--
 .../IStayEntryEntityService.cs}                           | 4 ++--
 .../StayEntryEntityService.cs}                            | 8 ++++----
 13 files changed, 27 insertions(+), 24 deletions(-)
 rename src/Somnia.GuestLog/Services/{GuestDocumentService.cs => Entity/GuestDocumentEntityService.cs} (97%)
 rename src/Somnia.GuestLog/Services/{IGuestDocumentService.cs => Entity/IGuestDocumentEntityService.cs} (86%)
 rename src/Somnia.GuestLog/Services/{IStayEntryService.cs => Entity/IStayEntryEntityService.cs} (91%)
 rename src/Somnia.GuestLog/Services/{StayEntryService.cs => Entity/StayEntryEntityService.cs} (98%)

diff --git a/src/Somnia.GuestLog/Components/Controls/GuestDocumentSearchDialog.razor b/src/Somnia.GuestLog/Components/Controls/GuestDocumentSearchDialog.razor
index c567f70..b795a99 100644
--- a/src/Somnia.GuestLog/Components/Controls/GuestDocumentSearchDialog.razor
+++ b/src/Somnia.GuestLog/Components/Controls/GuestDocumentSearchDialog.razor
@@ -1,9 +1,10 @@
 @using Somnia.GuestLog.Models.DTOs;
 @using Somnia.GuestLog.Services
+@using Somnia.GuestLog.Services.Entity
 
 @inject ILogger<AddressQueryDialog> logger;
 @inject IUserMessageService userMessage
-@inject IGuestDocumentService guestDocumentService;
+@inject IGuestDocumentEntityService guestDocumentService;
 
 
 <MudDialog Style="max-height: 90%;">
diff --git a/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocDetail.razor b/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocDetail.razor
index 42f494f..e09d9eb 100644
--- a/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocDetail.razor
+++ b/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocDetail.razor
@@ -7,8 +7,8 @@
 @inject IUserMessageService userMessage
 @inject IDialogService DialogService
 @inject NavigationManager Navigation
-@inject IGuestDocumentService guestDocService
-@inject IStayEntryService stayService
+@inject IGuestDocumentEntityService guestDocService
+@inject IStayEntryEntityService stayService
 
 
 <PageTitle>Somnia - Guest Docs - Details</PageTitle>
diff --git a/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocList.razor b/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocList.razor
index e19881d..5ebd570 100644
--- a/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocList.razor
+++ b/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocList.razor
@@ -3,7 +3,7 @@
 @using Somnia.GuestLog.Models.DTOs;
 @using Somnia.GuestLog.Services;
 
-@inject IGuestDocumentService GuestDocService
+@inject IGuestDocumentEntityService GuestDocService
 @inject NavigationManager Navigation
 @inject IUserMessageService userMessage
 @inject IDialogService DialogService
diff --git a/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocNew.razor b/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocNew.razor
index b865f97..9f6c8f1 100644
--- a/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocNew.razor
+++ b/src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocNew.razor
@@ -7,7 +7,7 @@
 @inject IUserMessageService userMessage
 @inject IDialogService DialogService
 @inject NavigationManager Navigation
-@inject IGuestDocumentService guestDocService
+@inject IGuestDocumentEntityService guestDocService
 @inject IDataListService dataListService;
 
 @inject FluentValidation.IValidator<GuestDocIdDTO> docIdValidator;
diff --git a/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryDetail.razor b/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryDetail.razor
index 4df0722..6ccc86d 100644
--- a/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryDetail.razor
+++ b/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryDetail.razor
@@ -6,8 +6,8 @@
 @inject IUserMessageService userMessage
 @inject IDialogService DialogService
 @inject NavigationManager Navigation
-@inject IGuestDocumentService guestDocService
-@inject IStayEntryService stayService
+@inject IGuestDocumentEntityService guestDocService
+@inject IStayEntryEntityService stayService
 
 
 <PageTitle>Somnia - Guest Docs - Details</PageTitle>
diff --git a/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryList.razor b/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryList.razor
index 1b31a44..2b6e9b0 100644
--- a/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryList.razor
+++ b/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryList.razor
@@ -3,7 +3,7 @@
 @using Somnia.GuestLog.Models.DTOs;
 @using Somnia.GuestLog.Services;
 
-@inject IStayEntryService StayEntryService
+@inject IStayEntryEntityService StayEntryService
 @inject NavigationManager Navigation
 @inject IUserMessageService userMessage
 @inject IDialogService DialogService
diff --git a/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryNew.razor b/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryNew.razor
index 943efd4..970c5e7 100644
--- a/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryNew.razor
+++ b/src/Somnia.GuestLog/Components/Pages/StayEntries/StayEntryNew.razor
@@ -7,7 +7,7 @@
 @inject IUserMessageService userMessage
 @inject IDialogService DialogService
 @inject NavigationManager Navigation
-@inject IStayEntryService stayService
+@inject IStayEntryEntityService stayService
 @inject IDataListService dataListService;
 
 <PageTitle>Somnia - Stay Entries - New</PageTitle>
diff --git a/src/Somnia.GuestLog/Components/Pages/_Imports.razor b/src/Somnia.GuestLog/Components/Pages/_Imports.razor
index 1745ef9..be91a40 100644
--- a/src/Somnia.GuestLog/Components/Pages/_Imports.razor
+++ b/src/Somnia.GuestLog/Components/Pages/_Imports.razor
@@ -1 +1,2 @@
-@using Somnia.GuestLog.Components.Controls
\ No newline at end of file
+@using Somnia.GuestLog.Components.Controls
+@using Somnia.GuestLog.Services.Entity;
\ No newline at end of file
diff --git a/src/Somnia.GuestLog/Program.cs b/src/Somnia.GuestLog/Program.cs
index b03c5c9..d257911 100644
--- a/src/Somnia.GuestLog/Program.cs
+++ b/src/Somnia.GuestLog/Program.cs
@@ -9,6 +9,7 @@ using Somnia.GuestLog.Models.Configuration;
 using Somnia.GuestLog.Models.DTOs;
 using Somnia.GuestLog.Services;
 using Somnia.GuestLog.Services.AddressQuery;
+using Somnia.GuestLog.Services.Entity;
 using Somnia.GuestLog.Utils;
 using Somnia.GuestLog.Validators;
 
@@ -55,8 +56,8 @@ builder.Services.AddSingleton<IValidator<GuestDocIdDTO>, GuestDocIdDTOValidator>
 builder.Services.AddSingleton<IValidator<StayEntryDTO>, StayEntryDTOValidator>();
 
 // Add Services
-builder.Services.AddSingleton<IGuestDocumentService, GuestDocumentService>();
-builder.Services.AddSingleton<IStayEntryService, StayEntryService>();
+builder.Services.AddSingleton<IGuestDocumentEntityService, GuestDocumentEntityService>();
+builder.Services.AddSingleton<IStayEntryEntityService, StayEntryEntityService>();
 builder.Services.AddSingleton<IDataListService, StaticDataListService>();
 
 builder.Services.AddScoped<IUserMessageService, UserMessageService>();
diff --git a/src/Somnia.GuestLog/Services/GuestDocumentService.cs b/src/Somnia.GuestLog/Services/Entity/GuestDocumentEntityService.cs
similarity index 97%
rename from src/Somnia.GuestLog/Services/GuestDocumentService.cs
rename to src/Somnia.GuestLog/Services/Entity/GuestDocumentEntityService.cs
index 6b284ea..a2f818c 100644
--- a/src/Somnia.GuestLog/Services/GuestDocumentService.cs
+++ b/src/Somnia.GuestLog/Services/Entity/GuestDocumentEntityService.cs
@@ -7,13 +7,13 @@ using Somnia.GuestLog.Models.DTOs;
 using Somnia.GuestLog.Models.Entities;
 using Somnia.GuestLog.Utils;
 
-namespace Somnia.GuestLog.Services;
+namespace Somnia.GuestLog.Services.Entity;
 
-public class GuestDocumentService(
-    ILogger<GuestDocumentService> logger,
+public class GuestDocumentEntityService(
+    ILogger<GuestDocumentEntityService> logger,
     IDbContextFactory<GuestLogContext> contextFactory,
     IValidator<GuestDocumentDTO> dtoValidator
-) : IGuestDocumentService
+) : IGuestDocumentEntityService
 {
     public async Task<Result> CreateDocumentAsync(GuestDocumentDTO dto)
     {
diff --git a/src/Somnia.GuestLog/Services/IGuestDocumentService.cs b/src/Somnia.GuestLog/Services/Entity/IGuestDocumentEntityService.cs
similarity index 86%
rename from src/Somnia.GuestLog/Services/IGuestDocumentService.cs
rename to src/Somnia.GuestLog/Services/Entity/IGuestDocumentEntityService.cs
index 89d11cb..5eb2c17 100644
--- a/src/Somnia.GuestLog/Services/IGuestDocumentService.cs
+++ b/src/Somnia.GuestLog/Services/Entity/IGuestDocumentEntityService.cs
@@ -1,8 +1,8 @@
 using Somnia.GuestLog.Models.DTOs;
 
-namespace Somnia.GuestLog.Services;
+namespace Somnia.GuestLog.Services.Entity;
 
-public interface IGuestDocumentService
+public interface IGuestDocumentEntityService
 {
     public Task<Result> CreateDocumentAsync(GuestDocumentDTO dto);
     public Task<Result> UpdateDocumentAsync(GuestDocumentDTO dto);
diff --git a/src/Somnia.GuestLog/Services/IStayEntryService.cs b/src/Somnia.GuestLog/Services/Entity/IStayEntryEntityService.cs
similarity index 91%
rename from src/Somnia.GuestLog/Services/IStayEntryService.cs
rename to src/Somnia.GuestLog/Services/Entity/IStayEntryEntityService.cs
index a7f2eea..d503f47 100644
--- a/src/Somnia.GuestLog/Services/IStayEntryService.cs
+++ b/src/Somnia.GuestLog/Services/Entity/IStayEntryEntityService.cs
@@ -1,9 +1,9 @@
 using Somnia.GuestLog.Models.DTOs;
 using Somnia.GuestLog.Models.QueryConfigs;
 
-namespace Somnia.GuestLog.Services;
+namespace Somnia.GuestLog.Services.Entity;
 
-public interface IStayEntryService
+public interface IStayEntryEntityService
 {
     public Task<Result> CreateEntryAsync(StayEntryDTO dto);
     public Task<Result> UpdateEntryAsync(StayEntryDTO updatedDto);
diff --git a/src/Somnia.GuestLog/Services/StayEntryService.cs b/src/Somnia.GuestLog/Services/Entity/StayEntryEntityService.cs
similarity index 98%
rename from src/Somnia.GuestLog/Services/StayEntryService.cs
rename to src/Somnia.GuestLog/Services/Entity/StayEntryEntityService.cs
index 369c510..a34dff5 100644
--- a/src/Somnia.GuestLog/Services/StayEntryService.cs
+++ b/src/Somnia.GuestLog/Services/Entity/StayEntryEntityService.cs
@@ -8,13 +8,13 @@ using Somnia.GuestLog.Models.Entities;
 using Somnia.GuestLog.Models.QueryConfigs;
 using Somnia.GuestLog.Utils;
 
-namespace Somnia.GuestLog.Services;
+namespace Somnia.GuestLog.Services.Entity;
 
-public class StayEntryService(
-    ILogger<StayEntryService> logger,
+public class StayEntryEntityService(
+    ILogger<StayEntryEntityService> logger,
     IDbContextFactory<GuestLogContext> contextFactory,
     IValidator<StayEntryDTO> dtoValidator
-) : IStayEntryService
+) : IStayEntryEntityService
 {
     public async Task<Result> CreateEntryAsync(StayEntryDTO dto)
     {