Getting all beers in brewery works

RieBi · Jul 25, 2024 · 2c6e8ea · 2c6e8ea
1 parent e804e13
commit 2c6e8ea
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/Api/Controllers/BreweryController.cs b/Api/Controllers/BreweryController.cs
@@ -19,5 +19,12 @@ public async Task<IList<BreweryDto>> All()
         return breweries;
     }
 
+    [HttpGet]
+    [Route("{id}/Beers")]
+    public async Task<IList<BeerDto>?> Beers(string id)
+    {
+        var beers = await _mediator.Send(new GetAllBeersInBreweryQuery(id));
 
+        return beers;
+    }
 }
diff --git a/Application/DTOs/BeerDto.cs b/Application/DTOs/BeerDto.cs
@@ -1,5 +1,5 @@
 namespace Application.DTOs;
-internal class BeerDto
+public class BeerDto
 {
     public string Id { get; set; } = default!;
     public string BrewerId { get; set; } = default!;

diff --git a/Application/Queries/BreweryQueries/GetAllBeersInBreweryQueryHandler.cs b/Application/Queries/BreweryQueries/GetAllBeersInBreweryQueryHandler.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using AutoMapper.QueryableExtensions;
+using Microsoft.EntityFrameworkCore;
 
 namespace Application.Queries.BreweryQueries;
 internal class GetAllBeersInBreweryQueryHandler(DataContext context, IMapper mapper) : IRequestHandler<GetAllBeersInBreweryQuery, IList<BeerDto>?>
@@ -8,11 +9,19 @@ internal class GetAllBeersInBreweryQueryHandler(DataContext context, IMapper map
 
     public async Task<IList<BeerDto>?> Handle(GetAllBeersInBreweryQuery request, CancellationToken cancellationToken)
     {
-        var beers = await _context.Breweries
-            .Include(f => f.Beers)
+        var count = await _context.Breweries
             .Where(f => f.Id == request.BreweryId)
-            .Select(f => f.Beers)
-            .SingleOrDefaultAsync(cancellationToken);
+            .CountAsync(cancellationToken);
+
+        if (count == 0)
+            return null;
+
+        var beers = await _context.Beers
+            .Include(f => f.Brewer)
+            .ThenInclude(f => f.Brewery)
+            .Where(f => f.Brewer.Brewery.Id == request.BreweryId)
+            .ProjectTo<BeerDto>(_mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
 
         if (beers is null)
             return null;

diff --git a/Data/ModelConfigurations/BreweryConfiguration.cs b/Data/ModelConfigurations/BreweryConfiguration.cs
@@ -15,9 +15,5 @@ public void Configure(EntityTypeBuilder<Brewery> builder)
         builder
             .HasMany(f => f.Brewers)
             .WithOne(f => f.Brewery);
-
-        builder
-            .HasMany(f => f.Beers)
-            .WithOne(f => f.Brewer.Brewery);
     }
 }
diff --git a/Domain/Models/Brewery.cs b/Domain/Models/Brewery.cs
@@ -6,5 +6,4 @@ public class Brewery
     public string Address { get; set; } = default!;
 
     public IList<Brewer> Brewers { get; set; } = [];
-    public IList<Beer> Beers { get; set; } = [];
 }