Refactored missing GET Endpoints to return DTOs

Author: lolgame99

Application/Controllers/PlayOfferController.cs

@@ -55,7 +55,7 @@ public async Task<ActionResult<IEnumerable<PlayOfferDto>>> GetByClubIdAsync([Fro
     [ProducesResponseType(typeof(ActionResult), StatusCodes.Status204NoContent)]
     [Consumes("application/json")]
     [Produces("application/json")]
-    public async Task<ActionResult<IEnumerable<PlayOffer>>> GetByParticipantIdAsync([FromQuery] Guid participantId)
+    public async Task<ActionResult<IEnumerable<PlayOfferDto>>> GetByParticipantIdAsync([FromQuery] Guid participantId)
     {
         //TODO: refactor after jwt implementation to get participantId from token
         var result = await _mediator.Send(new GetPlayOffersByParticipantIdQuery(participantId));
@@ -79,9 +79,9 @@ public async Task<ActionResult<IEnumerable<PlayOffer>>> GetByParticipantIdAsync(
     [ProducesResponseType(typeof(ActionResult), StatusCodes.Status204NoContent)]
     [Consumes("application/json")]
     [Produces("application/json")]
-    public async Task<ActionResult<IEnumerable<PlayOffer>>> GetByCreatorNameAsync([FromQuery] string creatorName)
+    public async Task<ActionResult<IEnumerable<PlayOfferDto>>> GetByCreatorNameAsync([FromQuery] string creatorName)
     {
-        IEnumerable<PlayOffer> result;
+        IEnumerable<PlayOfferDto> result;
         try
         {
             result = await _mediator.Send(new GetPlayOffersByCreatorNameQuery(creatorName));

Application/Handlers/GetPlayOffersByCreatorNameHandler.cs

@@ -5,18 +5,24 @@
 
 namespace PlayOfferService.Application.Handlers.Events;
 
-public class GetPlayOffersByCreatorNameHandler : IRequestHandler<GetPlayOffersByCreatorNameQuery, IEnumerable<PlayOffer>>
+public class GetPlayOffersByCreatorNameHandler : IRequestHandler<GetPlayOffersByCreatorNameQuery, IEnumerable<PlayOfferDto>>
 {
     private readonly PlayOfferRepository _playOfferRepository;
     private readonly MemberRepository _memberRepository;
+    private readonly ClubRepository _clubRepository;
+    private readonly ReservationRepository _reservationRepository;
+    private readonly CourtRepository _courtRepository;
 
-    public GetPlayOffersByCreatorNameHandler(PlayOfferRepository playOfferRepository, MemberRepository memberRepository)
+    public GetPlayOffersByCreatorNameHandler(PlayOfferRepository playOfferRepository, MemberRepository memberRepository, ClubRepository clubRepository, ReservationRepository reservationRepository, CourtRepository courtRepository)
     {
         _playOfferRepository = playOfferRepository;
         _memberRepository = memberRepository;
+        _clubRepository = clubRepository;
+        _reservationRepository = reservationRepository;
+        _courtRepository = courtRepository;
     }
 
-    public async Task<IEnumerable<PlayOffer>> Handle(GetPlayOffersByCreatorNameQuery request, CancellationToken cancellationToken)
+    public async Task<IEnumerable<PlayOfferDto>> Handle(GetPlayOffersByCreatorNameQuery request, CancellationToken cancellationToken)
     {
         if (request.CreatorName.Split(" ").Length > 2)
             throw new ArgumentException("Creator name must be in the format '<FirstName> <LastName>', '<FirstName>' or '<LastName>'");
@@ -28,7 +34,22 @@ public async Task<IEnumerable<PlayOffer>> Handle(GetPlayOffersByCreatorNameQuery
             var playOffersByCreator = await _playOfferRepository.GetPlayOffersByIds(null, creator.Id);
             playOffers.AddRange(playOffersByCreator);
         }
+
+        var clubDto = (await _clubRepository.GetAllClubs()).Select(club => new ClubDto(club)).ToList();
+        var memberDtos = (await _memberRepository.GetAllMembers()).Select(member => new MemberDto(member)).ToList();
+        var courtDtos = (await _courtRepository.GetAllCourts()).Select(court => new CourtDto(court)).ToList();
+        var reservationDtos = (await _reservationRepository.GetAllReservations()).Select(reservation => new ReservationDto(reservation, courtDtos)).ToList();
 
-        return playOffers;
+        var playOfferDtos = new List<PlayOfferDto>();
+        foreach (var playOffer in playOffers)
+        {
+            var club = clubDto.First(club => club.Id == playOffer.ClubId);
+            var creator = memberDtos.First(member => member.Id == playOffer.CreatorId);
+            var opponent = memberDtos.FirstOrDefault(member => member.Id == playOffer.OpponentId);
+            var reservation = reservationDtos.FirstOrDefault(reservation => reservation.Id == playOffer.ReservationId);
+            playOfferDtos.Add(new PlayOfferDto(playOffer, club, creator, opponent, reservation));
+        }
+
+        return playOfferDtos;
     }
 }

Application/Handlers/GetPlayOffersByParticipantIdHandler.cs

@@ -4,17 +4,42 @@
 using PlayOfferService.Domain.Repositories;
 
 namespace PlayOfferService.Application.Handlers;
-public class GetPlayOffersByParticipantIdHandler : IRequestHandler<GetPlayOffersByParticipantIdQuery, IEnumerable<PlayOffer>>
+public class GetPlayOffersByParticipantIdHandler : IRequestHandler<GetPlayOffersByParticipantIdQuery, IEnumerable<PlayOfferDto>>
 {
     private readonly PlayOfferRepository _playOfferRepository;
+    private readonly MemberRepository _memberRepository;
+    private readonly ClubRepository _clubRepository;
+    private readonly ReservationRepository _reservationRepository;
+    private readonly CourtRepository _courtRepository;
 
-    public GetPlayOffersByParticipantIdHandler(PlayOfferRepository playOfferRepository)
+    public GetPlayOffersByParticipantIdHandler(PlayOfferRepository playOfferRepository, MemberRepository memberRepository, ClubRepository clubRepository, ReservationRepository reservationRepository, CourtRepository courtRepository)
     {
         _playOfferRepository = playOfferRepository;
+        _memberRepository = memberRepository;
+        _clubRepository = clubRepository;
+        _reservationRepository = reservationRepository;
+        _courtRepository = courtRepository;
     }
 
-    public async Task<IEnumerable<PlayOffer>> Handle(GetPlayOffersByParticipantIdQuery request, CancellationToken cancellationToken)
+    public async Task<IEnumerable<PlayOfferDto>> Handle(GetPlayOffersByParticipantIdQuery request, CancellationToken cancellationToken)
     {
-        return await _playOfferRepository.GetPlayOffersByParticipantId(request.ParticipantId);
+        var playOffers =  await _playOfferRepository.GetPlayOffersByParticipantId(request.ParticipantId);
+        
+        var clubDto = (await _clubRepository.GetAllClubs()).Select(club => new ClubDto(club)).ToList();
+        var memberDtos = (await _memberRepository.GetAllMembers()).Select(member => new MemberDto(member)).ToList();
+        var courtDtos = (await _courtRepository.GetAllCourts()).Select(court => new CourtDto(court)).ToList();
+        var reservationDtos = (await _reservationRepository.GetAllReservations()).Select(reservation => new ReservationDto(reservation, courtDtos)).ToList();
+        
+        var playOfferDtos = new List<PlayOfferDto>();
+        foreach (var playOffer in playOffers)
+        {
+            var club = clubDto.First(club => club.Id == playOffer.ClubId);
+            var creator = memberDtos.First(member => member.Id == playOffer.CreatorId);
+            var opponent = memberDtos.FirstOrDefault(member => member.Id == playOffer.OpponentId);
+            var reservation = reservationDtos.FirstOrDefault(reservation => reservation.Id == playOffer.ReservationId);
+            playOfferDtos.Add(new PlayOfferDto(playOffer, club, creator, opponent, reservation));
+        }
+
+        return playOfferDtos;
     }
 }

Application/Queries/GetPlayOffersByCreatorNameQuery.cs

@@ -3,6 +3,6 @@
 
 namespace PlayOfferService.Application.Queries;
 
-public record GetPlayOffersByCreatorNameQuery(string CreatorName) : IRequest<IEnumerable<PlayOffer>>
+public record GetPlayOffersByCreatorNameQuery(string CreatorName) : IRequest<IEnumerable<PlayOfferDto>>
 {
 }

Application/Queries/GetPlayOffersByParticipantIdQuery.cs

@@ -3,6 +3,6 @@
 
 namespace PlayOfferService.Application.Queries;
 
-public record GetPlayOffersByParticipantIdQuery(Guid ParticipantId) : IRequest<IEnumerable<PlayOffer>>
+public record GetPlayOffersByParticipantIdQuery(Guid ParticipantId) : IRequest<IEnumerable<PlayOfferDto>>
 {
 }

Domain/Repositories/ClubRepository.cs

@@ -32,6 +32,11 @@ public virtual async Task Update()
         return club.First();
     }
 
+    public virtual async Task<IEnumerable<Club>> GetAllClubs()
+    {
+        return await _context.Clubs.ToListAsync();
+    }
+    
     public virtual void CreateClub(Club club)
     {
         _context.Clubs.Add(club);