memartel_loc/GGMM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yeehaw

Browse Source
This commit is contained in:
MarcEricMartel 2022-10-27 11:32:06 -07:00
parent 83331a4a08
commit f3dcc0c4d8
2 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
GrossesMitaines/GrossesMitainesAPI/Controllers/InventoryController.cs
View File

@ -14,7 +14,6 @@ public class InventoryController : Controller {
private readonly ILogger<InventoryController> _logger; private readonly ILogger<InventoryController> _logger;
private readonly InventoryContext _context; private readonly InventoryContext _context;
private readonly DatabaseCacheService _cache; private readonly DatabaseCacheService _cache;
private static object _lock = new object();
private const int AMOUNT_SCROLL = 5; private const int AMOUNT_SCROLL = 5;
public InventoryController(ILogger<InventoryController> logger, InventoryContext context, DatabaseCacheService cache) { public InventoryController(ILogger<InventoryController> logger, InventoryContext context, DatabaseCacheService cache) {
@ -24,12 +23,12 @@ public class InventoryController : Controller {
} }
[EnableCors("_myAllowSpecificOrigins"), HttpGet(Name = "Inventory"), AllowAnonymous] // Pour faire des calls async par paquet de AMOUNT (5) (pour du loading en scrollant) [EnableCors("_myAllowSpecificOrigins"), HttpGet(Name = "Inventory"), AllowAnonymous] // Pour faire des calls async par paquet de AMOUNT (5) (pour du loading en scrollant)
public IEnumerable<Product> Get(int? lastId, string? order, string? filterPrice, string? filterState, bool? all) { public IEnumerable<ProductViewModel> Get(int? lastId, string? order, string? filterPrice, string? filterState, bool? all) {
bool islock = false; bool iscache = false;
IQueryable<Product> ret; IQueryable<Product> ret;
if (_cache.isOk()) { if (_cache.isOk()) {
ret = _cache.queryCache(); ret = _cache.queryCache();
islock = true; iscache = true;
} }
else ret = _context.Products.AsQueryable(); else ret = _context.Products.AsQueryable();
switch (filterPrice) { switch (filterPrice) {
@ -70,7 +69,7 @@ public class InventoryController : Controller {
} }
switch (order) { switch (order) {
case "Price": case "Price":
ret = ret.OrderBy(x => x.Status == Product.States.Promotion || x.Status == Product.States.Clearance? x.PromoPrice: x.Price); ret = ret.OrderBy(x => x.Status == Product.States.Promotion || x.Status == Product.States.Clearance ? x.PromoPrice : x.Price);
break; break;
case "PriceDesc": case "PriceDesc":
ret = ret.OrderByDescending(x => x.Status == Product.States.Promotion || x.Status == Product.States.Clearance ? x.PromoPrice : x.Price); ret = ret.OrderByDescending(x => x.Status == Product.States.Promotion || x.Status == Product.States.Clearance ? x.PromoPrice : x.Price);
@ -89,42 +88,27 @@ public class InventoryController : Controller {
break; break;
default: break; default: break;
} }
List<Product> lst = new(); List<ProductViewModel> lst = new();
bool yup = false; bool yup = false;
int add = 0; int add = 0;
try { try {
if (lastId.HasValue) { // Pour avoir les prochains peu importe l'ordre. if (!lastId.HasValue || lastId == 0)
List<Product> prods; yup = true;
if (islock)
lock (_lock) { foreach (Product prod in ret.ToList()) {
prods = ret.ToList(); if (yup && add < AMOUNT_SCROLL || (all.HasValue && all == true)) {
} lst.Add(new ProductViewModel(prod));
else prods = ret.ToList(); add++;
foreach (Product prod in prods) {
if (yup && add < AMOUNT_SCROLL) {
lst.Add(prod);
add++;
}
if (prod.Id == lastId)
yup = true;
} }
} else if (all.HasValue && all == true) { if (!yup && prod.Id == lastId)
if (islock) yup = true;
lock (_lock) { }
lst = ret.ToList();
}
else lst = ret.ToList();
} else if (islock)
lock (_lock) {
lst = ret.Take(AMOUNT_SCROLL).ToList();
}
else lst = ret.Take(AMOUNT_SCROLL).ToList();
return lst; return lst;
} catch (Exception e) { } catch (Exception e) {
if (islock) if (iscache)
_logger.LogError(e, "Erreur d'appel de cache."); _logger.LogError(e, "Erreur d'appel de cache.");
else _logger.LogError(e, "Erreur d'appel d'API."); else _logger.LogError(e, "Erreur d'appel d'API.");
return new List<Product>(); return new List<ProductViewModel>();
} }
} }
// Inventory/Delete => Décrémenter un produit. Va aller chercher directement dans la BD. // Inventory/Delete => Décrémenter un produit. Va aller chercher directement dans la BD.
@ -143,11 +127,10 @@ public class InventoryController : Controller {
prod.Sales = prod.Sales + 1; prod.Sales = prod.Sales + 1;
prod.LastSale = DateTime.Now; prod.LastSale = DateTime.Now;
if (prod.Quantity == 0) if (prod.Quantity == 0)
prod.Status = prod.Status == Product.States.Clearance? prod.Status = prod.Status == Product.States.Clearance ?
Product.States.Discontinued: Product.States.Discontinued :
Product.States.BackOrder; Product.States.BackOrder;
} } else {
else {
_logger.LogError(8, "Vente de produit pas en stock."); _logger.LogError(8, "Vente de produit pas en stock.");
return BadRequest(); return BadRequest();
} }

4
GrossesMitaines/GrossesMitainesAPI/Services/DatabaseCacheService.cs
View File

@ -26,8 +26,10 @@ namespace GrossesMitainesAPI.Services {
_ok = UpdateCache(); _ok = UpdateCache();
_needUpd = !_ok; _needUpd = !_ok;
} }
if (_hits.Count > 0 && _ok) if (_hits.Count > 0 && _ok) {
UpdateMetrics(); UpdateMetrics();
//_needUpd = true;
}
} }
} }
private bool UpdateCache() { private bool UpdateCache() {