Bump .NEt
Add Freezer stuff Update Project Update Data
This commit is contained in:
@@ -1,14 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Data;
|
||||
using Data.Models;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using ThuisApi.Data;
|
||||
using ThuisApi.Models;
|
||||
|
||||
namespace ThuisApi.Controllers
|
||||
namespace Api.Controllers
|
||||
{
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
|
||||
@@ -1,15 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Api.Models;
|
||||
using AutoMapper;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Data;
|
||||
using Data.Models;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using ThuisApi.Data;
|
||||
using ThuisApi.Models;
|
||||
|
||||
namespace ThuisApi.Controllers
|
||||
namespace Api.Controllers
|
||||
{
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
@@ -28,21 +24,11 @@ namespace ThuisApi.Controllers
|
||||
[HttpGet]
|
||||
public async Task<ActionResult<IEnumerable<FreezerDto>>> GetFreezer()
|
||||
{
|
||||
// Iterate over the freezers to add amount in freezer.
|
||||
var freezers = await _context.Freezer.ToListAsync();
|
||||
var freezerResponse = new List<FreezerDto>();
|
||||
foreach (var freezer in freezers)
|
||||
return Ok(new { freezers = _context.Freezer.Select(freezer => new FreezerDto
|
||||
{
|
||||
freezerResponse.Add(new FreezerDto
|
||||
{
|
||||
FreezerId = freezer.FreezerId,
|
||||
Name = freezer.Name,
|
||||
AmountInFreezer =
|
||||
await _context.FreezerItem.CountAsync(a => a.Freezer.FreezerId == freezer.FreezerId)
|
||||
});
|
||||
}
|
||||
|
||||
return Ok(freezerResponse.ToArray());
|
||||
FreezerId = freezer.FreezerId, Name = freezer.Name,
|
||||
AmountInFreezer = _context.FreezerItem.Count(fi => fi.FreezerId == freezer.FreezerId)
|
||||
})});
|
||||
}
|
||||
|
||||
// GET: api/Freezer/5
|
||||
|
||||
@@ -1,17 +1,12 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Text.Json;
|
||||
using System.Threading.Tasks;
|
||||
using Api.Models;
|
||||
using AutoMapper;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Data;
|
||||
using Data.Models;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using ThuisApi.Data;
|
||||
using ThuisApi.Models;
|
||||
|
||||
namespace ThuisApi.Controllers
|
||||
namespace Api.Controllers
|
||||
{
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
@@ -42,9 +37,9 @@ namespace ThuisApi.Controllers
|
||||
return NotFound();
|
||||
}
|
||||
|
||||
return Ok(_mapper.Map<FreezerItem[], List<FreezerItemDto>>(await _context.FreezerItem
|
||||
return Ok(new {freezerItems = _mapper.Map<FreezerItem[], List<FreezerItemDto>>(await _context.FreezerItem
|
||||
.Where(a => a.FreezerId == id)
|
||||
.ToArrayAsync()));
|
||||
.ToArrayAsync())});
|
||||
}
|
||||
|
||||
// GET: api/FreezerItem/5
|
||||
@@ -98,9 +93,9 @@ namespace ThuisApi.Controllers
|
||||
public async Task<ActionResult<FreezerItemDto>> PostFreezerItem(FreezerItemDto freezerItemDto)
|
||||
{
|
||||
var mappedItem = _mapper.Map<FreezerItemDto, FreezerItem>(freezerItemDto);
|
||||
if (mappedItem.DatePlacedInFreezer.ToString(CultureInfo.CurrentCulture).Equals(""))
|
||||
if (mappedItem.AddedOn.ToString(CultureInfo.CurrentCulture).Equals(""))
|
||||
{
|
||||
mappedItem.DatePlacedInFreezer = DateTime.Now;
|
||||
mappedItem.AddedOn = DateTime.Now;
|
||||
}
|
||||
|
||||
mappedItem.Freezer =
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
using Microsoft.AspNetCore.Http.HttpResults;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace ThuisApi.Controllers;
|
||||
namespace Api.Controllers;
|
||||
|
||||
public class IndexController : ControllerBase
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user