diff --git a/Directory.Packages.props b/Directory.Packages.props index 045c171..56d31a4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -42,7 +42,7 @@ - + @@ -60,4 +60,4 @@ - + \ No newline at end of file diff --git a/InvoiceReminder.API.UnitTests/Endpoints/InvoiceEndpointsTests.cs b/InvoiceReminder.API.UnitTests/Endpoints/InvoiceEndpointsTests.cs index e67a969..e4cd2bc 100644 --- a/InvoiceReminder.API.UnitTests/Endpoints/InvoiceEndpointsTests.cs +++ b/InvoiceReminder.API.UnitTests/Endpoints/InvoiceEndpointsTests.cs @@ -1,7 +1,7 @@ using InvoiceReminder.API.UnitTests.Factories; -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.Interfaces; using InvoiceReminder.Application.ViewModels; +using InvoiceReminder.Domain.Abstractions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; diff --git a/InvoiceReminder.API.UnitTests/Endpoints/JobScheduleEndPointsTests.cs b/InvoiceReminder.API.UnitTests/Endpoints/JobScheduleEndPointsTests.cs index bec30f5..fb02df3 100644 --- a/InvoiceReminder.API.UnitTests/Endpoints/JobScheduleEndPointsTests.cs +++ b/InvoiceReminder.API.UnitTests/Endpoints/JobScheduleEndPointsTests.cs @@ -1,7 +1,7 @@ using InvoiceReminder.API.UnitTests.Factories; -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.Interfaces; using InvoiceReminder.Application.ViewModels; +using InvoiceReminder.Domain.Abstractions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; diff --git a/InvoiceReminder.API.UnitTests/Endpoints/LoginEndpointTests.cs b/InvoiceReminder.API.UnitTests/Endpoints/LoginEndpointTests.cs index 535b451..88d2752 100644 --- a/InvoiceReminder.API.UnitTests/Endpoints/LoginEndpointTests.cs +++ b/InvoiceReminder.API.UnitTests/Endpoints/LoginEndpointTests.cs @@ -1,11 +1,11 @@ using InvoiceReminder.API.AuthenticationSetup; using InvoiceReminder.API.UnitTests.Factories; -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.Interfaces; using InvoiceReminder.Application.ViewModels; using InvoiceReminder.Authentication.Extensions; using InvoiceReminder.Authentication.Interfaces; using InvoiceReminder.Authentication.Jwt; +using InvoiceReminder.Domain.Abstractions; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; diff --git a/InvoiceReminder.API.UnitTests/Endpoints/ScanEmailDefinitionEndpointsTests.cs b/InvoiceReminder.API.UnitTests/Endpoints/ScanEmailDefinitionEndpointsTests.cs index 2af4ec3..15083de 100644 --- a/InvoiceReminder.API.UnitTests/Endpoints/ScanEmailDefinitionEndpointsTests.cs +++ b/InvoiceReminder.API.UnitTests/Endpoints/ScanEmailDefinitionEndpointsTests.cs @@ -1,7 +1,7 @@ using InvoiceReminder.API.UnitTests.Factories; -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.Interfaces; using InvoiceReminder.Application.ViewModels; +using InvoiceReminder.Domain.Abstractions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; @@ -465,8 +465,8 @@ public async Task GetScanEmailDefinitionBySenderEmailAddressAndUserId_WhenUserIs var request = new HttpRequestMessage(HttpMethod.Get, $"/api/scan_email/{email}/{id}"); request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", "test_token"); - _ = _scanEmailDefinitionAppService.GetBySenderBeneficiaryAsync(Arg.Any(), Arg.Any()) - .ThrowsAsync(new ArgumentException("Service error")); + _ = _scanEmailDefinitionAppService.GetBySenderEmailAddressAsync(Arg.Any(), Arg.Any()) + .ThrowsAsync(); _ = _authorizationService.AuthorizeAsync(Arg.Any(), Arg.Any(), Arg.Any>()) diff --git a/InvoiceReminder.API.UnitTests/Endpoints/UserEndpointsTests.cs b/InvoiceReminder.API.UnitTests/Endpoints/UserEndpointsTests.cs index 6291ff5..690d9a5 100644 --- a/InvoiceReminder.API.UnitTests/Endpoints/UserEndpointsTests.cs +++ b/InvoiceReminder.API.UnitTests/Endpoints/UserEndpointsTests.cs @@ -1,7 +1,7 @@ using InvoiceReminder.API.UnitTests.Factories; -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.Interfaces; using InvoiceReminder.Application.ViewModels; +using InvoiceReminder.Domain.Abstractions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; diff --git a/InvoiceReminder.Application/AppServices/BaseAppService.cs b/InvoiceReminder.Application/AppServices/BaseAppService.cs index 9e0add7..4cd319d 100644 --- a/InvoiceReminder.Application/AppServices/BaseAppService.cs +++ b/InvoiceReminder.Application/AppServices/BaseAppService.cs @@ -1,6 +1,6 @@ -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.Interfaces; using InvoiceReminder.Data.Interfaces; +using InvoiceReminder.Domain.Abstractions; using Mapster; namespace InvoiceReminder.Application.AppServices; diff --git a/InvoiceReminder.Application/AppServices/InvoiceAppService.cs b/InvoiceReminder.Application/AppServices/InvoiceAppService.cs index d6e8fde..881871c 100644 --- a/InvoiceReminder.Application/AppServices/InvoiceAppService.cs +++ b/InvoiceReminder.Application/AppServices/InvoiceAppService.cs @@ -1,7 +1,7 @@ -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.Interfaces; using InvoiceReminder.Application.ViewModels; using InvoiceReminder.Data.Interfaces; +using InvoiceReminder.Domain.Abstractions; using InvoiceReminder.Domain.Entities; using Mapster; diff --git a/InvoiceReminder.Application/AppServices/JobScheduleAppService.cs b/InvoiceReminder.Application/AppServices/JobScheduleAppService.cs index 7a28191..72f507f 100644 --- a/InvoiceReminder.Application/AppServices/JobScheduleAppService.cs +++ b/InvoiceReminder.Application/AppServices/JobScheduleAppService.cs @@ -1,7 +1,7 @@ -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.Interfaces; using InvoiceReminder.Application.ViewModels; using InvoiceReminder.Data.Interfaces; +using InvoiceReminder.Domain.Abstractions; using InvoiceReminder.Domain.Entities; using InvoiceReminder.JobScheduler.HostedService; using Mapster; diff --git a/InvoiceReminder.Application/AppServices/ScanEmailDefinitionAppService.cs b/InvoiceReminder.Application/AppServices/ScanEmailDefinitionAppService.cs index 4359b20..edfcc15 100644 --- a/InvoiceReminder.Application/AppServices/ScanEmailDefinitionAppService.cs +++ b/InvoiceReminder.Application/AppServices/ScanEmailDefinitionAppService.cs @@ -1,7 +1,7 @@ -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.Interfaces; using InvoiceReminder.Application.ViewModels; using InvoiceReminder.Data.Interfaces; +using InvoiceReminder.Domain.Abstractions; using InvoiceReminder.Domain.Entities; using Mapster; diff --git a/InvoiceReminder.Application/AppServices/UserAppService.cs b/InvoiceReminder.Application/AppServices/UserAppService.cs index de864f3..d0fc72e 100644 --- a/InvoiceReminder.Application/AppServices/UserAppService.cs +++ b/InvoiceReminder.Application/AppServices/UserAppService.cs @@ -1,7 +1,7 @@ -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.Interfaces; using InvoiceReminder.Application.ViewModels; using InvoiceReminder.Data.Interfaces; +using InvoiceReminder.Domain.Abstractions; using InvoiceReminder.Domain.Entities; using Mapster; diff --git a/InvoiceReminder.Application/Interfaces/IBaseAppService.cs b/InvoiceReminder.Application/Interfaces/IBaseAppService.cs index 1ed0391..da710d7 100644 --- a/InvoiceReminder.Application/Interfaces/IBaseAppService.cs +++ b/InvoiceReminder.Application/Interfaces/IBaseAppService.cs @@ -1,4 +1,4 @@ -using InvoiceReminder.Application.Abstractions; +using InvoiceReminder.Domain.Abstractions; namespace InvoiceReminder.Application.Interfaces; diff --git a/InvoiceReminder.Application/Interfaces/IInvoiceAppService.cs b/InvoiceReminder.Application/Interfaces/IInvoiceAppService.cs index e178d5d..0856685 100644 --- a/InvoiceReminder.Application/Interfaces/IInvoiceAppService.cs +++ b/InvoiceReminder.Application/Interfaces/IInvoiceAppService.cs @@ -1,5 +1,5 @@ -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.ViewModels; +using InvoiceReminder.Domain.Abstractions; using InvoiceReminder.Domain.Entities; namespace InvoiceReminder.Application.Interfaces; diff --git a/InvoiceReminder.Application/Interfaces/IJobScheduleAppService.cs b/InvoiceReminder.Application/Interfaces/IJobScheduleAppService.cs index e798e29..bd61243 100644 --- a/InvoiceReminder.Application/Interfaces/IJobScheduleAppService.cs +++ b/InvoiceReminder.Application/Interfaces/IJobScheduleAppService.cs @@ -1,5 +1,5 @@ -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.ViewModels; +using InvoiceReminder.Domain.Abstractions; using InvoiceReminder.Domain.Entities; namespace InvoiceReminder.Application.Interfaces; diff --git a/InvoiceReminder.Application/Interfaces/IScanEmailDefinitionAppService.cs b/InvoiceReminder.Application/Interfaces/IScanEmailDefinitionAppService.cs index ec93035..fe9c14e 100644 --- a/InvoiceReminder.Application/Interfaces/IScanEmailDefinitionAppService.cs +++ b/InvoiceReminder.Application/Interfaces/IScanEmailDefinitionAppService.cs @@ -1,5 +1,5 @@ -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.ViewModels; +using InvoiceReminder.Domain.Abstractions; using InvoiceReminder.Domain.Entities; namespace InvoiceReminder.Application.Interfaces; diff --git a/InvoiceReminder.Application/Interfaces/IUserAppService.cs b/InvoiceReminder.Application/Interfaces/IUserAppService.cs index 6efcd25..9c874a8 100644 --- a/InvoiceReminder.Application/Interfaces/IUserAppService.cs +++ b/InvoiceReminder.Application/Interfaces/IUserAppService.cs @@ -1,5 +1,5 @@ -using InvoiceReminder.Application.Abstractions; using InvoiceReminder.Application.ViewModels; +using InvoiceReminder.Domain.Abstractions; using InvoiceReminder.Domain.Entities; namespace InvoiceReminder.Application.Interfaces; diff --git a/InvoiceReminder.Application/Abstractions/Result.cs b/InvoiceReminder.Domain/Abstractions/Result.cs similarity index 90% rename from InvoiceReminder.Application/Abstractions/Result.cs rename to InvoiceReminder.Domain/Abstractions/Result.cs index 9b4c5e5..4c3d7bf 100644 --- a/InvoiceReminder.Application/Abstractions/Result.cs +++ b/InvoiceReminder.Domain/Abstractions/Result.cs @@ -1,4 +1,4 @@ -namespace InvoiceReminder.Application.Abstractions; +namespace InvoiceReminder.Domain.Abstractions; public class Result {