Skip to content

Commit 573ec64

Browse files
committed
include endpoints data
1 parent 46a77d6 commit 573ec64

File tree

5 files changed

+45
-15
lines changed

5 files changed

+45
-15
lines changed

NorthwindCRUD/Controllers/EmployeesController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public ActionResult<EmployeeDto> GetSuperiorById(int id)
9090

9191
[HttpGet("{id}/Subordinates")]
9292
[Authorize]
93-
public ActionResult<ProductDto[]> GetSubordinatesById(int id)
93+
public ActionResult<EmployeeDto[]> GetSubordinatesById(int id)
9494
{
9595
try
9696
{

NorthwindCRUD/Helpers/DBSeeder.cs

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,30 @@ public static void Seed(DataContext dbContext)
9999
dbContext.SaveChanges();
100100
}
101101

102+
//Seed Territories
103+
if (!dbContext.Territories.Any())
104+
{
105+
var territoriesData = File.ReadAllText("./Resources/territories.json");
106+
var parsedTerritories = JsonConvert.DeserializeObject<TerritoryDb[]>(territoriesData);
107+
108+
dbContext.Territories.AddRange(parsedTerritories);
109+
dbContext.SaveChanges();
110+
}
111+
102112
//Seed Regions
103113
if (!dbContext.Regions.Any())
104114
{
105115
var productsData = File.ReadAllText("./Resources/regions.json");
106116
var parsedRegions = JsonConvert.DeserializeObject<RegionDb[]>(productsData);
107117

108-
dbContext.Regions.AddRange(parsedRegions);
118+
119+
foreach (var region in parsedRegions)
120+
{
121+
var matchingTerritories = dbContext.Territories.Where(t => t.RegionId == region.RegionId).ToList();
122+
region.Territories = matchingTerritories;
123+
124+
dbContext.Regions.Add(region);
125+
}
109126
dbContext.SaveChanges();
110127
}
111128

@@ -115,7 +132,14 @@ public static void Seed(DataContext dbContext)
115132
var shippersData = File.ReadAllText("./Resources/shippers.json");
116133
var parsedShippers = JsonConvert.DeserializeObject<ShipperDb[]>(shippersData);
117134

118-
dbContext.Shippers.AddRange(parsedShippers);
135+
foreach (var shipper in parsedShippers)
136+
{
137+
var matchingOrders = dbContext.Orders.Where(o => o.ShipperId == shipper.ShipperId).ToList();
138+
shipper.Orders = matchingOrders;
139+
140+
dbContext.Shippers.Add(shipper);
141+
}
142+
119143
dbContext.SaveChanges();
120144
}
121145

@@ -125,17 +149,14 @@ public static void Seed(DataContext dbContext)
125149
var suppliersData = File.ReadAllText("./Resources/suppliers.json");
126150
var parsedSuppliers = JsonConvert.DeserializeObject<SupplierDb[]>(suppliersData);
127151

128-
dbContext.Suppliers.AddRange(parsedSuppliers);
129-
dbContext.SaveChanges();
130-
}
152+
foreach (var supplier in parsedSuppliers)
153+
{
154+
var matchingProducts = dbContext.Products.Where(p => p.SupplierId == supplier.SupplierId).ToList();
155+
supplier.Products = matchingProducts;
131156

132-
//Seed Territories
133-
if (!dbContext.Territories.Any())
134-
{
135-
var territoriesData = File.ReadAllText("./Resources/territories.json");
136-
var parsedTerritories = JsonConvert.DeserializeObject<TerritoryDb[]>(territoriesData);
157+
dbContext.Suppliers.Add(supplier);
158+
}
137159

138-
dbContext.Territories.AddRange(parsedTerritories);
139160
dbContext.SaveChanges();
140161
}
141162

NorthwindCRUD/Services/RegionService.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace NorthwindCRUD.Services
22
{
33
using AutoMapper;
4+
using Microsoft.EntityFrameworkCore;
45
using NorthwindCRUD.Helpers;
56
using NorthwindCRUD.Models.DbModels;
67
using NorthwindCRUD.Models.Dtos;
@@ -24,7 +25,9 @@ public RegionDb[] GetAll()
2425

2526
public RegionDb GetById(int id)
2627
{
27-
return this.dataContext.Regions.FirstOrDefault(p => p.RegionId == id);
28+
return this.dataContext.Regions
29+
.Include(c => c.Territories)
30+
.FirstOrDefault(p => p.RegionId == id);
2831
}
2932

3033
public RegionDb Create(RegionDb model)

NorthwindCRUD/Services/ShipperService.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace NorthwindCRUD.Services
22
{
33
using AutoMapper;
4+
using Microsoft.EntityFrameworkCore;
45
using NorthwindCRUD.Helpers;
56
using NorthwindCRUD.Models.DbModels;
67
using NorthwindCRUD.Models.Dtos;
@@ -24,7 +25,9 @@ public ShipperDb[] GetAll()
2425

2526
public ShipperDb GetById(int id)
2627
{
27-
return this.dataContext.Shippers.FirstOrDefault(p => p.ShipperId == id);
28+
return this.dataContext.Shippers
29+
.Include(c => c.Orders)
30+
.FirstOrDefault(p => p.ShipperId == id);
2831
}
2932

3033
public ShipperDb Create(ShipperDb model)

NorthwindCRUD/Services/SupplierService.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace NorthwindCRUD.Services
22
{
33
using AutoMapper;
4+
using Microsoft.EntityFrameworkCore;
45
using NorthwindCRUD.Helpers;
56
using NorthwindCRUD.Models.DbModels;
67
using NorthwindCRUD.Models.Dtos;
@@ -24,7 +25,9 @@ public SupplierDb[] GetAll()
2425

2526
public SupplierDb GetById(int id)
2627
{
27-
return this.dataContext.Suppliers.FirstOrDefault(p => p.SupplierId == id);
28+
return this.dataContext.Suppliers
29+
.Include(s => s.Products)
30+
.FirstOrDefault(p => p.SupplierId == id);
2831
}
2932

3033
public SupplierDb Create(SupplierDb model)

0 commit comments

Comments
 (0)