diff --git a/Dockerfile b/Dockerfile index a20303b..a72abbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,18 +10,18 @@ USER app FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src -COPY ["src/WebApi/WebApi.csproj", "src/WebApi/"] -RUN dotnet restore "./src/WebApi/WebApi.csproj" +COPY ["src/Vegasco.Server.Api/Vegasco.Server.Api.csproj", "src/Vegasco.Server.Api/"] +RUN dotnet restore "./src/Vegasco.Server.Api/Vegasco.Server.Api.csproj" COPY . . -WORKDIR "/src/src/WebApi" -RUN dotnet build "./WebApi.csproj" -c $BUILD_CONFIGURATION -o /app/build +WORKDIR "/src/src/Vegasco.Server.Api" +RUN dotnet build "./Vegasco.Server.Api.csproj" -c $BUILD_CONFIGURATION -o /app/build FROM build AS publish ARG BUILD_CONFIGURATION=Release -RUN dotnet publish "./WebApi.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false +RUN dotnet publish "./Vegasco.Server.Api.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . HEALTHCHECK --interval=20s --timeout=1s --start-period=10s --retries=3 CMD curl --fail http://localhost:8080/health || exit 1 -ENTRYPOINT ["dotnet", "WebApi.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "Vegasco.Server.Api.dll"] \ No newline at end of file diff --git a/README.md b/README.md index aed75ba..54c564d 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ As appsettings.json (or a environment specific appsettings.*.json): ### Running the application The solution uses Aspire to orchestrate the application. Specifically, it introduces sensible service defaults, including but not limited to OpenTelemetry, -creates a Postgres database as a docker container, and starts the WebApi with the correct configuration to communicate with the database. +creates a Postgres database as a docker container, and starts the Api with the correct configuration to communicate with the database. Ensure you have an identity provider set up, for example Keycloak, and configured the relevant options described above. diff --git a/src/WebApi/Assembly.cs b/src/Vegasco.Server.Api/Assembly.cs similarity index 100% rename from src/WebApi/Assembly.cs rename to src/Vegasco.Server.Api/Assembly.cs diff --git a/src/WebApi/Authentication/JwtOptions.cs b/src/Vegasco.Server.Api/Authentication/JwtOptions.cs similarity index 91% rename from src/WebApi/Authentication/JwtOptions.cs rename to src/Vegasco.Server.Api/Authentication/JwtOptions.cs index ae44dbe..bb9073d 100644 --- a/src/WebApi/Authentication/JwtOptions.cs +++ b/src/Vegasco.Server.Api/Authentication/JwtOptions.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace Vegasco.WebApi.Authentication; +namespace Vegasco.Server.Api.Authentication; public class JwtOptions { diff --git a/src/WebApi/Authentication/UserAccessor.cs b/src/Vegasco.Server.Api/Authentication/UserAccessor.cs similarity index 97% rename from src/WebApi/Authentication/UserAccessor.cs rename to src/Vegasco.Server.Api/Authentication/UserAccessor.cs index 0b16e67..989d7bf 100644 --- a/src/WebApi/Authentication/UserAccessor.cs +++ b/src/Vegasco.Server.Api/Authentication/UserAccessor.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using System.Security.Claims; -namespace Vegasco.WebApi.Authentication; +namespace Vegasco.Server.Api.Authentication; public sealed class UserAccessor { diff --git a/src/WebApi/Cars/Car.cs b/src/Vegasco.Server.Api/Cars/Car.cs similarity index 88% rename from src/WebApi/Cars/Car.cs rename to src/Vegasco.Server.Api/Cars/Car.cs index 6e72bc4..b506d60 100644 --- a/src/WebApi/Cars/Car.cs +++ b/src/Vegasco.Server.Api/Cars/Car.cs @@ -1,9 +1,9 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Vegasco.WebApi.Consumptions; -using Vegasco.WebApi.Users; +using Vegasco.Server.Api.Consumptions; +using Vegasco.Server.Api.Users; -namespace Vegasco.WebApi.Cars; +namespace Vegasco.Server.Api.Cars; public class Car { diff --git a/src/WebApi/Cars/CarId.cs b/src/Vegasco.Server.Api/Cars/CarId.cs similarity index 68% rename from src/WebApi/Cars/CarId.cs rename to src/Vegasco.Server.Api/Cars/CarId.cs index f901160..86ea23e 100644 --- a/src/WebApi/Cars/CarId.cs +++ b/src/Vegasco.Server.Api/Cars/CarId.cs @@ -1,6 +1,6 @@ using StronglyTypedIds; -namespace Vegasco.WebApi.Cars; +namespace Vegasco.Server.Api.Cars; [StronglyTypedId] public partial struct CarId; diff --git a/src/WebApi/Cars/CreateCar.cs b/src/Vegasco.Server.Api/Cars/CreateCar.cs similarity index 89% rename from src/WebApi/Cars/CreateCar.cs rename to src/Vegasco.Server.Api/Cars/CreateCar.cs index b968b85..d254b6b 100644 --- a/src/WebApi/Cars/CreateCar.cs +++ b/src/Vegasco.Server.Api/Cars/CreateCar.cs @@ -1,11 +1,11 @@ using FluentValidation; using FluentValidation.Results; -using Vegasco.WebApi.Authentication; -using Vegasco.WebApi.Common; -using Vegasco.WebApi.Persistence; -using Vegasco.WebApi.Users; +using Vegasco.Server.Api.Authentication; +using Vegasco.Server.Api.Common; +using Vegasco.Server.Api.Persistence; +using Vegasco.Server.Api.Users; -namespace Vegasco.WebApi.Cars; +namespace Vegasco.Server.Api.Cars; public static class CreateCar { diff --git a/src/WebApi/Cars/DeleteCar.cs b/src/Vegasco.Server.Api/Cars/DeleteCar.cs similarity index 89% rename from src/WebApi/Cars/DeleteCar.cs rename to src/Vegasco.Server.Api/Cars/DeleteCar.cs index 638ed4b..c78eff0 100644 --- a/src/WebApi/Cars/DeleteCar.cs +++ b/src/Vegasco.Server.Api/Cars/DeleteCar.cs @@ -1,6 +1,6 @@ -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Persistence; -namespace Vegasco.WebApi.Cars; +namespace Vegasco.Server.Api.Cars; public static class DeleteCar { diff --git a/src/WebApi/Cars/GetCar.cs b/src/Vegasco.Server.Api/Cars/GetCar.cs similarity index 89% rename from src/WebApi/Cars/GetCar.cs rename to src/Vegasco.Server.Api/Cars/GetCar.cs index beb8432..9fd6955 100644 --- a/src/WebApi/Cars/GetCar.cs +++ b/src/Vegasco.Server.Api/Cars/GetCar.cs @@ -1,6 +1,6 @@ -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Persistence; -namespace Vegasco.WebApi.Cars; +namespace Vegasco.Server.Api.Cars; public static class GetCar { diff --git a/src/WebApi/Cars/GetCars.cs b/src/Vegasco.Server.Api/Cars/GetCars.cs similarity index 93% rename from src/WebApi/Cars/GetCars.cs rename to src/Vegasco.Server.Api/Cars/GetCars.cs index 14d0c5e..cb4ce6e 100644 --- a/src/WebApi/Cars/GetCars.cs +++ b/src/Vegasco.Server.Api/Cars/GetCars.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Persistence; -namespace Vegasco.WebApi.Cars; +namespace Vegasco.Server.Api.Cars; public static class GetCars { diff --git a/src/WebApi/Cars/UpdateCar.cs b/src/Vegasco.Server.Api/Cars/UpdateCar.cs similarity index 90% rename from src/WebApi/Cars/UpdateCar.cs rename to src/Vegasco.Server.Api/Cars/UpdateCar.cs index 38b27a9..2e06c52 100644 --- a/src/WebApi/Cars/UpdateCar.cs +++ b/src/Vegasco.Server.Api/Cars/UpdateCar.cs @@ -1,10 +1,10 @@ using FluentValidation; using FluentValidation.Results; -using Vegasco.WebApi.Authentication; -using Vegasco.WebApi.Common; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Authentication; +using Vegasco.Server.Api.Common; +using Vegasco.Server.Api.Persistence; -namespace Vegasco.WebApi.Cars; +namespace Vegasco.Server.Api.Cars; public static class UpdateCar { diff --git a/src/WebApi/Common/Constants.cs b/src/Vegasco.Server.Api/Common/Constants.cs similarity index 79% rename from src/WebApi/Common/Constants.cs rename to src/Vegasco.Server.Api/Common/Constants.cs index c160ccc..5e4b521 100644 --- a/src/WebApi/Common/Constants.cs +++ b/src/Vegasco.Server.Api/Common/Constants.cs @@ -1,4 +1,4 @@ -namespace Vegasco.WebApi.Common; +namespace Vegasco.Server.Api.Common; public static class Constants { diff --git a/src/WebApi/Common/DependencyInjectionExtensions.cs b/src/Vegasco.Server.Api/Common/DependencyInjectionExtensions.cs similarity index 88% rename from src/WebApi/Common/DependencyInjectionExtensions.cs rename to src/Vegasco.Server.Api/Common/DependencyInjectionExtensions.cs index 7bd4fdf..041b3dd 100644 --- a/src/WebApi/Common/DependencyInjectionExtensions.cs +++ b/src/Vegasco.Server.Api/Common/DependencyInjectionExtensions.cs @@ -2,18 +2,19 @@ using FluentValidation; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.Options; -using Vegasco.WebApi.Authentication; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Authentication; +using Vegasco.Server.Api.Common; +using Vegasco.Server.Api.Persistence; -namespace Vegasco.WebApi.Common; +namespace Vegasco.Server.Api.Common; public static class DependencyInjectionExtensions { /// - /// Adds all the WebApi related services to the Dependency Injection container. + /// Adds all the Api related services to the Dependency Injection container. /// /// - public static void AddWebApiServices(this IHostApplicationBuilder builder) + public static void AddApiServices(this IHostApplicationBuilder builder) { builder.Services .AddMiscellaneousServices() @@ -30,7 +31,7 @@ public static class DependencyInjectionExtensions services.AddValidatorsFromAssemblies( [ - typeof(IWebApiMarker).Assembly + typeof(IApiMarker).Assembly ], ServiceLifetime.Singleton); services.AddHealthChecks(); @@ -125,7 +126,7 @@ public static class DependencyInjectionExtensions private static IHostApplicationBuilder AddDbContext(this IHostApplicationBuilder builder) { - builder.AddNpgsqlDbContext(Server.AppHost.Shared.Constants.Database.Name); + builder.AddNpgsqlDbContext(AppHost.Shared.Constants.Database.Name); return builder; } } diff --git a/src/WebApi/Common/FluentValidationOptions.cs b/src/Vegasco.Server.Api/Common/FluentValidationOptions.cs similarity index 96% rename from src/WebApi/Common/FluentValidationOptions.cs rename to src/Vegasco.Server.Api/Common/FluentValidationOptions.cs index 3131736..eaa3164 100644 --- a/src/WebApi/Common/FluentValidationOptions.cs +++ b/src/Vegasco.Server.Api/Common/FluentValidationOptions.cs @@ -2,7 +2,7 @@ using FluentValidation.Results; using Microsoft.Extensions.Options; -namespace Vegasco.WebApi.Common; +namespace Vegasco.Server.Api.Common; public class FluentValidationOptions : IValidateOptions where TOptions : class diff --git a/src/Vegasco.Server.Api/Common/IApiMarker.cs b/src/Vegasco.Server.Api/Common/IApiMarker.cs new file mode 100644 index 0000000..643d2b3 --- /dev/null +++ b/src/Vegasco.Server.Api/Common/IApiMarker.cs @@ -0,0 +1,3 @@ +namespace Vegasco.Server.Api.Common; + +public interface IApiMarker; diff --git a/src/WebApi/Common/StartupExtensions.cs b/src/Vegasco.Server.Api/Common/StartupExtensions.cs similarity index 87% rename from src/WebApi/Common/StartupExtensions.cs rename to src/Vegasco.Server.Api/Common/StartupExtensions.cs index 54f077b..be0f48e 100644 --- a/src/WebApi/Common/StartupExtensions.cs +++ b/src/Vegasco.Server.Api/Common/StartupExtensions.cs @@ -1,8 +1,9 @@ using Microsoft.AspNetCore.Localization; using System.Globalization; -using Vegasco.WebApi.Endpoints; +using Vegasco.Server.Api.Endpoints; +using Vegasco.Server.ServiceDefaults; -namespace Vegasco.WebApi.Common; +namespace Vegasco.Server.Api.Common; internal static class StartupExtensions { @@ -12,7 +13,7 @@ internal static class StartupExtensions builder.Configuration.AddEnvironmentVariables("Vegasco_"); - builder.AddWebApiServices(); + builder.AddApiServices(); WebApplication app = builder.Build(); return app; diff --git a/src/WebApi/Common/ValidatorExtensions.cs b/src/Vegasco.Server.Api/Common/ValidatorExtensions.cs similarity index 96% rename from src/WebApi/Common/ValidatorExtensions.cs rename to src/Vegasco.Server.Api/Common/ValidatorExtensions.cs index f574e18..b93bb68 100644 --- a/src/WebApi/Common/ValidatorExtensions.cs +++ b/src/Vegasco.Server.Api/Common/ValidatorExtensions.cs @@ -2,7 +2,7 @@ using FluentValidation.Results; using Microsoft.Extensions.Options; -namespace Vegasco.WebApi.Common; +namespace Vegasco.Server.Api.Common; public static class ValidatorExtensions { @@ -38,7 +38,7 @@ public static class ValidatorExtensions { if (!combinedErrors.TryGetValue(error.PropertyName, out HashSet? value)) { - value = ([error.ErrorMessage]); + value = [error.ErrorMessage]; combinedErrors[error.PropertyName] = value; continue; } diff --git a/src/WebApi/Consumptions/Consumption.cs b/src/Vegasco.Server.Api/Consumptions/Consumption.cs similarity index 93% rename from src/WebApi/Consumptions/Consumption.cs rename to src/Vegasco.Server.Api/Consumptions/Consumption.cs index 3476e31..869b6af 100644 --- a/src/WebApi/Consumptions/Consumption.cs +++ b/src/Vegasco.Server.Api/Consumptions/Consumption.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Vegasco.WebApi.Cars; +using Vegasco.Server.Api.Cars; -namespace Vegasco.WebApi.Consumptions; +namespace Vegasco.Server.Api.Consumptions; public class Consumption { diff --git a/src/WebApi/Consumptions/ConsumptionId.cs b/src/Vegasco.Server.Api/Consumptions/ConsumptionId.cs similarity index 66% rename from src/WebApi/Consumptions/ConsumptionId.cs rename to src/Vegasco.Server.Api/Consumptions/ConsumptionId.cs index 5494b4a..e4936fb 100644 --- a/src/WebApi/Consumptions/ConsumptionId.cs +++ b/src/Vegasco.Server.Api/Consumptions/ConsumptionId.cs @@ -1,6 +1,6 @@ using StronglyTypedIds; -namespace Vegasco.WebApi.Consumptions; +namespace Vegasco.Server.Api.Consumptions; [StronglyTypedId] diff --git a/src/WebApi/Consumptions/CreateConsumption.cs b/src/Vegasco.Server.Api/Consumptions/CreateConsumption.cs similarity index 93% rename from src/WebApi/Consumptions/CreateConsumption.cs rename to src/Vegasco.Server.Api/Consumptions/CreateConsumption.cs index 7d5def3..b890632 100644 --- a/src/WebApi/Consumptions/CreateConsumption.cs +++ b/src/Vegasco.Server.Api/Consumptions/CreateConsumption.cs @@ -1,10 +1,10 @@ using FluentValidation; using FluentValidation.Results; -using Vegasco.WebApi.Cars; -using Vegasco.WebApi.Common; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Cars; +using Vegasco.Server.Api.Common; +using Vegasco.Server.Api.Persistence; -namespace Vegasco.WebApi.Consumptions; +namespace Vegasco.Server.Api.Consumptions; public static class CreateConsumption { diff --git a/src/WebApi/Consumptions/DeleteConsumptions.cs b/src/Vegasco.Server.Api/Consumptions/DeleteConsumptions.cs similarity index 89% rename from src/WebApi/Consumptions/DeleteConsumptions.cs rename to src/Vegasco.Server.Api/Consumptions/DeleteConsumptions.cs index aa93da5..8b6f4e9 100644 --- a/src/WebApi/Consumptions/DeleteConsumptions.cs +++ b/src/Vegasco.Server.Api/Consumptions/DeleteConsumptions.cs @@ -1,6 +1,6 @@ -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Persistence; -namespace Vegasco.WebApi.Consumptions; +namespace Vegasco.Server.Api.Consumptions; public static class DeleteConsumption { diff --git a/src/WebApi/Consumptions/GetConsumption.cs b/src/Vegasco.Server.Api/Consumptions/GetConsumption.cs similarity index 91% rename from src/WebApi/Consumptions/GetConsumption.cs rename to src/Vegasco.Server.Api/Consumptions/GetConsumption.cs index bcb9882..2f29fc8 100644 --- a/src/WebApi/Consumptions/GetConsumption.cs +++ b/src/Vegasco.Server.Api/Consumptions/GetConsumption.cs @@ -1,6 +1,6 @@ -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Persistence; -namespace Vegasco.WebApi.Consumptions; +namespace Vegasco.Server.Api.Consumptions; public static class GetConsumption { diff --git a/src/WebApi/Consumptions/GetConsumptions.cs b/src/Vegasco.Server.Api/Consumptions/GetConsumptions.cs similarity index 94% rename from src/WebApi/Consumptions/GetConsumptions.cs rename to src/Vegasco.Server.Api/Consumptions/GetConsumptions.cs index 9168366..84fcebd 100644 --- a/src/WebApi/Consumptions/GetConsumptions.cs +++ b/src/Vegasco.Server.Api/Consumptions/GetConsumptions.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Persistence; -namespace Vegasco.WebApi.Consumptions; +namespace Vegasco.Server.Api.Consumptions; public static class GetConsumptions { diff --git a/src/WebApi/Consumptions/UpdateConsumption.cs b/src/Vegasco.Server.Api/Consumptions/UpdateConsumption.cs similarity index 94% rename from src/WebApi/Consumptions/UpdateConsumption.cs rename to src/Vegasco.Server.Api/Consumptions/UpdateConsumption.cs index 8d27bad..868946a 100644 --- a/src/WebApi/Consumptions/UpdateConsumption.cs +++ b/src/Vegasco.Server.Api/Consumptions/UpdateConsumption.cs @@ -1,9 +1,9 @@ using FluentValidation; using FluentValidation.Results; -using Vegasco.WebApi.Common; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Common; +using Vegasco.Server.Api.Persistence; -namespace Vegasco.WebApi.Consumptions; +namespace Vegasco.Server.Api.Consumptions; public static class UpdateConsumption { diff --git a/src/WebApi/Endpoints/EndpointExtensions.cs b/src/Vegasco.Server.Api/Endpoints/EndpointExtensions.cs similarity index 81% rename from src/WebApi/Endpoints/EndpointExtensions.cs rename to src/Vegasco.Server.Api/Endpoints/EndpointExtensions.cs index 599ff6d..c389ef7 100644 --- a/src/WebApi/Endpoints/EndpointExtensions.cs +++ b/src/Vegasco.Server.Api/Endpoints/EndpointExtensions.cs @@ -1,12 +1,11 @@ using Asp.Versioning.Builder; using Asp.Versioning.Conventions; -using Microsoft.Extensions.DependencyInjection.Extensions; -using Vegasco.WebApi.Cars; -using Vegasco.WebApi.Common; -using Vegasco.WebApi.Consumptions; -using Vegasco.WebApi.Info; +using Vegasco.Server.Api.Cars; +using Vegasco.Server.Api.Common; +using Vegasco.Server.Api.Consumptions; +using Vegasco.Server.Api.Info; -namespace Vegasco.WebApi.Endpoints; +namespace Vegasco.Server.Api.Endpoints; public static class EndpointExtensions { diff --git a/src/WebApi/Info/GetServerInfo.cs b/src/Vegasco.Server.Api/Info/GetServerInfo.cs similarity index 95% rename from src/WebApi/Info/GetServerInfo.cs rename to src/Vegasco.Server.Api/Info/GetServerInfo.cs index f63cd73..730b83b 100644 --- a/src/WebApi/Info/GetServerInfo.cs +++ b/src/Vegasco.Server.Api/Info/GetServerInfo.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Http.HttpResults; -namespace Vegasco.WebApi.Info; +namespace Vegasco.Server.Api.Info; public class GetServerInfo { diff --git a/src/WebApi/Persistence/ApplicationDbContext.cs b/src/Vegasco.Server.Api/Persistence/ApplicationDbContext.cs similarity index 60% rename from src/WebApi/Persistence/ApplicationDbContext.cs rename to src/Vegasco.Server.Api/Persistence/ApplicationDbContext.cs index 6c436c9..1b35885 100644 --- a/src/WebApi/Persistence/ApplicationDbContext.cs +++ b/src/Vegasco.Server.Api/Persistence/ApplicationDbContext.cs @@ -1,10 +1,10 @@ using Microsoft.EntityFrameworkCore; -using Vegasco.WebApi.Cars; -using Vegasco.WebApi.Common; -using Vegasco.WebApi.Consumptions; -using Vegasco.WebApi.Users; +using Vegasco.Server.Api.Cars; +using Vegasco.Server.Api.Common; +using Vegasco.Server.Api.Consumptions; +using Vegasco.Server.Api.Users; -namespace Vegasco.WebApi.Persistence; +namespace Vegasco.Server.Api.Persistence; public class ApplicationDbContext(DbContextOptions options) : DbContext(options) { @@ -17,6 +17,6 @@ public class ApplicationDbContext(DbContextOptions options protected override void OnModelCreating(ModelBuilder modelBuilder) { base.OnModelCreating(modelBuilder); - modelBuilder.ApplyConfigurationsFromAssembly(typeof(IWebApiMarker).Assembly); + modelBuilder.ApplyConfigurationsFromAssembly(typeof(IApiMarker).Assembly); } } diff --git a/src/WebApi/Persistence/ApplyMigrationsService.cs b/src/Vegasco.Server.Api/Persistence/ApplyMigrationsService.cs similarity index 93% rename from src/WebApi/Persistence/ApplyMigrationsService.cs rename to src/Vegasco.Server.Api/Persistence/ApplyMigrationsService.cs index c135ed1..19b9d70 100644 --- a/src/WebApi/Persistence/ApplyMigrationsService.cs +++ b/src/Vegasco.Server.Api/Persistence/ApplyMigrationsService.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore; -namespace Vegasco.WebApi.Persistence; +namespace Vegasco.Server.Api.Persistence; public class ApplyMigrationsService(ILogger logger, IServiceScopeFactory scopeFactory) : IHostedService diff --git a/src/WebApi/Persistence/Migrations/20240818105918_Initial.Designer.cs b/src/Vegasco.Server.Api/Persistence/Migrations/20240818105918_Initial.Designer.cs similarity index 81% rename from src/WebApi/Persistence/Migrations/20240818105918_Initial.Designer.cs rename to src/Vegasco.Server.Api/Persistence/Migrations/20240818105918_Initial.Designer.cs index 046955c..9e48148 100644 --- a/src/WebApi/Persistence/Migrations/20240818105918_Initial.Designer.cs +++ b/src/Vegasco.Server.Api/Persistence/Migrations/20240818105918_Initial.Designer.cs @@ -5,11 +5,12 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Persistence; + #nullable disable -namespace Vegasco.WebApi.Persistence.Migrations +namespace Vegasco.Server.Api.Persistence.Migrations { [DbContext(typeof(ApplicationDbContext))] [Migration("20240818105918_Initial")] @@ -25,7 +26,7 @@ namespace Vegasco.WebApi.Persistence.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Vegasco.WebApi.Cars.Car", b => + modelBuilder.Entity("Vegasco.Server.Api.Cars.Car", b => { b.Property("Id") .HasColumnType("uuid"); @@ -46,7 +47,7 @@ namespace Vegasco.WebApi.Persistence.Migrations b.ToTable("Cars"); }); - modelBuilder.Entity("Vegasco.WebApi.Consumptions.Consumption", b => + modelBuilder.Entity("Vegasco.Server.Api.Consumptions.Consumption", b => { b.Property("Id") .HasColumnType("uuid"); @@ -73,7 +74,7 @@ namespace Vegasco.WebApi.Persistence.Migrations b.ToTable("Consumptions"); }); - modelBuilder.Entity("Vegasco.WebApi.Users.User", b => + modelBuilder.Entity("Vegasco.Server.Api.Users.User", b => { b.Property("Id") .HasColumnType("text"); @@ -83,9 +84,9 @@ namespace Vegasco.WebApi.Persistence.Migrations b.ToTable("Users"); }); - modelBuilder.Entity("Vegasco.WebApi.Cars.Car", b => + modelBuilder.Entity("Vegasco.Server.Api.Cars.Car", b => { - b.HasOne("Vegasco.WebApi.Users.User", "User") + b.HasOne("Vegasco.Server.Api.Users.User", "User") .WithMany("Cars") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -94,9 +95,9 @@ namespace Vegasco.WebApi.Persistence.Migrations b.Navigation("User"); }); - modelBuilder.Entity("Vegasco.WebApi.Consumptions.Consumption", b => + modelBuilder.Entity("Vegasco.Server.Api.Consumptions.Consumption", b => { - b.HasOne("Vegasco.WebApi.Cars.Car", "Car") + b.HasOne("Vegasco.Server.Api.Cars.Car", "Car") .WithMany("Consumptions") .HasForeignKey("CarId") .OnDelete(DeleteBehavior.Cascade) @@ -105,12 +106,12 @@ namespace Vegasco.WebApi.Persistence.Migrations b.Navigation("Car"); }); - modelBuilder.Entity("Vegasco.WebApi.Cars.Car", b => + modelBuilder.Entity("Vegasco.Server.Api.Cars.Car", b => { b.Navigation("Consumptions"); }); - modelBuilder.Entity("Vegasco.WebApi.Users.User", b => + modelBuilder.Entity("Vegasco.Server.Api.Users.User", b => { b.Navigation("Cars"); }); diff --git a/src/WebApi/Persistence/Migrations/20240818105918_Initial.cs b/src/Vegasco.Server.Api/Persistence/Migrations/20240818105918_Initial.cs similarity index 96% rename from src/WebApi/Persistence/Migrations/20240818105918_Initial.cs rename to src/Vegasco.Server.Api/Persistence/Migrations/20240818105918_Initial.cs index be2f349..90e5b37 100644 --- a/src/WebApi/Persistence/Migrations/20240818105918_Initial.cs +++ b/src/Vegasco.Server.Api/Persistence/Migrations/20240818105918_Initial.cs @@ -1,9 +1,8 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace Vegasco.WebApi.Persistence.Migrations +namespace Vegasco.Server.Api.Persistence.Migrations { /// public partial class Initial : Migration diff --git a/src/WebApi/Persistence/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Vegasco.Server.Api/Persistence/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 80% rename from src/WebApi/Persistence/Migrations/ApplicationDbContextModelSnapshot.cs rename to src/Vegasco.Server.Api/Persistence/Migrations/ApplicationDbContextModelSnapshot.cs index 390dc72..c29dadd 100644 --- a/src/WebApi/Persistence/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Vegasco.Server.Api/Persistence/Migrations/ApplicationDbContextModelSnapshot.cs @@ -4,11 +4,12 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Persistence; + #nullable disable -namespace Vegasco.WebApi.Persistence.Migrations +namespace Vegasco.Server.Api.Persistence.Migrations { [DbContext(typeof(ApplicationDbContext))] partial class ApplicationDbContextModelSnapshot : ModelSnapshot @@ -22,7 +23,7 @@ namespace Vegasco.WebApi.Persistence.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Vegasco.WebApi.Cars.Car", b => + modelBuilder.Entity("Vegasco.Server.Api.Cars.Car", b => { b.Property("Id") .HasColumnType("uuid"); @@ -43,7 +44,7 @@ namespace Vegasco.WebApi.Persistence.Migrations b.ToTable("Cars"); }); - modelBuilder.Entity("Vegasco.WebApi.Consumptions.Consumption", b => + modelBuilder.Entity("Vegasco.Server.Api.Consumptions.Consumption", b => { b.Property("Id") .HasColumnType("uuid"); @@ -70,7 +71,7 @@ namespace Vegasco.WebApi.Persistence.Migrations b.ToTable("Consumptions"); }); - modelBuilder.Entity("Vegasco.WebApi.Users.User", b => + modelBuilder.Entity("Vegasco.Server.Api.Users.User", b => { b.Property("Id") .HasColumnType("text"); @@ -80,9 +81,9 @@ namespace Vegasco.WebApi.Persistence.Migrations b.ToTable("Users"); }); - modelBuilder.Entity("Vegasco.WebApi.Cars.Car", b => + modelBuilder.Entity("Vegasco.Server.Api.Cars.Car", b => { - b.HasOne("Vegasco.WebApi.Users.User", "User") + b.HasOne("Vegasco.Server.Api.Users.User", "User") .WithMany("Cars") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -91,9 +92,9 @@ namespace Vegasco.WebApi.Persistence.Migrations b.Navigation("User"); }); - modelBuilder.Entity("Vegasco.WebApi.Consumptions.Consumption", b => + modelBuilder.Entity("Vegasco.Server.Api.Consumptions.Consumption", b => { - b.HasOne("Vegasco.WebApi.Cars.Car", "Car") + b.HasOne("Vegasco.Server.Api.Cars.Car", "Car") .WithMany("Consumptions") .HasForeignKey("CarId") .OnDelete(DeleteBehavior.Cascade) @@ -102,12 +103,12 @@ namespace Vegasco.WebApi.Persistence.Migrations b.Navigation("Car"); }); - modelBuilder.Entity("Vegasco.WebApi.Cars.Car", b => + modelBuilder.Entity("Vegasco.Server.Api.Cars.Car", b => { b.Navigation("Consumptions"); }); - modelBuilder.Entity("Vegasco.WebApi.Users.User", b => + modelBuilder.Entity("Vegasco.Server.Api.Users.User", b => { b.Navigation("Cars"); }); diff --git a/src/WebApi/Program.cs b/src/Vegasco.Server.Api/Program.cs similarity index 74% rename from src/WebApi/Program.cs rename to src/Vegasco.Server.Api/Program.cs index fd643eb..6a2b441 100644 --- a/src/WebApi/Program.cs +++ b/src/Vegasco.Server.Api/Program.cs @@ -1,4 +1,4 @@ -using Vegasco.WebApi.Common; +using Vegasco.Server.Api.Common; WebApplication.CreateBuilder(args) .ConfigureServices() diff --git a/src/WebApi/Properties/launchSettings.json b/src/Vegasco.Server.Api/Properties/launchSettings.json similarity index 100% rename from src/WebApi/Properties/launchSettings.json rename to src/Vegasco.Server.Api/Properties/launchSettings.json diff --git a/src/WebApi/Users/User.cs b/src/Vegasco.Server.Api/Users/User.cs similarity index 62% rename from src/WebApi/Users/User.cs rename to src/Vegasco.Server.Api/Users/User.cs index cc5a46d..e114b4e 100644 --- a/src/WebApi/Users/User.cs +++ b/src/Vegasco.Server.Api/Users/User.cs @@ -1,6 +1,6 @@ -using Vegasco.WebApi.Cars; +using Vegasco.Server.Api.Cars; -namespace Vegasco.WebApi.Users; +namespace Vegasco.Server.Api.Users; public class User { diff --git a/src/WebApi/Users/UserTableConfiguration.cs b/src/Vegasco.Server.Api/Users/UserTableConfiguration.cs similarity index 88% rename from src/WebApi/Users/UserTableConfiguration.cs rename to src/Vegasco.Server.Api/Users/UserTableConfiguration.cs index cf5a29a..6abe0ee 100644 --- a/src/WebApi/Users/UserTableConfiguration.cs +++ b/src/Vegasco.Server.Api/Users/UserTableConfiguration.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace Vegasco.WebApi.Users; +namespace Vegasco.Server.Api.Users; public class UserTableConfiguration : IEntityTypeConfiguration { diff --git a/src/WebApi/WebApi.csproj b/src/Vegasco.Server.Api/Vegasco.Server.Api.csproj similarity index 97% rename from src/WebApi/WebApi.csproj rename to src/Vegasco.Server.Api/Vegasco.Server.Api.csproj index 9ba8886..f09473e 100644 --- a/src/WebApi/WebApi.csproj +++ b/src/Vegasco.Server.Api/Vegasco.Server.Api.csproj @@ -7,7 +7,7 @@ 4bf893d3-0c16-41ec-8b46-2768d841215d Linux ..\.. - Vegasco.WebApi + Vegasco.Server.Api diff --git a/src/WebApi/appsettings.Development.json b/src/Vegasco.Server.Api/appsettings.Development.json similarity index 100% rename from src/WebApi/appsettings.Development.json rename to src/Vegasco.Server.Api/appsettings.Development.json diff --git a/src/WebApi/appsettings.json b/src/Vegasco.Server.Api/appsettings.json similarity index 100% rename from src/WebApi/appsettings.json rename to src/Vegasco.Server.Api/appsettings.json diff --git a/src/Vegasco.Server.AppHost.Shared/Constants.cs b/src/Vegasco.Server.AppHost.Shared/Constants.cs index cdd67eb..9c1dc4c 100644 --- a/src/Vegasco.Server.AppHost.Shared/Constants.cs +++ b/src/Vegasco.Server.AppHost.Shared/Constants.cs @@ -4,7 +4,7 @@ public static class Constants { public static class Projects { - public const string WebApiName = "webapi"; + public const string Api = "Vegasco_Server_Api"; } public static class Database diff --git a/src/Vegasco.Server.AppHost/Program.cs b/src/Vegasco.Server.AppHost/Program.cs index 6c19fd7..476f8c4 100644 --- a/src/Vegasco.Server.AppHost/Program.cs +++ b/src/Vegasco.Server.AppHost/Program.cs @@ -7,7 +7,7 @@ IResourceBuilder postgres = builder.AddPostgres(Consta .AddDatabase(Constants.Database.Name); builder - .AddProject(Constants.Projects.WebApiName) + .AddProject(Constants.Projects.Api) .WithReference(postgres) .WaitFor(postgres); diff --git a/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj b/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj index 70315a2..e4de3b0 100644 --- a/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj +++ b/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Vegasco.Server.ServiceDefaults/Extensions.cs b/src/Vegasco.Server.ServiceDefaults/Extensions.cs index 5984246..82fd99b 100644 --- a/src/Vegasco.Server.ServiceDefaults/Extensions.cs +++ b/src/Vegasco.Server.ServiceDefaults/Extensions.cs @@ -2,13 +2,13 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Diagnostics.HealthChecks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.ServiceDiscovery; using OpenTelemetry; using OpenTelemetry.Metrics; using OpenTelemetry.Trace; -namespace Microsoft.Extensions.Hosting; +namespace Vegasco.Server.ServiceDefaults; // Adds common .NET Aspire services: service discovery, resilience, health checks, and OpenTelemetry. // This project should be referenced by each service project in your solution. diff --git a/src/WebApi/Common/IWebApiMarker.cs b/src/WebApi/Common/IWebApiMarker.cs deleted file mode 100644 index bcd335d..0000000 --- a/src/WebApi/Common/IWebApiMarker.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Vegasco.WebApi.Common; - -public interface IWebApiMarker; diff --git a/tests/WebApi.Tests.Integration/CarFaker.cs b/tests/Vegasco.Server.Api.Tests.Integration/CarFaker.cs similarity index 79% rename from tests/WebApi.Tests.Integration/CarFaker.cs rename to tests/Vegasco.Server.Api.Tests.Integration/CarFaker.cs index 7364709..c8533d6 100644 --- a/tests/WebApi.Tests.Integration/CarFaker.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/CarFaker.cs @@ -1,7 +1,7 @@ using Bogus; -using Vegasco.WebApi.Cars; +using Vegasco.Server.Api.Cars; -namespace WebApi.Tests.Integration; +namespace Vegasco.Server.Api.Tests.Integration; internal class CarFaker { diff --git a/tests/WebApi.Tests.Integration/Cars/CreateCarTests.cs b/tests/Vegasco.Server.Api.Tests.Integration/Cars/CreateCarTests.cs similarity index 94% rename from tests/WebApi.Tests.Integration/Cars/CreateCarTests.cs rename to tests/Vegasco.Server.Api.Tests.Integration/Cars/CreateCarTests.cs index 95d2c03..28d3dd5 100644 --- a/tests/WebApi.Tests.Integration/Cars/CreateCarTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/Cars/CreateCarTests.cs @@ -3,10 +3,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using System.Net; using System.Net.Http.Json; -using Vegasco.WebApi.Cars; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Cars; +using Vegasco.Server.Api.Persistence; -namespace WebApi.Tests.Integration.Cars; +namespace Vegasco.Server.Api.Tests.Integration.Cars; [Collection(SharedTestCollection.Name)] public class CreateCarTests : IAsyncLifetime diff --git a/tests/WebApi.Tests.Integration/Cars/DeleteCarTests.cs b/tests/Vegasco.Server.Api.Tests.Integration/Cars/DeleteCarTests.cs similarity index 93% rename from tests/WebApi.Tests.Integration/Cars/DeleteCarTests.cs rename to tests/Vegasco.Server.Api.Tests.Integration/Cars/DeleteCarTests.cs index 160d96e..ba76a29 100644 --- a/tests/WebApi.Tests.Integration/Cars/DeleteCarTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/Cars/DeleteCarTests.cs @@ -2,10 +2,10 @@ using Microsoft.Extensions.DependencyInjection; using System.Net; using System.Net.Http.Json; -using Vegasco.WebApi.Cars; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Cars; +using Vegasco.Server.Api.Persistence; -namespace WebApi.Tests.Integration.Cars; +namespace Vegasco.Server.Api.Tests.Integration.Cars; [Collection(SharedTestCollection.Name)] public class DeleteCarTests : IAsyncLifetime diff --git a/tests/WebApi.Tests.Integration/Cars/GetCarTests.cs b/tests/Vegasco.Server.Api.Tests.Integration/Cars/GetCarTests.cs similarity index 94% rename from tests/WebApi.Tests.Integration/Cars/GetCarTests.cs rename to tests/Vegasco.Server.Api.Tests.Integration/Cars/GetCarTests.cs index f425919..81ddb53 100644 --- a/tests/WebApi.Tests.Integration/Cars/GetCarTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/Cars/GetCarTests.cs @@ -1,9 +1,9 @@ using FluentAssertions; using System.Net; using System.Net.Http.Json; -using Vegasco.WebApi.Cars; +using Vegasco.Server.Api.Cars; -namespace WebApi.Tests.Integration.Cars; +namespace Vegasco.Server.Api.Tests.Integration.Cars; [Collection(SharedTestCollection.Name)] public class GetCarTests : IAsyncLifetime diff --git a/tests/WebApi.Tests.Integration/Cars/GetCarsTests.cs b/tests/Vegasco.Server.Api.Tests.Integration/Cars/GetCarsTests.cs similarity index 95% rename from tests/WebApi.Tests.Integration/Cars/GetCarsTests.cs rename to tests/Vegasco.Server.Api.Tests.Integration/Cars/GetCarsTests.cs index 5924713..17a45dd 100644 --- a/tests/WebApi.Tests.Integration/Cars/GetCarsTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/Cars/GetCarsTests.cs @@ -1,9 +1,9 @@ using FluentAssertions; using System.Net; using System.Net.Http.Json; -using Vegasco.WebApi.Cars; +using Vegasco.Server.Api.Cars; -namespace WebApi.Tests.Integration.Cars; +namespace Vegasco.Server.Api.Tests.Integration.Cars; [Collection(SharedTestCollection.Name)] public class GetCarsTests : IAsyncLifetime diff --git a/tests/WebApi.Tests.Integration/Cars/UpdateCarTests.cs b/tests/Vegasco.Server.Api.Tests.Integration/Cars/UpdateCarTests.cs similarity index 96% rename from tests/WebApi.Tests.Integration/Cars/UpdateCarTests.cs rename to tests/Vegasco.Server.Api.Tests.Integration/Cars/UpdateCarTests.cs index ded5967..3896669 100644 --- a/tests/WebApi.Tests.Integration/Cars/UpdateCarTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/Cars/UpdateCarTests.cs @@ -3,10 +3,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using System.Net; using System.Net.Http.Json; -using Vegasco.WebApi.Cars; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Cars; +using Vegasco.Server.Api.Persistence; -namespace WebApi.Tests.Integration.Cars; +namespace Vegasco.Server.Api.Tests.Integration.Cars; [Collection(SharedTestCollection.Name)] public class UpdateCarTests : IAsyncLifetime diff --git a/tests/WebApi.Tests.Integration/ConsumptionFaker.cs b/tests/Vegasco.Server.Api.Tests.Integration/ConsumptionFaker.cs similarity index 88% rename from tests/WebApi.Tests.Integration/ConsumptionFaker.cs rename to tests/Vegasco.Server.Api.Tests.Integration/ConsumptionFaker.cs index d4e84a3..681ea4a 100644 --- a/tests/WebApi.Tests.Integration/ConsumptionFaker.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/ConsumptionFaker.cs @@ -1,7 +1,7 @@ using Bogus; -using Vegasco.WebApi.Consumptions; +using Vegasco.Server.Api.Consumptions; -namespace WebApi.Tests.Integration; +namespace Vegasco.Server.Api.Tests.Integration; internal class ConsumptionFaker { diff --git a/tests/WebApi.Tests.Integration/Consumptions/CreateConsumptionTests.cs b/tests/Vegasco.Server.Api.Tests.Integration/Consumptions/CreateConsumptionTests.cs similarity index 95% rename from tests/WebApi.Tests.Integration/Consumptions/CreateConsumptionTests.cs rename to tests/Vegasco.Server.Api.Tests.Integration/Consumptions/CreateConsumptionTests.cs index 30887e9..123b24b 100644 --- a/tests/WebApi.Tests.Integration/Consumptions/CreateConsumptionTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/Consumptions/CreateConsumptionTests.cs @@ -3,11 +3,11 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using System.Net; using System.Net.Http.Json; -using Vegasco.WebApi.Cars; -using Vegasco.WebApi.Consumptions; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Cars; +using Vegasco.Server.Api.Consumptions; +using Vegasco.Server.Api.Persistence; -namespace WebApi.Tests.Integration.Consumptions; +namespace Vegasco.Server.Api.Tests.Integration.Consumptions; [Collection(SharedTestCollection.Name)] public class CreateConsumptionTests : IAsyncLifetime diff --git a/tests/WebApi.Tests.Integration/Consumptions/DeleteConsumptionTests.cs b/tests/Vegasco.Server.Api.Tests.Integration/Consumptions/DeleteConsumptionTests.cs similarity index 94% rename from tests/WebApi.Tests.Integration/Consumptions/DeleteConsumptionTests.cs rename to tests/Vegasco.Server.Api.Tests.Integration/Consumptions/DeleteConsumptionTests.cs index af72f99..113109a 100644 --- a/tests/WebApi.Tests.Integration/Consumptions/DeleteConsumptionTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/Consumptions/DeleteConsumptionTests.cs @@ -2,11 +2,11 @@ using Microsoft.Extensions.DependencyInjection; using System.Net; using System.Net.Http.Json; -using Vegasco.WebApi.Cars; -using Vegasco.WebApi.Consumptions; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Cars; +using Vegasco.Server.Api.Consumptions; +using Vegasco.Server.Api.Persistence; -namespace WebApi.Tests.Integration.Consumptions; +namespace Vegasco.Server.Api.Tests.Integration.Consumptions; [Collection(SharedTestCollection.Name)] public class DeleteConsumptionTests : IAsyncLifetime diff --git a/tests/WebApi.Tests.Integration/Consumptions/GetConsumptionTests.cs b/tests/Vegasco.Server.Api.Tests.Integration/Consumptions/GetConsumptionTests.cs similarity index 94% rename from tests/WebApi.Tests.Integration/Consumptions/GetConsumptionTests.cs rename to tests/Vegasco.Server.Api.Tests.Integration/Consumptions/GetConsumptionTests.cs index 6448776..8596d73 100644 --- a/tests/WebApi.Tests.Integration/Consumptions/GetConsumptionTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/Consumptions/GetConsumptionTests.cs @@ -2,11 +2,11 @@ using Microsoft.Extensions.DependencyInjection; using System.Net; using System.Net.Http.Json; -using Vegasco.WebApi.Cars; -using Vegasco.WebApi.Consumptions; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Cars; +using Vegasco.Server.Api.Consumptions; +using Vegasco.Server.Api.Persistence; -namespace WebApi.Tests.Integration.Consumptions; +namespace Vegasco.Server.Api.Tests.Integration.Consumptions; [Collection(SharedTestCollection.Name)] public class GetConsumptionTests : IAsyncLifetime diff --git a/tests/WebApi.Tests.Integration/Consumptions/GetConsumptionsTests.cs b/tests/Vegasco.Server.Api.Tests.Integration/Consumptions/GetConsumptionsTests.cs similarity index 94% rename from tests/WebApi.Tests.Integration/Consumptions/GetConsumptionsTests.cs rename to tests/Vegasco.Server.Api.Tests.Integration/Consumptions/GetConsumptionsTests.cs index dc919ee..f93ee0a 100644 --- a/tests/WebApi.Tests.Integration/Consumptions/GetConsumptionsTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/Consumptions/GetConsumptionsTests.cs @@ -2,11 +2,11 @@ using Microsoft.Extensions.DependencyInjection; using System.Net; using System.Net.Http.Json; -using Vegasco.WebApi.Cars; -using Vegasco.WebApi.Consumptions; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Cars; +using Vegasco.Server.Api.Consumptions; +using Vegasco.Server.Api.Persistence; -namespace WebApi.Tests.Integration.Consumptions; +namespace Vegasco.Server.Api.Tests.Integration.Consumptions; [Collection(SharedTestCollection.Name)] public class GetConsumptionsTests : IAsyncLifetime diff --git a/tests/WebApi.Tests.Integration/Consumptions/UpdateConsumptionTests.cs b/tests/Vegasco.Server.Api.Tests.Integration/Consumptions/UpdateConsumptionTests.cs similarity index 96% rename from tests/WebApi.Tests.Integration/Consumptions/UpdateConsumptionTests.cs rename to tests/Vegasco.Server.Api.Tests.Integration/Consumptions/UpdateConsumptionTests.cs index 3999b1d..9f0c1a6 100644 --- a/tests/WebApi.Tests.Integration/Consumptions/UpdateConsumptionTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/Consumptions/UpdateConsumptionTests.cs @@ -3,11 +3,11 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using System.Net; using System.Net.Http.Json; -using Vegasco.WebApi.Cars; -using Vegasco.WebApi.Consumptions; -using Vegasco.WebApi.Persistence; +using Vegasco.Server.Api.Cars; +using Vegasco.Server.Api.Consumptions; +using Vegasco.Server.Api.Persistence; -namespace WebApi.Tests.Integration.Consumptions; +namespace Vegasco.Server.Api.Tests.Integration.Consumptions; [Collection(SharedTestCollection.Name)] public class UpdateConsumptionTests : IAsyncLifetime diff --git a/tests/WebApi.Tests.Integration/FluentAssertionConfiguration.cs b/tests/Vegasco.Server.Api.Tests.Integration/FluentAssertionConfiguration.cs similarity index 93% rename from tests/WebApi.Tests.Integration/FluentAssertionConfiguration.cs rename to tests/Vegasco.Server.Api.Tests.Integration/FluentAssertionConfiguration.cs index 019e491..235018a 100644 --- a/tests/WebApi.Tests.Integration/FluentAssertionConfiguration.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/FluentAssertionConfiguration.cs @@ -1,6 +1,7 @@ using FluentAssertions; -namespace WebApi.Tests.Integration; +namespace Vegasco.Server.Api.Tests.Integration; + internal static class FluentAssertionConfiguration { private const int DateTimeComparisonPrecision = 100; diff --git a/tests/WebApi.Tests.Integration/Info/GetServerInfoTests.cs b/tests/Vegasco.Server.Api.Tests.Integration/Info/GetServerInfoTests.cs similarity index 92% rename from tests/WebApi.Tests.Integration/Info/GetServerInfoTests.cs rename to tests/Vegasco.Server.Api.Tests.Integration/Info/GetServerInfoTests.cs index 1ce6a14..2732bec 100644 --- a/tests/WebApi.Tests.Integration/Info/GetServerInfoTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/Info/GetServerInfoTests.cs @@ -1,9 +1,9 @@ using System.Net.Http.Json; using FluentAssertions; using FluentAssertions.Extensions; -using Vegasco.WebApi.Info; +using Vegasco.Server.Api.Info; -namespace WebApi.Tests.Integration.Info; +namespace Vegasco.Server.Api.Tests.Integration.Info; [Collection(SharedTestCollection.Name)] public class GetServerInfoTests diff --git a/tests/WebApi.Tests.Integration/PostgresRespawner.cs b/tests/Vegasco.Server.Api.Tests.Integration/PostgresRespawner.cs similarity index 94% rename from tests/WebApi.Tests.Integration/PostgresRespawner.cs rename to tests/Vegasco.Server.Api.Tests.Integration/PostgresRespawner.cs index d969aac..f852765 100644 --- a/tests/WebApi.Tests.Integration/PostgresRespawner.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/PostgresRespawner.cs @@ -2,7 +2,7 @@ using Respawn; using System.Data.Common; -namespace WebApi.Tests.Integration; +namespace Vegasco.Server.Api.Tests.Integration; internal sealed class PostgresRespawner : IDisposable { private readonly DbConnection _connection; diff --git a/tests/WebApi.Tests.Integration/SharedTestCollection.cs b/tests/Vegasco.Server.Api.Tests.Integration/SharedTestCollection.cs similarity index 76% rename from tests/WebApi.Tests.Integration/SharedTestCollection.cs rename to tests/Vegasco.Server.Api.Tests.Integration/SharedTestCollection.cs index bb824b2..f8ebc6d 100644 --- a/tests/WebApi.Tests.Integration/SharedTestCollection.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/SharedTestCollection.cs @@ -1,4 +1,4 @@ -namespace WebApi.Tests.Integration; +namespace Vegasco.Server.Api.Tests.Integration; [CollectionDefinition(Name)] public class SharedTestCollection : ICollectionFixture diff --git a/tests/WebApi.Tests.Integration/TestUserAlwaysAuthorizedPolicyEvaluator.cs b/tests/Vegasco.Server.Api.Tests.Integration/TestUserAlwaysAuthorizedPolicyEvaluator.cs similarity index 96% rename from tests/WebApi.Tests.Integration/TestUserAlwaysAuthorizedPolicyEvaluator.cs rename to tests/Vegasco.Server.Api.Tests.Integration/TestUserAlwaysAuthorizedPolicyEvaluator.cs index 787d255..7c9deac 100644 --- a/tests/WebApi.Tests.Integration/TestUserAlwaysAuthorizedPolicyEvaluator.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/TestUserAlwaysAuthorizedPolicyEvaluator.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Authorization.Policy; using Microsoft.AspNetCore.Http; using System.Security.Claims; -namespace WebApi.Tests.Integration; +namespace Vegasco.Server.Api.Tests.Integration; public sealed class TestUserAlwaysAuthorizedPolicyEvaluator : IPolicyEvaluator { diff --git a/tests/WebApi.Tests.Integration/WebApi.Tests.Integration.csproj b/tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj similarity index 89% rename from tests/WebApi.Tests.Integration/WebApi.Tests.Integration.csproj rename to tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj index ebfdb83..8007836 100644 --- a/tests/WebApi.Tests.Integration/WebApi.Tests.Integration.csproj +++ b/tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj @@ -1,4 +1,4 @@ - + net9.0 @@ -16,7 +16,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -32,7 +32,7 @@ - + diff --git a/tests/WebApi.Tests.Integration/WebAppFactory.cs b/tests/Vegasco.Server.Api.Tests.Integration/WebAppFactory.cs similarity index 86% rename from tests/WebApi.Tests.Integration/WebAppFactory.cs rename to tests/Vegasco.Server.Api.Tests.Integration/WebAppFactory.cs index 892518a..3264e46 100644 --- a/tests/WebApi.Tests.Integration/WebAppFactory.cs +++ b/tests/Vegasco.Server.Api.Tests.Integration/WebAppFactory.cs @@ -7,11 +7,11 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Testcontainers.PostgreSql; -using Vegasco.WebApi.Common; +using Vegasco.Server.Api.Common; -namespace WebApi.Tests.Integration; +namespace Vegasco.Server.Api.Tests.Integration; -public sealed class WebAppFactory : WebApplicationFactory, IAsyncLifetime +public sealed class WebAppFactory : WebApplicationFactory, IAsyncLifetime { private readonly PostgreSqlContainer _database = new PostgreSqlBuilder() .WithImage(DockerImage) @@ -38,7 +38,7 @@ public sealed class WebAppFactory : WebApplicationFactory, IAsync { IEnumerable> customConfig = [ - new KeyValuePair($"ConnectionStrings:{Vegasco.Server.AppHost.Shared.Constants.Database.Name}", _database.GetConnectionString()), + new KeyValuePair($"ConnectionStrings:{AppHost.Shared.Constants.Database.Name}", _database.GetConnectionString()), new KeyValuePair("JWT:ValidAudience", "https://localhost"), new KeyValuePair("JWT:MetadataUrl", "https://localhost"), new KeyValuePair("JWT:NameClaimType", null), diff --git a/tests/WebApi.Tests.Unit/Authentication/UserAccessorTests.cs b/tests/Vegasco.Server.Api.Tests.Unit/Authentication/UserAccessorTests.cs similarity index 97% rename from tests/WebApi.Tests.Unit/Authentication/UserAccessorTests.cs rename to tests/Vegasco.Server.Api.Tests.Unit/Authentication/UserAccessorTests.cs index 0e5a68c..138819f 100644 --- a/tests/WebApi.Tests.Unit/Authentication/UserAccessorTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Unit/Authentication/UserAccessorTests.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; using NSubstitute; using System.Security.Claims; -using Vegasco.WebApi.Authentication; +using Vegasco.Server.Api.Authentication; -namespace WebApi.Tests.Unit.Authentication; +namespace Vegasco.Server.Api.Tests.Unit.Authentication; public sealed class UserAccessorTests { private readonly UserAccessor _sut; diff --git a/tests/WebApi.Tests.Unit/Cars/CreateCarRequestValidatorTests.cs b/tests/Vegasco.Server.Api.Tests.Unit/Cars/CreateCarRequestValidatorTests.cs similarity index 95% rename from tests/WebApi.Tests.Unit/Cars/CreateCarRequestValidatorTests.cs rename to tests/Vegasco.Server.Api.Tests.Unit/Cars/CreateCarRequestValidatorTests.cs index 2185cd3..d65f8af 100644 --- a/tests/WebApi.Tests.Unit/Cars/CreateCarRequestValidatorTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Unit/Cars/CreateCarRequestValidatorTests.cs @@ -1,8 +1,8 @@ using FluentAssertions; using FluentValidation.Results; -using Vegasco.WebApi.Cars; +using Vegasco.Server.Api.Cars; -namespace WebApi.Tests.Unit.Cars; +namespace Vegasco.Server.Api.Tests.Unit.Cars; public sealed class CreateCarRequestValidatorTests { diff --git a/tests/WebApi.Tests.Unit/Cars/UpdateCarRequestValidatorTests.cs b/tests/Vegasco.Server.Api.Tests.Unit/Cars/UpdateCarRequestValidatorTests.cs similarity index 95% rename from tests/WebApi.Tests.Unit/Cars/UpdateCarRequestValidatorTests.cs rename to tests/Vegasco.Server.Api.Tests.Unit/Cars/UpdateCarRequestValidatorTests.cs index 366fd5a..dfbdc03 100644 --- a/tests/WebApi.Tests.Unit/Cars/UpdateCarRequestValidatorTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Unit/Cars/UpdateCarRequestValidatorTests.cs @@ -1,8 +1,8 @@ using FluentAssertions; using FluentValidation.Results; -using Vegasco.WebApi.Cars; +using Vegasco.Server.Api.Cars; -namespace WebApi.Tests.Unit.Cars; +namespace Vegasco.Server.Api.Tests.Unit.Cars; public sealed class UpdateCarRequestValidatorTests { diff --git a/tests/WebApi.Tests.Unit/Consumptions/CreateConsumptionRequestValidatorTests.cs b/tests/Vegasco.Server.Api.Tests.Unit/Consumptions/CreateConsumptionRequestValidatorTests.cs similarity index 96% rename from tests/WebApi.Tests.Unit/Consumptions/CreateConsumptionRequestValidatorTests.cs rename to tests/Vegasco.Server.Api.Tests.Unit/Consumptions/CreateConsumptionRequestValidatorTests.cs index fa7f346..2c7c3ab 100644 --- a/tests/WebApi.Tests.Unit/Consumptions/CreateConsumptionRequestValidatorTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Unit/Consumptions/CreateConsumptionRequestValidatorTests.cs @@ -1,9 +1,9 @@ using FluentAssertions; using FluentValidation.Results; using NSubstitute; -using Vegasco.WebApi.Consumptions; +using Vegasco.Server.Api.Consumptions; -namespace WebApi.Tests.Unit.Consumptions; +namespace Vegasco.Server.Api.Tests.Unit.Consumptions; public class CreateConsumptionRequestValidatorTests { private readonly CreateConsumption.Validator _sut; diff --git a/tests/WebApi.Tests.Unit/Consumptions/UpdateConsumptionRequestValidatorTests.cs b/tests/Vegasco.Server.Api.Tests.Unit/Consumptions/UpdateConsumptionRequestValidatorTests.cs similarity index 96% rename from tests/WebApi.Tests.Unit/Consumptions/UpdateConsumptionRequestValidatorTests.cs rename to tests/Vegasco.Server.Api.Tests.Unit/Consumptions/UpdateConsumptionRequestValidatorTests.cs index 14a91e8..fd34167 100644 --- a/tests/WebApi.Tests.Unit/Consumptions/UpdateConsumptionRequestValidatorTests.cs +++ b/tests/Vegasco.Server.Api.Tests.Unit/Consumptions/UpdateConsumptionRequestValidatorTests.cs @@ -1,9 +1,9 @@ using FluentAssertions; using FluentValidation.Results; using NSubstitute; -using Vegasco.WebApi.Consumptions; +using Vegasco.Server.Api.Consumptions; -namespace WebApi.Tests.Unit.Consumptions; +namespace Vegasco.Server.Api.Tests.Unit.Consumptions; public class UpdateConsumptionRequestValidatorTests { diff --git a/tests/WebApi.Tests.Unit/WebApi.Tests.Unit.csproj b/tests/Vegasco.Server.Api.Tests.Unit/Vegasco.Server.Api.Tests.Unit.csproj similarity index 93% rename from tests/WebApi.Tests.Unit/WebApi.Tests.Unit.csproj rename to tests/Vegasco.Server.Api.Tests.Unit/Vegasco.Server.Api.Tests.Unit.csproj index 71caaf1..a2a53a7 100644 --- a/tests/WebApi.Tests.Unit/WebApi.Tests.Unit.csproj +++ b/tests/Vegasco.Server.Api.Tests.Unit/Vegasco.Server.Api.Tests.Unit.csproj @@ -26,7 +26,7 @@ - + diff --git a/vegasco-server.sln b/vegasco-server.sln deleted file mode 100644 index 2e7f0b3..0000000 --- a/vegasco-server.sln +++ /dev/null @@ -1,50 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.13.35617.110 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{089100B1-113F-4E66-888A-E83F3999EAFD}" - ProjectSection(SolutionItems) = preProject - .drone.yml = .drone.yml - Dockerfile = Dockerfile - README.md = README.md - version.json = version.json - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApi", "src\WebApi\WebApi.csproj", "{1B0A04C3-E6BC-0FB7-7994-7C99BDAB1788}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApi.Tests.Integration", "tests\WebApi.Tests.Integration\WebApi.Tests.Integration.csproj", "{72BF8CBC-E916-1472-A1E2-8F5DCF1A95C6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApi.Tests.Unit", "tests\WebApi.Tests.Unit\WebApi.Tests.Unit.csproj", "{2DD4D427-6FA5-EC56-76FC-9D71C4631E00}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1B0A04C3-E6BC-0FB7-7994-7C99BDAB1788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B0A04C3-E6BC-0FB7-7994-7C99BDAB1788}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B0A04C3-E6BC-0FB7-7994-7C99BDAB1788}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B0A04C3-E6BC-0FB7-7994-7C99BDAB1788}.Release|Any CPU.Build.0 = Release|Any CPU - {72BF8CBC-E916-1472-A1E2-8F5DCF1A95C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72BF8CBC-E916-1472-A1E2-8F5DCF1A95C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72BF8CBC-E916-1472-A1E2-8F5DCF1A95C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72BF8CBC-E916-1472-A1E2-8F5DCF1A95C6}.Release|Any CPU.Build.0 = Release|Any CPU - {2DD4D427-6FA5-EC56-76FC-9D71C4631E00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DD4D427-6FA5-EC56-76FC-9D71C4631E00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DD4D427-6FA5-EC56-76FC-9D71C4631E00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DD4D427-6FA5-EC56-76FC-9D71C4631E00}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {1B0A04C3-E6BC-0FB7-7994-7C99BDAB1788} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} - {72BF8CBC-E916-1472-A1E2-8F5DCF1A95C6} = {0AB3BF05-4346-4AA6-1389-037BE0695223} - {2DD4D427-6FA5-EC56-76FC-9D71C4631E00} = {0AB3BF05-4346-4AA6-1389-037BE0695223} - EndGlobalSection -EndGlobal diff --git a/vegasco-server.slnx b/vegasco-server.slnx index a928535..844625c 100644 --- a/vegasco-server.slnx +++ b/vegasco-server.slnx @@ -9,10 +9,10 @@ - + - - + + \ No newline at end of file