Refactoring

src/TeamUp.Application/Events/GetEvents/GetEvetnsQueryHandlers.cs

@@ -7,12 +7,12 @@
 
 namespace TeamUp.Application.Events.GetEvents;
 
-internal sealed class GetEventsQueryHandlers : IQueryHandler<GetEventsQuery, Result<List<EventSlimResponse>>>
+internal sealed class GetEventsQueryHandler : IQueryHandler<GetEventsQuery, Result<List<EventSlimResponse>>>
 {
 	private readonly IAppQueryContext _appQueryContext;
 	private readonly IDateTimeProvider _dateTimeProvider;
 
-	public GetEventsQueryHandlers(IAppQueryContext appQueryContext, IDateTimeProvider dateTimeProvider)
+	public GetEventsQueryHandler(IAppQueryContext appQueryContext, IDateTimeProvider dateTimeProvider)
 	{
 		_appQueryContext = appQueryContext;
 		_dateTimeProvider = dateTimeProvider;
@@ -75,26 +75,9 @@ public async Task<Result<List<EventSlimResponse>>> Handle(GetEventsQuery query,
 						EventType = team.EventTypes.First(et => et.Id == e.EventTypeId).Name
 					})
 					.OrderBy(e => e.FromUtc)
-					.ToList(),
-			})
-			.FirstOrDefaultAsync(team => team.Id == query.TeamId, ct);
-
-		/*
-		var team2 = await _appQueryContext.Teams
-			.Where(team => team.Id == query.TeamId)
-			.Select(team => new
-			{
-				Initiator = team.Members
-					.Where(member => member.UserId == query.InitiatorId)
-					.Select(member => new
-					{
-						member.Id,
-						member.Nickname,
-					})
-					.FirstOrDefault()
+					.ToList()
 			})
 			.FirstOrDefaultAsync(ct);
-		*/
 
 		return team
 			.EnsureNotNull(TeamErrors.TeamNotFound)

src/TeamUp.Application/Teams/GetUserTeams/GetTeamQueryHandler.cs

@@ -22,6 +22,7 @@ public async Task<Result<List<TeamSlimResponse>>> Handle(GetUserTeamsQuery query
 			{
 				TeamId = team.Id,
 				Name = team.Name,
+				NumberOfTeamMembers = team.NumberOfMembers
 			})
 			.ToListAsync(ct);
 	}

src/TeamUp.Application/Users/Activation/ActivateAccountCommandHandler.cs

@@ -20,8 +20,7 @@ public async Task<Result> Handle(ActivateAccountCommand command, CancellationTok
 		var user = await _userRepository.GetUserByIdAsync(command.UserId, ct);
 		return await user
 			.EnsureNotNull(UserErrors.UserNotFound)
-			.Tap(user => user.Activate())
-			.TapAsync(_ => _unitOfWork.SaveChangesAsync(ct))
-			.ToResultAsync();
+			.Then(user => user.Activate())
+			.TapAsync(() => _unitOfWork.SaveChangesAsync(ct));
 	}
 }

src/TeamUp.Application/Users/CompleteRegistration/CompleteRegistrationCommand Handler.cs

@@ -22,8 +22,7 @@ public async Task<Result> Handle(CompleteRegistrationCommand command, Cancellati
 		var user = await _userRepository.GetUserByIdAsync(command.UserId, ct);
 		return await user
 			.EnsureNotNull(UserErrors.UserNotFound)
-			.Tap(user => user.CompleteGeneratedRegistration(_passwordService.HashPassword(command.Password)))
-			.TapAsync(_ => _unitOfWork.SaveChangesAsync(ct))
-			.ToResultAsync();
+			.Then(user => user.CompleteGeneratedRegistration(_passwordService.HashPassword(command.Password)))
+			.TapAsync(() => _unitOfWork.SaveChangesAsync(ct));
 	}
 }

src/TeamUp.Contracts/Teams/TeamSlimResponse.cs

@@ -4,4 +4,5 @@ public sealed class TeamSlimResponse
 {
 	public required TeamId TeamId { get; init; }
 	public required string Name { get; init; }
+	public required int NumberOfTeamMembers { get; init; }
 }

tests/TeamUp.Tests.EndToEnd/EndpointTests/Teams/TeamTests.GetUserTeams.cs

@@ -42,6 +42,7 @@ public async Task GetUserTeams_Should_ReturnTeams_ThatUserIsMemberOf()
 		{
 			TeamId = team.Id,
 			Name = team.Name,
+			NumberOfTeamMembers = team.NumberOfMembers
 		});
 
 		var otherTeam = TeamGenerators.Team.WithOneOwner(members.First());