File Controllers/VehiclesController.cs changed (mode: 100644) (index f874130..d27abc7) |
... |
... |
namespace vega.Controllers |
33 |
33 |
if (!ModelState.IsValid) |
if (!ModelState.IsValid) |
34 |
34 |
return BadRequest(ModelState); |
return BadRequest(ModelState); |
35 |
35 |
|
|
36 |
|
var model = await context.Models.FindAsync(vehicleResource.ModelId); |
|
|
36 |
|
var model = await repository.GetVehicle(vehicleResource.ModelId, includeRelated: false); |
37 |
37 |
if (model == null) |
if (model == null) |
38 |
38 |
{ |
{ |
39 |
39 |
ModelState.AddModelError("ModelId", "Invalid modelId"); |
ModelState.AddModelError("ModelId", "Invalid modelId"); |
|
... |
... |
namespace vega.Controllers |
43 |
43 |
var vehicle = mapper.Map<SaveVehicleResource, Vehicle>(vehicleResource); |
var vehicle = mapper.Map<SaveVehicleResource, Vehicle>(vehicleResource); |
44 |
44 |
vehicle.LastUpdate = DateTime.Now; |
vehicle.LastUpdate = DateTime.Now; |
45 |
45 |
|
|
46 |
|
context.Vehicles.Add(vehicle); |
|
|
46 |
|
repository.Add(vehicle); |
47 |
47 |
await context.SaveChangesAsync(); |
await context.SaveChangesAsync(); |
48 |
48 |
|
|
49 |
49 |
vehicle = await repository.GetVehicle(vehicle.Id); |
vehicle = await repository.GetVehicle(vehicle.Id); |
|
... |
... |
namespace vega.Controllers |
75 |
75 |
[HttpDelete("{id}")] |
[HttpDelete("{id}")] |
76 |
76 |
public async Task<IActionResult> DeleteVehicle(int id) |
public async Task<IActionResult> DeleteVehicle(int id) |
77 |
77 |
{ |
{ |
78 |
|
var vehicle = await context.Vehicles.FindAsync(id); |
|
|
78 |
|
var vehicle = await repository.GetVehicle(id, includeRelated: false); |
79 |
79 |
|
|
80 |
80 |
if (vehicle == null) |
if (vehicle == null) |
81 |
81 |
return NotFound(); |
return NotFound(); |
82 |
82 |
|
|
83 |
|
context.Vehicles.Remove(vehicle); |
|
|
83 |
|
repository.Remove(vehicle); |
84 |
84 |
await context.SaveChangesAsync(); |
await context.SaveChangesAsync(); |
85 |
85 |
|
|
86 |
86 |
return Ok(id); |
return Ok(id); |
File Core/Repositories/IVehicleRepository.cs changed (mode: 100644) (index 87ee5d7..b2c0413) |
... |
... |
namespace vega.Core.Repositories |
6 |
6 |
{ |
{ |
7 |
7 |
public interface IVehicleRepository |
public interface IVehicleRepository |
8 |
8 |
{ |
{ |
9 |
|
Task<Vehicle> GetVehicle(int id); |
|
|
9 |
|
Task<Vehicle> GetVehicle(int id, bool includeRelated = true); |
|
10 |
|
void Add(Vehicle vehicle); |
|
11 |
|
void Remove(Vehicle vehicle); |
10 |
12 |
} |
} |
11 |
13 |
} |
} |
File Persistence/Repositories/VehicleRepository.cs changed (mode: 100644) (index 77173b0..8ad8dc6) |
... |
... |
namespace vega.Persistence.Repositories |
12 |
12 |
{ |
{ |
13 |
13 |
this.context = context; |
this.context = context; |
14 |
14 |
} |
} |
15 |
|
public async Task<Vehicle> GetVehicle(int id) |
|
|
15 |
|
public async Task<Vehicle> GetVehicle(int id, bool includeRelated = true) |
16 |
16 |
{ |
{ |
|
17 |
|
if (!includeRelated) |
|
18 |
|
return await context.Vehicles.FindAsync(id); |
|
19 |
|
|
17 |
20 |
return await context.Vehicles |
return await context.Vehicles |
18 |
|
.Include(v => v.Features) |
|
19 |
|
.ThenInclude(vf => vf.Feature) |
|
20 |
|
.Include(v => v.Model) |
|
21 |
|
.ThenInclude(m => m.Make) |
|
22 |
|
.SingleOrDefaultAsync(v => v.Id == id); |
|
|
21 |
|
.Include(v => v.Features) |
|
22 |
|
.ThenInclude(vf => vf.Feature) |
|
23 |
|
.Include(v => v.Model) |
|
24 |
|
.ThenInclude(m => m.Make) |
|
25 |
|
.SingleOrDefaultAsync(v => v.Id == id); |
|
26 |
|
} |
|
27 |
|
|
|
28 |
|
public void Add(Vehicle vehicle) |
|
29 |
|
{ |
|
30 |
|
context.Vehicles.Add(vehicle); |
|
31 |
|
} |
|
32 |
|
|
|
33 |
|
public void Remove(Vehicle vehicle) |
|
34 |
|
{ |
|
35 |
|
context.Vehicles.Remove(vehicle); |
23 |
36 |
} |
} |
24 |
37 |
} |
} |
25 |
38 |
} |
} |