Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nuget. Use nullable instead of Maybe #14

Merged
merged 1 commit into from
Mar 20, 2023
Merged

Update nuget. Use nullable instead of Maybe #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Application/src/Abstractions/Persistence/IRepository{T}.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ public interface IRepository<T> where T : class
ValueTask Add(T entity, CancellationToken cancellationToken);
ValueTask Update(T entity, CancellationToken cancellationToken);
ValueTask Delete(T entity, CancellationToken cancellationToken);
ValueTask<Maybe<T>> FindById(string id, CancellationToken cancellationToken);
ValueTask<T?> FindById(string id, CancellationToken cancellationToken);
}
4 changes: 2 additions & 2 deletions Application/src/Authentication/Commands/RegisterCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ await User.New(command.UserId, command.FirstName, command.LastName, command.Emai

private async ValueTask<Result<string, Error>> ValidateUserDoesNotExist(UserId id, CancellationToken cancellationToken)
{
var maybeUser = await _userRepository.FindById(id, cancellationToken);
if (maybeUser.HasValue)
var user = await _userRepository.FindById(id, cancellationToken);
if (user is not null)
return Result.Failure<string>(Errors.User.AlreadyExists(id));
return Result.Success<string>(id);
}
Expand Down
18 changes: 9 additions & 9 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<FunctionalDDDVersion>0.1.0-alpha.20</FunctionalDDDVersion>
<FunctionalDDDVersion>0.1.0-alpha.32</FunctionalDDDVersion>
</PropertyGroup>
<!-- Runtime -->
<ItemGroup>
Expand All @@ -15,27 +15,27 @@
<PackageVersion Include="FunctionalDDD.RailwayOrientedProgramming" Version="$(FunctionalDDDVersion)" />
<PackageVersion Include="Mapster" Version="7.3.0" />
<PackageVersion Include="Mapster.DependencyInjection" Version="1.0.0" />
<PackageVersion Include="Mediator.Abstractions" Version="2.1.0-preview.10" />
<PackageVersion Include="Mediator.SourceGenerator" Version="2.1.0-preview.10" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.2" />
<PackageVersion Include="Mediator.Abstractions" Version="2.1.1" />
<PackageVersion Include="Mediator.SourceGenerator" Version="2.1.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.32.0" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.32.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.119" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.26.1" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.27.0" />
</ItemGroup>
<!-- Test -->
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
<PackageVersion Include="FluentAssertions" Version="6.10.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="Xunit.DependencyInjection" Version="8.7.0" />
<PackageVersion Include="Xunit.DependencyInjection" Version="8.7.1" />
<PackageVersion Include="Xunit.Priority" Version="1.1.6" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageVersion Include="xunit.categories" Version="2.0.6" />
Expand Down
4 changes: 2 additions & 2 deletions Infrastructure/src/Persistence/UserCosmosDbRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public ValueTask Delete(User entity, CancellationToken cancellationToken)
}


public async ValueTask<Maybe<User>> FindById(string id, CancellationToken cancellationToken)
public async ValueTask<User?> FindById(string id, CancellationToken cancellationToken)
{
try
{
Expand All @@ -52,7 +52,7 @@ public async ValueTask<Maybe<User>> FindById(string id, CancellationToken cancel
}
catch (CosmosException ex) when (ex.StatusCode == System.Net.HttpStatusCode.NotFound)
{
return Maybe.None<User>();
return null;
}
}
}
4 changes: 2 additions & 2 deletions Infrastructure/src/Persistence/UserDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ public static UserDto ToDto(this User user) =>
Password = user.Password
};

public static Maybe<User> ToUser(this UserDto? userDto) =>
public static User? ToUser(this UserDto? userDto) =>
userDto is null
? Maybe.None<User>()
? null
: User.New(
UserId.New(userDto.Id).Value,
FirstName.New(userDto.FirstName).Value,
Expand Down
6 changes: 2 additions & 4 deletions Infrastructure/src/Persistence/UserInMemoryRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

using BuberDinner.Application.Abstractions.Persistence;
using BuberDinner.Domain.User.Entities;
using FunctionalDDD;
using System.Collections.Generic;
using System.Linq;

Expand All @@ -29,7 +28,6 @@ public ValueTask Delete(User entity, CancellationToken cancellationToken)
throw new NotImplementedException();
}

public ValueTask<Maybe<User>> FindById(string id, CancellationToken cancellationToken) =>
ValueTask.FromResult(s_users.SingleOrDefault(u => u.Id == id) ?? Maybe.None<User>());

public ValueTask<User?> FindById(string id, CancellationToken cancellationToken) =>
ValueTask.FromResult(s_users.SingleOrDefault(u => u.Id == id));
}
6 changes: 3 additions & 3 deletions Infrastructure/tests/UserRespositoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public async Task Can_read_and_write_User_from_storage()

// Act
await rep.Add(user, CancellationToken.None);
var maybeUser = await rep.FindById(userId, CancellationToken.None);
User? dbuser = await rep.FindById(userId, CancellationToken.None);

// Assert
maybeUser.HasValue.Should().BeTrue();
User dbuser = maybeUser.Value;
dbuser.Should().NotBeNull();
if (dbuser == null) return;
dbuser.Should().Be(user); // For entity only Id is checked for equality.
dbuser.Id.Should().Be(userId);
dbuser.FirstName.Should().Be(firstName);
Expand Down