Refactoring (#47)

* upgrade packages
* change requests to record type
* fix to use docker image of specific version of postgres (16.2)
* additional refactoring (fix types, naming, unnecessary code ...)

Directory.Packages.props

@@ -3,46 +3,46 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Asp.Versioning.Http" Version="8.0.0" />
-    <PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.0.0" />
-    <PackageVersion Include="Bogus" Version="35.4.0" />
+    <PackageVersion Include="Asp.Versioning.Http" Version="8.1.0" />
+    <PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
+    <PackageVersion Include="Bogus" Version="35.5.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="FluentAssertions.Analyzers" Version="0.30.0" />
-    <PackageVersion Include="FluentAssertions.Web" Version="1.2.5" />
-    <PackageVersion Include="FluentValidation" Version="11.9.0" />
-    <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.0" />
-    <PackageVersion Include="MailKit" Version="4.4.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
+    <PackageVersion Include="FluentAssertions.Analyzers" Version="0.31.0" />
+    <PackageVersion Include="FluentAssertions.Web" Version="1.3.0" />
+    <PackageVersion Include="FluentValidation" Version="11.9.1" />
+    <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.1" />
+    <PackageVersion Include="MailKit" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.4.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.5.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="MediatR" Version="12.2.0" />
     <PackageVersion Include="NetArchTest.Rules" Version="1.3.2" />
     <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
     <PackageVersion Include="Quartz" Version="3.8.1" />
     <PackageVersion Include="Quartz.Extensions.Hosting" Version="3.8.1" />
     <PackageVersion Include="Respawn" Version="6.2.1" />
-    <PackageVersion Include="Riok.Mapperly" Version="3.3.0" />
-    <PackageVersion Include="Skrasek.RailwayResult" Version="1.0.2" />
-    <PackageVersion Include="Skrasek.RailwayResult.Errors" Version="1.0.2" />
-    <PackageVersion Include="Skrasek.RailwayResult.FunctionalExtensions" Version="1.0.2" />
+    <PackageVersion Include="Riok.Mapperly" Version="3.5.1" />
+    <PackageVersion Include="Skrasek.RailwayResult" Version="1.1.0" />
+    <PackageVersion Include="Skrasek.RailwayResult.Errors" Version="1.1.0" />
+    <PackageVersion Include="Skrasek.RailwayResult.FunctionalExtensions" Version="1.1.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.4.0" />
-    <PackageVersion Include="Testcontainers" Version="3.7.0" />
-    <PackageVersion Include="Testcontainers.PostgreSql" Version="3.7.0" />
-    <PackageVersion Include="xunit" Version="2.6.6" />
-    <PackageVersion Include="xunit.extensibility.core" Version="2.6.6" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
+    <PackageVersion Include="Testcontainers" Version="3.8.0" />
+    <PackageVersion Include="Testcontainers.PostgreSql" Version="3.8.0" />
+    <PackageVersion Include="xunit" Version="2.7.1" />
+    <PackageVersion Include="xunit.extensibility.core" Version="2.7.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.8" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 </Project>

scripts/rundb.ps1

@@ -1 +1 @@
-docker run --name ca-postgres -e POSTGRES_PASSWORD=devpass -p 5432:5432 -d postgres
+docker run --name ca-postgres -e POSTGRES_PASSWORD=devpass -p 5432:5432 -d postgres:16.2

src/TeamUp.Api/Endpoints/Events/CreateEventEndpoint.cs

@@ -44,8 +44,8 @@ public async Task<IResult> CreateEventAsync(
 			ReplyClosingTimeBeforeMeetTime: request.ReplyClosingTimeBeforeMeetTime
 		);
 
-		var response = await sender.Send(command, ct);
-		return response.Match(eventId => TypedResults.Created(
+		var result = await sender.Send(command, ct);
+		return result.ToResponse(eventId => TypedResults.Created(
 			linkGenerator.GetPathByName(httpContext, nameof(GetEventEndpoint), new { teamId, eventId = eventId.Value }),
 			eventId
 		));

src/TeamUp.Api/Endpoints/Events/GetEventEndpoint.cs

@@ -36,7 +36,8 @@ public async Task<IResult> GetEventAsync(
 			TeamId.FromGuid(teamId),
 			EventId.FromGuid(eventId)
 		);
-		var response = await sender.Send(query, ct);
-		return response.Match(TypedResults.Ok);
+
+		var result = await sender.Send(query, ct);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Events/GetEventsEndpoint.cs

@@ -35,7 +35,8 @@ public async Task<IResult> GetEventsAsync(
 			TeamId.FromGuid(teamId),
 			fromUtc
 		);
-		var response = await sender.Send(query, ct);
-		return response.Match(TypedResults.Ok);
+
+		var result = await sender.Send(query, ct);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Events/RemoveEventEndpoint.cs

@@ -31,7 +31,7 @@ private async Task<IResult> RemoveEventAsync(
 	{
 		var command = new RemoveEventCommand(httpContext.GetCurrentUserId(), TeamId.FromGuid(teamId), EventId.FromGuid(eventId));
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 
 }

src/TeamUp.Api/Endpoints/Events/UpsertEventReplyEndpoint.cs

@@ -42,7 +42,7 @@ public async Task<IResult> UpsertEventReplyAsync(
 			Message: request.Message
 		);
 
-		var response = await sender.Send(command, ct);
-		return response.Match(TypedResults.Ok);
+		var result = await sender.Send(command, ct);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Invitations/AcceptInvitaionEndpoint.cs

@@ -30,6 +30,6 @@ private async Task<IResult> AcceptInvitationAsync(
 	{
 		var command = new AcceptInvitationCommand(httpContext.GetCurrentUserId(), InvitationId.FromGuid(invitationId));
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Invitations/GetMyInvitationsEndpoint.cs

@@ -26,6 +26,6 @@ private async Task<IResult> GetTeamInvitationsAsync(
 	{
 		var query = new GetMyInvitationsQuery(httpContext.GetCurrentUserId());
 		var result = await sender.Send(query, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Invitations/GetTeamInvitationsEndpoint.cs

@@ -30,6 +30,6 @@ private async Task<IResult> GetTeamInvitationsAsync(
 	{
 		var query = new GetTeamInvitationsQuery(httpContext.GetCurrentUserId(), TeamId.FromGuid(teamId));
 		var result = await sender.Send(query, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Invitations/InviteUserEndpoint.cs

@@ -32,7 +32,7 @@ private async Task<IResult> InviteUserAsync(
 		var command = new InviteUserCommand(httpContext.GetCurrentUserId(), request.TeamId, request.Email);
 
 		var result = await sender.Send(command, ct);
-		return result.Match(invitationId => TypedResults.Created(
+		return result.ToResponse(invitationId => TypedResults.Created(
 			uri: linkGenerator.GetPathByName(httpContext, nameof(GetTeamInvitationsEndpoint), request.TeamId.Value),
 			value: invitationId
 		));

src/TeamUp.Api/Endpoints/Invitations/RemoveInvitationEndpoint.cs

@@ -29,6 +29,6 @@ private async Task<IResult> RemoveInvitationAsync(
 	{
 		var command = new RemoveInvitationCommand(httpContext.GetCurrentUserId(), InvitationId.FromGuid(invitationId));
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Teams/ChangeNicknameEndpoint.cs

@@ -35,6 +35,6 @@ private async Task<IResult> ChangeNicknameAsync(
 			request.Nickname
 		);
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Teams/ChangeOwnerShipEndpoint.cs

@@ -34,6 +34,6 @@ private async Task<IResult> ChangeOwnerShipAsync(
 			TeamMemberId.FromGuid(teamMemberId)
 		);
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Teams/CreateEventTypeEndpoint.cs

@@ -38,7 +38,7 @@ private async Task<IResult> CreateEventTypeAsync(
 		);
 
 		var result = await sender.Send(command, ct);
-		return result.Match(eventTypeId => TypedResults.Created(
+		return result.ToResponse(eventTypeId => TypedResults.Created(
 			uri: linkGenerator.GetPathByName(httpContext, nameof(GetTeamEndpoint), teamId),
 			value: eventTypeId
 		));

src/TeamUp.Api/Endpoints/Teams/CreateTeamEndpoint.cs

@@ -28,7 +28,7 @@ private async Task<IResult> CreateTeamAsync(
 	{
 		var command = new CreateTeamCommand(httpContext.GetCurrentUserId(), request.Name);
 		var result = await sender.Send(command, ct);
-		return result.Match(teamId => TypedResults.Created(
+		return result.ToResponse(teamId => TypedResults.Created(
 			uri: linkGenerator.GetPathByName(httpContext, nameof(GetTeamEndpoint), teamId.Value),
 			value: teamId
 		));

src/TeamUp.Api/Endpoints/Teams/DeleteTeamEndpoint.cs

@@ -29,6 +29,6 @@ private async Task<IResult> DeleteTeamAsync(
 	{
 		var command = new DeleteTeamCommand(httpContext.GetCurrentUserId(), TeamId.FromGuid(teamId));
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Teams/GetTeamEndpoint.cs

@@ -29,6 +29,6 @@ private async Task<IResult> GetTeamAsync(
 	{
 		var query = new GetTeamQuery(httpContext.GetCurrentUserId(), TeamId.FromGuid(teamId));
 		var result = await sender.Send(query, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Teams/RemoveTeamMemberEndpoint.cs

@@ -35,6 +35,6 @@ private async Task<IResult> RemoveTeamMemberAsync(
 			TeamMemberId.FromGuid(teamMemberId)
 		);
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Teams/UpdateTeamMemberRoleEndpoint.cs

@@ -38,6 +38,6 @@ private async Task<IResult> UpdateTeamRoleAsync(
 			request.Role
 		);
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/Teams/UpdateTeamNameEndpoint.cs

@@ -35,6 +35,6 @@ private async Task<IResult> UpdateTeamNameAsync(
 			request.Name
 		);
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/UserAccess/ActivateAccountEndpoint.cs

@@ -26,6 +26,6 @@ private async Task<IResult> ActivateAccountAsync(
 	{
 		var command = new ActivateAccountCommand(UserId.FromGuid(userId));
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/UserAccess/DeleteAccountEndpoint.cs

@@ -29,6 +29,6 @@ private async Task<IResult> DeleteUserAsync(
 	{
 		var command = new DeleteAccountCommand(httpContext.GetCurrentUserId(), password);
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/UserAccess/GetMyAccountDetailsEndpoint.cs

@@ -27,6 +27,6 @@ private async Task<IResult> GetAccountDetailsAsync(
 	{
 		var query = new GetAccountDetailsQuery(httpContext.GetCurrentUserId());
 		var result = await sender.Send(query, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/UserAccess/LoginUserEndpoint.cs

@@ -28,6 +28,6 @@ private async Task<IResult> LoginAsync(
 	{
 		var command = mapper.ToCommand(request);
 		var result = await sender.Send(command, ct);
-		return result.Match(TypedResults.Ok);
+		return result.ToResponse(TypedResults.Ok);
 	}
 }

src/TeamUp.Api/Endpoints/UserAccess/RegisterUserEndpoint.cs

@@ -30,7 +30,7 @@ private async Task<IResult> RegisterUserAsync(
 	{
 		var command = mapper.ToCommand(request);
 		var result = await sender.Send(command, ct);
-		return result.Match(userId => TypedResults.Created(
+		return result.ToResponse(userId => TypedResults.Created(
 			uri: linkGenerator.GetPathByName(httpContext, nameof(GetMyAccountDetailsEndpoint)),
 			value: userId
 		));

src/TeamUp.Api/Extensions/ResultExtensions.cs → src/TeamUp.Api/Extensions/ResultToResponseExtensions.cs

@@ -3,19 +3,21 @@
 using RailwayResult;
 using RailwayResult.Errors;
 
+using IResult = Microsoft.AspNetCore.Http.IResult;
+
 namespace TeamUp.Api.Extensions;
 
-public static class ResultExtensions
+public static class ResultToResponseExtensions
 {
-	public static IResult Match<TOut>(this Result<TOut> result, Func<TOut, IResult> success)
+	public static IResult ToResponse<TOut>(this Result<TOut> result, Func<TOut, IResult> success)
 	{
 		if (result.IsSuccess)
 			return success(result.Value!);
 
 		return result.Error.ToResponse();
 	}
 
-	public static IResult Match(this Result result, Func<IResult> success)
+	public static IResult ToResponse(this Result result, Func<IResult> success)
 	{
 		if (result.IsSuccess)
 			return success();

src/TeamUp.Contracts/Events/CreateEventRequest.cs

@@ -8,7 +8,7 @@
 
 namespace TeamUp.Contracts.Events;
 
-public sealed class CreateEventRequest : IRequestBody
+public sealed record CreateEventRequest : IRequestBody
 {
 	public required EventTypeId EventTypeId { get; init; }
 

src/TeamUp.Contracts/Events/UpsertEventReplyRequest.cs

@@ -6,7 +6,7 @@
 
 namespace TeamUp.Contracts.Events;
 
-public sealed class UpsertEventReplyRequest : IRequestBody
+public sealed record UpsertEventReplyRequest : IRequestBody
 {
 	public required ReplyType ReplyType { get; init; }
 

src/TeamUp.Contracts/Invitations/InviteUserRequest.cs

@@ -7,7 +7,7 @@
 
 namespace TeamUp.Contracts.Invitations;
 
-public sealed class InviteUserRequest : IRequestBody
+public sealed record InviteUserRequest : IRequestBody
 {
 	public required TeamId TeamId { get; init; }
 

src/TeamUp.Contracts/Teams/ChangeNicknameRequest.cs

@@ -6,7 +6,7 @@
 
 namespace TeamUp.Contracts.Teams;
 
-public sealed class ChangeNicknameRequest : IRequestBody
+public sealed record ChangeNicknameRequest : IRequestBody
 {
 	[DataType(DataType.Text)]
 	public required string Nickname { get; init; }

src/TeamUp.Contracts/Teams/CreateTeamRequest.cs

@@ -6,7 +6,7 @@
 
 namespace TeamUp.Contracts.Teams;
 
-public sealed class CreateTeamRequest : IRequestBody
+public sealed record CreateTeamRequest : IRequestBody
 {
 	[DataType(DataType.Text)]
 	public required string Name { get; init; }

src/TeamUp.Contracts/Teams/UpdateTeamNameRequest.cs

@@ -6,7 +6,7 @@
 
 namespace TeamUp.Contracts.Teams;
 
-public sealed class UpdateTeamNameRequest : IRequestBody
+public sealed record UpdateTeamNameRequest : IRequestBody
 {
 	[DataType(DataType.Text)]
 	public required string Name { get; init; }

src/TeamUp.Contracts/Teams/UpdateTeamRoleRequest.cs

@@ -4,7 +4,7 @@
 
 namespace TeamUp.Contracts.Teams;
 
-public sealed class UpdateTeamRoleRequest : IRequestBody
+public sealed record UpdateTeamRoleRequest : IRequestBody
 {
 	public required TeamRole Role { get; init; }
 

src/TeamUp.Contracts/Teams/UpsertEventTypeRequest.cs

@@ -6,7 +6,7 @@
 
 namespace TeamUp.Contracts.Teams;
 
-public sealed class UpsertEventTypeRequest : IRequestBody
+public sealed record UpsertEventTypeRequest : IRequestBody
 {
 	[DataType(DataType.Text)]
 	public required string Name { get; init; }

src/TeamUp.Contracts/Users/LoginRequest.cs

@@ -6,7 +6,7 @@
 
 namespace TeamUp.Contracts.Users;
 
-public sealed class LoginRequest : IRequestBody
+public sealed record LoginRequest : IRequestBody
 {
 	[DataType(DataType.EmailAddress)]
 	public required string Email { get; init; }