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

Fix de l'API d'invoice pour pouvoir avoir l'info des produits.

Browse Source
This commit is contained in:
Victor Turgeon 2022-11-07 22:41:21 -05:00
parent 13310f6cd0
commit a3537c0a0f
7 changed files with 1467 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
GrossesMitaines/GrossesMitainesAPI/Controllers/InvoiceController.cs
View File

@ -28,11 +28,11 @@ public class InvoiceController : Controller {
#endregion
#region Ctor
public InvoiceController(ILogger<InvoiceController> logger,
InventoryContext context,
public InvoiceController(ILogger<InvoiceController> logger,
InventoryContext context,
DatabaseCacheService cache,
SignInManager<InventoryUser> signInMan,
Microsoft.AspNetCore.Identity.UserManager<InventoryUser> userMan) {
Microsoft.AspNetCore.Identity.UserManager<InventoryUser> userMan) {
_logger = logger;
_context = context;
_cache = cache;
@ -50,7 +50,8 @@ public class InvoiceController : Controller {
try { // Trouver les rôles de l'utilisateur, assumer non-admin si impossible à trouver.
var user = await _userMan.GetUserAsync(_signInMan.Context.User);
roles = await _userMan.GetRolesAsync(user);
} catch (Exception e) {
}
catch (Exception e) {
_logger.LogError(10, e.Message);
roles = new List<string>();
}
@ -58,10 +59,20 @@ public class InvoiceController : Controller {
try {
id = _signInMan.Context.User.Identity.GetUserId();
if (all is not null && all == true && roles.Contains("Administrateur"))
return Ok(_context.Invoices.ToList());
else return Ok(_context.Invoices.Include("ShippingAddress").Where(x => x.LinkedAccount != null &&
x.LinkedAccount.Id == id).ToList());
} catch (Exception e) {
return Ok(_context.Invoices
.Include("ShippingAddress")
.Include(x => x.Products)
.ThenInclude(y => y.Product)
.ToList());
else
return Ok(_context.Invoices
.Include("ShippingAddress")
.Include(x => x.Products)
.ThenInclude(y => y.Product)
.Where(x => x.LinkedAccount != null && x.LinkedAccount.Id == id).ToList());
}
catch (Exception e) {
_logger.LogError(10, e.Message);
return BadRequest();
}
@ -74,14 +85,16 @@ public class InvoiceController : Controller {
try { // Trouver les rôles de l'utilisateur, assumer non-admin si impossible à trouver.
roles = await _userMan.GetRolesAsync(await _userMan.GetUserAsync(_signInMan.Context.User));
} catch (Exception e) {
}
catch (Exception e) {
_logger.LogError(10, e.Message);
roles = new List<string>();
}
try {
inv = _context.Invoices.Where(x => x.Id == id).Include("ShippingAddress").First();
} catch (Exception e) {
}
catch (Exception e) {
_logger.LogError(10, e.Message);
return BadRequest();
}
@ -97,9 +110,9 @@ public class InvoiceController : Controller {
public async Task<ActionResult<InvoiceModel>> Post(SendInvoiceModel sinv) {
var user = await _userMan.GetUserAsync(_signInMan.Context.User);
var prodcom = sinv.ProdQuant;
Dictionary<int, uint> badprods = new();
Dictionary<int, uint> badprods = new();
List<ProductModel> prods;
InvoiceModel inv = new() {
InvoiceModel inv = new() {
FirstName = sinv.FirstName,
LastName = sinv.LastName,
EmailAddress = sinv.EmailAddress,
@ -112,7 +125,7 @@ public class InvoiceController : Controller {
x.City == sinv.City &&
x.Province == sinv.Province &&
x.Country == sinv.Country) ??
new() {
new() {
CivicNumber = sinv.CivicNumber,
Appartment = sinv.Appartment,
Street = sinv.Street,
@ -127,7 +140,8 @@ public class InvoiceController : Controller {
try {
prods = _context.Products.Where(x => sinv.ProdQuant.Select(x => x.Key).Contains(x.Id)).ToList();
} catch (Exception e) {
}
catch (Exception e) {
_logger.LogError(8, e.Message);
return BadRequest();
}
@ -144,20 +158,22 @@ public class InvoiceController : Controller {
inventProd.Status = inventProd.Status == ProductModel.States.Clearance ?
ProductModel.States.Discontinued :
ProductModel.States.BackOrder;
} else inventProd.Quantity -= prod.Value;
}
else inventProd.Quantity -= prod.Value;
inventProd.LastSale = DateTime.Now;
inventProd.Sales += prod.Value;
}
if (badprods.Count > 0) // Retour des produits non-achetable avec l'inventaire restant.
return BadRequest(badprods.ToArray());
try { // Faire les updates dans la BD.
_context.Addresses.Add(ad);
_context.Invoices.Add(inv);
_context.Products.UpdateRange(prods);
_context.SaveChanges();
} catch (Exception e) {
}
catch (Exception e) {
_logger.LogError(8, e.Message);
return BadRequest(e.InnerException.Message);
}
@ -167,27 +183,29 @@ public class InvoiceController : Controller {
}
[HttpPost("Cancel/{id}"), Authorize(Roles = "Client, Administrateur")]
public async Task<ActionResult<InvoiceModel>> Cancel(int id) {
public async Task<ActionResult<InvoiceModel>> Cancel(int id) {
InvoiceModel inv;
IList<string> roles;
try { // Trouver la commande.
inv = _context.Invoices.Where(x => x.Id == id)
.Include("Product").First();
} catch (Exception e) {
}
catch (Exception e) {
_logger.LogError(8, e.Message);
return BadRequest();
}
try { // Trouver les rôles de l'utilisateur, assumer non-admin si impossible à trouver.
roles = await _userMan.GetRolesAsync(await _userMan.GetUserAsync(_signInMan.Context.User));
} catch (Exception e) {
}
catch (Exception e) {
_logger.LogError(10, e.Message);
roles = new List<string>();
}
// Pour ne pas pouvoir arbitrairement annuler la commande d'un autre client en tant que client.
if (!((inv.LinkedAccount is not null &&
if (!((inv.LinkedAccount is not null &&
inv.LinkedAccount.Id == _signInMan.Context.User.Identity.GetUserId()) ||
roles.Contains("Administrateur")))
return Unauthorized();
@ -208,12 +226,13 @@ public class InvoiceController : Controller {
else prod.Product.Status = ProductModel.States.Available;
prod.Product.Quantity = prod.Product.Quantity + prod.Quantity;
prod.Product.Sales -= prod.Quantity;
}
}
try {
_context.Update(inv);
_context.SaveChanges();
} catch (Exception e) {
}
catch (Exception e) {
_logger.LogError(8, e.Message);
return BadRequest();
}

27
GrossesMitaines/GrossesMitainesAPI/Data/InventoryContext.cs
View File

@ -414,6 +414,15 @@ Pikachu is also the starter Pokémon of Pokémon Rumble Blast and Pokémon Rumbl
Province = "QC",
Country = "Canada",
InventoryUserId = AdminID,
},
new {
Id = 2,
CivicNumber = 420,
Street = "Rue MikeWard",
City = "Saint-Jérôme",
PostalCode = "H0H0H0",
Province = "QC",
Country = "Canada",
}
);
#endregion
@ -476,6 +485,16 @@ Pikachu is also the starter Pokémon of Pokémon Rumble Blast and Pokémon Rumbl
PurchaseDate = DateTime.Now,
ShippingAddressId = 1,
Status = InvoiceModel.InStates.Returned,
},
new {
Id = 6,
EmailAddress = "test@admin.com",
FirstName = "Jérémy",
LastName = "Le Petit",
PhoneNumber = "111-111-1111",
PurchaseDate = DateTime.Now,
ShippingAddressId = 2,
Status = InvoiceModel.InStates.Confirmed,
}
);
@ -578,6 +597,14 @@ Pikachu is also the starter Pokémon of Pokémon Rumble Blast and Pokémon Rumbl
ProductId = 15,
Quantity = (uint)2,
InvoiceModelId = 5
},
// invoice 6
new {
Id = 16,
ProductId = 20,
Quantity = (uint)4,
InvoiceModelId = 6
}
);
#endregion

1192
GrossesMitaines/GrossesMitainesAPI/Migrations/20221108033526_nonUserInvoice.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

158
GrossesMitaines/GrossesMitainesAPI/Migrations/20221108033526_nonUserInvoice.cs Normal file
View File

@ -0,0 +1,158 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace GrossesMitainesAPI.Migrations
{
public partial class nonUserInvoice : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.InsertData(
table: "Addresses",
columns: new[] { "Id", "Appartment", "City", "CivicNumber", "Country", "InventoryUserId", "PostalCode", "Province", "Street" },
values: new object[] { 2, null, "Saint-Jérôme", 420, "Canada", null, "H0H0H0", "QC", "Rue MikeWard" });
migrationBuilder.UpdateData(
table: "AspNetRoles",
keyColumn: "Id",
keyValue: "1b7b9c55-c746-493a-a24f-3d5ca937298e",
column: "ConcurrencyStamp",
value: "8b05058e-1c97-4021-a485-6987e774c877");
migrationBuilder.UpdateData(
table: "AspNetRoles",
keyColumn: "Id",
keyValue: "c9e08b20-d8a5-473f-9f52-572eb23c12af",
column: "ConcurrencyStamp",
value: "e5b77c04-830f-4c19-ad44-6c9e5a508efb");
migrationBuilder.UpdateData(
table: "AspNetUsers",
keyColumn: "Id",
keyValue: "ecf7503a-591c-454e-a824-048e10bd0474",
columns: new[] { "ConcurrencyStamp", "PasswordHash", "SecurityStamp" },
values: new object[] { "af3a641d-8fe8-45c3-8e36-fdfbef10659a", "AQAAAAEAACcQAAAAEL/k0+c61dX1YPgqHrr6wmVSZNJzoqveJzr8IxjVSSL3W+GSsqOXft+hVLXozCnqVg==", "8ac35276-f8dc-4de4-826f-ea2996e09f2c" });
migrationBuilder.UpdateData(
table: "Invoices",
keyColumn: "Id",
keyValue: 1,
column: "PurchaseDate",
value: new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6619));
migrationBuilder.UpdateData(
table: "Invoices",
keyColumn: "Id",
keyValue: 2,
column: "PurchaseDate",
value: new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6655));
migrationBuilder.UpdateData(
table: "Invoices",
keyColumn: "Id",
keyValue: 3,
column: "PurchaseDate",
value: new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6658));
migrationBuilder.UpdateData(
table: "Invoices",
keyColumn: "Id",
keyValue: 4,
column: "PurchaseDate",
value: new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6659));
migrationBuilder.UpdateData(
table: "Invoices",
keyColumn: "Id",
keyValue: 5,
column: "PurchaseDate",
value: new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6661));
migrationBuilder.InsertData(
table: "Invoices",
columns: new[] { "Id", "EmailAddress", "FirstName", "LastName", "LinkedAccountId", "PhoneNumber", "PurchaseDate", "ShippingAddressId", "Status" },
values: new object[] { 6, "test@admin.com", "Jérémy", "Le Petit", null, "111-111-1111", new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6663), 2, 0 });
migrationBuilder.InsertData(
table: "ProductInvoice",
columns: new[] { "Id", "InvoiceModelId", "ProductId", "Quantity" },
values: new object[] { 16, 6, 20, 4L });
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "ProductInvoice",
keyColumn: "Id",
keyValue: 16);
migrationBuilder.DeleteData(
table: "Invoices",
keyColumn: "Id",
keyValue: 6);
migrationBuilder.DeleteData(
table: "Addresses",
keyColumn: "Id",
keyValue: 2);
migrationBuilder.UpdateData(
table: "AspNetRoles",
keyColumn: "Id",
keyValue: "1b7b9c55-c746-493a-a24f-3d5ca937298e",
column: "ConcurrencyStamp",
value: "664e61a9-f77d-46ee-805c-98084e8b2fcb");
migrationBuilder.UpdateData(
table: "AspNetRoles",
keyColumn: "Id",
keyValue: "c9e08b20-d8a5-473f-9f52-572eb23c12af",
column: "ConcurrencyStamp",
value: "3b41186e-cc4b-49c0-b172-4c2b9be614d2");
migrationBuilder.UpdateData(
table: "AspNetUsers",
keyColumn: "Id",
keyValue: "ecf7503a-591c-454e-a824-048e10bd0474",
columns: new[] { "ConcurrencyStamp", "PasswordHash", "SecurityStamp" },
values: new object[] { "55f4780c-49dd-44ea-b566-30d058c0005b", "AQAAAAEAACcQAAAAEK/n6j8ui+ZivXKUi2Lv6Jr7wXBJQdOdXawkvVDBlr4Rnxc7DxsuWwaaX5vN3YSjmQ==", "e3f2e569-fb52-49af-b9bc-10bf8df2b778" });
migrationBuilder.UpdateData(
table: "Invoices",
keyColumn: "Id",
keyValue: 1,
column: "PurchaseDate",
value: new DateTime(2022, 11, 7, 22, 8, 27, 792, DateTimeKind.Local).AddTicks(1206));
migrationBuilder.UpdateData(
table: "Invoices",
keyColumn: "Id",
keyValue: 2,
column: "PurchaseDate",
value: new DateTime(2022, 11, 7, 22, 8, 27, 792, DateTimeKind.Local).AddTicks(1244));
migrationBuilder.UpdateData(
table: "Invoices",
keyColumn: "Id",
keyValue: 3,
column: "PurchaseDate",
value: new DateTime(2022, 11, 7, 22, 8, 27, 792, DateTimeKind.Local).AddTicks(1247));
migrationBuilder.UpdateData(
table: "Invoices",
keyColumn: "Id",
keyValue: 4,
column: "PurchaseDate",
value: new DateTime(2022, 11, 7, 22, 8, 27, 792, DateTimeKind.Local).AddTicks(1249));
migrationBuilder.UpdateData(
table: "Invoices",
keyColumn: "Id",
keyValue: 5,
column: "PurchaseDate",
value: new DateTime(2022, 11, 7, 22, 8, 27, 792, DateTimeKind.Local).AddTicks(1251));
}
}
}

48
GrossesMitaines/GrossesMitainesAPI/Migrations/InventoryContextModelSnapshot.cs
View File

@ -101,7 +101,7 @@ namespace GrossesMitainesAPI.Migrations
{
Id = "ecf7503a-591c-454e-a824-048e10bd0474",
AccessFailedCount = 0,
ConcurrencyStamp = "55f4780c-49dd-44ea-b566-30d058c0005b",
ConcurrencyStamp = "af3a641d-8fe8-45c3-8e36-fdfbef10659a",
Email = "admin@admin.com",
EmailConfirmed = false,
FirstName = "Roger",
@ -109,9 +109,9 @@ namespace GrossesMitainesAPI.Migrations
LockoutEnabled = false,
NormalizedEmail = "ADMIN@ADMIN.COM",
NormalizedUserName = "ADMIN",
PasswordHash = "AQAAAAEAACcQAAAAEK/n6j8ui+ZivXKUi2Lv6Jr7wXBJQdOdXawkvVDBlr4Rnxc7DxsuWwaaX5vN3YSjmQ==",
PasswordHash = "AQAAAAEAACcQAAAAEL/k0+c61dX1YPgqHrr6wmVSZNJzoqveJzr8IxjVSSL3W+GSsqOXft+hVLXozCnqVg==",
PhoneNumberConfirmed = false,
SecurityStamp = "e3f2e569-fb52-49af-b9bc-10bf8df2b778",
SecurityStamp = "8ac35276-f8dc-4de4-826f-ea2996e09f2c",
TwoFactorEnabled = false,
UserName = "Admin"
});
@ -176,6 +176,16 @@ namespace GrossesMitainesAPI.Migrations
PostalCode = "H0H0H0",
Province = "QC",
Street = "Rue Pierre-Falardeau"
},
new
{
Id = 2,
City = "Saint-Jérôme",
CivicNumber = 420,
Country = "Canada",
PostalCode = "H0H0H0",
Province = "QC",
Street = "Rue MikeWard"
});
});
@ -234,7 +244,7 @@ namespace GrossesMitainesAPI.Migrations
LastName = "Admin",
LinkedAccountId = "ecf7503a-591c-454e-a824-048e10bd0474",
PhoneNumber = "111-111-1111",
PurchaseDate = new DateTime(2022, 11, 7, 22, 8, 27, 792, DateTimeKind.Local).AddTicks(1206),
PurchaseDate = new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6619),
ShippingAddressId = 1,
Status = 0
},
@ -246,7 +256,7 @@ namespace GrossesMitainesAPI.Migrations
LastName = "Admin",
LinkedAccountId = "ecf7503a-591c-454e-a824-048e10bd0474",
PhoneNumber = "111-111-1111",
PurchaseDate = new DateTime(2022, 11, 7, 22, 8, 27, 792, DateTimeKind.Local).AddTicks(1244),
PurchaseDate = new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6655),
ShippingAddressId = 1,
Status = 1
},
@ -258,7 +268,7 @@ namespace GrossesMitainesAPI.Migrations
LastName = "Admin",
LinkedAccountId = "ecf7503a-591c-454e-a824-048e10bd0474",
PhoneNumber = "111-111-1111",
PurchaseDate = new DateTime(2022, 11, 7, 22, 8, 27, 792, DateTimeKind.Local).AddTicks(1247),
PurchaseDate = new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6658),
ShippingAddressId = 1,
Status = 3
},
@ -270,7 +280,7 @@ namespace GrossesMitainesAPI.Migrations
LastName = "Admin",
LinkedAccountId = "ecf7503a-591c-454e-a824-048e10bd0474",
PhoneNumber = "111-111-1111",
PurchaseDate = new DateTime(2022, 11, 7, 22, 8, 27, 792, DateTimeKind.Local).AddTicks(1249),
PurchaseDate = new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6659),
ShippingAddressId = 1,
Status = 4
},
@ -282,9 +292,20 @@ namespace GrossesMitainesAPI.Migrations
LastName = "Admin",
LinkedAccountId = "ecf7503a-591c-454e-a824-048e10bd0474",
PhoneNumber = "111-111-1111",
PurchaseDate = new DateTime(2022, 11, 7, 22, 8, 27, 792, DateTimeKind.Local).AddTicks(1251),
PurchaseDate = new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6661),
ShippingAddressId = 1,
Status = 5
},
new
{
Id = 6,
EmailAddress = "test@admin.com",
FirstName = "Jérémy",
LastName = "Le Petit",
PhoneNumber = "111-111-1111",
PurchaseDate = new DateTime(2022, 11, 7, 22, 35, 25, 783, DateTimeKind.Local).AddTicks(6663),
ShippingAddressId = 2,
Status = 0
});
});
@ -418,6 +439,13 @@ namespace GrossesMitainesAPI.Migrations
InvoiceModelId = 5,
ProductId = 15,
Quantity = 2L
},
new
{
Id = 16,
InvoiceModelId = 6,
ProductId = 20,
Quantity = 4L
});
});
@ -926,14 +954,14 @@ namespace GrossesMitainesAPI.Migrations
new
{
Id = "c9e08b20-d8a5-473f-9f52-572eb23c12af",
ConcurrencyStamp = "3b41186e-cc4b-49c0-b172-4c2b9be614d2",
ConcurrencyStamp = "e5b77c04-830f-4c19-ad44-6c9e5a508efb",
Name = "Administrateur",
NormalizedName = "ADMINISTRATEUR"
},
new
{
Id = "1b7b9c55-c746-493a-a24f-3d5ca937298e",
ConcurrencyStamp = "664e61a9-f77d-46ee-805c-98084e8b2fcb",
ConcurrencyStamp = "8b05058e-1c97-4021-a485-6987e774c877",
Name = "Client",
NormalizedName = "CLIENT"
});

3
GrossesMitaines/grosses-mitaines-ui/src/components/InvoiceItem.js
View File

@ -2,7 +2,8 @@ const InvoiceItem = (invoice) => {
return (
<>
Invoice Item
<div>
</div>
</>
);

10
GrossesMitaines/grosses-mitaines-ui/src/pages/MyInvoices.js
View File

@ -12,8 +12,14 @@ const MyInvoices = () => {
mode: 'cors',
credentials: 'include'
}).then(async (response) => {
var json = await response.json();
setInvoices(json);
if (response.ok) {
var json = await response.json();
console.log(json);
setInvoices(json);
}
else{
console.log("Erreur lors de la requête des invoices");
}
});
}, []);