SHA256
Compare commits
26
Commits
2335c223ea
...
StayExport
| Author | SHA256 | Date | |
|---|---|---|---|
|
|
9ec87d56da | ||
|
|
7b8020879b | ||
|
|
dc5293bdf7 | ||
|
|
4b72e3b3d3 | ||
|
|
6fe5a5e5a3 | ||
|
|
058352b7f3 | ||
|
|
313a714a99 | ||
|
|
cf31cbc414 | ||
|
|
b318f2415c | ||
|
|
c24faedee5 | ||
|
|
7052ec734c | ||
|
|
887c3d787a | ||
|
|
a01eed82e1 | ||
|
|
b08aaf2d7b | ||
|
|
4f22cd4541 | ||
|
|
b18bd7caa6 | ||
|
|
511bd023f2 | ||
|
|
0de4e1ba10 | ||
|
|
340bc583b7 | ||
|
|
67845e250f | ||
|
|
3e0ef34f66 | ||
|
|
6dc2d2426b | ||
|
|
ec7efd867b | ||
|
|
8232e7d7c9 | ||
|
|
5c7fed2677 | ||
|
|
3fe558c231 |
@@ -6,6 +6,8 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageVersion Include="Extensions.MudBlazor.StaticInput" Version="4.1.0" />
|
<PackageVersion Include="Extensions.MudBlazor.StaticInput" Version="4.1.0" />
|
||||||
|
<PackageVersion Include="FluentStorage" Version="8.0.16" />
|
||||||
|
<PackageVersion Include="FluentStorage.AWS" Version="8.0.10" />
|
||||||
<PackageVersion Include="FluentValidation" Version="12.1.1" />
|
<PackageVersion Include="FluentValidation" Version="12.1.1" />
|
||||||
<PackageVersion Include="Grpc.AspNetCore" Version="2.64.0" />
|
<PackageVersion Include="Grpc.AspNetCore" Version="2.64.0" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.Localization" Version="10.0.9" />
|
<PackageVersion Include="Microsoft.Extensions.Localization" Version="10.0.9" />
|
||||||
@@ -23,6 +25,7 @@
|
|||||||
</PackageVersion>
|
</PackageVersion>
|
||||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7" />
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7" />
|
||||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
|
||||||
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.7" />
|
||||||
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
|
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -23,6 +23,7 @@
|
|||||||
<ReconnectModal />
|
<ReconnectModal />
|
||||||
<script src="@Assets["_framework/blazor.web.js"]"></script>
|
<script src="@Assets["_framework/blazor.web.js"]"></script>
|
||||||
<script src="@Assets["_content/MudBlazor/MudBlazor.min.js"]"></script>
|
<script src="@Assets["_content/MudBlazor/MudBlazor.min.js"]"></script>
|
||||||
|
<script src="js/App.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -0,0 +1,161 @@
|
|||||||
|
@using Somnia.GuestLog.Models.DTOs;
|
||||||
|
@using Somnia.GuestLog.Services
|
||||||
|
@using Somnia.GuestLog.Services.AddressQuery;
|
||||||
|
|
||||||
|
@inject ILogger<AddressQueryDialog> logger;
|
||||||
|
@inject IAddressQueryFactory addressQueryFactory;
|
||||||
|
@inject IUserMessageService userMessage
|
||||||
|
|
||||||
|
<MudDialog @ref="@DialogRef">
|
||||||
|
<TitleContent>
|
||||||
|
<MudText Typo="Typo.h6">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.NotListedLocation" Class="mr-3 mb-n1" />
|
||||||
|
@LanguageLocale.control_AddressQueryDialog_dialogTitle
|
||||||
|
</MudText>
|
||||||
|
</TitleContent>
|
||||||
|
<DialogContent>
|
||||||
|
<MudStack row>
|
||||||
|
<MudTextField @bind-Value="SearchText" Label="@LanguageLocale.control_AddressQueryDialog_searchText"
|
||||||
|
Required />
|
||||||
|
<MudIconButton Icon="@Icons.Material.Filled.Search" OnClick="btnSearchAddress" />
|
||||||
|
</MudStack>
|
||||||
|
|
||||||
|
<MudPaper Class="mt-4 pa-2">
|
||||||
|
@if (addressResults.Count == 0)
|
||||||
|
{
|
||||||
|
<MudText Typo="Typo.body1">@LanguageLocale.general_noResults</MudText>
|
||||||
|
}
|
||||||
|
|
||||||
|
<MudList T="AddressResultDTO" @bind-SelectedValue="SelectedAddressResult"
|
||||||
|
SelectionMode="SelectionMode.SingleSelection" Color="Color.Info">
|
||||||
|
@foreach (AddressResultDTO result in addressResults)
|
||||||
|
{
|
||||||
|
<MudListItem Value="result">
|
||||||
|
<ChildContent>
|
||||||
|
<MudTextField Value="@($"{result.AddressRoad}, {result.HouseNumber}")"
|
||||||
|
Label="@LanguageLocale.general_address_address" ReadOnly />
|
||||||
|
<MudStack row>
|
||||||
|
<MudTextField Value="@result.AddressCity" Label="@LanguageLocale.general_address_city"
|
||||||
|
ReadOnly />
|
||||||
|
<MudTextField Value="@result.AddressProvince"
|
||||||
|
Label="@LanguageLocale.general_address_province" ReadOnly />
|
||||||
|
<MudTextField Value="@result.AddressState" Label="@LanguageLocale.general_address_state"
|
||||||
|
ReadOnly />
|
||||||
|
</MudStack>
|
||||||
|
<MudStack row>
|
||||||
|
<MudTextField Value="@result.AddressCountry" Label="@LanguageLocale.general_address_country"
|
||||||
|
ReadOnly />
|
||||||
|
<MudTextField Value="@result.ZipCode" Label="@LanguageLocale.general_address_zipCode"
|
||||||
|
ReadOnly />
|
||||||
|
</MudStack>
|
||||||
|
</ChildContent>
|
||||||
|
</MudListItem>
|
||||||
|
}
|
||||||
|
</MudList>
|
||||||
|
</MudPaper>
|
||||||
|
|
||||||
|
</DialogContent>
|
||||||
|
<DialogActions>
|
||||||
|
<MudButton OnClick="Cancel">
|
||||||
|
@LanguageLocale.general_btnCancel
|
||||||
|
</MudButton>
|
||||||
|
<MudButton Color="Color.Primary" OnClick="btnSelectAddress">
|
||||||
|
@LanguageLocale.control_AddressQueryDialog_btnSelectAddress
|
||||||
|
</MudButton>
|
||||||
|
</DialogActions>
|
||||||
|
</MudDialog>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
// Dialog Instance injected when open by the DialogService.
|
||||||
|
// This field is null when dialog is not open by the DialogService.
|
||||||
|
[CascadingParameter]
|
||||||
|
private IMudDialogInstance MudDialog { get; set; } = null!;
|
||||||
|
// Reference to the Dialog when open by the ShowAsync Method. (When dialog is used inline).
|
||||||
|
// This field is null when dialog is not open using the internal methods.
|
||||||
|
private IDialogReference? _reference;
|
||||||
|
|
||||||
|
//Reference to the MudDialog component. Used to manage the internal dialog when the component is inline.
|
||||||
|
private MudDialog DialogRef { get; set; } = null!;
|
||||||
|
|
||||||
|
private string SearchText { get; set; } = "";
|
||||||
|
private List<AddressResultDTO> addressResults = [];
|
||||||
|
private AddressResultDTO? SelectedAddressResult { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
private void Cancel()
|
||||||
|
{
|
||||||
|
if (MudDialog is not null)
|
||||||
|
{
|
||||||
|
MudDialog.Cancel();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (_reference is not null)
|
||||||
|
{
|
||||||
|
DialogRef.CloseAsync(DialogResult.Cancel());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw new InvalidOperationException("Unable to cancel (close) the dialog!");
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task btnSearchAddress()
|
||||||
|
{
|
||||||
|
if (SearchText.Length == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var queryService = addressQueryFactory.GetService();
|
||||||
|
|
||||||
|
addressResults = await queryService.SearchAddressAsync(SearchText);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "SearchAddress returned an error!");
|
||||||
|
userMessage.ShowMessage($"Error searching address: {ex.Message}", MessageKind.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task btnSelectAddress()
|
||||||
|
{
|
||||||
|
if (SelectedAddressResult is null)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("Select an address", MessageKind.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DialogResult dialogResult = DialogResult.Ok<AddressResultDTO?>(SelectedAddressResult);
|
||||||
|
|
||||||
|
//Close the dialog when opened by DialogService.
|
||||||
|
if (MudDialog != null)
|
||||||
|
{
|
||||||
|
logger.LogDebug("AddressQueryDialog - Closed MudDialogInstance!");
|
||||||
|
MudDialog.Close(dialogResult);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
//Close the dialog when is a Inline dialog.
|
||||||
|
else if (_reference is not null)
|
||||||
|
{
|
||||||
|
logger.LogDebug("AddressQueryDialog - Closed inline dialog instance!");
|
||||||
|
await DialogRef.CloseAsync(dialogResult);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
//Throw if the dialog can't be closed (as none of the above is true).
|
||||||
|
throw new InvalidOperationException("Dialog cannot be closed! No reference to close!");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<IDialogReference> ShowAsync(DialogOptions? options = null)
|
||||||
|
{
|
||||||
|
_reference = await DialogRef.ShowAsync(options: options);
|
||||||
|
return _reference;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task CloseAsync()
|
||||||
|
{
|
||||||
|
await DialogRef.CloseAsync();
|
||||||
|
_reference = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
<MudMessageBox @ref="_msgBox" Title="@LanguageLocale.general_confirmTitle"
|
||||||
|
CancelText="@LanguageLocale.general_btnCancel">
|
||||||
|
<MessageContent>
|
||||||
|
@LanguageLocale.general_confirmDeleteMsg
|
||||||
|
</MessageContent>
|
||||||
|
<YesButton>
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Error" StartIcon="@Icons.Material.Filled.DeleteForever">
|
||||||
|
@LanguageLocale.general_btnDelete
|
||||||
|
</MudButton>
|
||||||
|
</YesButton>
|
||||||
|
</MudMessageBox>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
public MudMessageBox MsgBox => _msgBox;
|
||||||
|
|
||||||
|
MudMessageBox _msgBox = null!;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,152 @@
|
|||||||
|
@using Somnia.GuestLog.Models.DTOs;
|
||||||
|
@using Somnia.GuestLog.Services
|
||||||
|
@using Somnia.GuestLog.Services.Entity
|
||||||
|
|
||||||
|
@inject ILogger<AddressQueryDialog> logger;
|
||||||
|
@inject IUserMessageService userMessage
|
||||||
|
@inject IGuestDocumentEntityService guestDocumentService;
|
||||||
|
|
||||||
|
|
||||||
|
<MudDialog Style="max-height: 90%;">
|
||||||
|
<TitleContent>
|
||||||
|
<MudText Typo="Typo.h6">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.PersonSearch" Class="mr-3 mb-n1" />
|
||||||
|
@LanguageLocale.control_GuestDocumentSearchDialog_dialogTitle
|
||||||
|
</MudText>
|
||||||
|
</TitleContent>
|
||||||
|
<DialogContent>
|
||||||
|
<GuestDocumentFilterForm @bind-Filter="@filter" />
|
||||||
|
<MudButton StartIcon="@Icons.Material.Filled.Search" OnClick="BtnSearchGuestDocuments" FullWidth
|
||||||
|
Variant="Variant.Filled" Disabled="@isLoading">
|
||||||
|
@LanguageLocale.general_btnSearch
|
||||||
|
</MudButton>
|
||||||
|
<MudDivider DividerType="DividerType.FullWidth" Class="my-4" />
|
||||||
|
|
||||||
|
<MudPaper Class="pa-2" MinHeight="120px">
|
||||||
|
@if (!isLoading && results.Count() == 0)
|
||||||
|
{
|
||||||
|
<MudText Typo="Typo.body1" Align="Align.Center">@LanguageLocale.general_noResults</MudText>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (isLoading)
|
||||||
|
{
|
||||||
|
<MudSkeleton SkeletonType="SkeletonType.Rectangle" Height="100px" />
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (!isLoading)
|
||||||
|
{
|
||||||
|
@* Only show on first load *@
|
||||||
|
@if (loadCount == 1)
|
||||||
|
{
|
||||||
|
<MudText Align="Align.Center" GutterBottom>
|
||||||
|
@LanguageLocale.control_GuestDocumentSearchDialog_txtSuggestedGuests
|
||||||
|
</MudText>
|
||||||
|
}
|
||||||
|
|
||||||
|
<MudList T="GuestDocumentDTO" @bind-SelectedValue="SelectedResult"
|
||||||
|
SelectionMode="SelectionMode.SingleSelection" Color="Color.Info">
|
||||||
|
@foreach (GuestDocumentDTO result in results)
|
||||||
|
{
|
||||||
|
<MudListItem Value="result">
|
||||||
|
<ChildContent>
|
||||||
|
<MudTextField Value="@($"{result.DocumentType} - {result.DocumentNum}")"
|
||||||
|
Label="@LanguageLocale.dto_GuestDocument_DocumentNum" ReadOnly />
|
||||||
|
<MudTextField Value="@($"{result.Name} {result.Surname} {result.Surname2}")"
|
||||||
|
Label="@LanguageLocale.dto_GuestDocument_Name" ReadOnly />
|
||||||
|
</ChildContent>
|
||||||
|
</MudListItem>
|
||||||
|
}
|
||||||
|
</MudList>
|
||||||
|
}
|
||||||
|
</MudPaper>
|
||||||
|
|
||||||
|
</DialogContent>
|
||||||
|
<DialogActions>
|
||||||
|
<MudButton OnClick="Cancel">
|
||||||
|
@LanguageLocale.general_btnCancel
|
||||||
|
</MudButton>
|
||||||
|
<MudButton Color="Color.Primary" OnClick="btnSelectGuest">
|
||||||
|
@LanguageLocale.control_GuestDocumentSearchDialog_btnSelectDocument
|
||||||
|
</MudButton>
|
||||||
|
</DialogActions>
|
||||||
|
</MudDialog>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
// Dialog Instance injected when open by the DialogService.
|
||||||
|
// This field is null when dialog is not open by the DialogService.
|
||||||
|
[CascadingParameter]
|
||||||
|
private IMudDialogInstance MudDialog { get; set; } = null!;
|
||||||
|
|
||||||
|
|
||||||
|
private GuestDocFilterDTO filter { get; set; } = new()
|
||||||
|
{
|
||||||
|
OnlyLastVersion = true
|
||||||
|
};
|
||||||
|
private IEnumerable<GuestDocumentDTO> results = [];
|
||||||
|
private GuestDocumentDTO? SelectedResult { get; set; }
|
||||||
|
|
||||||
|
private bool isLoading = false;
|
||||||
|
private int loadCount = 0;
|
||||||
|
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
//Load last 5 guests.
|
||||||
|
await LoadGuests(limit: 5);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void Cancel() => MudDialog.Cancel();
|
||||||
|
|
||||||
|
|
||||||
|
private async Task LoadGuests(int limit = 25)
|
||||||
|
{
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
isLoading = true;
|
||||||
|
results = await guestDocumentService.GetDtoListByFilterAsync(filter);
|
||||||
|
isLoading = false;
|
||||||
|
loadCount++;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "GuestDocument Search returned an error!");
|
||||||
|
userMessage.ShowMessage($"Error searching: {ex.Message}", MessageKind.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#region Event Handlers
|
||||||
|
|
||||||
|
private async Task BtnSearchGuestDocuments()
|
||||||
|
{
|
||||||
|
if (filter.IsEmpty)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("Search can't be empty!", MessageKind.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Load unlimited guests using current filter.
|
||||||
|
await LoadGuests();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task btnSelectGuest()
|
||||||
|
{
|
||||||
|
if (SelectedResult is null)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("A guest document must be selected", MessageKind.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DialogResult dialogResult = DialogResult.Ok<GuestDocumentDTO?>(SelectedResult);
|
||||||
|
|
||||||
|
//Close the dialog when opened by DialogService.
|
||||||
|
logger.LogDebug("GuestDocumentSearchDialog - Closed MudDialogInstance!");
|
||||||
|
MudDialog.Close(dialogResult);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
}
|
||||||
+78
-17
@@ -17,14 +17,16 @@
|
|||||||
<MudDivider DividerType="DividerType.Middle" Class="mb-4" />
|
<MudDivider DividerType="DividerType.Middle" Class="mb-4" />
|
||||||
<MudStack Row style="@FieldMarginY">
|
<MudStack Row style="@FieldMarginY">
|
||||||
<MudSelect @bind-Value="Model.DocumentType" For="@(() => Model.DocumentType)" Label="@LanguageLocale.dto_GuestDocument_DocumentType"
|
<MudSelect @bind-Value="Model.DocumentType" For="@(() => Model.DocumentType)" Label="@LanguageLocale.dto_GuestDocument_DocumentType"
|
||||||
Required ReadOnly="true">
|
Required ReadOnly="@ReadOnlyDocId">
|
||||||
@foreach (string docType in dataListService.GetDataListByName(GuestConsts.DataList_DocumentTypes))
|
@foreach (string docType in dataListService.GetDataListByName(GuestConsts.DataList_DocumentTypes))
|
||||||
{
|
{
|
||||||
<MudSelectItem Value="docType">@dataListService.GetLocalizedValue(GuestConsts.DataList_DocumentTypes, docType)</MudSelectItem>
|
<MudSelectItem Value="docType">
|
||||||
|
@dataListService.GetLocalizedValue(GuestConsts.DataList_DocumentTypes, docType)
|
||||||
|
</MudSelectItem>
|
||||||
}
|
}
|
||||||
</MudSelect>
|
</MudSelect>
|
||||||
<MudTextField @bind-Value="Model.DocumentNum" For="@(() => Model.DocumentNum)" Label="@LanguageLocale.dto_GuestDocument_DocumentNum"
|
<MudTextField @bind-Value="Model.DocumentNum" For="@(() => Model.DocumentNum)" Label="@LanguageLocale.dto_GuestDocument_DocumentNum"
|
||||||
Immediate="true" Required ReadOnly="true" />
|
Required ReadOnly="@ReadOnlyDocId" />
|
||||||
</MudStack>
|
</MudStack>
|
||||||
|
|
||||||
<MudStack Row style="@FieldMarginY">
|
<MudStack Row style="@FieldMarginY">
|
||||||
@@ -32,7 +34,7 @@
|
|||||||
Clearable OpenTo="OpenTo.Year" Editable />
|
Clearable OpenTo="OpenTo.Year" Editable />
|
||||||
|
|
||||||
<MudTextField @bind-Value="Model.SupportNum" For="@(() => Model.SupportNum)" Label="@LanguageLocale.dto_GuestDocument_SupportNum"
|
<MudTextField @bind-Value="Model.SupportNum" For="@(() => Model.SupportNum)" Label="@LanguageLocale.dto_GuestDocument_SupportNum"
|
||||||
Immediate="true" Required="@isSuportNumberRequired" Mask="@(new PatternMask("aaa000000"))"
|
Required="@isSuportNumberRequired" Mask="@(new PatternMask("aaa000000"))"
|
||||||
OnBlur="@(() => Model.SupportNum = Model.SupportNum?.ToUpper())" />
|
OnBlur="@(() => Model.SupportNum = Model.SupportNum?.ToUpper())" />
|
||||||
</MudStack>
|
</MudStack>
|
||||||
|
|
||||||
@@ -49,13 +51,13 @@
|
|||||||
|
|
||||||
<MudTextField @bind-Value="Model.Name" For="@(() => Model.Name)"
|
<MudTextField @bind-Value="Model.Name" For="@(() => Model.Name)"
|
||||||
Label="@LanguageLocale.dto_GuestDocument_Name"
|
Label="@LanguageLocale.dto_GuestDocument_Name"
|
||||||
Immediate="true" OnBlur="@(() => Model.Name = Model.Name?.ToUpper())" />
|
OnBlur="@(() => Model.Name = Model.Name?.ToUpper())" />
|
||||||
<MudTextField @bind-Value="Model.Surname" For="@(() => Model.Surname)"
|
<MudTextField @bind-Value="Model.Surname" For="@(() => Model.Surname)"
|
||||||
Label="@LanguageLocale.dto_GuestDocument_Surname"
|
Label="@LanguageLocale.dto_GuestDocument_Surname"
|
||||||
Immediate="true" OnBlur="@(() => Model.Surname = Model.Surname?.ToUpper())" />
|
OnBlur="@(() => Model.Surname = Model.Surname?.ToUpper())" />
|
||||||
<MudTextField @bind-Value="Model.Surname2" For="@(() => Model.Surname2)"
|
<MudTextField @bind-Value="Model.Surname2" For="@(() => Model.Surname2)"
|
||||||
Label="@LanguageLocale.dto_GuestDocument_Surname2"
|
Label="@LanguageLocale.dto_GuestDocument_Surname2"
|
||||||
Immediate="true" OnBlur="@(() => Model.Surname2 = Model.Surname2?.ToUpper())" />
|
OnBlur="@(() => Model.Surname2 = Model.Surname2?.ToUpper())" />
|
||||||
|
|
||||||
<MudStack Row style="@FieldMarginY">
|
<MudStack Row style="@FieldMarginY">
|
||||||
<MudDatePicker @bind-Date="Model.BirthDate" For="@(() => Model.BirthDate)" Label="@LanguageLocale.dto_GuestDocument_BirthDate"
|
<MudDatePicker @bind-Date="Model.BirthDate" For="@(() => Model.BirthDate)" Label="@LanguageLocale.dto_GuestDocument_BirthDate"
|
||||||
@@ -64,7 +66,9 @@
|
|||||||
<MudSelect @bind-Value="Model.Gender" For="@(() => Model.Gender)" Label="@LanguageLocale.dto_GuestDocument_Gender">
|
<MudSelect @bind-Value="Model.Gender" For="@(() => Model.Gender)" Label="@LanguageLocale.dto_GuestDocument_Gender">
|
||||||
@foreach (string gender in dataListService.GetDataListByName(GuestConsts.DataList_GenderOptions))
|
@foreach (string gender in dataListService.GetDataListByName(GuestConsts.DataList_GenderOptions))
|
||||||
{
|
{
|
||||||
<MudSelectItem Value="gender">@dataListService.GetLocalizedValue(GuestConsts.DataList_GenderOptions, gender)</MudSelectItem>
|
<MudSelectItem Value="gender">
|
||||||
|
@dataListService.GetLocalizedValue(GuestConsts.DataList_GenderOptions, gender)
|
||||||
|
</MudSelectItem>
|
||||||
}
|
}
|
||||||
</MudSelect>
|
</MudSelect>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
@@ -79,10 +83,10 @@
|
|||||||
<MudStack Row>
|
<MudStack Row>
|
||||||
<MudTextField @bind-Value="Model.PhoneNumber" For="@(() => Model.PhoneNumber)"
|
<MudTextField @bind-Value="Model.PhoneNumber" For="@(() => Model.PhoneNumber)"
|
||||||
Label="@LanguageLocale.dto_GuestDocument_PhoneNumber"
|
Label="@LanguageLocale.dto_GuestDocument_PhoneNumber"
|
||||||
InputType="InputType.Telephone" Immediate="true" />
|
InputType="InputType.Telephone" />
|
||||||
<MudTextField @bind-Value="Model.EmailAddress" For="@(() => Model.EmailAddress)"
|
<MudTextField @bind-Value="Model.EmailAddress" For="@(() => Model.EmailAddress)"
|
||||||
Label="@LanguageLocale.dto_GuestDocument_EmailAddress"
|
Label="@LanguageLocale.dto_GuestDocument_EmailAddress"
|
||||||
InputType="InputType.Email" Immediate="true" />
|
InputType="InputType.Email" />
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</MudPaper>
|
</MudPaper>
|
||||||
</MudItem>
|
</MudItem>
|
||||||
@@ -92,23 +96,31 @@
|
|||||||
<MudText Typo="Typo.subtitle1" Align="Align.Center">@LanguageLocale.control_GuestDocForm_sectionAddress</MudText>
|
<MudText Typo="Typo.subtitle1" Align="Align.Center">@LanguageLocale.control_GuestDocForm_sectionAddress</MudText>
|
||||||
<MudDivider DividerType="DividerType.Middle" Class="mb-4" />
|
<MudDivider DividerType="DividerType.Middle" Class="mb-4" />
|
||||||
|
|
||||||
<MudTextField @bind-Value="Model.Address" For="@(() => Model.Address)" Immediate="true" Label="@LanguageLocale.dto_GuestDocument_Address" />
|
@if (!ReadOnly)
|
||||||
|
{
|
||||||
|
<MudButton OnClick="BtnOpenAddressSearchDialog" Variant="Variant.Outlined" FullWidth="true" Class="mb-2">
|
||||||
|
@LanguageLocale.control_GuestDocForm_btnSearchAddress
|
||||||
|
</MudButton>
|
||||||
|
}
|
||||||
|
|
||||||
|
<MudTextField @bind-Value="Model.Address" For="@(() => Model.Address)"
|
||||||
|
Label="@LanguageLocale.general_address_address" ReadOnly="@ReadOnlyAddress" />
|
||||||
<MudStack Row style="@FieldMarginY">
|
<MudStack Row style="@FieldMarginY">
|
||||||
<MudTextField @bind-Value="Model.AddressCity" For="@(() => Model.AddressCity)"
|
<MudTextField @bind-Value="Model.AddressCity" For="@(() => Model.AddressCity)"
|
||||||
Label="@LanguageLocale.dto_GuestDocument_AddressCity" Immediate="true" />
|
Label="@LanguageLocale.general_address_city" ReadOnly="@ReadOnlyAddress" />
|
||||||
<MudTextField @bind-Value="Model.AddressProvince" For="@(() => Model.AddressProvince)"
|
<MudTextField @bind-Value="Model.AddressProvince" For="@(() => Model.AddressProvince)"
|
||||||
Label="@LanguageLocale.dto_GuestDocument_AddressProvince" Immediate="true" />
|
Label="@LanguageLocale.general_address_province" ReadOnly="@ReadOnlyAddress" />
|
||||||
<MudTextField @bind-Value="Model.AddressState" For="@(() => Model.AddressState)"
|
<MudTextField @bind-Value="Model.AddressState" For="@(() => Model.AddressState)"
|
||||||
Label="@LanguageLocale.dto_GuestDocument_AddressState" Immediate="true" />
|
Label="@LanguageLocale.general_address_state" ReadOnly="@ReadOnlyAddress" />
|
||||||
</MudStack>
|
</MudStack>
|
||||||
<MudStack Row style="@FieldMarginY">
|
<MudStack Row style="@FieldMarginY">
|
||||||
<MudAutocomplete T="string" @bind-Value="Model.AddressCountry" For="@(() => Model.AddressCountry)"
|
<MudAutocomplete T="string" @bind-Value="Model.AddressCountry" For="@(() => Model.AddressCountry)"
|
||||||
Label="@LanguageLocale.dto_GuestDocument_AddressCountry"
|
Label="@LanguageLocale.general_address_country" ReadOnly="@ReadOnlyAddress"
|
||||||
SearchFunc="@SearchCountryCodes" ToStringFunc="@(e=> string.IsNullOrEmpty(e) ? "" : @dataListService.GetLocalizedValue(GuestConsts.DataList_CountryCodes, e))"
|
SearchFunc="@SearchCountryCodes" ToStringFunc="@(e=> string.IsNullOrEmpty(e) ? "" : @dataListService.GetLocalizedValue(GuestConsts.DataList_CountryCodes, e))"
|
||||||
SelectValueOnTab="true" AdornmentIcon="@Icons.Material.Filled.Search" />
|
SelectValueOnTab="true" AdornmentIcon="@Icons.Material.Filled.Search" />
|
||||||
|
|
||||||
<MudTextField @bind-Value="Model.ZipCode" For="@(() => Model.ZipCode)" Immediate="true"
|
<MudTextField @bind-Value="Model.ZipCode" For="@(() => Model.ZipCode)"
|
||||||
Label="@LanguageLocale.dto_GuestDocument_ZipCode" />
|
Label="@LanguageLocale.general_address_zipCode" ReadOnly="@ReadOnlyAddress" />
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</MudPaper>
|
</MudPaper>
|
||||||
</MudItem>
|
</MudItem>
|
||||||
@@ -116,6 +128,8 @@
|
|||||||
<MudText Class="mt-4">@CreateTimeString</MudText>
|
<MudText Class="mt-4">@CreateTimeString</MudText>
|
||||||
</MudForm>
|
</MudForm>
|
||||||
|
|
||||||
|
<AddressQueryDialog @ref="@AddressQueryDialog" />
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
|
|
||||||
[Parameter]
|
[Parameter]
|
||||||
@@ -124,9 +138,21 @@
|
|||||||
[Parameter]
|
[Parameter]
|
||||||
public bool ReadOnly { get; set; } = false;
|
public bool ReadOnly { get; set; } = false;
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public bool ReadOnlyDocId { get; set; } = true;
|
||||||
|
|
||||||
|
|
||||||
private MudForm _form = null!;
|
private MudForm _form = null!;
|
||||||
|
AddressQueryDialog AddressQueryDialog { get; set; } = null!;
|
||||||
|
DialogOptions AddressQueryDialogOptions = new()
|
||||||
|
{
|
||||||
|
MaxWidth = MaxWidth.Large,
|
||||||
|
FullWidth = true,
|
||||||
|
};
|
||||||
|
private bool ReadOnlyAddress { get; set; } = true;
|
||||||
|
|
||||||
private const string FieldMarginY = "margin-block: 0.5em";
|
private const string FieldMarginY = "margin-block: 0.5em";
|
||||||
|
|
||||||
private Dictionary<string, string>? countryDict = null;
|
private Dictionary<string, string>? countryDict = null;
|
||||||
|
|
||||||
private bool isSuportNumberRequired { get => Model?.Nationality == GuestConsts.CountryCode_ESP; }
|
private bool isSuportNumberRequired { get => Model?.Nationality == GuestConsts.CountryCode_ESP; }
|
||||||
@@ -178,4 +204,39 @@
|
|||||||
.Select(x => x.Key);
|
.Select(x => x.Key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#region Event Handlers
|
||||||
|
|
||||||
|
private async Task BtnOpenAddressSearchDialog()
|
||||||
|
{
|
||||||
|
var reference = await AddressQueryDialog.ShowAsync(options: AddressQueryDialogOptions);
|
||||||
|
|
||||||
|
DialogResult? result = await reference.Result;
|
||||||
|
|
||||||
|
if (result is null || result.Canceled)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
AddressResultDTO? resultData = await reference.GetReturnValueAsync<AddressResultDTO>();
|
||||||
|
if (resultData is null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Update Address info.
|
||||||
|
Model.Address = $"{resultData.AddressRoad}, {resultData.HouseNumber}";
|
||||||
|
Model.AddressCity = resultData.AddressCity;
|
||||||
|
Model.AddressProvince = resultData.AddressProvince;
|
||||||
|
Model.AddressState = resultData.AddressState;
|
||||||
|
Model.ZipCode = resultData.ZipCode;
|
||||||
|
|
||||||
|
//Set country by address code.
|
||||||
|
Model.AddressCountry = resultData.AddressCountryCode;
|
||||||
|
|
||||||
|
//Address is editable after searching (if the form is editable).
|
||||||
|
ReadOnlyAddress = ReadOnly;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
@using Somnia.GuestLog.Models.DTOs
|
||||||
|
@using Somnia.GuestLog.Services
|
||||||
|
|
||||||
|
@inject IDataListService dataListService;
|
||||||
|
|
||||||
|
<MudForm Model="@Filter" IsTouchedChanged="@(() => FilterChanged.InvokeAsync(Filter))">
|
||||||
|
<MudStack Row Breakpoint="Breakpoint.LgAndDown" StretchItems="StretchItems.All">
|
||||||
|
<MudStack Row style="margin-block: 0.2em;">
|
||||||
|
<MudSelect @bind-Value="Filter.DocumentType" For="@(() => Filter.DocumentType)"
|
||||||
|
Label="@LanguageLocale.dto_GuestDocument_DocumentType" FullWidth Clearable>
|
||||||
|
@foreach (string docType in dataListService.GetDataListByName(GuestConsts.DataList_DocumentTypes))
|
||||||
|
{
|
||||||
|
<MudSelectItem Value="docType">
|
||||||
|
@dataListService.GetLocalizedValue(GuestConsts.DataList_DocumentTypes, docType)
|
||||||
|
</MudSelectItem>
|
||||||
|
}
|
||||||
|
</MudSelect>
|
||||||
|
<MudTextField @bind-Value="Filter.DocumentNumber" For="@(() => Filter.DocumentNumber)"
|
||||||
|
Label="@LanguageLocale.dto_GuestDocument_DocumentNum" FullWidth Clearable />
|
||||||
|
</MudStack>
|
||||||
|
<MudStack Row style="margin-block: 0.2em;">
|
||||||
|
<MudTextField @bind-Value="Filter.Name" For="@(() => Filter.Name)"
|
||||||
|
Label="@LanguageLocale.dto_GuestDocument_Name" HelperText="@LanguageLocale.general_wildcardHelperText"
|
||||||
|
HelperTextOnFocus="true" FullWidth Clearable OnBlur="@(() => Filter.Name = Filter.Name?.ToUpper())" />
|
||||||
|
<MudTextField @bind-Value="Filter.Surname" For="@(() => Filter.Surname)"
|
||||||
|
Label="@LanguageLocale.dto_GuestDocument_Surname"
|
||||||
|
HelperText="@LanguageLocale.general_wildcardHelperText" HelperTextOnFocus="true" FullWidth Clearable
|
||||||
|
OnBlur="@(() => Filter.Surname = Filter.Surname?.ToUpper())" />
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudForm>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public GuestDocFilterDTO Filter { get; set; } = new();
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public EventCallback<GuestDocFilterDTO> FilterChanged { get; set; }
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
@using System.ComponentModel
|
||||||
|
@using Somnia.GuestLog.Models.DTOs
|
||||||
|
@using Somnia.GuestLog.Services
|
||||||
|
|
||||||
|
@inject IDataListService dataListService;
|
||||||
|
|
||||||
|
<MudForm Model="@Filter" IsTouchedChanged="@(() => FilterChanged.InvokeAsync(Filter))">
|
||||||
|
<MudStack Row Breakpoint="Breakpoint.LgAndDown" StretchItems="StretchItems.All">
|
||||||
|
<MudStack Row style="margin-block: 0.2em;">
|
||||||
|
<MudDatePicker @bind-Date="Filter.DateInStart" For="@(() => Filter.DateInStart)"
|
||||||
|
Label="@LanguageLocale.general_dateStart" OpenTo="OpenTo.Date" Editable Required="@DateRequired" />
|
||||||
|
<MudDatePicker @bind-Date="Filter.DateInEnd" For="@(() => Filter.DateInEnd)"
|
||||||
|
Label="@LanguageLocale.general_dateEnd" OpenTo="OpenTo.Date" Editable Required="@DateRequired" />
|
||||||
|
</MudStack>
|
||||||
|
|
||||||
|
<MudStack Row style="margin-block: 0.2em;">
|
||||||
|
<MudTextField @bind-Value="Filter.RoomNumber" For="@(() => Filter.RoomNumber)"
|
||||||
|
Label="@LanguageLocale.dto_StayEntry_RoomNumber" FullWidth Clearable />
|
||||||
|
<MudSelect @bind-Value="Filter.PaymentMethod" For="@(() => Filter.PaymentMethod)"
|
||||||
|
Label="@LanguageLocale.dto_StayEntry_PaymentMethod" FullWidth Clearable>
|
||||||
|
@foreach (string paymentType in
|
||||||
|
dataListService.GetDataListByName(GuestConsts.DataList_PaymentMethods))
|
||||||
|
{
|
||||||
|
<MudSelectItem Value="paymentType">
|
||||||
|
@dataListService.GetLocalizedValue(GuestConsts.DataList_PaymentMethods, paymentType)
|
||||||
|
</MudSelectItem>
|
||||||
|
}
|
||||||
|
</MudSelect>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudForm>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
|
||||||
|
[Parameter, Bindable(true)]
|
||||||
|
public StayEntryFilterDTO Filter { get; set; } = new();
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public EventCallback<StayEntryFilterDTO> FilterChanged { get; set; }
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public bool DateRequired { get; set; } = true;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,270 @@
|
|||||||
|
@using System.Diagnostics
|
||||||
|
@using FluentValidation;
|
||||||
|
@using Somnia.GuestLog.Models.DTOs;
|
||||||
|
@using Somnia.GuestLog.Services;
|
||||||
|
@using Somnia.GuestLog.Validators;
|
||||||
|
|
||||||
|
@inject IDataListService dataListService;
|
||||||
|
@inject IValidator<StayEntryDTO> stayValidator;
|
||||||
|
@inject IDialogService dialogService;
|
||||||
|
@inject IUserMessageService userMessage
|
||||||
|
|
||||||
|
|
||||||
|
<MudForm @ref="@_form" Model="@Model" Validation="@((stayValidator as StayEntryDTOValidator)!.ValidateValue)"
|
||||||
|
ReadOnly="@ReadOnly">
|
||||||
|
<MudGrid>
|
||||||
|
<MudItem xs="12" xl=6>
|
||||||
|
<MudPaper Class="pa-4" Elevation="3" Height="100%">
|
||||||
|
<MudText Typo="Typo.subtitle1" Align="Align.Center">
|
||||||
|
@LanguageLocale.control_StayEntryForm_sectionDetails
|
||||||
|
</MudText>
|
||||||
|
<MudDivider DividerType="DividerType.Middle" Class="mb-4" />
|
||||||
|
|
||||||
|
<MudStack Row style="@FieldMarginY">
|
||||||
|
<MudDatePicker @ref="_datePickerDateIn" @bind-Date="Model.DateIn" For="@(() => Model.DateIn)"
|
||||||
|
Label="@LanguageLocale.dto_StayEntry_DateIn" Clearable OpenTo="OpenTo.Date" Editable
|
||||||
|
AutoClose="true" />
|
||||||
|
<MudTimePicker Time="Model.DateIn?.TimeOfDay" Label=" " Editable
|
||||||
|
TimeChanged="@((newVal) => Model.DateIn = GetDateTimeFromDateAndTime(Model.DateIn, newVal))" />
|
||||||
|
<MudDatePicker @ref="_datePickerDateOut" @bind-Date="Model.DateOut" For="@(() => Model.DateOut)"
|
||||||
|
Label="@LanguageLocale.dto_StayEntry_DateOut" Clearable OpenTo="OpenTo.Date" Editable
|
||||||
|
AutoClose="true" />
|
||||||
|
<MudTimePicker Time="Model.DateOut?.TimeOfDay" Label=" " Editable
|
||||||
|
TimeChanged="@((newVal) => Model.DateOut = GetDateTimeFromDateAndTime(Model.DateOut, newVal))" />
|
||||||
|
</MudStack>
|
||||||
|
<MudStack Row style="@FieldMarginY">
|
||||||
|
<MudTextField @bind-Value="Model.RoomCount" For="@(() => Model.RoomCount)"
|
||||||
|
Label="@LanguageLocale.dto_StayEntry_RoomCount" InputType="InputType.Number" FullWidth />
|
||||||
|
<MudTextField @bind-Value="Model.RoomNumber" For="@(() => Model.RoomNumber)"
|
||||||
|
Label="@LanguageLocale.dto_StayEntry_RoomNumber" FullWidth />
|
||||||
|
|
||||||
|
<MudSelect @bind-Value="Model.PaymentMethod" For="@(() => Model.PaymentMethod)"
|
||||||
|
Label="@LanguageLocale.dto_StayEntry_PaymentMethod" FullWidth>
|
||||||
|
@foreach (string payment in PaymentMethodSet)
|
||||||
|
{
|
||||||
|
<MudSelectItem Value="payment">
|
||||||
|
@dataListService.GetLocalizedValue(GuestConsts.DataList_PaymentMethods, payment)
|
||||||
|
</MudSelectItem>
|
||||||
|
}
|
||||||
|
</MudSelect>
|
||||||
|
</MudStack>
|
||||||
|
</MudPaper>
|
||||||
|
</MudItem>
|
||||||
|
<MudItem xs="12" xl=6>
|
||||||
|
<MudPaper Class="pa-4" Elevation="3" Height="100%" Width="100%">
|
||||||
|
<MudText Typo="Typo.subtitle1" Align="Align.Center">
|
||||||
|
@LanguageLocale.control_StayEntryForm_sectionGuests
|
||||||
|
</MudText>
|
||||||
|
<MudDivider DividerType="DividerType.Middle" Class="mb-4" />
|
||||||
|
|
||||||
|
@if (!ReadOnly)
|
||||||
|
{
|
||||||
|
<MudStack Row style="@FieldMarginY">
|
||||||
|
<MudButton OnClick="BtnAddGuest" StartIcon="@Icons.Material.Filled.Add">
|
||||||
|
@LanguageLocale.control_StayEntryForm_btnAddGuest
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
}
|
||||||
|
|
||||||
|
<MudTable Items="@Model.GuestDocuments" Hover="true">
|
||||||
|
<HeaderContent>
|
||||||
|
<MudTh>@LanguageLocale.dto_GuestDocument_DocumentType</MudTh>
|
||||||
|
<MudTh>@LanguageLocale.dto_GuestDocument_DocumentNum</MudTh>
|
||||||
|
<MudTh>@LanguageLocale.dto_GuestDocument_Name</MudTh>
|
||||||
|
<MudTh>@LanguageLocale.dto_GuestDocument_Surname</MudTh>
|
||||||
|
<MudTh>@LanguageLocale.dto_GuestDocument_Surname2</MudTh>
|
||||||
|
<MudTh>@LanguageLocale.general_actions</MudTh>
|
||||||
|
</HeaderContent>
|
||||||
|
<RowTemplate>
|
||||||
|
<MudTd DataLabel="@LanguageLocale.dto_GuestDocument_DocumentType">
|
||||||
|
@context.DocumentType
|
||||||
|
</MudTd>
|
||||||
|
<MudTd DataLabel="@LanguageLocale.dto_GuestDocument_DocumentNum">
|
||||||
|
@context.DocumentNum
|
||||||
|
</MudTd>
|
||||||
|
<MudTd DataLabel="@LanguageLocale.dto_GuestDocument_Name">
|
||||||
|
@context.Name
|
||||||
|
</MudTd>
|
||||||
|
<MudTd DataLabel="@LanguageLocale.dto_GuestDocument_Surname" HideSmall="true">
|
||||||
|
@context.Surname
|
||||||
|
</MudTd>
|
||||||
|
<MudTd DataLabel="@LanguageLocale.dto_GuestDocument_Surname2" HideSmall="true">
|
||||||
|
@context.Surname2
|
||||||
|
</MudTd>
|
||||||
|
@if (!ReadOnly)
|
||||||
|
{
|
||||||
|
<MudTd DataLabel="@LanguageLocale.general_actions">
|
||||||
|
<MudIconButton Icon="@Icons.Material.Filled.Delete"
|
||||||
|
OnClick="@(() => BtnDeleteGuest(context.Id!.Value, context.Version!.Value))" />
|
||||||
|
</MudTd>
|
||||||
|
}
|
||||||
|
@if (ReadOnly)
|
||||||
|
{
|
||||||
|
<MudTd DataLabel="@LanguageLocale.general_actions">
|
||||||
|
<MudIconButton Icon="@Icons.Material.Filled.Info"
|
||||||
|
OnClick="@(() => BtnViewGuestDetails(context))" />
|
||||||
|
</MudTd>
|
||||||
|
}
|
||||||
|
</RowTemplate>
|
||||||
|
</MudTable>
|
||||||
|
|
||||||
|
</MudPaper>
|
||||||
|
</MudItem>
|
||||||
|
</MudGrid>
|
||||||
|
</MudForm>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
[Parameter]
|
||||||
|
public StayEntryDTO Model { private get; set; } = new();
|
||||||
|
|
||||||
|
[Parameter, EditorRequired]
|
||||||
|
public FormMode FormMode { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
private bool ReadOnly => FormMode == FormMode.ReadOnly;
|
||||||
|
|
||||||
|
|
||||||
|
private MudForm _form = null!;
|
||||||
|
private MudDatePicker _datePickerDateIn = null!;
|
||||||
|
private MudDatePicker _datePickerDateOut = null!;
|
||||||
|
|
||||||
|
private const string FieldMarginY = "margin-block: 0.5em";
|
||||||
|
private IEnumerable<string> PaymentMethodSet
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (field is null)
|
||||||
|
{
|
||||||
|
field = dataListService.GetDataListByName(GuestConsts.DataList_PaymentMethods);
|
||||||
|
}
|
||||||
|
return field;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
protected override void OnInitialized()
|
||||||
|
{
|
||||||
|
//Initialize values when not ReadOnly.
|
||||||
|
if (FormMode == FormMode.Create)
|
||||||
|
{
|
||||||
|
Model.DateIn = DateTime.Now;
|
||||||
|
|
||||||
|
DateTime dateOut = DateTime.Today.AddDays(1);
|
||||||
|
Model.DateOut = new(
|
||||||
|
year: dateOut.Year, month: dateOut.Month, day: dateOut.Day,
|
||||||
|
hour: 12, minute: 0, second: 0
|
||||||
|
);
|
||||||
|
|
||||||
|
//Init Guest List
|
||||||
|
Model.GuestDocuments = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Public Methods
|
||||||
|
|
||||||
|
public async Task<bool> ValidateForm()
|
||||||
|
{
|
||||||
|
await _form.ValidateAsync();
|
||||||
|
|
||||||
|
if (Model.GuestDocuments is null || Model.GuestDocuments.Count == 0)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("At least 1 guest is required!", MessageKind.Warning);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return _form.IsValid;
|
||||||
|
}
|
||||||
|
|
||||||
|
public StayEntryDTO GetModel()
|
||||||
|
{
|
||||||
|
return Model;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
private static DateTime? GetDateTimeFromDateAndTime(DateTime? date, TimeSpan? time)
|
||||||
|
{
|
||||||
|
DateOnly? dateOnly = date is not null ? DateOnly.FromDateTime(date.Value) : null;
|
||||||
|
TimeOnly? timeOnly = time is not null ? TimeOnly.FromTimeSpan(time.Value) : null;
|
||||||
|
|
||||||
|
if (dateOnly is not null && timeOnly is not null)
|
||||||
|
{
|
||||||
|
return new DateTime(dateOnly.Value, timeOnly.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Event Handlers
|
||||||
|
|
||||||
|
private async Task BtnAddGuest()
|
||||||
|
{
|
||||||
|
Debug.Assert(Model.GuestDocuments != null);
|
||||||
|
|
||||||
|
DialogOptions dialogOptions = new()
|
||||||
|
{
|
||||||
|
MaxWidth = MaxWidth.Medium,
|
||||||
|
FullWidth = true,
|
||||||
|
BackdropClick = false,
|
||||||
|
CloseOnEscapeKey = true,
|
||||||
|
};
|
||||||
|
|
||||||
|
var dialog = await dialogService.ShowAsync<GuestDocumentSearchDialog>(title: "", options: dialogOptions);
|
||||||
|
DialogResult? result = await dialog.Result;
|
||||||
|
|
||||||
|
if (result is null || result.Canceled)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GuestDocumentDTO? resultData = await dialog.GetReturnValueAsync<GuestDocumentDTO>();
|
||||||
|
|
||||||
|
if (resultData is null)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("Error! No Guest Document selected!", MessageKind.Error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Check if this guest is already added.
|
||||||
|
if (Model.GuestDocuments.Count > 0)
|
||||||
|
{
|
||||||
|
bool alreadyAdded = Model.GuestDocuments.Any(e => e.Id == resultData.Id);
|
||||||
|
if (alreadyAdded)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("GuestDocument already added!", MessageKind.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Model.GuestDocuments.Add(resultData);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnDeleteGuest(long guestDocId, int version)
|
||||||
|
{
|
||||||
|
Debug.Assert(Model.GuestDocuments is not null);
|
||||||
|
|
||||||
|
//Filter out given GuestDocument from model.
|
||||||
|
Model.GuestDocuments = Model.GuestDocuments
|
||||||
|
.Where(e => !(e.Id == guestDocId && e.Version == version))
|
||||||
|
.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private async Task BtnViewGuestDetails(GuestDocumentDTO item)
|
||||||
|
{
|
||||||
|
var parameters =
|
||||||
|
new DialogParameters<GuestDocDetailsDialog> { { x => x.DocumentDTO, item } };
|
||||||
|
var options = new DialogOptions()
|
||||||
|
{
|
||||||
|
FullScreen = true,
|
||||||
|
CloseButton = true,
|
||||||
|
CloseOnEscapeKey = true,
|
||||||
|
};
|
||||||
|
|
||||||
|
await dialogService.ShowAsync<GuestDocDetailsDialog>("GuestDoc Details", parameters, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,11 +1,19 @@
|
|||||||
|
<MudNavMenu>
|
||||||
<MudNavMenu>
|
|
||||||
<MudNavLink Href="" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Home">Home</MudNavLink>
|
<MudNavLink Href="" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Home">Home</MudNavLink>
|
||||||
|
|
||||||
|
@*
|
||||||
<MudNavLink Href="counter" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Add">Counter</MudNavLink>
|
<MudNavLink Href="counter" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Add">Counter</MudNavLink>
|
||||||
|
|
||||||
<MudNavLink Href="weather" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.List">Weather</MudNavLink>
|
<MudNavLink Href="weather" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.List">Weather</MudNavLink>
|
||||||
|
*@
|
||||||
|
|
||||||
<MudNavLink Href="@GuestConsts.Page_GuestDocs_List" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.DocumentScanner">Guests</MudNavLink>
|
<MudNavLink Href="@GuestConsts.Page_GuestDocs_List" Match="NavLinkMatch.Prefix"
|
||||||
|
Icon="@Icons.Material.Filled.DocumentScanner">
|
||||||
|
@LanguageLocale.navMenu_GuestDocumentList
|
||||||
|
</MudNavLink>
|
||||||
|
<MudNavLink Href="@GuestConsts.Page_StayEntry_List" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Book">
|
||||||
|
@LanguageLocale.navMenu_StayEntryList
|
||||||
|
</MudNavLink>
|
||||||
|
<MudNavLink Href="@GuestConsts.Page_StayExport_List" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.ImportExport">
|
||||||
|
@LanguageLocale.navMenu_StayExport
|
||||||
|
</MudNavLink>
|
||||||
</MudNavMenu>
|
</MudNavMenu>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,115 @@
|
|||||||
|
@page "/debug/addrSearch"
|
||||||
|
|
||||||
|
@using Somnia.GuestLog.Models.DTOs;
|
||||||
|
@using Somnia.GuestLog.Services;
|
||||||
|
@using Somnia.GuestLog.Services.AddressQuery;
|
||||||
|
|
||||||
|
@inject ILogger<AddressQuery> logger;
|
||||||
|
@inject IAddressQueryFactory addressQueryFactory;
|
||||||
|
@inject IUserMessageService userMessage
|
||||||
|
@inject IDialogService DialogService
|
||||||
|
|
||||||
|
<PageTitle>DEBUG - Address Query</PageTitle>
|
||||||
|
|
||||||
|
<MudText Typo="Typo.h3" GutterBottom="true" Class="mt-2">Address Search</MudText>
|
||||||
|
|
||||||
|
<MudPaper Class="ma-2 pa-4">
|
||||||
|
<MudStack Row>
|
||||||
|
<MudTextField @ref="txtSearch" @bind-Value="SearchText" Label="Search address" Required />
|
||||||
|
<MudButton Color="Color.Primary" Variant="Variant.Filled" @onclick="btnSearchAddress" Class="mt-2">Search
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
|
||||||
|
<MudPaper class="mt-2 pa-4">
|
||||||
|
@if (addressResults.Count == 0)
|
||||||
|
{
|
||||||
|
<MudText Typo="Typo.body1">No results!</MudText>
|
||||||
|
}
|
||||||
|
@foreach (AddressResultDTO result in addressResults)
|
||||||
|
{
|
||||||
|
<MudItem>
|
||||||
|
<MudStack>
|
||||||
|
<MudText>Address: @result.AddressRoad , @result.HouseNumber</MudText>
|
||||||
|
<MudText>City: @result.AddressCity</MudText>
|
||||||
|
<MudText>Province: @result.AddressProvince</MudText>
|
||||||
|
<MudText>State: @result.AddressState</MudText>
|
||||||
|
<MudText>Country: @result.AddressCountry</MudText>
|
||||||
|
<MudText>ZipCode: @result.ZipCode</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudItem>
|
||||||
|
}
|
||||||
|
</MudPaper>
|
||||||
|
</MudPaper>
|
||||||
|
|
||||||
|
<MudDivider DividerType="DividerType.FullWidth" />
|
||||||
|
|
||||||
|
<MudPaper Class="ma-2 pa-4">
|
||||||
|
<MudButton OnClick="btnOpenSearchDialog" Color="Color.Primary" Variant="Variant.Filled" FullWidth>
|
||||||
|
Open Search Dialog
|
||||||
|
</MudButton>
|
||||||
|
|
||||||
|
@if (dialogSelectedAddress is not null)
|
||||||
|
{
|
||||||
|
<MudPaper class="mt-2 pa-4">
|
||||||
|
<MudText>Selected Address: </MudText>
|
||||||
|
<MudStack>
|
||||||
|
<MudText>Address: @dialogSelectedAddress.AddressRoad , @dialogSelectedAddress.HouseNumber</MudText>
|
||||||
|
<MudText>City: @dialogSelectedAddress.AddressCity</MudText>
|
||||||
|
<MudText>Province: @dialogSelectedAddress.AddressProvince</MudText>
|
||||||
|
<MudText>State: @dialogSelectedAddress.AddressState</MudText>
|
||||||
|
<MudText>Country: @dialogSelectedAddress.AddressCountry</MudText>
|
||||||
|
<MudText>ZipCode: @dialogSelectedAddress.ZipCode</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudPaper>
|
||||||
|
}
|
||||||
|
</MudPaper>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
|
||||||
|
public string SearchText { get; set; } = "";
|
||||||
|
private List<AddressResultDTO> addressResults = [];
|
||||||
|
|
||||||
|
private MudTextField<string> txtSearch = null!;
|
||||||
|
|
||||||
|
private AddressResultDTO? dialogSelectedAddress = null;
|
||||||
|
|
||||||
|
private async Task btnSearchAddress()
|
||||||
|
{
|
||||||
|
if (SearchText.Length == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var queryService = addressQueryFactory.GetService();
|
||||||
|
|
||||||
|
addressResults = await queryService.SearchAddressAsync(SearchText);
|
||||||
|
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "SearchAddress returned an error!");
|
||||||
|
userMessage.ShowMessage($"Error searching address: {ex.Message}", MessageKind.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task btnOpenSearchDialog()
|
||||||
|
{
|
||||||
|
DialogOptions options = new()
|
||||||
|
{
|
||||||
|
MaxWidth = MaxWidth.Large,
|
||||||
|
FullWidth= true,
|
||||||
|
};
|
||||||
|
|
||||||
|
var dialog = await DialogService.ShowAsync<AddressQueryDialog>("Search Address", options);
|
||||||
|
DialogResult? result = await dialog.Result;
|
||||||
|
|
||||||
|
if (result is not null && !result.Canceled)
|
||||||
|
{
|
||||||
|
AddressResultDTO? resultData = await dialog.GetReturnValueAsync<AddressResultDTO>();
|
||||||
|
|
||||||
|
dialogSelectedAddress = resultData;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
@page "/debug/empty"
|
||||||
|
|
||||||
|
@using Somnia.GuestLog.Services
|
||||||
|
|
||||||
|
|
||||||
|
@inject ILogger<Empty> logger;
|
||||||
|
@inject IUserMessageService userMessage
|
||||||
|
@inject IDialogService DialogService
|
||||||
|
|
||||||
|
<PageTitle>DEBUG - Empty</PageTitle>
|
||||||
|
|
||||||
|
<MudText Typo="Typo.h3" GutterBottom="true" Class="mt-2">Empty Page for Debug</MudText>
|
||||||
|
|
||||||
|
|
||||||
|
@code {
|
||||||
|
|
||||||
|
}
|
||||||
@@ -2,23 +2,22 @@
|
|||||||
|
|
||||||
@using Somnia.GuestLog.Models.DTOs;
|
@using Somnia.GuestLog.Models.DTOs;
|
||||||
@using Somnia.GuestLog.Services;
|
@using Somnia.GuestLog.Services;
|
||||||
|
@using Microsoft.AspNetCore.WebUtilities;
|
||||||
|
|
||||||
@inject ISnackbar Snackbar
|
@inject IUserMessageService userMessage
|
||||||
@inject IDialogService DialogService
|
@inject IDialogService DialogService
|
||||||
@inject NavigationManager Navigation
|
@inject NavigationManager Navigation
|
||||||
@inject IGuestDocumentService guestDocService
|
@inject IGuestDocumentEntityService guestDocService
|
||||||
|
@inject IStayEntryEntityService stayService
|
||||||
|
|
||||||
@inject FluentValidation.IValidator<GuestDocIdDTO> docIdValidator;
|
|
||||||
|
|
||||||
|
|
||||||
<PageTitle>Somnia - Guest Docs - Details</PageTitle>
|
<PageTitle>Somnia - Guest Docs - Details</PageTitle>
|
||||||
|
|
||||||
<MudStack Row="true" Class="my-4">
|
<MudStack Row="true" Class="my-4">
|
||||||
<MudText Typo="Typo.h4" GutterBottom="true">Guest Document - "@docId"</MudText>
|
<MudText Typo="Typo.h4" GutterBottom="true">Guest Document: @docId - @documentModel?.FullDocument</MudText>
|
||||||
<MudSpacer />
|
<MudSpacer />
|
||||||
<MudButton Variant="Variant.Filled" Color="Color.Success" Size="Size.Small" StartIcon="@Icons.Material.Filled.Add"
|
<MudButton Variant="Variant.Filled" Color="Color.Success" Size="Size.Small" StartIcon="@Icons.Material.Filled.Edit"
|
||||||
OnClick="() => BtnEdit()">
|
OnClick="() => BtnEdit()" Disabled>
|
||||||
@LanguageLocale.general_btnEdit
|
@LanguageLocale.general_btnEdit
|
||||||
</MudButton>
|
</MudButton>
|
||||||
<MudButton Variant="Variant.Filled" Color="Color.Default" Size="Size.Small"
|
<MudButton Variant="Variant.Filled" Color="Color.Default" Size="Size.Small"
|
||||||
@@ -29,53 +28,122 @@
|
|||||||
|
|
||||||
@if (documentModel is not null)
|
@if (documentModel is not null)
|
||||||
{
|
{
|
||||||
<GuestDocForm @ref="_form" Model="documentModel" ReadOnly="true" />
|
<MudTabs Elevation="3" Rounded="true" ApplyEffectsToContainer="true" TabPanelsClass="pa-4" KeepPanelsAlive="true"
|
||||||
|
Centered>
|
||||||
|
|
||||||
|
<MudTabPanel Text="Details" Icon="@Icons.Material.Filled.Info">
|
||||||
|
<GuestDocForm @ref="_form" Model="documentModel" ReadOnly="true" />
|
||||||
|
</MudTabPanel>
|
||||||
|
|
||||||
|
<MudTabPanel Text="Stays" ToolTip="Guest stays" OnClick="LoadTabGuestStays" Icon="@Icons.Material.Filled.Bed">
|
||||||
|
<MudText>Total Stays: @(guestStaysLoading ? "Loading..." : guestStayList.Count())</MudText>
|
||||||
|
<MudTable Items="@guestStayList" Hover="true" Loading="@guestStaysLoading" Class="mt-2" Elevation="2">
|
||||||
|
<HeaderContent>
|
||||||
|
<MudTh>@LanguageLocale.dto_StayEntry_DateIn</MudTh>
|
||||||
|
<MudTh>@LanguageLocale.dto_StayEntry_DateOut</MudTh>
|
||||||
|
<MudTh>@LanguageLocale.dto_StayEntry_RoomCount</MudTh>
|
||||||
|
<MudTh>@LanguageLocale.dto_StayEntry_RoomNumber</MudTh>
|
||||||
|
<MudTh>@LanguageLocale.general_actions</MudTh>
|
||||||
|
</HeaderContent>
|
||||||
|
<RowTemplate>
|
||||||
|
<MudTd DataLabel="@LanguageLocale.dto_StayEntry_DateIn">
|
||||||
|
@context.DateIn
|
||||||
|
</MudTd>
|
||||||
|
<MudTd DataLabel="@LanguageLocale.dto_StayEntry_DateOut">
|
||||||
|
@context.DateOut
|
||||||
|
</MudTd>
|
||||||
|
<MudTd DataLabel="@LanguageLocale.dto_StayEntry_RoomCount">
|
||||||
|
@context.RoomCount
|
||||||
|
</MudTd>
|
||||||
|
<MudTd DataLabel="@LanguageLocale.dto_StayEntry_RoomNumber">
|
||||||
|
@context.RoomNumber
|
||||||
|
</MudTd>
|
||||||
|
<MudTd DataLabel="@LanguageLocale.general_actions">
|
||||||
|
<MudIconButton Icon="@Icons.Material.Filled.Info" OnClick="@(() => BtnViewStayDetails(context))" />
|
||||||
|
</MudTd>
|
||||||
|
</RowTemplate>
|
||||||
|
<NoRecordsContent>
|
||||||
|
<MudText>@LanguageLocale.general_noResults</MudText>
|
||||||
|
</NoRecordsContent>
|
||||||
|
<LoadingContent>
|
||||||
|
<MudSkeleton Height="50px" Class="mx-4" />
|
||||||
|
</LoadingContent>
|
||||||
|
</MudTable>
|
||||||
|
</MudTabPanel>
|
||||||
|
|
||||||
|
</MudTabs>
|
||||||
}
|
}
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
|
|
||||||
[Parameter]
|
[Parameter]
|
||||||
public string? docId { get; set; }
|
public long docId { get; set; }
|
||||||
|
|
||||||
GuestDocForm _form = null!;
|
GuestDocForm _form = null!;
|
||||||
|
|
||||||
GuestDocumentDTO? documentModel = null;
|
GuestDocumentDTO? documentModel = null;
|
||||||
|
|
||||||
|
|
||||||
|
IEnumerable<StayEntryDTO> guestStayList = [];
|
||||||
|
bool guestStaysLoading = true;
|
||||||
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
if (docId is null)
|
|
||||||
{
|
|
||||||
Snackbar.Add("No GuestDocument provided!!", Severity.Error);
|
|
||||||
Navigation.NotFound();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
GuestDocIdDTO? docIdModel = GuestDocIdDTO.DecodeFromString(docId);
|
|
||||||
if (docIdModel is null)
|
|
||||||
{
|
|
||||||
Snackbar.Add($"Provided GuestDocId can't be decoded: '{docId}'", Severity.Error);
|
|
||||||
Navigation.NotFound();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Get model from db.
|
//Get model from db.
|
||||||
documentModel = await guestDocService.GetDtoByIdAsync(docIdModel.DocumentType, docIdModel.DocumentNum);
|
documentModel = await guestDocService.GetLastVersionDtoByIdAsync(docId);
|
||||||
if (documentModel is null)
|
if (documentModel is null)
|
||||||
{
|
{
|
||||||
Snackbar.Add($"GuestDocument not found with ID: '{docId}'", Severity.Error);
|
userMessage.ShowMessage($"GuestDocument not found with ID: '{docId}'", MessageKind.Error);
|
||||||
Navigation.NotFound();
|
Navigation.NotFound();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task LoadTabGuestStays()
|
||||||
|
{
|
||||||
|
//Only load when there is no data.
|
||||||
|
if (guestStayList.Count() > 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (documentModel is null || documentModel.Id is null || documentModel.Version is null)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException();
|
||||||
|
}
|
||||||
|
|
||||||
|
guestStaysLoading = true;
|
||||||
|
guestStayList = await stayService.GetStaysWithGuest(documentModel.Id.Value);
|
||||||
|
guestStaysLoading = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#region Event Handlers
|
||||||
|
|
||||||
private void BtnEdit()
|
private void BtnEdit()
|
||||||
{
|
{
|
||||||
Snackbar.Add("Not implemented yet!", Severity.Info);
|
userMessage.ShowMessage("Not implemented yet!", MessageKind.Info);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnReturn()
|
private void BtnReturn()
|
||||||
{
|
{
|
||||||
Navigation.NavigateTo(GuestConsts.Page_GuestDocs_List);
|
Navigation.NavigateTo(GuestConsts.Page_GuestDocs_List);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void BtnViewStayDetails(StayEntryDTO item)
|
||||||
|
{
|
||||||
|
string itemId = $"{item.Id ?? -1}";
|
||||||
|
string uri = GuestConsts.Page_StayEntry_Detail.Replace(GuestConsts.Page_StayEntry_Detail_Param_Id, itemId);
|
||||||
|
|
||||||
|
string relativeUri = Navigation.ToBaseRelativePath(Navigation.Uri);
|
||||||
|
uri = QueryHelpers.AddQueryString(uri, [
|
||||||
|
new KeyValuePair<string, string?>(GuestConsts.QueryParam_ReturnUrl, relativeUri)
|
||||||
|
]);
|
||||||
|
Navigation.NavigateTo(uri);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -3,9 +3,9 @@
|
|||||||
@using Somnia.GuestLog.Models.DTOs;
|
@using Somnia.GuestLog.Models.DTOs;
|
||||||
@using Somnia.GuestLog.Services;
|
@using Somnia.GuestLog.Services;
|
||||||
|
|
||||||
@inject IGuestDocumentService GuestDocService
|
@inject IGuestDocumentEntityService GuestDocService
|
||||||
@inject NavigationManager Navigation
|
@inject NavigationManager Navigation
|
||||||
@inject ISnackbar Snackbar
|
@inject IUserMessageService userMessage
|
||||||
@inject IDialogService DialogService
|
@inject IDialogService DialogService
|
||||||
@inject IDataListService dataListService;
|
@inject IDataListService dataListService;
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
<MudText Typo="Typo.h4" GutterBottom="true">@LanguageLocale.page_GuestDocList_pageTitle</MudText>
|
<MudText Typo="Typo.h4" GutterBottom="true">@LanguageLocale.page_GuestDocList_pageTitle</MudText>
|
||||||
<MudSpacer />
|
<MudSpacer />
|
||||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" Size="Size.Small"
|
<MudButton Variant="Variant.Filled" Color="Color.Primary" Size="Size.Small"
|
||||||
StartIcon="@Icons.Material.Filled.Search" OnClick="() => SearchDataAsync()">
|
StartIcon="@Icons.Material.Filled.Search" OnClick="() => BtnSearchDataAsync()">
|
||||||
@LanguageLocale.general_btnSearch
|
@LanguageLocale.general_btnSearch
|
||||||
</MudButton>
|
</MudButton>
|
||||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" Size="Size.Small" StartIcon="@Icons.Material.Filled.Add"
|
<MudButton Variant="Variant.Filled" Color="Color.Primary" Size="Size.Small" StartIcon="@Icons.Material.Filled.Add"
|
||||||
@@ -26,31 +26,7 @@
|
|||||||
</MudStack>
|
</MudStack>
|
||||||
|
|
||||||
<MudPaper Class="pa-4 my-4" Elevation="2" Height="100%">
|
<MudPaper Class="pa-4 my-4" Elevation="2" Height="100%">
|
||||||
<MudForm Model="@docFilter">
|
<GuestDocumentFilterForm @bind-Filter="docFilter" />
|
||||||
<MudStack Row Breakpoint="Breakpoint.LgAndDown" StretchItems="StretchItems.All">
|
|
||||||
<MudStack Row style="margin-block: 0.2em;">
|
|
||||||
<MudSelect @bind-Value="docFilter.DocumentType" For="@(() => docFilter.DocumentType)"
|
|
||||||
Label="@LanguageLocale.dto_GuestDocument_DocumentType">
|
|
||||||
@foreach (string docType in dataListService.GetDataListByName(GuestConsts.DataList_DocumentTypes))
|
|
||||||
{
|
|
||||||
<MudSelectItem Value="docType">
|
|
||||||
@dataListService.GetLocalizedValue(GuestConsts.DataList_DocumentTypes, docType)
|
|
||||||
</MudSelectItem>
|
|
||||||
}
|
|
||||||
</MudSelect>
|
|
||||||
<MudTextField @bind-Value="docFilter.DocumentNumber" For="@(() => docFilter.DocumentNumber)"
|
|
||||||
Label="@LanguageLocale.dto_GuestDocument_DocumentNum" />
|
|
||||||
</MudStack>
|
|
||||||
<MudStack Row style="margin-block: 0.2em;">
|
|
||||||
<MudTextField @bind-Value="docFilter.Name" For="@(() => docFilter.Name)"
|
|
||||||
Label="@LanguageLocale.dto_GuestDocument_Name"
|
|
||||||
HelperText="@LanguageLocale.general_wildcardHelperText" HelperTextOnFocus="true" />
|
|
||||||
<MudTextField @bind-Value="docFilter.Surname" For="@(() => docFilter.Surname)"
|
|
||||||
Label="@LanguageLocale.dto_GuestDocument_Surname"
|
|
||||||
HelperText="@LanguageLocale.general_wildcardHelperText" HelperTextOnFocus="true" />
|
|
||||||
</MudStack>
|
|
||||||
</MudStack>
|
|
||||||
</MudForm>
|
|
||||||
</MudPaper>
|
</MudPaper>
|
||||||
|
|
||||||
<MudDataGrid @ref="_dataGrid" T="GuestDocumentDTO" Items="@guestDocList" Loading="@_dataLoading" ReadOnly="true"
|
<MudDataGrid @ref="_dataGrid" T="GuestDocumentDTO" Items="@guestDocList" Loading="@_dataLoading" ReadOnly="true"
|
||||||
@@ -58,7 +34,7 @@
|
|||||||
<ToolBarContent>
|
<ToolBarContent>
|
||||||
<MudText Typo="Typo.subtitle1">@LanguageLocale.page_GuestDocList_documentList</MudText>
|
<MudText Typo="Typo.subtitle1">@LanguageLocale.page_GuestDocList_documentList</MudText>
|
||||||
<MudStack Class="ml-auto" Row="true" AlignItems="AlignItems.Center">
|
<MudStack Class="ml-auto" Row="true" AlignItems="AlignItems.Center">
|
||||||
<MudCheckBox @bind-Value="_showAllData" Label="@LanguageLocale.page_GuestDocList_showAllElements"
|
<MudCheckBox @bind-Value="_showAllData" Label="@LanguageLocale.general_showAllElements"
|
||||||
LabelPlacement="Placement.Start" />
|
LabelPlacement="Placement.Start" />
|
||||||
<MudButton StartIcon="@Icons.Material.Outlined.ViewColumn" Variant="Variant.Outlined" Size="Size.Small"
|
<MudButton StartIcon="@Icons.Material.Outlined.ViewColumn" Variant="Variant.Outlined" Size="Size.Small"
|
||||||
OnClick="(args) => BtnConfigureColumnsClick(args)">
|
OnClick="(args) => BtnConfigureColumnsClick(args)">
|
||||||
@@ -67,6 +43,8 @@
|
|||||||
</MudStack>
|
</MudStack>
|
||||||
</ToolBarContent>
|
</ToolBarContent>
|
||||||
<Columns>
|
<Columns>
|
||||||
|
<PropertyColumn Property="x => x.Id" Title="@LanguageLocale.dto_GuestDocument_Id" />
|
||||||
|
<PropertyColumn Property="x => x.Version" Title="@LanguageLocale.dto_GuestDocument_Version" />
|
||||||
<PropertyColumn Title="@LanguageLocale.dto_GuestDocument_DocumentType"
|
<PropertyColumn Title="@LanguageLocale.dto_GuestDocument_DocumentType"
|
||||||
Property="x => dataListService.GetLocalizedValue(GuestConsts.DataList_DocumentTypes, x.DocumentType)"
|
Property="x => dataListService.GetLocalizedValue(GuestConsts.DataList_DocumentTypes, x.DocumentType)"
|
||||||
Hideable="false" />
|
Hideable="false" />
|
||||||
@@ -74,6 +52,7 @@
|
|||||||
Title="@LanguageLocale.dto_GuestDocument_DocumentNum" />
|
Title="@LanguageLocale.dto_GuestDocument_DocumentNum" />
|
||||||
<PropertyColumn Property="x => x.Name" Title="@LanguageLocale.dto_GuestDocument_Name" />
|
<PropertyColumn Property="x => x.Name" Title="@LanguageLocale.dto_GuestDocument_Name" />
|
||||||
<PropertyColumn Property="x => x.Surname" Title="@LanguageLocale.dto_GuestDocument_Surname" />
|
<PropertyColumn Property="x => x.Surname" Title="@LanguageLocale.dto_GuestDocument_Surname" />
|
||||||
|
<PropertyColumn Property="x => x.Surname2" Title="@LanguageLocale.dto_GuestDocument_Surname2" />
|
||||||
<PropertyColumn Title="@LanguageLocale.dto_GuestDocument_Nationality"
|
<PropertyColumn Title="@LanguageLocale.dto_GuestDocument_Nationality"
|
||||||
Property="x => dataListService.GetLocalizedValue(GuestConsts.DataList_CountryCodes, x.Nationality)" />
|
Property="x => dataListService.GetLocalizedValue(GuestConsts.DataList_CountryCodes, x.Nationality)" />
|
||||||
<PropertyColumn Property="x => x.UpdateTime" Title="@LanguageLocale.dto_GuestDocument_UpdateTime" />
|
<PropertyColumn Property="x => x.UpdateTime" Title="@LanguageLocale.dto_GuestDocument_UpdateTime" />
|
||||||
@@ -93,17 +72,7 @@
|
|||||||
</PagerContent>
|
</PagerContent>
|
||||||
</MudDataGrid>
|
</MudDataGrid>
|
||||||
|
|
||||||
<MudMessageBox @ref="_msgBoxConfirmDelete" Title="@LanguageLocale.general_confirmTitle"
|
<ConfirmDeleteMsgBox @ref="_msgBoxConfirmDelete" />
|
||||||
CancelText="@LanguageLocale.general_btnCancel">
|
|
||||||
<MessageContent>
|
|
||||||
@LanguageLocale.general_confirmDeleteMsg
|
|
||||||
</MessageContent>
|
|
||||||
<YesButton>
|
|
||||||
<MudButton Variant="Variant.Filled" Color="Color.Error" StartIcon="@Icons.Material.Filled.DeleteForever">
|
|
||||||
@LanguageLocale.general_btnDelete
|
|
||||||
</MudButton>
|
|
||||||
</YesButton>
|
|
||||||
</MudMessageBox>
|
|
||||||
|
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
@@ -116,7 +85,7 @@
|
|||||||
private GuestDocFilterDTO docFilter = new GuestDocFilterDTO();
|
private GuestDocFilterDTO docFilter = new GuestDocFilterDTO();
|
||||||
|
|
||||||
private MudDataGrid<GuestDocumentDTO> _dataGrid = null!;
|
private MudDataGrid<GuestDocumentDTO> _dataGrid = null!;
|
||||||
private MudMessageBox _msgBoxConfirmDelete = null!;
|
private ConfirmDeleteMsgBox _msgBoxConfirmDelete = null!;
|
||||||
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
@@ -126,14 +95,6 @@
|
|||||||
|
|
||||||
#region Data Loading
|
#region Data Loading
|
||||||
|
|
||||||
private async Task SearchDataAsync()
|
|
||||||
{
|
|
||||||
docFilter.Name = docFilter.Name?.ToUpper();
|
|
||||||
docFilter.Surname = docFilter.Surname?.ToUpper();
|
|
||||||
|
|
||||||
await LoadDataAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task LoadDataAsync(bool showMsg = true)
|
private async Task LoadDataAsync(bool showMsg = true)
|
||||||
{
|
{
|
||||||
_dataLoading = true;
|
_dataLoading = true;
|
||||||
@@ -143,7 +104,7 @@
|
|||||||
|
|
||||||
if (showMsg)
|
if (showMsg)
|
||||||
{
|
{
|
||||||
Snackbar.Add("Data loaded from DB", Severity.Info, o => o.VisibleStateDuration = 1000);
|
userMessage.ShowMessage("Data loaded from DB", MessageKind.Info);
|
||||||
}
|
}
|
||||||
_dataLoading = false;
|
_dataLoading = false;
|
||||||
}
|
}
|
||||||
@@ -152,43 +113,47 @@
|
|||||||
|
|
||||||
#region Event Handlers
|
#region Event Handlers
|
||||||
|
|
||||||
|
private async Task BtnSearchDataAsync()
|
||||||
|
{
|
||||||
|
docFilter.Name = docFilter.Name?.ToUpper();
|
||||||
|
docFilter.Surname = docFilter.Surname?.ToUpper();
|
||||||
|
|
||||||
|
await LoadDataAsync();
|
||||||
|
}
|
||||||
|
|
||||||
private async Task BtnConfigureColumnsClick(MouseEventArgs args)
|
private async Task BtnConfigureColumnsClick(MouseEventArgs args)
|
||||||
{
|
{
|
||||||
_dataGrid.ShowColumnsPanel(args);
|
_dataGrid.ShowColumnsPanel(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private async Task BtnViewDetails(GuestDocumentDTO item)
|
private async Task BtnViewDetails(GuestDocumentDTO item)
|
||||||
{
|
{
|
||||||
var parameters =
|
string strId = item.Id?.ToString() ?? throw new InvalidOperationException();
|
||||||
new DialogParameters<GuestDocDetailsDialog> { { x => x.DocumentDTO, item } };
|
|
||||||
var options = new DialogOptions()
|
|
||||||
{
|
|
||||||
FullScreen = true,
|
|
||||||
CloseButton = true,
|
|
||||||
CloseOnEscapeKey = true,
|
|
||||||
};
|
|
||||||
|
|
||||||
await DialogService.ShowAsync<GuestDocDetailsDialog>("GuestDoc Details", parameters, options);
|
string uri = GuestConsts.Page_GuestDocs_Detail.Replace(GuestConsts.Page_GuestDocs_Detail_Param_DocId, strId);
|
||||||
|
Navigation.NavigateTo(uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task BtnDeleteItem(GuestDocumentDTO item)
|
private async Task BtnDeleteItem(GuestDocumentDTO item)
|
||||||
{
|
{
|
||||||
bool? confirmDelete = await _msgBoxConfirmDelete.ShowAsync();
|
bool? confirmDelete = await _msgBoxConfirmDelete.MsgBox.ShowAsync();
|
||||||
|
|
||||||
if (confirmDelete is null || confirmDelete.Value == false)
|
if (confirmDelete is null || confirmDelete.Value == false)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool deleted = await GuestDocService.DeleteDocumentAsync(item);
|
Result deleteResult = await GuestDocService.DeleteDocumentAsync(item);
|
||||||
if (!deleted)
|
if (!deleteResult.IsSuccess)
|
||||||
{
|
{
|
||||||
Snackbar.Add($"Error deleting document {item.DocumentType}-{item.DocumentNum}", Severity.Error);
|
string errorMsg = $"Error deleting document {item.DocumentType}-{item.DocumentNum}";
|
||||||
|
userMessage.ShowResultWithMessage(deleteResult, errorMsg);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Snackbar.Add($"Document {item.DocumentType}-{item.DocumentNum} deleted!", Severity.Success);
|
userMessage.ShowMessage($"Document {item.DocumentType}-{item.DocumentNum} deleted!", MessageKind.Success);
|
||||||
await LoadDataAsync();
|
await LoadDataAsync(showMsg: false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnNewGuest()
|
private void BtnNewGuest()
|
||||||
|
|||||||
@@ -4,10 +4,10 @@
|
|||||||
@using Somnia.GuestLog.Services;
|
@using Somnia.GuestLog.Services;
|
||||||
@using Somnia.GuestLog.Validators;
|
@using Somnia.GuestLog.Validators;
|
||||||
|
|
||||||
@inject ISnackbar Snackbar
|
@inject IUserMessageService userMessage
|
||||||
@inject IDialogService DialogService
|
@inject IDialogService DialogService
|
||||||
@inject NavigationManager Navigation
|
@inject NavigationManager Navigation
|
||||||
@inject IGuestDocumentService guestDocService
|
@inject IGuestDocumentEntityService guestDocService
|
||||||
@inject IDataListService dataListService;
|
@inject IDataListService dataListService;
|
||||||
|
|
||||||
@inject FluentValidation.IValidator<GuestDocIdDTO> docIdValidator;
|
@inject FluentValidation.IValidator<GuestDocIdDTO> docIdValidator;
|
||||||
@@ -82,6 +82,7 @@
|
|||||||
|
|
||||||
ePageMode currentPageMode = ePageMode.selectDocId;
|
ePageMode currentPageMode = ePageMode.selectDocId;
|
||||||
GuestDocIdDTO currentDocId = new() { DocumentNum = "", DocumentType = "" };
|
GuestDocIdDTO currentDocId = new() { DocumentNum = "", DocumentType = "" };
|
||||||
|
long? alreadyExistDocId = null;
|
||||||
GuestDocumentDTO newDocumentModel = new();
|
GuestDocumentDTO newDocumentModel = new();
|
||||||
|
|
||||||
bool loadingDocId = false;
|
bool loadingDocId = false;
|
||||||
@@ -100,7 +101,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
loadingDocId = true;
|
loadingDocId = true;
|
||||||
GuestDocumentDTO? dto = await guestDocService.GetDtoByIdAsync(currentDocId.DocumentType, currentDocId.DocumentNum);
|
GuestDocumentDTO? dto =
|
||||||
|
await guestDocService.GetLastVersionDtoByDocumentAsync(currentDocId.DocumentType, currentDocId.DocumentNum);
|
||||||
loadingDocId = false;
|
loadingDocId = false;
|
||||||
|
|
||||||
if (dto is null)
|
if (dto is null)
|
||||||
@@ -117,6 +119,7 @@
|
|||||||
|
|
||||||
//GuestDoc already exists!
|
//GuestDoc already exists!
|
||||||
currentPageMode = ePageMode.alreadyExistDoc;
|
currentPageMode = ePageMode.alreadyExistDoc;
|
||||||
|
alreadyExistDocId = dto.Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnReturn()
|
private void BtnReturn()
|
||||||
@@ -129,39 +132,39 @@
|
|||||||
bool isFormValid = await _form.ValidateForm();
|
bool isFormValid = await _form.ValidateForm();
|
||||||
if (!isFormValid)
|
if (!isFormValid)
|
||||||
{
|
{
|
||||||
Snackbar.Add("Invalid Form!", Severity.Error);
|
userMessage.ShowMessage("Invalid Form!", MessageKind.Warning);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
GuestDocumentDTO model = _form.Model;
|
GuestDocumentDTO model = _form.Model;
|
||||||
|
|
||||||
Snackbar.Add($"Document '{model.DocumentNum}' creating...", Severity.Info);
|
|
||||||
|
|
||||||
//Show Loading dialog...
|
//Show Loading dialog...
|
||||||
var loadingDialog = await DialogService.ShowAsync<LoadingDialog>();
|
var loadingDialog = await DialogService.ShowAsync<LoadingDialog>();
|
||||||
|
|
||||||
bool isCreated = await guestDocService.CreateDocumentAsync(model);
|
Result createResult = await guestDocService.CreateDocumentAsync(model);
|
||||||
if (!isCreated)
|
if (!createResult.IsSuccess)
|
||||||
{
|
{
|
||||||
Snackbar.Add($"Error creating Document '{model.DocumentNum}'", Severity.Error);
|
string errorMsg = $"Error creating Document '{model.DocumentNum}'";
|
||||||
|
userMessage.ShowResultWithMessage(createResult, errorMsg);
|
||||||
loadingDialog.Close();
|
loadingDialog.Close();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Snackbar.Add($"Document '{model.DocumentNum}' Created!", Severity.Success);
|
userMessage.ShowMessage($"Document '{model.DocumentNum}' Created!", MessageKind.Success);
|
||||||
Navigation.NavigateTo(GuestConsts.Page_GuestDocs_List);
|
Navigation.NavigateTo(GuestConsts.Page_GuestDocs_List);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnGoToDocument()
|
private void BtnGoToDocument()
|
||||||
{
|
{
|
||||||
if (currentPageMode != ePageMode.alreadyExistDoc)
|
if (currentPageMode != ePageMode.alreadyExistDoc || alreadyExistDocId is null)
|
||||||
{
|
{
|
||||||
Snackbar.Add("Invalid operation!", Severity.Error);
|
userMessage.ShowMessage("Invalid operation!", MessageKind.Error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
string docId = GuestDocIdDTO.EncodeAsString(currentDocId);
|
|
||||||
string uri = GuestConsts.Page_GuestDocs_Detail.Replace("{docId}", docId);
|
string strId = alreadyExistDocId.Value.ToString();
|
||||||
|
string uri = GuestConsts.Page_GuestDocs_Detail.Replace(GuestConsts.Page_GuestDocs_Detail_Param_DocId, strId);
|
||||||
Navigation.NavigateTo(uri);
|
Navigation.NavigateTo(uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
@attribute [Route($"{GuestConsts.Page_StayEntry_Detail}")]
|
||||||
|
|
||||||
|
@using Somnia.GuestLog.Models.DTOs;
|
||||||
|
@using Somnia.GuestLog.Services;
|
||||||
|
|
||||||
|
@inject IUserMessageService userMessage
|
||||||
|
@inject IDialogService DialogService
|
||||||
|
@inject NavigationManager Navigation
|
||||||
|
@inject IGuestDocumentEntityService guestDocService
|
||||||
|
@inject IStayEntryEntityService stayService
|
||||||
|
|
||||||
|
|
||||||
|
<PageTitle>Somnia - Guest Docs - Details</PageTitle>
|
||||||
|
|
||||||
|
<MudStack Row="true" Class="my-4">
|
||||||
|
<MudText Typo="Typo.h4" GutterBottom="true">Stay Entry - "@StayId"</MudText>
|
||||||
|
<MudSpacer />
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Success" Size="Size.Small" StartIcon="@Icons.Material.Filled.Edit"
|
||||||
|
OnClick="() => BtnEdit()" Disabled>
|
||||||
|
@LanguageLocale.general_btnEdit
|
||||||
|
</MudButton>
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Default" Size="Size.Small"
|
||||||
|
StartIcon="@Icons.Material.Filled.ArrowBack" OnClick="() => BtnReturn()">
|
||||||
|
@LanguageLocale.general_btnReturn
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
|
||||||
|
@if (stayModel is not null)
|
||||||
|
{
|
||||||
|
<StayEntryForm Model="stayModel" FormMode="FormMode.ReadOnly" />
|
||||||
|
<MudText Class="mt-4">@CreateTimeString</MudText>
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@code {
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public long StayId { get; set; }
|
||||||
|
|
||||||
|
[SupplyParameterFromQuery(Name = GuestConsts.QueryParam_ReturnUrl)]
|
||||||
|
public string? ReturnUrl { get; set; }
|
||||||
|
|
||||||
|
StayEntryDTO? stayModel = null;
|
||||||
|
|
||||||
|
private string? CreateTimeString
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (stayModel is null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<string> textList = [];
|
||||||
|
textList.Add($"Created at: {stayModel.CreateTime?.ToString() ?? "???"}");
|
||||||
|
textList.Add($"Last Update Time: {stayModel.UpdateTime?.ToString() ?? "???"}");
|
||||||
|
return string.Join("; ", textList);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
@* if (StayId is default)
|
||||||
|
{
|
||||||
|
Snackbar.Add("No Id provided!!", Severity.Error);
|
||||||
|
Navigation.NotFound();
|
||||||
|
return;
|
||||||
|
} *@
|
||||||
|
|
||||||
|
//Get model from db.
|
||||||
|
stayModel = await stayService.GetDtoByIdAsync(StayId, queryConfig: new(IncludeGuests: true));
|
||||||
|
if (stayModel is null)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage($"Stay not found with ID: '{StayId}'", MessageKind.Error);
|
||||||
|
Navigation.NotFound();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnEdit()
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("Not implemented yet!", MessageKind.Info);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnReturn()
|
||||||
|
{
|
||||||
|
string uri = ReturnUrl ?? GuestConsts.Page_StayEntry_List;
|
||||||
|
Navigation.NavigateTo(uri);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
@attribute [Route($"{GuestConsts.Page_StayEntry_List}")]
|
||||||
|
|
||||||
|
@using Somnia.GuestLog.Models.DTOs;
|
||||||
|
@using Somnia.GuestLog.Services;
|
||||||
|
|
||||||
|
@inject IStayEntryEntityService StayEntryService
|
||||||
|
@inject NavigationManager Navigation
|
||||||
|
@inject IUserMessageService userMessage
|
||||||
|
@inject IDialogService DialogService
|
||||||
|
@inject IDataListService dataListService;
|
||||||
|
|
||||||
|
<PageTitle>Somnia - Stay Entries</PageTitle>
|
||||||
|
|
||||||
|
<MudStack Row="true" Class="my-4">
|
||||||
|
<MudText Typo="Typo.h4" GutterBottom="true">@LanguageLocale.page_StayEntryList_pageTitle</MudText>
|
||||||
|
<MudSpacer />
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Primary" Size="Size.Small"
|
||||||
|
StartIcon="@Icons.Material.Filled.Search" OnClick="() => BtnSearchDataAsync()">
|
||||||
|
@LanguageLocale.general_btnSearch
|
||||||
|
</MudButton>
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Primary" Size="Size.Small" StartIcon="@Icons.Material.Filled.Add"
|
||||||
|
OnClick="() => BtnNewStay()">
|
||||||
|
@LanguageLocale.page_StayEntryList_btnNewStay
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
|
||||||
|
<MudPaper Class="pa-4 my-4" Elevation="2" Height="100%">
|
||||||
|
<StayEntryFilterForm @bind-Filter="stayFilter" />
|
||||||
|
</MudPaper>
|
||||||
|
|
||||||
|
<MudDataGrid @ref="_dataGrid" T="StayEntryDTO" Items="@stayEntryList" Loading="@_dataLoading" ReadOnly="true"
|
||||||
|
Elevation="2">
|
||||||
|
<ToolBarContent>
|
||||||
|
<MudText Typo="Typo.subtitle1">@LanguageLocale.page_StayEntryList_entryList</MudText>
|
||||||
|
<MudStack Class="ml-auto" Row="true" AlignItems="AlignItems.Center">
|
||||||
|
<MudCheckBox @bind-Value="_showAllData" Label="@LanguageLocale.general_showAllElements"
|
||||||
|
LabelPlacement="Placement.Start" />
|
||||||
|
</MudStack>
|
||||||
|
</ToolBarContent>
|
||||||
|
<Columns>
|
||||||
|
<PropertyColumn Property="x => x.Id" Hideable="false" Title="@LanguageLocale.dto_StayEntry_Id" />
|
||||||
|
<PropertyColumn Property="x => x.DateIn" Title="@LanguageLocale.dto_StayEntry_DateIn" />
|
||||||
|
<PropertyColumn Property="x => x.DateOut" Title="@LanguageLocale.dto_StayEntry_DateOut" />
|
||||||
|
<PropertyColumn Property="x => x.RoomNumber" Title="@LanguageLocale.dto_StayEntry_RoomNumber" />
|
||||||
|
<PropertyColumn Title="@LanguageLocale.dto_StayEntry_PaymentMethod"
|
||||||
|
Property="x => dataListService.GetLocalizedValue(GuestConsts.DataList_PaymentMethods, x.PaymentMethod)" />
|
||||||
|
|
||||||
|
<PropertyColumn Property="x => x.UpdateTime" Title="@LanguageLocale.dto_GuestDocument_UpdateTime" />
|
||||||
|
|
||||||
|
<TemplateColumn CellClass="d-flex justify-between" Title="Options" StickyRight Hideable="false"
|
||||||
|
ShowColumnOptions="false">
|
||||||
|
<CellTemplate>
|
||||||
|
<MudIconButton Size="@Size.Small" Icon="@Icons.Material.Outlined.Info"
|
||||||
|
OnClick="() => BtnViewDetails(context.Item)" />
|
||||||
|
<MudIconButton Size="@Size.Small" Icon="@Icons.Material.Outlined.Delete"
|
||||||
|
OnClick="() => BtnDeleteItem(context.Item)" />
|
||||||
|
</CellTemplate>
|
||||||
|
</TemplateColumn>
|
||||||
|
</Columns>
|
||||||
|
<PagerContent>
|
||||||
|
<MudDataGridPager T="StayEntryDTO" />
|
||||||
|
</PagerContent>
|
||||||
|
</MudDataGrid>
|
||||||
|
|
||||||
|
<ConfirmDeleteMsgBox @ref="_confirmDeleteMsgBox" />
|
||||||
|
|
||||||
|
@code {
|
||||||
|
|
||||||
|
private bool _dataLoading = true;
|
||||||
|
private bool _showAllData = false;
|
||||||
|
private const int resultLimit = 200;
|
||||||
|
|
||||||
|
private StayEntryFilterDTO stayFilter = new StayEntryFilterDTO()
|
||||||
|
{
|
||||||
|
DateInStart = DateTime.Today.AddDays(-14),
|
||||||
|
DateInEnd = DateTime.Today.AddDays(1),
|
||||||
|
};
|
||||||
|
|
||||||
|
private IEnumerable<StayEntryDTO> stayEntryList = [];
|
||||||
|
|
||||||
|
private MudDataGrid<StayEntryDTO> _dataGrid = null!;
|
||||||
|
private ConfirmDeleteMsgBox _confirmDeleteMsgBox = null!;
|
||||||
|
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
await LoadDataAsync(showMsg: false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task LoadDataAsync(bool showMsg = true)
|
||||||
|
{
|
||||||
|
_dataLoading = true;
|
||||||
|
|
||||||
|
int dataLimit = _showAllData ? 0 : resultLimit;
|
||||||
|
stayEntryList = await StayEntryService.GetDtoListByFilterAsync(filter: stayFilter, limit: dataLimit);
|
||||||
|
|
||||||
|
if (showMsg)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("Data loaded from DB", MessageKind.Info);
|
||||||
|
}
|
||||||
|
_dataLoading = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#region Event Handlers
|
||||||
|
|
||||||
|
private async Task BtnSearchDataAsync()
|
||||||
|
{
|
||||||
|
await LoadDataAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnNewStay()
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo(GuestConsts.Page_StayEntry_New);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private async Task BtnViewDetails(StayEntryDTO item)
|
||||||
|
{
|
||||||
|
string itemId = item.Id?.ToString() ?? throw new InvalidOperationException();
|
||||||
|
string uri = GuestConsts.Page_StayEntry_Detail.Replace(GuestConsts.Page_StayEntry_Detail_Param_Id, itemId);
|
||||||
|
Navigation.NavigateTo(uri);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task BtnDeleteItem(StayEntryDTO item)
|
||||||
|
{
|
||||||
|
bool? confirmDelete = await _confirmDeleteMsgBox.MsgBox.ShowAsync();
|
||||||
|
|
||||||
|
if (confirmDelete is null || confirmDelete.Value == false)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Result deleteResult = await StayEntryService.DeleteEntryAsync(item);
|
||||||
|
if (!deleteResult.IsSuccess)
|
||||||
|
{
|
||||||
|
string errorMsg = $"Error deleting Stay {item.Id}";
|
||||||
|
userMessage.ShowResultWithMessage(deleteResult, errorMsg);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
userMessage.ShowMessage($"Stay {item.Id} deleted!", MessageKind.Success);
|
||||||
|
await LoadDataAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
@attribute [Route($"{GuestConsts.Page_StayEntry_New}")]
|
||||||
|
|
||||||
|
@using Somnia.GuestLog.Models.DTOs;
|
||||||
|
@using Somnia.GuestLog.Services;
|
||||||
|
|
||||||
|
|
||||||
|
@inject IUserMessageService userMessage
|
||||||
|
@inject IDialogService DialogService
|
||||||
|
@inject NavigationManager Navigation
|
||||||
|
@inject IStayEntryEntityService stayService
|
||||||
|
@inject IDataListService dataListService;
|
||||||
|
|
||||||
|
<PageTitle>Somnia - Stay Entries - New</PageTitle>
|
||||||
|
|
||||||
|
<MudStack Row="true" Class="my-4">
|
||||||
|
<MudText Typo="Typo.h4" GutterBottom="true">
|
||||||
|
@LanguageLocale.page_StayEntryNew_pageTitle
|
||||||
|
</MudText>
|
||||||
|
<MudSpacer />
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Success" Size="Size.Small" StartIcon="@Icons.Material.Filled.Add"
|
||||||
|
OnClick="() => BtnSaveStay()">
|
||||||
|
@LanguageLocale.general_btnCreate
|
||||||
|
</MudButton>
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Default" Size="Size.Small"
|
||||||
|
StartIcon="@Icons.Material.Filled.ArrowBack" OnClick="() => BtnReturn()">
|
||||||
|
@LanguageLocale.general_btnReturn
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
|
||||||
|
<StayEntryForm @ref="_form" Model="@newStayModel" FormMode="FormMode.Create" />
|
||||||
|
|
||||||
|
@code {
|
||||||
|
StayEntryForm _form = null!;
|
||||||
|
|
||||||
|
StayEntryDTO newStayModel = new();
|
||||||
|
|
||||||
|
|
||||||
|
private void BtnReturn()
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo(GuestConsts.Page_StayEntry_List);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task BtnSaveStay()
|
||||||
|
{
|
||||||
|
bool isFormValid = await _form.ValidateForm();
|
||||||
|
if (!isFormValid)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("Invalid Form!", MessageKind.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var loadingDialog = await DialogService.ShowAsync<LoadingDialog>();
|
||||||
|
|
||||||
|
StayEntryDTO model = _form.GetModel();
|
||||||
|
Result createResult = await stayService.CreateEntryAsync(model);
|
||||||
|
if (!createResult.IsSuccess)
|
||||||
|
{
|
||||||
|
userMessage.ShowResultWithMessage(createResult, $"Error creating StayEntry");
|
||||||
|
loadingDialog.Close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
userMessage.ShowMessage($"StayEntry Created!", MessageKind.Success);
|
||||||
|
Navigation.NavigateTo(GuestConsts.Page_StayEntry_List);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,197 @@
|
|||||||
|
@attribute [Route($"{GuestConsts.Page_StayExport_List}")]
|
||||||
|
|
||||||
|
@using System.Text.Json;
|
||||||
|
@using Somnia.GuestLog.Models.DTOs;
|
||||||
|
@using Somnia.GuestLog.Services;
|
||||||
|
@using Somnia.GuestLog.Services.StayExport;
|
||||||
|
|
||||||
|
@inject IStayExportFileEntityService stayExportEntityService
|
||||||
|
@inject NavigationManager Navigation
|
||||||
|
@inject IUserMessageService userMessage
|
||||||
|
@inject IDialogService DialogService
|
||||||
|
@inject IDataListService dataListService;
|
||||||
|
@inject ILocalizerService Localizer;
|
||||||
|
|
||||||
|
@inject IStayExportService ExportService;
|
||||||
|
@inject IJSRuntime JS
|
||||||
|
|
||||||
|
|
||||||
|
<PageTitle>Somnia - Stay Export Files</PageTitle>
|
||||||
|
|
||||||
|
<MudStack Row="true" Class="my-4">
|
||||||
|
<MudText Typo="Typo.h4" GutterBottom="true">@LanguageLocale.page_StayExportList_pageTitle</MudText>
|
||||||
|
<MudSpacer />
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Primary" Size="Size.Small"
|
||||||
|
StartIcon="@Icons.Material.Filled.Search" OnClick="() => BtnSearchDataAsync()">
|
||||||
|
@LanguageLocale.general_btnSearch
|
||||||
|
</MudButton>
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Primary" Size="Size.Small" StartIcon="@Icons.Material.Filled.Add"
|
||||||
|
OnClick="() => BtnNewExport()">
|
||||||
|
@LanguageLocale.page_StayExportList_btnNewExport
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
|
||||||
|
@* <MudPaper Class="pa-4 my-4" Elevation="2" Height="100%">
|
||||||
|
FILTER
|
||||||
|
</MudPaper> *@
|
||||||
|
|
||||||
|
<MudDataGrid @ref="_dataGrid" T="StayExportFileDTO" Items="@stayExportList" Loading="@_dataLoading" ReadOnly="true"
|
||||||
|
Elevation="2">
|
||||||
|
<ToolBarContent>
|
||||||
|
<MudText Typo="Typo.subtitle1">@LanguageLocale.page_StayExportList_exportList</MudText>
|
||||||
|
</ToolBarContent>
|
||||||
|
<Columns>
|
||||||
|
<PropertyColumn Property="x => x.Id" Hideable="false" Title="@LanguageLocale.dto_StayExportFile_Id" />
|
||||||
|
<PropertyColumn Property="x => Localizer.GetEnumValue(x.ExportFormat)"
|
||||||
|
Title="@LanguageLocale.dto_StayExportFile_ExportFormat" />
|
||||||
|
<TemplateColumn Title="@LanguageLocale.dto_StayExportFile_ExportParams">
|
||||||
|
<CellTemplate>
|
||||||
|
<MudIconButton Size="@Size.Small" Icon="@Icons.Material.Outlined.Info"
|
||||||
|
OnClick="() => ShowExportParams(context.Item)" />
|
||||||
|
</CellTemplate>
|
||||||
|
</TemplateColumn>
|
||||||
|
<PropertyColumn Property="x => Localizer.GetEnumValue(x.ExportResult)"
|
||||||
|
Title="@LanguageLocale.dto_StayExportFile_ExportResult" />
|
||||||
|
<PropertyColumn Property="x => x.ExportTime" Title="@LanguageLocale.dto_StayExportFile_ExportTime" />
|
||||||
|
<TemplateColumn Title="@LanguageLocale.dto_StayExportFile_ExportDetails">
|
||||||
|
<CellTemplate>
|
||||||
|
<MudIconButton Size="@Size.Small" Icon="@Icons.Material.Outlined.Info"
|
||||||
|
OnClick="() => ShowExportDetails(context.Item)" />
|
||||||
|
</CellTemplate>
|
||||||
|
</TemplateColumn>
|
||||||
|
|
||||||
|
<TemplateColumn CellClass="d-flex justify-between" Title="Options" StickyRight Hideable="false"
|
||||||
|
ShowColumnOptions="false">
|
||||||
|
<CellTemplate>
|
||||||
|
<MudIconButton Size="@Size.Small" Icon="@Icons.Material.Outlined.Download"
|
||||||
|
OnClick="() => BtnDownloadFile(context.Item)" />
|
||||||
|
<MudIconButton Size="@Size.Small" Icon="@Icons.Material.Outlined.Delete"
|
||||||
|
OnClick="() => BtnDeleteItem(context.Item)" />
|
||||||
|
</CellTemplate>
|
||||||
|
</TemplateColumn>
|
||||||
|
</Columns>
|
||||||
|
<PagerContent>
|
||||||
|
<MudDataGridPager T="StayExportFileDTO" />
|
||||||
|
</PagerContent>
|
||||||
|
</MudDataGrid>
|
||||||
|
|
||||||
|
<ConfirmDeleteMsgBox @ref="_confirmDeleteMsgBox" />
|
||||||
|
|
||||||
|
@code {
|
||||||
|
private bool _dataLoading = true;
|
||||||
|
private const int resultLimit = 200;
|
||||||
|
|
||||||
|
private IEnumerable<StayExportFileDTO> stayExportList = [];
|
||||||
|
|
||||||
|
private MudDataGrid<StayExportFileDTO> _dataGrid = null!;
|
||||||
|
private ConfirmDeleteMsgBox _confirmDeleteMsgBox = null!;
|
||||||
|
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
await LoadDataAsync(showMsg: false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task LoadDataAsync(bool showMsg = true)
|
||||||
|
{
|
||||||
|
_dataLoading = true;
|
||||||
|
|
||||||
|
stayExportList = await stayExportEntityService.GetDtoListAsync(limit: resultLimit);
|
||||||
|
|
||||||
|
if (showMsg)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("Data loaded from DB", MessageKind.Info);
|
||||||
|
}
|
||||||
|
_dataLoading = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#region Event Handlers
|
||||||
|
|
||||||
|
private async Task BtnSearchDataAsync()
|
||||||
|
{
|
||||||
|
await LoadDataAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnNewExport()
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo(GuestConsts.Page_StayExport_New);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private async Task ShowExportParams(StayExportFileDTO dto)
|
||||||
|
{
|
||||||
|
string jsonParams = JsonSerializer.Serialize(dto.ExportParams, options: new() { WriteIndented = true });
|
||||||
|
|
||||||
|
await DialogService.ShowMessageBoxAsync("Details", (MarkupString)$"<pre>{jsonParams}</pre>");
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task ShowExportDetails(StayExportFileDTO dto)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(dto.ExportDetails))
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("This ExportFile doesn't have any export details", MessageKind.Info);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
using var jDoc = JsonDocument.Parse(dto.ExportDetails);
|
||||||
|
string jsonDetails = JsonSerializer.Serialize(jDoc, new JsonSerializerOptions { WriteIndented = true });
|
||||||
|
|
||||||
|
await DialogService.ShowMessageBoxAsync("Details", (MarkupString)$"<pre>{jsonDetails}</pre>");
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task BtnDownloadFile(StayExportFileDTO item)
|
||||||
|
{
|
||||||
|
if (item.ExportResult == Enums.Models.StayExportFileResult.NoData)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("A Export without data can't be downloaded!", MessageKind.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(item.ExportedPath))
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("File can't be downloaded: no path found!", MessageKind.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
using Stream objectStream = new MemoryStream();
|
||||||
|
Result loadResult = await ExportService.GetExportedFileAsync(item, objectStream);
|
||||||
|
if (!loadResult.IsSuccess)
|
||||||
|
{
|
||||||
|
userMessage.ShowResultWithMessage(loadResult, "Exported File can't be downloaded");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
objectStream.Seek(0, SeekOrigin.Begin);
|
||||||
|
|
||||||
|
using var streamRef = new DotNetStreamReference(stream: objectStream);
|
||||||
|
|
||||||
|
var fileName = Path.GetFileName(item.ExportedPath);
|
||||||
|
await JS.InvokeVoidAsync("downloadFileFromStream", fileName, streamRef);
|
||||||
|
userMessage.ShowMessage("Exported File downloaded!", MessageKind.Success);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task BtnDeleteItem(StayExportFileDTO item)
|
||||||
|
{
|
||||||
|
bool? confirmDelete = await _confirmDeleteMsgBox.MsgBox.ShowAsync();
|
||||||
|
|
||||||
|
if (confirmDelete is null || confirmDelete.Value == false)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Result deleteResult = await ExportService.DeleteExportedFileAsync(item);
|
||||||
|
if (!deleteResult.IsSuccess)
|
||||||
|
{
|
||||||
|
string errorMsg = $"Error deleting Export file {item.Id}";
|
||||||
|
userMessage.ShowResultWithMessage(deleteResult, errorMsg);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
userMessage.ShowMessage($"Export file {item.Id} deleted!", MessageKind.Success);
|
||||||
|
await LoadDataAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,162 @@
|
|||||||
|
@attribute [Route($"{GuestConsts.Page_StayExport_New}")]
|
||||||
|
|
||||||
|
@using FluentValidation;
|
||||||
|
@using Somnia.GuestLog.Models.DTOs;
|
||||||
|
@using Somnia.GuestLog.Enums.Models;
|
||||||
|
@using Somnia.GuestLog.Services;
|
||||||
|
@using Somnia.GuestLog.Validators;
|
||||||
|
@using Somnia.GuestLog.Services.StayExport;
|
||||||
|
|
||||||
|
|
||||||
|
@inject IUserMessageService userMessage
|
||||||
|
@inject IDialogService DialogService
|
||||||
|
@inject NavigationManager Navigation
|
||||||
|
@inject IValidator<StayExportParamsDTO> ExportParamsValidator;
|
||||||
|
@inject ILocalizerService Localizer;
|
||||||
|
@inject IStayExportService ExportService;
|
||||||
|
|
||||||
|
@inject IJSRuntime JS
|
||||||
|
|
||||||
|
|
||||||
|
<PageTitle>Somnia - Stay Export - New</PageTitle>
|
||||||
|
|
||||||
|
<MudStack Row="true" Class="my-4">
|
||||||
|
<MudText Typo="Typo.h4" GutterBottom="true">
|
||||||
|
@LanguageLocale.page_StayExportNew_pageTitle
|
||||||
|
</MudText>
|
||||||
|
<MudSpacer />
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Success" Size="Size.Small" StartIcon="@Icons.Material.Filled.Add"
|
||||||
|
OnClick="() => BtnCreateExport()" Disabled="@_isExported">
|
||||||
|
@LanguageLocale.general_btnCreate
|
||||||
|
</MudButton>
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Default" Size="Size.Small"
|
||||||
|
StartIcon="@Icons.Material.Filled.ArrowBack" OnClick="() => BtnReturn()">
|
||||||
|
@LanguageLocale.general_btnReturn
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
|
||||||
|
<MudForm @ref="@_form" Model="@exportParams"
|
||||||
|
Validation="@((ExportParamsValidator as StayExportParamsDTOValidator)!.ValidateValue)" ReadOnly="@_isExported">
|
||||||
|
<MudPaper Class="pa-4 my-4" Elevation="3" Height="100%">
|
||||||
|
<MudStack Row style="margin-block: 0.2em;">
|
||||||
|
<MudSelect @bind-Value="exportFormat" Label="@LanguageLocale.dto_StayExportFile_ExportFormat" FullWidth
|
||||||
|
Clearable>
|
||||||
|
@foreach (StayExportFormat option in Enum.GetValues<StayExportFormat>())
|
||||||
|
{
|
||||||
|
<MudSelectItem Value="new Nullable<StayExportFormat>(option)">
|
||||||
|
@Localizer.GetEnumValue(option)
|
||||||
|
</MudSelectItem>
|
||||||
|
}
|
||||||
|
</MudSelect>
|
||||||
|
<MudSelect @bind-Value="exportParams.ExportType" For="@(() => exportParams.ExportType)"
|
||||||
|
Label="@LanguageLocale.dto_StayExportParams_ExportType" FullWidth Clearable>
|
||||||
|
@foreach (StayExportParamType option in Enum.GetValues<StayExportParamType>())
|
||||||
|
{
|
||||||
|
<MudSelectItem Value="new Nullable<StayExportParamType>(option)">
|
||||||
|
@Localizer.GetEnumValue(option)
|
||||||
|
</MudSelectItem>
|
||||||
|
}
|
||||||
|
</MudSelect>
|
||||||
|
</MudStack>
|
||||||
|
</MudPaper>
|
||||||
|
@if (_showPeriodFields)
|
||||||
|
{
|
||||||
|
<MudPaper Class="pa-4" Elevation="3" Height="100%">
|
||||||
|
<MudStack Row>
|
||||||
|
<MudDatePicker @bind-Date="exportParams.ExportPeriodStart" For="@(() => exportParams.ExportPeriodStart)"
|
||||||
|
Label="@LanguageLocale.dto_StayExportParams_ExportPeriodStart" Clearable OpenTo="OpenTo.Date" Editable
|
||||||
|
AutoClose="true" />
|
||||||
|
<MudDatePicker @bind-Date="exportParams.ExportPeriodEnd" For="@(() => exportParams.ExportPeriodEnd)"
|
||||||
|
Label="@LanguageLocale.dto_StayExportParams_ExportPeriodEnd" Clearable OpenTo="OpenTo.Date" Editable
|
||||||
|
AutoClose="true" />
|
||||||
|
</MudStack>
|
||||||
|
</MudPaper>
|
||||||
|
}
|
||||||
|
|
||||||
|
</MudForm>
|
||||||
|
|
||||||
|
@if (_isExported && exportedFile != null)
|
||||||
|
{
|
||||||
|
<MudPaper Class="pa-4 my-6" Elevation="3" Height="100%">
|
||||||
|
<MudStack>
|
||||||
|
<MudText Typo="Typo.h4">File Exported!</MudText>
|
||||||
|
<MudTextField Value="@Localizer.GetEnumValue(exportedFile.ExportResult)"
|
||||||
|
Label="@LanguageLocale.dto_StayExportFile_ExportResult" FullWidth ReadOnly="true" />
|
||||||
|
<MudTextField Value="@Localizer.GetEnumValue(exportedFile.ExportFormat)"
|
||||||
|
Label="@LanguageLocale.dto_StayExportFile_ExportFormat" FullWidth ReadOnly="true" />
|
||||||
|
<MudButton OnClick="BtnDownloadExportedFile">Download Exported File</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
</MudPaper>
|
||||||
|
}
|
||||||
|
|
||||||
|
@code {
|
||||||
|
MudForm _form = null!;
|
||||||
|
|
||||||
|
StayExportFormat? exportFormat = null;
|
||||||
|
StayExportParamsDTO exportParams = new();
|
||||||
|
StayExportFileDTO? exportedFile = null;
|
||||||
|
|
||||||
|
bool _showPeriodFields => exportParams.ExportType == StayExportParamType.PeriodDateIn;
|
||||||
|
bool _isExported => exportedFile != null;
|
||||||
|
|
||||||
|
|
||||||
|
private void BtnReturn()
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo(GuestConsts.Page_StayExport_List);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task BtnCreateExport()
|
||||||
|
{
|
||||||
|
await _form.ValidateAsync();
|
||||||
|
if (!_form.IsValid || exportFormat == null)
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("Invalid Form!", MessageKind.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var loadingDialog = await DialogService.ShowAsync<LoadingDialog>();
|
||||||
|
|
||||||
|
var exportResult = await ExportService.ExportStaysByParamsAsync(exportFormat.Value, exportParams);
|
||||||
|
exportedFile = exportResult.Value;
|
||||||
|
loadingDialog.Close();
|
||||||
|
|
||||||
|
if (!exportResult.IsSuccess)
|
||||||
|
{
|
||||||
|
userMessage.ShowResultWithMessage(exportResult, $"Error exporting stays");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
userMessage.ShowMessage(
|
||||||
|
$"Stay exported: {exportResult.ResultCode} with export result: {exportedFile?.ExportResult}",
|
||||||
|
MessageKind.Success);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task BtnDownloadExportedFile()
|
||||||
|
{
|
||||||
|
Debug.Assert(exportedFile != null);
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(exportedFile.ExportedPath))
|
||||||
|
{
|
||||||
|
userMessage.ShowMessage("Exported File can't be downloaded as no file was saved", MessageKind.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
using Stream dataStream = new MemoryStream();
|
||||||
|
|
||||||
|
Result loadResult = await ExportService.GetExportedFileAsync(exportedFile, dataStream);
|
||||||
|
if (!loadResult.IsSuccess)
|
||||||
|
{
|
||||||
|
userMessage.ShowResultWithMessage(loadResult, "Exported File can't be downloaded");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
dataStream.Seek(0, SeekOrigin.Begin);
|
||||||
|
using var streamRef = new DotNetStreamReference(stream: dataStream);
|
||||||
|
|
||||||
|
var fileName = Path.GetFileName(exportedFile.ExportedPath);
|
||||||
|
await JS.InvokeVoidAsync("downloadFileFromStream", fileName, streamRef);
|
||||||
|
|
||||||
|
userMessage.ShowMessage("Exported File downloaded!", MessageKind.Success);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1 +1,3 @@
|
|||||||
@using Somnia.GuestLog.Components.Controls
|
@using Somnia.GuestLog.Components.Controls
|
||||||
|
@using Somnia.GuestLog.Services.Entity;
|
||||||
|
@using System.Diagnostics;
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
@using System.Net.Http
|
@using System.Net.Http
|
||||||
@using System.Net.Http.Json
|
@using System.Net.Http.Json
|
||||||
|
@using System.Linq;
|
||||||
@using Microsoft.AspNetCore.Components.Forms
|
@using Microsoft.AspNetCore.Components.Forms
|
||||||
@using Microsoft.AspNetCore.Components.Routing
|
@using Microsoft.AspNetCore.Components.Routing
|
||||||
@using Microsoft.AspNetCore.Components.Web
|
@using Microsoft.AspNetCore.Components.Web
|
||||||
@@ -12,4 +13,7 @@
|
|||||||
@using Somnia.GuestLog
|
@using Somnia.GuestLog
|
||||||
@using Somnia.GuestLog.Components
|
@using Somnia.GuestLog.Components
|
||||||
@using Somnia.GuestLog.Components.Layout
|
@using Somnia.GuestLog.Components.Layout
|
||||||
|
@using Somnia.GuestLog.Components.Forms
|
||||||
|
@using Somnia.GuestLog.Components.Controls
|
||||||
@using Somnia.GuestLog.Resources
|
@using Somnia.GuestLog.Resources
|
||||||
|
@using Somnia.GuestLog.Enums.UI
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
namespace Somnia.GuestLog.Enums.Models;
|
||||||
|
|
||||||
|
public enum StayExportFileResult
|
||||||
|
{
|
||||||
|
OK = 0,
|
||||||
|
NoData = 1,
|
||||||
|
ExportError = 2,
|
||||||
|
UploadError = 3,
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace Somnia.GuestLog.Enums.Models;
|
||||||
|
|
||||||
|
public enum StayExportFormat
|
||||||
|
{
|
||||||
|
GuestLogJson = 0,
|
||||||
|
SpainParteViajeros = 1,
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace Somnia.GuestLog.Enums.Models;
|
||||||
|
|
||||||
|
public enum StayExportParamType
|
||||||
|
{
|
||||||
|
PeriodDateIn = 0,
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace Somnia.GuestLog.Enums.Services;
|
||||||
|
|
||||||
|
public enum AddressQueryProvider
|
||||||
|
{
|
||||||
|
Nominatim,
|
||||||
|
GoogleApiV4
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
namespace Somnia.GuestLog.Enums.Services;
|
||||||
|
|
||||||
|
public enum ResultCode
|
||||||
|
{
|
||||||
|
//Common Codes
|
||||||
|
Ok,
|
||||||
|
UnknownError,
|
||||||
|
FailedValidation,
|
||||||
|
NotFound,
|
||||||
|
FileStorageError,
|
||||||
|
|
||||||
|
//Specific Codes
|
||||||
|
GuestInStay,
|
||||||
|
GuestCurrentlyInStay,
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace Somnia.GuestLog.Enums.UI;
|
||||||
|
|
||||||
|
public enum FormMode
|
||||||
|
{
|
||||||
|
Create, ReadOnly, Edit
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace Somnia.GuestLog.Enums.UI;
|
||||||
|
|
||||||
|
public enum MessageKind
|
||||||
|
{
|
||||||
|
Info, Warning, Error, Success, Normal
|
||||||
|
}
|
||||||
@@ -5,12 +5,25 @@ public static class GuestConsts
|
|||||||
|
|
||||||
public const string Page_GuestDocs_List = "/guest-documents";
|
public const string Page_GuestDocs_List = "/guest-documents";
|
||||||
public const string Page_GuestDocs_New = "/guest-documents/new";
|
public const string Page_GuestDocs_New = "/guest-documents/new";
|
||||||
public const string Page_GuestDocs_Detail = "/guest-documents/d/{docId}";
|
public const string Page_GuestDocs_Detail = $"/guest-documents/d/{Page_GuestDocs_Detail_Param_DocId}";
|
||||||
|
public const string Page_GuestDocs_Detail_Param_DocId = "{docId:long}";
|
||||||
|
|
||||||
|
public const string Page_StayEntry_List = "/stayEntries";
|
||||||
|
public const string Page_StayEntry_New = "/stayEntries/new";
|
||||||
|
public const string Page_StayEntry_Detail = $"/stayEntries/d/{Page_StayEntry_Detail_Param_Id}";
|
||||||
|
public const string Page_StayEntry_Detail_Param_Id = "{StayId:long}";
|
||||||
|
|
||||||
|
public const string Page_StayExport_List = "/stayExport";
|
||||||
|
public const string Page_StayExport_New = "/stayExport/new";
|
||||||
|
|
||||||
|
|
||||||
|
public const string QueryParam_ReturnUrl = "returnUrl";
|
||||||
|
|
||||||
|
|
||||||
public const string DataList_DocumentTypes = "DocumentType";
|
public const string DataList_DocumentTypes = "DocumentType";
|
||||||
public const string DataList_GenderOptions = "GenderOption";
|
public const string DataList_GenderOptions = "GenderOption";
|
||||||
public const string DataList_CountryCodes = "CountryCode";
|
public const string DataList_CountryCodes = "CountryCode";
|
||||||
|
public const string DataList_PaymentMethods = "PaymentMethod";
|
||||||
|
|
||||||
|
|
||||||
public const string CountryCode_ESP = "ESP";
|
public const string CountryCode_ESP = "ESP";
|
||||||
@@ -18,4 +31,13 @@ public static class GuestConsts
|
|||||||
public const string DocumentType_DNI = "DNI";
|
public const string DocumentType_DNI = "DNI";
|
||||||
public const string DocumentType_NIE = "NIE";
|
public const string DocumentType_NIE = "NIE";
|
||||||
public const string DocumentType_PASSPORT = "PASSPORT";
|
public const string DocumentType_PASSPORT = "PASSPORT";
|
||||||
|
|
||||||
|
public const string GenderOptions_MALE = "M";
|
||||||
|
public const string GenderOptions_FEMALE = "F";
|
||||||
|
public const string GenderOptions_OTHER = "O";
|
||||||
|
|
||||||
|
public const int GuestDocument_FirstVersion = 1;
|
||||||
|
|
||||||
|
|
||||||
|
public const string EmptyField = "-";
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
namespace Somnia.GuestLog.Infrastructure;
|
||||||
|
|
||||||
|
public static class DbConsts
|
||||||
|
{
|
||||||
|
public const string DbType_Timestamptz = "timestamp with time zone";
|
||||||
|
public const string DbType_Timestamptz_0 = "timestamp(0) with time zone";
|
||||||
|
public const string DbType_Timestamptz_3 = "timestamp(3) with time zone";
|
||||||
|
|
||||||
|
public const string DbType_jsonb = "jsonb";
|
||||||
|
|
||||||
|
public const string PK_NotApply = "N/A";
|
||||||
|
}
|
||||||
@@ -11,7 +11,13 @@ public class GuestDocumentEntityConfig : IEntityTypeConfiguration<GuestDocument>
|
|||||||
builder.ToTable("GuestDocument");
|
builder.ToTable("GuestDocument");
|
||||||
|
|
||||||
//PK
|
//PK
|
||||||
builder.HasKey(e => new { e.DocumentType, e.DocumentNum });
|
builder.HasKey(e => new { e.Id, e.Version });
|
||||||
|
|
||||||
|
builder.Property(e => e.Id)
|
||||||
|
.UseIdentityByDefaultColumn();
|
||||||
|
|
||||||
|
builder.Property(e => e.Version)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
builder.Property(e => e.DocumentType)
|
builder.Property(e => e.DocumentType)
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
@@ -48,6 +54,15 @@ public class GuestDocumentEntityConfig : IEntityTypeConfiguration<GuestDocument>
|
|||||||
builder.Property(e => e.EmailAddress)
|
builder.Property(e => e.EmailAddress)
|
||||||
.HasMaxLength(256);
|
.HasMaxLength(256);
|
||||||
|
|
||||||
|
builder.Property(e => e.CreateTime)
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType(DbConsts.DbType_Timestamptz_3);
|
||||||
|
builder.Property(e => e.UpdateTime)
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType(DbConsts.DbType_Timestamptz_3);
|
||||||
|
builder.Property(e => e.IsLastVersion)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
|
||||||
var addressBuilder = builder.ComplexProperty(e => e.AddressDetails);
|
var addressBuilder = builder.ComplexProperty(e => e.AddressDetails);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Metadata.Builders;
|
||||||
|
using Somnia.GuestLog.Models.Entities;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Infrastructure.EntityConfigs;
|
||||||
|
|
||||||
|
public class StayEntryEntityConfig : IEntityTypeConfiguration<StayEntry>
|
||||||
|
{
|
||||||
|
public void Configure(EntityTypeBuilder<StayEntry> builder)
|
||||||
|
{
|
||||||
|
builder.ToTable("StayEntry");
|
||||||
|
|
||||||
|
//PK
|
||||||
|
builder.HasKey(e => e.Id);
|
||||||
|
|
||||||
|
builder.Property(e => e.Id)
|
||||||
|
.IsRequired()
|
||||||
|
.UseIdentityByDefaultColumn();
|
||||||
|
|
||||||
|
builder.Property(e => e.DateIn)
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType(DbConsts.DbType_Timestamptz_0);
|
||||||
|
builder.Property(e => e.DateOut)
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType(DbConsts.DbType_Timestamptz_0);
|
||||||
|
|
||||||
|
builder.Property(e => e.RoomNumber)
|
||||||
|
.HasMaxLength(32);
|
||||||
|
builder.Property(e => e.PaymentMethod)
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(5);
|
||||||
|
|
||||||
|
|
||||||
|
builder.Property(e => e.CreateTime)
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType(DbConsts.DbType_Timestamptz);
|
||||||
|
builder.Property(e => e.UpdateTime)
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType(DbConsts.DbType_Timestamptz);
|
||||||
|
|
||||||
|
|
||||||
|
builder.HasMany(e => e.GuestDocuments)
|
||||||
|
.WithMany();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Metadata.Builders;
|
||||||
|
using Somnia.GuestLog.Models.Entities;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Infrastructure.EntityConfigs;
|
||||||
|
|
||||||
|
public class StayExportFileEntityConfig : IEntityTypeConfiguration<StayExportFile>
|
||||||
|
{
|
||||||
|
public void Configure(EntityTypeBuilder<StayExportFile> builder)
|
||||||
|
{
|
||||||
|
builder.ToTable("StayExportFile");
|
||||||
|
|
||||||
|
//PK
|
||||||
|
builder.HasKey(e => e.Id);
|
||||||
|
|
||||||
|
builder.Property(e => e.Id)
|
||||||
|
.IsRequired()
|
||||||
|
.UseIdentityByDefaultColumn();
|
||||||
|
|
||||||
|
builder.ComplexProperty(e => e.ExportParams, e =>
|
||||||
|
{
|
||||||
|
e.ToJson();
|
||||||
|
});
|
||||||
|
|
||||||
|
builder.Property(e => e.ExportedPath)
|
||||||
|
.HasMaxLength(256);
|
||||||
|
|
||||||
|
builder.Property(e => e.ExportDetails)
|
||||||
|
.HasColumnType(DbConsts.DbType_jsonb);
|
||||||
|
|
||||||
|
|
||||||
|
builder.Property(e => e.ExportTime)
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType(DbConsts.DbType_Timestamptz);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,11 +11,16 @@ public partial class GuestLogContext : DbContext
|
|||||||
{ }
|
{ }
|
||||||
|
|
||||||
public DbSet<GuestDocument> GuestDocuments { get; set; }
|
public DbSet<GuestDocument> GuestDocuments { get; set; }
|
||||||
|
public DbSet<StayEntry> StayEntries { get; set; }
|
||||||
|
|
||||||
|
public DbSet<StayExportFile> StayExportFiles { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||||
{
|
{
|
||||||
modelBuilder.ApplyConfiguration<GuestDocument>(new GuestDocumentEntityConfig());
|
modelBuilder.ApplyConfiguration<GuestDocument>(new GuestDocumentEntityConfig());
|
||||||
|
modelBuilder.ApplyConfiguration<StayEntry>(new StayEntryEntityConfig());
|
||||||
|
modelBuilder.ApplyConfiguration<StayExportFile>(new StayExportFileEntityConfig());
|
||||||
|
|
||||||
OnModelCreatingPartial(modelBuilder);
|
OnModelCreatingPartial(modelBuilder);
|
||||||
base.OnModelCreating(modelBuilder);
|
base.OnModelCreating(modelBuilder);
|
||||||
|
|||||||
Generated
+191
@@ -0,0 +1,191 @@
|
|||||||
|
// <auto-generated />
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
using Somnia.GuestLog.Infrastructure;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
[DbContext(typeof(GuestLogContext))]
|
||||||
|
[Migration("20260813085339_AddTable_StayEntry")]
|
||||||
|
partial class AddTable_StayEntry
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
|
{
|
||||||
|
#pragma warning disable 612, 618
|
||||||
|
modelBuilder
|
||||||
|
.HasAnnotation("ProductVersion", "10.0.7")
|
||||||
|
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||||
|
|
||||||
|
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||||
|
|
||||||
|
modelBuilder.Entity("GuestDocumentStayEntry", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("StayEntryId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<string>("GuestDocumentsDocumentType")
|
||||||
|
.HasColumnType("character varying(8)");
|
||||||
|
|
||||||
|
b.Property<string>("GuestDocumentsDocumentNum")
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.HasKey("StayEntryId", "GuestDocumentsDocumentType", "GuestDocumentsDocumentNum");
|
||||||
|
|
||||||
|
b.HasIndex("GuestDocumentsDocumentType", "GuestDocumentsDocumentNum");
|
||||||
|
|
||||||
|
b.ToTable("GuestDocumentStayEntry");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.GuestDocument", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("DocumentType")
|
||||||
|
.HasMaxLength(8)
|
||||||
|
.HasColumnType("character varying(8)");
|
||||||
|
|
||||||
|
b.Property<string>("DocumentNum")
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<DateOnly>("BirthDate")
|
||||||
|
.HasColumnType("date");
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("EmailAddress")
|
||||||
|
.HasMaxLength(256)
|
||||||
|
.HasColumnType("character varying(256)");
|
||||||
|
|
||||||
|
b.Property<string>("Gender")
|
||||||
|
.HasMaxLength(1)
|
||||||
|
.HasColumnType("character varying(1)");
|
||||||
|
|
||||||
|
b.Property<DateOnly>("IssueDate")
|
||||||
|
.HasColumnType("date");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("Nationality")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(3)
|
||||||
|
.HasColumnType("character varying(3)");
|
||||||
|
|
||||||
|
b.Property<string>("PhoneNumber")
|
||||||
|
.HasMaxLength(32)
|
||||||
|
.HasColumnType("character varying(32)");
|
||||||
|
|
||||||
|
b.Property<string>("SupportNum")
|
||||||
|
.HasMaxLength(10)
|
||||||
|
.HasColumnType("character varying(10)");
|
||||||
|
|
||||||
|
b.Property<string>("Surname")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("Surname2")
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UpdateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.ComplexProperty(typeof(Dictionary<string, object>), "AddressDetails", "Somnia.GuestLog.Models.Entities.GuestDocument.AddressDetails#GuestAddress", b1 =>
|
||||||
|
{
|
||||||
|
b1.Property<string>("Address")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressCity")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressCountry")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(3)
|
||||||
|
.HasColumnType("character varying(3)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressProvince")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressState")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("ZipCode")
|
||||||
|
.HasMaxLength(12)
|
||||||
|
.HasColumnType("character varying(12)");
|
||||||
|
});
|
||||||
|
|
||||||
|
b.HasKey("DocumentType", "DocumentNum");
|
||||||
|
|
||||||
|
b.ToTable("GuestDocument", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.StayEntry", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateIn")
|
||||||
|
.HasColumnType("timestamp(0) with time zone");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateOut")
|
||||||
|
.HasColumnType("timestamp(0) with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("PaymentMethod")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(5)
|
||||||
|
.HasColumnType("character varying(5)");
|
||||||
|
|
||||||
|
b.Property<int>("RoomCount")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("RoomNumber")
|
||||||
|
.HasMaxLength(32)
|
||||||
|
.HasColumnType("character varying(32)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UpdateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("StayEntry", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("GuestDocumentStayEntry", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Somnia.GuestLog.Models.Entities.StayEntry", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("StayEntryId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("Somnia.GuestLog.Models.Entities.GuestDocument", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("GuestDocumentsDocumentType", "GuestDocumentsDocumentNum")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
});
|
||||||
|
#pragma warning restore 612, 618
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AddTable_StayEntry : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "StayEntry",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
DateIn = table.Column<DateTime>(type: "timestamp(0) with time zone", nullable: false),
|
||||||
|
DateOut = table.Column<DateTime>(type: "timestamp(0) with time zone", nullable: false),
|
||||||
|
RoomCount = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
RoomNumber = table.Column<string>(type: "character varying(32)", maxLength: 32, nullable: true),
|
||||||
|
PaymentMethod = table.Column<string>(type: "character varying(5)", maxLength: 5, nullable: false),
|
||||||
|
CreateTime = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
|
||||||
|
UpdateTime = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_StayEntry", x => x.Id);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "GuestDocumentStayEntry",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
StayEntryId = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
GuestDocumentsDocumentType = table.Column<string>(type: "character varying(8)", nullable: false),
|
||||||
|
GuestDocumentsDocumentNum = table.Column<string>(type: "character varying(64)", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_GuestDocumentStayEntry", x => new { x.StayEntryId, x.GuestDocumentsDocumentType, x.GuestDocumentsDocumentNum });
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_GuestDocumentStayEntry_GuestDocument_GuestDocumentsDocument~",
|
||||||
|
columns: x => new { x.GuestDocumentsDocumentType, x.GuestDocumentsDocumentNum },
|
||||||
|
principalTable: "GuestDocument",
|
||||||
|
principalColumns: new[] { "DocumentType", "DocumentNum" },
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_GuestDocumentStayEntry_StayEntry_StayEntryId",
|
||||||
|
column: x => x.StayEntryId,
|
||||||
|
principalTable: "StayEntry",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_GuestDocumentStayEntry_GuestDocumentsDocumentType_GuestDocu~",
|
||||||
|
table: "GuestDocumentStayEntry",
|
||||||
|
columns: new[] { "GuestDocumentsDocumentType", "GuestDocumentsDocumentNum" });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "GuestDocumentStayEntry");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "StayEntry");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+205
@@ -0,0 +1,205 @@
|
|||||||
|
// <auto-generated />
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
using Somnia.GuestLog.Infrastructure;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
[DbContext(typeof(GuestLogContext))]
|
||||||
|
[Migration("20260830201743_GuestDocument_ChangePKToIdAndVersion")]
|
||||||
|
partial class GuestDocument_ChangePKToIdAndVersion
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
|
{
|
||||||
|
#pragma warning disable 612, 618
|
||||||
|
modelBuilder
|
||||||
|
.HasAnnotation("ProductVersion", "10.0.7")
|
||||||
|
.HasAnnotation("Proxies:ChangeTracking", false)
|
||||||
|
.HasAnnotation("Proxies:CheckEquality", false)
|
||||||
|
.HasAnnotation("Proxies:LazyLoading", true)
|
||||||
|
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||||
|
|
||||||
|
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||||
|
|
||||||
|
modelBuilder.Entity("GuestDocumentStayEntry", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("StayEntryId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<long>("GuestDocumentsId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<int>("GuestDocumentsVersion")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasKey("StayEntryId", "GuestDocumentsId", "GuestDocumentsVersion");
|
||||||
|
|
||||||
|
b.HasIndex("GuestDocumentsId", "GuestDocumentsVersion");
|
||||||
|
|
||||||
|
b.ToTable("GuestDocumentStayEntry");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.GuestDocument", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<int>("Version")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<DateOnly>("BirthDate")
|
||||||
|
.HasColumnType("date");
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("DocumentNum")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("DocumentType")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(8)
|
||||||
|
.HasColumnType("character varying(8)");
|
||||||
|
|
||||||
|
b.Property<string>("EmailAddress")
|
||||||
|
.HasMaxLength(256)
|
||||||
|
.HasColumnType("character varying(256)");
|
||||||
|
|
||||||
|
b.Property<string>("Gender")
|
||||||
|
.HasMaxLength(1)
|
||||||
|
.HasColumnType("character varying(1)");
|
||||||
|
|
||||||
|
b.Property<DateOnly>("IssueDate")
|
||||||
|
.HasColumnType("date");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("Nationality")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(3)
|
||||||
|
.HasColumnType("character varying(3)");
|
||||||
|
|
||||||
|
b.Property<string>("PhoneNumber")
|
||||||
|
.HasMaxLength(32)
|
||||||
|
.HasColumnType("character varying(32)");
|
||||||
|
|
||||||
|
b.Property<string>("SupportNum")
|
||||||
|
.HasMaxLength(10)
|
||||||
|
.HasColumnType("character varying(10)");
|
||||||
|
|
||||||
|
b.Property<string>("Surname")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("Surname2")
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UpdateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.ComplexProperty(typeof(Dictionary<string, object>), "AddressDetails", "Somnia.GuestLog.Models.Entities.GuestDocument.AddressDetails#GuestAddress", b1 =>
|
||||||
|
{
|
||||||
|
b1.Property<string>("Address")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressCity")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressCountry")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(3)
|
||||||
|
.HasColumnType("character varying(3)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressProvince")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressState")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("ZipCode")
|
||||||
|
.HasMaxLength(12)
|
||||||
|
.HasColumnType("character varying(12)");
|
||||||
|
});
|
||||||
|
|
||||||
|
b.HasKey("Id", "Version");
|
||||||
|
|
||||||
|
b.ToTable("GuestDocument", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.StayEntry", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateIn")
|
||||||
|
.HasColumnType("timestamp(0) with time zone");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateOut")
|
||||||
|
.HasColumnType("timestamp(0) with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("PaymentMethod")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(5)
|
||||||
|
.HasColumnType("character varying(5)");
|
||||||
|
|
||||||
|
b.Property<int>("RoomCount")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("RoomNumber")
|
||||||
|
.HasMaxLength(32)
|
||||||
|
.HasColumnType("character varying(32)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UpdateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("StayEntry", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("GuestDocumentStayEntry", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Somnia.GuestLog.Models.Entities.StayEntry", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("StayEntryId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("Somnia.GuestLog.Models.Entities.GuestDocument", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("GuestDocumentsId", "GuestDocumentsVersion")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
});
|
||||||
|
#pragma warning restore 612, 618
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+101
@@ -0,0 +1,101 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class GuestDocument_ChangePKToIdAndVersion : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
//Data don't really matter right now. Just get it working good.
|
||||||
|
//This migration will destry all data, but it's fine.
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "GuestDocumentStayEntry"
|
||||||
|
);
|
||||||
|
|
||||||
|
migrationBuilder.Sql("""DELETE FROM "StayEntry";""");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "GuestDocument"
|
||||||
|
);
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "GuestDocument",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
Version = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
DocumentType = table.Column<string>(type: "character varying(8)", maxLength: 8, nullable: false),
|
||||||
|
DocumentNum = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
|
||||||
|
IssueDate = table.Column<DateOnly>(type: "date", nullable: false),
|
||||||
|
SupportNum = table.Column<string>(type: "character varying(10)", maxLength: 10, nullable: true),
|
||||||
|
Nationality = table.Column<string>(type: "character varying(3)", maxLength: 3, nullable: false),
|
||||||
|
Name = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
|
||||||
|
Surname = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
|
||||||
|
Surname2 = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: true),
|
||||||
|
BirthDate = table.Column<DateOnly>(type: "date", nullable: false),
|
||||||
|
Gender = table.Column<string>(type: "character varying(1)", maxLength: 1, nullable: true),
|
||||||
|
PhoneNumber = table.Column<string>(type: "character varying(32)", maxLength: 32, nullable: true),
|
||||||
|
EmailAddress = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
|
||||||
|
CreateTime = table.Column<DateTime>(type: "timestamp(3) with time zone", nullable: false),
|
||||||
|
UpdateTime = table.Column<DateTime>(type: "timestamp(3) with time zone", nullable: false),
|
||||||
|
IsLastVersion = table.Column<bool>(type: "boolean", nullable: false),
|
||||||
|
AddressDetails_Address = table.Column<string>(type: "character varying(128)", maxLength: 128, nullable: true),
|
||||||
|
AddressDetails_AddressCity = table.Column<string>(type: "character varying(128)", maxLength: 128, nullable: true),
|
||||||
|
AddressDetails_AddressCountry = table.Column<string>(type: "character varying(3)", maxLength: 3, nullable: true),
|
||||||
|
AddressDetails_AddressProvince = table.Column<string>(type: "character varying(128)", maxLength: 128, nullable: true),
|
||||||
|
AddressDetails_AddressState = table.Column<string>(type: "character varying(128)", maxLength: 128, nullable: true),
|
||||||
|
AddressDetails_ZipCode = table.Column<string>(type: "character varying(12)", maxLength: 12, nullable: true)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_GuestDocument", x => new { x.Id, x.Version });
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
//Existing index for "DocType" and "DocNum" can be useful, so let's keep it.
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "GuestDocumentStayEntry",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
StayEntryId = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
GuestDocumentsId = table.Column<long>(type: "bigint", nullable: false),
|
||||||
|
GuestDocumentsVersion = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_GuestDocumentStayEntry", x => new { x.StayEntryId, x.GuestDocumentsId, x.GuestDocumentsVersion });
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_GuestDocumentStayEntry_GuestDocument_GuestDocumentsId_Guest~",
|
||||||
|
columns: x => new { x.GuestDocumentsId, x.GuestDocumentsVersion },
|
||||||
|
principalTable: "GuestDocument",
|
||||||
|
principalColumns: new[] { "Id", "Version" },
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_GuestDocumentStayEntry_StayEntry_StayEntryId",
|
||||||
|
column: x => x.StayEntryId,
|
||||||
|
principalTable: "StayEntry",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_GuestDocumentStayEntry_GuestDocumentsId_GuestDocumentsVersi~",
|
||||||
|
table: "GuestDocumentStayEntry",
|
||||||
|
columns: new[] { "GuestDocumentsId", "GuestDocumentsVersion" });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
throw new NotSupportedException("Rollback is not supported for this migration!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Generated
+249
@@ -0,0 +1,249 @@
|
|||||||
|
// <auto-generated />
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
using Somnia.GuestLog.Infrastructure;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
[DbContext(typeof(GuestLogContext))]
|
||||||
|
[Migration("20260901161146_AddTable_StayExportFile")]
|
||||||
|
partial class AddTable_StayExportFile
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
|
{
|
||||||
|
#pragma warning disable 612, 618
|
||||||
|
modelBuilder
|
||||||
|
.HasAnnotation("ProductVersion", "10.0.7")
|
||||||
|
.HasAnnotation("Proxies:ChangeTracking", false)
|
||||||
|
.HasAnnotation("Proxies:CheckEquality", false)
|
||||||
|
.HasAnnotation("Proxies:LazyLoading", true)
|
||||||
|
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||||
|
|
||||||
|
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||||
|
|
||||||
|
modelBuilder.Entity("GuestDocumentStayEntry", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("StayEntryId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<long>("GuestDocumentsId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<int>("GuestDocumentsVersion")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasKey("StayEntryId", "GuestDocumentsId", "GuestDocumentsVersion");
|
||||||
|
|
||||||
|
b.HasIndex("GuestDocumentsId", "GuestDocumentsVersion");
|
||||||
|
|
||||||
|
b.ToTable("GuestDocumentStayEntry");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.GuestDocument", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<int>("Version")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<DateOnly>("BirthDate")
|
||||||
|
.HasColumnType("date");
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreateTime")
|
||||||
|
.HasColumnType("timestamp(3) with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("DocumentNum")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("DocumentType")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(8)
|
||||||
|
.HasColumnType("character varying(8)");
|
||||||
|
|
||||||
|
b.Property<string>("EmailAddress")
|
||||||
|
.HasMaxLength(256)
|
||||||
|
.HasColumnType("character varying(256)");
|
||||||
|
|
||||||
|
b.Property<string>("Gender")
|
||||||
|
.HasMaxLength(1)
|
||||||
|
.HasColumnType("character varying(1)");
|
||||||
|
|
||||||
|
b.Property<bool>("IsLastVersion")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<DateOnly>("IssueDate")
|
||||||
|
.HasColumnType("date");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("Nationality")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(3)
|
||||||
|
.HasColumnType("character varying(3)");
|
||||||
|
|
||||||
|
b.Property<string>("PhoneNumber")
|
||||||
|
.HasMaxLength(32)
|
||||||
|
.HasColumnType("character varying(32)");
|
||||||
|
|
||||||
|
b.Property<string>("SupportNum")
|
||||||
|
.HasMaxLength(10)
|
||||||
|
.HasColumnType("character varying(10)");
|
||||||
|
|
||||||
|
b.Property<string>("Surname")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("Surname2")
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UpdateTime")
|
||||||
|
.HasColumnType("timestamp(3) with time zone");
|
||||||
|
|
||||||
|
b.ComplexProperty(typeof(Dictionary<string, object>), "AddressDetails", "Somnia.GuestLog.Models.Entities.GuestDocument.AddressDetails#GuestAddress", b1 =>
|
||||||
|
{
|
||||||
|
b1.Property<string>("Address")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressCity")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressCountry")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(3)
|
||||||
|
.HasColumnType("character varying(3)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressProvince")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressState")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("ZipCode")
|
||||||
|
.HasMaxLength(12)
|
||||||
|
.HasColumnType("character varying(12)");
|
||||||
|
});
|
||||||
|
|
||||||
|
b.HasKey("Id", "Version");
|
||||||
|
|
||||||
|
b.ToTable("GuestDocument", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.StayEntry", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateIn")
|
||||||
|
.HasColumnType("timestamp(0) with time zone");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateOut")
|
||||||
|
.HasColumnType("timestamp(0) with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("PaymentMethod")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(5)
|
||||||
|
.HasColumnType("character varying(5)");
|
||||||
|
|
||||||
|
b.Property<int>("RoomCount")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("RoomNumber")
|
||||||
|
.HasMaxLength(32)
|
||||||
|
.HasColumnType("character varying(32)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UpdateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("StayEntry", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.StayExportFile", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<int>("ExportFormat")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<int>("ExportResult")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<DateTime>("ExportTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("ExportedPath")
|
||||||
|
.HasMaxLength(256)
|
||||||
|
.HasColumnType("character varying(256)");
|
||||||
|
|
||||||
|
b.ComplexProperty(typeof(Dictionary<string, object>), "ExportParams", "Somnia.GuestLog.Models.Entities.StayExportFile.ExportParams#StayExportParams", b1 =>
|
||||||
|
{
|
||||||
|
b1.IsRequired();
|
||||||
|
|
||||||
|
b1.Property<DateTime?>("ExportPeriodEnd");
|
||||||
|
|
||||||
|
b1.Property<DateTime?>("ExportPeriodStart");
|
||||||
|
|
||||||
|
b1.Property<int>("ExportType");
|
||||||
|
|
||||||
|
b1
|
||||||
|
.ToJson("ExportParams")
|
||||||
|
.HasColumnType("jsonb");
|
||||||
|
});
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("StayExportFile", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("GuestDocumentStayEntry", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Somnia.GuestLog.Models.Entities.StayEntry", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("StayEntryId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("Somnia.GuestLog.Models.Entities.GuestDocument", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("GuestDocumentsId", "GuestDocumentsVersion")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
});
|
||||||
|
#pragma warning restore 612, 618
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+40
@@ -0,0 +1,40 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AddTable_StayExportFile : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "StayExportFile",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
ExportFormat = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
ExportResult = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
ExportedPath = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
|
||||||
|
ExportTime = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
|
||||||
|
ExportParams = table.Column<string>(type: "jsonb", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_StayExportFile", x => x.Id);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "StayExportFile");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+252
@@ -0,0 +1,252 @@
|
|||||||
|
// <auto-generated />
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
using Somnia.GuestLog.Infrastructure;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
[DbContext(typeof(GuestLogContext))]
|
||||||
|
[Migration("20260908172441_StayExportFile_AddColumn_ExportDetails")]
|
||||||
|
partial class StayExportFile_AddColumn_ExportDetails
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
|
{
|
||||||
|
#pragma warning disable 612, 618
|
||||||
|
modelBuilder
|
||||||
|
.HasAnnotation("ProductVersion", "10.0.7")
|
||||||
|
.HasAnnotation("Proxies:ChangeTracking", false)
|
||||||
|
.HasAnnotation("Proxies:CheckEquality", false)
|
||||||
|
.HasAnnotation("Proxies:LazyLoading", true)
|
||||||
|
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||||
|
|
||||||
|
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||||
|
|
||||||
|
modelBuilder.Entity("GuestDocumentStayEntry", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("StayEntryId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<long>("GuestDocumentsId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<int>("GuestDocumentsVersion")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasKey("StayEntryId", "GuestDocumentsId", "GuestDocumentsVersion");
|
||||||
|
|
||||||
|
b.HasIndex("GuestDocumentsId", "GuestDocumentsVersion");
|
||||||
|
|
||||||
|
b.ToTable("GuestDocumentStayEntry");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.GuestDocument", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<int>("Version")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<DateOnly>("BirthDate")
|
||||||
|
.HasColumnType("date");
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreateTime")
|
||||||
|
.HasColumnType("timestamp(3) with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("DocumentNum")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("DocumentType")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(8)
|
||||||
|
.HasColumnType("character varying(8)");
|
||||||
|
|
||||||
|
b.Property<string>("EmailAddress")
|
||||||
|
.HasMaxLength(256)
|
||||||
|
.HasColumnType("character varying(256)");
|
||||||
|
|
||||||
|
b.Property<string>("Gender")
|
||||||
|
.HasMaxLength(1)
|
||||||
|
.HasColumnType("character varying(1)");
|
||||||
|
|
||||||
|
b.Property<bool>("IsLastVersion")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<DateOnly>("IssueDate")
|
||||||
|
.HasColumnType("date");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("Nationality")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(3)
|
||||||
|
.HasColumnType("character varying(3)");
|
||||||
|
|
||||||
|
b.Property<string>("PhoneNumber")
|
||||||
|
.HasMaxLength(32)
|
||||||
|
.HasColumnType("character varying(32)");
|
||||||
|
|
||||||
|
b.Property<string>("SupportNum")
|
||||||
|
.HasMaxLength(10)
|
||||||
|
.HasColumnType("character varying(10)");
|
||||||
|
|
||||||
|
b.Property<string>("Surname")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("Surname2")
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UpdateTime")
|
||||||
|
.HasColumnType("timestamp(3) with time zone");
|
||||||
|
|
||||||
|
b.ComplexProperty(typeof(Dictionary<string, object>), "AddressDetails", "Somnia.GuestLog.Models.Entities.GuestDocument.AddressDetails#GuestAddress", b1 =>
|
||||||
|
{
|
||||||
|
b1.Property<string>("Address")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressCity")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressCountry")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(3)
|
||||||
|
.HasColumnType("character varying(3)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressProvince")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("AddressState")
|
||||||
|
.HasMaxLength(128)
|
||||||
|
.HasColumnType("character varying(128)");
|
||||||
|
|
||||||
|
b1.Property<string>("ZipCode")
|
||||||
|
.HasMaxLength(12)
|
||||||
|
.HasColumnType("character varying(12)");
|
||||||
|
});
|
||||||
|
|
||||||
|
b.HasKey("Id", "Version");
|
||||||
|
|
||||||
|
b.ToTable("GuestDocument", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.StayEntry", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateIn")
|
||||||
|
.HasColumnType("timestamp(0) with time zone");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateOut")
|
||||||
|
.HasColumnType("timestamp(0) with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("PaymentMethod")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(5)
|
||||||
|
.HasColumnType("character varying(5)");
|
||||||
|
|
||||||
|
b.Property<int>("RoomCount")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("RoomNumber")
|
||||||
|
.HasMaxLength(32)
|
||||||
|
.HasColumnType("character varying(32)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UpdateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("StayEntry", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.StayExportFile", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<string>("ExportDetails")
|
||||||
|
.HasColumnType("jsonb");
|
||||||
|
|
||||||
|
b.Property<int>("ExportFormat")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<int>("ExportResult")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<DateTime>("ExportTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("ExportedPath")
|
||||||
|
.HasMaxLength(256)
|
||||||
|
.HasColumnType("character varying(256)");
|
||||||
|
|
||||||
|
b.ComplexProperty(typeof(Dictionary<string, object>), "ExportParams", "Somnia.GuestLog.Models.Entities.StayExportFile.ExportParams#StayExportParams", b1 =>
|
||||||
|
{
|
||||||
|
b1.IsRequired();
|
||||||
|
|
||||||
|
b1.Property<DateTime?>("ExportPeriodEnd");
|
||||||
|
|
||||||
|
b1.Property<DateTime?>("ExportPeriodStart");
|
||||||
|
|
||||||
|
b1.Property<int>("ExportType");
|
||||||
|
|
||||||
|
b1
|
||||||
|
.ToJson("ExportParams")
|
||||||
|
.HasColumnType("jsonb");
|
||||||
|
});
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("StayExportFile", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("GuestDocumentStayEntry", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Somnia.GuestLog.Models.Entities.StayEntry", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("StayEntryId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("Somnia.GuestLog.Models.Entities.GuestDocument", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("GuestDocumentsId", "GuestDocumentsVersion")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
});
|
||||||
|
#pragma warning restore 612, 618
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+28
@@ -0,0 +1,28 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class StayExportFile_AddColumn_ExportDetails : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "ExportDetails",
|
||||||
|
table: "StayExportFile",
|
||||||
|
type: "jsonb",
|
||||||
|
nullable: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "ExportDetails",
|
||||||
|
table: "StayExportFile");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -19,25 +19,57 @@ namespace Somnia.GuestLog.Infrastructure.Migrations
|
|||||||
#pragma warning disable 612, 618
|
#pragma warning disable 612, 618
|
||||||
modelBuilder
|
modelBuilder
|
||||||
.HasAnnotation("ProductVersion", "10.0.7")
|
.HasAnnotation("ProductVersion", "10.0.7")
|
||||||
|
.HasAnnotation("Proxies:ChangeTracking", false)
|
||||||
|
.HasAnnotation("Proxies:CheckEquality", false)
|
||||||
|
.HasAnnotation("Proxies:LazyLoading", true)
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||||
|
|
||||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||||
|
|
||||||
|
modelBuilder.Entity("GuestDocumentStayEntry", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("StayEntryId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<long>("GuestDocumentsId")
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
b.Property<int>("GuestDocumentsVersion")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasKey("StayEntryId", "GuestDocumentsId", "GuestDocumentsVersion");
|
||||||
|
|
||||||
|
b.HasIndex("GuestDocumentsId", "GuestDocumentsVersion");
|
||||||
|
|
||||||
|
b.ToTable("GuestDocumentStayEntry");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.GuestDocument", b =>
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.GuestDocument", b =>
|
||||||
{
|
{
|
||||||
b.Property<string>("DocumentType")
|
b.Property<long>("Id")
|
||||||
.HasMaxLength(8)
|
.ValueGeneratedOnAdd()
|
||||||
.HasColumnType("character varying(8)");
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
b.Property<string>("DocumentNum")
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
.HasMaxLength(64)
|
|
||||||
.HasColumnType("character varying(64)");
|
b.Property<int>("Version")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
b.Property<DateOnly>("BirthDate")
|
b.Property<DateOnly>("BirthDate")
|
||||||
.HasColumnType("date");
|
.HasColumnType("date");
|
||||||
|
|
||||||
b.Property<DateTime>("CreateTime")
|
b.Property<DateTime>("CreateTime")
|
||||||
.HasColumnType("timestamp with time zone");
|
.HasColumnType("timestamp(3) with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("DocumentNum")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(64)
|
||||||
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
|
b.Property<string>("DocumentType")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(8)
|
||||||
|
.HasColumnType("character varying(8)");
|
||||||
|
|
||||||
b.Property<string>("EmailAddress")
|
b.Property<string>("EmailAddress")
|
||||||
.HasMaxLength(256)
|
.HasMaxLength(256)
|
||||||
@@ -47,6 +79,9 @@ namespace Somnia.GuestLog.Infrastructure.Migrations
|
|||||||
.HasMaxLength(1)
|
.HasMaxLength(1)
|
||||||
.HasColumnType("character varying(1)");
|
.HasColumnType("character varying(1)");
|
||||||
|
|
||||||
|
b.Property<bool>("IsLastVersion")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
b.Property<DateOnly>("IssueDate")
|
b.Property<DateOnly>("IssueDate")
|
||||||
.HasColumnType("date");
|
.HasColumnType("date");
|
||||||
|
|
||||||
@@ -78,7 +113,7 @@ namespace Somnia.GuestLog.Infrastructure.Migrations
|
|||||||
.HasColumnType("character varying(64)");
|
.HasColumnType("character varying(64)");
|
||||||
|
|
||||||
b.Property<DateTime>("UpdateTime")
|
b.Property<DateTime>("UpdateTime")
|
||||||
.HasColumnType("timestamp with time zone");
|
.HasColumnType("timestamp(3) with time zone");
|
||||||
|
|
||||||
b.ComplexProperty(typeof(Dictionary<string, object>), "AddressDetails", "Somnia.GuestLog.Models.Entities.GuestDocument.AddressDetails#GuestAddress", b1 =>
|
b.ComplexProperty(typeof(Dictionary<string, object>), "AddressDetails", "Somnia.GuestLog.Models.Entities.GuestDocument.AddressDetails#GuestAddress", b1 =>
|
||||||
{
|
{
|
||||||
@@ -108,10 +143,106 @@ namespace Somnia.GuestLog.Infrastructure.Migrations
|
|||||||
.HasColumnType("character varying(12)");
|
.HasColumnType("character varying(12)");
|
||||||
});
|
});
|
||||||
|
|
||||||
b.HasKey("DocumentType", "DocumentNum");
|
b.HasKey("Id", "Version");
|
||||||
|
|
||||||
b.ToTable("GuestDocument", (string)null);
|
b.ToTable("GuestDocument", (string)null);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.StayEntry", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateIn")
|
||||||
|
.HasColumnType("timestamp(0) with time zone");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateOut")
|
||||||
|
.HasColumnType("timestamp(0) with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("PaymentMethod")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(5)
|
||||||
|
.HasColumnType("character varying(5)");
|
||||||
|
|
||||||
|
b.Property<int>("RoomCount")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("RoomNumber")
|
||||||
|
.HasMaxLength(32)
|
||||||
|
.HasColumnType("character varying(32)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UpdateTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("StayEntry", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Somnia.GuestLog.Models.Entities.StayExportFile", b =>
|
||||||
|
{
|
||||||
|
b.Property<long>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("bigint");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||||
|
|
||||||
|
b.Property<string>("ExportDetails")
|
||||||
|
.HasColumnType("jsonb");
|
||||||
|
|
||||||
|
b.Property<int>("ExportFormat")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<int>("ExportResult")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<DateTime>("ExportTime")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("ExportedPath")
|
||||||
|
.HasMaxLength(256)
|
||||||
|
.HasColumnType("character varying(256)");
|
||||||
|
|
||||||
|
b.ComplexProperty(typeof(Dictionary<string, object>), "ExportParams", "Somnia.GuestLog.Models.Entities.StayExportFile.ExportParams#StayExportParams", b1 =>
|
||||||
|
{
|
||||||
|
b1.IsRequired();
|
||||||
|
|
||||||
|
b1.Property<DateTime?>("ExportPeriodEnd");
|
||||||
|
|
||||||
|
b1.Property<DateTime?>("ExportPeriodStart");
|
||||||
|
|
||||||
|
b1.Property<int>("ExportType");
|
||||||
|
|
||||||
|
b1
|
||||||
|
.ToJson("ExportParams")
|
||||||
|
.HasColumnType("jsonb");
|
||||||
|
});
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("StayExportFile", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("GuestDocumentStayEntry", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Somnia.GuestLog.Models.Entities.StayEntry", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("StayEntryId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("Somnia.GuestLog.Models.Entities.GuestDocument", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("GuestDocumentsId", "GuestDocumentsVersion")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
});
|
||||||
#pragma warning restore 612, 618
|
#pragma warning restore 612, 618
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using Somnia.GuestLog.Enums.Services;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Models.Configuration;
|
||||||
|
|
||||||
|
public class AddressQueryConfig
|
||||||
|
{
|
||||||
|
public const string SectionName = "AddressQuery";
|
||||||
|
|
||||||
|
public bool EnableAddressQuery { get; set; }
|
||||||
|
public AddressQueryProvider? Provider { get; set; }
|
||||||
|
public string? ServiceURL { get; set; }
|
||||||
|
public string? ApiKey { get; set; }
|
||||||
|
public string? UserAgent { get; set; }
|
||||||
|
public string? ResultLang { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
namespace Somnia.GuestLog.Models.Configuration;
|
||||||
|
|
||||||
|
public class StayExportConfig
|
||||||
|
{
|
||||||
|
public const string SectionName = "StayExport";
|
||||||
|
|
||||||
|
public bool EnableStayExport { get; set; } = false;
|
||||||
|
public string? ExportStorageConnectionString { get; set; }
|
||||||
|
public bool UseSubdirectoryByFormat { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
namespace Somnia.GuestLog.Models.Configuration;
|
||||||
|
|
||||||
|
public class StayExportSpainParteViajerosConfig
|
||||||
|
{
|
||||||
|
public const string SectionName = "StayExportSpainParteViajeros";
|
||||||
|
|
||||||
|
public bool InternetAvailable { get; set; } = false;
|
||||||
|
public string? CodigoEstablecimiento { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
namespace Somnia.GuestLog.Models.DTOs;
|
||||||
|
|
||||||
|
public class AddressResultDTO
|
||||||
|
{
|
||||||
|
public string? HouseNumber { get; set; }
|
||||||
|
public string? AddressRoad { get; set; }
|
||||||
|
public string? AddressCity { get; set; }
|
||||||
|
public string? AddressProvince { get; set; }
|
||||||
|
public string? AddressState { get; set; }
|
||||||
|
public string? AddressCountry { get; set; }
|
||||||
|
public string? ZipCode { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// CountryCode in ISO3166-1:alpha3
|
||||||
|
/// </summary>
|
||||||
|
public string? AddressCountryCode { get; set; }
|
||||||
|
}
|
||||||
@@ -4,10 +4,19 @@ public class GuestDocFilterDTO
|
|||||||
{
|
{
|
||||||
public string? DocumentType { get; set; }
|
public string? DocumentType { get; set; }
|
||||||
public string? DocumentNumber { get; set; }
|
public string? DocumentNumber { get; set; }
|
||||||
|
|
||||||
public string? Name { get; set; }
|
public string? Name { get; set; }
|
||||||
public string? Surname { get; set; }
|
public string? Surname { get; set; }
|
||||||
|
|
||||||
public string? PhoneNumber { get; set; }
|
public string? PhoneNumber { get; set; }
|
||||||
|
|
||||||
|
public bool OnlyLastVersion { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public bool IsEmpty => string.IsNullOrEmpty(DocumentType)
|
||||||
|
&& string.IsNullOrEmpty(DocumentNumber)
|
||||||
|
&& string.IsNullOrEmpty(Name)
|
||||||
|
&& string.IsNullOrEmpty(Surname)
|
||||||
|
&& string.IsNullOrEmpty(PhoneNumber);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,4 +25,18 @@ public class GuestDocIdDTO
|
|||||||
DocumentNum = parts[1]
|
DocumentNum = parts[1]
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static GuestDocIdDTO? BuildFromDto(GuestDocumentDTO? dto)
|
||||||
|
{
|
||||||
|
if (dto is null || dto.DocumentType is null || dto.DocumentNum is null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new()
|
||||||
|
{
|
||||||
|
DocumentType = dto.DocumentType,
|
||||||
|
DocumentNum = dto.DocumentNum
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,9 @@ namespace Somnia.GuestLog.Models.DTOs;
|
|||||||
|
|
||||||
public class GuestDocumentDTO
|
public class GuestDocumentDTO
|
||||||
{
|
{
|
||||||
|
public long? Id { get; set; }
|
||||||
|
public int? Version { get; set; }
|
||||||
|
|
||||||
public string? DocumentType { get; set; }
|
public string? DocumentType { get; set; }
|
||||||
public string? DocumentNum { get; set; }
|
public string? DocumentNum { get; set; }
|
||||||
|
|
||||||
@@ -31,4 +34,8 @@ public class GuestDocumentDTO
|
|||||||
|
|
||||||
public DateTime? CreateTime { get; set; }
|
public DateTime? CreateTime { get; set; }
|
||||||
public DateTime? UpdateTime { get; set; }
|
public DateTime? UpdateTime { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public string FullKey => $"{Id}-{Version}";
|
||||||
|
public string FullDocument => $"{DocumentType ?? "???"}-{DocumentNum ?? "???"}";
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
using Somnia.GuestLog.Enums.Services;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Models.DTOs;
|
||||||
|
|
||||||
|
public interface IResult
|
||||||
|
{
|
||||||
|
bool IsSuccess { get; }
|
||||||
|
ResultCode ResultCode { get; }
|
||||||
|
object[]? Context { get; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed record Result(
|
||||||
|
bool IsSuccess,
|
||||||
|
ResultCode ResultCode,
|
||||||
|
params object[]? Context
|
||||||
|
) : IResult
|
||||||
|
{
|
||||||
|
public static Result Ok() => new(IsSuccess: true, ResultCode: ResultCode.Ok, Context: null);
|
||||||
|
|
||||||
|
public static Result Fail(ResultCode resultCode) => new(IsSuccess: false, resultCode, Context: null);
|
||||||
|
public static Result FailWithContext(ResultCode resultCode, params object[] context)
|
||||||
|
=> new(IsSuccess: false, resultCode, context);
|
||||||
|
public static Result FailUnknownError()
|
||||||
|
=> new(IsSuccess: false, ResultCode: ResultCode.UnknownError, Context: null);
|
||||||
|
|
||||||
|
public bool IsUnknownError => !IsSuccess && ResultCode == ResultCode.UnknownError;
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed record Result<T>(
|
||||||
|
bool IsSuccess,
|
||||||
|
T? Value,
|
||||||
|
ResultCode ResultCode,
|
||||||
|
params object[]? Context
|
||||||
|
) : IResult
|
||||||
|
{
|
||||||
|
public static Result<T> Ok(T value) => new(IsSuccess: true, value, ResultCode: ResultCode.Ok, Context: null);
|
||||||
|
public static Result<T> Fail(ResultCode resultCode) => new(IsSuccess: false, Value: default, resultCode, Context: null);
|
||||||
|
public static Result<T> FailWithContext(ResultCode resultCode, params object[] context)
|
||||||
|
=> new(IsSuccess: false, Value: default, resultCode, context);
|
||||||
|
|
||||||
|
public bool IsUnknownError => !IsSuccess && ResultCode == ResultCode.UnknownError;
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
namespace Somnia.GuestLog.Models.DTOs;
|
||||||
|
|
||||||
|
public class StayEntryDTO
|
||||||
|
{
|
||||||
|
public long? Id { get; set; }
|
||||||
|
|
||||||
|
public DateTime? DateIn { get; set; }
|
||||||
|
public DateTime? DateOut { get; set; }
|
||||||
|
|
||||||
|
public int? RoomCount { get; set; }
|
||||||
|
public string? RoomNumber { get; set; }
|
||||||
|
public string? PaymentMethod { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public List<GuestDocumentDTO>? GuestDocuments { get; set; } = null;
|
||||||
|
|
||||||
|
|
||||||
|
public DateTime? CreateTime { get; set; }
|
||||||
|
public DateTime? UpdateTime { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
namespace Somnia.GuestLog.Models.DTOs;
|
||||||
|
|
||||||
|
public class StayEntryFilterDTO
|
||||||
|
{
|
||||||
|
public DateTime? DateInStart { get; set; }
|
||||||
|
public DateTime? DateInEnd { get; set; }
|
||||||
|
|
||||||
|
public string? RoomNumber { get; set; }
|
||||||
|
public string? PaymentMethod { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
using Somnia.GuestLog.Enums.Models;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Models.DTOs;
|
||||||
|
|
||||||
|
public class StayExportFileDTO
|
||||||
|
{
|
||||||
|
public long? Id { get; set; }
|
||||||
|
|
||||||
|
public StayExportFormat? ExportFormat { get; set; }
|
||||||
|
|
||||||
|
public StayExportParamsDTO? ExportParams { get; set; }
|
||||||
|
|
||||||
|
public StayExportFileResult? ExportResult { get; set; }
|
||||||
|
|
||||||
|
public string? ExportedPath { get; set; }
|
||||||
|
|
||||||
|
public string? ExportDetails { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public DateTime? ExportTime { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class StayExportParamsDTO
|
||||||
|
{
|
||||||
|
public StayExportParamType? ExportType { get; set; }
|
||||||
|
|
||||||
|
public DateTime? ExportPeriodStart { get; set; }
|
||||||
|
public DateTime? ExportPeriodEnd { get; set; }
|
||||||
|
}
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using Somnia.GuestLog.Infrastructure;
|
||||||
|
|
||||||
namespace Somnia.GuestLog.Models.Entities;
|
namespace Somnia.GuestLog.Models.Entities;
|
||||||
|
|
||||||
public class GuestAddress : BaseEntity
|
public class GuestAddress : BaseEntity
|
||||||
@@ -9,5 +11,5 @@ public class GuestAddress : BaseEntity
|
|||||||
public required string AddressCountry { get; set; }
|
public required string AddressCountry { get; set; }
|
||||||
public string? ZipCode { get; set; }
|
public string? ZipCode { get; set; }
|
||||||
|
|
||||||
public override string GetFullKey() => "N/A";
|
public override string GetFullKey() => DbConsts.PK_NotApply;
|
||||||
}
|
}
|
||||||
@@ -2,6 +2,9 @@ namespace Somnia.GuestLog.Models.Entities;
|
|||||||
|
|
||||||
public class GuestDocument : BaseEntity
|
public class GuestDocument : BaseEntity
|
||||||
{
|
{
|
||||||
|
public long Id { get; set; }
|
||||||
|
public int Version { get; set; }
|
||||||
|
|
||||||
public required string DocumentType { get; set; }
|
public required string DocumentType { get; set; }
|
||||||
public required string DocumentNum { get; set; }
|
public required string DocumentNum { get; set; }
|
||||||
|
|
||||||
@@ -26,6 +29,8 @@ public class GuestDocument : BaseEntity
|
|||||||
public required DateTime CreateTime { get; set; }
|
public required DateTime CreateTime { get; set; }
|
||||||
public required DateTime UpdateTime { get; set; }
|
public required DateTime UpdateTime { get; set; }
|
||||||
|
|
||||||
|
public required bool IsLastVersion { get; set; }
|
||||||
|
|
||||||
public override string GetFullKey() => $"{DocumentType}-{DocumentNum}";
|
|
||||||
|
public override string GetFullKey() => $"{Id}-{Version}";
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
namespace Somnia.GuestLog.Models.Entities;
|
||||||
|
|
||||||
|
public class StayEntry : BaseEntity
|
||||||
|
{
|
||||||
|
public long Id { get; set; }
|
||||||
|
|
||||||
|
public required DateTime DateIn { get; set; }
|
||||||
|
public required DateTime DateOut { get; set; }
|
||||||
|
|
||||||
|
public required int RoomCount { get; set; }
|
||||||
|
public string? RoomNumber { get; set; }
|
||||||
|
|
||||||
|
public required string PaymentMethod { get; set; }
|
||||||
|
|
||||||
|
public virtual ICollection<GuestDocument> GuestDocuments { get; } = [];
|
||||||
|
|
||||||
|
|
||||||
|
//Generated Properties.
|
||||||
|
public required DateTime CreateTime { get; set; }
|
||||||
|
public required DateTime UpdateTime { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public override string GetFullKey() => $"{Id}";
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
using Somnia.GuestLog.Enums.Models;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Models.Entities;
|
||||||
|
|
||||||
|
public class StayExportFile : BaseEntity
|
||||||
|
{
|
||||||
|
public long Id { get; set; }
|
||||||
|
|
||||||
|
public required StayExportFormat ExportFormat { get; set; }
|
||||||
|
public required StayExportParams ExportParams { get; set; }
|
||||||
|
|
||||||
|
public required StayExportFileResult ExportResult { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Path to exported data.
|
||||||
|
/// Should be relative to configured Storage.
|
||||||
|
/// </summary>
|
||||||
|
public string? ExportedPath { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// A JSON column to store details about the exported file.
|
||||||
|
/// This details can contain information about errors, which stays where included, etc.
|
||||||
|
/// </summary>
|
||||||
|
public string? ExportDetails { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Date/Time when export file was generated.
|
||||||
|
/// </summary>
|
||||||
|
public required DateTime ExportTime { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public override string GetFullKey() => $"{Id}";
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
using Somnia.GuestLog.Enums.Models;
|
||||||
|
using Somnia.GuestLog.Infrastructure;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Models.Entities;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// This class store params used on StayExport.
|
||||||
|
/// Different params apply for different export types.
|
||||||
|
/// </summary>
|
||||||
|
public class StayExportParams : BaseEntity
|
||||||
|
{
|
||||||
|
public required StayExportParamType ExportType { get; set; }
|
||||||
|
|
||||||
|
public DateTime? ExportPeriodStart { get; set; }
|
||||||
|
public DateTime? ExportPeriodEnd { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public override string GetFullKey() => DbConsts.PK_NotApply;
|
||||||
|
}
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
using Somnia.GuestLog.Models.Entities;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Models;
|
||||||
|
|
||||||
|
internal static class EntityMapping
|
||||||
|
{
|
||||||
|
|
||||||
|
public static GuestDocumentDTO MapGuestDocumentEntityToDTO(GuestDocument entity)
|
||||||
|
{
|
||||||
|
return new()
|
||||||
|
{
|
||||||
|
Id = entity.Id,
|
||||||
|
Version = entity.Version,
|
||||||
|
DocumentType = entity.DocumentType,
|
||||||
|
DocumentNum = entity.DocumentNum,
|
||||||
|
IssueDate = entity.IssueDate.ToDateTime(TimeOnly.MinValue),
|
||||||
|
SupportNum = entity.SupportNum,
|
||||||
|
Nationality = entity.Nationality,
|
||||||
|
Name = entity.Name,
|
||||||
|
Surname = entity.Surname,
|
||||||
|
Surname2 = entity.Surname2,
|
||||||
|
BirthDate = entity.BirthDate.ToDateTime(TimeOnly.MinValue),
|
||||||
|
Gender = entity.Gender,
|
||||||
|
PhoneNumber = entity.PhoneNumber,
|
||||||
|
EmailAddress = entity.EmailAddress,
|
||||||
|
Address = entity.AddressDetails?.Address ?? "",
|
||||||
|
AddressCity = entity.AddressDetails?.AddressCity ?? "",
|
||||||
|
AddressProvince = entity.AddressDetails?.AddressProvince ?? "",
|
||||||
|
AddressState = entity.AddressDetails?.AddressState ?? "",
|
||||||
|
AddressCountry = entity.AddressDetails?.AddressCountry! ?? "",
|
||||||
|
ZipCode = entity.AddressDetails?.ZipCode ?? "",
|
||||||
|
CreateTime = entity.CreateTime,
|
||||||
|
UpdateTime = entity.UpdateTime,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public static StayEntryDTO MapStayEntryEntityToDTO(StayEntry entity, bool includeGuests)
|
||||||
|
{
|
||||||
|
return new()
|
||||||
|
{
|
||||||
|
Id = entity.Id,
|
||||||
|
DateIn = entity.DateIn.ToLocalTime(),
|
||||||
|
DateOut = entity.DateOut.ToLocalTime(),
|
||||||
|
RoomCount = entity.RoomCount,
|
||||||
|
RoomNumber = entity.RoomNumber,
|
||||||
|
PaymentMethod = entity.PaymentMethod,
|
||||||
|
CreateTime = entity.CreateTime,
|
||||||
|
UpdateTime = entity.UpdateTime,
|
||||||
|
GuestDocuments = includeGuests ? [.. entity.GuestDocuments.Select(e => MapGuestDocumentEntityToDTO(e))] : null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public static StayExportFileDTO MapStayExportFileEntityToDTO(StayExportFile entity)
|
||||||
|
{
|
||||||
|
StayExportParamsDTO exportParamsDto = new()
|
||||||
|
{
|
||||||
|
ExportType = entity.ExportParams.ExportType,
|
||||||
|
ExportPeriodStart = entity.ExportParams.ExportPeriodStart,
|
||||||
|
ExportPeriodEnd = entity.ExportParams.ExportPeriodEnd,
|
||||||
|
};
|
||||||
|
|
||||||
|
return new()
|
||||||
|
{
|
||||||
|
Id = entity.Id,
|
||||||
|
ExportFormat = entity.ExportFormat,
|
||||||
|
ExportParams = exportParamsDto,
|
||||||
|
ExportResult = entity.ExportResult,
|
||||||
|
ExportedPath = entity.ExportedPath,
|
||||||
|
ExportDetails = entity.ExportDetails,
|
||||||
|
ExportTime = entity.ExportTime,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Somnia.GuestLog.Models.Entities;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Models.QueryConfigs;
|
||||||
|
|
||||||
|
public record StayEntryQueryConfig(bool IncludeGuests = false, bool UseSplitQueries = true, bool DisableTracking = false)
|
||||||
|
{
|
||||||
|
public readonly static StayEntryQueryConfig DefaultQueryConfig = new();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static class StayEntryQueryExtensions
|
||||||
|
{
|
||||||
|
public static IQueryable<StayEntry> AddQueryConfig(this IQueryable<StayEntry> query, StayEntryQueryConfig? config)
|
||||||
|
{
|
||||||
|
config ??= StayEntryQueryConfig.DefaultQueryConfig;
|
||||||
|
|
||||||
|
if (config.IncludeGuests)
|
||||||
|
{
|
||||||
|
query = query.Include(e => e.GuestDocuments);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config.UseSplitQueries)
|
||||||
|
{
|
||||||
|
query = query.AsSplitQuery();
|
||||||
|
}
|
||||||
|
if (config.DisableTracking)
|
||||||
|
{
|
||||||
|
query = query.AsNoTracking();
|
||||||
|
}
|
||||||
|
|
||||||
|
return query;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,11 +1,19 @@
|
|||||||
|
using FluentStorage;
|
||||||
using FluentValidation;
|
using FluentValidation;
|
||||||
using Microsoft.AspNetCore.Localization;
|
using Microsoft.AspNetCore.Localization;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Diagnostics;
|
||||||
using MudBlazor.Services;
|
using MudBlazor.Services;
|
||||||
using Somnia.GuestLog.Components;
|
using Somnia.GuestLog.Components;
|
||||||
using Somnia.GuestLog.Infrastructure;
|
using Somnia.GuestLog.Infrastructure;
|
||||||
|
using Somnia.GuestLog.Models.Configuration;
|
||||||
using Somnia.GuestLog.Models.DTOs;
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
using Somnia.GuestLog.Services;
|
using Somnia.GuestLog.Services;
|
||||||
|
using Somnia.GuestLog.Services.AddressQuery;
|
||||||
|
using Somnia.GuestLog.Services.Entity;
|
||||||
|
using Somnia.GuestLog.Services.SpainCodigoMunicipio;
|
||||||
|
using Somnia.GuestLog.Services.StayExport;
|
||||||
|
using Somnia.GuestLog.Utils;
|
||||||
using Somnia.GuestLog.Validators;
|
using Somnia.GuestLog.Validators;
|
||||||
|
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
@@ -14,27 +22,66 @@ var connectionStringGuestLog = builder.Configuration.GetConnectionString("DbSomn
|
|||||||
?? throw new InvalidOperationException("Connection string 'DbSomniaGuestLog' not found.");
|
?? throw new InvalidOperationException("Connection string 'DbSomniaGuestLog' not found.");
|
||||||
builder.Services.AddDbContextFactory<GuestLogContext>(options =>
|
builder.Services.AddDbContextFactory<GuestLogContext>(options =>
|
||||||
{
|
{
|
||||||
options.UseNpgsql(connectionStringGuestLog);
|
options.UseNpgsql(connectionStringGuestLog)
|
||||||
|
.UseLazyLoadingProxies()
|
||||||
|
.ConfigureWarnings(w => w.Log((CoreEventId.NavigationLazyLoading, LogLevel.Warning)));
|
||||||
|
|
||||||
|
// The following options help with debugging, but should
|
||||||
|
// be changed or removed for production.
|
||||||
|
if (builder.Environment.IsDevelopment())
|
||||||
|
{
|
||||||
|
options.EnableSensitiveDataLogging()
|
||||||
|
.EnableDetailedErrors();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
builder.Services.AddDatabaseDeveloperPageExceptionFilter();
|
builder.Services.AddDatabaseDeveloperPageExceptionFilter();
|
||||||
|
|
||||||
// Add MudBlazor services
|
// Add MudBlazor services
|
||||||
builder.Services.AddMudServices();
|
builder.Services.AddMudServices(c =>
|
||||||
|
{
|
||||||
|
c.SnackbarConfiguration.PositionClass = MudBlazor.Defaults.Classes.Position.TopCenter;
|
||||||
|
c.SnackbarConfiguration.ShowTransitionDuration = 300;
|
||||||
|
c.SnackbarConfiguration.HideTransitionDuration = 500;
|
||||||
|
c.SnackbarConfiguration.VisibleStateDuration = 10000;
|
||||||
|
});
|
||||||
|
|
||||||
// Add services to the container.
|
// Add components services to the container.
|
||||||
builder.Services.AddRazorComponents()
|
builder.Services.AddRazorComponents()
|
||||||
.AddInteractiveServerComponents();
|
.AddInteractiveServerComponents();
|
||||||
|
|
||||||
|
builder.Services.AddLocalization();
|
||||||
|
builder.Services.AddHttpClient();
|
||||||
|
|
||||||
// Add Validation Services
|
// Add Validation Services
|
||||||
builder.Services.AddSingleton<IValidator<GuestDocumentDTO>, GuestDocumentDTOValidator>();
|
builder.Services.AddSingleton<IValidator<GuestDocumentDTO>, GuestDocumentDTOValidator>();
|
||||||
builder.Services.AddSingleton<IValidator<GuestDocIdDTO>, GuestDocIdDTOValidator>();
|
builder.Services.AddSingleton<IValidator<GuestDocIdDTO>, GuestDocIdDTOValidator>();
|
||||||
|
builder.Services.AddSingleton<IValidator<StayEntryDTO>, StayEntryDTOValidator>();
|
||||||
|
builder.Services.AddSingleton<IValidator<StayExportParamsDTO>, StayExportParamsDTOValidator>();
|
||||||
|
|
||||||
|
// Add Entity Services
|
||||||
|
builder.Services.AddSingleton<IGuestDocumentEntityService, GuestDocumentEntityService>();
|
||||||
|
builder.Services.AddSingleton<IStayEntryEntityService, StayEntryEntityService>();
|
||||||
|
builder.Services.AddSingleton<IStayExportFileEntityService, StayExportFileEntityService>();
|
||||||
|
|
||||||
// Add Services
|
// Add Services
|
||||||
builder.Services.AddSingleton<IGuestDocumentService, GuestDocumentService>();
|
|
||||||
builder.Services.AddSingleton<IDataListService, StaticDataListService>();
|
builder.Services.AddSingleton<IDataListService, StaticDataListService>();
|
||||||
|
builder.Services.AddScoped<IUserMessageService, UserMessageService>();
|
||||||
|
builder.Services.AddSingleton<ILocalizerService, LocalizerService>();
|
||||||
|
builder.Services.AddSingleton<IStayExportService, StayExportService>();
|
||||||
|
builder.Services.AddSingleton<ISpainCodigoMunicipioService, SpainCodigoMunicipioCatastroService>();
|
||||||
|
|
||||||
builder.Services.AddLocalization();
|
// Add Factories (and it's services)
|
||||||
|
builder.Services.AddFactoryDI<IAddressQueryFactory, ConfigFileAddressQueryFactory>();
|
||||||
|
builder.Services.AddFactoryDI<IStayExportFormatProviderFactory, StayExportFormatProviderFactory>();
|
||||||
|
|
||||||
|
// Add Options config
|
||||||
|
builder.Services.AddOptions<AddressQueryConfig>()
|
||||||
|
.Bind(builder.Configuration.GetSection(AddressQueryConfig.SectionName));
|
||||||
|
builder.Services.AddOptions<StayExportConfig>()
|
||||||
|
.Bind(builder.Configuration.GetSection(StayExportConfig.SectionName));
|
||||||
|
builder.Services.AddOptions<StayExportSpainParteViajerosConfig>()
|
||||||
|
.Bind(builder.Configuration.GetSection(StayExportSpainParteViajerosConfig.SectionName));
|
||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
|
|
||||||
@@ -69,4 +116,7 @@ app.MapStaticAssets();
|
|||||||
app.MapRazorComponents<App>()
|
app.MapRazorComponents<App>()
|
||||||
.AddInteractiveServerRenderMode();
|
.AddInteractiveServerRenderMode();
|
||||||
|
|
||||||
|
//Activate S3 storage.
|
||||||
|
AwsS3Storage.Use();
|
||||||
|
|
||||||
app.Run();
|
app.Run();
|
||||||
|
|||||||
@@ -388,4 +388,10 @@
|
|||||||
<data name="dataList.GenderOption.F" xml:space="preserve"><value>Female</value></data>
|
<data name="dataList.GenderOption.F" xml:space="preserve"><value>Female</value></data>
|
||||||
<data name="dataList.GenderOption.O" xml:space="preserve"><value>Other</value></data>
|
<data name="dataList.GenderOption.O" xml:space="preserve"><value>Other</value></data>
|
||||||
|
|
||||||
|
<data name="dataList.PaymentMethod.EFECT" xml:space="preserve"><value>Cash</value></data>
|
||||||
|
<data name="dataList.PaymentMethod.TARJT" xml:space="preserve"><value>Card</value></data>
|
||||||
|
<data name="dataList.PaymentMethod.TRANS" xml:space="preserve"><value>Wire Transfer</value></data>
|
||||||
|
<data name="dataList.PaymentMethod.MOVIL" xml:space="preserve"><value>Phone</value></data>
|
||||||
|
<data name="dataList.PaymentMethod.OTRO" xml:space="preserve"><value>Other</value></data>
|
||||||
|
|
||||||
</root>
|
</root>
|
||||||
@@ -122,6 +122,8 @@
|
|||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0,
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
|
<data name="dto.GuestDocument.Id" xml:space="preserve"><value>ID</value></data>
|
||||||
|
<data name="dto.GuestDocument.Version" xml:space="preserve"><value>Version</value></data>
|
||||||
<data name="dto.GuestDocument.DocumentType" xml:space="preserve"><value>Document Type</value></data>
|
<data name="dto.GuestDocument.DocumentType" xml:space="preserve"><value>Document Type</value></data>
|
||||||
<data name="dto.GuestDocument.DocumentNum" xml:space="preserve"><value>Document Number</value></data>
|
<data name="dto.GuestDocument.DocumentNum" xml:space="preserve"><value>Document Number</value></data>
|
||||||
<data name="dto.GuestDocument.IssueDate" xml:space="preserve"><value>Issue Date</value></data>
|
<data name="dto.GuestDocument.IssueDate" xml:space="preserve"><value>Issue Date</value></data>
|
||||||
@@ -134,15 +136,34 @@
|
|||||||
<data name="dto.GuestDocument.Gender" xml:space="preserve"><value>Gender</value></data>
|
<data name="dto.GuestDocument.Gender" xml:space="preserve"><value>Gender</value></data>
|
||||||
<data name="dto.GuestDocument.PhoneNumber" xml:space="preserve"><value>Phone Number</value></data>
|
<data name="dto.GuestDocument.PhoneNumber" xml:space="preserve"><value>Phone Number</value></data>
|
||||||
<data name="dto.GuestDocument.EmailAddress" xml:space="preserve"><value>Email Address</value></data>
|
<data name="dto.GuestDocument.EmailAddress" xml:space="preserve"><value>Email Address</value></data>
|
||||||
<data name="dto.GuestDocument.Address" xml:space="preserve"><value>Address</value></data>
|
|
||||||
<data name="dto.GuestDocument.AddressCity" xml:space="preserve"><value>City</value></data>
|
|
||||||
<data name="dto.GuestDocument.AddressProvince" xml:space="preserve"><value>County</value></data>
|
|
||||||
<data name="dto.GuestDocument.AddressState" xml:space="preserve"><value>State</value></data>
|
|
||||||
<data name="dto.GuestDocument.AddressCountry" xml:space="preserve"><value>Country</value></data>
|
|
||||||
<data name="dto.GuestDocument.ZipCode" xml:space="preserve"><value>Zip Code</value></data>
|
|
||||||
<data name="dto.GuestDocument.CreateTime" xml:space="preserve"><value>Creation Time</value></data>
|
<data name="dto.GuestDocument.CreateTime" xml:space="preserve"><value>Creation Time</value></data>
|
||||||
<data name="dto.GuestDocument.UpdateTime" xml:space="preserve"><value>Update Time</value></data>
|
<data name="dto.GuestDocument.UpdateTime" xml:space="preserve"><value>Update Time</value></data>
|
||||||
|
|
||||||
|
<data name="dto.StayEntry.Id" xml:space="preserve"><value>Id</value></data>
|
||||||
|
<data name="dto.StayEntry.DateIn" xml:space="preserve"><value>Date In</value></data>
|
||||||
|
<data name="dto.StayEntry.DateOut" xml:space="preserve"><value>Date Out</value></data>
|
||||||
|
<data name="dto.StayEntry.RoomCount" xml:space="preserve"><value>Room Count</value></data>
|
||||||
|
<data name="dto.StayEntry.RoomNumber" xml:space="preserve"><value>Room Number</value></data>
|
||||||
|
<data name="dto.StayEntry.PaymentMethod" xml:space="preserve"><value>Payment Method</value></data>
|
||||||
|
<data name="dto.StayEntry.GuestDocuments" xml:space="preserve"><value>Guests</value></data>
|
||||||
|
<data name="dto.StayEntry.CreateTime" xml:space="preserve"><value>Creation Time</value></data>
|
||||||
|
<data name="dto.StayEntry.UpdateTime" xml:space="preserve"><value>Update Time</value></data>
|
||||||
|
|
||||||
|
<data name="dto.StayExportFile.Id" xml:space="preserve"><value>Id</value></data>
|
||||||
|
<data name="dto.StayExportFile.ExportFormat" xml:space="preserve"><value>Export Format</value></data>
|
||||||
|
<data name="dto.StayExportFile.ExportParams" xml:space="preserve"><value>Export Params</value></data>
|
||||||
|
<data name="dto.StayExportFile.ExportResult" xml:space="preserve"><value>Export Result</value></data>
|
||||||
|
<data name="dto.StayExportFile.ExportedPath" xml:space="preserve"><value>Export Path</value></data>
|
||||||
|
<data name="dto.StayExportFile.ExportDetails" xml:space="preserve"><value>Export Details</value></data>
|
||||||
|
<data name="dto.StayExportFile.ExportTime" xml:space="preserve"><value>Export Time</value></data>
|
||||||
|
|
||||||
|
<data name="dto.StayExportParams.ExportType" xml:space="preserve"><value>Export Type</value></data>
|
||||||
|
<data name="dto.StayExportParams.ExportPeriodStart" xml:space="preserve"><value>Date From</value></data>
|
||||||
|
<data name="dto.StayExportParams.ExportPeriodEnd" xml:space="preserve"><value>Date To</value></data>
|
||||||
|
|
||||||
|
<data name="tmp" xml:space="preserve"><value>TMP</value></data>
|
||||||
|
|
||||||
|
<data name="general.actions" xml:space="preserve"><value>Actions</value></data>
|
||||||
<data name="general.reloadData" xml:space="preserve"><value>Reload Data</value></data>
|
<data name="general.reloadData" xml:space="preserve"><value>Reload Data</value></data>
|
||||||
<data name="general.inProgressMsg" xml:space="preserve"><value>In Progress...</value></data>
|
<data name="general.inProgressMsg" xml:space="preserve"><value>In Progress...</value></data>
|
||||||
<data name="general.ConfigureColumns" xml:space="preserve"><value>Configure Columns</value></data>
|
<data name="general.ConfigureColumns" xml:space="preserve"><value>Configure Columns</value></data>
|
||||||
@@ -156,19 +177,83 @@
|
|||||||
<data name="general.btnSearch" xml:space="preserve"><value>Search</value></data>
|
<data name="general.btnSearch" xml:space="preserve"><value>Search</value></data>
|
||||||
<data name="general.btnSave" xml:space="preserve"><value>Save</value></data>
|
<data name="general.btnSave" xml:space="preserve"><value>Save</value></data>
|
||||||
<data name="general.btnCancel" xml:space="preserve"><value>Cancel</value></data>
|
<data name="general.btnCancel" xml:space="preserve"><value>Cancel</value></data>
|
||||||
|
<data name="general.noResults" xml:space="preserve"><value>No Results!</value></data>
|
||||||
|
<data name="general.showAllElements" xml:space="preserve"><value>Show all elements</value></data>
|
||||||
<data name="general.wildcardHelperText" xml:space="preserve"><value>Use '%' as wildcard</value></data>
|
<data name="general.wildcardHelperText" xml:space="preserve"><value>Use '%' as wildcard</value></data>
|
||||||
|
<data name="general.dateStart" xml:space="preserve"><value>Date Start</value></data>
|
||||||
|
<data name="general.dateEnd" xml:space="preserve"><value>Date End</value></data>
|
||||||
|
|
||||||
|
<data name="general.address.address" xml:space="preserve"><value>Address</value></data>
|
||||||
|
<data name="general.address.city" xml:space="preserve"><value>City</value></data>
|
||||||
|
<data name="general.address.province" xml:space="preserve"><value>County</value></data>
|
||||||
|
<data name="general.address.state" xml:space="preserve"><value>State</value></data>
|
||||||
|
<data name="general.address.country" xml:space="preserve"><value>Country</value></data>
|
||||||
|
<data name="general.address.zipCode" xml:space="preserve"><value>Zip Code</value></data>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Common codes -->
|
||||||
|
<data name="enum.ResultCode.Ok" xml:space="preserve"><value>OK</value></data>
|
||||||
|
<data name="enum.ResultCode.UnknownError" xml:space="preserve"><value>Unknown Error</value></data>
|
||||||
|
<data name="enum.ResultCode.FailedValidation" xml:space="preserve"><value>Failed entity validation</value></data>
|
||||||
|
<data name="enum.ResultCode.NotFound" xml:space="preserve"><value>Not found</value></data>
|
||||||
|
<data name="enum.ResultCode.FileStorageError" xml:space="preserve"><value>File Storage Error</value></data>
|
||||||
|
<!-- Specific codes -->
|
||||||
|
<data name="enum.ResultCode.GuestInStay" xml:space="preserve"><value>Guest (ID: '{0}') is in a stay.</value></data>
|
||||||
|
<data name="enum.ResultCode.GuestCurrentlyInStay" xml:space="preserve"><value>Guest (ID: '{0}') is already in one stay during the period: {1}</value></data>
|
||||||
|
|
||||||
|
<data name="enum.StayExportFileResult.OK" xml:space="preserve"><value>OK</value></data>
|
||||||
|
<data name="enum.StayExportFileResult.NoData" xml:space="preserve"><value>No Data</value></data>
|
||||||
|
<data name="enum.StayExportFileResult.ExportError" xml:space="preserve"><value>Export Error</value></data>
|
||||||
|
<data name="enum.StayExportFileResult.UploadError" xml:space="preserve"><value>File Error</value></data>
|
||||||
|
|
||||||
|
<data name="enum.StayExportFormat.GuestLogJson" xml:space="preserve"><value>GuestLog JSON</value></data>
|
||||||
|
<data name="enum.StayExportFormat.SpainParteViajeros" xml:space="preserve"><value>Spain Parte Viajeros</value></data>
|
||||||
|
|
||||||
|
<data name="enum.StayExportParamType.PeriodDateIn" xml:space="preserve"><value>Stay 'Date In' Period</value></data>
|
||||||
|
|
||||||
|
|
||||||
|
<data name="navMenu.GuestDocumentList" xml:space="preserve"><value>Guests</value></data>
|
||||||
|
<data name="navMenu.StayEntryList" xml:space="preserve"><value>Stays</value></data>
|
||||||
|
<data name="navMenu.StayExport" xml:space="preserve"><value>Stay Export</value></data>
|
||||||
|
|
||||||
|
|
||||||
<data name="page.GuestDocList.pageTitle" xml:space="preserve"><value>Guest Documents</value></data>
|
<data name="page.GuestDocList.pageTitle" xml:space="preserve"><value>Guest Documents</value></data>
|
||||||
<data name="page.GuestDocList.documentList" xml:space="preserve"><value>Document List</value></data>
|
<data name="page.GuestDocList.documentList" xml:space="preserve"><value>Document List</value></data>
|
||||||
<data name="page.GuestDocList.btnNewGuest" xml:space="preserve"><value>New Guest</value></data>
|
<data name="page.GuestDocList.btnNewGuest" xml:space="preserve"><value>New Guest</value></data>
|
||||||
<data name="page.GuestDocList.showAllElements" xml:space="preserve"><value>Show all elements</value></data>
|
|
||||||
|
|
||||||
<data name="page.GuestDocNew.msgAlreadyExists" xml:space="preserve"><value>This Guest Document Already exists!!</value></data>
|
<data name="page.GuestDocNew.msgAlreadyExists" xml:space="preserve"><value>This Guest Document Already exists!!</value></data>
|
||||||
<data name="page.GuestDocNew.btnGoExistingDoc" xml:space="preserve"><value>Go to existing document</value></data>
|
<data name="page.GuestDocNew.btnGoExistingDoc" xml:space="preserve"><value>Go to existing document</value></data>
|
||||||
|
|
||||||
|
<data name="page.StayEntryList.pageTitle" xml:space="preserve"><value>Stay Entries</value></data>
|
||||||
|
<data name="page.StayEntryList.entryList" xml:space="preserve"><value>Entry List</value></data>
|
||||||
|
<data name="page.StayEntryList.btnNewStay" xml:space="preserve"><value>New Stay</value></data>
|
||||||
|
|
||||||
|
<data name="page.StayEntryNew.pageTitle" xml:space="preserve"><value>New Stay</value></data>
|
||||||
|
|
||||||
|
<data name="page.StayExportList.pageTitle" xml:space="preserve"><value>Stay Export Files</value></data>
|
||||||
|
<data name="page.StayExportList.exportList" xml:space="preserve"><value>Export List</value></data>
|
||||||
|
<data name="page.StayExportList.btnNewExport" xml:space="preserve"><value>New Export</value></data>
|
||||||
|
|
||||||
|
<data name="page.StayExportNew.pageTitle" xml:space="preserve"><value>New Stay Export</value></data>
|
||||||
|
|
||||||
|
|
||||||
<data name="control.GuestDocForm.sectionDocument" xml:space="preserve"><value>Document Details</value></data>
|
<data name="control.GuestDocForm.sectionDocument" xml:space="preserve"><value>Document Details</value></data>
|
||||||
<data name="control.GuestDocForm.sectionGuest" xml:space="preserve"><value>Guest Details</value></data>
|
<data name="control.GuestDocForm.sectionGuest" xml:space="preserve"><value>Guest Details</value></data>
|
||||||
<data name="control.GuestDocForm.sectionContact" xml:space="preserve"><value>Contact Details</value></data>
|
<data name="control.GuestDocForm.sectionContact" xml:space="preserve"><value>Contact Details</value></data>
|
||||||
<data name="control.GuestDocForm.sectionAddress" xml:space="preserve"><value>Guest Address</value></data>
|
<data name="control.GuestDocForm.sectionAddress" xml:space="preserve"><value>Guest Address</value></data>
|
||||||
|
<data name="control.GuestDocForm.btnSearchAddress" xml:space="preserve"><value>Search Address</value></data>
|
||||||
|
|
||||||
|
<data name="control.StayEntryForm.sectionDetails" xml:space="preserve"><value>Stay Details</value></data>
|
||||||
|
<data name="control.StayEntryForm.sectionGuests" xml:space="preserve"><value>Guest List</value></data>
|
||||||
|
<data name="control.StayEntryForm.btnAddGuest" xml:space="preserve"><value>Add Guest</value></data>
|
||||||
|
|
||||||
|
<data name="control.AddressQueryDialog.dialogTitle" xml:space="preserve"><value>Search Address</value></data>
|
||||||
|
<data name="control.AddressQueryDialog.searchText" xml:space="preserve"><value>Search Address</value></data>
|
||||||
|
<data name="control.AddressQueryDialog.btnSearch" xml:space="preserve"><value>Search Address</value></data>
|
||||||
|
<data name="control.AddressQueryDialog.btnSelectAddress" xml:space="preserve"><value>Use Address</value></data>
|
||||||
|
|
||||||
|
<data name="control.GuestDocumentSearchDialog.dialogTitle" xml:space="preserve"><value>Search Guest Document</value></data>
|
||||||
|
<data name="control.GuestDocumentSearchDialog.btnSelectDocument" xml:space="preserve"><value>Use Guest</value></data>
|
||||||
|
<data name="control.GuestDocumentSearchDialog.txtSuggestedGuests" xml:space="preserve"><value>Suggested Guests</value></data>
|
||||||
|
|
||||||
</root>
|
</root>
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
using Somnia.GuestLog.Enums.Services;
|
||||||
|
using Somnia.GuestLog.Models.Configuration;
|
||||||
|
using Somnia.GuestLog.Utils.DI;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.AddressQuery;
|
||||||
|
|
||||||
|
public class ConfigFileAddressQueryFactory(
|
||||||
|
IServiceProvider serviceProvider,
|
||||||
|
IOptions<AddressQueryConfig> config
|
||||||
|
) : IAddressQueryFactory, IFactoryDI
|
||||||
|
{
|
||||||
|
public static void RegisterFactoryItems(IServiceCollection services)
|
||||||
|
{
|
||||||
|
services.AddKeyedTransient<IAddressQueryService, NominatimAddressQueryService>(AddressQueryProvider.Nominatim);
|
||||||
|
services.AddKeyedTransient<IAddressQueryService, GoogleApiAddressQueryService>(AddressQueryProvider.GoogleApiV4);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IAddressQueryService GetService()
|
||||||
|
{
|
||||||
|
if (config.Value.EnableAddressQuery == false)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("AddressQuery is disabled. Enable and configure it first!");
|
||||||
|
}
|
||||||
|
|
||||||
|
return serviceProvider.GetKeyedService<IAddressQueryService>(config.Value.Provider)
|
||||||
|
?? throw new InvalidOperationException($"AddressQueryService not found for provider: '{config.Value.Provider}'");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,125 @@
|
|||||||
|
using Microsoft.AspNetCore.WebUtilities;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
using Somnia.GuestLog.Models.Configuration;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
using Somnia.GuestLog.Utils;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.AddressQuery;
|
||||||
|
|
||||||
|
public class GoogleApiAddressQueryService(
|
||||||
|
IHttpClientFactory httpClientFactory,
|
||||||
|
ILogger<GoogleApiAddressQueryService> logger,
|
||||||
|
IOptions<AddressQueryConfig> configOptions
|
||||||
|
) : IAddressQueryService
|
||||||
|
{
|
||||||
|
private const string defaultBaseAddr = "https://geocode.googleapis.com/v4/";
|
||||||
|
private const string defaultUserAgent = "Somnia-GuestLog";
|
||||||
|
private const string apiUri = "geocode/address/";
|
||||||
|
|
||||||
|
private readonly AddressQueryConfig config = configOptions.Value;
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<List<AddressResultDTO>> SearchAddressAsync(string query)
|
||||||
|
{
|
||||||
|
var http = GetHttpClient();
|
||||||
|
List<AddressResultDTO> rsList = [];
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string uri = GetRequestUri(query);
|
||||||
|
GeocodeAddressResponse? apiList = await http.GetFromJsonAsync<GeocodeAddressResponse>(uri)
|
||||||
|
?? throw new InvalidOperationException("Response without results??");
|
||||||
|
|
||||||
|
foreach (GeocodeResult result in apiList.Results)
|
||||||
|
{
|
||||||
|
if (result.PostalAddress is null)
|
||||||
|
{
|
||||||
|
logger.LogWarning("Skipping result without PostalAddress. '{result}'", result);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
string? alpha3CountryCode = CountryCodesUtils.Alpha2ToAlpha3(result.PostalAddress.RegionCode);
|
||||||
|
string? addressLine = result.PostalAddress.AddressLines is not null ? string.Join(", ", result.PostalAddress.AddressLines) : null;
|
||||||
|
|
||||||
|
string[]? formatedParts = result.FormattedAddress?.Split(",");
|
||||||
|
if (formatedParts is not null && formatedParts.Length < 2)
|
||||||
|
{
|
||||||
|
formatedParts = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
rsList.Add(new()
|
||||||
|
{
|
||||||
|
HouseNumber = null,
|
||||||
|
AddressRoad = addressLine,
|
||||||
|
AddressCity = result.PostalAddress.Locality,
|
||||||
|
AddressProvince = result.PostalAddress.AdministrativeArea,
|
||||||
|
AddressState = null,
|
||||||
|
AddressCountry = formatedParts?[^1],
|
||||||
|
ZipCode = result.PostalAddress.PostalCode,
|
||||||
|
AddressCountryCode = alpha3CountryCode
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return rsList;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Error getting info from API!");
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Internal Methods
|
||||||
|
|
||||||
|
private HttpClient GetHttpClient()
|
||||||
|
{
|
||||||
|
HttpClient client = httpClientFactory.CreateClient();
|
||||||
|
|
||||||
|
Uri baseAddr = new(config.ServiceURL ?? defaultBaseAddr);
|
||||||
|
|
||||||
|
client.BaseAddress = baseAddr;
|
||||||
|
client.DefaultRequestHeaders.UserAgent.ParseAdd(config.UserAgent ?? defaultUserAgent);
|
||||||
|
client.DefaultRequestHeaders.Add("X-Goog-Api-Key", config.ApiKey);
|
||||||
|
|
||||||
|
return client;
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetRequestUri(string query)
|
||||||
|
{
|
||||||
|
string escapedQuery = Uri.EscapeDataString(query).TrimStart('/');
|
||||||
|
string finalUri = $"{apiUri.TrimEnd('/')}/{escapedQuery}";
|
||||||
|
|
||||||
|
List<KeyValuePair<string, string?>> queryParams = [];
|
||||||
|
if (config.ResultLang is not null)
|
||||||
|
{
|
||||||
|
queryParams.Add(new KeyValuePair<string, string?>("languageCode", config.ResultLang));
|
||||||
|
}
|
||||||
|
|
||||||
|
return QueryHelpers.AddQueryString(finalUri, queryParams);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Internal Models
|
||||||
|
|
||||||
|
private record class PostalAddress(
|
||||||
|
string[]? AddressLines = null,
|
||||||
|
string? PostalCode = null,
|
||||||
|
|
||||||
|
string? AdministrativeArea = null, //Province
|
||||||
|
string? Locality = null, //City
|
||||||
|
string? RegionCode = null //Country Code (CLDR region code)
|
||||||
|
);
|
||||||
|
|
||||||
|
private record class GeocodeResult(
|
||||||
|
string? FormattedAddress = null,
|
||||||
|
PostalAddress? PostalAddress = null
|
||||||
|
);
|
||||||
|
|
||||||
|
private record class GeocodeAddressResponse(
|
||||||
|
GeocodeResult[] Results = null!
|
||||||
|
);
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
namespace Somnia.GuestLog.Services.AddressQuery;
|
||||||
|
|
||||||
|
public interface IAddressQueryFactory
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Returns the AddressQuery service implementation given current configuration.
|
||||||
|
/// </summary>
|
||||||
|
public IAddressQueryService GetService();
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.AddressQuery;
|
||||||
|
|
||||||
|
public interface IAddressQueryService
|
||||||
|
{
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Search an address by plain text query.
|
||||||
|
/// Data is returned as a structured address.
|
||||||
|
/// This service allow to complete and validate addresses.
|
||||||
|
///
|
||||||
|
/// Note: Not all fields are always available for a given query.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="query">Address to search</param>
|
||||||
|
/// <returns>List of resulting structured addresses</returns>
|
||||||
|
public Task<List<AddressResultDTO>> SearchAddressAsync(string query);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
using Microsoft.AspNetCore.WebUtilities;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
using Somnia.GuestLog.Models.Configuration;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
using Somnia.GuestLog.Utils;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.AddressQuery;
|
||||||
|
|
||||||
|
public class NominatimAddressQueryService(
|
||||||
|
IHttpClientFactory httpClientFactory,
|
||||||
|
ILogger<NominatimAddressQueryService> logger,
|
||||||
|
IOptions<AddressQueryConfig> configOptions
|
||||||
|
) : IAddressQueryService
|
||||||
|
{
|
||||||
|
private const string defaultBaseAddr = "https://nominatim.openstreetmap.org";
|
||||||
|
private const string defaultUserAgent = "Somnia-GuestLog";
|
||||||
|
private const string apiUri = "/search";
|
||||||
|
|
||||||
|
private readonly AddressQueryConfig config = configOptions.Value;
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<List<AddressResultDTO>> SearchAddressAsync(string query)
|
||||||
|
{
|
||||||
|
var http = GetHttpClient();
|
||||||
|
List<AddressResultDTO> rsList = [];
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string uri = GetRequestUri(query);
|
||||||
|
List<ApiResult> apiList = (await http.GetFromJsonAsync<List<ApiResult>>(uri)) ?? [];
|
||||||
|
|
||||||
|
foreach (ApiResult result in apiList)
|
||||||
|
{
|
||||||
|
if (result.Address is null)
|
||||||
|
{
|
||||||
|
logger.LogWarning("Skipping result without address details. '{result}'", result);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
string? alpha3CountryCode = CountryCodesUtils.Alpha2ToAlpha3(result.Address.Country_code);
|
||||||
|
|
||||||
|
rsList.Add(new()
|
||||||
|
{
|
||||||
|
HouseNumber = result.Address.House_number,
|
||||||
|
AddressRoad = result.Address.Road ?? result.Address.Square,
|
||||||
|
AddressCity = result.Address.City ?? result.Address.Municipality ?? result.Address.Town ?? result.Address.Village,
|
||||||
|
AddressProvince = result.Address.Province ?? result.Address.State_district ?? result.Address.County,
|
||||||
|
AddressState = result.Address.State,
|
||||||
|
AddressCountry = result.Address.Country,
|
||||||
|
ZipCode = result.Address.Postcode,
|
||||||
|
AddressCountryCode = alpha3CountryCode
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return rsList;
|
||||||
|
}
|
||||||
|
catch (System.Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Error getting info from API!");
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private HttpClient GetHttpClient()
|
||||||
|
{
|
||||||
|
HttpClient client = httpClientFactory.CreateClient();
|
||||||
|
|
||||||
|
Uri baseAddr = new(config.ServiceURL ?? defaultBaseAddr);
|
||||||
|
|
||||||
|
client.BaseAddress = baseAddr;
|
||||||
|
client.DefaultRequestHeaders.UserAgent.ParseAdd(config.UserAgent ?? defaultUserAgent);
|
||||||
|
if (config.ResultLang is not null)
|
||||||
|
{
|
||||||
|
client.DefaultRequestHeaders.AcceptLanguage.ParseAdd(config.ResultLang);
|
||||||
|
}
|
||||||
|
|
||||||
|
return client;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetRequestUri(string query)
|
||||||
|
{
|
||||||
|
return QueryHelpers.AddQueryString(apiUri, [
|
||||||
|
new KeyValuePair<string, string?>("format", "jsonv2"),
|
||||||
|
new KeyValuePair<string, string?>("addressdetails", "1"),
|
||||||
|
new KeyValuePair<string, string?>("layer", "address"),
|
||||||
|
new KeyValuePair<string, string?>("q", query),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private record class ApiResultAddress(
|
||||||
|
string? House_number = null,
|
||||||
|
string? Road = null,
|
||||||
|
string? Square = null,
|
||||||
|
string? City = null,
|
||||||
|
string? Municipality = null,
|
||||||
|
string? Village = null,
|
||||||
|
string? Town = null,
|
||||||
|
string? Province = null,
|
||||||
|
string? State_district = null,
|
||||||
|
string? County = null,
|
||||||
|
string? State = null,
|
||||||
|
string? Country = null,
|
||||||
|
string? Postcode = null,
|
||||||
|
string? Country_code = null
|
||||||
|
);
|
||||||
|
|
||||||
|
private record class ApiResult(
|
||||||
|
string? Osm_type = null,
|
||||||
|
long? Osm_id = null,
|
||||||
|
string? Category = null,
|
||||||
|
string? AddressType = null,
|
||||||
|
string? Name = null,
|
||||||
|
string? Display_name = null,
|
||||||
|
ApiResultAddress? Address = null
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,233 @@
|
|||||||
|
using FluentValidation;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Somnia.GuestLog.Enums.Services;
|
||||||
|
using Somnia.GuestLog.Infrastructure;
|
||||||
|
using Somnia.GuestLog.Models;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
using Somnia.GuestLog.Models.Entities;
|
||||||
|
using Somnia.GuestLog.Utils;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.Entity;
|
||||||
|
|
||||||
|
public class GuestDocumentEntityService(
|
||||||
|
ILogger<GuestDocumentEntityService> logger,
|
||||||
|
IDbContextFactory<GuestLogContext> contextFactory,
|
||||||
|
IValidator<GuestDocumentDTO> dtoValidator,
|
||||||
|
IStayEntryEntityService stayEntityService
|
||||||
|
) : IGuestDocumentEntityService
|
||||||
|
{
|
||||||
|
public async Task<Result> CreateDocumentAsync(GuestDocumentDTO dto)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(dto);
|
||||||
|
|
||||||
|
var valResult = dtoValidator.Validate(dto);
|
||||||
|
if (!valResult.IsValid)
|
||||||
|
{
|
||||||
|
logger.LogWarning("GuestDocumentService - CreateDocument: Dto validation failed. Fix the errors: {errorList}", valResult.Errors);
|
||||||
|
return Result.Fail(ResultCode.FailedValidation);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Dto must be valid, so null warings shouldn't matter.
|
||||||
|
GuestAddress addressItem = new()
|
||||||
|
{
|
||||||
|
Address = dto.Address,
|
||||||
|
AddressCity = dto.AddressCity,
|
||||||
|
AddressProvince = dto.AddressProvince,
|
||||||
|
AddressState = dto.AddressState,
|
||||||
|
AddressCountry = dto.AddressCountry!,
|
||||||
|
ZipCode = dto.ZipCode,
|
||||||
|
};
|
||||||
|
|
||||||
|
DateTime createTime = DateTime.UtcNow;
|
||||||
|
GuestDocument dbItem = new()
|
||||||
|
{
|
||||||
|
Version = GuestConsts.GuestDocument_FirstVersion,
|
||||||
|
DocumentType = dto.DocumentType!,
|
||||||
|
DocumentNum = dto.DocumentNum!,
|
||||||
|
IssueDate = DateOnly.FromDateTime(dto.IssueDate!.Value),
|
||||||
|
SupportNum = dto.SupportNum,
|
||||||
|
Nationality = dto.Nationality!,
|
||||||
|
Name = dto.Name!,
|
||||||
|
Surname = dto.Surname!,
|
||||||
|
Surname2 = dto.Surname2,
|
||||||
|
BirthDate = DateOnly.FromDateTime(dto.BirthDate!.Value),
|
||||||
|
Gender = dto.Gender,
|
||||||
|
PhoneNumber = dto.PhoneNumber,
|
||||||
|
EmailAddress = dto.EmailAddress,
|
||||||
|
AddressDetails = addressItem,
|
||||||
|
CreateTime = createTime,
|
||||||
|
UpdateTime = createTime,
|
||||||
|
IsLastVersion = true, //On creation, created entity is last version.
|
||||||
|
};
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
await dbContext.AddAsync(dbItem);
|
||||||
|
await dbContext.SaveChangesAsync();
|
||||||
|
|
||||||
|
logger.LogInformation("GuestDocumentService - CreateDocument: GuestDocument Created: '{id}'", dbItem.GetFullKey());
|
||||||
|
return Result.Ok();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "GuestDocumentService - CreateDocument: Error creating GuestDocument: '{id}'", dbItem.GetFullKey());
|
||||||
|
return Result.FailUnknownError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<Result> UpdateDocumentAsync(GuestDocumentDTO dto)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<Result> DeleteDocumentAsync(GuestDocumentDTO dto)
|
||||||
|
{
|
||||||
|
if (dto.Id is null)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("GuestDocumentService - DeleteDocument: A DTO without ID can't be deleted!");
|
||||||
|
}
|
||||||
|
|
||||||
|
return DeleteDocumentAsync(dto.Id.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Result> DeleteDocumentAsync(long id)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
|
||||||
|
//Check if GuestDocument is used in a Stay.
|
||||||
|
bool isUsed = await stayEntityService.IsGuestInStay(id);
|
||||||
|
if (isUsed)
|
||||||
|
{
|
||||||
|
logger.LogWarning("GuestDocumentService - DeleteDocument: Error deleting GuestDocument. Guest (ID: '{ID}') is in a Stay", id);
|
||||||
|
return Result.FailWithContext(ResultCode.GuestInStay, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
int deletedCount = await dbContext.GuestDocuments
|
||||||
|
.Where(e => e.Id == id)
|
||||||
|
.ExecuteDeleteAsync();
|
||||||
|
|
||||||
|
if (deletedCount == 0)
|
||||||
|
{
|
||||||
|
logger.LogWarning("GuestDocumentService - DeleteDocument: Error deleting GuestDocument. Entity not found with ID: '{ID}'", id);
|
||||||
|
return Result.Fail(ResultCode.NotFound);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.LogInformation(
|
||||||
|
"GuestDocumentService - DeleteDocument: GuestDocument deleted with Id: '{id}'. Versions deleted: '{Count}'",
|
||||||
|
id, deletedCount);
|
||||||
|
return Result.Ok();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "GuestDocumentService - CreateDocument: Error deleting GuestDocument: '{id}'", id);
|
||||||
|
return Result.FailUnknownError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<GuestDocumentDTO?> GetLastVersionDtoByIdAsync(long id)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
GuestDocument? dbItem = await dbContext.GuestDocuments
|
||||||
|
.Where(e => e.Id == id)
|
||||||
|
.OrderByDescending(e => e.Version)
|
||||||
|
.FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
return dbItem is not null ? GetDtoFromDb(dbItem) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<GuestDocumentDTO?> GetLastVersionDtoByDocumentAsync(string docType, string docNum)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
GuestDocument? dbItem = await dbContext.GuestDocuments
|
||||||
|
.Where(e => e.DocumentType == docType && e.DocumentNum == docNum)
|
||||||
|
.OrderByDescending(e => e.Version)
|
||||||
|
.FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
return dbItem is not null ? GetDtoFromDb(dbItem) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<IEnumerable<GuestDocumentDTO>> GetDtoListAsync(bool onlyLastVersion)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
|
||||||
|
// TEMP solution
|
||||||
|
var query = dbContext.GuestDocuments.AsQueryable();
|
||||||
|
if (onlyLastVersion)
|
||||||
|
{
|
||||||
|
query = query.Where(e => e.IsLastVersion == true);
|
||||||
|
}
|
||||||
|
var dbList = await query.OrderByDescending(e => e.UpdateTime)
|
||||||
|
.ToListAsync();
|
||||||
|
|
||||||
|
// TODO: Waiting for EF Core Window function improvements:
|
||||||
|
// See expected translation: https://github.com/dotnet/efcore/issues/36380#issuecomment-3082788964
|
||||||
|
// See window function status: https://github.com/dotnet/efcore/issues/12747
|
||||||
|
// var dbList = await dbContext.GuestDocuments
|
||||||
|
// .GroupBy(e => e.Id)
|
||||||
|
// .Select(g => g.OrderByDescending(e => e.Version).First())
|
||||||
|
// .ToListAsync();
|
||||||
|
|
||||||
|
return dbList.Select(GetDtoFromDb);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get GuestDocumentDTO from DB with the given filters.
|
||||||
|
/// Result count can be limited for perfomance reasons.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="filter">Filters to use</param>
|
||||||
|
/// <param name="limit">Result count. Set to 0 for unlimited results</param>
|
||||||
|
/// <returns>Filtered GuestDocumentDTO result list</returns>
|
||||||
|
public async Task<IEnumerable<GuestDocumentDTO>> GetDtoListByFilterAsync(GuestDocFilterDTO filter, int limit = 0)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
|
||||||
|
var query = dbContext.GuestDocuments.AsQueryable();
|
||||||
|
|
||||||
|
query = query.WhereIf(!string.IsNullOrEmpty(filter.DocumentType),
|
||||||
|
e => e.DocumentType == filter.DocumentType);
|
||||||
|
query = query.WhereIf(!string.IsNullOrEmpty(filter.DocumentNumber),
|
||||||
|
e => e.DocumentNum == filter.DocumentNumber);
|
||||||
|
|
||||||
|
query = query.WhereIf(!string.IsNullOrEmpty(filter.Name),
|
||||||
|
e => EF.Functions.Like(e.Name, filter.Name));
|
||||||
|
query = query.WhereIf(!string.IsNullOrEmpty(filter.Surname),
|
||||||
|
e => EF.Functions.Like(e.Surname, filter.Surname));
|
||||||
|
|
||||||
|
// TEMP while waiting for EF Core Window function improvements
|
||||||
|
query = query.WhereIf(filter.OnlyLastVersion,
|
||||||
|
e => e.IsLastVersion == true);
|
||||||
|
query = query.OrderByDescending(e => e.UpdateTime);
|
||||||
|
|
||||||
|
|
||||||
|
// TODO: Waiting for EF Core Window function improvements:
|
||||||
|
// See: https://github.com/dotnet/efcore/issues/27470
|
||||||
|
// See window function status: https://github.com/dotnet/efcore/issues/12747
|
||||||
|
// For Ordering (or operations post-grouping), see: https://github.com/dotnet/efcore/pull/38687
|
||||||
|
// query = query
|
||||||
|
// .OrderByDescending(e => e.UpdateTime)
|
||||||
|
// .GroupBy(e => e.Id)
|
||||||
|
// .Select(g => g.OrderByDescending(e => e.Version).First());
|
||||||
|
|
||||||
|
if (limit > 0)
|
||||||
|
{
|
||||||
|
query = query.Take(limit);
|
||||||
|
}
|
||||||
|
|
||||||
|
var dbList = await query.ToListAsync();
|
||||||
|
|
||||||
|
return dbList.Select(x => GetDtoFromDb(x));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#region Internal Methods
|
||||||
|
|
||||||
|
private static GuestDocumentDTO GetDtoFromDb(GuestDocument dbItem)
|
||||||
|
{
|
||||||
|
return EntityMapping.MapGuestDocumentEntityToDTO(dbItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.Entity;
|
||||||
|
|
||||||
|
public interface IGuestDocumentEntityService
|
||||||
|
{
|
||||||
|
public Task<Result> CreateDocumentAsync(GuestDocumentDTO dto);
|
||||||
|
public Task<Result> UpdateDocumentAsync(GuestDocumentDTO dto);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Same behavior as <see cref="DeleteDocumentAsync(long)"/>
|
||||||
|
/// </summary>
|
||||||
|
public Task<Result> DeleteDocumentAsync(GuestDocumentDTO dto);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Delete documents by ID.
|
||||||
|
/// This operation will delete all versions of a document.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id">ID of the document to Delete</param>
|
||||||
|
public Task<Result> DeleteDocumentAsync(long id);
|
||||||
|
|
||||||
|
public Task<GuestDocumentDTO?> GetLastVersionDtoByIdAsync(long id);
|
||||||
|
public Task<GuestDocumentDTO?> GetLastVersionDtoByDocumentAsync(string docType, string docNum);
|
||||||
|
|
||||||
|
public Task<IEnumerable<GuestDocumentDTO>> GetDtoListAsync(bool onlyLastVersion);
|
||||||
|
public Task<IEnumerable<GuestDocumentDTO>> GetDtoListByFilterAsync(GuestDocFilterDTO filter, int limit = 0);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
using Somnia.GuestLog.Models.QueryConfigs;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.Entity;
|
||||||
|
|
||||||
|
public interface IStayEntryEntityService
|
||||||
|
{
|
||||||
|
public Task<Result> CreateEntryAsync(StayEntryDTO dto);
|
||||||
|
public Task<Result> UpdateEntryAsync(StayEntryDTO updatedDto);
|
||||||
|
public Task<Result> DeleteEntryAsync(StayEntryDTO dto);
|
||||||
|
public Task<Result> DeleteEntryAsync(long id);
|
||||||
|
|
||||||
|
public Task<StayEntryDTO?> GetDtoByIdAsync(long id, StayEntryQueryConfig? queryConfig = null);
|
||||||
|
public Task<IEnumerable<StayEntryDTO>> GetDtoListAsync(StayEntryQueryConfig? queryConfig = null);
|
||||||
|
public Task<IEnumerable<StayEntryDTO>> GetDtoListByFilterAsync(StayEntryFilterDTO filter, int limit = 0, StayEntryQueryConfig? queryConfig = null);
|
||||||
|
|
||||||
|
|
||||||
|
public Task<bool> IsGuestInStay(long guestDocId);
|
||||||
|
public Task<bool> IsGuestInStayInPeriod(long guestDocId, DateTime startTime, DateTime endTime);
|
||||||
|
public Task<IEnumerable<StayEntryDTO>> GetStaysWithGuest(long guestDocId, StayEntryQueryConfig? queryConfig = null);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.Entity;
|
||||||
|
|
||||||
|
public interface IStayExportFileEntityService
|
||||||
|
{
|
||||||
|
public Task<Result> CreateStayExportAsync(StayExportFileDTO dto);
|
||||||
|
public Task<Result> UpdateStayExportAsync(StayExportFileDTO dto);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Delete StayExport entry from DB.
|
||||||
|
/// Exported File won't be deleted from Storage.
|
||||||
|
/// </summary>
|
||||||
|
public Task<Result> DeleteStayExportAsync(StayExportFileDTO dto);
|
||||||
|
|
||||||
|
public Task<StayExportFileDTO?> GetDtoByIdAsync(long id);
|
||||||
|
//public Task<IEnumerable<StayExportFileDTO>> GetDtoListByFilterAsync(StayExportFileFilterDTO filter, int limit = 0);
|
||||||
|
public Task<IEnumerable<StayExportFileDTO>> GetDtoListAsync(int limit = 0);
|
||||||
|
}
|
||||||
@@ -0,0 +1,217 @@
|
|||||||
|
using FluentValidation;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Somnia.GuestLog.Enums.Services;
|
||||||
|
using Somnia.GuestLog.Infrastructure;
|
||||||
|
using Somnia.GuestLog.Models;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
using Somnia.GuestLog.Models.Entities;
|
||||||
|
using Somnia.GuestLog.Models.QueryConfigs;
|
||||||
|
using Somnia.GuestLog.Utils;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.Entity;
|
||||||
|
|
||||||
|
public class StayEntryEntityService(
|
||||||
|
ILogger<StayEntryEntityService> logger,
|
||||||
|
IDbContextFactory<GuestLogContext> contextFactory,
|
||||||
|
IValidator<StayEntryDTO> dtoValidator
|
||||||
|
) : IStayEntryEntityService
|
||||||
|
{
|
||||||
|
public async Task<Result> CreateEntryAsync(StayEntryDTO dto)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(dto);
|
||||||
|
|
||||||
|
var valResult = await dtoValidator.ValidateAsync(dto);
|
||||||
|
if (!valResult.IsValid)
|
||||||
|
{
|
||||||
|
logger.LogWarning("StayEntryService - CreateEntryAsync: Dto validation failed. Fix the errors: {errorList}", valResult.Errors);
|
||||||
|
return Result.Fail(ResultCode.FailedValidation);
|
||||||
|
}
|
||||||
|
|
||||||
|
DateTime createTime = DateTime.UtcNow;
|
||||||
|
StayEntry dbStay = new()
|
||||||
|
{
|
||||||
|
DateIn = dto.DateIn!.Value.ToUniversalTime(),
|
||||||
|
DateOut = dto.DateOut!.Value.ToUniversalTime(),
|
||||||
|
RoomCount = dto.RoomCount!.Value,
|
||||||
|
RoomNumber = dto.RoomNumber,
|
||||||
|
PaymentMethod = dto.PaymentMethod!,
|
||||||
|
CreateTime = createTime,
|
||||||
|
UpdateTime = createTime,
|
||||||
|
};
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
|
||||||
|
//Check and add GuestDocuments
|
||||||
|
foreach (GuestDocumentDTO guestDto in dto.GuestDocuments!)
|
||||||
|
{
|
||||||
|
//Get guest from db.
|
||||||
|
GuestDocument dbGuest = await dbContext.GuestDocuments
|
||||||
|
.Where(gd => gd.Id == guestDto.Id && gd.Version == guestDto.Version)
|
||||||
|
.SingleAsync();
|
||||||
|
|
||||||
|
//Check if Guest is already in other stay during the same period.
|
||||||
|
bool isInOtherStay = await this.IsGuestInStayInPeriod(dbGuest.Id, dbStay.DateIn, dbStay.DateOut);
|
||||||
|
if (isInOtherStay)
|
||||||
|
{
|
||||||
|
string period = $"{dbStay.DateIn}-{dbStay.DateOut}";
|
||||||
|
return Result.FailWithContext(ResultCode.GuestCurrentlyInStay, dbGuest.GetFullKey(), period);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Add dbGuest to dbStay.
|
||||||
|
dbStay.GuestDocuments.Add(dbGuest);
|
||||||
|
}
|
||||||
|
|
||||||
|
await dbContext.AddAsync(dbStay);
|
||||||
|
await dbContext.SaveChangesAsync();
|
||||||
|
|
||||||
|
logger.LogInformation("StayEntryService - CreateEntryAsync: StayEntry Created: '{id}'", dbStay.GetFullKey());
|
||||||
|
return Result.Ok();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "StayEntryService - CreateEntryAsync: Error creating StayEntry");
|
||||||
|
return Result.FailUnknownError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<Result> UpdateEntryAsync(StayEntryDTO updatedDto)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Result> DeleteEntryAsync(StayEntryDTO dto)
|
||||||
|
{
|
||||||
|
if (dto.Id is null)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("StayEntryService - DeleteEntry: A DTO without key can't be deleted!");
|
||||||
|
}
|
||||||
|
|
||||||
|
return await DeleteEntryAsync(dto.Id.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Result> DeleteEntryAsync(long id)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
StayEntry? dbItem = await dbContext.StayEntries.FindAsync(id);
|
||||||
|
if (dbItem is null)
|
||||||
|
{
|
||||||
|
logger.LogWarning("StayEntryService - DeleteEntry: Error deleting StayEntry. Entity not found with key: '{key}'", id);
|
||||||
|
return Result.Fail(ResultCode.NotFound);
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
dbContext.StayEntries.Remove(dbItem);
|
||||||
|
await dbContext.SaveChangesAsync();
|
||||||
|
|
||||||
|
logger.LogInformation("StayEntryService - DeleteEntry: StayEntry deleted: '{id}'", dbItem.GetFullKey());
|
||||||
|
return Result.Ok();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "StayEntryService - DeleteEntry: Error deleting StayEntry: '{id}'", dbItem.GetFullKey());
|
||||||
|
return Result.FailUnknownError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<StayEntryDTO?> GetDtoByIdAsync(long id, StayEntryQueryConfig? queryConfig = null)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
StayEntry? dbItem = await dbContext.StayEntries
|
||||||
|
.Where(e => e.Id == id)
|
||||||
|
.AddQueryConfig(queryConfig)
|
||||||
|
.FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
return dbItem is not null ? GetDtoFromDb(dbItem, queryConfig) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<IEnumerable<StayEntryDTO>> GetDtoListAsync(StayEntryQueryConfig? queryConfig = null)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
|
||||||
|
var dbList = await dbContext.StayEntries
|
||||||
|
.AddQueryConfig(queryConfig)
|
||||||
|
.OrderByDescending(e => e.UpdateTime)
|
||||||
|
.ToListAsync();
|
||||||
|
|
||||||
|
return dbList.Select(e => GetDtoFromDb(e, queryConfig));
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<IEnumerable<StayEntryDTO>> GetDtoListByFilterAsync(StayEntryFilterDTO filter, int limit = 0, StayEntryQueryConfig? queryConfig = null)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
|
||||||
|
var query = dbContext.StayEntries
|
||||||
|
.AddQueryConfig(queryConfig)
|
||||||
|
.AsQueryable();
|
||||||
|
|
||||||
|
query = query.WhereIf(filter.DateInStart is not null && filter.DateInEnd is not null,
|
||||||
|
e => e.DateIn >= filter.DateInStart!.Value.ToUniversalTime()
|
||||||
|
&& e.DateIn < filter.DateInEnd!.Value.ToUniversalTime());
|
||||||
|
query = query.WhereIf(!string.IsNullOrEmpty(filter.RoomNumber),
|
||||||
|
e => EF.Functions.Like(e.RoomNumber, $"%{filter.RoomNumber}%"));
|
||||||
|
query = query.WhereIf(!string.IsNullOrEmpty(filter.PaymentMethod),
|
||||||
|
e => e.PaymentMethod == filter.PaymentMethod);
|
||||||
|
|
||||||
|
query = query.OrderByDescending(e => e.DateIn);
|
||||||
|
|
||||||
|
if (limit > 0)
|
||||||
|
{
|
||||||
|
query = query.Take(limit);
|
||||||
|
}
|
||||||
|
|
||||||
|
var dbList = await query
|
||||||
|
.ToListAsync();
|
||||||
|
|
||||||
|
return dbList.Select(x => GetDtoFromDb(x, queryConfig));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<bool> IsGuestInStay(long guestDocId)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
|
||||||
|
bool rs = await dbContext.StayEntries
|
||||||
|
.AnyAsync(s => s.GuestDocuments.Any(g => g.Id == guestDocId));
|
||||||
|
|
||||||
|
return rs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> IsGuestInStayInPeriod(long guestDocId, DateTime startTime, DateTime endTime)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
|
||||||
|
bool rs = await dbContext.StayEntries
|
||||||
|
.AnyAsync(s => s.DateIn < endTime && s.DateOut > startTime
|
||||||
|
&& s.GuestDocuments.Any(g => g.Id == guestDocId)
|
||||||
|
);
|
||||||
|
|
||||||
|
return rs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<IEnumerable<StayEntryDTO>> GetStaysWithGuest(long guestDocId, StayEntryQueryConfig? queryConfig = null)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
|
||||||
|
var rs = await dbContext.StayEntries
|
||||||
|
.Where(s => s.GuestDocuments.Any(g => g.Id == guestDocId))
|
||||||
|
.AddQueryConfig(queryConfig)
|
||||||
|
.OrderByDescending(e => e.DateIn)
|
||||||
|
.ToListAsync();
|
||||||
|
|
||||||
|
return rs.Select(e => GetDtoFromDb(e, queryConfig));
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Internal Methods
|
||||||
|
|
||||||
|
private static StayEntryDTO GetDtoFromDb(StayEntry dbItem, StayEntryQueryConfig? queryConfig)
|
||||||
|
{
|
||||||
|
queryConfig ??= StayEntryQueryConfig.DefaultQueryConfig;
|
||||||
|
|
||||||
|
return EntityMapping.MapStayEntryEntityToDTO(dbItem, queryConfig.IncludeGuests);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
using FluentValidation;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Somnia.GuestLog.Enums.Services;
|
||||||
|
using Somnia.GuestLog.Infrastructure;
|
||||||
|
using Somnia.GuestLog.Models;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
using Somnia.GuestLog.Models.Entities;
|
||||||
|
using Somnia.GuestLog.Utils;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.Entity;
|
||||||
|
|
||||||
|
public class StayExportFileEntityService(
|
||||||
|
ILogger<StayExportFileEntityService> logger,
|
||||||
|
IDbContextFactory<GuestLogContext> contextFactory
|
||||||
|
) : IStayExportFileEntityService
|
||||||
|
{
|
||||||
|
public async Task<Result> CreateStayExportAsync(StayExportFileDTO dto)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(dto, nameof(dto));
|
||||||
|
|
||||||
|
//Check for null values in the DTO.
|
||||||
|
if (dto.ExportFormat == null || dto.ExportResult == null || dto.ExportTime == null)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("StayExportFile dto contains null fields");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dto.ExportParams == null)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("StayExportFile dto contains null ExportParams");
|
||||||
|
}
|
||||||
|
|
||||||
|
StayExportParams exportParams = GetExportParamsFromDTO(dto.ExportParams);
|
||||||
|
StayExportFile dbItem = new()
|
||||||
|
{
|
||||||
|
ExportFormat = dto.ExportFormat.Value,
|
||||||
|
ExportParams = exportParams,
|
||||||
|
ExportResult = dto.ExportResult.Value,
|
||||||
|
ExportedPath = dto.ExportedPath,
|
||||||
|
ExportDetails = dto.ExportDetails,
|
||||||
|
ExportTime = dto.ExportTime?.ToUniversalTime() ?? DateTime.UtcNow,
|
||||||
|
};
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
await dbContext.AddAsync(dbItem);
|
||||||
|
await dbContext.SaveChangesAsync();
|
||||||
|
|
||||||
|
logger.LogInformation("StayExportFileService - CreateStayExportAsync: GuestDocument Created: '{id}'", dbItem.GetFullKey());
|
||||||
|
return Result.Ok();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "StayExportFileService - CreateStayExportAsync: Error creating GuestDocument");
|
||||||
|
return Result.FailUnknownError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<Result> UpdateStayExportAsync(StayExportFileDTO dto)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Result> DeleteStayExportAsync(StayExportFileDTO dto)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
|
||||||
|
int deletedCount = await dbContext.StayExportFiles
|
||||||
|
.Where(e => e.Id == dto.Id)
|
||||||
|
.ExecuteDeleteAsync();
|
||||||
|
|
||||||
|
if (deletedCount == 0)
|
||||||
|
{
|
||||||
|
logger.LogWarning("StayExportFileService - DeleteStayExportAsync: Error deleting StayExport. Entity not found with ID: '{ID}'", dto.Id);
|
||||||
|
return Result.Fail(ResultCode.NotFound);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.LogInformation(
|
||||||
|
"StayExportFileService - DeleteStayExportAsync: StayExport deleted with Id: '{id}'.", dto.Id);
|
||||||
|
return Result.Ok();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "StayExportFileService - DeleteStayExportAsync: Error creating GuestDocument");
|
||||||
|
return Result.FailUnknownError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<StayExportFileDTO?> GetDtoByIdAsync(long id)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
StayExportFile? dbItem = await dbContext.StayExportFiles
|
||||||
|
.Where(e => e.Id == id)
|
||||||
|
.FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
return dbItem is not null ? GetDtoFromDb(dbItem) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<IEnumerable<StayExportFileDTO>> GetDtoListAsync(int limit = 0)
|
||||||
|
{
|
||||||
|
using var dbContext = contextFactory.CreateDbContext();
|
||||||
|
|
||||||
|
IQueryable<StayExportFile> query = dbContext.StayExportFiles
|
||||||
|
.OrderByDescending(e => e.ExportTime)
|
||||||
|
.WithLimit(limit);
|
||||||
|
|
||||||
|
var dbList = await query.ToListAsync();
|
||||||
|
|
||||||
|
return dbList.Select(e => GetDtoFromDb(e));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#region Internal Methods
|
||||||
|
|
||||||
|
private static StayExportFileDTO GetDtoFromDb(StayExportFile dbItem)
|
||||||
|
{
|
||||||
|
return EntityMapping.MapStayExportFileEntityToDTO(dbItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static StayExportParams GetExportParamsFromDTO(StayExportParamsDTO dto)
|
||||||
|
{
|
||||||
|
if (dto.ExportType == null)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("Dto with invalid data");
|
||||||
|
}
|
||||||
|
|
||||||
|
return new()
|
||||||
|
{
|
||||||
|
ExportType = dto.ExportType.Value,
|
||||||
|
ExportPeriodStart = dto.ExportPeriodStart?.ToUniversalTime(),
|
||||||
|
ExportPeriodEnd = dto.ExportPeriodEnd?.ToUniversalTime()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
@@ -1,192 +0,0 @@
|
|||||||
using FluentValidation;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Somnia.GuestLog.Infrastructure;
|
|
||||||
using Somnia.GuestLog.Models.DTOs;
|
|
||||||
using Somnia.GuestLog.Models.Entities;
|
|
||||||
using Somnia.GuestLog.Utils;
|
|
||||||
|
|
||||||
namespace Somnia.GuestLog.Services;
|
|
||||||
|
|
||||||
public class GuestDocumentService(
|
|
||||||
ILogger<GuestDocumentService> logger,
|
|
||||||
IDbContextFactory<GuestLogContext> contextFactory,
|
|
||||||
IValidator<GuestDocumentDTO> dtoValidator
|
|
||||||
) : IGuestDocumentService
|
|
||||||
{
|
|
||||||
public async Task<bool> CreateDocumentAsync(GuestDocumentDTO dto)
|
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(dto);
|
|
||||||
|
|
||||||
var valResult = dtoValidator.Validate(dto);
|
|
||||||
if (!valResult.IsValid)
|
|
||||||
{
|
|
||||||
logger.LogWarning("GuestDocumentService - CreateDocument: Dto validation failed. Fix the errors: {errorList}", valResult.Errors);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Dto must be valid, so null warings shouldn't matter.
|
|
||||||
GuestAddress addressItem = new()
|
|
||||||
{
|
|
||||||
Address = dto.Address,
|
|
||||||
AddressCity = dto.AddressCity,
|
|
||||||
AddressProvince = dto.AddressProvince,
|
|
||||||
AddressState = dto.AddressState,
|
|
||||||
AddressCountry = dto.AddressCountry!,
|
|
||||||
ZipCode = dto.ZipCode,
|
|
||||||
};
|
|
||||||
|
|
||||||
GuestDocument dbItem = new()
|
|
||||||
{
|
|
||||||
DocumentType = dto.DocumentType!,
|
|
||||||
DocumentNum = dto.DocumentNum!,
|
|
||||||
IssueDate = DateOnly.FromDateTime(dto.IssueDate!.Value),
|
|
||||||
SupportNum = dto.SupportNum,
|
|
||||||
Nationality = dto.Nationality!,
|
|
||||||
Name = dto.Name!,
|
|
||||||
Surname = dto.Surname!,
|
|
||||||
Surname2 = dto.Surname2,
|
|
||||||
BirthDate = DateOnly.FromDateTime(dto.BirthDate!.Value),
|
|
||||||
Gender = dto.Gender,
|
|
||||||
PhoneNumber = dto.PhoneNumber,
|
|
||||||
EmailAddress = dto.EmailAddress,
|
|
||||||
AddressDetails = addressItem,
|
|
||||||
CreateTime = DateTime.UtcNow,
|
|
||||||
UpdateTime = DateTime.UtcNow,
|
|
||||||
};
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
using var dbContext = contextFactory.CreateDbContext();
|
|
||||||
await dbContext.AddAsync(dbItem);
|
|
||||||
await dbContext.SaveChangesAsync();
|
|
||||||
|
|
||||||
logger.LogInformation("GuestDocumentService - CreateDocument: GuestDocument Created: '{id}'", dbItem.GetFullKey());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.LogError(ex, "GuestDocumentService - CreateDocument: Error creating GuestDocument: '{id}'", dbItem.GetFullKey());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task<bool> UpdateDocumentAsync(GuestDocumentDTO dto)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task<bool> DeleteDocumentAsync(GuestDocumentDTO dto)
|
|
||||||
{
|
|
||||||
if (dto.DocumentType is null || dto.DocumentNum is null)
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException("GuestDocumentService - DeleteDocument: A DTO without key can't be deleted!");
|
|
||||||
}
|
|
||||||
|
|
||||||
return DeleteDocumentAsync(dto.DocumentType, dto.DocumentNum);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<bool> DeleteDocumentAsync(string docType, string docNum)
|
|
||||||
{
|
|
||||||
using var dbContext = contextFactory.CreateDbContext();
|
|
||||||
GuestDocument? dbItem = await dbContext.GuestDocuments.FindAsync(docType, docNum);
|
|
||||||
if (dbItem is null)
|
|
||||||
{
|
|
||||||
logger.LogWarning("GuestDocumentService - DeleteDocument: Error deleting GuestDocument. Entity not found with key: '{key}-{key2}'", docType, docNum);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
dbContext.GuestDocuments.Remove(dbItem);
|
|
||||||
await dbContext.SaveChangesAsync();
|
|
||||||
|
|
||||||
logger.LogInformation("GuestDocumentService - DeleteDocument: GuestDocument deleted: '{id}'", dbItem.GetFullKey());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.LogError(ex, "GuestDocumentService - CreateDocument: Error deleting GuestDocument: '{id}'", dbItem.GetFullKey());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public async Task<GuestDocumentDTO?> GetDtoByIdAsync(string docType, string docNum)
|
|
||||||
{
|
|
||||||
using var dbContext = contextFactory.CreateDbContext();
|
|
||||||
GuestDocument? dbItem = await dbContext.GuestDocuments.FindAsync(docType, docNum);
|
|
||||||
return dbItem is not null ? GetDtoFromDb(dbItem) : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<IEnumerable<GuestDocumentDTO>> GetDtoListAsync()
|
|
||||||
{
|
|
||||||
using var dbContext = contextFactory.CreateDbContext();
|
|
||||||
var dbList = await dbContext.GuestDocuments
|
|
||||||
.OrderByDescending(e => e.UpdateTime)
|
|
||||||
.ToListAsync();
|
|
||||||
|
|
||||||
return dbList.Select(x => GetDtoFromDb(x));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get GuestDocumentDTO from DB with the given filters.
|
|
||||||
/// Result count can be limited for perfomance reasons.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="filter">Filters to use</param>
|
|
||||||
/// <param name="limit">Result count. Set to 0 for unlimited results</param>
|
|
||||||
/// <returns>Filtered GuestDocumentDTO result list</returns>
|
|
||||||
public async Task<IEnumerable<GuestDocumentDTO>> GetDtoListByFilterAsync(GuestDocFilterDTO filter, int limit = 0)
|
|
||||||
{
|
|
||||||
using var dbContext = contextFactory.CreateDbContext();
|
|
||||||
|
|
||||||
var query = dbContext.GuestDocuments.AsQueryable();
|
|
||||||
|
|
||||||
query = query.WhereIf(!string.IsNullOrEmpty(filter.DocumentType),
|
|
||||||
e => e.DocumentType == filter.DocumentType);
|
|
||||||
query = query.WhereIf(!string.IsNullOrEmpty(filter.DocumentNumber),
|
|
||||||
e => e.DocumentNum == filter.DocumentNumber);
|
|
||||||
|
|
||||||
query = query.WhereIf(!string.IsNullOrEmpty(filter.Name),
|
|
||||||
e => EF.Functions.Like(e.Name, filter.Name));
|
|
||||||
query = query.WhereIf(!string.IsNullOrEmpty(filter.Surname),
|
|
||||||
e => EF.Functions.Like(e.Surname, filter.Surname));
|
|
||||||
|
|
||||||
query = query.OrderByDescending(e => e.UpdateTime);
|
|
||||||
|
|
||||||
if (limit > 0)
|
|
||||||
{
|
|
||||||
query = query.Take(limit);
|
|
||||||
}
|
|
||||||
|
|
||||||
var dbList = await query.ToListAsync();
|
|
||||||
|
|
||||||
return dbList.Select(x => GetDtoFromDb(x));
|
|
||||||
}
|
|
||||||
|
|
||||||
public GuestDocumentDTO GetDtoFromDb(GuestDocument dbItem)
|
|
||||||
{
|
|
||||||
return new()
|
|
||||||
{
|
|
||||||
DocumentType = dbItem.DocumentType,
|
|
||||||
DocumentNum = dbItem.DocumentNum,
|
|
||||||
IssueDate = dbItem.IssueDate.ToDateTime(TimeOnly.MinValue),
|
|
||||||
SupportNum = dbItem.SupportNum,
|
|
||||||
Nationality = dbItem.Nationality,
|
|
||||||
Name = dbItem.Name,
|
|
||||||
Surname = dbItem.Surname,
|
|
||||||
Surname2 = dbItem.Surname2,
|
|
||||||
BirthDate = dbItem.BirthDate.ToDateTime(TimeOnly.MinValue),
|
|
||||||
Gender = dbItem.Gender,
|
|
||||||
PhoneNumber = dbItem.PhoneNumber,
|
|
||||||
EmailAddress = dbItem.EmailAddress,
|
|
||||||
Address = dbItem.AddressDetails?.Address ?? "",
|
|
||||||
AddressCity = dbItem.AddressDetails?.AddressCity ?? "",
|
|
||||||
AddressProvince = dbItem.AddressDetails?.AddressProvince ?? "",
|
|
||||||
AddressState = dbItem.AddressDetails?.AddressState ?? "",
|
|
||||||
AddressCountry = dbItem.AddressDetails?.AddressCountry! ?? "",
|
|
||||||
ZipCode = dbItem.AddressDetails?.ZipCode ?? "",
|
|
||||||
CreateTime = dbItem.CreateTime,
|
|
||||||
UpdateTime = dbItem.UpdateTime,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
using Somnia.GuestLog.Models.DTOs;
|
|
||||||
|
|
||||||
namespace Somnia.GuestLog.Services;
|
|
||||||
|
|
||||||
public interface IGuestDocumentService
|
|
||||||
{
|
|
||||||
public Task<bool> CreateDocumentAsync(GuestDocumentDTO dto);
|
|
||||||
public Task<bool> UpdateDocumentAsync(GuestDocumentDTO dto);
|
|
||||||
public Task<bool> DeleteDocumentAsync(GuestDocumentDTO dto);
|
|
||||||
public Task<bool> DeleteDocumentAsync(string docType, string docNum);
|
|
||||||
|
|
||||||
public Task<GuestDocumentDTO?> GetDtoByIdAsync(string docType, string docNum);
|
|
||||||
public Task<IEnumerable<GuestDocumentDTO>> GetDtoListByFilterAsync(GuestDocFilterDTO filter, int limit = 0);
|
|
||||||
public Task<IEnumerable<GuestDocumentDTO>> GetDtoListAsync();
|
|
||||||
|
|
||||||
//TODO: Add Filter
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace Somnia.GuestLog.Services;
|
||||||
|
|
||||||
|
public interface ILocalizerService
|
||||||
|
{
|
||||||
|
public string GetEnumValue<TEnum>(TEnum? enumValue) where TEnum : struct, Enum;
|
||||||
|
public string GetEnumValue<TEnum>(TEnum enumValue) where TEnum : struct, Enum;
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
using Somnia.GuestLog.Enums.UI;
|
||||||
|
using IResult = Somnia.GuestLog.Models.DTOs.IResult;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services;
|
||||||
|
|
||||||
|
public interface IUserMessageService
|
||||||
|
{
|
||||||
|
public void ShowMessage(string text, MessageKind kind, params object[] parameters);
|
||||||
|
|
||||||
|
public void ShowResult(IResult resultDto);
|
||||||
|
public void ShowResultWithMessage(IResult resultDto, string message);
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
using Microsoft.Extensions.Localization;
|
||||||
|
using Somnia.GuestLog.Resources;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services;
|
||||||
|
|
||||||
|
public class LocalizerService(
|
||||||
|
IServiceProvider serviceProvider
|
||||||
|
) : ILocalizerService
|
||||||
|
{
|
||||||
|
private IStringLocalizer<LanguageLocale> Localizer
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
field ??= serviceProvider.GetRequiredService<IStringLocalizer<LanguageLocale>>();
|
||||||
|
return field;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public string GetEnumValue<TEnum>(TEnum? enumValue) where TEnum : struct, Enum
|
||||||
|
{
|
||||||
|
if (enumValue == null)
|
||||||
|
{
|
||||||
|
return GuestConsts.EmptyField;
|
||||||
|
}
|
||||||
|
|
||||||
|
return GetEnumValue(enumValue.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public string GetEnumValue<TEnum>(TEnum enumValue) where TEnum : struct, Enum
|
||||||
|
{
|
||||||
|
string enumName = typeof(TEnum).Name;
|
||||||
|
string? strEnumValue = Enum.GetName(enumValue);
|
||||||
|
string localeKey = $"enum.{enumName}.{strEnumValue}";
|
||||||
|
|
||||||
|
return Localizer[localeKey];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace Somnia.GuestLog.Services.SpainCodigoMunicipio;
|
||||||
|
|
||||||
|
public interface ISpainCodigoMunicipioService
|
||||||
|
{
|
||||||
|
public Task<string?> GetCodigoMunicipioAsync(string municipio, string province);
|
||||||
|
}
|
||||||
+123
@@ -0,0 +1,123 @@
|
|||||||
|
using System.Xml.Serialization;
|
||||||
|
using Microsoft.AspNetCore.WebUtilities;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.SpainCodigoMunicipio;
|
||||||
|
|
||||||
|
public class SpainCodigoMunicipioCatastroService(
|
||||||
|
ILogger<SpainCodigoMunicipioCatastroService> logger,
|
||||||
|
IHttpClientFactory httpFactory
|
||||||
|
) : ISpainCodigoMunicipioService
|
||||||
|
{
|
||||||
|
private const string Api_Host = "https://ovc.catastro.meh.es";
|
||||||
|
private const string Api_Address = "OVCServWeb/OVCWcfCallejero/COVCCallejero.svc/rest/ObtenerMunicipios";
|
||||||
|
private const string Api_Param_Provincia = "Provincia";
|
||||||
|
private const string Api_Param_Municipio = "Municipio";
|
||||||
|
|
||||||
|
|
||||||
|
//Result Cache.
|
||||||
|
readonly Dictionary<(string provincia, string municipio), string> codigoMunicipioCache = [];
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<string?> GetCodigoMunicipioAsync(string municipio, string province)
|
||||||
|
{
|
||||||
|
var cacheKey = (province.ToUpper(), municipio.ToUpper());
|
||||||
|
|
||||||
|
//Try get from cache.
|
||||||
|
if (codigoMunicipioCache.TryGetValue(cacheKey, out string? cacheCode))
|
||||||
|
{
|
||||||
|
logger.LogInformation("SpainCodigoMunicipioCatastroService - Municipio found in cache for: '{key}'", cacheKey);
|
||||||
|
return cacheCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string uri = GetRequestUri(municipio, province);
|
||||||
|
logger.LogInformation("SpainCodigoMunicipioCatastroService - Getting municipios from API with query: '{addr}'", uri);
|
||||||
|
|
||||||
|
var httpClient = httpFactory.CreateClient();
|
||||||
|
using var rsStream = await httpClient.GetStreamAsync(uri);
|
||||||
|
|
||||||
|
XmlSerializer serializer = new(typeof(CatastroApiResult));
|
||||||
|
|
||||||
|
if (serializer.Deserialize(rsStream) is not CatastroApiResult rs)
|
||||||
|
{
|
||||||
|
logger.LogError("SpainCodigoMunicipioCatastroService - Result can't be deserialized!");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rs.municipios.Count == 0)
|
||||||
|
{
|
||||||
|
logger.LogWarning("SpainCodigoMunicipioCatastroService - No municipios found for query: '{addr}'", uri);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rs.municipios.Count > 1)
|
||||||
|
{
|
||||||
|
logger.LogWarning("SpainCodigoMunicipioCatastroService - More than 1 municipio was returned. First one will be used!");
|
||||||
|
}
|
||||||
|
|
||||||
|
CatastroApiResultCodigoIne? codIne = rs.municipios.First().codigoIne;
|
||||||
|
if (codIne == null || codIne.codigoMunicipio == null || codIne.codigoProvincia == null)
|
||||||
|
{
|
||||||
|
logger.LogWarning("SpainCodigoMunicipioCatastroService - Returned Municipio without data!");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
string finalCode = $"{codIne.codigoProvincia}{codIne.codigoMunicipio}";
|
||||||
|
|
||||||
|
codigoMunicipioCache.Add(cacheKey, finalCode);
|
||||||
|
return finalCode;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "SpainCodigoMunicipioCatastroService - Error getting codigo municipio from catastro API!");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#region Internal Methods
|
||||||
|
|
||||||
|
private static string GetRequestUri(string municipio, string province)
|
||||||
|
{
|
||||||
|
string baseAddress = $"{Api_Host}/{Api_Address}";
|
||||||
|
|
||||||
|
return QueryHelpers.AddQueryString(baseAddress, [
|
||||||
|
new KeyValuePair<string, string?>(Api_Param_Provincia, province),
|
||||||
|
new KeyValuePair<string, string?>(Api_Param_Municipio, municipio),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region API Model
|
||||||
|
|
||||||
|
[XmlRoot(ElementName = "consulta_municipiero", Namespace = "http://www.catastro.meh.es/")]
|
||||||
|
public class CatastroApiResult()
|
||||||
|
{
|
||||||
|
[XmlArray(ElementName = "municipiero")]
|
||||||
|
[XmlArrayItem(ElementName = "muni")]
|
||||||
|
public required List<CatastroApiResultMunicipio> municipios;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class CatastroApiResultMunicipio()
|
||||||
|
{
|
||||||
|
[XmlElement(ElementName = "nm")]
|
||||||
|
public string? municipio;
|
||||||
|
|
||||||
|
[XmlElement(ElementName = "loine")]
|
||||||
|
public CatastroApiResultCodigoIne? codigoIne;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public class CatastroApiResultCodigoIne
|
||||||
|
{
|
||||||
|
[XmlElement(ElementName = "cp")]
|
||||||
|
public string? codigoProvincia;
|
||||||
|
|
||||||
|
[XmlElement(ElementName = "cm")]
|
||||||
|
public string? codigoMunicipio;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
@@ -20,6 +20,7 @@ public class StaticDataListService(
|
|||||||
new KeyValuePair<string, HashSet<string>>(GuestConsts.DataList_DocumentTypes, _documentTypeSet),
|
new KeyValuePair<string, HashSet<string>>(GuestConsts.DataList_DocumentTypes, _documentTypeSet),
|
||||||
new KeyValuePair<string, HashSet<string>>(GuestConsts.DataList_GenderOptions, _genderOptionSet),
|
new KeyValuePair<string, HashSet<string>>(GuestConsts.DataList_GenderOptions, _genderOptionSet),
|
||||||
new KeyValuePair<string, HashSet<string>>(GuestConsts.DataList_CountryCodes, _countryCodeSet),
|
new KeyValuePair<string, HashSet<string>>(GuestConsts.DataList_CountryCodes, _countryCodeSet),
|
||||||
|
new KeyValuePair<string, HashSet<string>>(GuestConsts.DataList_PaymentMethods, _paymentMethodSet),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
public List<string> GetAvailableLists()
|
public List<string> GetAvailableLists()
|
||||||
@@ -92,6 +93,14 @@ public class StaticDataListService(
|
|||||||
"VIR","VNM","VUT","WLF","WSM","YEM","ZAF","ZMB","ZWE",
|
"VIR","VNM","VUT","WLF","WSM","YEM","ZAF","ZMB","ZWE",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
private static readonly HashSet<string> _paymentMethodSet = [
|
||||||
|
"EFECT",
|
||||||
|
"TARJT",
|
||||||
|
"TRANS",
|
||||||
|
"MOVIL",
|
||||||
|
"OTRO",
|
||||||
|
];
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
using Somnia.GuestLog.Enums.Models;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.StayExport;
|
||||||
|
|
||||||
|
public interface IStayExportFormatProvider
|
||||||
|
{
|
||||||
|
public StayExportFormat GetFormat();
|
||||||
|
public string GetFilename(DateTime exportTime);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Export Data with the corresponding format.
|
||||||
|
/// Data is copied to given stream (no other operations are performed to the stream).
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="stayList">List of Stays to export</param>
|
||||||
|
/// <param name="dataStream">Stream to copy exported data.</param>
|
||||||
|
public Task<(StayExportFileResult fileResult, string? exportDetails)> ExportDataAsync(IEnumerable<StayEntryDTO> stayList, Stream dataStream);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
using Somnia.GuestLog.Enums.Models;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.StayExport;
|
||||||
|
|
||||||
|
public interface IStayExportFormatProviderFactory
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Returns the StayExport service implementation given current configuration.
|
||||||
|
/// </summary>
|
||||||
|
public IStayExportFormatProvider GetProvider(StayExportFormat exportFormat);
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
using Somnia.GuestLog.Enums.Models;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.StayExport;
|
||||||
|
|
||||||
|
public interface IStayExportService
|
||||||
|
{
|
||||||
|
public Task<Result<StayExportFileDTO>> ExportStaysByParamsAsync(StayExportFormat format, StayExportParamsDTO exportParams);
|
||||||
|
|
||||||
|
|
||||||
|
public Task<Result> GetExportedFileAsync(StayExportFileDTO item, Stream dataStream);
|
||||||
|
|
||||||
|
public Task<Result> DeleteExportedFileAsync(StayExportFileDTO item);
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
using Somnia.GuestLog.Enums.Models;
|
||||||
|
using Somnia.GuestLog.Models.Configuration;
|
||||||
|
using Somnia.GuestLog.Utils.DI;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.StayExport;
|
||||||
|
|
||||||
|
public class StayExportFormatProviderFactory(
|
||||||
|
IServiceProvider serviceProvider,
|
||||||
|
IOptions<StayExportConfig> config
|
||||||
|
) : IStayExportFormatProviderFactory, IFactoryDI
|
||||||
|
{
|
||||||
|
public static void RegisterFactoryItems(IServiceCollection services)
|
||||||
|
{
|
||||||
|
services.AddKeyedSingleton<IStayExportFormatProvider, StayExportProviderJson>(StayExportFormat.GuestLogJson);
|
||||||
|
services.AddKeyedSingleton<IStayExportFormatProvider, StayExportProviderSpainParteViajeros>(StayExportFormat.SpainParteViajeros);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public IStayExportFormatProvider GetProvider(StayExportFormat exportFormat)
|
||||||
|
{
|
||||||
|
if (config.Value.EnableStayExport == false)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("StayExport is disabled. Enable and configure it first!");
|
||||||
|
}
|
||||||
|
|
||||||
|
return serviceProvider.GetKeyedService<IStayExportFormatProvider>(exportFormat)
|
||||||
|
?? throw new InvalidOperationException($"StayExport service not found for ExportFormat: '{exportFormat}'");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using Somnia.GuestLog.Enums.Models;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.StayExport;
|
||||||
|
|
||||||
|
public class StayExportProviderJson : IStayExportFormatProvider
|
||||||
|
{
|
||||||
|
private const string fileExtension = "json";
|
||||||
|
|
||||||
|
public StayExportFormat GetFormat() => StayExportFormat.GuestLogJson;
|
||||||
|
public string GetFilename(DateTime exportTime)
|
||||||
|
=> $"{Enum.GetName(GetFormat())}_{exportTime.ToFileTimeUtc()}.{fileExtension}";
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<(StayExportFileResult fileResult, string? exportDetails)> ExportDataAsync(IEnumerable<StayEntryDTO> stayList, Stream dataStream)
|
||||||
|
{
|
||||||
|
if (!stayList.Any())
|
||||||
|
{
|
||||||
|
return (fileResult: StayExportFileResult.NoData, exportDetails: null);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert to JSON.
|
||||||
|
await JsonSerializer.SerializeAsync(dataStream, stayList);
|
||||||
|
|
||||||
|
List<string> exportDetails = [.. stayList.Where(s => s.Id != null).Select(s => s.Id?.ToString() ?? "")];
|
||||||
|
string details = JsonSerializer.Serialize(exportDetails);
|
||||||
|
return (fileResult: StayExportFileResult.OK, exportDetails: details);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,411 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Xml.Serialization;
|
||||||
|
using FluentValidation;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
using Somnia.GuestLog.Enums.Models;
|
||||||
|
using Somnia.GuestLog.Models.Configuration;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
using Somnia.GuestLog.Services.SpainCodigoMunicipio;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.StayExport;
|
||||||
|
|
||||||
|
public class StayExportProviderSpainParteViajeros(
|
||||||
|
ILogger<StayExportProviderSpainParteViajeros> logger,
|
||||||
|
ISpainCodigoMunicipioService codigoMunicipioService,
|
||||||
|
IOptions<StayExportSpainParteViajerosConfig> configOptions
|
||||||
|
) : IStayExportFormatProvider
|
||||||
|
{
|
||||||
|
private const string fileExtension = "xml";
|
||||||
|
|
||||||
|
private const string ExportDetailsResult_Error = "Error";
|
||||||
|
private const string ExportDetailsResult_Ok = "Ok";
|
||||||
|
|
||||||
|
private const string PersonRole = "VI";
|
||||||
|
private const string PersonRelation = "OT";
|
||||||
|
|
||||||
|
private const string PersonTipoDoc_NIF = "NIF";
|
||||||
|
private const string PersonTipoDoc_NIE = "NIE";
|
||||||
|
private const string PersonTipoDoc_PAS = "PAS";
|
||||||
|
private const string PersonTipoDoc_OTRO = "OTRO";
|
||||||
|
|
||||||
|
private const string PersonDireccionPais_ESP = "ESP";
|
||||||
|
|
||||||
|
private const string XmlNamespace_Peticion = "http://www.neg.hospedajes.mir.es/altaParteHospedaje";
|
||||||
|
|
||||||
|
private readonly StayExportSpainParteViajerosConfig config = configOptions.Value;
|
||||||
|
|
||||||
|
|
||||||
|
public StayExportFormat GetFormat() => StayExportFormat.SpainParteViajeros;
|
||||||
|
public string GetFilename(DateTime exportTime)
|
||||||
|
=> $"{Enum.GetName(GetFormat())}_{exportTime.ToFileTimeUtc()}.{fileExtension}";
|
||||||
|
|
||||||
|
public async Task<(StayExportFileResult fileResult, string? exportDetails)> ExportDataAsync(IEnumerable<StayEntryDTO> stayList, Stream dataStream)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(config.CodigoEstablecimiento))
|
||||||
|
{
|
||||||
|
logger.LogError("StayExportProviderSpainParteViajeros - Config error: CodigoEstablecimiento is not configured!");
|
||||||
|
return (fileResult: StayExportFileResult.ExportError, exportDetails: null);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!stayList.Any())
|
||||||
|
{
|
||||||
|
return (fileResult: StayExportFileResult.NoData, exportDetails: null);
|
||||||
|
}
|
||||||
|
|
||||||
|
List<StayExportDetails> stayExportDetails = [];
|
||||||
|
ComunicacionValidator comunicacionValidator = new();
|
||||||
|
|
||||||
|
List<Comunicacion> comunicacionsList = [];
|
||||||
|
foreach (StayEntryDTO stay in stayList)
|
||||||
|
{
|
||||||
|
(Comunicacion? comunicacion, string errorMsg) = await GetComunicacionFromStay(stay);
|
||||||
|
if (comunicacion == null)
|
||||||
|
{
|
||||||
|
logger.LogWarning("StayExportProviderSpainParteViajeros - Stay (ID: {id}) can't be exported: Error: {code}", stay.Id, errorMsg);
|
||||||
|
stayExportDetails.Add(new(StayId: stay.Id ?? -1, ExportResult: ExportDetailsResult_Error, Details: errorMsg));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var errors = comunicacionValidator.Validate(comunicacion);
|
||||||
|
if (!errors.IsValid)
|
||||||
|
{
|
||||||
|
logger.LogWarning("StayExportProviderSpainParteViajeros - Stay (ID: {id}) is invalid: Errors: {errors}", stay.Id, errors.Errors);
|
||||||
|
stayExportDetails.Add(new(StayId: stay.Id ?? -1, ExportResult: ExportDetailsResult_Error, Details: errors.ToString()));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
comunicacionsList.Add(comunicacion);
|
||||||
|
logger.LogInformation("StayExportProviderSpainParteViajeros - Stay (ID: {id}) Exported OK", stay.Id);
|
||||||
|
stayExportDetails.Add(new(StayId: stay.Id ?? -1, ExportResult: ExportDetailsResult_Ok, Details: null));
|
||||||
|
}
|
||||||
|
|
||||||
|
Peticion peticion = new()
|
||||||
|
{
|
||||||
|
solicitud = new()
|
||||||
|
{
|
||||||
|
codigoEstablecimiento = config.CodigoEstablecimiento,
|
||||||
|
comunicacion = comunicacionsList,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
XmlSerializer serializer = new(typeof(Peticion));
|
||||||
|
serializer.Serialize(dataStream, peticion);
|
||||||
|
|
||||||
|
string details = JsonSerializer.Serialize(stayExportDetails);
|
||||||
|
return (fileResult: StayExportFileResult.OK, exportDetails: details);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Internal Methods
|
||||||
|
|
||||||
|
private async Task<(Comunicacion? comunicacion, string errorMsg)> GetComunicacionFromStay(StayEntryDTO stay)
|
||||||
|
{
|
||||||
|
Debug.Assert(stay.Id != null
|
||||||
|
&& stay.DateIn != null
|
||||||
|
&& stay.DateOut != null
|
||||||
|
&& stay.GuestDocuments != null
|
||||||
|
);
|
||||||
|
|
||||||
|
//Call Fn to validate Stay.
|
||||||
|
|
||||||
|
Contrato contrato = new()
|
||||||
|
{
|
||||||
|
referencia = stay.Id.Value.ToString(),
|
||||||
|
fechaContrato = stay.DateIn.Value.Date,
|
||||||
|
fechaEntrada = stay.DateIn.Value,
|
||||||
|
fechaSalida = stay.DateOut.Value,
|
||||||
|
internet = config.InternetAvailable,
|
||||||
|
numHabitaciones = stay.RoomCount ?? -1,
|
||||||
|
numPersonas = stay.GuestDocuments.Count,
|
||||||
|
pago = new()
|
||||||
|
{
|
||||||
|
tipoPago = GetTipoPagoFromStay(stay)!
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
List<Persona> personasList = [];
|
||||||
|
foreach (GuestDocumentDTO doc in stay.GuestDocuments)
|
||||||
|
{
|
||||||
|
Direccion dir = new()
|
||||||
|
{
|
||||||
|
direccion = doc.Address!,
|
||||||
|
codigoPostal = doc.ZipCode!,
|
||||||
|
pais = doc.AddressCountry!,
|
||||||
|
};
|
||||||
|
|
||||||
|
//Get Municipio given current country.
|
||||||
|
if (doc.AddressCountry != PersonDireccionPais_ESP)
|
||||||
|
{
|
||||||
|
List<string?> addressParts = [doc.AddressCity, doc.AddressProvince, doc.AddressState];
|
||||||
|
dir.nombreMunicipio = string.Join(", ", addressParts.Where(p => !string.IsNullOrEmpty(p)));
|
||||||
|
}
|
||||||
|
if (doc.AddressCountry == PersonDireccionPais_ESP)
|
||||||
|
{
|
||||||
|
dir.codigoMunicipio = await GetMunicipioFromGuestAddressAsync(doc);
|
||||||
|
if (dir.codigoMunicipio == null)
|
||||||
|
{
|
||||||
|
return (
|
||||||
|
comunicacion: null,
|
||||||
|
errorMsg: "Can't get codigo municio"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Persona persona = new()
|
||||||
|
{
|
||||||
|
rol = PersonRole,
|
||||||
|
nombre = doc.Name!,
|
||||||
|
apellido1 = doc.Surname!,
|
||||||
|
apellido2 = doc.Surname2,
|
||||||
|
tipoDocumento = GetTipoDocumentoFromGuest(doc)!,
|
||||||
|
numeroDocumento = doc.DocumentNum!,
|
||||||
|
soporteDocumento = doc.SupportNum,
|
||||||
|
fechaNacimiento = doc.BirthDate?.Date ?? DateTime.MaxValue,
|
||||||
|
nacionalidad = doc.Nationality!,
|
||||||
|
sexo = GetSexoFromGuest(doc)!,
|
||||||
|
telefono = doc.PhoneNumber,
|
||||||
|
correo = doc.EmailAddress,
|
||||||
|
parentesco = PersonRelation,
|
||||||
|
direccion = dir,
|
||||||
|
};
|
||||||
|
personasList.Add(persona);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
comunicacion: new()
|
||||||
|
{
|
||||||
|
contrato = contrato,
|
||||||
|
persona = personasList
|
||||||
|
},
|
||||||
|
errorMsg: "OK");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string? GetTipoDocumentoFromGuest(GuestDocumentDTO doc)
|
||||||
|
{
|
||||||
|
return doc.DocumentType switch
|
||||||
|
{
|
||||||
|
GuestConsts.DocumentType_DNI => PersonTipoDoc_NIF,
|
||||||
|
GuestConsts.DocumentType_NIE => PersonTipoDoc_NIE,
|
||||||
|
GuestConsts.DocumentType_PASSPORT => PersonTipoDoc_PAS,
|
||||||
|
null => null,
|
||||||
|
_ => PersonTipoDoc_OTRO
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string? GetSexoFromGuest(GuestDocumentDTO doc)
|
||||||
|
{
|
||||||
|
return doc.Gender switch
|
||||||
|
{
|
||||||
|
GuestConsts.GenderOptions_MALE => "H",
|
||||||
|
GuestConsts.GenderOptions_FEMALE => "F",
|
||||||
|
null => null,
|
||||||
|
_ => "O"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string? GetTipoPagoFromStay(StayEntryDTO stay)
|
||||||
|
{
|
||||||
|
return stay.PaymentMethod;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<string?> GetMunicipioFromGuestAddressAsync(GuestDocumentDTO doc)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(doc.AddressCity) || string.IsNullOrEmpty(doc.AddressProvince))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Get codMunicipio from API.
|
||||||
|
return await codigoMunicipioService.GetCodigoMunicipioAsync(doc.AddressCity, doc.AddressProvince);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Validator
|
||||||
|
|
||||||
|
private sealed class ComunicacionValidator : AbstractValidator<Comunicacion>
|
||||||
|
{
|
||||||
|
//TODO: Validate values in list for: Pago.tipoPago, Persona.sexo, Persona.tipoDocumento
|
||||||
|
|
||||||
|
public ComunicacionValidator()
|
||||||
|
{
|
||||||
|
RuleFor(comm => comm.contrato)
|
||||||
|
.NotNull()
|
||||||
|
.ChildRules(contrato =>
|
||||||
|
{
|
||||||
|
contrato.RuleFor(p => p.referencia)
|
||||||
|
.NotEmpty()
|
||||||
|
.MaximumLength(50);
|
||||||
|
|
||||||
|
contrato.RuleFor(p => p.fechaEntrada)
|
||||||
|
.LessThan(p => p.fechaSalida);
|
||||||
|
|
||||||
|
contrato.RuleFor(p => p.fechaSalida)
|
||||||
|
.GreaterThan(p => p.fechaEntrada);
|
||||||
|
|
||||||
|
contrato.RuleFor(p => p.numHabitaciones)
|
||||||
|
.GreaterThanOrEqualTo(0);
|
||||||
|
|
||||||
|
//BLOQUE PAGO
|
||||||
|
contrato.RuleFor(p => p.pago)
|
||||||
|
.ChildRules(e =>
|
||||||
|
{
|
||||||
|
e.RuleFor(p => p.tipoPago)
|
||||||
|
.NotEmpty();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
RuleForEach(comm => comm.persona)
|
||||||
|
.ChildRules(person =>
|
||||||
|
{
|
||||||
|
person.RuleFor(p => p.rol)
|
||||||
|
.Equal(PersonRole);
|
||||||
|
person.RuleFor(p => p.nombre)
|
||||||
|
.NotEmpty()
|
||||||
|
.MaximumLength(50);
|
||||||
|
person.RuleFor(p => p.apellido1)
|
||||||
|
.NotEmpty()
|
||||||
|
.MaximumLength(50);
|
||||||
|
person.RuleFor(p => p.apellido2)
|
||||||
|
.MaximumLength(50);
|
||||||
|
person.RuleFor(p => p.tipoDocumento)
|
||||||
|
.NotEmpty()
|
||||||
|
.MaximumLength(5);
|
||||||
|
person.RuleFor(p => p.numeroDocumento)
|
||||||
|
.NotEmpty()
|
||||||
|
.MaximumLength(15);
|
||||||
|
person.RuleFor(p => p.soporteDocumento)
|
||||||
|
.NotEmpty()
|
||||||
|
.When(p => p.tipoDocumento == PersonTipoDoc_NIF || p.tipoDocumento == PersonTipoDoc_NIE);
|
||||||
|
person.RuleFor(p => p.fechaNacimiento)
|
||||||
|
.NotEmpty();
|
||||||
|
person.RuleFor(p => p.sexo)
|
||||||
|
.MaximumLength(1);
|
||||||
|
person.RuleFor(p => p.telefono)
|
||||||
|
.MaximumLength(20);
|
||||||
|
person.RuleFor(p => p.correo)
|
||||||
|
.MaximumLength(250);
|
||||||
|
|
||||||
|
person.RuleFor(p => p.direccion)
|
||||||
|
.ChildRules(d =>
|
||||||
|
{
|
||||||
|
d.RuleFor(p => p.direccion)
|
||||||
|
.NotEmpty()
|
||||||
|
.MaximumLength(100);
|
||||||
|
d.RuleFor(p => p.codigoMunicipio)
|
||||||
|
.NotEmpty()
|
||||||
|
.When(p => p.pais == PersonDireccionPais_ESP)
|
||||||
|
.MaximumLength(5);
|
||||||
|
d.RuleFor(p => p.nombreMunicipio)
|
||||||
|
.NotEmpty()
|
||||||
|
.When(p => p.pais != PersonDireccionPais_ESP)
|
||||||
|
.MaximumLength(100);
|
||||||
|
d.RuleFor(p => p.codigoMunicipio)
|
||||||
|
.NotEmpty()
|
||||||
|
.MaximumLength(20);
|
||||||
|
d.RuleFor(p => p.pais)
|
||||||
|
.NotEmpty()
|
||||||
|
.Length(3);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
RuleForEach(comm => comm.persona)
|
||||||
|
.Must(p => !string.IsNullOrEmpty(p.telefono) || !string.IsNullOrEmpty(p.correo))
|
||||||
|
.WithMessage($"It's required to have at least one of the following fields: '{nameof(Persona.telefono)}', '{nameof(Persona.correo)}'");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Export Data Classes
|
||||||
|
|
||||||
|
private record StayExportDetails(long StayId, string ExportResult, string? Details);
|
||||||
|
|
||||||
|
[XmlRoot(ElementName = "peticion", Namespace = XmlNamespace_Peticion)]
|
||||||
|
public class Peticion
|
||||||
|
{
|
||||||
|
public required Solicitud solicitud;
|
||||||
|
}
|
||||||
|
|
||||||
|
[XmlRoot(ElementName = "solicitud")]
|
||||||
|
public class Solicitud
|
||||||
|
{
|
||||||
|
public required string codigoEstablecimiento;
|
||||||
|
public required List<Comunicacion> comunicacion;
|
||||||
|
}
|
||||||
|
|
||||||
|
[XmlRoot(ElementName = "comunicacion")]
|
||||||
|
public class Comunicacion
|
||||||
|
{
|
||||||
|
public required Contrato contrato;
|
||||||
|
public required List<Persona> persona;
|
||||||
|
}
|
||||||
|
|
||||||
|
[XmlRoot(ElementName = "contrato")]
|
||||||
|
public class Contrato
|
||||||
|
{
|
||||||
|
public required string referencia;
|
||||||
|
|
||||||
|
[XmlElement(DataType = "date")]
|
||||||
|
public required DateTime fechaContrato;
|
||||||
|
|
||||||
|
[XmlElement(DataType = "dateTime")]
|
||||||
|
public required DateTime fechaEntrada;
|
||||||
|
|
||||||
|
[XmlElement(DataType = "dateTime")]
|
||||||
|
public required DateTime fechaSalida;
|
||||||
|
|
||||||
|
public required int numPersonas;
|
||||||
|
public int? numHabitaciones;
|
||||||
|
public bool? internet;
|
||||||
|
|
||||||
|
//BLOQUE PAGO
|
||||||
|
public required Pago pago;
|
||||||
|
}
|
||||||
|
|
||||||
|
[XmlRoot(ElementName = "persona")]
|
||||||
|
public class Persona
|
||||||
|
{
|
||||||
|
public required string rol;
|
||||||
|
public required string nombre;
|
||||||
|
public required string apellido1;
|
||||||
|
public string? apellido2;
|
||||||
|
public required string tipoDocumento;
|
||||||
|
public required string numeroDocumento;
|
||||||
|
public string? soporteDocumento;
|
||||||
|
|
||||||
|
[XmlElement(DataType = "date")]
|
||||||
|
public required DateTime fechaNacimiento;
|
||||||
|
public required string nacionalidad;
|
||||||
|
public required string sexo;
|
||||||
|
|
||||||
|
public string? telefono;
|
||||||
|
public string? correo;
|
||||||
|
public required string parentesco;
|
||||||
|
|
||||||
|
// BLOQUE DIRECCION
|
||||||
|
public required Direccion direccion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Pago
|
||||||
|
{
|
||||||
|
public required string tipoPago;
|
||||||
|
|
||||||
|
// [XmlElement(DataType = "date")]
|
||||||
|
// public required DateTime fechaPago;
|
||||||
|
public string? medioPago;
|
||||||
|
public string? titular;
|
||||||
|
public string? caducidadTarjeta;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Direccion
|
||||||
|
{
|
||||||
|
public required string direccion;
|
||||||
|
public string? codigoMunicipio;
|
||||||
|
public string? nombreMunicipio;
|
||||||
|
public required string codigoPostal;
|
||||||
|
public required string pais;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
@@ -0,0 +1,247 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
using FluentStorage;
|
||||||
|
using FluentStorage.Storage;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
using Somnia.GuestLog.Enums.Models;
|
||||||
|
using Somnia.GuestLog.Enums.Services;
|
||||||
|
using Somnia.GuestLog.Models.Configuration;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
using Somnia.GuestLog.Models.QueryConfigs;
|
||||||
|
using Somnia.GuestLog.Services.Entity;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services.StayExport;
|
||||||
|
|
||||||
|
public class StayExportService(
|
||||||
|
ILogger<StayExportProviderJson> logger,
|
||||||
|
IOptions<StayExportConfig> exportConfig,
|
||||||
|
IStayExportFileEntityService stayExportEntityService,
|
||||||
|
IStayEntryEntityService stayEntityService,
|
||||||
|
IStayExportFormatProviderFactory providerFactory
|
||||||
|
) : IStayExportService
|
||||||
|
{
|
||||||
|
|
||||||
|
private static readonly StayEntryQueryConfig queryConfig =
|
||||||
|
new(IncludeGuests: true, UseSplitQueries: true, DisableTracking: true);
|
||||||
|
private readonly StayExportConfig config = exportConfig.Value;
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<Result<StayExportFileDTO>> ExportStaysByParamsAsync(StayExportFormat format, StayExportParamsDTO exportParams)
|
||||||
|
{
|
||||||
|
//Get data to export.
|
||||||
|
IEnumerable<StayEntryDTO>? stayList;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
stayList = await GetStaysToExportByParamsAsync(exportParams);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "JsonStayExportService - ExportStaysByParams: Error retriving stays to export!");
|
||||||
|
return Result<StayExportFileDTO>.Fail(ResultCode.UnknownError);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Create initial StayExportFile
|
||||||
|
DateTime exportTime = DateTime.UtcNow;
|
||||||
|
StayExportFileDTO stayExport = new()
|
||||||
|
{
|
||||||
|
ExportFormat = format,
|
||||||
|
ExportParams = exportParams,
|
||||||
|
ExportTime = exportTime,
|
||||||
|
};
|
||||||
|
|
||||||
|
//Export data.
|
||||||
|
using Stream exportedDataStream = new MemoryStream();
|
||||||
|
|
||||||
|
//Generate data to export.
|
||||||
|
StayExportFileResult exportResult;
|
||||||
|
string? exportFilename = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
//Create Format provider and export data to stream.
|
||||||
|
var provider = providerFactory.GetProvider(format);
|
||||||
|
(exportResult, stayExport.ExportDetails) = await provider.ExportDataAsync(stayList, exportedDataStream);
|
||||||
|
|
||||||
|
// "Rewind" stream so it can be read from the begining when uploading.
|
||||||
|
exportedDataStream.Seek(0, SeekOrigin.Begin);
|
||||||
|
|
||||||
|
exportFilename = provider.GetFilename(exportTime);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "JsonStayExportService - ExportStaysByParams: Error exporting data!");
|
||||||
|
exportResult = StayExportFileResult.ExportError;
|
||||||
|
}
|
||||||
|
|
||||||
|
//If data exported OK, save to file.
|
||||||
|
if (exportResult == StayExportFileResult.OK)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Debug.Assert(exportFilename != null);
|
||||||
|
|
||||||
|
string exportPathSubdir = "";
|
||||||
|
if (config.UseSubdirectoryByFormat)
|
||||||
|
{
|
||||||
|
exportPathSubdir = Enum.GetName(format) ?? "";
|
||||||
|
}
|
||||||
|
string exportPath = Path.Combine(exportPathSubdir, exportFilename);
|
||||||
|
|
||||||
|
//Store data.
|
||||||
|
using IStore exportStore = GetExportStore();
|
||||||
|
await exportStore.SetObject(objectPath: exportPath, dataStream: exportedDataStream);
|
||||||
|
|
||||||
|
//Update path in item.
|
||||||
|
stayExport.ExportedPath = exportPath;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "JsonStayExportService - ExportStaysByParams: Error Uploading exported data!");
|
||||||
|
exportResult = StayExportFileResult.UploadError;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Store StayExport in DB.
|
||||||
|
stayExport.ExportResult = exportResult;
|
||||||
|
Result? createResult = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
createResult = await stayExportEntityService.CreateStayExportAsync(stayExport);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "JsonStayExportService - ExportStaysByParams: Error storing StayExportFile entity to DB: {stayExport}", stayExport);
|
||||||
|
}
|
||||||
|
|
||||||
|
//If everything is OK, return OK.
|
||||||
|
if (createResult != null && createResult.ResultCode == ResultCode.Ok)
|
||||||
|
{
|
||||||
|
return Result<StayExportFileDTO>.Ok(stayExport);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Saving export to DB failed. Delete exported file (if exported)
|
||||||
|
if (!string.IsNullOrEmpty(stayExport.ExportedPath))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using IStore exportStore = GetExportStore();
|
||||||
|
await exportStore.DeleteObject(objectPath: stayExport.ExportedPath);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "JsonStayExportService - ExportStaysByParams: Error deleting exported file after db saving error: {exportedPath}", stayExport.ExportedPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.LogError(
|
||||||
|
"JsonStayExportService - ExportStaysByDateIn: Error (code '{code}') storing StayExportFile entity to DB: {stayExport}",
|
||||||
|
createResult?.ResultCode, stayExport);
|
||||||
|
return Result<StayExportFileDTO>.Fail(ResultCode.UnknownError);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<Result> GetExportedFileAsync(StayExportFileDTO item, Stream dataStream)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(item.ExportedPath))
|
||||||
|
{
|
||||||
|
logger.LogWarning("Trying to get exported file without path!! Exported file can't be loaded!");
|
||||||
|
return Result.Fail(ResultCode.NotFound);
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
IStore store = GetExportStore();
|
||||||
|
await store.GetObject(item.ExportedPath, dataStream);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Error getting exported file '{id}' from path '{path}'", item.Id, item.ExportedPath);
|
||||||
|
return Result.FailUnknownError();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Result.Ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Result> DeleteExportedFileAsync(StayExportFileDTO item)
|
||||||
|
{
|
||||||
|
//Try to delete existing file.
|
||||||
|
if (!string.IsNullOrEmpty(item.ExportedPath))
|
||||||
|
{
|
||||||
|
bool fileDeletedFromStore = await DeleteExportFileFromStoreAsync(item);
|
||||||
|
if (!fileDeletedFromStore)
|
||||||
|
{
|
||||||
|
return Result.Fail(ResultCode.FileStorageError);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Delete entry from DB.
|
||||||
|
Result deleteResult = await stayExportEntityService.DeleteStayExportAsync(item);
|
||||||
|
if (!deleteResult.IsSuccess)
|
||||||
|
{
|
||||||
|
return Result.Fail(deleteResult.ResultCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Result.Ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#region Internal Methods
|
||||||
|
|
||||||
|
private async Task<IEnumerable<StayEntryDTO>> GetStaysToExportByParamsAsync(StayExportParamsDTO exportParams)
|
||||||
|
{
|
||||||
|
//Todo - Improve type selection (when there are more types).
|
||||||
|
if (exportParams.ExportType == StayExportParamType.PeriodDateIn)
|
||||||
|
{
|
||||||
|
if (exportParams.ExportPeriodStart == null || exportParams.ExportPeriodEnd == null)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException($"StayExportFile - ExportType {exportParams.ExportType} require date start/end. Null dates found");
|
||||||
|
}
|
||||||
|
|
||||||
|
//Get Stays in period.
|
||||||
|
StayEntryFilterDTO filter = new()
|
||||||
|
{
|
||||||
|
DateInStart = exportParams.ExportPeriodStart,
|
||||||
|
DateInEnd = exportParams.ExportPeriodEnd
|
||||||
|
};
|
||||||
|
return await stayEntityService.GetDtoListByFilterAsync(filter, limit: 0, queryConfig: queryConfig);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new InvalidOperationException($"StayExportFile - Error getting stays using params: export type invalid: {exportParams.ExportType}");
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<bool> DeleteExportFileFromStoreAsync(StayExportFileDTO item)
|
||||||
|
{
|
||||||
|
Debug.Assert(!string.IsNullOrEmpty(item.ExportedPath));
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
IStore store = GetExportStore();
|
||||||
|
bool objectExist = await store.ObjectExists(item.ExportedPath);
|
||||||
|
if (!objectExist)
|
||||||
|
{
|
||||||
|
logger.LogWarning("StayExportService - File for item {id} not found in store! Skip delete!", item.Id);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
await store.DeleteObject(item.ExportedPath);
|
||||||
|
logger.LogInformation("StayExportService - File for item {id} deleted from path {path}", item.Id, item.ExportedPath);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "StayExportService - Error deleting export file of item {id}", item.Id);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private IStore GetExportStore()
|
||||||
|
{
|
||||||
|
string? storageConnString = config.ExportStorageConnectionString;
|
||||||
|
if (string.IsNullOrEmpty(storageConnString))
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("No Stay Export Storage configured. Stays can't be exported");
|
||||||
|
}
|
||||||
|
|
||||||
|
return StorageFactory.FromConnectionString(storageConnString);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
using MudBlazor;
|
||||||
|
using Somnia.GuestLog.Enums.Services;
|
||||||
|
using Somnia.GuestLog.Enums.UI;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
using IResult = Somnia.GuestLog.Models.DTOs.IResult;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Services;
|
||||||
|
|
||||||
|
public class UserMessageService(
|
||||||
|
ILocalizerService Localizer,
|
||||||
|
ISnackbar snackbar
|
||||||
|
) : IUserMessageService
|
||||||
|
{
|
||||||
|
public void ShowMessage(string text, MessageKind kind, params object[] parameters)
|
||||||
|
{
|
||||||
|
string formatedMsg = GetFormatedMessage(text, parameters);
|
||||||
|
ShowSnackbar(formatedMsg, kind);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void ShowResult(IResult resultDto)
|
||||||
|
{
|
||||||
|
ShowResultWithMessage(resultDto, message: null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ShowResultWithMessage(IResult resultDto, string? message)
|
||||||
|
{
|
||||||
|
string resultMsg = GetMsgForResultCode(resultDto.ResultCode);
|
||||||
|
resultMsg = GetFormatedMessage(resultMsg, resultDto.Context);
|
||||||
|
|
||||||
|
string finalMsg = message is not null ? $"{message.Trim().TrimEnd(':')}: {resultMsg}" : resultMsg;
|
||||||
|
|
||||||
|
//Show success when OK, error for UnknownErrors and warning otherwise.
|
||||||
|
MessageKind kind = resultDto switch
|
||||||
|
{
|
||||||
|
{ IsSuccess: true } => MessageKind.Success,
|
||||||
|
{ ResultCode: ResultCode.UnknownError } => MessageKind.Error,
|
||||||
|
_ => MessageKind.Warning
|
||||||
|
};
|
||||||
|
|
||||||
|
ShowSnackbar(finalMsg, kind);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#region Internal Methods
|
||||||
|
|
||||||
|
private void ShowSnackbar(string msg, MessageKind kind)
|
||||||
|
{
|
||||||
|
snackbar.Add(message: msg, severity: GetSnackbarSeveryForMessageKind(kind));
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetMsgForResultCode(ResultCode resultCode)
|
||||||
|
{
|
||||||
|
return Localizer.GetEnumValue(resultCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetFormatedMessage(string template, params object[]? parameters)
|
||||||
|
{
|
||||||
|
if (parameters is null || parameters.Length == 0)
|
||||||
|
{
|
||||||
|
return template;
|
||||||
|
}
|
||||||
|
|
||||||
|
return string.Format(template, parameters);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static MudBlazor.Severity GetSnackbarSeveryForMessageKind(MessageKind kind) => kind switch
|
||||||
|
{
|
||||||
|
MessageKind.Info => MudBlazor.Severity.Info,
|
||||||
|
MessageKind.Warning => MudBlazor.Severity.Warning,
|
||||||
|
MessageKind.Error => MudBlazor.Severity.Error,
|
||||||
|
MessageKind.Success => MudBlazor.Severity.Success,
|
||||||
|
MessageKind.Normal => MudBlazor.Severity.Normal,
|
||||||
|
_ => throw new ArgumentOutOfRangeException(nameof(kind), $"Not expected MessageKind value: {kind}")
|
||||||
|
};
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
@@ -8,6 +8,8 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="FluentStorage" />
|
||||||
|
<PackageReference Include="FluentStorage.AWS" />
|
||||||
<PackageReference Include="FluentValidation" />
|
<PackageReference Include="FluentValidation" />
|
||||||
<PackageReference Include="MudBlazor" />
|
<PackageReference Include="MudBlazor" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -24,6 +26,7 @@
|
|||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
|
||||||
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" />
|
||||||
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
|
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,282 @@
|
|||||||
|
namespace Somnia.GuestLog.Utils;
|
||||||
|
|
||||||
|
public static class CountryCodesUtils
|
||||||
|
{
|
||||||
|
// Returns null when input is invalid/unknown.
|
||||||
|
public static string? Alpha2ToAlpha3(string? alpha2)
|
||||||
|
{
|
||||||
|
if (alpha2 is null) return null;
|
||||||
|
|
||||||
|
// Common normalization: trim + uppercase.
|
||||||
|
// Avoids issues with "us", " US ", etc.
|
||||||
|
var key = alpha2.Trim().ToUpperInvariant();
|
||||||
|
|
||||||
|
if (key.Length != 2) return null;
|
||||||
|
|
||||||
|
return Alpha2ToAlpha3Dict.TryGetValue(key, out var alpha3) ? alpha3 : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Throwing for invalid/unknown codes
|
||||||
|
public static string Alpha2ToAlpha3OrThrow(string alpha2)
|
||||||
|
{
|
||||||
|
var result = Alpha2ToAlpha3(alpha2)
|
||||||
|
?? throw new ArgumentException("Unknown or invalid ISO 3166-1 alpha2 code.", nameof(alpha2));
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build-time constant lookup.
|
||||||
|
// Keys are ISO 3166-1 alpha-2 codes (uppercase).
|
||||||
|
private static readonly Dictionary<string, string> Alpha2ToAlpha3Dict =
|
||||||
|
new(StringComparer.Ordinal)
|
||||||
|
{
|
||||||
|
["AF"] = "AFG",
|
||||||
|
["AX"] = "ALA",
|
||||||
|
["AL"] = "ALB",
|
||||||
|
["DZ"] = "DZA",
|
||||||
|
["AS"] = "ASM",
|
||||||
|
["AD"] = "AND",
|
||||||
|
["AO"] = "AGO",
|
||||||
|
["AI"] = "AIA",
|
||||||
|
["AQ"] = "ATA",
|
||||||
|
["AG"] = "ATG",
|
||||||
|
["AR"] = "ARG",
|
||||||
|
["AM"] = "ARM",
|
||||||
|
["AW"] = "ABW",
|
||||||
|
["AU"] = "AUS",
|
||||||
|
["AT"] = "AUT",
|
||||||
|
["AZ"] = "AZE",
|
||||||
|
["BS"] = "BHS",
|
||||||
|
["BH"] = "BHR",
|
||||||
|
["BD"] = "BGD",
|
||||||
|
["BB"] = "BRB",
|
||||||
|
["BY"] = "BLR",
|
||||||
|
["BE"] = "BEL",
|
||||||
|
["BZ"] = "BLZ",
|
||||||
|
["BJ"] = "BEN",
|
||||||
|
["BM"] = "BMU",
|
||||||
|
["BT"] = "BTN",
|
||||||
|
["BO"] = "BOL",
|
||||||
|
["BQ"] = "BES",
|
||||||
|
["BA"] = "BIH",
|
||||||
|
["BW"] = "BWA",
|
||||||
|
["BV"] = "BVT",
|
||||||
|
["BR"] = "BRA",
|
||||||
|
["IO"] = "IOT",
|
||||||
|
["BN"] = "BRN",
|
||||||
|
["BG"] = "BGR",
|
||||||
|
["BF"] = "BFA",
|
||||||
|
["BI"] = "BDI",
|
||||||
|
["CV"] = "CPV",
|
||||||
|
["KH"] = "KHM",
|
||||||
|
["CM"] = "CMR",
|
||||||
|
["CA"] = "CAN",
|
||||||
|
["KY"] = "CYM",
|
||||||
|
["CF"] = "CAF",
|
||||||
|
["TD"] = "TCD",
|
||||||
|
["CL"] = "CHL",
|
||||||
|
["CN"] = "CHN",
|
||||||
|
["CX"] = "CXR",
|
||||||
|
["CC"] = "CCK",
|
||||||
|
["CO"] = "COL",
|
||||||
|
["KM"] = "COM",
|
||||||
|
["CG"] = "COG",
|
||||||
|
["CD"] = "COD",
|
||||||
|
["CK"] = "COK",
|
||||||
|
["CR"] = "CRI",
|
||||||
|
["CI"] = "CIV",
|
||||||
|
["HR"] = "HRV",
|
||||||
|
["CU"] = "CUB",
|
||||||
|
["CW"] = "CUW",
|
||||||
|
["CY"] = "CYP",
|
||||||
|
["CZ"] = "CZE",
|
||||||
|
["DK"] = "DNK",
|
||||||
|
["DJ"] = "DJI",
|
||||||
|
["DM"] = "DMA",
|
||||||
|
["DO"] = "DOM",
|
||||||
|
["EC"] = "ECU",
|
||||||
|
["EG"] = "EGY",
|
||||||
|
["SV"] = "SLV",
|
||||||
|
["GQ"] = "GNQ",
|
||||||
|
["ER"] = "ERI",
|
||||||
|
["EE"] = "EST",
|
||||||
|
["SZ"] = "SWZ",
|
||||||
|
["ET"] = "ETH",
|
||||||
|
["FK"] = "FLK",
|
||||||
|
["FO"] = "FRO",
|
||||||
|
["FJ"] = "FJI",
|
||||||
|
["FI"] = "FIN",
|
||||||
|
["FR"] = "FRA",
|
||||||
|
["GF"] = "GUF",
|
||||||
|
["PF"] = "PYF",
|
||||||
|
["TF"] = "ATF",
|
||||||
|
["GA"] = "GAB",
|
||||||
|
["GM"] = "GMB",
|
||||||
|
["GE"] = "GEO",
|
||||||
|
["DE"] = "DEU",
|
||||||
|
["GH"] = "GHA",
|
||||||
|
["GI"] = "GIB",
|
||||||
|
["GR"] = "GRC",
|
||||||
|
["GL"] = "GRL",
|
||||||
|
["GD"] = "GRD",
|
||||||
|
["GP"] = "GLP",
|
||||||
|
["GU"] = "GUM",
|
||||||
|
["GT"] = "GTM",
|
||||||
|
["GG"] = "GGY",
|
||||||
|
["GN"] = "GIN",
|
||||||
|
["GW"] = "GNB",
|
||||||
|
["GY"] = "GUY",
|
||||||
|
["HT"] = "HTI",
|
||||||
|
["HM"] = "HMD",
|
||||||
|
["VA"] = "VAT",
|
||||||
|
["HN"] = "HND",
|
||||||
|
["HK"] = "HKG",
|
||||||
|
["HU"] = "HUN",
|
||||||
|
["IS"] = "ISL",
|
||||||
|
["IN"] = "IND",
|
||||||
|
["ID"] = "IDN",
|
||||||
|
["IR"] = "IRN",
|
||||||
|
["IQ"] = "IRQ",
|
||||||
|
["IE"] = "IRL",
|
||||||
|
["IM"] = "IMN",
|
||||||
|
["IL"] = "ISR",
|
||||||
|
["IT"] = "ITA",
|
||||||
|
["JM"] = "JAM",
|
||||||
|
["JP"] = "JPN",
|
||||||
|
["JE"] = "JEY",
|
||||||
|
["JO"] = "JOR",
|
||||||
|
["KZ"] = "KAZ",
|
||||||
|
["KE"] = "KEN",
|
||||||
|
["KI"] = "KIR",
|
||||||
|
["KP"] = "PRK",
|
||||||
|
["KR"] = "KOR",
|
||||||
|
["KW"] = "KWT",
|
||||||
|
["KG"] = "KGZ",
|
||||||
|
["LA"] = "LAO",
|
||||||
|
["LV"] = "LVA",
|
||||||
|
["LB"] = "LBN",
|
||||||
|
["LS"] = "LSO",
|
||||||
|
["LR"] = "LBR",
|
||||||
|
["LY"] = "LBY",
|
||||||
|
["LI"] = "LIE",
|
||||||
|
["LT"] = "LTU",
|
||||||
|
["LU"] = "LUX",
|
||||||
|
["MO"] = "MAC",
|
||||||
|
["MG"] = "MDG",
|
||||||
|
["MW"] = "MWI",
|
||||||
|
["MY"] = "MYS",
|
||||||
|
["MV"] = "MDV",
|
||||||
|
["ML"] = "MLI",
|
||||||
|
["MT"] = "MLT",
|
||||||
|
["MH"] = "MHL",
|
||||||
|
["MQ"] = "MTQ",
|
||||||
|
["MR"] = "MRT",
|
||||||
|
["MU"] = "MUS",
|
||||||
|
["YT"] = "MYT",
|
||||||
|
["MX"] = "MEX",
|
||||||
|
["FM"] = "FSM",
|
||||||
|
["MD"] = "MDA",
|
||||||
|
["MC"] = "MCO",
|
||||||
|
["MN"] = "MNG",
|
||||||
|
["ME"] = "MNE",
|
||||||
|
["MS"] = "MSR",
|
||||||
|
["MA"] = "MAR",
|
||||||
|
["MZ"] = "MOZ",
|
||||||
|
["MM"] = "MMR",
|
||||||
|
["NA"] = "NAM",
|
||||||
|
["NR"] = "NRU",
|
||||||
|
["NP"] = "NPL",
|
||||||
|
["NL"] = "NLD",
|
||||||
|
["NC"] = "NCL",
|
||||||
|
["NZ"] = "NZL",
|
||||||
|
["NI"] = "NIC",
|
||||||
|
["NE"] = "NER",
|
||||||
|
["NG"] = "NGA",
|
||||||
|
["NU"] = "NIU",
|
||||||
|
["NF"] = "NFK",
|
||||||
|
["MK"] = "MKD",
|
||||||
|
["MP"] = "MNP",
|
||||||
|
["NO"] = "NOR",
|
||||||
|
["OM"] = "OMN",
|
||||||
|
["PK"] = "PAK",
|
||||||
|
["PW"] = "PLW",
|
||||||
|
["PS"] = "PSE",
|
||||||
|
["PA"] = "PAN",
|
||||||
|
["PG"] = "PNG",
|
||||||
|
["PY"] = "PRY",
|
||||||
|
["PE"] = "PER",
|
||||||
|
["PH"] = "PHL",
|
||||||
|
["PN"] = "PCN",
|
||||||
|
["PL"] = "POL",
|
||||||
|
["PT"] = "PRT",
|
||||||
|
["PR"] = "PRI",
|
||||||
|
["QA"] = "QAT",
|
||||||
|
["RE"] = "REU",
|
||||||
|
["RO"] = "ROU",
|
||||||
|
["RU"] = "RUS",
|
||||||
|
["RW"] = "RWA",
|
||||||
|
["BL"] = "BLM",
|
||||||
|
["SH"] = "SHN",
|
||||||
|
["KN"] = "KNA",
|
||||||
|
["LC"] = "LCA",
|
||||||
|
["MF"] = "MAF",
|
||||||
|
["PM"] = "SPM",
|
||||||
|
["VC"] = "VCT",
|
||||||
|
["WS"] = "WSM",
|
||||||
|
["SM"] = "SMR",
|
||||||
|
["ST"] = "STP",
|
||||||
|
["SA"] = "SAU",
|
||||||
|
["SN"] = "SEN",
|
||||||
|
["RS"] = "SRB",
|
||||||
|
["SC"] = "SYC",
|
||||||
|
["SL"] = "SLE",
|
||||||
|
["SG"] = "SGP",
|
||||||
|
["SX"] = "SXM",
|
||||||
|
["SK"] = "SVK",
|
||||||
|
["SI"] = "SVN",
|
||||||
|
["SB"] = "SLB",
|
||||||
|
["SO"] = "SOM",
|
||||||
|
["ZA"] = "ZAF",
|
||||||
|
["GS"] = "SGS",
|
||||||
|
["SS"] = "SSD",
|
||||||
|
["ES"] = "ESP",
|
||||||
|
["LK"] = "LKA",
|
||||||
|
["SD"] = "SDN",
|
||||||
|
["SR"] = "SUR",
|
||||||
|
["SJ"] = "SJM",
|
||||||
|
["SE"] = "SWE",
|
||||||
|
["CH"] = "CHE",
|
||||||
|
["SY"] = "SYR",
|
||||||
|
["TW"] = "TWN",
|
||||||
|
["TJ"] = "TJK",
|
||||||
|
["TZ"] = "TZA",
|
||||||
|
["TH"] = "THA",
|
||||||
|
["TL"] = "TLS",
|
||||||
|
["TG"] = "TGO",
|
||||||
|
["TK"] = "TKL",
|
||||||
|
["TO"] = "TON",
|
||||||
|
["TT"] = "TTO",
|
||||||
|
["TN"] = "TUN",
|
||||||
|
["TR"] = "TUR",
|
||||||
|
["TM"] = "TKM",
|
||||||
|
["TC"] = "TCA",
|
||||||
|
["TV"] = "TUV",
|
||||||
|
["UG"] = "UGA",
|
||||||
|
["UA"] = "UKR",
|
||||||
|
["AE"] = "ARE",
|
||||||
|
["GB"] = "GBR",
|
||||||
|
["US"] = "USA",
|
||||||
|
["UM"] = "UMI",
|
||||||
|
["UY"] = "URY",
|
||||||
|
["UZ"] = "UZB",
|
||||||
|
["VU"] = "VUT",
|
||||||
|
["VE"] = "VEN",
|
||||||
|
["VN"] = "VNM",
|
||||||
|
["VG"] = "VGB",
|
||||||
|
["VI"] = "VIR",
|
||||||
|
["WF"] = "WLF",
|
||||||
|
["EH"] = "ESH",
|
||||||
|
["YE"] = "YEM",
|
||||||
|
["ZM"] = "ZMB",
|
||||||
|
["ZW"] = "ZWE",
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
namespace Somnia.GuestLog.Utils.DI;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Interface for Factories that need to register DI services.
|
||||||
|
/// <br/><see cref="ServiceCollectionExtensions.AddFactoryDI{TFactory, TFactoryImpl}(IServiceCollection)"/>
|
||||||
|
/// </summary>
|
||||||
|
public interface IFactoryDI
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Register required services in the ServiceCollection.
|
||||||
|
/// This method is automaticaly call when the factory is register.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="services"></param>
|
||||||
|
public abstract static void RegisterFactoryItems(IServiceCollection services);
|
||||||
|
}
|
||||||
@@ -8,4 +8,9 @@ public static class QueryExtensions
|
|||||||
{
|
{
|
||||||
return condition ? source.Where(predicate) : source;
|
return condition ? source.Where(predicate) : source;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static IQueryable<T> WithLimit<T>(this IQueryable<T> source, int limit)
|
||||||
|
{
|
||||||
|
return limit > 0 ? source.Take(limit) : source;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
using Somnia.GuestLog.Utils.DI;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Utils;
|
||||||
|
|
||||||
|
public static class ServiceCollectionExtensions
|
||||||
|
{
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Helper for registering factories using IFactoryDI interface.
|
||||||
|
/// Those factories register the required services directly to the service collection.
|
||||||
|
/// This helper ensures all required methods are called.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="TFactory">Factory Interface</typeparam>
|
||||||
|
/// <typeparam name="TFactoryImpl">Factory Implementation</typeparam>
|
||||||
|
public static IServiceCollection AddFactoryDI<TFactory, TFactoryImpl>(this IServiceCollection services)
|
||||||
|
where TFactory : class
|
||||||
|
where TFactoryImpl : class, TFactory, IFactoryDI
|
||||||
|
{
|
||||||
|
services.AddSingleton<TFactory, TFactoryImpl>();
|
||||||
|
TFactoryImpl.RegisterFactoryItems(services);
|
||||||
|
return services;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -8,7 +8,7 @@ namespace Somnia.GuestLog.Validators;
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Validator for GuestDocumentDTO which contains multiple rules and can be shared with the back end API
|
/// Validator for GuestDocumentDTO which contains multiple rules and can be shared with the back end API
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class GuestDocIdDTOValidator : AbstractValidator<GuestDocIdDTO>
|
public class GuestDocIdDTOValidator : ValueValidator<GuestDocIdDTO>
|
||||||
{
|
{
|
||||||
public GuestDocIdDTOValidator(IDataListService dataListService)
|
public GuestDocIdDTOValidator(IDataListService dataListService)
|
||||||
{
|
{
|
||||||
@@ -34,11 +34,4 @@ public class GuestDocIdDTOValidator : AbstractValidator<GuestDocIdDTO>
|
|||||||
.WithMessage("Invalid NIE")
|
.WithMessage("Invalid NIE")
|
||||||
.When(x => x.DocumentType == GuestConsts.DocumentType_NIE);
|
.When(x => x.DocumentType == GuestConsts.DocumentType_NIE);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Func<object, string, Task<IEnumerable<string>>> ValidateValue => async (model, propertyName) =>
|
|
||||||
{
|
|
||||||
var result = await ValidateAsync(ValidationContext<GuestDocIdDTO>.CreateWithOptions((GuestDocIdDTO)model, x =>
|
|
||||||
x.IncludeProperties(propertyName)));
|
|
||||||
return result.IsValid ? [] : result.Errors.Select(e => e.ErrorMessage);
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ namespace Somnia.GuestLog.Validators;
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Validator for GuestDocumentDTO which contains multiple rules and can be shared with the back end API
|
/// Validator for GuestDocumentDTO which contains multiple rules and can be shared with the back end API
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class GuestDocumentDTOValidator : AbstractValidator<GuestDocumentDTO>
|
public class GuestDocumentDTOValidator : ValueValidator<GuestDocumentDTO>
|
||||||
{
|
{
|
||||||
public GuestDocumentDTOValidator(IDataListService dataListService)
|
public GuestDocumentDTOValidator(IDataListService dataListService)
|
||||||
{
|
{
|
||||||
@@ -82,11 +82,4 @@ public class GuestDocumentDTOValidator : AbstractValidator<GuestDocumentDTO>
|
|||||||
// RuleForEach(x => x.OrderDetails)
|
// RuleForEach(x => x.OrderDetails)
|
||||||
// .SetValidator(new OrderDetailsModelFluentValidator());
|
// .SetValidator(new OrderDetailsModelFluentValidator());
|
||||||
}
|
}
|
||||||
|
|
||||||
public Func<object, string, Task<IEnumerable<string>>> ValidateValue => async (model, propertyName) =>
|
|
||||||
{
|
|
||||||
var result = await ValidateAsync(ValidationContext<GuestDocumentDTO>.CreateWithOptions((GuestDocumentDTO)model, x =>
|
|
||||||
x.IncludeProperties(propertyName)));
|
|
||||||
return result.IsValid ? [] : result.Errors.Select(e => e.ErrorMessage);
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
using FluentValidation;
|
||||||
|
using Somnia.GuestLog.Models.DTOs;
|
||||||
|
using Somnia.GuestLog.Services;
|
||||||
|
|
||||||
|
namespace Somnia.GuestLog.Validators;
|
||||||
|
|
||||||
|
public class StayEntryDTOValidator : ValueValidator<StayEntryDTO>
|
||||||
|
{
|
||||||
|
public StayEntryDTOValidator(IDataListService dataListService)
|
||||||
|
{
|
||||||
|
RuleFor(e => e.DateIn)
|
||||||
|
.NotEmpty()
|
||||||
|
.LessThanOrEqualTo(DateTime.Today.AddDays(1).AddSeconds(-1));
|
||||||
|
|
||||||
|
RuleFor(e => e.DateOut)
|
||||||
|
.NotEmpty()
|
||||||
|
.GreaterThan(e => e.DateIn);
|
||||||
|
|
||||||
|
RuleFor(e => e.RoomCount)
|
||||||
|
.NotEmpty()
|
||||||
|
.GreaterThan(0);
|
||||||
|
|
||||||
|
RuleFor(e => e.PaymentMethod)
|
||||||
|
.Cascade(CascadeMode.Stop)
|
||||||
|
.NotEmpty()
|
||||||
|
.Must(val => val != null && dataListService.IsValueInList(GuestConsts.DataList_PaymentMethods, val));
|
||||||
|
|
||||||
|
RuleFor(e => e.GuestDocuments)
|
||||||
|
.NotNull()
|
||||||
|
.NotEmpty();
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user