Inlcude Initiator Reply In Event Response (#13)

* include initiator event reply in event response
* include number of team members in team slim response
* fix naming

src/Modules/TeamManagement/TeamUp.TeamManagement.Application/Events/GetEvetnsQueryHandlers.cs

@@ -11,12 +11,12 @@
 
 namespace TeamUp.TeamManagement.Application.Events;
 
-internal sealed class GetEventsQueryHandlers : IQueryHandler<GetEventsQuery, Collection<EventSlimResponse>>
+internal sealed class GetEventsQueryHandler : IQueryHandler<GetEventsQuery, Collection<EventSlimResponse>>
 {
 	private readonly ITeamManagementQueryContext _appQueryContext;
 	private readonly IDateTimeProvider _dateTimeProvider;
 
-	public GetEventsQueryHandlers(ITeamManagementQueryContext appQueryContext, IDateTimeProvider dateTimeProvider)
+	public GetEventsQueryHandler(ITeamManagementQueryContext appQueryContext, IDateTimeProvider dateTimeProvider)
 	{
 		_appQueryContext = appQueryContext;
 		_dateTimeProvider = dateTimeProvider;
@@ -26,9 +26,24 @@ public async Task<Result<Collection<EventSlimResponse>>> Handle(GetEventsQuery q
 	{
 		var from = query.FromUtc ?? _dateTimeProvider.UtcNow;
 		var team = await _appQueryContext.Teams
+			.Where(team => team.Id == query.TeamId)
 			.Select(team => new
 			{
 				team.Id,
+				team.EventTypes,
+				Initiator = team.Members
+					.Where(member => member.UserId == query.InitiatorId)
+					.Select(member => new
+					{
+						member.Id,
+						member.Nickname,
+					})
+					.FirstOrDefault()
+			})
+			.Select(team => new
+			{
+				team.Id,
+				team.Initiator,
 				Events = _appQueryContext.Events
 					.AsSplitQuery()
 					.Where(e => e.TeamId == team.Id && e.ToUtc > from)
@@ -42,6 +57,17 @@ public async Task<Result<Collection<EventSlimResponse>>> Handle(GetEventsQuery q
 						Status = e.Status,
 						MeetTime = e.MeetTime,
 						ReplyClosingTimeBeforeMeetTime = e.ReplyClosingTimeBeforeMeetTime,
+						InitiatorResponse = e.EventResponses
+							.Where(er => er.TeamMemberId == team.Initiator!.Id)
+							.Select(er => new EventResponseResponse
+							{
+								TeamMemberId = team.Initiator!.Id,
+								Message = er.Message,
+								TeamMemberNickname = team.Initiator.Nickname,
+								TimeStampUtc = er.TimeStampUtc,
+								Type = er.ReplyType,
+							})
+							.FirstOrDefault(),
 						ReplyCount = e.EventResponses
 							.GroupBy(er => er.ReplyType)
 							.Select(x => new ReplyCountResponse
@@ -53,12 +79,9 @@ public async Task<Result<Collection<EventSlimResponse>>> Handle(GetEventsQuery q
 						EventType = team.EventTypes.First(et => et.Id == e.EventTypeId).Name
 					})
 					.OrderBy(e => e.FromUtc)
-					.ToList(),
-				Initiator = team.Members
-					.Select(member => member.UserId)
-					.FirstOrDefault(id => id == query.InitiatorId)
+					.ToList()
 			})
-			.FirstOrDefaultAsync(team => team.Id == query.TeamId, ct);
+			.FirstOrDefaultAsync(ct);
 
 		return team
 			.EnsureNotNull(TeamErrors.TeamNotFound)

src/Modules/TeamManagement/TeamUp.TeamManagement.Application/Invitations/GetTeamQueryHandler.cs

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

src/Modules/TeamManagement/TeamUp.TeamManagement.Contracts/Events/EventSlimResponse.cs

@@ -10,5 +10,6 @@ public sealed class EventSlimResponse
 	public required EventStatus Status { get; init; }
 	public required TimeSpan MeetTime { get; init; }
 	public required TimeSpan ReplyClosingTimeBeforeMeetTime { get; init; }
+	public required EventResponseResponse? InitiatorResponse { get; init; }
 	public required List<ReplyCountResponse> ReplyCount { get; init; }
 }

src/Modules/TeamManagement/TeamUp.TeamManagement.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/TeamManagement/Teams/TeamTests.GetUserTeams.cs

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