From 81d1eb08a9f54c4782ef2a65d3cc3b8e421b40ab Mon Sep 17 00:00:00 2001 From: Dominik Zarsky Date: Sun, 28 Jan 2024 12:27:28 +0100 Subject: [PATCH] Rename solution and projects --- DZarsky.ToDoAppTemplate.Api/Dockerfile | 27 --------------- .../Email/Settings/EmailConfiguration.cs | 13 -------- .../Email/Settings/SenderType.cs | 7 ---- README.md | 33 +++++++++++++++++++ .../Auth/Endpoints/ChangePasswordEndpoint.cs | 8 ++--- .../Auth/Endpoints/LoginEndpoint.cs | 14 ++++---- .../Auth/Endpoints/RegisterEndpoint.cs | 10 +++--- .../Endpoints/RequestPasswordResetEndpoint.cs | 8 ++--- .../Auth/Endpoints/ResetPasswordEndpoint.cs | 8 ++--- .../Auth/Models/LoginRequest.cs | 2 +- .../Auth/Models/LoginResponse.cs | 2 +- .../Auth/Models/PasswordChangeRequest.cs | 4 +-- .../Auth/Models/PasswordResetRequest.cs | 2 +- .../Auth/Models/RegisterRequest.cs | 2 +- .../Models/RequestPasswordResetRequest.cs | 2 +- .../PasswordChangeRequestValidator.cs | 6 ++-- .../PasswordResetRequestValidator.cs | 6 ++-- .../Validators/RegisterRequestValidator.cs | 6 ++-- .../RequestPasswordResetRequestValidator.cs | 6 ++-- .../Common/Constants/Endpoints.cs | 2 +- .../Common/Models/GetResourceByIdRequest.cs | 2 +- ToDoAppTemplate.Api/Dockerfile | 27 +++++++++++++++ .../ApiConfigurationExtensions.cs | 6 ++-- .../Extensions/EndpointExtensions.cs | 6 ++-- .../Resolvers/StatusCodeResolver.cs | 6 ++-- .../Security/AuthConfiguration.cs | 2 +- .../Infrastructure/Security/TokenGenerator.cs | 4 +-- .../Program.cs | 10 +++--- .../Properties/launchSettings.json | 0 .../ToDoAppTemplate.Api.csproj | 8 ++--- .../Todos/Endpoints/AddToDoEndpoint.cs | 10 +++--- .../Todos/Endpoints/CompleteToDoEndpoint.cs | 10 +++--- .../Todos/Endpoints/DeleteToDoEndpoint.cs | 8 ++--- .../Todos/Endpoints/GetToDosEndpoint.cs | 10 +++--- .../Todos/Endpoints/UpdateToDoEndpoint.cs | 10 +++--- .../Todos/Models/Requests/AddToDoRequest.cs | 4 +-- .../Models/Requests/CompleteToDoRequest.cs | 6 ++-- .../Models/Requests/DeleteToDoRequest.cs | 6 ++-- .../Todos/Models/Requests/GetToDosRequest.cs | 6 ++-- .../Models/Requests/UpdateToDoRequest.cs | 6 ++-- .../Todos/Models/Responses/GetToDoResponse.cs | 6 ++-- .../Models/Responses/GetToDosResponse.cs | 6 ++-- .../Validators/AddToDoRequestValidator.cs | 6 ++-- .../Validators/UpdateToDoRequestValidator.cs | 6 ++-- .../appsettings.Development.json | 0 .../appsettings.json | 0 .../Auth/Commands/ChangePasswordCommand.cs | 16 ++++----- .../Auth/Commands/RegisterUserCommand.cs | 14 ++++---- .../Commands/RequestPasswordResetCommand.cs | 18 +++++----- .../Auth/Commands/ResetPasswordCommand.cs | 14 ++++---- .../Auth/Queries/LoginUserQuery.cs | 6 ++-- .../ApplicationConfigurationExtensions.cs | 6 ++-- .../RequestWithUserIdPipelineBehaviour.cs | 6 ++-- .../ToDoAppTemplate.Application.csproj | 4 +-- .../Todos/Commands/AddToDoCommand.cs | 12 +++---- .../Todos/Commands/CompleteToDoCommand.cs | 12 +++---- .../Todos/Commands/DeleteToDoCommand.cs | 12 +++---- .../Todos/Commands/UpdateToDoCommand.cs | 12 +++---- .../Todos/Queries/GetToDosQuery.cs | 14 ++++---- .../Auth/Models/AuthResult.cs | 2 +- .../Auth/Models/Credentials.cs | 2 +- .../Auth/Services/AuthManager.cs | 10 +++--- .../Communication/Email/IEmailSender.cs | 2 +- .../Email/SendGrid/SendGridEmailSender.cs | 4 +-- .../Settings/SendGridConfiguration.cs | 2 +- .../Email/Settings/EmailConfiguration.cs | 13 ++++++++ .../Email/Settings/SenderType.cs | 7 ++++ .../Email/Smtp/Settings/SmtpConfiguration.cs | 2 +- .../Email/Smtp/SmtpEmailSender.cs | 4 +-- .../CoreConfigurationExtensions.cs | 20 +++++------ .../Security/Models/SecurityConfiguration.cs | 2 +- .../Infrastructure/Security/PasswordHasher.cs | 4 +-- .../Security/PasswordValidator.cs | 2 +- .../Templating/TemplatingService.cs | 2 +- .../Templating/Views/Email/_layout.liquid | 0 .../Templating/Views/Email/_viewstart.liquid | 0 .../Views/Email/password-reset.liquid | 0 .../ToDoAppTemplate.Core.csproj | 2 +- .../Common/Constants/Tables.cs | 2 +- .../Mappings/BaseEntityConfiguration.cs | 4 +-- .../DataConfigurationExtensions.cs | 6 ++-- .../Infrastructure/EF/DataContext.cs | 2 +- .../20240113091057_Initial.Designer.cs | 5 +-- .../Migrations/20240113091057_Initial.cs | 2 +- ...21110228_AddPasswordResetCodes.Designer.cs | 21 ++++++------ .../20240121110228_AddPasswordResetCodes.cs | 2 +- .../Migrations/DataContextModelSnapshot.cs | 20 +++++------ .../ToDoAppTemplate.Data.csproj | 2 +- .../Todos/Mappings/TodoConfiguration.cs | 8 ++--- .../PasswordResetCodeConfiguration.cs | 8 ++--- .../Users/Mappings/UserConfiguration.cs | 8 ++--- .../Common/BaseEntity.cs | 2 +- .../Common/Errors/ErrorDescription.cs | 2 +- .../Common/HttpClients.cs | 2 +- .../Common/IAuthenticatedRequest.cs | 2 +- .../Common/MediatR/IMediatrBaseResult.cs | 6 ++-- .../Common/MediatR/MediatrBaseResult.cs | 6 ++-- .../Common/Requests/PagedRequest.cs | 2 +- .../Common/Results/PagedResponse.cs | 2 +- .../Common/Results/ResultStatus.cs | 2 +- .../ToDoAppTemplate.Domain.csproj | 0 .../Todos/Todo.cs | 6 ++-- .../Users/PasswordResetCode.cs | 4 +-- .../Users/User.cs | 6 ++-- ...ToDoAppTemplate.sln => ToDoAppTemplate.sln | 10 +++--- docker-compose.yml | 14 ++++---- 106 files changed, 378 insertions(+), 343 deletions(-) delete mode 100644 DZarsky.ToDoAppTemplate.Api/Dockerfile delete mode 100644 DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/EmailConfiguration.cs delete mode 100644 DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/SenderType.cs rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Endpoints/ChangePasswordEndpoint.cs (85%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Endpoints/LoginEndpoint.cs (80%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Endpoints/RegisterEndpoint.cs (83%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Endpoints/RequestPasswordResetEndpoint.cs (85%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Endpoints/ResetPasswordEndpoint.cs (85%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Models/LoginRequest.cs (72%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Models/LoginResponse.cs (77%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Models/PasswordChangeRequest.cs (73%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Models/PasswordResetRequest.cs (77%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Models/RegisterRequest.cs (63%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Models/RequestPasswordResetRequest.cs (65%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Validators/PasswordChangeRequestValidator.cs (85%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Validators/PasswordResetRequestValidator.cs (84%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Validators/RegisterRequestValidator.cs (82%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Auth/Validators/RequestPasswordResetRequestValidator.cs (69%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Common/Constants/Endpoints.cs (91%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Common/Models/GetResourceByIdRequest.cs (59%) create mode 100644 ToDoAppTemplate.Api/Dockerfile rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Infrastructure/Configuration/ApiConfigurationExtensions.cs (90%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Infrastructure/Extensions/EndpointExtensions.cs (93%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Infrastructure/Resolvers/StatusCodeResolver.cs (90%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Infrastructure/Security/AuthConfiguration.cs (86%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Infrastructure/Security/TokenGenerator.cs (86%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Program.cs (62%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Properties/launchSettings.json (100%) rename DZarsky.ToDoAppTemplate.Api/DZarsky.ToDoAppTemplate.Api.csproj => ToDoAppTemplate.Api/ToDoAppTemplate.Api.csproj (77%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Endpoints/AddToDoEndpoint.cs (83%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Endpoints/CompleteToDoEndpoint.cs (84%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Endpoints/DeleteToDoEndpoint.cs (85%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Endpoints/GetToDosEndpoint.cs (84%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Endpoints/UpdateToDoEndpoint.cs (85%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Models/Requests/AddToDoRequest.cs (68%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Models/Requests/CompleteToDoRequest.cs (58%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Models/Requests/DeleteToDoRequest.cs (51%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Models/Requests/GetToDosRequest.cs (60%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Models/Requests/UpdateToDoRequest.cs (69%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Models/Responses/GetToDoResponse.cs (78%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Models/Responses/GetToDosResponse.cs (81%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Validators/AddToDoRequestValidator.cs (79%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/Todos/Validators/UpdateToDoRequestValidator.cs (83%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/appsettings.Development.json (100%) rename {DZarsky.ToDoAppTemplate.Api => ToDoAppTemplate.Api}/appsettings.json (100%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Auth/Commands/ChangePasswordCommand.cs (81%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Auth/Commands/RegisterUserCommand.cs (86%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Auth/Commands/RequestPasswordResetCommand.cs (82%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Auth/Commands/ResetPasswordCommand.cs (86%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Auth/Queries/LoginUserQuery.cs (83%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Infrastructure/Configuration/ApplicationConfigurationExtensions.cs (76%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Infrastructure/MediatR/Behaviours/RequestWithUserIdPipelineBehaviour.cs (83%) rename DZarsky.ToDoAppTemplate.Application/DZarsky.ToDoAppTemplate.Application.csproj => ToDoAppTemplate.Application/ToDoAppTemplate.Application.csproj (78%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Todos/Commands/AddToDoCommand.cs (80%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Todos/Commands/CompleteToDoCommand.cs (82%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Todos/Commands/DeleteToDoCommand.cs (79%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Todos/Commands/UpdateToDoCommand.cs (85%) rename {DZarsky.ToDoAppTemplate.Application => ToDoAppTemplate.Application}/Todos/Queries/GetToDosQuery.cs (84%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Auth/Models/AuthResult.cs (84%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Auth/Models/Credentials.cs (54%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Auth/Services/AuthManager.cs (80%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Infrastructure/Communication/Email/IEmailSender.cs (55%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Infrastructure/Communication/Email/SendGrid/SendGridEmailSender.cs (89%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Infrastructure/Communication/Email/SendGrid/Settings/SendGridConfiguration.cs (63%) create mode 100644 ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/EmailConfiguration.cs create mode 100644 ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/SenderType.cs rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Infrastructure/Communication/Email/Smtp/Settings/SmtpConfiguration.cs (74%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Infrastructure/Communication/Email/Smtp/SmtpEmailSender.cs (86%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Infrastructure/Configuration/CoreConfigurationExtensions.cs (82%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Infrastructure/Security/Models/SecurityConfiguration.cs (59%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Infrastructure/Security/PasswordHasher.cs (90%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Infrastructure/Security/PasswordValidator.cs (92%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Templating/TemplatingService.cs (96%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Templating/Views/Email/_layout.liquid (100%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Templating/Views/Email/_viewstart.liquid (100%) rename {DZarsky.ToDoAppTemplate.Core => ToDoAppTemplate.Core}/Templating/Views/Email/password-reset.liquid (100%) rename DZarsky.ToDoAppTemplate.Core/DZarsky.ToDoAppTemplate.Core.csproj => ToDoAppTemplate.Core/ToDoAppTemplate.Core.csproj (94%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Common/Constants/Tables.cs (76%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Common/Mappings/BaseEntityConfiguration.cs (88%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Infrastructure/Configuration/DataConfigurationExtensions.cs (78%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Infrastructure/EF/DataContext.cs (83%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Migrations/20240113091057_Initial.Designer.cs (97%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Migrations/20240113091057_Initial.cs (98%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Migrations/20240121110228_AddPasswordResetCodes.Designer.cs (91%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Migrations/20240121110228_AddPasswordResetCodes.cs (98%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Migrations/DataContextModelSnapshot.cs (91%) rename DZarsky.ToDoAppTemplate.Data/DZarsky.ToDoAppTemplate.Data.csproj => ToDoAppTemplate.Data/ToDoAppTemplate.Data.csproj (83%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Todos/Mappings/TodoConfiguration.cs (68%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Users/Mappings/PasswordResetCodeConfiguration.cs (70%) rename {DZarsky.ToDoAppTemplate.Data => ToDoAppTemplate.Data}/Users/Mappings/UserConfiguration.cs (79%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Common/BaseEntity.cs (80%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Common/Errors/ErrorDescription.cs (56%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Common/HttpClients.cs (63%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Common/IAuthenticatedRequest.cs (60%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Common/MediatR/IMediatrBaseResult.cs (55%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Common/MediatR/MediatrBaseResult.cs (90%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Common/Requests/PagedRequest.cs (74%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Common/Results/PagedResponse.cs (89%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Common/Results/ResultStatus.cs (72%) rename DZarsky.ToDoAppTemplate.Domain/DZarsky.ToDoAppTemplate.Domain.csproj => ToDoAppTemplate.Domain/ToDoAppTemplate.Domain.csproj (100%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Todos/Todo.cs (70%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Users/PasswordResetCode.cs (88%) rename {DZarsky.ToDoAppTemplate.Domain => ToDoAppTemplate.Domain}/Users/User.cs (74%) rename DZarsky.ToDoAppTemplate.sln => ToDoAppTemplate.sln (69%) diff --git a/DZarsky.ToDoAppTemplate.Api/Dockerfile b/DZarsky.ToDoAppTemplate.Api/Dockerfile deleted file mode 100644 index 143722a..0000000 --- a/DZarsky.ToDoAppTemplate.Api/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base -USER $APP_UID -WORKDIR /app -EXPOSE 8080 -EXPOSE 8081 - -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build -ARG BUILD_CONFIGURATION=Release -WORKDIR /src -COPY ["DZarsky.ToDoAppTemplate.Api/DZarsky.ToDoAppTemplate.Api.csproj", "DZarsky.ToDoAppTemplate.Api/"] -COPY ["DZarsky.ToDoAppTemplate.Domain/DZarsky.ToDoAppTemplate.Domain.csproj", "DZarsky.ToDoAppTemplate.Domain/"] -COPY ["DZarsky.ToDoAppTemplate.Application/DZarsky.ToDoAppTemplate.Application.csproj", "DZarsky.ToDoAppTemplate.Application/"] -COPY ["DZarsky.ToDoAppTemplate.Data/DZarsky.ToDoAppTemplate.Data.csproj", "DZarsky.ToDoAppTemplate.Data/"] -COPY ["DZarsky.ToDoAppTemplate.Core/DZarsky.ToDoAppTemplate.Core.csproj", "DZarsky.ToDoAppTemplate.Core/"] -RUN dotnet restore "DZarsky.ToDoAppTemplate.Api/DZarsky.ToDoAppTemplate.Api.csproj" -COPY . . -WORKDIR "/src/DZarsky.ToDoAppTemplate.Api" -RUN dotnet build "DZarsky.ToDoAppTemplate.Api.csproj" -c $BUILD_CONFIGURATION -o /app/build - -FROM build AS publish -ARG BUILD_CONFIGURATION=Release -RUN dotnet publish "DZarsky.ToDoAppTemplate.Api.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "DZarsky.ToDoAppTemplate.Api.dll"] diff --git a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/EmailConfiguration.cs b/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/EmailConfiguration.cs deleted file mode 100644 index 6be9a70..0000000 --- a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/EmailConfiguration.cs +++ /dev/null @@ -1,13 +0,0 @@ -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.SendGrid.Settings; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.Smtp.Settings; - -namespace DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.Settings; - -internal sealed class EmailConfiguration -{ - public SenderType SenderType { get; init; } - - public SmtpConfiguration? Smtp { get; init; } - - public SendGridConfiguration? SendGrid { get; init; } -} diff --git a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/SenderType.cs b/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/SenderType.cs deleted file mode 100644 index ca96459..0000000 --- a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/SenderType.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.Settings; - -public enum SenderType -{ - Smtp, - SendGrid -} diff --git a/README.md b/README.md index 7a64a6b..87f8e02 100644 --- a/README.md +++ b/README.md @@ -1 +1,34 @@ # ToDo app template API + +A template repository for a ToDo app API with .NET8 and PostgreSQL. REPR (FastEndpoints), CQRS (MediatR) and partially Clean Architecture patterns are used. +The API is easily extensible and can be used as a starting point for a new project. + +Functionality: + +- Create, read, update and delete ToDos +- User registration, login, option to reset user's password. Accounts are stored in the database, authentication is done using JWT. +- Email templates and sending emails via Smtp or SendGrid is supported. + +## Prerequisites + +- [.NET 8](https://dotnet.microsoft.com/download/dotnet/8.0) +- [PostgreSQL](https://www.postgresql.org/download/) +- [Dotnet ef](https://docs.microsoft.com/en-us/ef/core/cli/dotnet) +- Optional: [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/) + +## Applying the database migrations + +The database migrations are located in the `ToDoAppTemplate.Data` project. The following commands can be run from the solution root directory: + +```powershell +# Create a new migration +dotnet ef migrations add MigrationName --project ./ToDoAppTemplate.Data --startup-project ./ToDoAppTemplate/Api +# Apply a migration +dotnet ef database update --project ./ToDoAppTemplate.Data --startup-project ./ToDoAppTemplate.Api +``` + +## Running the API + +Either run the API by running `docker-compose up` from the root of the solution. This will start the API and a PostgreSQL database in Docker containers. + +Or run the API from Visual Studio or the command line. The connection string to the database can be configured in the `appsettings.json` file. diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/ChangePasswordEndpoint.cs b/ToDoAppTemplate.Api/Auth/Endpoints/ChangePasswordEndpoint.cs similarity index 85% rename from DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/ChangePasswordEndpoint.cs rename to ToDoAppTemplate.Api/Auth/Endpoints/ChangePasswordEndpoint.cs index c575c76..ceaa724 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/ChangePasswordEndpoint.cs +++ b/ToDoAppTemplate.Api/Auth/Endpoints/ChangePasswordEndpoint.cs @@ -1,10 +1,10 @@ -using DZarsky.ToDoAppTemplate.Api.Auth.Models; -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Extensions; -using DZarsky.ToDoAppTemplate.Application.Auth.Commands; +using ToDoAppTemplate.Api.Infrastructure.Extensions; +using ToDoAppTemplate.Application.Auth.Commands; using FastEndpoints; using MediatR; +using ToDoAppTemplate.Api.Auth.Models; -namespace DZarsky.ToDoAppTemplate.Api.Auth.Endpoints; +namespace ToDoAppTemplate.Api.Auth.Endpoints; public sealed class ChangePasswordEndpoint : Endpoint { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/LoginEndpoint.cs b/ToDoAppTemplate.Api/Auth/Endpoints/LoginEndpoint.cs similarity index 80% rename from DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/LoginEndpoint.cs rename to ToDoAppTemplate.Api/Auth/Endpoints/LoginEndpoint.cs index 5263c2a..0859568 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/LoginEndpoint.cs +++ b/ToDoAppTemplate.Api/Auth/Endpoints/LoginEndpoint.cs @@ -1,13 +1,13 @@ -using DZarsky.ToDoAppTemplate.Api.Auth.Models; -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Extensions; -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Resolvers; -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Security; -using DZarsky.ToDoAppTemplate.Application.Auth.Queries; -using DZarsky.ToDoAppTemplate.Core.Auth.Models; +using ToDoAppTemplate.Api.Infrastructure.Extensions; +using ToDoAppTemplate.Api.Infrastructure.Resolvers; +using ToDoAppTemplate.Application.Auth.Queries; +using ToDoAppTemplate.Core.Auth.Models; using FastEndpoints; using MediatR; +using ToDoAppTemplate.Api.Auth.Models; +using ToDoAppTemplate.Api.Infrastructure.Security; -namespace DZarsky.ToDoAppTemplate.Api.Auth.Endpoints; +namespace ToDoAppTemplate.Api.Auth.Endpoints; public class LoginEndpoint : Endpoint { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/RegisterEndpoint.cs b/ToDoAppTemplate.Api/Auth/Endpoints/RegisterEndpoint.cs similarity index 83% rename from DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/RegisterEndpoint.cs rename to ToDoAppTemplate.Api/Auth/Endpoints/RegisterEndpoint.cs index 7f8f0b9..ea952ca 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/RegisterEndpoint.cs +++ b/ToDoAppTemplate.Api/Auth/Endpoints/RegisterEndpoint.cs @@ -1,11 +1,11 @@ -using DZarsky.ToDoAppTemplate.Api.Auth.Models; -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Extensions; -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Resolvers; -using DZarsky.ToDoAppTemplate.Application.Auth.Commands; +using ToDoAppTemplate.Api.Infrastructure.Extensions; +using ToDoAppTemplate.Api.Infrastructure.Resolvers; +using ToDoAppTemplate.Application.Auth.Commands; using FastEndpoints; using MediatR; +using ToDoAppTemplate.Api.Auth.Models; -namespace DZarsky.ToDoAppTemplate.Api.Auth.Endpoints; +namespace ToDoAppTemplate.Api.Auth.Endpoints; public sealed class RegisterEndpoint : Endpoint { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/RequestPasswordResetEndpoint.cs b/ToDoAppTemplate.Api/Auth/Endpoints/RequestPasswordResetEndpoint.cs similarity index 85% rename from DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/RequestPasswordResetEndpoint.cs rename to ToDoAppTemplate.Api/Auth/Endpoints/RequestPasswordResetEndpoint.cs index 177c6f2..afcf0e7 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/RequestPasswordResetEndpoint.cs +++ b/ToDoAppTemplate.Api/Auth/Endpoints/RequestPasswordResetEndpoint.cs @@ -1,10 +1,10 @@ -using DZarsky.ToDoAppTemplate.Api.Auth.Models; -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Extensions; -using DZarsky.ToDoAppTemplate.Application.Auth.Commands; +using ToDoAppTemplate.Api.Infrastructure.Extensions; +using ToDoAppTemplate.Application.Auth.Commands; using FastEndpoints; using MediatR; +using ToDoAppTemplate.Api.Auth.Models; -namespace DZarsky.ToDoAppTemplate.Api.Auth.Endpoints; +namespace ToDoAppTemplate.Api.Auth.Endpoints; public sealed class RequestPasswordResetEndpoint : Endpoint { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/ResetPasswordEndpoint.cs b/ToDoAppTemplate.Api/Auth/Endpoints/ResetPasswordEndpoint.cs similarity index 85% rename from DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/ResetPasswordEndpoint.cs rename to ToDoAppTemplate.Api/Auth/Endpoints/ResetPasswordEndpoint.cs index 5ec30f8..087c0f0 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Endpoints/ResetPasswordEndpoint.cs +++ b/ToDoAppTemplate.Api/Auth/Endpoints/ResetPasswordEndpoint.cs @@ -1,10 +1,10 @@ -using DZarsky.ToDoAppTemplate.Api.Auth.Models; -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Extensions; -using DZarsky.ToDoAppTemplate.Application.Auth.Commands; +using ToDoAppTemplate.Api.Infrastructure.Extensions; +using ToDoAppTemplate.Application.Auth.Commands; using FastEndpoints; using MediatR; +using ToDoAppTemplate.Api.Auth.Models; -namespace DZarsky.ToDoAppTemplate.Api.Auth.Endpoints; +namespace ToDoAppTemplate.Api.Auth.Endpoints; public sealed class ResetPasswordEndpoint : Endpoint { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Models/LoginRequest.cs b/ToDoAppTemplate.Api/Auth/Models/LoginRequest.cs similarity index 72% rename from DZarsky.ToDoAppTemplate.Api/Auth/Models/LoginRequest.cs rename to ToDoAppTemplate.Api/Auth/Models/LoginRequest.cs index 4717624..726d2a6 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Models/LoginRequest.cs +++ b/ToDoAppTemplate.Api/Auth/Models/LoginRequest.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Api.Auth.Models; +namespace ToDoAppTemplate.Api.Auth.Models; public class LoginRequest { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Models/LoginResponse.cs b/ToDoAppTemplate.Api/Auth/Models/LoginResponse.cs similarity index 77% rename from DZarsky.ToDoAppTemplate.Api/Auth/Models/LoginResponse.cs rename to ToDoAppTemplate.Api/Auth/Models/LoginResponse.cs index 9d27d8c..e914cb1 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Models/LoginResponse.cs +++ b/ToDoAppTemplate.Api/Auth/Models/LoginResponse.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Api.Auth.Models; +namespace ToDoAppTemplate.Api.Auth.Models; public sealed class LoginResponse { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Models/PasswordChangeRequest.cs b/ToDoAppTemplate.Api/Auth/Models/PasswordChangeRequest.cs similarity index 73% rename from DZarsky.ToDoAppTemplate.Api/Auth/Models/PasswordChangeRequest.cs rename to ToDoAppTemplate.Api/Auth/Models/PasswordChangeRequest.cs index 1a03f32..f0c0666 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Models/PasswordChangeRequest.cs +++ b/ToDoAppTemplate.Api/Auth/Models/PasswordChangeRequest.cs @@ -1,7 +1,7 @@ -using DZarsky.ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common; using FastEndpoints; -namespace DZarsky.ToDoAppTemplate.Api.Auth.Models; +namespace ToDoAppTemplate.Api.Auth.Models; public sealed class PasswordChangeRequest : IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Models/PasswordResetRequest.cs b/ToDoAppTemplate.Api/Auth/Models/PasswordResetRequest.cs similarity index 77% rename from DZarsky.ToDoAppTemplate.Api/Auth/Models/PasswordResetRequest.cs rename to ToDoAppTemplate.Api/Auth/Models/PasswordResetRequest.cs index f843324..30b6f56 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Models/PasswordResetRequest.cs +++ b/ToDoAppTemplate.Api/Auth/Models/PasswordResetRequest.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Api.Auth.Models; +namespace ToDoAppTemplate.Api.Auth.Models; public class PasswordResetRequest : RequestPasswordResetRequest { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Models/RegisterRequest.cs b/ToDoAppTemplate.Api/Auth/Models/RegisterRequest.cs similarity index 63% rename from DZarsky.ToDoAppTemplate.Api/Auth/Models/RegisterRequest.cs rename to ToDoAppTemplate.Api/Auth/Models/RegisterRequest.cs index bad069c..fe81a16 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Models/RegisterRequest.cs +++ b/ToDoAppTemplate.Api/Auth/Models/RegisterRequest.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Api.Auth.Models; +namespace ToDoAppTemplate.Api.Auth.Models; public sealed class RegisterRequest : LoginRequest { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Models/RequestPasswordResetRequest.cs b/ToDoAppTemplate.Api/Auth/Models/RequestPasswordResetRequest.cs similarity index 65% rename from DZarsky.ToDoAppTemplate.Api/Auth/Models/RequestPasswordResetRequest.cs rename to ToDoAppTemplate.Api/Auth/Models/RequestPasswordResetRequest.cs index 0650d52..d32f448 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Models/RequestPasswordResetRequest.cs +++ b/ToDoAppTemplate.Api/Auth/Models/RequestPasswordResetRequest.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Api.Auth.Models; +namespace ToDoAppTemplate.Api.Auth.Models; public class RequestPasswordResetRequest { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Validators/PasswordChangeRequestValidator.cs b/ToDoAppTemplate.Api/Auth/Validators/PasswordChangeRequestValidator.cs similarity index 85% rename from DZarsky.ToDoAppTemplate.Api/Auth/Validators/PasswordChangeRequestValidator.cs rename to ToDoAppTemplate.Api/Auth/Validators/PasswordChangeRequestValidator.cs index 76c54d3..6de20ce 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Validators/PasswordChangeRequestValidator.cs +++ b/ToDoAppTemplate.Api/Auth/Validators/PasswordChangeRequestValidator.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Api.Auth.Models; -using FastEndpoints; +using FastEndpoints; using FluentValidation; +using ToDoAppTemplate.Api.Auth.Models; -namespace DZarsky.ToDoAppTemplate.Api.Auth.Validators; +namespace ToDoAppTemplate.Api.Auth.Validators; public sealed class PasswordChangeRequestValidator : Validator { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Validators/PasswordResetRequestValidator.cs b/ToDoAppTemplate.Api/Auth/Validators/PasswordResetRequestValidator.cs similarity index 84% rename from DZarsky.ToDoAppTemplate.Api/Auth/Validators/PasswordResetRequestValidator.cs rename to ToDoAppTemplate.Api/Auth/Validators/PasswordResetRequestValidator.cs index 18f6396..f9b7b71 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Validators/PasswordResetRequestValidator.cs +++ b/ToDoAppTemplate.Api/Auth/Validators/PasswordResetRequestValidator.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Api.Auth.Models; -using FastEndpoints; +using FastEndpoints; using FluentValidation; +using ToDoAppTemplate.Api.Auth.Models; -namespace DZarsky.ToDoAppTemplate.Api.Auth.Validators; +namespace ToDoAppTemplate.Api.Auth.Validators; public sealed class PasswordResetRequestValidator : Validator { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Validators/RegisterRequestValidator.cs b/ToDoAppTemplate.Api/Auth/Validators/RegisterRequestValidator.cs similarity index 82% rename from DZarsky.ToDoAppTemplate.Api/Auth/Validators/RegisterRequestValidator.cs rename to ToDoAppTemplate.Api/Auth/Validators/RegisterRequestValidator.cs index f41196a..8d31bf8 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Validators/RegisterRequestValidator.cs +++ b/ToDoAppTemplate.Api/Auth/Validators/RegisterRequestValidator.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Api.Auth.Models; -using FastEndpoints; +using FastEndpoints; using FluentValidation; +using ToDoAppTemplate.Api.Auth.Models; -namespace DZarsky.ToDoAppTemplate.Api.Auth.Validators; +namespace ToDoAppTemplate.Api.Auth.Validators; public class RegisterRequestValidator : Validator { diff --git a/DZarsky.ToDoAppTemplate.Api/Auth/Validators/RequestPasswordResetRequestValidator.cs b/ToDoAppTemplate.Api/Auth/Validators/RequestPasswordResetRequestValidator.cs similarity index 69% rename from DZarsky.ToDoAppTemplate.Api/Auth/Validators/RequestPasswordResetRequestValidator.cs rename to ToDoAppTemplate.Api/Auth/Validators/RequestPasswordResetRequestValidator.cs index e92f145..353ece9 100644 --- a/DZarsky.ToDoAppTemplate.Api/Auth/Validators/RequestPasswordResetRequestValidator.cs +++ b/ToDoAppTemplate.Api/Auth/Validators/RequestPasswordResetRequestValidator.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Api.Auth.Models; -using FastEndpoints; +using FastEndpoints; using FluentValidation; +using ToDoAppTemplate.Api.Auth.Models; -namespace DZarsky.ToDoAppTemplate.Api.Auth.Validators; +namespace ToDoAppTemplate.Api.Auth.Validators; public class RequestPasswordResetRequestValidator : Validator { diff --git a/DZarsky.ToDoAppTemplate.Api/Common/Constants/Endpoints.cs b/ToDoAppTemplate.Api/Common/Constants/Endpoints.cs similarity index 91% rename from DZarsky.ToDoAppTemplate.Api/Common/Constants/Endpoints.cs rename to ToDoAppTemplate.Api/Common/Constants/Endpoints.cs index 3c79390..bc1d596 100644 --- a/DZarsky.ToDoAppTemplate.Api/Common/Constants/Endpoints.cs +++ b/ToDoAppTemplate.Api/Common/Constants/Endpoints.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Api.Common.Constants; +namespace ToDoAppTemplate.Api.Common.Constants; public static class Endpoints { diff --git a/DZarsky.ToDoAppTemplate.Api/Common/Models/GetResourceByIdRequest.cs b/ToDoAppTemplate.Api/Common/Models/GetResourceByIdRequest.cs similarity index 59% rename from DZarsky.ToDoAppTemplate.Api/Common/Models/GetResourceByIdRequest.cs rename to ToDoAppTemplate.Api/Common/Models/GetResourceByIdRequest.cs index c774ddb..205ebeb 100644 --- a/DZarsky.ToDoAppTemplate.Api/Common/Models/GetResourceByIdRequest.cs +++ b/ToDoAppTemplate.Api/Common/Models/GetResourceByIdRequest.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Api.Common.Models; +namespace ToDoAppTemplate.Api.Common.Models; public abstract class GetResourceByIdRequest { diff --git a/ToDoAppTemplate.Api/Dockerfile b/ToDoAppTemplate.Api/Dockerfile new file mode 100644 index 0000000..1a72520 --- /dev/null +++ b/ToDoAppTemplate.Api/Dockerfile @@ -0,0 +1,27 @@ +FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base +USER $APP_UID +WORKDIR /app +EXPOSE 8080 +EXPOSE 8081 + +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +ARG BUILD_CONFIGURATION=Release +WORKDIR /src +COPY ["ToDoAppTemplate.Api/ToDoAppTemplate.Api.csproj", "ToDoAppTemplate.Api/"] +COPY ["ToDoAppTemplate.Domain/ToDoAppTemplate.Domain.csproj", "ToDoAppTemplate.Domain/"] +COPY ["ToDoAppTemplate.Application/ToDoAppTemplate.Application.csproj", "ToDoAppTemplate.Application/"] +COPY ["ToDoAppTemplate.Data/ToDoAppTemplate.Data.csproj", "ToDoAppTemplate.Data/"] +COPY ["ToDoAppTemplate.Core/ToDoAppTemplate.Core.csproj", "ToDoAppTemplate.Core/"] +RUN dotnet restore "ToDoAppTemplate.Api/ToDoAppTemplate.Api.csproj" +COPY . . +WORKDIR "/src/ToDoAppTemplate.Api" +RUN dotnet build "ToDoAppTemplate.Api.csproj" -c $BUILD_CONFIGURATION -o /app/build + +FROM build AS publish +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "ToDoAppTemplate.Api.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "ToDoAppTemplate.Api.dll"] diff --git a/DZarsky.ToDoAppTemplate.Api/Infrastructure/Configuration/ApiConfigurationExtensions.cs b/ToDoAppTemplate.Api/Infrastructure/Configuration/ApiConfigurationExtensions.cs similarity index 90% rename from DZarsky.ToDoAppTemplate.Api/Infrastructure/Configuration/ApiConfigurationExtensions.cs rename to ToDoAppTemplate.Api/Infrastructure/Configuration/ApiConfigurationExtensions.cs index ad615d1..b63020c 100644 --- a/DZarsky.ToDoAppTemplate.Api/Infrastructure/Configuration/ApiConfigurationExtensions.cs +++ b/ToDoAppTemplate.Api/Infrastructure/Configuration/ApiConfigurationExtensions.cs @@ -1,10 +1,10 @@ -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Security; -using FastEndpoints; +using FastEndpoints; using FastEndpoints.Security; using FastEndpoints.Swagger; using Microsoft.IdentityModel.Protocols.Configuration; +using ToDoAppTemplate.Api.Infrastructure.Security; -namespace DZarsky.ToDoAppTemplate.Api.Infrastructure.Configuration; +namespace ToDoAppTemplate.Api.Infrastructure.Configuration; internal static class ApiConfigurationExtensions { diff --git a/DZarsky.ToDoAppTemplate.Api/Infrastructure/Extensions/EndpointExtensions.cs b/ToDoAppTemplate.Api/Infrastructure/Extensions/EndpointExtensions.cs similarity index 93% rename from DZarsky.ToDoAppTemplate.Api/Infrastructure/Extensions/EndpointExtensions.cs rename to ToDoAppTemplate.Api/Infrastructure/Extensions/EndpointExtensions.cs index bc9f706..6cc38d1 100644 --- a/DZarsky.ToDoAppTemplate.Api/Infrastructure/Extensions/EndpointExtensions.cs +++ b/ToDoAppTemplate.Api/Infrastructure/Extensions/EndpointExtensions.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Resolvers; -using DZarsky.ToDoAppTemplate.Domain.Common.MediatR; +using ToDoAppTemplate.Api.Infrastructure.Resolvers; +using ToDoAppTemplate.Domain.Common.MediatR; using FastEndpoints; -namespace DZarsky.ToDoAppTemplate.Api.Infrastructure.Extensions; +namespace ToDoAppTemplate.Api.Infrastructure.Extensions; internal static class EndpointExtensions { diff --git a/DZarsky.ToDoAppTemplate.Api/Infrastructure/Resolvers/StatusCodeResolver.cs b/ToDoAppTemplate.Api/Infrastructure/Resolvers/StatusCodeResolver.cs similarity index 90% rename from DZarsky.ToDoAppTemplate.Api/Infrastructure/Resolvers/StatusCodeResolver.cs rename to ToDoAppTemplate.Api/Infrastructure/Resolvers/StatusCodeResolver.cs index 3248c48..1ce2de9 100644 --- a/DZarsky.ToDoAppTemplate.Api/Infrastructure/Resolvers/StatusCodeResolver.cs +++ b/ToDoAppTemplate.Api/Infrastructure/Resolvers/StatusCodeResolver.cs @@ -1,7 +1,7 @@ -using DZarsky.ToDoAppTemplate.Core.Auth.Models; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Core.Auth.Models; +using ToDoAppTemplate.Domain.Common.Results; -namespace DZarsky.ToDoAppTemplate.Api.Infrastructure.Resolvers; +namespace ToDoAppTemplate.Api.Infrastructure.Resolvers; internal static class StatusCodeResolver { diff --git a/DZarsky.ToDoAppTemplate.Api/Infrastructure/Security/AuthConfiguration.cs b/ToDoAppTemplate.Api/Infrastructure/Security/AuthConfiguration.cs similarity index 86% rename from DZarsky.ToDoAppTemplate.Api/Infrastructure/Security/AuthConfiguration.cs rename to ToDoAppTemplate.Api/Infrastructure/Security/AuthConfiguration.cs index 618f25f..010698e 100644 --- a/DZarsky.ToDoAppTemplate.Api/Infrastructure/Security/AuthConfiguration.cs +++ b/ToDoAppTemplate.Api/Infrastructure/Security/AuthConfiguration.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Api.Infrastructure.Security; +namespace ToDoAppTemplate.Api.Infrastructure.Security; public sealed class AuthConfiguration { diff --git a/DZarsky.ToDoAppTemplate.Api/Infrastructure/Security/TokenGenerator.cs b/ToDoAppTemplate.Api/Infrastructure/Security/TokenGenerator.cs similarity index 86% rename from DZarsky.ToDoAppTemplate.Api/Infrastructure/Security/TokenGenerator.cs rename to ToDoAppTemplate.Api/Infrastructure/Security/TokenGenerator.cs index 23fd458..30a3461 100644 --- a/DZarsky.ToDoAppTemplate.Api/Infrastructure/Security/TokenGenerator.cs +++ b/ToDoAppTemplate.Api/Infrastructure/Security/TokenGenerator.cs @@ -1,8 +1,8 @@ using System.Security.Claims; -using DZarsky.ToDoAppTemplate.Core.Auth.Models; +using ToDoAppTemplate.Core.Auth.Models; using FastEndpoints.Security; -namespace DZarsky.ToDoAppTemplate.Api.Infrastructure.Security; +namespace ToDoAppTemplate.Api.Infrastructure.Security; public sealed class TokenGenerator { diff --git a/DZarsky.ToDoAppTemplate.Api/Program.cs b/ToDoAppTemplate.Api/Program.cs similarity index 62% rename from DZarsky.ToDoAppTemplate.Api/Program.cs rename to ToDoAppTemplate.Api/Program.cs index 7b2a4d8..31fa507 100644 --- a/DZarsky.ToDoAppTemplate.Api/Program.cs +++ b/ToDoAppTemplate.Api/Program.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Configuration; -using DZarsky.ToDoAppTemplate.Application.Infrastructure.Configuration; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Configuration; -using DZarsky.ToDoAppTemplate.Data.Infrastructure.Configuration; -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Api.Infrastructure.Configuration; +using ToDoAppTemplate.Application.Infrastructure.Configuration; +using ToDoAppTemplate.Core.Infrastructure.Configuration; +using ToDoAppTemplate.Data.Infrastructure.Configuration; +using ToDoAppTemplate.Data.Infrastructure.EF; using Microsoft.EntityFrameworkCore; var builder = WebApplication.CreateBuilder(args); diff --git a/DZarsky.ToDoAppTemplate.Api/Properties/launchSettings.json b/ToDoAppTemplate.Api/Properties/launchSettings.json similarity index 100% rename from DZarsky.ToDoAppTemplate.Api/Properties/launchSettings.json rename to ToDoAppTemplate.Api/Properties/launchSettings.json diff --git a/DZarsky.ToDoAppTemplate.Api/DZarsky.ToDoAppTemplate.Api.csproj b/ToDoAppTemplate.Api/ToDoAppTemplate.Api.csproj similarity index 77% rename from DZarsky.ToDoAppTemplate.Api/DZarsky.ToDoAppTemplate.Api.csproj rename to ToDoAppTemplate.Api/ToDoAppTemplate.Api.csproj index 02e72f3..2eebfe7 100644 --- a/DZarsky.ToDoAppTemplate.Api/DZarsky.ToDoAppTemplate.Api.csproj +++ b/ToDoAppTemplate.Api/ToDoAppTemplate.Api.csproj @@ -27,10 +27,10 @@ - - - - + + + + diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/AddToDoEndpoint.cs b/ToDoAppTemplate.Api/Todos/Endpoints/AddToDoEndpoint.cs similarity index 83% rename from DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/AddToDoEndpoint.cs rename to ToDoAppTemplate.Api/Todos/Endpoints/AddToDoEndpoint.cs index 76eb664..e03275f 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/AddToDoEndpoint.cs +++ b/ToDoAppTemplate.Api/Todos/Endpoints/AddToDoEndpoint.cs @@ -1,11 +1,11 @@ -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Extensions; -using DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; -using DZarsky.ToDoAppTemplate.Api.Todos.Models.Responses; -using DZarsky.ToDoAppTemplate.Application.Todos.Commands; +using ToDoAppTemplate.Api.Infrastructure.Extensions; +using ToDoAppTemplate.Application.Todos.Commands; using FastEndpoints; using MediatR; +using ToDoAppTemplate.Api.Todos.Models.Requests; +using ToDoAppTemplate.Api.Todos.Models.Responses; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Endpoints; +namespace ToDoAppTemplate.Api.Todos.Endpoints; public sealed class AddToDoEndpoint : Endpoint { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/CompleteToDoEndpoint.cs b/ToDoAppTemplate.Api/Todos/Endpoints/CompleteToDoEndpoint.cs similarity index 84% rename from DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/CompleteToDoEndpoint.cs rename to ToDoAppTemplate.Api/Todos/Endpoints/CompleteToDoEndpoint.cs index cb93887..e869661 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/CompleteToDoEndpoint.cs +++ b/ToDoAppTemplate.Api/Todos/Endpoints/CompleteToDoEndpoint.cs @@ -1,11 +1,11 @@ -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Extensions; -using DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; -using DZarsky.ToDoAppTemplate.Api.Todos.Models.Responses; -using DZarsky.ToDoAppTemplate.Application.Todos.Commands; +using ToDoAppTemplate.Api.Infrastructure.Extensions; +using ToDoAppTemplate.Application.Todos.Commands; using FastEndpoints; using MediatR; +using ToDoAppTemplate.Api.Todos.Models.Requests; +using ToDoAppTemplate.Api.Todos.Models.Responses; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Endpoints; +namespace ToDoAppTemplate.Api.Todos.Endpoints; public sealed class CompleteToDoEndpoint : Endpoint { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/DeleteToDoEndpoint.cs b/ToDoAppTemplate.Api/Todos/Endpoints/DeleteToDoEndpoint.cs similarity index 85% rename from DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/DeleteToDoEndpoint.cs rename to ToDoAppTemplate.Api/Todos/Endpoints/DeleteToDoEndpoint.cs index 70e0b3e..fa19d9a 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/DeleteToDoEndpoint.cs +++ b/ToDoAppTemplate.Api/Todos/Endpoints/DeleteToDoEndpoint.cs @@ -1,10 +1,10 @@ -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Extensions; -using DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; -using DZarsky.ToDoAppTemplate.Application.Todos.Commands; +using ToDoAppTemplate.Api.Infrastructure.Extensions; +using ToDoAppTemplate.Application.Todos.Commands; using FastEndpoints; using MediatR; +using ToDoAppTemplate.Api.Todos.Models.Requests; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Endpoints; +namespace ToDoAppTemplate.Api.Todos.Endpoints; public sealed class DeleteToDoEndpoint : Endpoint { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/GetToDosEndpoint.cs b/ToDoAppTemplate.Api/Todos/Endpoints/GetToDosEndpoint.cs similarity index 84% rename from DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/GetToDosEndpoint.cs rename to ToDoAppTemplate.Api/Todos/Endpoints/GetToDosEndpoint.cs index ff7afce..2cef2c7 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/GetToDosEndpoint.cs +++ b/ToDoAppTemplate.Api/Todos/Endpoints/GetToDosEndpoint.cs @@ -1,11 +1,11 @@ -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Extensions; -using DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; -using DZarsky.ToDoAppTemplate.Api.Todos.Models.Responses; -using DZarsky.ToDoAppTemplate.Application.Todos.Queries; +using ToDoAppTemplate.Api.Infrastructure.Extensions; +using ToDoAppTemplate.Application.Todos.Queries; using FastEndpoints; using MediatR; +using ToDoAppTemplate.Api.Todos.Models.Requests; +using ToDoAppTemplate.Api.Todos.Models.Responses; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Endpoints; +namespace ToDoAppTemplate.Api.Todos.Endpoints; public sealed class GetToDosEndpoint : Endpoint { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/UpdateToDoEndpoint.cs b/ToDoAppTemplate.Api/Todos/Endpoints/UpdateToDoEndpoint.cs similarity index 85% rename from DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/UpdateToDoEndpoint.cs rename to ToDoAppTemplate.Api/Todos/Endpoints/UpdateToDoEndpoint.cs index cae800b..6319dbd 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Endpoints/UpdateToDoEndpoint.cs +++ b/ToDoAppTemplate.Api/Todos/Endpoints/UpdateToDoEndpoint.cs @@ -1,11 +1,11 @@ -using DZarsky.ToDoAppTemplate.Api.Infrastructure.Extensions; -using DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; -using DZarsky.ToDoAppTemplate.Api.Todos.Models.Responses; -using DZarsky.ToDoAppTemplate.Application.Todos.Commands; +using ToDoAppTemplate.Api.Infrastructure.Extensions; +using ToDoAppTemplate.Application.Todos.Commands; using FastEndpoints; using MediatR; +using ToDoAppTemplate.Api.Todos.Models.Requests; +using ToDoAppTemplate.Api.Todos.Models.Responses; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Endpoints; +namespace ToDoAppTemplate.Api.Todos.Endpoints; public sealed class UpdateToDoEndpoint : Endpoint { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/AddToDoRequest.cs b/ToDoAppTemplate.Api/Todos/Models/Requests/AddToDoRequest.cs similarity index 68% rename from DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/AddToDoRequest.cs rename to ToDoAppTemplate.Api/Todos/Models/Requests/AddToDoRequest.cs index 75a59b3..9422922 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/AddToDoRequest.cs +++ b/ToDoAppTemplate.Api/Todos/Models/Requests/AddToDoRequest.cs @@ -1,7 +1,7 @@ -using DZarsky.ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common; using FastEndpoints; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; +namespace ToDoAppTemplate.Api.Todos.Models.Requests; public sealed class AddToDoRequest : IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/CompleteToDoRequest.cs b/ToDoAppTemplate.Api/Todos/Models/Requests/CompleteToDoRequest.cs similarity index 58% rename from DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/CompleteToDoRequest.cs rename to ToDoAppTemplate.Api/Todos/Models/Requests/CompleteToDoRequest.cs index 14d2867..9c897e9 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/CompleteToDoRequest.cs +++ b/ToDoAppTemplate.Api/Todos/Models/Requests/CompleteToDoRequest.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Api.Common.Models; -using DZarsky.ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common; using FastEndpoints; +using ToDoAppTemplate.Api.Common.Models; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; +namespace ToDoAppTemplate.Api.Todos.Models.Requests; public sealed class CompleteToDoRequest : GetResourceByIdRequest, IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/DeleteToDoRequest.cs b/ToDoAppTemplate.Api/Todos/Models/Requests/DeleteToDoRequest.cs similarity index 51% rename from DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/DeleteToDoRequest.cs rename to ToDoAppTemplate.Api/Todos/Models/Requests/DeleteToDoRequest.cs index d196b02..bf69f84 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/DeleteToDoRequest.cs +++ b/ToDoAppTemplate.Api/Todos/Models/Requests/DeleteToDoRequest.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Api.Common.Models; -using DZarsky.ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common; using FastEndpoints; +using ToDoAppTemplate.Api.Common.Models; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; +namespace ToDoAppTemplate.Api.Todos.Models.Requests; public sealed class DeleteToDoRequest : GetResourceByIdRequest, IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/GetToDosRequest.cs b/ToDoAppTemplate.Api/Todos/Models/Requests/GetToDosRequest.cs similarity index 60% rename from DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/GetToDosRequest.cs rename to ToDoAppTemplate.Api/Todos/Models/Requests/GetToDosRequest.cs index d7c2322..098bea0 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/GetToDosRequest.cs +++ b/ToDoAppTemplate.Api/Todos/Models/Requests/GetToDosRequest.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Domain.Common; -using DZarsky.ToDoAppTemplate.Domain.Common.Requests; +using ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common.Requests; using FastEndpoints; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; +namespace ToDoAppTemplate.Api.Todos.Models.Requests; public sealed class GetToDosRequest : PagedRequest, IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/UpdateToDoRequest.cs b/ToDoAppTemplate.Api/Todos/Models/Requests/UpdateToDoRequest.cs similarity index 69% rename from DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/UpdateToDoRequest.cs rename to ToDoAppTemplate.Api/Todos/Models/Requests/UpdateToDoRequest.cs index 13ec713..5e71ab8 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Requests/UpdateToDoRequest.cs +++ b/ToDoAppTemplate.Api/Todos/Models/Requests/UpdateToDoRequest.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Api.Common.Models; -using DZarsky.ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common; using FastEndpoints; +using ToDoAppTemplate.Api.Common.Models; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; +namespace ToDoAppTemplate.Api.Todos.Models.Requests; public sealed class UpdateToDoRequest : GetResourceByIdRequest, IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Responses/GetToDoResponse.cs b/ToDoAppTemplate.Api/Todos/Models/Responses/GetToDoResponse.cs similarity index 78% rename from DZarsky.ToDoAppTemplate.Api/Todos/Models/Responses/GetToDoResponse.cs rename to ToDoAppTemplate.Api/Todos/Models/Responses/GetToDoResponse.cs index 96a888e..c9c5775 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Responses/GetToDoResponse.cs +++ b/ToDoAppTemplate.Api/Todos/Models/Responses/GetToDoResponse.cs @@ -1,7 +1,7 @@ -using DZarsky.ToDoAppTemplate.Api.Common.Models; -using DZarsky.ToDoAppTemplate.Domain.Todos; +using ToDoAppTemplate.Domain.Todos; +using ToDoAppTemplate.Api.Common.Models; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Models.Responses; +namespace ToDoAppTemplate.Api.Todos.Models.Responses; public class GetToDoResponse : GetResourceByIdRequest { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Responses/GetToDosResponse.cs b/ToDoAppTemplate.Api/Todos/Models/Responses/GetToDosResponse.cs similarity index 81% rename from DZarsky.ToDoAppTemplate.Api/Todos/Models/Responses/GetToDosResponse.cs rename to ToDoAppTemplate.Api/Todos/Models/Responses/GetToDosResponse.cs index 8f57a01..caa235e 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Models/Responses/GetToDosResponse.cs +++ b/ToDoAppTemplate.Api/Todos/Models/Responses/GetToDosResponse.cs @@ -1,7 +1,7 @@ -using DZarsky.ToDoAppTemplate.Domain.Common.Results; -using DZarsky.ToDoAppTemplate.Domain.Todos; +using ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Todos; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Models.Responses; +namespace ToDoAppTemplate.Api.Todos.Models.Responses; public sealed class GetToDosResponse : PagedResponse> { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Validators/AddToDoRequestValidator.cs b/ToDoAppTemplate.Api/Todos/Validators/AddToDoRequestValidator.cs similarity index 79% rename from DZarsky.ToDoAppTemplate.Api/Todos/Validators/AddToDoRequestValidator.cs rename to ToDoAppTemplate.Api/Todos/Validators/AddToDoRequestValidator.cs index ff52bc2..47c9354 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Validators/AddToDoRequestValidator.cs +++ b/ToDoAppTemplate.Api/Todos/Validators/AddToDoRequestValidator.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; -using FastEndpoints; +using FastEndpoints; using FluentValidation; +using ToDoAppTemplate.Api.Todos.Models.Requests; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Validators; +namespace ToDoAppTemplate.Api.Todos.Validators; public sealed class AddToDoRequestValidator : Validator { diff --git a/DZarsky.ToDoAppTemplate.Api/Todos/Validators/UpdateToDoRequestValidator.cs b/ToDoAppTemplate.Api/Todos/Validators/UpdateToDoRequestValidator.cs similarity index 83% rename from DZarsky.ToDoAppTemplate.Api/Todos/Validators/UpdateToDoRequestValidator.cs rename to ToDoAppTemplate.Api/Todos/Validators/UpdateToDoRequestValidator.cs index 5b7b204..5602ec6 100644 --- a/DZarsky.ToDoAppTemplate.Api/Todos/Validators/UpdateToDoRequestValidator.cs +++ b/ToDoAppTemplate.Api/Todos/Validators/UpdateToDoRequestValidator.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Api.Todos.Models.Requests; -using FastEndpoints; +using FastEndpoints; using FluentValidation; +using ToDoAppTemplate.Api.Todos.Models.Requests; -namespace DZarsky.ToDoAppTemplate.Api.Todos.Validators; +namespace ToDoAppTemplate.Api.Todos.Validators; public sealed class UpdateToDoRequestValidator : Validator { diff --git a/DZarsky.ToDoAppTemplate.Api/appsettings.Development.json b/ToDoAppTemplate.Api/appsettings.Development.json similarity index 100% rename from DZarsky.ToDoAppTemplate.Api/appsettings.Development.json rename to ToDoAppTemplate.Api/appsettings.Development.json diff --git a/DZarsky.ToDoAppTemplate.Api/appsettings.json b/ToDoAppTemplate.Api/appsettings.json similarity index 100% rename from DZarsky.ToDoAppTemplate.Api/appsettings.json rename to ToDoAppTemplate.Api/appsettings.json diff --git a/DZarsky.ToDoAppTemplate.Application/Auth/Commands/ChangePasswordCommand.cs b/ToDoAppTemplate.Application/Auth/Commands/ChangePasswordCommand.cs similarity index 81% rename from DZarsky.ToDoAppTemplate.Application/Auth/Commands/ChangePasswordCommand.cs rename to ToDoAppTemplate.Application/Auth/Commands/ChangePasswordCommand.cs index ca54da3..c941a9e 100644 --- a/DZarsky.ToDoAppTemplate.Application/Auth/Commands/ChangePasswordCommand.cs +++ b/ToDoAppTemplate.Application/Auth/Commands/ChangePasswordCommand.cs @@ -1,14 +1,14 @@ -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Security; -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; -using DZarsky.ToDoAppTemplate.Domain.Common; -using DZarsky.ToDoAppTemplate.Domain.Common.Errors; -using DZarsky.ToDoAppTemplate.Domain.Common.MediatR; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; -using DZarsky.ToDoAppTemplate.Domain.Users; +using ToDoAppTemplate.Core.Infrastructure.Security; +using ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common.Errors; +using ToDoAppTemplate.Domain.Common.MediatR; +using ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Users; using MediatR; using Microsoft.EntityFrameworkCore; -namespace DZarsky.ToDoAppTemplate.Application.Auth.Commands; +namespace ToDoAppTemplate.Application.Auth.Commands; public sealed class ChangePasswordCommand : IRequest, IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Application/Auth/Commands/RegisterUserCommand.cs b/ToDoAppTemplate.Application/Auth/Commands/RegisterUserCommand.cs similarity index 86% rename from DZarsky.ToDoAppTemplate.Application/Auth/Commands/RegisterUserCommand.cs rename to ToDoAppTemplate.Application/Auth/Commands/RegisterUserCommand.cs index f1a4c37..346c390 100644 --- a/DZarsky.ToDoAppTemplate.Application/Auth/Commands/RegisterUserCommand.cs +++ b/ToDoAppTemplate.Application/Auth/Commands/RegisterUserCommand.cs @@ -1,15 +1,15 @@ using System.Text.Json; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Security; -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; -using DZarsky.ToDoAppTemplate.Domain.Common.Errors; -using DZarsky.ToDoAppTemplate.Domain.Common.MediatR; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; -using DZarsky.ToDoAppTemplate.Domain.Users; +using ToDoAppTemplate.Core.Infrastructure.Security; +using ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Domain.Common.Errors; +using ToDoAppTemplate.Domain.Common.MediatR; +using ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Users; using MediatR; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -namespace DZarsky.ToDoAppTemplate.Application.Auth.Commands; +namespace ToDoAppTemplate.Application.Auth.Commands; public sealed class RegisterUserCommand : IRequest { diff --git a/DZarsky.ToDoAppTemplate.Application/Auth/Commands/RequestPasswordResetCommand.cs b/ToDoAppTemplate.Application/Auth/Commands/RequestPasswordResetCommand.cs similarity index 82% rename from DZarsky.ToDoAppTemplate.Application/Auth/Commands/RequestPasswordResetCommand.cs rename to ToDoAppTemplate.Application/Auth/Commands/RequestPasswordResetCommand.cs index e51a246..d17c3ec 100644 --- a/DZarsky.ToDoAppTemplate.Application/Auth/Commands/RequestPasswordResetCommand.cs +++ b/ToDoAppTemplate.Application/Auth/Commands/RequestPasswordResetCommand.cs @@ -1,15 +1,15 @@ -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Security; -using DZarsky.ToDoAppTemplate.Core.Templating; -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; -using DZarsky.ToDoAppTemplate.Domain.Common.Errors; -using DZarsky.ToDoAppTemplate.Domain.Common.MediatR; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; -using DZarsky.ToDoAppTemplate.Domain.Users; +using ToDoAppTemplate.Core.Infrastructure.Communication.Email; +using ToDoAppTemplate.Core.Infrastructure.Security; +using ToDoAppTemplate.Core.Templating; +using ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Domain.Common.Errors; +using ToDoAppTemplate.Domain.Common.MediatR; +using ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Users; using MediatR; using Microsoft.EntityFrameworkCore; -namespace DZarsky.ToDoAppTemplate.Application.Auth.Commands; +namespace ToDoAppTemplate.Application.Auth.Commands; public sealed class RequestPasswordResetCommand : IRequest { diff --git a/DZarsky.ToDoAppTemplate.Application/Auth/Commands/ResetPasswordCommand.cs b/ToDoAppTemplate.Application/Auth/Commands/ResetPasswordCommand.cs similarity index 86% rename from DZarsky.ToDoAppTemplate.Application/Auth/Commands/ResetPasswordCommand.cs rename to ToDoAppTemplate.Application/Auth/Commands/ResetPasswordCommand.cs index d942fc9..b098c62 100644 --- a/DZarsky.ToDoAppTemplate.Application/Auth/Commands/ResetPasswordCommand.cs +++ b/ToDoAppTemplate.Application/Auth/Commands/ResetPasswordCommand.cs @@ -1,13 +1,13 @@ -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Security; -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; -using DZarsky.ToDoAppTemplate.Domain.Common.Errors; -using DZarsky.ToDoAppTemplate.Domain.Common.MediatR; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; -using DZarsky.ToDoAppTemplate.Domain.Users; +using ToDoAppTemplate.Core.Infrastructure.Security; +using ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Domain.Common.Errors; +using ToDoAppTemplate.Domain.Common.MediatR; +using ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Users; using MediatR; using Microsoft.EntityFrameworkCore; -namespace DZarsky.ToDoAppTemplate.Application.Auth.Commands; +namespace ToDoAppTemplate.Application.Auth.Commands; public sealed class ResetPasswordCommand : IRequest { diff --git a/DZarsky.ToDoAppTemplate.Application/Auth/Queries/LoginUserQuery.cs b/ToDoAppTemplate.Application/Auth/Queries/LoginUserQuery.cs similarity index 83% rename from DZarsky.ToDoAppTemplate.Application/Auth/Queries/LoginUserQuery.cs rename to ToDoAppTemplate.Application/Auth/Queries/LoginUserQuery.cs index 51f0759..e7eb1f9 100644 --- a/DZarsky.ToDoAppTemplate.Application/Auth/Queries/LoginUserQuery.cs +++ b/ToDoAppTemplate.Application/Auth/Queries/LoginUserQuery.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Core.Auth.Models; -using DZarsky.ToDoAppTemplate.Core.Auth.Services; +using ToDoAppTemplate.Core.Auth.Models; +using ToDoAppTemplate.Core.Auth.Services; using MediatR; -namespace DZarsky.ToDoAppTemplate.Application.Auth.Queries; +namespace ToDoAppTemplate.Application.Auth.Queries; public sealed class LoginUserQuery : IRequest { diff --git a/DZarsky.ToDoAppTemplate.Application/Infrastructure/Configuration/ApplicationConfigurationExtensions.cs b/ToDoAppTemplate.Application/Infrastructure/Configuration/ApplicationConfigurationExtensions.cs similarity index 76% rename from DZarsky.ToDoAppTemplate.Application/Infrastructure/Configuration/ApplicationConfigurationExtensions.cs rename to ToDoAppTemplate.Application/Infrastructure/Configuration/ApplicationConfigurationExtensions.cs index 24749f2..b4aa087 100644 --- a/DZarsky.ToDoAppTemplate.Application/Infrastructure/Configuration/ApplicationConfigurationExtensions.cs +++ b/ToDoAppTemplate.Application/Infrastructure/Configuration/ApplicationConfigurationExtensions.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Application.Infrastructure.MediatR.Behaviours; -using MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; +using ToDoAppTemplate.Application.Infrastructure.MediatR.Behaviours; -namespace DZarsky.ToDoAppTemplate.Application.Infrastructure.Configuration; +namespace ToDoAppTemplate.Application.Infrastructure.Configuration; public static class ApplicationConfigurationExtensions { diff --git a/DZarsky.ToDoAppTemplate.Application/Infrastructure/MediatR/Behaviours/RequestWithUserIdPipelineBehaviour.cs b/ToDoAppTemplate.Application/Infrastructure/MediatR/Behaviours/RequestWithUserIdPipelineBehaviour.cs similarity index 83% rename from DZarsky.ToDoAppTemplate.Application/Infrastructure/MediatR/Behaviours/RequestWithUserIdPipelineBehaviour.cs rename to ToDoAppTemplate.Application/Infrastructure/MediatR/Behaviours/RequestWithUserIdPipelineBehaviour.cs index db37346..6256c83 100644 --- a/DZarsky.ToDoAppTemplate.Application/Infrastructure/MediatR/Behaviours/RequestWithUserIdPipelineBehaviour.cs +++ b/ToDoAppTemplate.Application/Infrastructure/MediatR/Behaviours/RequestWithUserIdPipelineBehaviour.cs @@ -1,9 +1,9 @@ -using DZarsky.ToDoAppTemplate.Domain.Common; -using DZarsky.ToDoAppTemplate.Domain.Common.MediatR; +using ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common.MediatR; using MediatR; using Microsoft.AspNetCore.Http; -namespace DZarsky.ToDoAppTemplate.Application.Infrastructure.MediatR.Behaviours; +namespace ToDoAppTemplate.Application.Infrastructure.MediatR.Behaviours; public class RequestWithUserIdPipelineBehaviour : IPipelineBehavior where TRequest : IAuthenticatedRequest diff --git a/DZarsky.ToDoAppTemplate.Application/DZarsky.ToDoAppTemplate.Application.csproj b/ToDoAppTemplate.Application/ToDoAppTemplate.Application.csproj similarity index 78% rename from DZarsky.ToDoAppTemplate.Application/DZarsky.ToDoAppTemplate.Application.csproj rename to ToDoAppTemplate.Application/ToDoAppTemplate.Application.csproj index 932188c..0b0da7f 100644 --- a/DZarsky.ToDoAppTemplate.Application/DZarsky.ToDoAppTemplate.Application.csproj +++ b/ToDoAppTemplate.Application/ToDoAppTemplate.Application.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/DZarsky.ToDoAppTemplate.Application/Todos/Commands/AddToDoCommand.cs b/ToDoAppTemplate.Application/Todos/Commands/AddToDoCommand.cs similarity index 80% rename from DZarsky.ToDoAppTemplate.Application/Todos/Commands/AddToDoCommand.cs rename to ToDoAppTemplate.Application/Todos/Commands/AddToDoCommand.cs index fac4289..ad917a0 100644 --- a/DZarsky.ToDoAppTemplate.Application/Todos/Commands/AddToDoCommand.cs +++ b/ToDoAppTemplate.Application/Todos/Commands/AddToDoCommand.cs @@ -1,11 +1,11 @@ -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; -using DZarsky.ToDoAppTemplate.Domain.Common; -using DZarsky.ToDoAppTemplate.Domain.Common.MediatR; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; -using DZarsky.ToDoAppTemplate.Domain.Todos; +using ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common.MediatR; +using ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Todos; using MediatR; -namespace DZarsky.ToDoAppTemplate.Application.Todos.Commands; +namespace ToDoAppTemplate.Application.Todos.Commands; public sealed class AddToDoCommand : IRequest>, IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Application/Todos/Commands/CompleteToDoCommand.cs b/ToDoAppTemplate.Application/Todos/Commands/CompleteToDoCommand.cs similarity index 82% rename from DZarsky.ToDoAppTemplate.Application/Todos/Commands/CompleteToDoCommand.cs rename to ToDoAppTemplate.Application/Todos/Commands/CompleteToDoCommand.cs index 424cb44..5d66fe3 100644 --- a/DZarsky.ToDoAppTemplate.Application/Todos/Commands/CompleteToDoCommand.cs +++ b/ToDoAppTemplate.Application/Todos/Commands/CompleteToDoCommand.cs @@ -1,12 +1,12 @@ -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; -using DZarsky.ToDoAppTemplate.Domain.Common; -using DZarsky.ToDoAppTemplate.Domain.Common.MediatR; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; -using DZarsky.ToDoAppTemplate.Domain.Todos; +using ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common.MediatR; +using ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Todos; using MediatR; using Microsoft.EntityFrameworkCore; -namespace DZarsky.ToDoAppTemplate.Application.Todos.Commands; +namespace ToDoAppTemplate.Application.Todos.Commands; public sealed class CompleteToDoCommand : IRequest>, IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Application/Todos/Commands/DeleteToDoCommand.cs b/ToDoAppTemplate.Application/Todos/Commands/DeleteToDoCommand.cs similarity index 79% rename from DZarsky.ToDoAppTemplate.Application/Todos/Commands/DeleteToDoCommand.cs rename to ToDoAppTemplate.Application/Todos/Commands/DeleteToDoCommand.cs index f9b0369..f990c66 100644 --- a/DZarsky.ToDoAppTemplate.Application/Todos/Commands/DeleteToDoCommand.cs +++ b/ToDoAppTemplate.Application/Todos/Commands/DeleteToDoCommand.cs @@ -1,12 +1,12 @@ -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; -using DZarsky.ToDoAppTemplate.Domain.Common; -using DZarsky.ToDoAppTemplate.Domain.Common.MediatR; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; -using DZarsky.ToDoAppTemplate.Domain.Todos; +using ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common.MediatR; +using ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Todos; using MediatR; using Microsoft.EntityFrameworkCore; -namespace DZarsky.ToDoAppTemplate.Application.Todos.Commands; +namespace ToDoAppTemplate.Application.Todos.Commands; public sealed class DeleteToDoCommand : IRequest, IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Application/Todos/Commands/UpdateToDoCommand.cs b/ToDoAppTemplate.Application/Todos/Commands/UpdateToDoCommand.cs similarity index 85% rename from DZarsky.ToDoAppTemplate.Application/Todos/Commands/UpdateToDoCommand.cs rename to ToDoAppTemplate.Application/Todos/Commands/UpdateToDoCommand.cs index 2e4fdae..cc807ca 100644 --- a/DZarsky.ToDoAppTemplate.Application/Todos/Commands/UpdateToDoCommand.cs +++ b/ToDoAppTemplate.Application/Todos/Commands/UpdateToDoCommand.cs @@ -1,12 +1,12 @@ -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; -using DZarsky.ToDoAppTemplate.Domain.Common; -using DZarsky.ToDoAppTemplate.Domain.Common.MediatR; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; -using DZarsky.ToDoAppTemplate.Domain.Todos; +using ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common.MediatR; +using ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Todos; using MediatR; using Microsoft.EntityFrameworkCore; -namespace DZarsky.ToDoAppTemplate.Application.Todos.Commands; +namespace ToDoAppTemplate.Application.Todos.Commands; public sealed class UpdateToDoCommand : IRequest>, IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Application/Todos/Queries/GetToDosQuery.cs b/ToDoAppTemplate.Application/Todos/Queries/GetToDosQuery.cs similarity index 84% rename from DZarsky.ToDoAppTemplate.Application/Todos/Queries/GetToDosQuery.cs rename to ToDoAppTemplate.Application/Todos/Queries/GetToDosQuery.cs index 701a50d..a50dd00 100644 --- a/DZarsky.ToDoAppTemplate.Application/Todos/Queries/GetToDosQuery.cs +++ b/ToDoAppTemplate.Application/Todos/Queries/GetToDosQuery.cs @@ -1,13 +1,13 @@ -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; -using DZarsky.ToDoAppTemplate.Domain.Common; -using DZarsky.ToDoAppTemplate.Domain.Common.MediatR; -using DZarsky.ToDoAppTemplate.Domain.Common.Requests; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; -using DZarsky.ToDoAppTemplate.Domain.Todos; +using ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common.MediatR; +using ToDoAppTemplate.Domain.Common.Requests; +using ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Todos; using MediatR; using Microsoft.EntityFrameworkCore; -namespace DZarsky.ToDoAppTemplate.Application.Todos.Queries; +namespace ToDoAppTemplate.Application.Todos.Queries; public sealed class GetToDosQuery : PagedRequest, IRequest>>>, IAuthenticatedRequest diff --git a/DZarsky.ToDoAppTemplate.Core/Auth/Models/AuthResult.cs b/ToDoAppTemplate.Core/Auth/Models/AuthResult.cs similarity index 84% rename from DZarsky.ToDoAppTemplate.Core/Auth/Models/AuthResult.cs rename to ToDoAppTemplate.Core/Auth/Models/AuthResult.cs index c057017..7ae5417 100644 --- a/DZarsky.ToDoAppTemplate.Core/Auth/Models/AuthResult.cs +++ b/ToDoAppTemplate.Core/Auth/Models/AuthResult.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace DZarsky.ToDoAppTemplate.Core.Auth.Models; +namespace ToDoAppTemplate.Core.Auth.Models; public sealed record AuthResult(AuthResultStatus Status, int? UserId = null); diff --git a/DZarsky.ToDoAppTemplate.Core/Auth/Models/Credentials.cs b/ToDoAppTemplate.Core/Auth/Models/Credentials.cs similarity index 54% rename from DZarsky.ToDoAppTemplate.Core/Auth/Models/Credentials.cs rename to ToDoAppTemplate.Core/Auth/Models/Credentials.cs index 921b000..5d07942 100644 --- a/DZarsky.ToDoAppTemplate.Core/Auth/Models/Credentials.cs +++ b/ToDoAppTemplate.Core/Auth/Models/Credentials.cs @@ -1,3 +1,3 @@ -namespace DZarsky.ToDoAppTemplate.Core.Auth.Models; +namespace ToDoAppTemplate.Core.Auth.Models; public sealed record Credentials(string Login, string Password); diff --git a/DZarsky.ToDoAppTemplate.Core/Auth/Services/AuthManager.cs b/ToDoAppTemplate.Core/Auth/Services/AuthManager.cs similarity index 80% rename from DZarsky.ToDoAppTemplate.Core/Auth/Services/AuthManager.cs rename to ToDoAppTemplate.Core/Auth/Services/AuthManager.cs index c062778..e43c7ea 100644 --- a/DZarsky.ToDoAppTemplate.Core/Auth/Services/AuthManager.cs +++ b/ToDoAppTemplate.Core/Auth/Services/AuthManager.cs @@ -1,10 +1,10 @@ -using DZarsky.ToDoAppTemplate.Core.Auth.Models; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Security; -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; -using DZarsky.ToDoAppTemplate.Domain.Users; +using ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Domain.Users; using Microsoft.EntityFrameworkCore; +using ToDoAppTemplate.Core.Auth.Models; +using ToDoAppTemplate.Core.Infrastructure.Security; -namespace DZarsky.ToDoAppTemplate.Core.Auth.Services; +namespace ToDoAppTemplate.Core.Auth.Services; public sealed class AuthManager { diff --git a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/IEmailSender.cs b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/IEmailSender.cs similarity index 55% rename from DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/IEmailSender.cs rename to ToDoAppTemplate.Core/Infrastructure/Communication/Email/IEmailSender.cs index c5a100f..b1104f3 100644 --- a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/IEmailSender.cs +++ b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/IEmailSender.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email; +namespace ToDoAppTemplate.Core.Infrastructure.Communication.Email; public interface IEmailSender { diff --git a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/SendGridEmailSender.cs b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/SendGridEmailSender.cs similarity index 89% rename from DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/SendGridEmailSender.cs rename to ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/SendGridEmailSender.cs index 19bc584..0b86dd5 100644 --- a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/SendGridEmailSender.cs +++ b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/SendGridEmailSender.cs @@ -1,7 +1,7 @@ using System.Net.Http.Json; -using DZarsky.ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common; -namespace DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.SendGrid; +namespace ToDoAppTemplate.Core.Infrastructure.Communication.Email.SendGrid; public sealed class SendGridEmailSender : IEmailSender { diff --git a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/Settings/SendGridConfiguration.cs b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/Settings/SendGridConfiguration.cs similarity index 63% rename from DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/Settings/SendGridConfiguration.cs rename to ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/Settings/SendGridConfiguration.cs index 4316b45..9411392 100644 --- a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/Settings/SendGridConfiguration.cs +++ b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/SendGrid/Settings/SendGridConfiguration.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.SendGrid.Settings; +namespace ToDoAppTemplate.Core.Infrastructure.Communication.Email.SendGrid.Settings; internal sealed class SendGridConfiguration { diff --git a/ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/EmailConfiguration.cs b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/EmailConfiguration.cs new file mode 100644 index 0000000..47c4961 --- /dev/null +++ b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/EmailConfiguration.cs @@ -0,0 +1,13 @@ +using ToDoAppTemplate.Core.Infrastructure.Communication.Email.SendGrid.Settings; +using ToDoAppTemplate.Core.Infrastructure.Communication.Email.Smtp.Settings; + +namespace ToDoAppTemplate.Core.Infrastructure.Communication.Email.Settings; + +internal sealed class EmailConfiguration +{ + public SenderType SenderType { get; init; } + + public SmtpConfiguration? Smtp { get; init; } + + public SendGridConfiguration? SendGrid { get; init; } +} diff --git a/ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/SenderType.cs b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/SenderType.cs new file mode 100644 index 0000000..12f3aec --- /dev/null +++ b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/Settings/SenderType.cs @@ -0,0 +1,7 @@ +namespace ToDoAppTemplate.Core.Infrastructure.Communication.Email.Settings; + +public enum SenderType +{ + Smtp, + SendGrid +} diff --git a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/Settings/SmtpConfiguration.cs b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/Settings/SmtpConfiguration.cs similarity index 74% rename from DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/Settings/SmtpConfiguration.cs rename to ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/Settings/SmtpConfiguration.cs index 0c3f971..e15be21 100644 --- a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/Settings/SmtpConfiguration.cs +++ b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/Settings/SmtpConfiguration.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.Smtp.Settings; +namespace ToDoAppTemplate.Core.Infrastructure.Communication.Email.Smtp.Settings; public sealed class SmtpConfiguration { diff --git a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/SmtpEmailSender.cs b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/SmtpEmailSender.cs similarity index 86% rename from DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/SmtpEmailSender.cs rename to ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/SmtpEmailSender.cs index 8b9730a..9c5ab81 100644 --- a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/SmtpEmailSender.cs +++ b/ToDoAppTemplate.Core/Infrastructure/Communication/Email/Smtp/SmtpEmailSender.cs @@ -1,9 +1,9 @@ using System.Net; using System.Net.Mail; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.Smtp.Settings; using Microsoft.Extensions.Logging; +using ToDoAppTemplate.Core.Infrastructure.Communication.Email.Smtp.Settings; -namespace DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.Smtp; +namespace ToDoAppTemplate.Core.Infrastructure.Communication.Email.Smtp; public sealed class SmtpEmailSender : IEmailSender { diff --git a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Configuration/CoreConfigurationExtensions.cs b/ToDoAppTemplate.Core/Infrastructure/Configuration/CoreConfigurationExtensions.cs similarity index 82% rename from DZarsky.ToDoAppTemplate.Core/Infrastructure/Configuration/CoreConfigurationExtensions.cs rename to ToDoAppTemplate.Core/Infrastructure/Configuration/CoreConfigurationExtensions.cs index e271e8c..79f5b80 100644 --- a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Configuration/CoreConfigurationExtensions.cs +++ b/ToDoAppTemplate.Core/Infrastructure/Configuration/CoreConfigurationExtensions.cs @@ -1,19 +1,19 @@ using System.Net.Http.Headers; -using DZarsky.ToDoAppTemplate.Core.Auth.Services; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.SendGrid; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.SendGrid.Settings; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.Settings; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Communication.Email.Smtp; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Security; -using DZarsky.ToDoAppTemplate.Core.Templating; -using DZarsky.ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common; using Fluid.ViewEngine; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using ToDoAppTemplate.Core.Auth.Services; +using ToDoAppTemplate.Core.Infrastructure.Communication.Email; +using ToDoAppTemplate.Core.Infrastructure.Communication.Email.SendGrid; +using ToDoAppTemplate.Core.Infrastructure.Communication.Email.SendGrid.Settings; +using ToDoAppTemplate.Core.Infrastructure.Communication.Email.Settings; +using ToDoAppTemplate.Core.Infrastructure.Communication.Email.Smtp; +using ToDoAppTemplate.Core.Infrastructure.Security; +using ToDoAppTemplate.Core.Templating; -namespace DZarsky.ToDoAppTemplate.Core.Infrastructure.Configuration; +namespace ToDoAppTemplate.Core.Infrastructure.Configuration; public static class CoreConfigurationExtensions { diff --git a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Security/Models/SecurityConfiguration.cs b/ToDoAppTemplate.Core/Infrastructure/Security/Models/SecurityConfiguration.cs similarity index 59% rename from DZarsky.ToDoAppTemplate.Core/Infrastructure/Security/Models/SecurityConfiguration.cs rename to ToDoAppTemplate.Core/Infrastructure/Security/Models/SecurityConfiguration.cs index 4eb5105..3a68585 100644 --- a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Security/Models/SecurityConfiguration.cs +++ b/ToDoAppTemplate.Core/Infrastructure/Security/Models/SecurityConfiguration.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Core.Infrastructure.Security.Models; +namespace ToDoAppTemplate.Core.Infrastructure.Security.Models; public sealed record SecurityConfiguration { diff --git a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Security/PasswordHasher.cs b/ToDoAppTemplate.Core/Infrastructure/Security/PasswordHasher.cs similarity index 90% rename from DZarsky.ToDoAppTemplate.Core/Infrastructure/Security/PasswordHasher.cs rename to ToDoAppTemplate.Core/Infrastructure/Security/PasswordHasher.cs index ea9fcf5..dc70d96 100644 --- a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Security/PasswordHasher.cs +++ b/ToDoAppTemplate.Core/Infrastructure/Security/PasswordHasher.cs @@ -1,10 +1,10 @@ using System.Security.Cryptography; using System.Text; -using DZarsky.ToDoAppTemplate.Core.Infrastructure.Security.Models; using Isopoh.Cryptography.Argon2; using Microsoft.Extensions.Configuration; +using ToDoAppTemplate.Core.Infrastructure.Security.Models; -namespace DZarsky.ToDoAppTemplate.Core.Infrastructure.Security; +namespace ToDoAppTemplate.Core.Infrastructure.Security; public sealed class PasswordHasher(IConfiguration configuration) { diff --git a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Security/PasswordValidator.cs b/ToDoAppTemplate.Core/Infrastructure/Security/PasswordValidator.cs similarity index 92% rename from DZarsky.ToDoAppTemplate.Core/Infrastructure/Security/PasswordValidator.cs rename to ToDoAppTemplate.Core/Infrastructure/Security/PasswordValidator.cs index a0cf05a..b3494e1 100644 --- a/DZarsky.ToDoAppTemplate.Core/Infrastructure/Security/PasswordValidator.cs +++ b/ToDoAppTemplate.Core/Infrastructure/Security/PasswordValidator.cs @@ -1,6 +1,6 @@ using Isopoh.Cryptography.Argon2; -namespace DZarsky.ToDoAppTemplate.Core.Infrastructure.Security; +namespace ToDoAppTemplate.Core.Infrastructure.Security; public sealed class PasswordValidator { diff --git a/DZarsky.ToDoAppTemplate.Core/Templating/TemplatingService.cs b/ToDoAppTemplate.Core/Templating/TemplatingService.cs similarity index 96% rename from DZarsky.ToDoAppTemplate.Core/Templating/TemplatingService.cs rename to ToDoAppTemplate.Core/Templating/TemplatingService.cs index 5c9d605..9f2ad65 100644 --- a/DZarsky.ToDoAppTemplate.Core/Templating/TemplatingService.cs +++ b/ToDoAppTemplate.Core/Templating/TemplatingService.cs @@ -2,7 +2,7 @@ using Fluid; using Fluid.ViewEngine; -namespace DZarsky.ToDoAppTemplate.Core.Templating; +namespace ToDoAppTemplate.Core.Templating; public sealed class TemplatingService { diff --git a/DZarsky.ToDoAppTemplate.Core/Templating/Views/Email/_layout.liquid b/ToDoAppTemplate.Core/Templating/Views/Email/_layout.liquid similarity index 100% rename from DZarsky.ToDoAppTemplate.Core/Templating/Views/Email/_layout.liquid rename to ToDoAppTemplate.Core/Templating/Views/Email/_layout.liquid diff --git a/DZarsky.ToDoAppTemplate.Core/Templating/Views/Email/_viewstart.liquid b/ToDoAppTemplate.Core/Templating/Views/Email/_viewstart.liquid similarity index 100% rename from DZarsky.ToDoAppTemplate.Core/Templating/Views/Email/_viewstart.liquid rename to ToDoAppTemplate.Core/Templating/Views/Email/_viewstart.liquid diff --git a/DZarsky.ToDoAppTemplate.Core/Templating/Views/Email/password-reset.liquid b/ToDoAppTemplate.Core/Templating/Views/Email/password-reset.liquid similarity index 100% rename from DZarsky.ToDoAppTemplate.Core/Templating/Views/Email/password-reset.liquid rename to ToDoAppTemplate.Core/Templating/Views/Email/password-reset.liquid diff --git a/DZarsky.ToDoAppTemplate.Core/DZarsky.ToDoAppTemplate.Core.csproj b/ToDoAppTemplate.Core/ToDoAppTemplate.Core.csproj similarity index 94% rename from DZarsky.ToDoAppTemplate.Core/DZarsky.ToDoAppTemplate.Core.csproj rename to ToDoAppTemplate.Core/ToDoAppTemplate.Core.csproj index d14b1f7..45c0177 100644 --- a/DZarsky.ToDoAppTemplate.Core/DZarsky.ToDoAppTemplate.Core.csproj +++ b/ToDoAppTemplate.Core/ToDoAppTemplate.Core.csproj @@ -15,7 +15,7 @@ - + diff --git a/DZarsky.ToDoAppTemplate.Data/Common/Constants/Tables.cs b/ToDoAppTemplate.Data/Common/Constants/Tables.cs similarity index 76% rename from DZarsky.ToDoAppTemplate.Data/Common/Constants/Tables.cs rename to ToDoAppTemplate.Data/Common/Constants/Tables.cs index f0e721e..a4d14ad 100644 --- a/DZarsky.ToDoAppTemplate.Data/Common/Constants/Tables.cs +++ b/ToDoAppTemplate.Data/Common/Constants/Tables.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Data.Common.Constants; +namespace ToDoAppTemplate.Data.Common.Constants; public static class Tables { diff --git a/DZarsky.ToDoAppTemplate.Data/Common/Mappings/BaseEntityConfiguration.cs b/ToDoAppTemplate.Data/Common/Mappings/BaseEntityConfiguration.cs similarity index 88% rename from DZarsky.ToDoAppTemplate.Data/Common/Mappings/BaseEntityConfiguration.cs rename to ToDoAppTemplate.Data/Common/Mappings/BaseEntityConfiguration.cs index e44adf0..8977940 100644 --- a/DZarsky.ToDoAppTemplate.Data/Common/Mappings/BaseEntityConfiguration.cs +++ b/ToDoAppTemplate.Data/Common/Mappings/BaseEntityConfiguration.cs @@ -1,8 +1,8 @@ -using DZarsky.ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace DZarsky.ToDoAppTemplate.Data.Common.Mappings; +namespace ToDoAppTemplate.Data.Common.Mappings; public abstract class BaseEntityConfiguration(string tableName) : IEntityTypeConfiguration where TEntity : BaseEntity diff --git a/DZarsky.ToDoAppTemplate.Data/Infrastructure/Configuration/DataConfigurationExtensions.cs b/ToDoAppTemplate.Data/Infrastructure/Configuration/DataConfigurationExtensions.cs similarity index 78% rename from DZarsky.ToDoAppTemplate.Data/Infrastructure/Configuration/DataConfigurationExtensions.cs rename to ToDoAppTemplate.Data/Infrastructure/Configuration/DataConfigurationExtensions.cs index d43c68a..7eeaaeb 100644 --- a/DZarsky.ToDoAppTemplate.Data/Infrastructure/Configuration/DataConfigurationExtensions.cs +++ b/ToDoAppTemplate.Data/Infrastructure/Configuration/DataConfigurationExtensions.cs @@ -1,9 +1,9 @@ -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using ToDoAppTemplate.Data.Infrastructure.EF; -namespace DZarsky.ToDoAppTemplate.Data.Infrastructure.Configuration; +namespace ToDoAppTemplate.Data.Infrastructure.Configuration; public static class DataConfigurationExtensions { diff --git a/DZarsky.ToDoAppTemplate.Data/Infrastructure/EF/DataContext.cs b/ToDoAppTemplate.Data/Infrastructure/EF/DataContext.cs similarity index 83% rename from DZarsky.ToDoAppTemplate.Data/Infrastructure/EF/DataContext.cs rename to ToDoAppTemplate.Data/Infrastructure/EF/DataContext.cs index 7eaeee2..58f32af 100644 --- a/DZarsky.ToDoAppTemplate.Data/Infrastructure/EF/DataContext.cs +++ b/ToDoAppTemplate.Data/Infrastructure/EF/DataContext.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore; -namespace DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; +namespace ToDoAppTemplate.Data.Infrastructure.EF; public sealed class DataContext(DbContextOptions options) : DbContext(options) { diff --git a/DZarsky.ToDoAppTemplate.Data/Migrations/20240113091057_Initial.Designer.cs b/ToDoAppTemplate.Data/Migrations/20240113091057_Initial.Designer.cs similarity index 97% rename from DZarsky.ToDoAppTemplate.Data/Migrations/20240113091057_Initial.Designer.cs rename to ToDoAppTemplate.Data/Migrations/20240113091057_Initial.Designer.cs index e59ecd4..86274da 100644 --- a/DZarsky.ToDoAppTemplate.Data/Migrations/20240113091057_Initial.Designer.cs +++ b/ToDoAppTemplate.Data/Migrations/20240113091057_Initial.Designer.cs @@ -1,15 +1,16 @@ // using System; -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Data.Infrastructure.EF; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using ToDoAppTemplate.Data.Infrastructure.EF; #nullable disable -namespace DZarsky.ToDoAppTemplate.Data.Migrations +namespace ToDoAppTemplate.Data.Migrations { [DbContext(typeof(DataContext))] [Migration("20240113091057_Initial")] diff --git a/DZarsky.ToDoAppTemplate.Data/Migrations/20240113091057_Initial.cs b/ToDoAppTemplate.Data/Migrations/20240113091057_Initial.cs similarity index 98% rename from DZarsky.ToDoAppTemplate.Data/Migrations/20240113091057_Initial.cs rename to ToDoAppTemplate.Data/Migrations/20240113091057_Initial.cs index cd7da23..ad1a433 100644 --- a/DZarsky.ToDoAppTemplate.Data/Migrations/20240113091057_Initial.cs +++ b/ToDoAppTemplate.Data/Migrations/20240113091057_Initial.cs @@ -4,7 +4,7 @@ #nullable disable -namespace DZarsky.ToDoAppTemplate.Data.Migrations +namespace ToDoAppTemplate.Data.Migrations { /// public partial class Initial : Migration diff --git a/DZarsky.ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.Designer.cs b/ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.Designer.cs similarity index 91% rename from DZarsky.ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.Designer.cs rename to ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.Designer.cs index e6fe1d2..a0993ec 100644 --- a/DZarsky.ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.Designer.cs +++ b/ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.Designer.cs @@ -1,15 +1,16 @@ // using System; -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; +using ToDoAppTemplate.Data.Infrastructure.EF; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using ToDoAppTemplate.Data.Infrastructure.EF; #nullable disable -namespace DZarsky.ToDoAppTemplate.Data.Migrations +namespace ToDoAppTemplate.Data.Migrations { [DbContext(typeof(DataContext))] [Migration("20240121110228_AddPasswordResetCodes")] @@ -25,7 +26,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Todos.Todo", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Todos.Todo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -85,7 +86,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("Todos", (string)null); }); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Users.PasswordResetCode", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Users.PasswordResetCode", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -140,7 +141,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("PasswordResetCodes", (string)null); }); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Users.User", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Users.User", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -196,9 +197,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("Users", (string)null); }); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Todos.Todo", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Todos.Todo", b => { - b.HasOne("DZarsky.ToDoAppTemplate.Domain.Users.User", "Owner") + b.HasOne("ToDoAppTemplate.Domain.Users.User", "Owner") .WithMany("Todos") .HasForeignKey("OwnerId") .OnDelete(DeleteBehavior.Cascade) @@ -208,9 +209,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Navigation("Owner"); }); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Users.PasswordResetCode", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Users.PasswordResetCode", b => { - b.HasOne("DZarsky.ToDoAppTemplate.Domain.Users.User", "User") + b.HasOne("ToDoAppTemplate.Domain.Users.User", "User") .WithMany("PasswordResetCodes") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -220,7 +221,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Navigation("User"); }); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Users.User", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Users.User", b => { b.Navigation("PasswordResetCodes"); diff --git a/DZarsky.ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.cs b/ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.cs similarity index 98% rename from DZarsky.ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.cs rename to ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.cs index 84e8e15..a43c279 100644 --- a/DZarsky.ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.cs +++ b/ToDoAppTemplate.Data/Migrations/20240121110228_AddPasswordResetCodes.cs @@ -4,7 +4,7 @@ #nullable disable -namespace DZarsky.ToDoAppTemplate.Data.Migrations +namespace ToDoAppTemplate.Data.Migrations { /// public partial class AddPasswordResetCodes : Migration diff --git a/DZarsky.ToDoAppTemplate.Data/Migrations/DataContextModelSnapshot.cs b/ToDoAppTemplate.Data/Migrations/DataContextModelSnapshot.cs similarity index 91% rename from DZarsky.ToDoAppTemplate.Data/Migrations/DataContextModelSnapshot.cs rename to ToDoAppTemplate.Data/Migrations/DataContextModelSnapshot.cs index 9bca832..71c757c 100644 --- a/DZarsky.ToDoAppTemplate.Data/Migrations/DataContextModelSnapshot.cs +++ b/ToDoAppTemplate.Data/Migrations/DataContextModelSnapshot.cs @@ -1,14 +1,14 @@ // using System; -using DZarsky.ToDoAppTemplate.Data.Infrastructure.EF; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using ToDoAppTemplate.Data.Infrastructure.EF; #nullable disable -namespace DZarsky.ToDoAppTemplate.Data.Migrations +namespace ToDoAppTemplate.Data.Migrations { [DbContext(typeof(DataContext))] partial class DataContextModelSnapshot : ModelSnapshot @@ -22,7 +22,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Todos.Todo", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Todos.Todo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -82,7 +82,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Todos", (string)null); }); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Users.PasswordResetCode", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Users.PasswordResetCode", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -137,7 +137,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("PasswordResetCodes", (string)null); }); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Users.User", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Users.User", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -193,9 +193,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Users", (string)null); }); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Todos.Todo", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Todos.Todo", b => { - b.HasOne("DZarsky.ToDoAppTemplate.Domain.Users.User", "Owner") + b.HasOne("ToDoAppTemplate.Domain.Users.User", "Owner") .WithMany("Todos") .HasForeignKey("OwnerId") .OnDelete(DeleteBehavior.Cascade) @@ -205,9 +205,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Owner"); }); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Users.PasswordResetCode", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Users.PasswordResetCode", b => { - b.HasOne("DZarsky.ToDoAppTemplate.Domain.Users.User", "User") + b.HasOne("ToDoAppTemplate.Domain.Users.User", "User") .WithMany("PasswordResetCodes") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -217,7 +217,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("User"); }); - modelBuilder.Entity("DZarsky.ToDoAppTemplate.Domain.Users.User", b => + modelBuilder.Entity("ToDoAppTemplate.Domain.Users.User", b => { b.Navigation("PasswordResetCodes"); diff --git a/DZarsky.ToDoAppTemplate.Data/DZarsky.ToDoAppTemplate.Data.csproj b/ToDoAppTemplate.Data/ToDoAppTemplate.Data.csproj similarity index 83% rename from DZarsky.ToDoAppTemplate.Data/DZarsky.ToDoAppTemplate.Data.csproj rename to ToDoAppTemplate.Data/ToDoAppTemplate.Data.csproj index 4d57c51..571dc44 100644 --- a/DZarsky.ToDoAppTemplate.Data/DZarsky.ToDoAppTemplate.Data.csproj +++ b/ToDoAppTemplate.Data/ToDoAppTemplate.Data.csproj @@ -13,7 +13,7 @@ - + diff --git a/DZarsky.ToDoAppTemplate.Data/Todos/Mappings/TodoConfiguration.cs b/ToDoAppTemplate.Data/Todos/Mappings/TodoConfiguration.cs similarity index 68% rename from DZarsky.ToDoAppTemplate.Data/Todos/Mappings/TodoConfiguration.cs rename to ToDoAppTemplate.Data/Todos/Mappings/TodoConfiguration.cs index 6bd44ee..c36bfa2 100644 --- a/DZarsky.ToDoAppTemplate.Data/Todos/Mappings/TodoConfiguration.cs +++ b/ToDoAppTemplate.Data/Todos/Mappings/TodoConfiguration.cs @@ -1,9 +1,9 @@ -using DZarsky.ToDoAppTemplate.Data.Common.Constants; -using DZarsky.ToDoAppTemplate.Data.Common.Mappings; -using DZarsky.ToDoAppTemplate.Domain.Todos; +using ToDoAppTemplate.Domain.Todos; using Microsoft.EntityFrameworkCore.Metadata.Builders; +using ToDoAppTemplate.Data.Common.Constants; +using ToDoAppTemplate.Data.Common.Mappings; -namespace DZarsky.ToDoAppTemplate.Data.Todos.Mappings; +namespace ToDoAppTemplate.Data.Todos.Mappings; public sealed class TodoConfiguration() : BaseEntityConfiguration(Tables.Todos) { diff --git a/DZarsky.ToDoAppTemplate.Data/Users/Mappings/PasswordResetCodeConfiguration.cs b/ToDoAppTemplate.Data/Users/Mappings/PasswordResetCodeConfiguration.cs similarity index 70% rename from DZarsky.ToDoAppTemplate.Data/Users/Mappings/PasswordResetCodeConfiguration.cs rename to ToDoAppTemplate.Data/Users/Mappings/PasswordResetCodeConfiguration.cs index 4fdda4c..ac2dc8a 100644 --- a/DZarsky.ToDoAppTemplate.Data/Users/Mappings/PasswordResetCodeConfiguration.cs +++ b/ToDoAppTemplate.Data/Users/Mappings/PasswordResetCodeConfiguration.cs @@ -1,9 +1,9 @@ -using DZarsky.ToDoAppTemplate.Data.Common.Constants; -using DZarsky.ToDoAppTemplate.Data.Common.Mappings; -using DZarsky.ToDoAppTemplate.Domain.Users; +using ToDoAppTemplate.Domain.Users; using Microsoft.EntityFrameworkCore.Metadata.Builders; +using ToDoAppTemplate.Data.Common.Constants; +using ToDoAppTemplate.Data.Common.Mappings; -namespace DZarsky.ToDoAppTemplate.Data.Users.Mappings; +namespace ToDoAppTemplate.Data.Users.Mappings; public sealed class PasswordResetCodeConfiguration() : BaseEntityConfiguration(Tables.PasswordResetCodes) diff --git a/DZarsky.ToDoAppTemplate.Data/Users/Mappings/UserConfiguration.cs b/ToDoAppTemplate.Data/Users/Mappings/UserConfiguration.cs similarity index 79% rename from DZarsky.ToDoAppTemplate.Data/Users/Mappings/UserConfiguration.cs rename to ToDoAppTemplate.Data/Users/Mappings/UserConfiguration.cs index 6a4b17d..7b58526 100644 --- a/DZarsky.ToDoAppTemplate.Data/Users/Mappings/UserConfiguration.cs +++ b/ToDoAppTemplate.Data/Users/Mappings/UserConfiguration.cs @@ -1,10 +1,10 @@ -using DZarsky.ToDoAppTemplate.Data.Common.Constants; -using DZarsky.ToDoAppTemplate.Data.Common.Mappings; -using DZarsky.ToDoAppTemplate.Domain.Users; +using ToDoAppTemplate.Domain.Users; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; +using ToDoAppTemplate.Data.Common.Constants; +using ToDoAppTemplate.Data.Common.Mappings; -namespace DZarsky.ToDoAppTemplate.Data.Users.Mappings; +namespace ToDoAppTemplate.Data.Users.Mappings; public sealed class UserConfiguration() : BaseEntityConfiguration(Tables.Users) { diff --git a/DZarsky.ToDoAppTemplate.Domain/Common/BaseEntity.cs b/ToDoAppTemplate.Domain/Common/BaseEntity.cs similarity index 80% rename from DZarsky.ToDoAppTemplate.Domain/Common/BaseEntity.cs rename to ToDoAppTemplate.Domain/Common/BaseEntity.cs index 1434357..7f737ba 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Common/BaseEntity.cs +++ b/ToDoAppTemplate.Domain/Common/BaseEntity.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Domain.Common; +namespace ToDoAppTemplate.Domain.Common; public abstract class BaseEntity { diff --git a/DZarsky.ToDoAppTemplate.Domain/Common/Errors/ErrorDescription.cs b/ToDoAppTemplate.Domain/Common/Errors/ErrorDescription.cs similarity index 56% rename from DZarsky.ToDoAppTemplate.Domain/Common/Errors/ErrorDescription.cs rename to ToDoAppTemplate.Domain/Common/Errors/ErrorDescription.cs index 6efc1ff..85d5be5 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Common/Errors/ErrorDescription.cs +++ b/ToDoAppTemplate.Domain/Common/Errors/ErrorDescription.cs @@ -1,3 +1,3 @@ -namespace DZarsky.ToDoAppTemplate.Domain.Common.Errors; +namespace ToDoAppTemplate.Domain.Common.Errors; public sealed record ErrorDescription(string Key, string? Message = null); diff --git a/DZarsky.ToDoAppTemplate.Domain/Common/HttpClients.cs b/ToDoAppTemplate.Domain/Common/HttpClients.cs similarity index 63% rename from DZarsky.ToDoAppTemplate.Domain/Common/HttpClients.cs rename to ToDoAppTemplate.Domain/Common/HttpClients.cs index 97faa3e..4d6c731 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Common/HttpClients.cs +++ b/ToDoAppTemplate.Domain/Common/HttpClients.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Domain.Common; +namespace ToDoAppTemplate.Domain.Common; public static class HttpClients { diff --git a/DZarsky.ToDoAppTemplate.Domain/Common/IAuthenticatedRequest.cs b/ToDoAppTemplate.Domain/Common/IAuthenticatedRequest.cs similarity index 60% rename from DZarsky.ToDoAppTemplate.Domain/Common/IAuthenticatedRequest.cs rename to ToDoAppTemplate.Domain/Common/IAuthenticatedRequest.cs index 6e8e066..8f71239 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Common/IAuthenticatedRequest.cs +++ b/ToDoAppTemplate.Domain/Common/IAuthenticatedRequest.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Domain.Common; +namespace ToDoAppTemplate.Domain.Common; public interface IAuthenticatedRequest { diff --git a/DZarsky.ToDoAppTemplate.Domain/Common/MediatR/IMediatrBaseResult.cs b/ToDoAppTemplate.Domain/Common/MediatR/IMediatrBaseResult.cs similarity index 55% rename from DZarsky.ToDoAppTemplate.Domain/Common/MediatR/IMediatrBaseResult.cs rename to ToDoAppTemplate.Domain/Common/MediatR/IMediatrBaseResult.cs index 5dc7390..2e23118 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Common/MediatR/IMediatrBaseResult.cs +++ b/ToDoAppTemplate.Domain/Common/MediatR/IMediatrBaseResult.cs @@ -1,7 +1,7 @@ -using DZarsky.ToDoAppTemplate.Domain.Common.Errors; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Common.Errors; +using ToDoAppTemplate.Domain.Common.Results; -namespace DZarsky.ToDoAppTemplate.Domain.Common.MediatR; +namespace ToDoAppTemplate.Domain.Common.MediatR; public interface IMediatrBaseResult { diff --git a/DZarsky.ToDoAppTemplate.Domain/Common/MediatR/MediatrBaseResult.cs b/ToDoAppTemplate.Domain/Common/MediatR/MediatrBaseResult.cs similarity index 90% rename from DZarsky.ToDoAppTemplate.Domain/Common/MediatR/MediatrBaseResult.cs rename to ToDoAppTemplate.Domain/Common/MediatR/MediatrBaseResult.cs index bca908f..e4ea03a 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Common/MediatR/MediatrBaseResult.cs +++ b/ToDoAppTemplate.Domain/Common/MediatR/MediatrBaseResult.cs @@ -1,8 +1,8 @@ using System.Runtime.CompilerServices; -using DZarsky.ToDoAppTemplate.Domain.Common.Errors; -using DZarsky.ToDoAppTemplate.Domain.Common.Results; +using ToDoAppTemplate.Domain.Common.Errors; +using ToDoAppTemplate.Domain.Common.Results; -namespace DZarsky.ToDoAppTemplate.Domain.Common.MediatR; +namespace ToDoAppTemplate.Domain.Common.MediatR; public class MediatrBaseResult : IMediatrBaseResult where TResult : class { diff --git a/DZarsky.ToDoAppTemplate.Domain/Common/Requests/PagedRequest.cs b/ToDoAppTemplate.Domain/Common/Requests/PagedRequest.cs similarity index 74% rename from DZarsky.ToDoAppTemplate.Domain/Common/Requests/PagedRequest.cs rename to ToDoAppTemplate.Domain/Common/Requests/PagedRequest.cs index 49332ee..10eca0d 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Common/Requests/PagedRequest.cs +++ b/ToDoAppTemplate.Domain/Common/Requests/PagedRequest.cs @@ -1,5 +1,5 @@ // ReSharper disable MemberCanBeProtected.Global -namespace DZarsky.ToDoAppTemplate.Domain.Common.Requests; +namespace ToDoAppTemplate.Domain.Common.Requests; public class PagedRequest { diff --git a/DZarsky.ToDoAppTemplate.Domain/Common/Results/PagedResponse.cs b/ToDoAppTemplate.Domain/Common/Results/PagedResponse.cs similarity index 89% rename from DZarsky.ToDoAppTemplate.Domain/Common/Results/PagedResponse.cs rename to ToDoAppTemplate.Domain/Common/Results/PagedResponse.cs index 0585a76..71b4a30 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Common/Results/PagedResponse.cs +++ b/ToDoAppTemplate.Domain/Common/Results/PagedResponse.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Domain.Common.Results; +namespace ToDoAppTemplate.Domain.Common.Results; public class PagedResponse where TResponse : class { diff --git a/DZarsky.ToDoAppTemplate.Domain/Common/Results/ResultStatus.cs b/ToDoAppTemplate.Domain/Common/Results/ResultStatus.cs similarity index 72% rename from DZarsky.ToDoAppTemplate.Domain/Common/Results/ResultStatus.cs rename to ToDoAppTemplate.Domain/Common/Results/ResultStatus.cs index 1f85fc4..0dcac84 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Common/Results/ResultStatus.cs +++ b/ToDoAppTemplate.Domain/Common/Results/ResultStatus.cs @@ -1,4 +1,4 @@ -namespace DZarsky.ToDoAppTemplate.Domain.Common.Results; +namespace ToDoAppTemplate.Domain.Common.Results; public enum ResultStatus { diff --git a/DZarsky.ToDoAppTemplate.Domain/DZarsky.ToDoAppTemplate.Domain.csproj b/ToDoAppTemplate.Domain/ToDoAppTemplate.Domain.csproj similarity index 100% rename from DZarsky.ToDoAppTemplate.Domain/DZarsky.ToDoAppTemplate.Domain.csproj rename to ToDoAppTemplate.Domain/ToDoAppTemplate.Domain.csproj diff --git a/DZarsky.ToDoAppTemplate.Domain/Todos/Todo.cs b/ToDoAppTemplate.Domain/Todos/Todo.cs similarity index 70% rename from DZarsky.ToDoAppTemplate.Domain/Todos/Todo.cs rename to ToDoAppTemplate.Domain/Todos/Todo.cs index 8e09030..033574e 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Todos/Todo.cs +++ b/ToDoAppTemplate.Domain/Todos/Todo.cs @@ -1,7 +1,7 @@ -using DZarsky.ToDoAppTemplate.Domain.Common; -using DZarsky.ToDoAppTemplate.Domain.Users; +using ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Users; -namespace DZarsky.ToDoAppTemplate.Domain.Todos; +namespace ToDoAppTemplate.Domain.Todos; public sealed class Todo : BaseEntity { diff --git a/DZarsky.ToDoAppTemplate.Domain/Users/PasswordResetCode.cs b/ToDoAppTemplate.Domain/Users/PasswordResetCode.cs similarity index 88% rename from DZarsky.ToDoAppTemplate.Domain/Users/PasswordResetCode.cs rename to ToDoAppTemplate.Domain/Users/PasswordResetCode.cs index 56ff57e..62483fb 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Users/PasswordResetCode.cs +++ b/ToDoAppTemplate.Domain/Users/PasswordResetCode.cs @@ -1,7 +1,7 @@ using System.Security.Cryptography; -using DZarsky.ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Common; -namespace DZarsky.ToDoAppTemplate.Domain.Users; +namespace ToDoAppTemplate.Domain.Users; public sealed class PasswordResetCode : BaseEntity { diff --git a/DZarsky.ToDoAppTemplate.Domain/Users/User.cs b/ToDoAppTemplate.Domain/Users/User.cs similarity index 74% rename from DZarsky.ToDoAppTemplate.Domain/Users/User.cs rename to ToDoAppTemplate.Domain/Users/User.cs index ab959f3..566577e 100644 --- a/DZarsky.ToDoAppTemplate.Domain/Users/User.cs +++ b/ToDoAppTemplate.Domain/Users/User.cs @@ -1,7 +1,7 @@ -using DZarsky.ToDoAppTemplate.Domain.Common; -using DZarsky.ToDoAppTemplate.Domain.Todos; +using ToDoAppTemplate.Domain.Common; +using ToDoAppTemplate.Domain.Todos; -namespace DZarsky.ToDoAppTemplate.Domain.Users; +namespace ToDoAppTemplate.Domain.Users; public sealed class User : BaseEntity { diff --git a/DZarsky.ToDoAppTemplate.sln b/ToDoAppTemplate.sln similarity index 69% rename from DZarsky.ToDoAppTemplate.sln rename to ToDoAppTemplate.sln index 53797b4..e4b2a37 100644 --- a/DZarsky.ToDoAppTemplate.sln +++ b/ToDoAppTemplate.sln @@ -1,19 +1,19 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DZarsky.ToDoAppTemplate.Api", "DZarsky.ToDoAppTemplate.Api\DZarsky.ToDoAppTemplate.Api.csproj", "{5350B641-A885-4200-9EBB-A8D5E3AF8E97}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToDoAppTemplate.Api", "ToDoAppTemplate.Api\ToDoAppTemplate.Api.csproj", "{5350B641-A885-4200-9EBB-A8D5E3AF8E97}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DZarsky.ToDoAppTemplate.Domain", "DZarsky.ToDoAppTemplate.Domain\DZarsky.ToDoAppTemplate.Domain.csproj", "{F3F1BF18-D6E3-4A82-8399-961EC71398EB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToDoAppTemplate.Domain", "ToDoAppTemplate.Domain\ToDoAppTemplate.Domain.csproj", "{F3F1BF18-D6E3-4A82-8399-961EC71398EB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DZarsky.ToDoAppTemplate.Data", "DZarsky.ToDoAppTemplate.Data\DZarsky.ToDoAppTemplate.Data.csproj", "{4DC00F26-D2A1-4DDE-A4C2-420453190C9E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToDoAppTemplate.Data", "ToDoAppTemplate.Data\ToDoAppTemplate.Data.csproj", "{4DC00F26-D2A1-4DDE-A4C2-420453190C9E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DZarsky.ToDoAppTemplate.Core", "DZarsky.ToDoAppTemplate.Core\DZarsky.ToDoAppTemplate.Core.csproj", "{B3184BB2-C62F-4935-AE69-A80763B3B06A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToDoAppTemplate.Core", "ToDoAppTemplate.Core\ToDoAppTemplate.Core.csproj", "{B3184BB2-C62F-4935-AE69-A80763B3B06A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7257A7A7-7B34-4C37-8F33-ADDEBB4A3A95}" ProjectSection(SolutionItems) = preProject docker-compose.yml = docker-compose.yml EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DZarsky.ToDoAppTemplate.Application", "DZarsky.ToDoAppTemplate.Application\DZarsky.ToDoAppTemplate.Application.csproj", "{FFC9ABAE-F4A1-4378-AC91-DE5974C24343}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToDoAppTemplate.Application", "ToDoAppTemplate.Application\ToDoAppTemplate.Application.csproj", "{FFC9ABAE-F4A1-4378-AC91-DE5974C24343}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/docker-compose.yml b/docker-compose.yml index 526fab7..1cdf233 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,16 +1,16 @@ services: - dzarsky.todoapptemplate.api: - image: dzarsky.todoapptemplate.api + todoapptemplate.api: + image: todoapptemplate.api depends_on: - - db + - db build: context: . - dockerfile: DZarsky.ToDoAppTemplate.Api/Dockerfile + dockerfile: ToDoAppTemplate.Api/Dockerfile links: - "db:postgres" ports: - - "31255:8080" - - "31256:8081" + - "31255:8080" + - "31256:8081" db: image: postgres:15-alpine3.19 environment: @@ -18,7 +18,7 @@ POSTGRES_PASSWORD: TOD0app24 POSTGRES_DB: todoapp ports: - - "31257:5432" + - "31257:5432" volumes: - pgdata-todoapp:/var/lib/postgresql/data volumes: