diff --git a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor b/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor index 9480631..3b73c89 100644 --- a/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor +++ b/CulinaryCommandApp/Components/Pages/Assignments/AdminAssignTask.razor @@ -4,16 +4,13 @@ @using CulinaryCommand.Services @using CulinaryCommand.Data.Enums; @using CulinaryCommand.Services.UserContextSpace -@using CulinaryCommandApp.Recipe.Services; -@using CulinaryCommandApp.Recipe.Services.Interfaces; -@using CulinaryCommandApp.Recipe.Entities; @inject IUserContextService UserCtx @inject NavigationManager Nav @inject ILocationService LocationService @inject IUserService UserService @inject LocationState LocationState @inject ITaskAssignmentService TaskService -@inject IRecipeService RecipeService +@inject RecipeService RecipeService @implements IDisposable @rendermode InteractiveServer @@ -349,8 +346,11 @@ else try { - recipes = await RecipeService.GetAllByLocationIdAsync(selectedLocationId.Value); - recipes = recipes.OrderBy(r => r.Title).ToList(); + var all = await RecipeService.GetAllAsync(); + recipes = all + .Where(r => r.LocationId == selectedLocationId.Value) + .OrderBy(r => r.Title) + .ToList(); } catch { diff --git a/CulinaryCommandApp/Components/Pages/EmployeeView.razor b/CulinaryCommandApp/Components/Pages/EmployeeView.razor deleted file mode 100644 index 82f700d..0000000 --- a/CulinaryCommandApp/Components/Pages/EmployeeView.razor +++ /dev/null @@ -1,64 +0,0 @@ -@rendermode InteractiveServer - -@using CulinaryCommand.Components.Custom -@using CulinaryCommand.Services.UserContextSpace -@using CulinaryCommand.Services - -@inject IUserContextService UserCtx -@inject LocationState LocationState - -
-

Employee Dashboard

- - @if (!_ready) - { -
Loading...
- } - else if (LocationState.CurrentLocation is null) - { -

No location assigned. Please contact your manager.

- } - else - { -

Welcome to @LocationState.CurrentLocation.Name.

- -
-
-
- - -
-
- - -
-
-
- } -
- -@code { - - private bool _ready; - - protected override async Task OnInitializedAsync() - { - _ready = true; - } -} diff --git a/CulinaryCommandApp/Components/Pages/Recipes/Create.razor b/CulinaryCommandApp/Components/Pages/Recipes/Create.razor new file mode 100644 index 0000000..8df7d49 --- /dev/null +++ b/CulinaryCommandApp/Components/Pages/Recipes/Create.razor @@ -0,0 +1,31 @@ +@page "/recipes/create" +@using CulinaryCommand.Data.Entities +@inject NavigationManager Nav +@inject RecipeService Recipes +@inject LocationState LocationState +@rendermode InteractiveServer + +

Create Recipe

+ + + +@code { + private Recipe model = new(); + + private async Task Save() + { + // Make sure we have a current location + if (LocationState.CurrentLocation is null) + { + // You can swap this for a nicer UI message later + Console.WriteLine("No current location selected – cannot save recipe."); + return; + } + + // πŸ”₯ attach recipe to the active location + model.LocationId = LocationState.CurrentLocation.Id; + + await Recipes.CreateAsync(model); + Nav.NavigateTo("/recipes"); + } +} \ No newline at end of file diff --git a/CulinaryCommandApp/Components/Pages/Recipes/Edit.razor b/CulinaryCommandApp/Components/Pages/Recipes/Edit.razor new file mode 100644 index 0000000..95b1205 --- /dev/null +++ b/CulinaryCommandApp/Components/Pages/Recipes/Edit.razor @@ -0,0 +1,33 @@ +@page "/recipes/edit/{id:int}" +@using CulinaryCommand.Data.Entities +@inject NavigationManager Nav +@inject RecipeService Recipes +@rendermode InteractiveServer + +

Edit Recipe

+ +@if (model == null) +{ +

Loading...

+} +else +{ + +} + +@code { + [Parameter] public int id { get; set; } + + private Recipe? model; + + protected override async Task OnInitializedAsync() + { + model = await Recipes.GetByIdAsync(id); + } + + private async Task Save() + { + await Recipes.UpdateAsync(model); + Nav.NavigateTo("/recipes"); + } +} diff --git a/CulinaryCommandApp/Components/Pages/Recipes/Index.razor b/CulinaryCommandApp/Components/Pages/Recipes/Index.razor new file mode 100644 index 0000000..7da5afe --- /dev/null +++ b/CulinaryCommandApp/Components/Pages/Recipes/Index.razor @@ -0,0 +1,5 @@ +@page "/recipes" +@using CulinaryCommand.Data.Entities +@rendermode InteractiveServer + + diff --git a/CulinaryCommandApp/Components/Pages/Recipes/RecipeForm.razor b/CulinaryCommandApp/Components/Pages/Recipes/RecipeForm.razor new file mode 100644 index 0000000..bc08ae7 --- /dev/null +++ b/CulinaryCommandApp/Components/Pages/Recipes/RecipeForm.razor @@ -0,0 +1,234 @@ +@using CulinaryCommand.Data.Entities +@using CulinaryCommand.Inventory.Services +@rendermode InteractiveServer +@inject NavigationManager Nav +@inject IngredientService Ingredients +@inject UnitService Units +@inject EnumService enumService + +
+
+

@FormTitle

+
+ +
+ + +
+
+ + +
+ +
+ + +
+
+ +
+
+ + +
+ +
+ + + Enter a value from 0–100% +
+ +
+ + +
+
+ +
+ + +
Ingredients
+ + @foreach (var item in Model.RecipeIngredients.OrderBy(i => i.SortOrder)) + { +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ +
+
+ + +
+
+ + +
+
+ + +
+ } + + + +
+ + +
Steps
+ + @foreach (var step in Model.Steps.OrderBy(s => s.StepNumber)) + { +
+ + + +
+ } + + + +
+ + + + + +
+
+ +@code { + [Parameter] public Recipe Model { get; set; } = new(); + [Parameter] public EventCallback OnValidSubmit { get; set; } + [Parameter] public string FormTitle { get; set; } = "Recipe"; + + public List IngredientCategories { get; set; } = new(); + private List recipeCategories = new (); + private List recipeTypes = new (); + private List yieldUnits = new(); + + protected override async Task OnInitializedAsync() + { + IngredientCategories = enumService.GetCategories(); + recipeCategories = enumService.GetCategories(); + recipeTypes = enumService.GetRecipeTypes(); + yieldUnits = enumService.GetUnits(); + } + + void AddIngredient() + { + Model.RecipeIngredients.Add(new RecipeIngredient + { + SortOrder = Model.RecipeIngredients.Count + 1, + AvailableIngredients = new(), + AvailableUnits = new() + }); + } + + void RemoveIngredient(RecipeIngredient item) + { + Model.RecipeIngredients.Remove(item); + } + + void AddStep() + { + Model.Steps.Add(new RecipeStep + { + StepNumber = Model.Steps.Count + 1 + }); + } + + void RemoveStep(RecipeStep step) + { + Model.Steps.Remove(step); + } + + async Task LoadIngredientsForCategory(RecipeIngredient item, string? category) + { + if (string.IsNullOrWhiteSpace(category)) + return; + + item.AvailableIngredients = await Ingredients.GetByCategoryAsync(category); + } + + async Task LoadUnitsForIngredient(RecipeIngredient item) + { + if (item.IngredientId <= 0) + return; + + item.AvailableUnits = await Units.GetUnitsForIngredient(item.IngredientId); + } + + void Cancel() => Nav.NavigateTo("/recipes"); + + async Task Save() => await OnValidSubmit.InvokeAsync(); +} \ No newline at end of file diff --git a/CulinaryCommandApp/Components/Pages/Recipes/RecipeList.razor b/CulinaryCommandApp/Components/Pages/Recipes/RecipeList.razor new file mode 100644 index 0000000..4705381 --- /dev/null +++ b/CulinaryCommandApp/Components/Pages/Recipes/RecipeList.razor @@ -0,0 +1,167 @@ +@* @page "/recipes" *@ +@rendermode InteractiveServer +@implements IDisposable + +@using CulinaryCommand.Data.Entities +@using CulinaryCommand.Services +@using CulinaryCommand.Services.UserContextSpace + +@inject NavigationManager Nav +@inject IJSRuntime Js +@inject RecipeService Recipes +@inject LocationState LocationState +@inject IUserContextService UserCtx + +

Recipes

+ +@if (priv) +{ + +} + +@if (recipes == null) +{ +

Loading...

+} +else +{ + + + + + + + + + + + + @foreach (var r in recipes) + { + + + + + + + + } + +
TitleCategoryTypeYield
@r.Title@r.Category@r.RecipeType@FormatYield(r) + + @if (priv) + { + + + } +
+} + +@code { + private UserContext? _ctx; + + private List? recipes; + private bool priv = false; + + protected override async Task OnInitializedAsync() + { + _ctx = await UserCtx.GetAsync(); + + // If not authenticated, bounce to Cognito login + if (_ctx.IsAuthenticated != true) + { + Nav.NavigateTo("/login", true); + return; + } + + // Invite-only: authenticated but not in DB + if (_ctx.User is null) + { + Nav.NavigateTo("/no-access", true); + return; + } + + // Ensure LocationState is hydrated if user deep-links here + if (LocationState.ManagedLocations.Count == 0 && _ctx.AccessibleLocations.Any()) + await LocationState.SetLocationsAsync(_ctx.AccessibleLocations); + + UpdatePriv(); + + LocationState.OnChange += RefreshRecipes; + + await LoadRecipesAsync(); + } + + private void UpdatePriv() + { + var role = _ctx?.User?.Role; + priv = + string.Equals(role, "Manager", StringComparison.OrdinalIgnoreCase) || + string.Equals(role, "Admin", StringComparison.OrdinalIgnoreCase); + } + + private async Task LoadRecipesAsync() + { + var loc = LocationState.CurrentLocation; + + if (loc == null) + { + recipes = new List(); + return; + } + + recipes = await Recipes.GetAllByLocationIdAsync(loc.Id); + } + + private void RefreshRecipes() + { + _ = InvokeAsync(async () => + { + await LoadRecipesAsync(); + StateHasChanged(); + }); + } + + void AddNew() => Nav.NavigateTo("/recipes/create"); + void Edit(int id) => Nav.NavigateTo($"/recipes/edit/{id}"); + void View(int id) => Nav.NavigateTo($"/recipes/view/{id}"); + + async Task Delete(int id) + { + if (await Js.InvokeAsync("confirm", $"Delete recipe #{id}?")) + { + await Recipes.DeleteAsync(id); + await LoadRecipesAsync(); + await InvokeAsync(StateHasChanged); + } + } + + private string FormatYield(Recipe r) + { + if (!r.YieldAmount.HasValue) + return string.IsNullOrWhiteSpace(r.YieldUnit) ? string.Empty : r.YieldUnit!; + + var amount = r.YieldAmount.Value; + + var amountText = decimal.Truncate(amount) == amount + ? amount.ToString("0") + : amount.ToString("0.##"); + + return string.IsNullOrWhiteSpace(r.YieldUnit) + ? amountText + : $"{amountText} {r.YieldUnit}"; + } + + public void Dispose() + { + LocationState.OnChange -= RefreshRecipes; + } +} diff --git a/CulinaryCommandApp/Components/Pages/Recipes/RecipeView.razor b/CulinaryCommandApp/Components/Pages/Recipes/RecipeView.razor new file mode 100644 index 0000000..ba7b904 --- /dev/null +++ b/CulinaryCommandApp/Components/Pages/Recipes/RecipeView.razor @@ -0,0 +1,133 @@ +@page "/recipes/view/{id:int}" +@using CulinaryCommand.Data.Entities +@inject RecipeService Recipes +@inject NavigationManager Nav + +
+ +
+

@recipe?.Title

+ +
+ + @if (recipe == null) + { +

Loading...

+ } + else + { +
+
+ + +
+
+
+
Category
+
@recipe.Category
+
+
+ +
+
+
Type
+
@recipe.RecipeType
+
+
+ +
+
+
Yield
+
@FormatYield(recipe)
+
+
+
+ +
+ + +

+ Ingredients +

+ + @if (recipe.RecipeIngredients.Count == 0) + { +

No ingredients added.

+ } + else + { +
    + @foreach (var ing in recipe.RecipeIngredients.OrderBy(i => i.SortOrder)) + { +
  • + @FormatQuantity(ing.Quantity) + @(" " + ing.Unit?.Name) + @(" β€” ") + @ing.Ingredient?.Name + + @if (!string.IsNullOrWhiteSpace(ing.PrepNote)) + { +
    @ing.PrepNote
    + } +
    • + } +
+ } + + +

+ Steps +

+ + @if (recipe.Steps.Count == 0) + { +

No steps added.

+ } + else + { +
    + @foreach (var step in recipe.Steps.OrderBy(s => s.StepNumber)) + { +
  1. +
    @step.Instructions
    +
    2. + } +
+ } + +
+
+ } +
+ +@code { + [Parameter] public int id { get; set; } + private Recipe? recipe; + + protected override async Task OnInitializedAsync() + { + recipe = await Recipes.GetByIdAsync(id); + } + + void GoBack() => Nav.NavigateTo("/recipes"); + + string FormatQuantity(decimal qty) + { + // remove trailing zeros + return qty.ToString("0.##"); + } + + string FormatYield(Recipe r) + { + if (!r.YieldAmount.HasValue) + return r.YieldUnit ?? ""; + + string amt = r.YieldAmount.Value.ToString("0.##"); + + return string.IsNullOrWhiteSpace(r.YieldUnit) + ? amt + : $"{amt} {r.YieldUnit}"; + } +} diff --git a/CulinaryCommandApp/Components/Pages/Recipes/RecipeView.razor.css b/CulinaryCommandApp/Components/Pages/Recipes/RecipeView.razor.css new file mode 100644 index 0000000..4669abd --- /dev/null +++ b/CulinaryCommandApp/Components/Pages/Recipes/RecipeView.razor.css @@ -0,0 +1,10 @@ +.detail-box { + background: #f8f9fa; + border: 1px solid #e3e3e3; +} + +.list-group-numbered > .list-group-item { + padding: 1rem; + border-radius: 6px; + margin-bottom: 6px; +} diff --git a/CulinaryCommandApp/Components/Pages/UserSettings/LocationSettings/ConfigureLocation.razor b/CulinaryCommandApp/Components/Pages/UserSettings/LocationSettings/ConfigureLocation.razor index 7cea837..dd09708 100644 --- a/CulinaryCommandApp/Components/Pages/UserSettings/LocationSettings/ConfigureLocation.razor +++ b/CulinaryCommandApp/Components/Pages/UserSettings/LocationSettings/ConfigureLocation.razor @@ -5,9 +5,6 @@ @using CulinaryCommand.Vendor.Services @using CulinaryCommand.Services @using CulinaryCommand.Services.UserContextSpace -@using CulinaryCommandApp.Inventory.Entities -@using CulinaryCommandApp.Inventory.Services -@using CulinaryCommandApp.Inventory.Services.Interfaces @using Microsoft.AspNetCore.Authorization @using System.Net.Http.Json @using System.Text.Json @@ -15,7 +12,6 @@ @inject IVendorService VendorService @inject ILocationService LocationService -@inject IUnitService UnitService @inject IUserContextService UserCtx @inject NavigationManager Nav @inject IConfiguration Config @@ -136,61 +132,6 @@ } - - -
-
-
Measurement Units
- -
- -
- @if (!_locationUnits.Any()) - { -
- - No units assigned to this location yet. Add one to get started. -
- } - else - { - - - - - - - - - - @foreach (var unit in _locationUnits) - { - - - - - - } - -
NameAbbreviation
@unit.Name@unit.Abbreviation - -
- } -
- - @if (_locationUnits.Any()) - { -
- @_locationUnits.Count unit(s) at this location -
- } -
} @@ -320,66 +261,15 @@ } - -@if (_showAddUnitModal) -{ -
-
-
-
-
Add Unit to Location
- -
-
- @if (!_availableUnitsToAdd.Any()) - { -

All available units are already assigned to this location.

- } - else - { -
- - -
- } -
- - -
-
-
-
-
-} - @code { [Parameter] public int LocationId { get; set; } private Location? _location; private List _locationVendors = new(); - private List _locationUnits = new(); - private List _availableUnitsToAdd = new(); private bool _hydrated; private bool _showAddVendorModal; private bool _creatingVendor; - private bool _showAddUnitModal; - private bool _addingUnit; - private int _selectedUnitId; private Vendor _newVendor = new(); private int? _companyId; @@ -423,7 +313,6 @@ if (_location is not null && _companyId.HasValue) { _locationVendors = await VendorService.GetVendorsByLocationAsync(LocationId); - _locationUnits = await UnitService.GetByLocationAsync(LocationId); } _hydrated = true; @@ -556,45 +445,4 @@ _showAddVendorModal = false; StateHasChanged(); } - - // ── Units ───────────────────────────────────────────────────────────────── - - private async Task OpenAddUnitModal() - { - var all = await UnitService.GetAllAsync(); - var assignedIds = _locationUnits.Select(u => u.Id).ToHashSet(); - _availableUnitsToAdd = all.Where(u => !assignedIds.Contains(u.Id)).ToList(); - _selectedUnitId = 0; - _showAddUnitModal = true; - } - - private void CloseAddUnitModal() - { - _showAddUnitModal = false; - _selectedUnitId = 0; - } - - private async Task AddUnit() - { - if (_selectedUnitId == 0) return; - - _addingUnit = true; - - var currentIds = _locationUnits.Select(u => u.Id).ToList(); - currentIds.Add(_selectedUnitId); - await UnitService.SetLocationUnitsAsync(LocationId, currentIds); - _locationUnits = await UnitService.GetByLocationAsync(LocationId); - - _addingUnit = false; - _showAddUnitModal = false; - StateHasChanged(); - } - - private async Task RemoveUnit(int unitId) - { - var remaining = _locationUnits.Select(u => u.Id).Where(id => id != unitId); - await UnitService.SetLocationUnitsAsync(LocationId, remaining); - _locationUnits = await UnitService.GetByLocationAsync(LocationId); - StateHasChanged(); - } } diff --git a/CulinaryCommandApp/Data/AppDbContext.cs b/CulinaryCommandApp/Data/AppDbContext.cs index 3ddb33e..c37eb03 100644 --- a/CulinaryCommandApp/Data/AppDbContext.cs +++ b/CulinaryCommandApp/Data/AppDbContext.cs @@ -1,11 +1,9 @@ using Microsoft.EntityFrameworkCore; using CulinaryCommand.Data.Entities; -using CulinaryCommandApp.Inventory.Entities; -using CulinaryCommandApp.Recipe.Entities; +using CulinaryCommand.Inventory.Entities; using PO = CulinaryCommand.PurchaseOrder.Entities; using V = CulinaryCommand.Vendor.Entities; - namespace CulinaryCommand.Data { public class AppDbContext : DbContext @@ -19,20 +17,20 @@ public AppDbContext(DbContextOptions options) public DbSet Users => Set(); public DbSet Tasks => Set(); public DbSet Companies => Set(); - public DbSet Ingredients => Set(); - public DbSet Recipes => Set(); - public DbSet RecipeIngredients => Set(); - public DbSet RecipeSteps => Set(); - public DbSet RecipeSubRecipes => Set(); + public DbSet Ingredients => Set(); + public DbSet MeasurementUnits => Set(); + public DbSet Recipes => Set(); + public DbSet RecipeIngredients => Set(); + public DbSet RecipeSteps => Set(); public DbSet UserLocations => Set(); public DbSet ManagerLocations => Set(); public DbSet InventoryTransactions => Set(); - public DbSet Units => Set(); + public DbSet Units => Set(); public DbSet PurchaseOrders => Set(); public DbSet PurchaseOrderLines => Set(); public DbSet Vendors => Set(); public DbSet LocationVendors => Set(); - public DbSet LocationUnits => Set(); + protected override void OnModelCreating(ModelBuilder modelBuilder) { @@ -82,14 +80,14 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasForeignKey(ml => ml.LocationId); // Ingredient belongs to a Location - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(i => i.Location) .WithMany() .HasForeignKey(i => i.LocationId) .OnDelete(DeleteBehavior.Cascade); // Ingredient optionally belongs to a Vendor - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(i => i.Vendor) .WithMany() .HasForeignKey(i => i.VendorId) @@ -116,101 +114,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasOne(lv => lv.Vendor) .WithMany(v => v.LocationVendors) .HasForeignKey(lv => lv.VendorId); - - // Recipe belongs to a Location - modelBuilder.Entity() - .HasOne(r => r.Location) - .WithMany(l => l.Recipes) - .HasForeignKey(r => r.LocationId) - .OnDelete(DeleteBehavior.Cascade); - - // RowVersion is a MySQL timestamp(6) with DEFAULT/ON UPDATE CURRENT_TIMESTAMP(6). - // Mark it as database-generated so EF never sends DateTime.MinValue on INSERT/UPDATE. - modelBuilder.Entity() - .Property(r => r.RowVersion) - .ValueGeneratedOnAddOrUpdate() - .IsConcurrencyToken(); - - // Tasks optionally references a Recipe (prep task) - modelBuilder.Entity() - .HasOne(t => t.Recipe) - .WithMany() - .HasForeignKey(t => t.RecipeId) - .OnDelete(DeleteBehavior.SetNull) - .IsRequired(false); - - // RecipeIngredient to parent Recipe - modelBuilder.Entity() - .HasOne(ri => ri.Recipe) - .WithMany(r => r.RecipeIngredients) - .HasForeignKey(ri => ri.RecipeId) - .OnDelete(DeleteBehavior.Cascade); - - // RecipeIngredient - optional Ingredient (raw ingredient line) - modelBuilder.Entity() - .HasOne(ri => ri.Ingredient) - .WithMany() - .HasForeignKey(ri => ri.IngredientId) - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(false); - - // RecipeIngredient - optional sub-Recipe - modelBuilder.Entity() - .HasOne(ri => ri.SubRecipe) - .WithMany() - .HasForeignKey(ri => ri.SubRecipeId) - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(false); - - // RecipeIngredient - Unit - modelBuilder.Entity() - .HasOne(ri => ri.Unit) - .WithMany() - .HasForeignKey(ri => ri.UnitId) - .OnDelete(DeleteBehavior.Restrict); - - // RecipeStep - Recipe - modelBuilder.Entity() - .HasOne(rs => rs.Recipe) - .WithMany(r => r.Steps) - .HasForeignKey(rs => rs.RecipeId) - .OnDelete(DeleteBehavior.Cascade); - - // RecipeSubRecipe: composite PK - modelBuilder.Entity() - .HasKey(rs => new { rs.ParentRecipeId, rs.ChildRecipeId }); - - // RecipeSubRecipe - parent Recipe (cascade: deleting a parent removes its sub-recipe links) - modelBuilder.Entity() - .HasOne(rs => rs.ParentRecipe) - .WithMany(r => r.SubRecipeUsages) - .HasForeignKey(rs => rs.ParentRecipeId) - .OnDelete(DeleteBehavior.Cascade); - - // RecipeSubRecipe - child Recipe (restrict: cannot delete a sub-recipe still in use) - modelBuilder.Entity() - .HasOne(rs => rs.ChildRecipe) - .WithMany(r => r.UsedInRecipes) - .HasForeignKey(rs => rs.ChildRecipeId) - .OnDelete(DeleteBehavior.Restrict); - - ConfigureLocationUnit(modelBuilder); - } - - private void ConfigureLocationUnit(ModelBuilder modelBuilder) - { - modelBuilder.Entity() - .HasKey(lu => new { lu.LocationId, lu.UnitId }); - - modelBuilder.Entity() - .HasOne(lu => lu.Location) - .WithMany(l => l.LocationUnits) - .HasForeignKey(lu => lu.LocationId); - - modelBuilder.Entity() - .HasOne(lu => lu.Unit) - .WithMany(u => u.LocationUnits) - .HasForeignKey(lu => lu.UnitId); + } } } \ No newline at end of file diff --git a/CulinaryCommandApp/Data/Entities/Ingredient.cs b/CulinaryCommandApp/Data/Entities/Ingredient.cs new file mode 100644 index 0000000..944da5b --- /dev/null +++ b/CulinaryCommandApp/Data/Entities/Ingredient.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace CulinaryCommand.Data.Entities +{ + public class Ingredient + { + [Key] + public int IngredientId { get; set; } + + [Required, MaxLength(128)] + public string Name { get; set; } + + [Required, MaxLength(128)] + public string Category { get; set; } + + [Required, MaxLength(128)] + public string DefaultUnit { get; set; } + + // Navigation + public ICollection RecipeIngredients { get; set; } = new List(); + } +} \ No newline at end of file diff --git a/CulinaryCommandApp/Data/Entities/Location.cs b/CulinaryCommandApp/Data/Entities/Location.cs index 2025d93..8d84094 100644 --- a/CulinaryCommandApp/Data/Entities/Location.cs +++ b/CulinaryCommandApp/Data/Entities/Location.cs @@ -1,8 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; -using CulinaryCommandApp.Inventory.Entities; -using Rec = CulinaryCommandApp.Recipe.Entities; namespace CulinaryCommand.Data.Entities { @@ -33,7 +31,7 @@ public class Location public int CompanyId { get; set; } public Company Company { get; set; } - public ICollection Recipes { get; set; } = new List(); + public ICollection Recipes { get; set; } = new List(); // join table combining employees and locations [JsonIgnore] @@ -55,8 +53,6 @@ public class Location [JsonIgnore] public ICollection LocationVendors { get; set; } = new List(); - [JsonIgnore] - public ICollection LocationUnits { get; set; } = new List(); - } + } diff --git a/CulinaryCommandApp/Data/Entities/MeasurementUnit.cs b/CulinaryCommandApp/Data/Entities/MeasurementUnit.cs new file mode 100644 index 0000000..5413550 --- /dev/null +++ b/CulinaryCommandApp/Data/Entities/MeasurementUnit.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace CulinaryCommand.Data.Entities +{ + public class MeasurementUnit + { + [Key] + public int UnitId { get; set; } + + [Required, MaxLength(128)] + public string Name { get; set; } // "Cup" + + [Required, MaxLength(32)] + public string Abbreviation { get; set; } // "c" + + // Navigation + public ICollection RecipeIngredients { get; set; } = new List(); + } + +} \ No newline at end of file diff --git a/CulinaryCommandApp/Data/Entities/Recipe.cs b/CulinaryCommandApp/Data/Entities/Recipe.cs new file mode 100644 index 0000000..60b15a8 --- /dev/null +++ b/CulinaryCommandApp/Data/Entities/Recipe.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace CulinaryCommand.Data.Entities +{ + public class Recipe + { + [Key] + public int RecipeId { get; set; } + public int LocationId { get; set; } + + [Required, MaxLength(128)] + public string? Title { get; set; } + + [Required, MaxLength(128)] + public string Category { get; set; } + + [Required, MaxLength(128)] + public string RecipeType { get; set; } + + public decimal? YieldAmount { get; set; } + + [MaxLength(128)] + public string YieldUnit { get; set; } + + public DateTime CreatedAt { get; set; } = DateTime.UtcNow; + + // Navigation + public Location? Location { get; set; } + public ICollection RecipeIngredients { get; set; } = new List(); + public ICollection Steps { get; set; } = new List(); + } + +} \ No newline at end of file diff --git a/CulinaryCommandApp/Data/Entities/RecipeIngredient.cs b/CulinaryCommandApp/Data/Entities/RecipeIngredient.cs new file mode 100644 index 0000000..d166a1b --- /dev/null +++ b/CulinaryCommandApp/Data/Entities/RecipeIngredient.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Threading.Tasks; +using CulinaryCommand.Inventory.Entities; + +namespace CulinaryCommand.Data.Entities +{ + public class RecipeIngredient + { + [Key] + public int RecipeIngredientId { get; set; } + public int RecipeId { get; set; } + public int IngredientId { get; set; } + public int UnitId { get; set; } + + public decimal Quantity { get; set; } + + [MaxLength(256)] + public string? PrepNote { get; set; } + public int SortOrder { get; set; } + + // Navigation + public Recipe? Recipe { get; set; } + public CulinaryCommand.Inventory.Entities.Ingredient? Ingredient { get; set; } + public Unit? Unit { get; set; } + + [NotMapped] + public List AvailableIngredients { get; set; } = new(); + + [NotMapped] + public List AvailableUnits { get; set; } = new(); + } + +} \ No newline at end of file diff --git a/CulinaryCommandApp/Data/Entities/RecipeStep.cs b/CulinaryCommandApp/Data/Entities/RecipeStep.cs new file mode 100644 index 0000000..8a25b2e --- /dev/null +++ b/CulinaryCommandApp/Data/Entities/RecipeStep.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace CulinaryCommand.Data.Entities +{ + public class RecipeStep + { + [Key] + public int StepId { get; set; } + public int RecipeId { get; set; } + + public int StepNumber { get; set; } // 1, 2, 3... + + [MaxLength(256)] + public string? Instructions { get; set; } + + // Navigation + public Recipe? Recipe { get; set; } + } + +} \ No newline at end of file diff --git a/CulinaryCommandApp/Data/Entities/Tasks.cs b/CulinaryCommandApp/Data/Entities/Tasks.cs index af8586d..4e5d78a 100644 --- a/CulinaryCommandApp/Data/Entities/Tasks.cs +++ b/CulinaryCommandApp/Data/Entities/Tasks.cs @@ -1,8 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using CulinaryCommand.Data.Enums; -using Rec = CulinaryCommandApp.Recipe.Entities; -using InvIngredient = CulinaryCommandApp.Inventory.Entities.Ingredient; +using InvIngredient = CulinaryCommand.Inventory.Entities.Ingredient; namespace CulinaryCommand.Data.Entities { @@ -53,7 +52,7 @@ public class Tasks // Link to recipe if this is a prep task public int? RecipeId { get; set; } - public Rec.Recipe? Recipe { get; set; } + public Recipe? Recipe { get; set; } // Link to ingredient (Inventory.Entities.Ingredient) public int? IngredientId { get; set; } diff --git a/CulinaryCommandApp/Data/Models/MeasurementUnitViewModel.cs b/CulinaryCommandApp/Data/Models/MeasurementUnitViewModel.cs new file mode 100644 index 0000000..d311c2f --- /dev/null +++ b/CulinaryCommandApp/Data/Models/MeasurementUnitViewModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CulinaryCommand.Models +{ + public class MeasurementUnitViewModel + { + public int UnitId { get; set; } + public string UnitName { get; set; } = ""; + public string Abbreviation { get; set; } = ""; + } + +} \ No newline at end of file diff --git a/CulinaryCommandApp/Inventory/DTOs/CreateIngredientDTO.cs b/CulinaryCommandApp/Inventory/DTOs/CreateIngredientDTO.cs index 4443575..84abe90 100644 --- a/CulinaryCommandApp/Inventory/DTOs/CreateIngredientDTO.cs +++ b/CulinaryCommandApp/Inventory/DTOs/CreateIngredientDTO.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace CulinaryCommandApp.Inventory.DTOs +namespace CulinaryCommand.Inventory.DTOs { public class CreateIngredientDTO { diff --git a/CulinaryCommandApp/Inventory/DTOs/InventoryCatalogDTO.cs b/CulinaryCommandApp/Inventory/DTOs/InventoryCatalogDTO.cs index ac8398f..0aaf14d 100644 --- a/CulinaryCommandApp/Inventory/DTOs/InventoryCatalogDTO.cs +++ b/CulinaryCommandApp/Inventory/DTOs/InventoryCatalogDTO.cs @@ -1,6 +1,6 @@ using System; -namespace CulinaryCommandApp.Inventory.DTOs +namespace CulinaryCommand.Inventory.DTOs { public class InventoryCatalogDTO { diff --git a/CulinaryCommandApp/Inventory/DTOs/InventoryItemDTO.cs b/CulinaryCommandApp/Inventory/DTOs/InventoryItemDTO.cs index a15276f..0304346 100644 --- a/CulinaryCommandApp/Inventory/DTOs/InventoryItemDTO.cs +++ b/CulinaryCommandApp/Inventory/DTOs/InventoryItemDTO.cs @@ -1,6 +1,6 @@ using System; -namespace CulinaryCommandApp.Inventory.DTOs +namespace CulinaryCommand.Inventory.DTOs { public class InventoryItemDTO { @@ -10,7 +10,6 @@ public class InventoryItemDTO public string Category { get; set; } = string.Empty; public decimal CurrentQuantity { get; set; } public string Unit { get; set; } = "count"; - public int UnitId { get; set; } public decimal Price { get; set; } public decimal ReorderLevel { get; set; } public bool IsLowStock { get; set; } diff --git a/CulinaryCommandApp/Inventory/Data/Configurations/IngredientConfiguration.cs b/CulinaryCommandApp/Inventory/Data/Configurations/IngredientConfiguration.cs index d4cb11a..c4f06b7 100644 --- a/CulinaryCommandApp/Inventory/Data/Configurations/IngredientConfiguration.cs +++ b/CulinaryCommandApp/Inventory/Data/Configurations/IngredientConfiguration.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using CulinaryCommandApp.Inventory.Entities; +using CulinaryCommand.Inventory.Entities; namespace CulinaryCommand.Inventory.Data.Configurations { diff --git a/CulinaryCommandApp/Inventory/Entities/Ingredient.cs b/CulinaryCommandApp/Inventory/Entities/Ingredient.cs index a58d097..11df568 100644 --- a/CulinaryCommandApp/Inventory/Entities/Ingredient.cs +++ b/CulinaryCommandApp/Inventory/Entities/Ingredient.cs @@ -1,7 +1,7 @@ using System; using CulinaryCommand.Data.Entities; -namespace CulinaryCommandApp.Inventory.Entities +namespace CulinaryCommand.Inventory.Entities { public class Ingredient { diff --git a/CulinaryCommandApp/Inventory/Entities/InventoryBatch.cs b/CulinaryCommandApp/Inventory/Entities/InventoryBatch.cs index ff34b02..57c3a09 100644 --- a/CulinaryCommandApp/Inventory/Entities/InventoryBatch.cs +++ b/CulinaryCommandApp/Inventory/Entities/InventoryBatch.cs @@ -2,7 +2,7 @@ using CulinaryCommand.Data.Entities; -namespace CulinaryCommandApp.Inventory.Entities +namespace CulinaryCommand.Inventory.Entities { public class InventoryBatch { diff --git a/CulinaryCommandApp/Inventory/Entities/InventoryTransaction.cs b/CulinaryCommandApp/Inventory/Entities/InventoryTransaction.cs index 4ed294d..3f327d3 100644 --- a/CulinaryCommandApp/Inventory/Entities/InventoryTransaction.cs +++ b/CulinaryCommandApp/Inventory/Entities/InventoryTransaction.cs @@ -1,6 +1,6 @@ using System; -namespace CulinaryCommandApp.Inventory.Entities +namespace CulinaryCommand.Inventory.Entities { public class InventoryTransaction diff --git a/CulinaryCommandApp/Inventory/Entities/LocationUnit.cs b/CulinaryCommandApp/Inventory/Entities/LocationUnit.cs deleted file mode 100644 index 7fe3928..0000000 --- a/CulinaryCommandApp/Inventory/Entities/LocationUnit.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Text.Json.Serialization; -using CulinaryCommand.Data.Entities; -using CulinaryCommandApp.Inventory.Entities; - -namespace CulinaryCommandApp.Inventory.Entities -{ - public class LocationUnit - { - [JsonIgnore] - public Location Location { get; set; } = default!; - public int LocationId { get; set; } - - [JsonIgnore] - public Unit Unit { get; set; } = default!; - public int UnitId { get; set; } - - public DateTime AssignedAt { get; set; } = DateTime.UtcNow; - } -} \ No newline at end of file diff --git a/CulinaryCommandApp/Inventory/Entities/Unit.cs b/CulinaryCommandApp/Inventory/Entities/Unit.cs index 676f666..171f42a 100644 --- a/CulinaryCommandApp/Inventory/Entities/Unit.cs +++ b/CulinaryCommandApp/Inventory/Entities/Unit.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; -using System.Text.Json.Serialization; -namespace CulinaryCommandApp.Inventory.Entities +namespace CulinaryCommand.Inventory.Entities { public class Unit { @@ -23,8 +22,5 @@ public class Unit // list of inventory transactions that use this unit public ICollection InventoryTransaction { get; set; } = new List(); - [JsonIgnore] - public ICollection LocationUnits { get; set; } = new List(); - } } \ No newline at end of file diff --git a/CulinaryCommandApp/Inventory/Pages/Inventory/InventoryCatalog.razor b/CulinaryCommandApp/Inventory/Pages/Inventory/InventoryCatalog.razor index 6e02cab..c8efc8b 100644 --- a/CulinaryCommandApp/Inventory/Pages/Inventory/InventoryCatalog.razor +++ b/CulinaryCommandApp/Inventory/Pages/Inventory/InventoryCatalog.razor @@ -1,51 +1,16 @@ @page "/inventory-catalog" @rendermode InteractiveServer -@implements IDisposable - -@using CulinaryCommandApp.Inventory.DTOs -@using CulinaryCommandApp.Inventory.Entities -@using CulinaryCommandApp.Inventory.Services -@using CulinaryCommandApp.Inventory.Services.Interfaces -@using CulinaryCommand.Services -@using CulinaryCommand.Services.UserContextSpace - -@inject IInventoryManagementService InventoryService -@inject IUnitService UnitService -@inject LocationState LocationState -@inject EnumService EnumService -@inject IUserContextService UserCtx -@inject NavigationManager Nav + +@using CulinaryCommand.Inventory.DTOs
- @if (!_ready) - { -
Loading...
- } - else if (!_allowed) - { -
- You need Admin or Manager permissions to access the inventory catalog. -
- } - else - {
-

Inventory Catalog

-

@(LocationState.CurrentLocation is not null ? $"{LocationState.CurrentLocation.Name} β€” ingredient catalog" : "Manage your ingredient catalog")

+

Inventory Catalog - testing deployment change

+

Manage your ingredient catalog

- @if (LocationState.CurrentLocation is null) - { - - } - else - { -
@@ -121,7 +86,7 @@
-
@item.Name
+
@item.ItemName
SKU: @item.SKU
@@ -129,8 +94,8 @@ @item.Category @item.Unit - $@item.Price.ToString("F2") - @(item.VendorName ?? "β€”") + $@item.PricePerUnit.ToString("F2") + @item.Supplier @(string.IsNullOrWhiteSpace(item.Notes) ? "-" : item.Notes)
@@ -170,11 +135,6 @@
- - } @* end @if (LocationState.CurrentLocation is not null) *@ - - } @* end else (_allowed) *@ -
@@ -192,7 +152,7 @@
- +
@@ -212,29 +172,32 @@
- + + + + + + + +
- +
- - + +
- - + +
@@ -248,10 +211,9 @@ } @code { - private List itemCatalog = new(); - private List filteredItems = new(); - private List pagedItems = new(); - private List _units = new(); + private List itemCatalog = new(); + private List filteredItems = new(); + private List pagedItems = new(); private bool isLoading = true; private string searchTerm = ""; private string selectedCategory = ""; @@ -262,95 +224,34 @@ private int totalPages = 1; private List pageButtons = new(); private HashSet selectedIds = new(); - private List categories = new(); + + private List categories = new() { "Vegetables", "Dairy", "Meat & Poultry", "Grains & Pasta", "Oils & Sauces" }; private bool showModal = false; - private bool _saving = false; - private bool _ready = false; - private bool _allowed = false; - private CreateIngredientDTO modalItem = new(); - private InventoryItemDTO? editingItem = null; + private InventoryCatalogDTO modalItem = new(); + private InventoryCatalogDTO? editingItem = null; protected override async Task OnInitializedAsync() { - var ctx = await UserCtx.GetAsync(); - - if (!ctx.IsAuthenticated) - { - Nav.NavigateTo("/login", true); - return; - } - - if (ctx.User is null) - { - Nav.NavigateTo("/no-access", true); - return; - } - - _allowed = - string.Equals(ctx.User.Role, "Admin", StringComparison.OrdinalIgnoreCase) || - string.Equals(ctx.User.Role, "Manager", StringComparison.OrdinalIgnoreCase); - - _ready = true; - - if (!_allowed) - return; - - LocationState.OnChange += OnLocationChanged; await LoadCatalogData(); } - private void OnLocationChanged() - { - _ = InvokeAsync(async () => { - try { - await LoadCatalogData(); - StateHasChanged(); - } - catch (Exception){ - // add some logging later - } - }); - } - - public void Dispose() - { - if (_allowed) - LocationState.OnChange -= OnLocationChanged; - } - private async Task LoadCatalogData() { isLoading = true; - StateHasChanged(); - var locId = LocationState.CurrentLocation?.Id; - if (locId is null) + itemCatalog = new List { - itemCatalog = new(); - categories = EnumService.GetCategories(); - _units = await UnitService.GetAllAsync(); - FilterItems(); - isLoading = false; - return; - } - - itemCatalog = await InventoryService.GetItemsByLocationAsync(locId.Value); - - // Always start from the preset list so the modal always has options. - // Merge in any DB-side categories not in the preset (e.g. legacy or custom data). - var dbCategories = await InventoryService.GetCategoriesByLocationAsync(locId.Value); - categories = EnumService.GetCategories() - .Union(dbCategories, StringComparer.OrdinalIgnoreCase) - .OrderBy(c => c) - .ToList(); - - _units = await UnitService.GetByLocationAsync(locId.Value); - if (!_units.Any()) - _units = await UnitService.GetAllAsync(); + new InventoryCatalogDTO { Id = 1, ItemName = "Pasta", SKU = "123", Category = "Grains & Pasta", Unit = "lbs", PricePerUnit = 5.00m, Supplier = 1, Notes = "Dry pasta" }, + new InventoryCatalogDTO { Id = 2, ItemName = "Milk", SKU = "321", Category = "Dairy", Unit = "mL", PricePerUnit = 8.00m, Supplier = 2, Notes = "" }, + new InventoryCatalogDTO { Id = 3, ItemName = "Heavy Cream", SKU = "456", Category = "Dairy", Unit = "L", PricePerUnit = 10.00m, Supplier = 2, Notes = "" }, + new InventoryCatalogDTO { Id = 4, ItemName = "Olive Oil", SKU = "654", Category = "Oils & Sauces", Unit = "L", PricePerUnit = 8.00m, Supplier = 3, Notes = "Extra virgin" }, + new InventoryCatalogDTO { Id = 5, ItemName = "Potatoes", SKU = "789", Category = "Vegetables", Unit = "lbs", PricePerUnit = 9.00m, Supplier = 4, Notes = "" }, + }; FilterItems(); isLoading = false; + await Task.CompletedTask; } private void FilterItems() @@ -359,9 +260,9 @@ filteredItems = itemCatalog.Where(item => { bool searchMatch = string.IsNullOrWhiteSpace(searchTerm) || - item.Name.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) || - (item.SKU ?? "").Contains(searchTerm, StringComparison.OrdinalIgnoreCase) || - (item.Category ?? "").Contains(searchTerm, StringComparison.OrdinalIgnoreCase); + item.ItemName.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) || + item.SKU.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) || + item.Category.Contains(searchTerm, StringComparison.OrdinalIgnoreCase); bool categoryMatch = string.IsNullOrWhiteSpace(selectedCategory) || item.Category == selectedCategory; @@ -390,14 +291,14 @@ { filteredItems = sortColumn switch { - "name" => sortAscending ? filteredItems.OrderBy(i => i.Name).ToList() : filteredItems.OrderByDescending(i => i.Name).ToList(), - "price" => sortAscending ? filteredItems.OrderBy(i => i.Price).ToList() : filteredItems.OrderByDescending(i => i.Price).ToList(), - "supplier" => sortAscending ? filteredItems.OrderBy(i => i.VendorName).ToList() : filteredItems.OrderByDescending(i => i.VendorName).ToList(), + "name" => sortAscending ? filteredItems.OrderBy(i => i.ItemName).ToList() : filteredItems.OrderByDescending(i => i.ItemName).ToList(), + "price" => sortAscending ? filteredItems.OrderBy(i => i.PricePerUnit).ToList() : filteredItems.OrderByDescending(i => i.PricePerUnit).ToList(), + "supplier" => sortAscending ? filteredItems.OrderBy(i => i.Supplier).ToList() : filteredItems.OrderByDescending(i => i.Supplier).ToList(), _ => filteredItems }; } - private string GetCategoryClass(string? category) => category switch + private string GetCategoryClass(string category) => category switch { "Grains & Pasta" => "category-grains", "Dairy" => "category-dairy", @@ -463,73 +364,49 @@ private void ShowAddItemModal() { editingItem = null; - modalItem = new CreateIngredientDTO - { - LocationId = LocationState.CurrentLocation?.Id ?? 0 - }; + modalItem = new InventoryCatalogDTO(); showModal = true; } - private void EditItem(InventoryItemDTO item) + private void EditItem(InventoryCatalogDTO item) { editingItem = item; - modalItem = new CreateIngredientDTO + modalItem = new InventoryCatalogDTO { - Name = item.Name, + Id = item.Id, + ItemName = item.ItemName, SKU = item.SKU, Category = item.Category, - Price = item.Price, - CurrentQuantity = item.CurrentQuantity, - ReorderLevel = item.ReorderLevel, - LocationId = LocationState.CurrentLocation?.Id ?? 0, - UnitId = item.UnitId, - VendorId = item.VendorId + Unit = item.Unit, + PricePerUnit = item.PricePerUnit, + Supplier = item.Supplier, + Notes = item.Notes }; showModal = true; } - private async Task SaveItem() + private void SaveItem() { - _saving = true; try { - if (editingItem is null) + if (editingItem != null) { - await InventoryService.AddItemAsync(modalItem); + var idx = itemCatalog.FindIndex(i => i.Id == modalItem.Id); + if (idx >= 0) itemCatalog[idx] = modalItem; + else itemCatalog.Add(modalItem); } else { - var dto = new InventoryItemDTO - { - Id = editingItem.Id, - Name = modalItem.Name, - SKU = modalItem.SKU ?? "", - Category = modalItem.Category ?? "", - Price = modalItem.Price, - CurrentQuantity = modalItem.CurrentQuantity, - ReorderLevel = modalItem.ReorderLevel, - UnitId = modalItem.UnitId, - VendorId = modalItem.VendorId, - }; - await InventoryService.UpdateItemAsync(dto); + modalItem.Id = itemCatalog.Any() ? itemCatalog.Max(i => i.Id) + 1 : 1; + itemCatalog.Add(modalItem); } CloseModal(); - await LoadCatalogData(); + FilterItems(); } catch (Exception ex) { Console.Error.WriteLine($"Failed to save item: {ex}"); } - finally - { - _saving = false; - } - } - - private async Task DeleteItem(InventoryItemDTO item) - { - await InventoryService.DeleteItemAsync(item.Id); - await LoadCatalogData(); } private void CloseModal() @@ -539,6 +416,12 @@ editingItem = null; } + private void DeleteItem(InventoryCatalogDTO item) + { + itemCatalog.Remove(item); + FilterItems(); + } + private async Task RefreshCatalog() { await LoadCatalogData(); diff --git a/CulinaryCommandApp/Inventory/Pages/Inventory/InventoryManagement.razor b/CulinaryCommandApp/Inventory/Pages/Inventory/InventoryManagement.razor index eae930e..e24b7c3 100644 --- a/CulinaryCommandApp/Inventory/Pages/Inventory/InventoryManagement.razor +++ b/CulinaryCommandApp/Inventory/Pages/Inventory/InventoryManagement.razor @@ -2,10 +2,10 @@ @rendermode InteractiveServer @implements IDisposable -@using CulinaryCommandApp.Inventory.DTOs -@using CulinaryCommandApp.Inventory.Entities -@using CulinaryCommandApp.Inventory.Services -@using CulinaryCommandApp.Inventory.Services.Interfaces +@using CulinaryCommand.Inventory.DTOs +@using CulinaryCommand.Inventory.Entities +@using CulinaryCommand.Inventory.Services +@using CulinaryCommand.Inventory.Services.Interfaces @using Microsoft.JSInterop @using Microsoft.AspNetCore.Components.Forms diff --git a/CulinaryCommandApp/Inventory/Services/IngredientService.cs b/CulinaryCommandApp/Inventory/Services/IngredientService.cs index 49e20c5..c784eda 100644 --- a/CulinaryCommandApp/Inventory/Services/IngredientService.cs +++ b/CulinaryCommandApp/Inventory/Services/IngredientService.cs @@ -2,11 +2,11 @@ using System.Threading; using System.Threading.Tasks; using CulinaryCommand.Data; -using CulinaryCommandApp.Inventory.Entities; -using CulinaryCommandApp.Inventory.Services.Interfaces; +using CulinaryCommand.Inventory.Entities; +using CulinaryCommand.Inventory.Services.Interfaces; using Microsoft.EntityFrameworkCore; -namespace CulinaryCommandApp.Inventory.Services +namespace CulinaryCommand.Inventory.Services { public class IngredientService : IIngredientService { @@ -27,17 +27,6 @@ public async Task> GetCategoriesAsync(CancellationToken cancellatio .ToListAsync(cancellationToken); } - public async Task> GetIngredientsByLocationAsync(int locationId, CancellationToken cancellationToken = default) - { - return await _db.Ingredients - .AsNoTracking() - .Include(i => i.Unit) - .Where(i => i.LocationId == locationId) - .OrderBy(i => i.Category) - .ThenBy(i => i.Name) - .ToListAsync(cancellationToken); - } - public async Task> GetByCategoryAsync(string category, CancellationToken cancellationToken = default) { return await _db.Ingredients diff --git a/CulinaryCommandApp/Inventory/Services/Interfaces/IIngredientService.cs b/CulinaryCommandApp/Inventory/Services/Interfaces/IIngredientService.cs index d54747b..4f7bccf 100644 --- a/CulinaryCommandApp/Inventory/Services/Interfaces/IIngredientService.cs +++ b/CulinaryCommandApp/Inventory/Services/Interfaces/IIngredientService.cs @@ -1,18 +1,15 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using CulinaryCommandApp.Inventory.Entities; +using CulinaryCommand.Inventory.Entities; -namespace CulinaryCommandApp.Inventory.Services.Interfaces +namespace CulinaryCommand.Inventory.Services.Interfaces { public interface IIngredientService { // Retrieves all ingredient categories. Task> GetCategoriesAsync(CancellationToken cancellationToken = default); - // returns all ingredients belonging to a specific restaurant location. specifically references ingredients populated in /inventory-catalog - Task> GetIngredientsByLocationAsync(int locationId, CancellationToken cancellationToken = default); - // Retrieves ingredients that belong to the provided category. Task> GetByCategoryAsync(string category, CancellationToken cancellationToken = default); diff --git a/CulinaryCommandApp/Inventory/Services/Interfaces/IInventoryManagementService.cs b/CulinaryCommandApp/Inventory/Services/Interfaces/IInventoryManagementService.cs index 5cc7131..2f12c69 100644 --- a/CulinaryCommandApp/Inventory/Services/Interfaces/IInventoryManagementService.cs +++ b/CulinaryCommandApp/Inventory/Services/Interfaces/IInventoryManagementService.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Threading.Tasks; -using CulinaryCommandApp.Inventory.DTOs; +using CulinaryCommand.Inventory.DTOs; -namespace CulinaryCommandApp.Inventory.Services.Interfaces +namespace CulinaryCommand.Inventory.Services.Interfaces { public interface IInventoryManagementService { diff --git a/CulinaryCommandApp/Inventory/Services/Interfaces/IInventoryTransactionService.cs b/CulinaryCommandApp/Inventory/Services/Interfaces/IInventoryTransactionService.cs index 7fc0973..7f6e23e 100644 --- a/CulinaryCommandApp/Inventory/Services/Interfaces/IInventoryTransactionService.cs +++ b/CulinaryCommandApp/Inventory/Services/Interfaces/IInventoryTransactionService.cs @@ -1,22 +1,13 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using CulinaryCommandApp.Inventory.Entities; +using CulinaryCommand.Inventory.Entities; -namespace CulinaryCommandApp.Inventory.Services.Interfaces +namespace CulinaryCommand.Inventory.Services.Interfaces { public interface IInventoryTransactionService { Task RecordAsync(InventoryTransaction transaction, CancellationToken cancellationToken = default); - - /// - /// Deducts stock for every transaction in atomically. - /// All stock updates and audit rows are committed in a single database transaction; - /// if any deduction fails (e.g. insufficient stock) the entire batch is rolled back - /// and an is thrown. - /// - Task> RecordBatchAsync(IEnumerable transactions, CancellationToken cancellationToken = default); - Task> GetTransactionsAsync(int? ingredientId = null, CancellationToken cancellationToken = default); } } \ No newline at end of file diff --git a/CulinaryCommandApp/Inventory/Services/Interfaces/IUnitService.cs b/CulinaryCommandApp/Inventory/Services/Interfaces/IUnitService.cs index 4e54fbb..9bff6c2 100644 --- a/CulinaryCommandApp/Inventory/Services/Interfaces/IUnitService.cs +++ b/CulinaryCommandApp/Inventory/Services/Interfaces/IUnitService.cs @@ -1,20 +1,15 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using CulinaryCommandApp.Inventory.Entities; +using CulinaryCommand.Inventory.Entities; -namespace CulinaryCommandApp.Inventory.Services.Interfaces +namespace CulinaryCommand.Inventory.Services.Interfaces { public interface IUnitService { // Returns all units asynchronously as a list of Unit objects. Task> GetAllAsync(CancellationToken cancellationToken = default); - // returns only the units enabled for a specific location - Task> GetByLocationAsync(int locationId, CancellationToken cancellationToken = default); - - Task SetLocationUnitsAsync(int locationId, IEnumerable unitIds, CancellationToken cancellationToken = default); - // Retrieves a unit by its Id asynchronously; returns null if not found. Task GetByIdAsync(int id, CancellationToken cancellationToken = default); diff --git a/CulinaryCommandApp/Inventory/Services/InventoryManagementService.cs b/CulinaryCommandApp/Inventory/Services/InventoryManagementService.cs index d2a4826..8850e99 100644 --- a/CulinaryCommandApp/Inventory/Services/InventoryManagementService.cs +++ b/CulinaryCommandApp/Inventory/Services/InventoryManagementService.cs @@ -1,11 +1,11 @@ using System.Linq; -using CulinaryCommandApp.Inventory.Services.Interfaces; +using CulinaryCommand.Inventory.Services.Interfaces; using Microsoft.EntityFrameworkCore; -using CulinaryCommandApp.Inventory.DTOs; +using CulinaryCommand.Inventory.DTOs; using CulinaryCommand.Data; -using CulinaryCommandApp.Inventory.Entities; +using CulinaryCommand.Inventory.Entities; -namespace CulinaryCommandApp.Inventory.Services +namespace CulinaryCommand.Inventory.Services { public class InventoryManagementService : IInventoryManagementService { @@ -76,7 +76,7 @@ public async Task> GetCategoriesByLocationAsync(int locationId) } public async Task AddItemAsync(CreateIngredientDTO dto) { - var entity = new CulinaryCommandApp.Inventory.Entities.Ingredient { + var entity = new CulinaryCommand.Inventory.Entities.Ingredient { Name = dto.Name, Sku = dto.SKU, Price = dto.Price, @@ -129,9 +129,9 @@ public async Task DeleteItemAsync(int id) entity.StockQuantity = dto.CurrentQuantity; entity.Price = dto.Price; entity.ReorderLevel = dto.ReorderLevel; + // Category and Unit mapping: if you have Unit lookup by name to Id, handle here. + // For now assume Category stored on entity and UnitId unchanged. entity.Category = dto.Category; - entity.UnitId = dto.UnitId; - entity.VendorId = dto.VendorId; await _db.SaveChangesAsync(); @@ -143,14 +143,12 @@ public async Task DeleteItemAsync(int id) Category = entity.Category ?? string.Empty, CurrentQuantity = entity.StockQuantity, Unit = entity.Unit != null ? entity.Unit.Name : "count", - UnitId = entity.UnitId, Price = entity.Price ?? 0m, ReorderLevel = entity.ReorderLevel, IsLowStock = entity.StockQuantity <= entity.ReorderLevel, OutOfStockDate = null, LastOrderDate = null, - Notes = entity.Notes ?? string.Empty, - VendorId = entity.VendorId, + Notes = entity.Notes ?? string.Empty }; } } diff --git a/CulinaryCommandApp/Inventory/Services/InventoryTransactionService.cs b/CulinaryCommandApp/Inventory/Services/InventoryTransactionService.cs index 9722787..7b785e1 100644 --- a/CulinaryCommandApp/Inventory/Services/InventoryTransactionService.cs +++ b/CulinaryCommandApp/Inventory/Services/InventoryTransactionService.cs @@ -5,12 +5,12 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using CulinaryCommand.Data; -using CulinaryCommandApp.Inventory.Entities; -using CulinaryCommandApp.Inventory.Services.Interfaces; +using CulinaryCommand.Inventory.Entities; +using CulinaryCommand.Inventory.Services.Interfaces; -namespace CulinaryCommandApp.Inventory.Services +namespace CulinaryCommand.Inventory.Services { public class InventoryTransactionService : IInventoryTransactionService { @@ -42,7 +42,7 @@ public async Task RecordAsync(InventoryTransaction transac await using var dbTransaction = await _db.Database.BeginTransactionAsync(cancellationToken); var rows = await _db.Database.ExecuteSqlInterpolatedAsync( - $"UPDATE Ingredients SET StockQuantity = StockQuantity + {transactionAmount} WHERE IngredientId = {transaction.IngredientId} AND StockQuantity + {transactionAmount} >= 0", + $"UPDATE Ingredients SET StockQuantity = StockQuantity + {transactionAmount} WHERE Id = {transaction.IngredientId} AND StockQuantity + {transactionAmount} >= 0", cancellationToken); if (rows == 0) @@ -80,73 +80,6 @@ public async Task RecordAsync(InventoryTransaction transac return transaction; } - public async Task> RecordBatchAsync( - IEnumerable transactions, - CancellationToken cancellationToken = default) - { - if (transactions is null) - throw new ArgumentNullException(nameof(transactions)); - - var batch = transactions.ToList(); - if (batch.Count == 0) - return new List(); - - await using var dbTransaction = await _db.Database.BeginTransactionAsync(cancellationToken); - - try - { - foreach (var transaction in batch) - { - if (transaction.StockChange == 0) - throw new ArgumentException($"StockChange must be non-zero (IngredientId {transaction.IngredientId})."); - if (transaction.IngredientId <= 0) - throw new ArgumentException($"IngredientId must be a positive integer (value: {transaction.IngredientId})."); - - var delta = transaction.StockChange; - - _logger.LogDebug( - "Batch: recording transaction for ingredient {IngredientId} delta {Delta}", - transaction.IngredientId, delta); - - var rows = await _db.Database.ExecuteSqlInterpolatedAsync( - $"UPDATE Ingredients SET StockQuantity = StockQuantity + {delta} WHERE IngredientId = {transaction.IngredientId} AND StockQuantity + {delta} >= 0", - cancellationToken); - - if (rows == 0) - { - _logger.LogWarning( - "Batch stock update failed for ingredient {IngredientId} with delta {Delta} β€” rolling back entire batch", - transaction.IngredientId, delta); - throw new InvalidOperationException( - $"Insufficient stock or ingredient not found (IngredientId {transaction.IngredientId}). No inventory was changed."); - } - - transaction.CreatedAt = DateTimeOffset.UtcNow; - await _db.InventoryTransactions.AddAsync(transaction, cancellationToken); - } - - await _db.SaveChangesAsync(cancellationToken); - await dbTransaction.CommitAsync(cancellationToken); - - _logger.LogInformation("Committed batch of {Count} inventory transactions", batch.Count); - } - catch (Exception ex) - { - _logger.LogError(ex, "Batch transaction failed β€” rolling back"); - try - { - await dbTransaction.RollbackAsync(cancellationToken); - } - catch (Exception rbEx) - { - _logger.LogError(rbEx, "Rollback failed after batch error"); - } - - throw; - } - - return batch; - } public async Task> GetTransactionsAsync(int? ingredientId = null, CancellationToken cancellationToken = default) { diff --git a/CulinaryCommandApp/Inventory/Services/UnitService.cs b/CulinaryCommandApp/Inventory/Services/UnitService.cs index 60fb631..750125c 100644 --- a/CulinaryCommandApp/Inventory/Services/UnitService.cs +++ b/CulinaryCommandApp/Inventory/Services/UnitService.cs @@ -3,11 +3,11 @@ using System.Threading; using System.Threading.Tasks; using CulinaryCommand.Data; -using CulinaryCommandApp.Inventory.Entities; -using CulinaryCommandApp.Inventory.Services.Interfaces; +using CulinaryCommand.Inventory.Entities; +using CulinaryCommand.Inventory.Services.Interfaces; using Microsoft.EntityFrameworkCore; -namespace CulinaryCommandApp.Inventory.Services +namespace CulinaryCommand.Inventory.Services { public class UnitService : IUnitService { @@ -67,45 +67,5 @@ public async Task> GetUnitsForIngredient(int ingredientId, Cancellati { return await GetAllAsync(cancellationToken); } - - - public async Task> GetByLocationAsync(int locationId, CancellationToken cancellationToken = default) - { - return await _db.LocationUnits - .Where(lu => lu.LocationId == locationId) - .Include(lu => lu.Unit) - .Select(lu => lu.Unit) - .OrderBy(u => u.Name) - .ToListAsync(cancellationToken); - } - - - public async Task SetLocationUnitsAsync(int locationId, IEnumerable unitIds, CancellationToken cancellationToken = default) - { - var desired = unitIds.ToHashSet(); - - var existing = await _db.LocationUnits - .Where(lu => lu.LocationId == locationId) - .ToListAsync(cancellationToken); - - var existingIds = existing.Select(lu => lu.UnitId).ToHashSet(); - - // Remove units no longer in the list - var toRemove = existing.Where(lu => !desired.Contains(lu.UnitId)).ToList(); - _db.LocationUnits.RemoveRange(toRemove); - - // Add new units - foreach (var unitId in desired.Where(id => !existingIds.Contains(id))) - { - _db.LocationUnits.Add(new LocationUnit - { - LocationId = locationId, - UnitId = unitId, - AssignedAt = DateTime.UtcNow - }); - } - - await _db.SaveChangesAsync(cancellationToken); - } } } diff --git a/CulinaryCommandApp/Migrations/20260227192322_RecipeAndLocationUnitSupport.Designer.cs b/CulinaryCommandApp/Migrations/20260227192322_RecipeAndLocationUnitSupport.Designer.cs deleted file mode 100644 index 12f212a..0000000 --- a/CulinaryCommandApp/Migrations/20260227192322_RecipeAndLocationUnitSupport.Designer.cs +++ /dev/null @@ -1,1121 +0,0 @@ -ο»Ώ// -using System; -using CulinaryCommand.Data; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -#nullable disable - -namespace CulinaryCommand.Migrations -{ - [DbContext(typeof(AppDbContext))] - [Migration("20260227192322_RecipeAndLocationUnitSupport")] - partial class RecipeAndLocationUnitSupport - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "9.0.0") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Company", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Address") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("City") - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("CompanyCode") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("varchar(50)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Description") - .HasColumnType("longtext"); - - b.Property("Email") - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("LLCName") - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Phone") - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("State") - .HasMaxLength(64) - .HasColumnType("varchar(64)"); - - b.Property("TaxId") - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("ZipCode") - .HasMaxLength(32) - .HasColumnType("varchar(32)"); - - b.HasKey("Id"); - - b.ToTable("Companies"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Address") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("City") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("CompanyId") - .HasColumnType("int"); - - b.Property("MarginEdgeKey") - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("State") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("ZipCode") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("CompanyId"); - - b.ToTable("Locations"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.ManagerLocation", b => - { - b.Property("UserId") - .HasColumnType("int"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.HasKey("UserId", "LocationId"); - - b.HasIndex("LocationId"); - - b.ToTable("ManagerLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Tasks", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Assigner") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Count") - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Date") - .HasColumnType("datetime(6)"); - - b.Property("DueDate") - .HasColumnType("datetime(6)"); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("Kind") - .HasColumnType("int"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Notes") - .HasColumnType("longtext"); - - b.Property("Par") - .HasColumnType("int"); - - b.Property("Priority") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("RecipeId") - .HasColumnType("int"); - - b.Property("Station") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("Status") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("UserId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("IngredientId"); - - b.HasIndex("LocationId"); - - b.HasIndex("RecipeId"); - - b.HasIndex("UserId"); - - b.ToTable("Tasks"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CompanyId") - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("CreatedByUserId") - .HasColumnType("int"); - - b.Property("Email") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("EmailConfirmed") - .HasColumnType("bit(1)"); - - b.Property("InviteToken") - .HasColumnType("longtext"); - - b.Property("InviteTokenExpires") - .HasColumnType("datetime(6)"); - - b.Property("IsActive") - .HasColumnType("bit(1)"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Password") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Phone") - .HasColumnType("longtext"); - - b.Property("Role") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("StationsWorked") - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("Id"); - - b.HasIndex("CompanyId"); - - b.ToTable("Users"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.UserLocation", b => - { - b.Property("UserId") - .HasColumnType("int"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Role") - .HasMaxLength(32) - .HasColumnType("varchar(32)"); - - b.HasKey("UserId", "LocationId"); - - b.HasIndex("LocationId"); - - b.ToTable("UserLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("ExpectedDeliveryDate") - .HasColumnType("datetime(6)"); - - b.Property("IsLocationLocked") - .HasColumnType("bit(1)"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Notes") - .HasColumnType("longtext"); - - b.Property("OrderDate") - .HasColumnType("datetime(6)"); - - b.Property("OrderNumber") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("varchar(50)"); - - b.Property("Status") - .HasColumnType("int"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("VendorContact") - .HasColumnType("longtext"); - - b.Property("VendorName") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("LocationId"); - - b.HasIndex("OrderNumber") - .IsUnique(); - - b.ToTable("PurchaseOrders"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrderLine", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("PurchaseOrderId") - .HasColumnType("int"); - - b.Property("QuantityOrdered") - .HasPrecision(18, 3) - .HasColumnType("decimal(18,3)"); - - b.Property("QuantityReceived") - .ValueGeneratedOnAdd() - .HasPrecision(18, 3) - .HasColumnType("decimal(18,3)") - .HasDefaultValue(0m); - - b.Property("UnitId") - .HasColumnType("int"); - - b.Property("UnitPrice") - .HasPrecision(18, 2) - .HasColumnType("decimal(18,2)"); - - b.HasKey("Id"); - - b.HasIndex("IngredientId"); - - b.HasIndex("PurchaseOrderId"); - - b.HasIndex("UnitId"); - - b.ToTable("PurchaseOrderLines"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.LocationVendor", b => - { - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("VendorId") - .HasColumnType("int"); - - b.Property("AssignedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("LocationId", "VendorId"); - - b.HasIndex("VendorId"); - - b.ToTable("LocationVendors"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CompanyId") - .HasColumnType("int"); - - b.Property("ContactName") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Email") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("IsActive") - .HasColumnType("bit(1)"); - - b.Property("LogoUrl") - .HasMaxLength(512) - .HasColumnType("varchar(512)"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Notes") - .HasMaxLength(500) - .HasColumnType("varchar(500)"); - - b.Property("Phone") - .HasMaxLength(50) - .HasColumnType("varchar(50)"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Website") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("CompanyId"); - - b.ToTable("Vendors"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Ingredient", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int") - .HasColumnName("IngredientId"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Category") - .IsRequired() - .HasMaxLength(100) - .HasColumnType("varchar(100)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("varchar(200)"); - - b.Property("Notes") - .HasColumnType("longtext"); - - b.Property("Price") - .HasColumnType("decimal(65,30)"); - - b.Property("ReorderLevel") - .HasColumnType("decimal(65,30)"); - - b.Property("Sku") - .HasColumnType("longtext"); - - b.Property("StockQuantity") - .HasColumnType("decimal(18, 4)"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("VendorId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("LocationId"); - - b.HasIndex("UnitId"); - - b.HasIndex("VendorId"); - - b.ToTable("Ingredients", (string)null); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.InventoryTransaction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("Reason") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StockChange") - .HasColumnType("decimal(65,30)"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("IngredientId"); - - b.HasIndex("UnitId"); - - b.ToTable("InventoryTransactions"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.LocationUnit", b => - { - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.Property("AssignedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("LocationId", "UnitId"); - - b.HasIndex("UnitId"); - - b.ToTable("LocationUnits"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Unit", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Abbreviation") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ConversionFactor") - .HasColumnType("decimal(65,30)"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Units"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => - { - b.Property("RecipeId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("RecipeId")); - - b.Property("Category") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("CostPerYield") - .HasColumnType("decimal(65,30)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IsSubRecipe") - .HasColumnType("bit(1)"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("RecipeType") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("Title") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("YieldAmount") - .HasColumnType("decimal(65,30)"); - - b.Property("YieldUnit") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.HasKey("RecipeId"); - - b.HasIndex("LocationId"); - - b.ToTable("Recipes"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeIngredient", b => - { - b.Property("RecipeIngredientId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("RecipeIngredientId")); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("PrepNote") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Quantity") - .HasColumnType("decimal(65,30)"); - - b.Property("RecipeId") - .HasColumnType("int"); - - b.Property("SortOrder") - .HasColumnType("int"); - - b.Property("SubRecipeId") - .HasColumnType("int"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.HasKey("RecipeIngredientId"); - - b.HasIndex("IngredientId"); - - b.HasIndex("RecipeId"); - - b.HasIndex("SubRecipeId"); - - b.HasIndex("UnitId"); - - b.ToTable("RecipeIngredients"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeStep", b => - { - b.Property("StepId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("StepId")); - - b.Property("Duration") - .HasMaxLength(64) - .HasColumnType("varchar(64)"); - - b.Property("Equipment") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Instructions") - .IsRequired() - .HasMaxLength(2048) - .HasColumnType("varchar(2048)"); - - b.Property("RecipeId") - .HasColumnType("int"); - - b.Property("StepNumber") - .HasColumnType("int"); - - b.Property("Temperature") - .HasMaxLength(64) - .HasColumnType("varchar(64)"); - - b.HasKey("StepId"); - - b.HasIndex("RecipeId"); - - b.ToTable("RecipeSteps"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeSubRecipe", b => - { - b.Property("ParentRecipeId") - .HasColumnType("int"); - - b.Property("ChildRecipeId") - .HasColumnType("int"); - - b.HasKey("ParentRecipeId", "ChildRecipeId"); - - b.HasIndex("ChildRecipeId"); - - b.ToTable("RecipeSubRecipes"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") - .WithMany("Locations") - .HasForeignKey("CompanyId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Company"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.ManagerLocation", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("ManagerLocations") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Data.Entities.User", "User") - .WithMany("ManagerLocations") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("User"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Tasks", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId"); - - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany() - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") - .WithMany() - .HasForeignKey("RecipeId") - .OnDelete(DeleteBehavior.SetNull); - - b.HasOne("CulinaryCommand.Data.Entities.User", "User") - .WithMany() - .HasForeignKey("UserId"); - - b.Navigation("Ingredient"); - - b.Navigation("Location"); - - b.Navigation("Recipe"); - - b.Navigation("User"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.User", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") - .WithMany("Employees") - .HasForeignKey("CompanyId") - .OnDelete(DeleteBehavior.Restrict); - - b.Navigation("Company"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.UserLocation", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("UserLocations") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Data.Entities.User", "User") - .WithMany("UserLocations") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("User"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany() - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.Navigation("Location"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrderLine", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", "PurchaseOrder") - .WithMany("Lines") - .HasForeignKey("PurchaseOrderId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany() - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.Navigation("Ingredient"); - - b.Navigation("PurchaseOrder"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.LocationVendor", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("LocationVendors") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Vendor.Entities.Vendor", "Vendor") - .WithMany("LocationVendors") - .HasForeignKey("VendorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("Vendor"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") - .WithMany("Vendors") - .HasForeignKey("CompanyId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Company"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Ingredient", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany() - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany("Ingredients") - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Vendor.Entities.Vendor", "Vendor") - .WithMany() - .HasForeignKey("VendorId") - .OnDelete(DeleteBehavior.SetNull); - - b.Navigation("Location"); - - b.Navigation("Unit"); - - b.Navigation("Vendor"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.InventoryTransaction", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany("InventoryTransaction") - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Ingredient"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.LocationUnit", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("LocationUnits") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany("LocationUnits") - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("Recipes") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeIngredient", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId") - .OnDelete(DeleteBehavior.Restrict); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") - .WithMany("RecipeIngredients") - .HasForeignKey("RecipeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "SubRecipe") - .WithMany() - .HasForeignKey("SubRecipeId") - .OnDelete(DeleteBehavior.Restrict); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany() - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.Navigation("Ingredient"); - - b.Navigation("Recipe"); - - b.Navigation("SubRecipe"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeStep", b => - { - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") - .WithMany("Steps") - .HasForeignKey("RecipeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Recipe"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeSubRecipe", b => - { - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "ChildRecipe") - .WithMany("UsedInRecipes") - .HasForeignKey("ChildRecipeId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "ParentRecipe") - .WithMany("SubRecipeUsages") - .HasForeignKey("ParentRecipeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("ChildRecipe"); - - b.Navigation("ParentRecipe"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Company", b => - { - b.Navigation("Employees"); - - b.Navigation("Locations"); - - b.Navigation("Vendors"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => - { - b.Navigation("LocationUnits"); - - b.Navigation("LocationVendors"); - - b.Navigation("ManagerLocations"); - - b.Navigation("Recipes"); - - b.Navigation("UserLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.User", b => - { - b.Navigation("ManagerLocations"); - - b.Navigation("UserLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => - { - b.Navigation("Lines"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => - { - b.Navigation("LocationVendors"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Unit", b => - { - b.Navigation("Ingredients"); - - b.Navigation("InventoryTransaction"); - - b.Navigation("LocationUnits"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => - { - b.Navigation("RecipeIngredients"); - - b.Navigation("Steps"); - - b.Navigation("SubRecipeUsages"); - - b.Navigation("UsedInRecipes"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/CulinaryCommandApp/Migrations/20260227192322_RecipeAndLocationUnitSupport.cs b/CulinaryCommandApp/Migrations/20260227192322_RecipeAndLocationUnitSupport.cs deleted file mode 100644 index 1225678..0000000 --- a/CulinaryCommandApp/Migrations/20260227192322_RecipeAndLocationUnitSupport.cs +++ /dev/null @@ -1,346 +0,0 @@ -ο»Ώusing System; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace CulinaryCommand.Migrations -{ - /// - public partial class RecipeAndLocationUnitSupport : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_RecipeIngredients_Ingredients_IngredientId", - table: "RecipeIngredients"); - - migrationBuilder.DropForeignKey( - name: "FK_RecipeIngredients_MeasurementUnits_MeasurementUnitUnitId", - table: "RecipeIngredients"); - - migrationBuilder.DropForeignKey( - name: "FK_RecipeIngredients_Units_UnitId", - table: "RecipeIngredients"); - - migrationBuilder.DropForeignKey( - name: "FK_Tasks_Recipes_RecipeId", - table: "Tasks"); - - migrationBuilder.DropTable( - name: "MeasurementUnits"); - - migrationBuilder.RenameColumn( - name: "MeasurementUnitUnitId", - table: "RecipeIngredients", - newName: "SubRecipeId"); - - migrationBuilder.RenameIndex( - name: "IX_RecipeIngredients_MeasurementUnitUnitId", - table: "RecipeIngredients", - newName: "IX_RecipeIngredients_SubRecipeId"); - - migrationBuilder.UpdateData( - table: "RecipeSteps", - keyColumn: "Instructions", - keyValue: null, - column: "Instructions", - value: ""); - - migrationBuilder.AlterColumn( - name: "Instructions", - table: "RecipeSteps", - type: "varchar(2048)", - maxLength: 2048, - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(256)", - oldMaxLength: 256, - oldNullable: true) - .Annotation("MySql:CharSet", "utf8mb4") - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.AddColumn( - name: "Duration", - table: "RecipeSteps", - type: "varchar(64)", - maxLength: 64, - nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.AddColumn( - name: "Equipment", - table: "RecipeSteps", - type: "varchar(256)", - maxLength: 256, - nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.AddColumn( - name: "Temperature", - table: "RecipeSteps", - type: "varchar(64)", - maxLength: 64, - nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.AlterColumn( - name: "CreatedAt", - table: "Recipes", - type: "datetime(6)", - nullable: true, - oldClrType: typeof(DateTime), - oldType: "datetime(6)"); - - migrationBuilder.AddColumn( - name: "CostPerYield", - table: "Recipes", - type: "decimal(65,30)", - nullable: true); - - migrationBuilder.AddColumn( - name: "IsSubRecipe", - table: "Recipes", - type: "bit(1)", - nullable: false, - defaultValue: false); - - migrationBuilder.AlterColumn( - name: "IngredientId", - table: "RecipeIngredients", - type: "int", - nullable: true, - oldClrType: typeof(int), - oldType: "int"); - - migrationBuilder.CreateTable( - name: "LocationUnits", - columns: table => new - { - LocationId = table.Column(type: "int", nullable: false), - UnitId = table.Column(type: "int", nullable: false), - AssignedAt = table.Column(type: "datetime(6)", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_LocationUnits", x => new { x.LocationId, x.UnitId }); - table.ForeignKey( - name: "FK_LocationUnits_Locations_LocationId", - column: x => x.LocationId, - principalTable: "Locations", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_LocationUnits_Units_UnitId", - column: x => x.UnitId, - principalTable: "Units", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }) - .Annotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.CreateTable( - name: "RecipeSubRecipes", - columns: table => new - { - ParentRecipeId = table.Column(type: "int", nullable: false), - ChildRecipeId = table.Column(type: "int", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_RecipeSubRecipes", x => new { x.ParentRecipeId, x.ChildRecipeId }); - table.ForeignKey( - name: "FK_RecipeSubRecipes_Recipes_ChildRecipeId", - column: x => x.ChildRecipeId, - principalTable: "Recipes", - principalColumn: "RecipeId", - onDelete: ReferentialAction.Restrict); - table.ForeignKey( - name: "FK_RecipeSubRecipes_Recipes_ParentRecipeId", - column: x => x.ParentRecipeId, - principalTable: "Recipes", - principalColumn: "RecipeId", - onDelete: ReferentialAction.Cascade); - }) - .Annotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.CreateIndex( - name: "IX_LocationUnits_UnitId", - table: "LocationUnits", - column: "UnitId"); - - migrationBuilder.CreateIndex( - name: "IX_RecipeSubRecipes_ChildRecipeId", - table: "RecipeSubRecipes", - column: "ChildRecipeId"); - - migrationBuilder.AddForeignKey( - name: "FK_RecipeIngredients_Ingredients_IngredientId", - table: "RecipeIngredients", - column: "IngredientId", - principalTable: "Ingredients", - principalColumn: "IngredientId", - onDelete: ReferentialAction.Restrict); - - migrationBuilder.AddForeignKey( - name: "FK_RecipeIngredients_Recipes_SubRecipeId", - table: "RecipeIngredients", - column: "SubRecipeId", - principalTable: "Recipes", - principalColumn: "RecipeId", - onDelete: ReferentialAction.Restrict); - - migrationBuilder.AddForeignKey( - name: "FK_RecipeIngredients_Units_UnitId", - table: "RecipeIngredients", - column: "UnitId", - principalTable: "Units", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - - migrationBuilder.AddForeignKey( - name: "FK_Tasks_Recipes_RecipeId", - table: "Tasks", - column: "RecipeId", - principalTable: "Recipes", - principalColumn: "RecipeId", - onDelete: ReferentialAction.SetNull); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_RecipeIngredients_Ingredients_IngredientId", - table: "RecipeIngredients"); - - migrationBuilder.DropForeignKey( - name: "FK_RecipeIngredients_Recipes_SubRecipeId", - table: "RecipeIngredients"); - - migrationBuilder.DropForeignKey( - name: "FK_RecipeIngredients_Units_UnitId", - table: "RecipeIngredients"); - - migrationBuilder.DropForeignKey( - name: "FK_Tasks_Recipes_RecipeId", - table: "Tasks"); - - migrationBuilder.DropTable( - name: "LocationUnits"); - - migrationBuilder.DropTable( - name: "RecipeSubRecipes"); - - migrationBuilder.DropColumn( - name: "Duration", - table: "RecipeSteps"); - - migrationBuilder.DropColumn( - name: "Equipment", - table: "RecipeSteps"); - - migrationBuilder.DropColumn( - name: "Temperature", - table: "RecipeSteps"); - - migrationBuilder.DropColumn( - name: "CostPerYield", - table: "Recipes"); - - migrationBuilder.DropColumn( - name: "IsSubRecipe", - table: "Recipes"); - - migrationBuilder.RenameColumn( - name: "SubRecipeId", - table: "RecipeIngredients", - newName: "MeasurementUnitUnitId"); - - migrationBuilder.RenameIndex( - name: "IX_RecipeIngredients_SubRecipeId", - table: "RecipeIngredients", - newName: "IX_RecipeIngredients_MeasurementUnitUnitId"); - - migrationBuilder.AlterColumn( - name: "Instructions", - table: "RecipeSteps", - type: "varchar(256)", - maxLength: 256, - nullable: true, - oldClrType: typeof(string), - oldType: "varchar(2048)", - oldMaxLength: 2048) - .Annotation("MySql:CharSet", "utf8mb4") - .OldAnnotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.AlterColumn( - name: "CreatedAt", - table: "Recipes", - type: "datetime(6)", - nullable: false, - defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), - oldClrType: typeof(DateTime), - oldType: "datetime(6)", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "IngredientId", - table: "RecipeIngredients", - type: "int", - nullable: false, - defaultValue: 0, - oldClrType: typeof(int), - oldType: "int", - oldNullable: true); - - migrationBuilder.CreateTable( - name: "MeasurementUnits", - columns: table => new - { - UnitId = table.Column(type: "int", nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Abbreviation = table.Column(type: "varchar(32)", maxLength: 32, nullable: false) - .Annotation("MySql:CharSet", "utf8mb4"), - Name = table.Column(type: "varchar(128)", maxLength: 128, nullable: false) - .Annotation("MySql:CharSet", "utf8mb4") - }, - constraints: table => - { - table.PrimaryKey("PK_MeasurementUnits", x => x.UnitId); - }) - .Annotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.AddForeignKey( - name: "FK_RecipeIngredients_Ingredients_IngredientId", - table: "RecipeIngredients", - column: "IngredientId", - principalTable: "Ingredients", - principalColumn: "IngredientId", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_RecipeIngredients_MeasurementUnits_MeasurementUnitUnitId", - table: "RecipeIngredients", - column: "MeasurementUnitUnitId", - principalTable: "MeasurementUnits", - principalColumn: "UnitId"); - - migrationBuilder.AddForeignKey( - name: "FK_RecipeIngredients_Units_UnitId", - table: "RecipeIngredients", - column: "UnitId", - principalTable: "Units", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_Tasks_Recipes_RecipeId", - table: "Tasks", - column: "RecipeId", - principalTable: "Recipes", - principalColumn: "RecipeId"); - } - } -} diff --git a/CulinaryCommandApp/Migrations/20260305191150_AddRecipeRowVersion.Designer.cs b/CulinaryCommandApp/Migrations/20260305191150_AddRecipeRowVersion.Designer.cs deleted file mode 100644 index fc463fc..0000000 --- a/CulinaryCommandApp/Migrations/20260305191150_AddRecipeRowVersion.Designer.cs +++ /dev/null @@ -1,1126 +0,0 @@ -ο»Ώ// -using System; -using CulinaryCommand.Data; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -#nullable disable - -namespace CulinaryCommand.Migrations -{ - [DbContext(typeof(AppDbContext))] - [Migration("20260305191150_AddRecipeRowVersion")] - partial class AddRecipeRowVersion - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "9.0.0") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Company", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Address") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("City") - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("CompanyCode") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("varchar(50)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Description") - .HasColumnType("longtext"); - - b.Property("Email") - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("LLCName") - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Phone") - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("State") - .HasMaxLength(64) - .HasColumnType("varchar(64)"); - - b.Property("TaxId") - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("ZipCode") - .HasMaxLength(32) - .HasColumnType("varchar(32)"); - - b.HasKey("Id"); - - b.ToTable("Companies"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Address") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("City") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("CompanyId") - .HasColumnType("int"); - - b.Property("MarginEdgeKey") - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("State") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("ZipCode") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("CompanyId"); - - b.ToTable("Locations"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.ManagerLocation", b => - { - b.Property("UserId") - .HasColumnType("int"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.HasKey("UserId", "LocationId"); - - b.HasIndex("LocationId"); - - b.ToTable("ManagerLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Tasks", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Assigner") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Count") - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Date") - .HasColumnType("datetime(6)"); - - b.Property("DueDate") - .HasColumnType("datetime(6)"); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("Kind") - .HasColumnType("int"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Notes") - .HasColumnType("longtext"); - - b.Property("Par") - .HasColumnType("int"); - - b.Property("Priority") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("RecipeId") - .HasColumnType("int"); - - b.Property("Station") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("Status") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("UserId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("IngredientId"); - - b.HasIndex("LocationId"); - - b.HasIndex("RecipeId"); - - b.HasIndex("UserId"); - - b.ToTable("Tasks"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CompanyId") - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("CreatedByUserId") - .HasColumnType("int"); - - b.Property("Email") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("EmailConfirmed") - .HasColumnType("bit(1)"); - - b.Property("InviteToken") - .HasColumnType("longtext"); - - b.Property("InviteTokenExpires") - .HasColumnType("datetime(6)"); - - b.Property("IsActive") - .HasColumnType("bit(1)"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Password") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Phone") - .HasColumnType("longtext"); - - b.Property("Role") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("StationsWorked") - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("Id"); - - b.HasIndex("CompanyId"); - - b.ToTable("Users"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.UserLocation", b => - { - b.Property("UserId") - .HasColumnType("int"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Role") - .HasMaxLength(32) - .HasColumnType("varchar(32)"); - - b.HasKey("UserId", "LocationId"); - - b.HasIndex("LocationId"); - - b.ToTable("UserLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("ExpectedDeliveryDate") - .HasColumnType("datetime(6)"); - - b.Property("IsLocationLocked") - .HasColumnType("bit(1)"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Notes") - .HasColumnType("longtext"); - - b.Property("OrderDate") - .HasColumnType("datetime(6)"); - - b.Property("OrderNumber") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("varchar(50)"); - - b.Property("Status") - .HasColumnType("int"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("VendorContact") - .HasColumnType("longtext"); - - b.Property("VendorName") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("LocationId"); - - b.HasIndex("OrderNumber") - .IsUnique(); - - b.ToTable("PurchaseOrders"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrderLine", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("PurchaseOrderId") - .HasColumnType("int"); - - b.Property("QuantityOrdered") - .HasPrecision(18, 3) - .HasColumnType("decimal(18,3)"); - - b.Property("QuantityReceived") - .ValueGeneratedOnAdd() - .HasPrecision(18, 3) - .HasColumnType("decimal(18,3)") - .HasDefaultValue(0m); - - b.Property("UnitId") - .HasColumnType("int"); - - b.Property("UnitPrice") - .HasPrecision(18, 2) - .HasColumnType("decimal(18,2)"); - - b.HasKey("Id"); - - b.HasIndex("IngredientId"); - - b.HasIndex("PurchaseOrderId"); - - b.HasIndex("UnitId"); - - b.ToTable("PurchaseOrderLines"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.LocationVendor", b => - { - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("VendorId") - .HasColumnType("int"); - - b.Property("AssignedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("LocationId", "VendorId"); - - b.HasIndex("VendorId"); - - b.ToTable("LocationVendors"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CompanyId") - .HasColumnType("int"); - - b.Property("ContactName") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Email") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("IsActive") - .HasColumnType("bit(1)"); - - b.Property("LogoUrl") - .HasMaxLength(512) - .HasColumnType("varchar(512)"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Notes") - .HasMaxLength(500) - .HasColumnType("varchar(500)"); - - b.Property("Phone") - .HasMaxLength(50) - .HasColumnType("varchar(50)"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Website") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("CompanyId"); - - b.ToTable("Vendors"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Ingredient", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int") - .HasColumnName("IngredientId"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Category") - .IsRequired() - .HasMaxLength(100) - .HasColumnType("varchar(100)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("varchar(200)"); - - b.Property("Notes") - .HasColumnType("longtext"); - - b.Property("Price") - .HasColumnType("decimal(65,30)"); - - b.Property("ReorderLevel") - .HasColumnType("decimal(65,30)"); - - b.Property("Sku") - .HasColumnType("longtext"); - - b.Property("StockQuantity") - .HasColumnType("decimal(18, 4)"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("VendorId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("LocationId"); - - b.HasIndex("UnitId"); - - b.HasIndex("VendorId"); - - b.ToTable("Ingredients", (string)null); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.InventoryTransaction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("Reason") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StockChange") - .HasColumnType("decimal(65,30)"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("IngredientId"); - - b.HasIndex("UnitId"); - - b.ToTable("InventoryTransactions"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.LocationUnit", b => - { - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.Property("AssignedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("LocationId", "UnitId"); - - b.HasIndex("UnitId"); - - b.ToTable("LocationUnits"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Unit", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Abbreviation") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ConversionFactor") - .HasColumnType("decimal(65,30)"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Units"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => - { - b.Property("RecipeId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("RecipeId")); - - b.Property("Category") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("CostPerYield") - .HasColumnType("decimal(65,30)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IsSubRecipe") - .HasColumnType("bit(1)"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("RecipeType") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("RowVersion") - .IsConcurrencyToken() - .ValueGeneratedOnAddOrUpdate() - .HasColumnType("timestamp(6)"); - - b.Property("Title") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("YieldAmount") - .HasColumnType("decimal(65,30)"); - - b.Property("YieldUnit") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.HasKey("RecipeId"); - - b.HasIndex("LocationId"); - - b.ToTable("Recipes"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeIngredient", b => - { - b.Property("RecipeIngredientId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("RecipeIngredientId")); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("PrepNote") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Quantity") - .HasColumnType("decimal(65,30)"); - - b.Property("RecipeId") - .HasColumnType("int"); - - b.Property("SortOrder") - .HasColumnType("int"); - - b.Property("SubRecipeId") - .HasColumnType("int"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.HasKey("RecipeIngredientId"); - - b.HasIndex("IngredientId"); - - b.HasIndex("RecipeId"); - - b.HasIndex("SubRecipeId"); - - b.HasIndex("UnitId"); - - b.ToTable("RecipeIngredients"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeStep", b => - { - b.Property("StepId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("StepId")); - - b.Property("Duration") - .HasMaxLength(64) - .HasColumnType("varchar(64)"); - - b.Property("Equipment") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Instructions") - .IsRequired() - .HasMaxLength(2048) - .HasColumnType("varchar(2048)"); - - b.Property("RecipeId") - .HasColumnType("int"); - - b.Property("StepNumber") - .HasColumnType("int"); - - b.Property("Temperature") - .HasMaxLength(64) - .HasColumnType("varchar(64)"); - - b.HasKey("StepId"); - - b.HasIndex("RecipeId"); - - b.ToTable("RecipeSteps"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeSubRecipe", b => - { - b.Property("ParentRecipeId") - .HasColumnType("int"); - - b.Property("ChildRecipeId") - .HasColumnType("int"); - - b.HasKey("ParentRecipeId", "ChildRecipeId"); - - b.HasIndex("ChildRecipeId"); - - b.ToTable("RecipeSubRecipes"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") - .WithMany("Locations") - .HasForeignKey("CompanyId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Company"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.ManagerLocation", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("ManagerLocations") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Data.Entities.User", "User") - .WithMany("ManagerLocations") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("User"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Tasks", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId"); - - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany() - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") - .WithMany() - .HasForeignKey("RecipeId") - .OnDelete(DeleteBehavior.SetNull); - - b.HasOne("CulinaryCommand.Data.Entities.User", "User") - .WithMany() - .HasForeignKey("UserId"); - - b.Navigation("Ingredient"); - - b.Navigation("Location"); - - b.Navigation("Recipe"); - - b.Navigation("User"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.User", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") - .WithMany("Employees") - .HasForeignKey("CompanyId") - .OnDelete(DeleteBehavior.Restrict); - - b.Navigation("Company"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.UserLocation", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("UserLocations") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Data.Entities.User", "User") - .WithMany("UserLocations") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("User"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany() - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.Navigation("Location"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrderLine", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", "PurchaseOrder") - .WithMany("Lines") - .HasForeignKey("PurchaseOrderId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany() - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.Navigation("Ingredient"); - - b.Navigation("PurchaseOrder"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.LocationVendor", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("LocationVendors") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Vendor.Entities.Vendor", "Vendor") - .WithMany("LocationVendors") - .HasForeignKey("VendorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("Vendor"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") - .WithMany("Vendors") - .HasForeignKey("CompanyId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Company"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Ingredient", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany() - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany("Ingredients") - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Vendor.Entities.Vendor", "Vendor") - .WithMany() - .HasForeignKey("VendorId") - .OnDelete(DeleteBehavior.SetNull); - - b.Navigation("Location"); - - b.Navigation("Unit"); - - b.Navigation("Vendor"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.InventoryTransaction", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany("InventoryTransaction") - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Ingredient"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.LocationUnit", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("LocationUnits") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany("LocationUnits") - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("Recipes") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeIngredient", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId") - .OnDelete(DeleteBehavior.Restrict); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") - .WithMany("RecipeIngredients") - .HasForeignKey("RecipeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "SubRecipe") - .WithMany() - .HasForeignKey("SubRecipeId") - .OnDelete(DeleteBehavior.Restrict); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany() - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.Navigation("Ingredient"); - - b.Navigation("Recipe"); - - b.Navigation("SubRecipe"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeStep", b => - { - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") - .WithMany("Steps") - .HasForeignKey("RecipeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Recipe"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeSubRecipe", b => - { - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "ChildRecipe") - .WithMany("UsedInRecipes") - .HasForeignKey("ChildRecipeId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "ParentRecipe") - .WithMany("SubRecipeUsages") - .HasForeignKey("ParentRecipeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("ChildRecipe"); - - b.Navigation("ParentRecipe"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Company", b => - { - b.Navigation("Employees"); - - b.Navigation("Locations"); - - b.Navigation("Vendors"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => - { - b.Navigation("LocationUnits"); - - b.Navigation("LocationVendors"); - - b.Navigation("ManagerLocations"); - - b.Navigation("Recipes"); - - b.Navigation("UserLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.User", b => - { - b.Navigation("ManagerLocations"); - - b.Navigation("UserLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => - { - b.Navigation("Lines"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => - { - b.Navigation("LocationVendors"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Unit", b => - { - b.Navigation("Ingredients"); - - b.Navigation("InventoryTransaction"); - - b.Navigation("LocationUnits"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => - { - b.Navigation("RecipeIngredients"); - - b.Navigation("Steps"); - - b.Navigation("SubRecipeUsages"); - - b.Navigation("UsedInRecipes"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/CulinaryCommandApp/Migrations/20260305191150_AddRecipeRowVersion.cs b/CulinaryCommandApp/Migrations/20260305191150_AddRecipeRowVersion.cs deleted file mode 100644 index 99ef4b3..0000000 --- a/CulinaryCommandApp/Migrations/20260305191150_AddRecipeRowVersion.cs +++ /dev/null @@ -1,31 +0,0 @@ -ο»Ώusing System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace CulinaryCommand.Migrations -{ - /// - public partial class AddRecipeRowVersion : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - // MySQL timestamp range starts at 1970-01-01; the EF-generated default of - // 0001-01-01 is rejected. Use raw SQL with CURRENT_TIMESTAMP(6) so that - // both new and existing rows receive a valid value, and ON UPDATE keeps - // the column in sync for optimistic concurrency. - migrationBuilder.Sql( - "ALTER TABLE `Recipes` ADD `RowVersion` timestamp(6) NOT NULL " + - "DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "RowVersion", - table: "Recipes"); - } - } -} diff --git a/CulinaryCommandApp/Migrations/20260306015138_SeedUnits.Designer.cs b/CulinaryCommandApp/Migrations/20260306015138_SeedUnits.Designer.cs deleted file mode 100644 index b166b36..0000000 --- a/CulinaryCommandApp/Migrations/20260306015138_SeedUnits.Designer.cs +++ /dev/null @@ -1,1126 +0,0 @@ -ο»Ώ// -using System; -using CulinaryCommand.Data; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -#nullable disable - -namespace CulinaryCommand.Migrations -{ - [DbContext(typeof(AppDbContext))] - [Migration("20260306015138_SeedUnits")] - partial class SeedUnits - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "9.0.0") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Company", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Address") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("City") - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("CompanyCode") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("varchar(50)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Description") - .HasColumnType("longtext"); - - b.Property("Email") - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("LLCName") - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Phone") - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("State") - .HasMaxLength(64) - .HasColumnType("varchar(64)"); - - b.Property("TaxId") - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("ZipCode") - .HasMaxLength(32) - .HasColumnType("varchar(32)"); - - b.HasKey("Id"); - - b.ToTable("Companies"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Address") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("City") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("CompanyId") - .HasColumnType("int"); - - b.Property("MarginEdgeKey") - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("State") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("ZipCode") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("CompanyId"); - - b.ToTable("Locations"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.ManagerLocation", b => - { - b.Property("UserId") - .HasColumnType("int"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.HasKey("UserId", "LocationId"); - - b.HasIndex("LocationId"); - - b.ToTable("ManagerLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Tasks", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Assigner") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Count") - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Date") - .HasColumnType("datetime(6)"); - - b.Property("DueDate") - .HasColumnType("datetime(6)"); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("Kind") - .HasColumnType("int"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Notes") - .HasColumnType("longtext"); - - b.Property("Par") - .HasColumnType("int"); - - b.Property("Priority") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("RecipeId") - .HasColumnType("int"); - - b.Property("Station") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("Status") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("UserId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("IngredientId"); - - b.HasIndex("LocationId"); - - b.HasIndex("RecipeId"); - - b.HasIndex("UserId"); - - b.ToTable("Tasks"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CompanyId") - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("CreatedByUserId") - .HasColumnType("int"); - - b.Property("Email") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("EmailConfirmed") - .HasColumnType("bit(1)"); - - b.Property("InviteToken") - .HasColumnType("longtext"); - - b.Property("InviteTokenExpires") - .HasColumnType("datetime(6)"); - - b.Property("IsActive") - .HasColumnType("bit(1)"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Password") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Phone") - .HasColumnType("longtext"); - - b.Property("Role") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("StationsWorked") - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("Id"); - - b.HasIndex("CompanyId"); - - b.ToTable("Users"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.UserLocation", b => - { - b.Property("UserId") - .HasColumnType("int"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Role") - .HasMaxLength(32) - .HasColumnType("varchar(32)"); - - b.HasKey("UserId", "LocationId"); - - b.HasIndex("LocationId"); - - b.ToTable("UserLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("ExpectedDeliveryDate") - .HasColumnType("datetime(6)"); - - b.Property("IsLocationLocked") - .HasColumnType("bit(1)"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Notes") - .HasColumnType("longtext"); - - b.Property("OrderDate") - .HasColumnType("datetime(6)"); - - b.Property("OrderNumber") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("varchar(50)"); - - b.Property("Status") - .HasColumnType("int"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("VendorContact") - .HasColumnType("longtext"); - - b.Property("VendorName") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("LocationId"); - - b.HasIndex("OrderNumber") - .IsUnique(); - - b.ToTable("PurchaseOrders"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrderLine", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("PurchaseOrderId") - .HasColumnType("int"); - - b.Property("QuantityOrdered") - .HasPrecision(18, 3) - .HasColumnType("decimal(18,3)"); - - b.Property("QuantityReceived") - .ValueGeneratedOnAdd() - .HasPrecision(18, 3) - .HasColumnType("decimal(18,3)") - .HasDefaultValue(0m); - - b.Property("UnitId") - .HasColumnType("int"); - - b.Property("UnitPrice") - .HasPrecision(18, 2) - .HasColumnType("decimal(18,2)"); - - b.HasKey("Id"); - - b.HasIndex("IngredientId"); - - b.HasIndex("PurchaseOrderId"); - - b.HasIndex("UnitId"); - - b.ToTable("PurchaseOrderLines"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.LocationVendor", b => - { - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("VendorId") - .HasColumnType("int"); - - b.Property("AssignedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("LocationId", "VendorId"); - - b.HasIndex("VendorId"); - - b.ToTable("LocationVendors"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CompanyId") - .HasColumnType("int"); - - b.Property("ContactName") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Email") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("IsActive") - .HasColumnType("bit(1)"); - - b.Property("LogoUrl") - .HasMaxLength(512) - .HasColumnType("varchar(512)"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Notes") - .HasMaxLength(500) - .HasColumnType("varchar(500)"); - - b.Property("Phone") - .HasMaxLength(50) - .HasColumnType("varchar(50)"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Website") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.HasKey("Id"); - - b.HasIndex("CompanyId"); - - b.ToTable("Vendors"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Ingredient", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int") - .HasColumnName("IngredientId"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Category") - .IsRequired() - .HasMaxLength(100) - .HasColumnType("varchar(100)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("varchar(200)"); - - b.Property("Notes") - .HasColumnType("longtext"); - - b.Property("Price") - .HasColumnType("decimal(65,30)"); - - b.Property("ReorderLevel") - .HasColumnType("decimal(65,30)"); - - b.Property("Sku") - .HasColumnType("longtext"); - - b.Property("StockQuantity") - .HasColumnType("decimal(18, 4)"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("VendorId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("LocationId"); - - b.HasIndex("UnitId"); - - b.HasIndex("VendorId"); - - b.ToTable("Ingredients", (string)null); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.InventoryTransaction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("Reason") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StockChange") - .HasColumnType("decimal(65,30)"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("IngredientId"); - - b.HasIndex("UnitId"); - - b.ToTable("InventoryTransactions"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.LocationUnit", b => - { - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.Property("AssignedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("LocationId", "UnitId"); - - b.HasIndex("UnitId"); - - b.ToTable("LocationUnits"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Unit", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Abbreviation") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ConversionFactor") - .HasColumnType("decimal(65,30)"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Units"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => - { - b.Property("RecipeId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("RecipeId")); - - b.Property("Category") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("CostPerYield") - .HasColumnType("decimal(65,30)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IsSubRecipe") - .HasColumnType("bit(1)"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("RecipeType") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("RowVersion") - .IsConcurrencyToken() - .ValueGeneratedOnAddOrUpdate() - .HasColumnType("timestamp(6)"); - - b.Property("Title") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("YieldAmount") - .HasColumnType("decimal(65,30)"); - - b.Property("YieldUnit") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.HasKey("RecipeId"); - - b.HasIndex("LocationId"); - - b.ToTable("Recipes"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeIngredient", b => - { - b.Property("RecipeIngredientId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("RecipeIngredientId")); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("PrepNote") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Quantity") - .HasColumnType("decimal(65,30)"); - - b.Property("RecipeId") - .HasColumnType("int"); - - b.Property("SortOrder") - .HasColumnType("int"); - - b.Property("SubRecipeId") - .HasColumnType("int"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.HasKey("RecipeIngredientId"); - - b.HasIndex("IngredientId"); - - b.HasIndex("RecipeId"); - - b.HasIndex("SubRecipeId"); - - b.HasIndex("UnitId"); - - b.ToTable("RecipeIngredients"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeStep", b => - { - b.Property("StepId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("StepId")); - - b.Property("Duration") - .HasMaxLength(64) - .HasColumnType("varchar(64)"); - - b.Property("Equipment") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Instructions") - .IsRequired() - .HasMaxLength(2048) - .HasColumnType("varchar(2048)"); - - b.Property("RecipeId") - .HasColumnType("int"); - - b.Property("StepNumber") - .HasColumnType("int"); - - b.Property("Temperature") - .HasMaxLength(64) - .HasColumnType("varchar(64)"); - - b.HasKey("StepId"); - - b.HasIndex("RecipeId"); - - b.ToTable("RecipeSteps"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeSubRecipe", b => - { - b.Property("ParentRecipeId") - .HasColumnType("int"); - - b.Property("ChildRecipeId") - .HasColumnType("int"); - - b.HasKey("ParentRecipeId", "ChildRecipeId"); - - b.HasIndex("ChildRecipeId"); - - b.ToTable("RecipeSubRecipes"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") - .WithMany("Locations") - .HasForeignKey("CompanyId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Company"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.ManagerLocation", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("ManagerLocations") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Data.Entities.User", "User") - .WithMany("ManagerLocations") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("User"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Tasks", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId"); - - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany() - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") - .WithMany() - .HasForeignKey("RecipeId") - .OnDelete(DeleteBehavior.SetNull); - - b.HasOne("CulinaryCommand.Data.Entities.User", "User") - .WithMany() - .HasForeignKey("UserId"); - - b.Navigation("Ingredient"); - - b.Navigation("Location"); - - b.Navigation("Recipe"); - - b.Navigation("User"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.User", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") - .WithMany("Employees") - .HasForeignKey("CompanyId") - .OnDelete(DeleteBehavior.Restrict); - - b.Navigation("Company"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.UserLocation", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("UserLocations") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Data.Entities.User", "User") - .WithMany("UserLocations") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("User"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany() - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.Navigation("Location"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrderLine", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", "PurchaseOrder") - .WithMany("Lines") - .HasForeignKey("PurchaseOrderId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany() - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.Navigation("Ingredient"); - - b.Navigation("PurchaseOrder"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.LocationVendor", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("LocationVendors") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Vendor.Entities.Vendor", "Vendor") - .WithMany("LocationVendors") - .HasForeignKey("VendorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("Vendor"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") - .WithMany("Vendors") - .HasForeignKey("CompanyId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Company"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Ingredient", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany() - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany("Ingredients") - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Vendor.Entities.Vendor", "Vendor") - .WithMany() - .HasForeignKey("VendorId") - .OnDelete(DeleteBehavior.SetNull); - - b.Navigation("Location"); - - b.Navigation("Unit"); - - b.Navigation("Vendor"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.InventoryTransaction", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany("InventoryTransaction") - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Ingredient"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.LocationUnit", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("LocationUnits") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany("LocationUnits") - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("Recipes") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeIngredient", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId") - .OnDelete(DeleteBehavior.Restrict); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") - .WithMany("RecipeIngredients") - .HasForeignKey("RecipeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "SubRecipe") - .WithMany() - .HasForeignKey("SubRecipeId") - .OnDelete(DeleteBehavior.Restrict); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany() - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.Navigation("Ingredient"); - - b.Navigation("Recipe"); - - b.Navigation("SubRecipe"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeStep", b => - { - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") - .WithMany("Steps") - .HasForeignKey("RecipeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Recipe"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeSubRecipe", b => - { - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "ChildRecipe") - .WithMany("UsedInRecipes") - .HasForeignKey("ChildRecipeId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "ParentRecipe") - .WithMany("SubRecipeUsages") - .HasForeignKey("ParentRecipeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("ChildRecipe"); - - b.Navigation("ParentRecipe"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Company", b => - { - b.Navigation("Employees"); - - b.Navigation("Locations"); - - b.Navigation("Vendors"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => - { - b.Navigation("LocationUnits"); - - b.Navigation("LocationVendors"); - - b.Navigation("ManagerLocations"); - - b.Navigation("Recipes"); - - b.Navigation("UserLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.Data.Entities.User", b => - { - b.Navigation("ManagerLocations"); - - b.Navigation("UserLocations"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => - { - b.Navigation("Lines"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => - { - b.Navigation("LocationVendors"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Unit", b => - { - b.Navigation("Ingredients"); - - b.Navigation("InventoryTransaction"); - - b.Navigation("LocationUnits"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => - { - b.Navigation("RecipeIngredients"); - - b.Navigation("Steps"); - - b.Navigation("SubRecipeUsages"); - - b.Navigation("UsedInRecipes"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/CulinaryCommandApp/Migrations/20260306015138_SeedUnits.cs b/CulinaryCommandApp/Migrations/20260306015138_SeedUnits.cs deleted file mode 100644 index 639b821..0000000 --- a/CulinaryCommandApp/Migrations/20260306015138_SeedUnits.cs +++ /dev/null @@ -1,48 +0,0 @@ -ο»Ώusing Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace CulinaryCommand.Migrations -{ - /// - public partial class SeedUnits : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - // Negative IDs are reserved for seeded/system units so they never - // collide with user-created units (which use the positive identity sequence). - migrationBuilder.InsertData( - table: "Units", - columns: new[] { "Id", "Name", "Abbreviation", "ConversionFactor" }, - values: new object[,] - { - { -1, "Percent", "%", 1m }, - { -2, "Each", "ea", 1m }, - { -3, "Grams", "g", 1m }, - { -4, "Kilograms", "kg", 1000m }, - { -5, "Ounces", "oz", 28.3495m }, - { -6, "Pounds", "lb", 453.592m }, - { -7, "Milliliters", "mL", 1m }, - { -8, "Liters", "L", 1000m }, - { -9, "Teaspoon", "tsp", 4.92892m }, - { -10, "Tablespoon", "tbsp", 14.7868m }, - { -11, "Cup", "cup", 236.588m }, - { -12, "Quart", "qt", 946.353m }, - { -13, "Gallon", "gal", 3785.41m }, - { -14, "Serving", "srv", 1m }, - }); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - // Delete by PK (Id) so we only remove the exact seeded rows and - // never accidentally touch user-created units that share a name. - migrationBuilder.DeleteData( - table: "Units", - keyColumn: "Id", - keyValues: new object[] { -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14 }); - } - } -} diff --git a/CulinaryCommandApp/Migrations/AppDbContextModelSnapshot.cs b/CulinaryCommandApp/Migrations/AppDbContextModelSnapshot.cs index 506fc19..26a716b 100644 --- a/CulinaryCommandApp/Migrations/AppDbContextModelSnapshot.cs +++ b/CulinaryCommandApp/Migrations/AppDbContextModelSnapshot.cs @@ -145,6 +145,141 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("ManagerLocations"); }); + modelBuilder.Entity("CulinaryCommand.Data.Entities.MeasurementUnit", b => + { + b.Property("UnitId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("UnitId")); + + b.Property("Abbreviation") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("varchar(32)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.HasKey("UnitId"); + + b.ToTable("MeasurementUnits"); + }); + + modelBuilder.Entity("CulinaryCommand.Data.Entities.Recipe", b => + { + b.Property("RecipeId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("RecipeId")); + + b.Property("Category") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("LocationId") + .HasColumnType("int"); + + b.Property("RecipeType") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("YieldAmount") + .HasColumnType("decimal(65,30)"); + + b.Property("YieldUnit") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.HasKey("RecipeId"); + + b.HasIndex("LocationId"); + + b.ToTable("Recipes"); + }); + + modelBuilder.Entity("CulinaryCommand.Data.Entities.RecipeIngredient", b => + { + b.Property("RecipeIngredientId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("RecipeIngredientId")); + + b.Property("IngredientId") + .HasColumnType("int"); + + b.Property("MeasurementUnitUnitId") + .HasColumnType("int"); + + b.Property("PrepNote") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("Quantity") + .HasColumnType("decimal(65,30)"); + + b.Property("RecipeId") + .HasColumnType("int"); + + b.Property("SortOrder") + .HasColumnType("int"); + + b.Property("UnitId") + .HasColumnType("int"); + + b.HasKey("RecipeIngredientId"); + + b.HasIndex("IngredientId"); + + b.HasIndex("MeasurementUnitUnitId"); + + b.HasIndex("RecipeId"); + + b.HasIndex("UnitId"); + + b.ToTable("RecipeIngredients"); + }); + + modelBuilder.Entity("CulinaryCommand.Data.Entities.RecipeStep", b => + { + b.Property("StepId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("StepId")); + + b.Property("Instructions") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("RecipeId") + .HasColumnType("int"); + + b.Property("StepNumber") + .HasColumnType("int"); + + b.HasKey("StepId"); + + b.HasIndex("RecipeId"); + + b.ToTable("RecipeSteps"); + }); + modelBuilder.Entity("CulinaryCommand.Data.Entities.Tasks", b => { b.Property("Id") @@ -307,6 +442,123 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("UserLocations"); }); + modelBuilder.Entity("CulinaryCommand.Inventory.Entities.Ingredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasColumnName("IngredientId"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + + b.Property("Category") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("varchar(100)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("LocationId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("varchar(200)"); + + b.Property("Notes") + .HasColumnType("longtext"); + + b.Property("Price") + .HasColumnType("decimal(65,30)"); + + b.Property("ReorderLevel") + .HasColumnType("decimal(65,30)"); + + b.Property("Sku") + .HasColumnType("longtext"); + + b.Property("StockQuantity") + .HasColumnType("decimal(18, 4)"); + + b.Property("UnitId") + .HasColumnType("int"); + + b.Property("UpdatedAt") + .HasColumnType("datetime(6)"); + + b.Property("VendorId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("LocationId"); + + b.HasIndex("UnitId"); + + b.HasIndex("VendorId"); + + b.ToTable("Ingredients", (string)null); + }); + + modelBuilder.Entity("CulinaryCommand.Inventory.Entities.InventoryTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("IngredientId") + .HasColumnType("int"); + + b.Property("Reason") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StockChange") + .HasColumnType("decimal(65,30)"); + + b.Property("UnitId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("IngredientId"); + + b.HasIndex("UnitId"); + + b.ToTable("InventoryTransactions"); + }); + + modelBuilder.Entity("CulinaryCommand.Inventory.Entities.Unit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + + b.Property("Abbreviation") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ConversionFactor") + .HasColumnType("decimal(65,30)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Units"); + }); + modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => { b.Property("Id") @@ -478,325 +730,92 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Vendors"); }); - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Ingredient", b => + modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int") - .HasColumnName("IngredientId"); + b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") + .WithMany("Locations") + .HasForeignKey("CompanyId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + b.Navigation("Company"); + }); - b.Property("Category") - .IsRequired() - .HasMaxLength(100) - .HasColumnType("varchar(100)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("varchar(200)"); - - b.Property("Notes") - .HasColumnType("longtext"); - - b.Property("Price") - .HasColumnType("decimal(65,30)"); - - b.Property("ReorderLevel") - .HasColumnType("decimal(65,30)"); - - b.Property("Sku") - .HasColumnType("longtext"); - - b.Property("StockQuantity") - .HasColumnType("decimal(18, 4)"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.Property("VendorId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("LocationId"); - - b.HasIndex("UnitId"); - - b.HasIndex("VendorId"); - - b.ToTable("Ingredients", (string)null); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.InventoryTransaction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("Reason") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StockChange") - .HasColumnType("decimal(65,30)"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("IngredientId"); - - b.HasIndex("UnitId"); - - b.ToTable("InventoryTransactions"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.LocationUnit", b => - { - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.Property("AssignedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("LocationId", "UnitId"); - - b.HasIndex("UnitId"); - - b.ToTable("LocationUnits"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Unit", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); - - b.Property("Abbreviation") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ConversionFactor") - .HasColumnType("decimal(65,30)"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Units"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => - { - b.Property("RecipeId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("RecipeId")); - - b.Property("Category") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("CostPerYield") - .HasColumnType("decimal(65,30)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IsSubRecipe") - .HasColumnType("bit(1)"); - - b.Property("LocationId") - .HasColumnType("int"); - - b.Property("RecipeType") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("RowVersion") - .IsConcurrencyToken() - .ValueGeneratedOnAddOrUpdate() - .HasColumnType("timestamp(6)"); - - b.Property("Title") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.Property("YieldAmount") - .HasColumnType("decimal(65,30)"); - - b.Property("YieldUnit") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); - - b.HasKey("RecipeId"); - - b.HasIndex("LocationId"); - - b.ToTable("Recipes"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeIngredient", b => + modelBuilder.Entity("CulinaryCommand.Data.Entities.ManagerLocation", b => { - b.Property("RecipeIngredientId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("RecipeIngredientId")); - - b.Property("IngredientId") - .HasColumnType("int"); - - b.Property("PrepNote") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Quantity") - .HasColumnType("decimal(65,30)"); - - b.Property("RecipeId") - .HasColumnType("int"); - - b.Property("SortOrder") - .HasColumnType("int"); - - b.Property("SubRecipeId") - .HasColumnType("int"); - - b.Property("UnitId") - .HasColumnType("int"); - - b.HasKey("RecipeIngredientId"); - - b.HasIndex("IngredientId"); - - b.HasIndex("RecipeId"); + b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") + .WithMany("ManagerLocations") + .HasForeignKey("LocationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - b.HasIndex("SubRecipeId"); + b.HasOne("CulinaryCommand.Data.Entities.User", "User") + .WithMany("ManagerLocations") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - b.HasIndex("UnitId"); + b.Navigation("Location"); - b.ToTable("RecipeIngredients"); + b.Navigation("User"); }); - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeStep", b => + modelBuilder.Entity("CulinaryCommand.Data.Entities.Recipe", b => { - b.Property("StepId") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("StepId")); - - b.Property("Duration") - .HasMaxLength(64) - .HasColumnType("varchar(64)"); - - b.Property("Equipment") - .HasMaxLength(256) - .HasColumnType("varchar(256)"); - - b.Property("Instructions") - .IsRequired() - .HasMaxLength(2048) - .HasColumnType("varchar(2048)"); - - b.Property("RecipeId") - .HasColumnType("int"); - - b.Property("StepNumber") - .HasColumnType("int"); - - b.Property("Temperature") - .HasMaxLength(64) - .HasColumnType("varchar(64)"); - - b.HasKey("StepId"); - - b.HasIndex("RecipeId"); + b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") + .WithMany("Recipes") + .HasForeignKey("LocationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - b.ToTable("RecipeSteps"); + b.Navigation("Location"); }); - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeSubRecipe", b => + modelBuilder.Entity("CulinaryCommand.Data.Entities.RecipeIngredient", b => { - b.Property("ParentRecipeId") - .HasColumnType("int"); - - b.Property("ChildRecipeId") - .HasColumnType("int"); - - b.HasKey("ParentRecipeId", "ChildRecipeId"); + b.HasOne("CulinaryCommand.Inventory.Entities.Ingredient", "Ingredient") + .WithMany() + .HasForeignKey("IngredientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - b.HasIndex("ChildRecipeId"); + b.HasOne("CulinaryCommand.Data.Entities.MeasurementUnit", null) + .WithMany("RecipeIngredients") + .HasForeignKey("MeasurementUnitUnitId"); - b.ToTable("RecipeSubRecipes"); - }); + b.HasOne("CulinaryCommand.Data.Entities.Recipe", "Recipe") + .WithMany("RecipeIngredients") + .HasForeignKey("RecipeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") - .WithMany("Locations") - .HasForeignKey("CompanyId") + b.HasOne("CulinaryCommand.Inventory.Entities.Unit", "Unit") + .WithMany() + .HasForeignKey("UnitId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.Navigation("Company"); + b.Navigation("Ingredient"); + + b.Navigation("Recipe"); + + b.Navigation("Unit"); }); - modelBuilder.Entity("CulinaryCommand.Data.Entities.ManagerLocation", b => + modelBuilder.Entity("CulinaryCommand.Data.Entities.RecipeStep", b => { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("ManagerLocations") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Data.Entities.User", "User") - .WithMany("ManagerLocations") - .HasForeignKey("UserId") + b.HasOne("CulinaryCommand.Data.Entities.Recipe", "Recipe") + .WithMany("Steps") + .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.Navigation("Location"); - - b.Navigation("User"); + b.Navigation("Recipe"); }); modelBuilder.Entity("CulinaryCommand.Data.Entities.Tasks", b => { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") + b.HasOne("CulinaryCommand.Inventory.Entities.Ingredient", "Ingredient") .WithMany() .HasForeignKey("IngredientId"); @@ -806,10 +825,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") + b.HasOne("CulinaryCommand.Data.Entities.Recipe", "Recipe") .WithMany() - .HasForeignKey("RecipeId") - .OnDelete(DeleteBehavior.SetNull); + .HasForeignKey("RecipeId"); b.HasOne("CulinaryCommand.Data.Entities.User", "User") .WithMany() @@ -853,75 +871,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("User"); }); - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany() - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.Navigation("Location"); - }); - - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrderLine", b => - { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") - .WithMany() - .HasForeignKey("IngredientId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", "PurchaseOrder") - .WithMany("Lines") - .HasForeignKey("PurchaseOrderId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany() - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.Navigation("Ingredient"); - - b.Navigation("PurchaseOrder"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.LocationVendor", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("LocationVendors") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommand.Vendor.Entities.Vendor", "Vendor") - .WithMany("LocationVendors") - .HasForeignKey("VendorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("Vendor"); - }); - - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") - .WithMany("Vendors") - .HasForeignKey("CompanyId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Company"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Ingredient", b => + modelBuilder.Entity("CulinaryCommand.Inventory.Entities.Ingredient", b => { b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") .WithMany() @@ -929,7 +879,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") + b.HasOne("CulinaryCommand.Inventory.Entities.Unit", "Unit") .WithMany("Ingredients") .HasForeignKey("UnitId") .OnDelete(DeleteBehavior.Cascade) @@ -947,15 +897,15 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Vendor"); }); - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.InventoryTransaction", b => + modelBuilder.Entity("CulinaryCommand.Inventory.Entities.InventoryTransaction", b => { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") + b.HasOne("CulinaryCommand.Inventory.Entities.Ingredient", "Ingredient") .WithMany() .HasForeignKey("IngredientId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") + b.HasOne("CulinaryCommand.Inventory.Entities.Unit", "Unit") .WithMany("InventoryTransaction") .HasForeignKey("UnitId") .OnDelete(DeleteBehavior.Cascade) @@ -966,55 +916,32 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Unit"); }); - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.LocationUnit", b => - { - b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("LocationUnits") - .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") - .WithMany("LocationUnits") - .HasForeignKey("UnitId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Location"); - - b.Navigation("Unit"); - }); - - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => + modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => { b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") - .WithMany("Recipes") + .WithMany() .HasForeignKey("LocationId") - .OnDelete(DeleteBehavior.Cascade) + .OnDelete(DeleteBehavior.Restrict) .IsRequired(); b.Navigation("Location"); }); - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeIngredient", b => + modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrderLine", b => { - b.HasOne("CulinaryCommandApp.Inventory.Entities.Ingredient", "Ingredient") + b.HasOne("CulinaryCommand.Inventory.Entities.Ingredient", "Ingredient") .WithMany() .HasForeignKey("IngredientId") - .OnDelete(DeleteBehavior.Restrict); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") - .WithMany("RecipeIngredients") - .HasForeignKey("RecipeId") - .OnDelete(DeleteBehavior.Cascade) + .OnDelete(DeleteBehavior.Restrict) .IsRequired(); - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "SubRecipe") - .WithMany() - .HasForeignKey("SubRecipeId") - .OnDelete(DeleteBehavior.Restrict); + b.HasOne("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", "PurchaseOrder") + .WithMany("Lines") + .HasForeignKey("PurchaseOrderId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); - b.HasOne("CulinaryCommandApp.Inventory.Entities.Unit", "Unit") + b.HasOne("CulinaryCommand.Inventory.Entities.Unit", "Unit") .WithMany() .HasForeignKey("UnitId") .OnDelete(DeleteBehavior.Restrict) @@ -1022,41 +949,39 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Ingredient"); - b.Navigation("Recipe"); - - b.Navigation("SubRecipe"); + b.Navigation("PurchaseOrder"); b.Navigation("Unit"); }); - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeStep", b => + modelBuilder.Entity("CulinaryCommand.Vendor.Entities.LocationVendor", b => { - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "Recipe") - .WithMany("Steps") - .HasForeignKey("RecipeId") + b.HasOne("CulinaryCommand.Data.Entities.Location", "Location") + .WithMany("LocationVendors") + .HasForeignKey("LocationId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.Navigation("Recipe"); + b.HasOne("CulinaryCommand.Vendor.Entities.Vendor", "Vendor") + .WithMany("LocationVendors") + .HasForeignKey("VendorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Location"); + + b.Navigation("Vendor"); }); - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.RecipeSubRecipe", b => + modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => { - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "ChildRecipe") - .WithMany("UsedInRecipes") - .HasForeignKey("ChildRecipeId") - .OnDelete(DeleteBehavior.Restrict) - .IsRequired(); - - b.HasOne("CulinaryCommandApp.Recipe.Entities.Recipe", "ParentRecipe") - .WithMany("SubRecipeUsages") - .HasForeignKey("ParentRecipeId") + b.HasOne("CulinaryCommand.Data.Entities.Company", "Company") + .WithMany("Vendors") + .HasForeignKey("CompanyId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.Navigation("ChildRecipe"); - - b.Navigation("ParentRecipe"); + b.Navigation("Company"); }); modelBuilder.Entity("CulinaryCommand.Data.Entities.Company", b => @@ -1070,8 +995,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("CulinaryCommand.Data.Entities.Location", b => { - b.Navigation("LocationUnits"); - b.Navigation("LocationVendors"); b.Navigation("ManagerLocations"); @@ -1081,41 +1004,40 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("UserLocations"); }); - modelBuilder.Entity("CulinaryCommand.Data.Entities.User", b => + modelBuilder.Entity("CulinaryCommand.Data.Entities.MeasurementUnit", b => { - b.Navigation("ManagerLocations"); - - b.Navigation("UserLocations"); + b.Navigation("RecipeIngredients"); }); - modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => + modelBuilder.Entity("CulinaryCommand.Data.Entities.Recipe", b => { - b.Navigation("Lines"); + b.Navigation("RecipeIngredients"); + + b.Navigation("Steps"); }); - modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => + modelBuilder.Entity("CulinaryCommand.Data.Entities.User", b => { - b.Navigation("LocationVendors"); + b.Navigation("ManagerLocations"); + + b.Navigation("UserLocations"); }); - modelBuilder.Entity("CulinaryCommandApp.Inventory.Entities.Unit", b => + modelBuilder.Entity("CulinaryCommand.Inventory.Entities.Unit", b => { b.Navigation("Ingredients"); b.Navigation("InventoryTransaction"); - - b.Navigation("LocationUnits"); }); - modelBuilder.Entity("CulinaryCommandApp.Recipe.Entities.Recipe", b => + modelBuilder.Entity("CulinaryCommand.PurchaseOrder.Entities.PurchaseOrder", b => { - b.Navigation("RecipeIngredients"); - - b.Navigation("Steps"); - - b.Navigation("SubRecipeUsages"); + b.Navigation("Lines"); + }); - b.Navigation("UsedInRecipes"); + modelBuilder.Entity("CulinaryCommand.Vendor.Entities.Vendor", b => + { + b.Navigation("LocationVendors"); }); #pragma warning restore 612, 618 } diff --git a/CulinaryCommandApp/Program.cs b/CulinaryCommandApp/Program.cs index 59b9df5..eee80e5 100644 --- a/CulinaryCommandApp/Program.cs +++ b/CulinaryCommandApp/Program.cs @@ -5,14 +5,12 @@ using Microsoft.IdentityModel.Protocols.OpenIdConnect; using CulinaryCommand.Data; using CulinaryCommand.Services; -using CulinaryCommandApp.Inventory.Services; +using CulinaryCommand.Inventory.Services; using CulinaryCommand.PurchaseOrder.Services; using CulinaryCommand.Components; using CulinaryCommand.Inventory; -using CulinaryCommandApp.Inventory.Services.Interfaces; +using CulinaryCommand.Inventory.Services.Interfaces; using CulinaryCommandApp.AIDashboard.Services.Reporting; -using CulinaryCommandApp.Recipe.Services; -using CulinaryCommandApp.Recipe.Services.Interfaces; using Google.GenAI; using System; using CulinaryCommand.Services.UserContextSpace; @@ -153,7 +151,7 @@ builder.Services.AddAWSService(); builder.Services.AddScoped(); -builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/CulinaryCommandApp/PurchaseOrder/Entities/PurchaseOrderLine.cs b/CulinaryCommandApp/PurchaseOrder/Entities/PurchaseOrderLine.cs index 3cc51d8..745baa4 100644 --- a/CulinaryCommandApp/PurchaseOrder/Entities/PurchaseOrderLine.cs +++ b/CulinaryCommandApp/PurchaseOrder/Entities/PurchaseOrderLine.cs @@ -1,5 +1,5 @@ // Represents a single ingredient on a purchase order -using CulinaryCommandApp.Inventory.Entities; +using CulinaryCommand.Inventory.Entities; namespace CulinaryCommand.PurchaseOrder.Entities { diff --git a/CulinaryCommandApp/PurchaseOrder/Pages/Create.razor b/CulinaryCommandApp/PurchaseOrder/Pages/Create.razor index ce2f025..27ecc16 100644 --- a/CulinaryCommandApp/PurchaseOrder/Pages/Create.razor +++ b/CulinaryCommandApp/PurchaseOrder/Pages/Create.razor @@ -1,7 +1,7 @@ @page "/purchase-orders/create" @using CulinaryCommand.PurchaseOrder.DTOs @using CulinaryCommand.PurchaseOrder.Services -@using CulinaryCommandApp.Inventory.Entities +@using CulinaryCommand.Inventory.Entities @using Microsoft.EntityFrameworkCore @inject NavigationManager Nav @inject IPurchaseOrderService PurchaseOrderService diff --git a/CulinaryCommandApp/Recipe/Components/ProduceRecipeDialog.razor b/CulinaryCommandApp/Recipe/Components/ProduceRecipeDialog.razor deleted file mode 100644 index e276797..0000000 --- a/CulinaryCommandApp/Recipe/Components/ProduceRecipeDialog.razor +++ /dev/null @@ -1,247 +0,0 @@ -@namespace CulinaryCommandApp.Recipe.Components - -@* ProduceRecipeDialog β€” confirms servings count and deducts inventory for each - raw ingredient (recursively resolved through any sub-recipes). *@ - -@using CulinaryCommandApp.Inventory.Entities -@using CulinaryCommandApp.Inventory.Services.Interfaces -@using CulinaryCommandApp.Recipe.Services -@using CulinaryCommandApp.Recipe.Services.Interfaces - -@inject IRecipeService RecipeService -@inject IInventoryTransactionService TransactionService - -@if (_visible) -{ - -} - -@code { - - [Parameter] public int RecipeId { get; set; } - [Parameter] public string RecipeTitle { get; set; } = "Recipe"; - - private bool _visible; - private bool _working; - private bool _success; - private bool _submitAttempted; - private string? _errorMessage; - - private decimal _servings = 1; - private List _flatLines = new(); - - // Grouped by IngredientId so the preview table merges duplicate lines - private IEnumerable _groupedLines => - _flatLines - .GroupBy(l => l.IngredientId) - .Select(g => new FlatIngredientLine - { - IngredientId = g.Key, - IngredientName = g.First().IngredientName, - Quantity = g.Sum(l => l.Quantity), - UnitId = g.First().UnitId, - UnitName = g.First().UnitName, - }); - - /// Called by RecipeView to open the dialog. - public async Task OpenAsync() - { - _success = false; - _submitAttempted = false; - _errorMessage = null; - _servings = 1; - _flatLines = new(); - - try - { - // Pre-load the flat ingredient list for the preview panel - _flatLines = await RecipeService.FlattenIngredientsAsync(RecipeId); - } - catch (InvalidOperationException ex) - { - _errorMessage = "Circular reference or recipe not found."; - } - catch (Exception ex) - { - _errorMessage = $"Could not load ingredient list."; - } - - _visible = true; - StateHasChanged(); - } - - private void Close() - { - _visible = false; - _success = false; - _errorMessage = null; - } - - private async Task ProduceAsync() - { - _submitAttempted = true; - _errorMessage = null; - - if (_servings <= 0) - return; - - _working = true; - - try - { - // Flatten at produce-time with the chosen multiplier to get exact scaled quantities. - var lines = await RecipeService.FlattenIngredientsAsync(RecipeId, _servings); - - // Group by ingredient so the same ingredient appearing in multiple - // sub-recipe branches is combined into a single deduction. - var transactions = lines - .GroupBy(l => l.IngredientId) - .Select(g => new InventoryTransaction - { - IngredientId = g.First().IngredientId, - StockChange = -g.Sum(l => l.Quantity), // negative = deduction - UnitId = g.First().UnitId, - Reason = $"Recipe production: {RecipeTitle}", - }) - .ToList(); - - // All deductions committed atomically β€” any failure (e.g. insufficient - // stock) rolls back the entire batch so inventory is never partially deducted. - await TransactionService.RecordBatchAsync(transactions); - - _success = true; - } - catch (InvalidOperationException ex) - { - - _errorMessage = "Insufficient stock, circular reference, or recipe not found."; - } - catch (Exception ex) - { - _errorMessage = $"Production failed."; - } - finally - { - _working = false; - } - } -} diff --git a/CulinaryCommandApp/Recipe/Entities/Recipe.cs b/CulinaryCommandApp/Recipe/Entities/Recipe.cs deleted file mode 100644 index b64b838..0000000 --- a/CulinaryCommandApp/Recipe/Entities/Recipe.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using CulinaryCommand.Data.Entities; - -namespace CulinaryCommandApp.Recipe.Entities -{ - public class Recipe - { - [Key] - public int RecipeId { get; set; } - - public int LocationId { get; set; } - public Location? Location { get; set; } - - [Required, MaxLength(128)] - public string Title { get; set; } = string.Empty; - - [MaxLength(128)] - public string Category { get; set; } = string.Empty; - - [MaxLength(128)] - public string RecipeType { get; set; } = string.Empty; - - [MaxLength(128)] - public string YieldUnit { get; set; } = string.Empty; - - public decimal? YieldAmount { get; set; } - - public decimal? CostPerYield { get; set; } - - public bool IsSubRecipe { get; set; } = false; - - public DateTime? CreatedAt { get; set; } - - // Optimistic concurrency token β€” backed by a MySQL timestamp(6) column - // (ON UPDATE CURRENT_TIMESTAMP(6)), materialised as DateTime by the Pomelo provider. - // ValueGeneratedOnAddOrUpdate + IsConcurrencyToken are set via fluent API in AppDbContext. - public DateTime RowVersion { get; set; } - - // Navigation - public ICollection RecipeIngredients { get; set; } = new List(); - public ICollection Steps { get; set; } = new List(); - public ICollection SubRecipeUsages { get; set; } = new List(); - public ICollection UsedInRecipes { get; set; } = new List(); - } -} \ No newline at end of file diff --git a/CulinaryCommandApp/Recipe/Entities/RecipeIngredient.cs b/CulinaryCommandApp/Recipe/Entities/RecipeIngredient.cs deleted file mode 100644 index 42a2434..0000000 --- a/CulinaryCommandApp/Recipe/Entities/RecipeIngredient.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using CulinaryCommandApp.Inventory.Entities; - -namespace CulinaryCommandApp.Recipe.Entities -{ - public class RecipeIngredient - { - [Key] - public int RecipeIngredientId { get; set; } - - public int RecipeId { get; set; } - public Recipe? Recipe { get; set; } - - public int? IngredientId { get; set; } - public Ingredient? Ingredient { get; set; } - - public int? SubRecipeId { get; set; } - public Recipe? SubRecipe { get; set; } - - public int UnitId { get; set; } - public Unit? Unit { get; set; } - - public int SortOrder { get; set; } - - public decimal Quantity { get; set; } - - [MaxLength(256)] - public string? PrepNote { get; set; } - } -} \ No newline at end of file diff --git a/CulinaryCommandApp/Recipe/Entities/RecipeStep.cs b/CulinaryCommandApp/Recipe/Entities/RecipeStep.cs deleted file mode 100644 index be83d79..0000000 --- a/CulinaryCommandApp/Recipe/Entities/RecipeStep.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace CulinaryCommandApp.Recipe.Entities -{ - public class RecipeStep - { - [Key] - public int StepId { get; set; } - - public int RecipeId { get; set; } - - public int StepNumber { get; set; } - - [MaxLength(2048)] - public string Instructions { get; set; } = string.Empty; - - // optional: estimated duration (ex: "5 minutes", "8-10 minutes") - [MaxLength(64)] - public string? Duration { get; set; } - - // optional: target temperature (ex: "375-400Β°F", "Internal: 145Β°F") - [MaxLength(64)] - public string? Temperature { get; set; } - - // optional: equipment or tools needed (ex: "Gas or charcoal grill", "Spatula") - [MaxLength(256)] - public string? Equipment { get; set; } - - // Navigation - public Recipe? Recipe { get; set; } - } -} \ No newline at end of file diff --git a/CulinaryCommandApp/Recipe/Entities/RecipeSubRecipe.cs b/CulinaryCommandApp/Recipe/Entities/RecipeSubRecipe.cs deleted file mode 100644 index 5700506..0000000 --- a/CulinaryCommandApp/Recipe/Entities/RecipeSubRecipe.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace CulinaryCommandApp.Recipe.Entities -{ - public class RecipeSubRecipe - { - // composite PK configured via Fluent API in AppDbContext - public int ParentRecipeId { get; set; } - public Recipe? ParentRecipe { get; set; } - - public int ChildRecipeId { get; set; } - public Recipe? ChildRecipe { get; set; } - } -} \ No newline at end of file diff --git a/CulinaryCommandApp/Recipe/Pages/IngredientLineRow.razor b/CulinaryCommandApp/Recipe/Pages/IngredientLineRow.razor deleted file mode 100644 index b88a254..0000000 --- a/CulinaryCommandApp/Recipe/Pages/IngredientLineRow.razor +++ /dev/null @@ -1,117 +0,0 @@ -@using CulinaryCommandApp.Recipe.Entities -@using CulinaryCommandApp.Inventory.Entities - - -
- -
- - -
- - @if (!IsSubRecipeMode) { - - } - else { - - } - - - - -
- - -@code { - [Parameter, EditorRequired] public RecipeIngredient Line { get; set; } = default!; - [Parameter, EditorRequired] public int LocationId { get; set; } - [Parameter, EditorRequired] public List SubRecipes { get; set; } = new(); - [Parameter] public EventCallback OnRemove { get; set; } - - // true when this line refers to a sub-recipe (has SubRecipeId) - private bool IsSubRecipeMode => Line.SubRecipeId.HasValue; - private List availableIngredients = new(); - private List ingredientCategories = new(); - private List availableSubRecipes = new(); - private List availableUnits = new (); - - - private IEnumerable IngredientsByCategory(string category) => availableIngredients - .Where(i => i.Category == category) - .OrderBy(i => i.Name); - - // Switch mode - when enabling sub-recipe mode clear IngredientId, and vice-versa - // to keep the line in a consistent state with only one reference active. - private void SetMode(bool subRecipeMode) { - if (subRecipeMode) { - // Clear ingredient reference when using a sub-recipe - Line.IngredientId = null; - } - else { - // Clear sub-recipe reference when using an ingredient - Line.SubRecipeId = null; - } - } - - // update Line.IngredientId from select change - private void OnIngredientChanged(ChangeEventArgs ingredientChangeEvent) { - // try parse selected value as int - if (int.TryParse(ingredientChangeEvent.Value?.ToString(), out int id)) - Line.IngredientId = id; // assign parsed id when valid - else - Line.IngredientId = null; // clear id when parse fails - } - - - private void OnSubRecipeChanged(ChangeEventArgs subRecipeChangeEvent) { - - if (int.TryParse(subRecipeChangeEvent.Value?.ToString(), out int id)) - Line.SubRecipeId = id; - else - Line.SubRecipe = null; - } - - - private void OnUnitChanged(ChangeEventArgs unitChangeEvent) { - if (int.TryParse(unitChangeEvent.Value?.ToString(), out int id)) - Line.UnitId = id; - } -} \ No newline at end of file diff --git a/CulinaryCommandApp/Recipe/Pages/RecipeCreate.razor b/CulinaryCommandApp/Recipe/Pages/RecipeCreate.razor deleted file mode 100644 index 2a21a29..0000000 --- a/CulinaryCommandApp/Recipe/Pages/RecipeCreate.razor +++ /dev/null @@ -1,83 +0,0 @@ -@page "/recipes/create" -@rendermode InteractiveServer - -@using CulinaryCommand.Services.UserContextSpace -@using CulinaryCommandApp.Recipe.Entities - -@inject IUserContextService UserCtx -@inject LocationState LocationState -@inject NavigationManager Nav - -New Recipe - -@if (!_ready) -{ -
- -
-} -else if (!_allowed) -{ -
-
- You need manager or admin permissions to create recipes. -
-
-} -else -{ -
- - - -
-} - -@code { - - private Recipe _model = new(); - private bool _ready; - private bool _allowed; - - protected override async Task OnInitializedAsync() - { - var ctx = await UserCtx.GetAsync(); - - if (ctx.IsAuthenticated != true) - { - Nav.NavigateTo("/login", true); - return; - } - - if (ctx.User is null) - { - Nav.NavigateTo("/no-access", true); - return; - } - - _allowed = string.Equals(ctx.User.Role, "Admin", StringComparison.OrdinalIgnoreCase) - || string.Equals(ctx.User.Role, "Manager", StringComparison.OrdinalIgnoreCase); - - - if (LocationState.ManagedLocations.Count == 0 && ctx.AccessibleLocations.Any()) - await LocationState.SetLocationsAsync(ctx.AccessibleLocations); - - _ready = true; - } - - private void HandleSubmit() - { - Nav.NavigateTo("/recipes"); - } -} diff --git a/CulinaryCommandApp/Recipe/Pages/RecipeEdit.razor b/CulinaryCommandApp/Recipe/Pages/RecipeEdit.razor deleted file mode 100644 index afc67be..0000000 --- a/CulinaryCommandApp/Recipe/Pages/RecipeEdit.razor +++ /dev/null @@ -1,103 +0,0 @@ -@page "/recipes/edit/{id:int}" -@rendermode InteractiveServer - -@using CulinaryCommand.Services.UserContextSpace -@using CulinaryCommandApp.Recipe.Entities - -@inject IRecipeService RecipeService -@inject IUserContextService UserCtx -@inject LocationState LocationState -@inject NavigationManager Nav - -Edit Recipe - -@if (!_ready) -{ -
- -
-} -else if (!_allowed) -{ -
-
- You need manager or admin permissions to edit recipes. -
-
-} -else if (_notFound) -{ -
-
- Recipe not found. It may have been deleted. - Back to Recipes -
-
-} -else -{ -
- - - -
-} - -@code { - - [Parameter] public int Id { get; set; } - - private Recipe? _model; - private bool _ready; - private bool _allowed; - private bool _notFound; - - protected override async Task OnInitializedAsync() - { - var ctx = await UserCtx.GetAsync(); - - if (ctx.IsAuthenticated != true) - { - Nav.NavigateTo("/login", true); - return; - } - - if (ctx.User is null) - { - Nav.NavigateTo("/no-access", true); - return; - } - - _allowed = string.Equals(ctx.User.Role, "Admin", StringComparison.OrdinalIgnoreCase) - || string.Equals(ctx.User.Role, "Manager", StringComparison.OrdinalIgnoreCase); - - - if (LocationState.ManagedLocations.Count == 0 && ctx.AccessibleLocations.Any()) - await LocationState.SetLocationsAsync(ctx.AccessibleLocations); - - if (_allowed) - { - var allowedLocationIds = ctx.AccessibleLocations.Select(l => l.Id); - _model = await RecipeService.GetByIdAsync(Id, allowedLocationIds); - _notFound = _model is null; - } - - _ready = true; - } - - private void HandleSubmit() - { - Nav.NavigateTo("/recipes"); - } -} diff --git a/CulinaryCommandApp/Recipe/Pages/RecipeForm.razor b/CulinaryCommandApp/Recipe/Pages/RecipeForm.razor deleted file mode 100644 index b0d6d96..0000000 --- a/CulinaryCommandApp/Recipe/Pages/RecipeForm.razor +++ /dev/null @@ -1,820 +0,0 @@ -@rendermode InteractiveServer -@implements IDisposable - -@using CulinaryCommand.Services -@using CulinaryCommand.Services.UserContextSpace -@using CulinaryCommandApp.Inventory.Entities -@using CulinaryCommandApp.Inventory.Services -@using CulinaryCommandApp.Inventory.Services.Interfaces -@using Microsoft.EntityFrameworkCore -@using System.Threading -@inject IIngredientService IngredientService -@inject IUnitService UnitService -@inject IRecipeService RecipeService -@inject EnumService EnumService -@inject IUserContextService UserCtx -@inject LocationState LocationState -@inject NavigationManager Nav - -@*--------------------------------------------------------------- -CONCURRENCY CONFLICT BANNER --> Pops up when a DbUpdateConcurrencyException is caught on save. ----------------------------------------------------------------*@ -@if (_conflictDetected) { - -} - -@*------------------ -GENERIC ERROR BANNER -------------------*@ - -@if (!string.IsNullOrWhiteSpace(_errorMessage)) { - -} - -@*----------- -LOADING STATE ------------*@ - -@if (!_ready) { -
- -
-} -else { -
-
-

@FormTitle

- @if (Model.RecipeId > 0) - { - ID: @Model.RecipeId - } -
- -
- @* ---- Section 1: Basic metadata ---- *@ -
Recipe Details
- -
-
- - - @if (string.IsNullOrWhiteSpace(Model.Title) && _submitAttempted) - { -
Title is required.
- } -
- -
- - -
-
- -
-
- - -
- -
- - -
- -
- - -
-
- - @* Toggle sub-recipe*@ -
- - -
- When enabled, this recipe will appear in the sub-recipe picker of other recipes. -
-
- -
- - @* ---- Section 2: Ingredient Lines ----*@ -
-
Ingredients
- -
- - @if (!_ingredientLines.Any()) - { -

No ingredients added yet.

- } - - @foreach (var line in _ingredientLines.OrderBy(l => l.SortOrder)) - { -
-
- - @* Mode toggle *@ -
- - -
- -
- - @if (!line.IsSubRecipeMode) - { - @* Category to Ingredient cascade *@ -
- - -
- -
- - -
- } - else - { -
- - -
- } - -
- - -
- -
- - -
- -
- - -
- -
- -
-
-
-
- } - -
- - @* ---- Section 3: Steps ---- *@ - -
-
Preparation Steps
- -
- - @if (!Model.Steps.Any()) - { -

No steps added yet.

- } - - @foreach (var step in Model.Steps.OrderBy(s => s.StepNumber)) - { -
-
-
- -
- - @step.StepNumber - - -
- -
- -
- -
-
- - -
-
- - -
-
- - -
-
- -
-
-
- } - -
- - @* ---- Section 4: Actions ---- *@ -
- - - -
- -
-
-} - -@code { - - [Parameter] public Recipe Model { get; set; } = new(); - [Parameter] public EventCallback OnValidSubmit { get; set; } - [Parameter] public string FormTitle { get; set; } = "Recipe"; - - // UI State - private bool _ready; - private bool _conflictDetected; - private bool _saving; - private bool _submitAttempted; - private string? _errorMessage; - private bool _dataLoaded; - private bool _dataLoading; - private readonly SemaphoreSlim _loadSemaphore = new(1, 1); - - // Reference data - private List _recipeTypes = new(); - private List _recipeCategories = new(); - private List _ingredientCategories = new(); - private List _locationUnits = new(); - private List _locationIngredients = new(); - private List _availableSubRecipes = new(); - - private List _ingredientLines = new(); - - protected override async Task OnInitializedAsync() { - _recipeCategories = EnumService.GetCategories(); - _recipeTypes = EnumService.GetRecipeTypes(); - - LocationState.OnChange += HandleLocationChanged; - - if (LocationState.CurrentLocation is not null) - { - await LoadLocationDataAsync(); - } - - _ready = true; - } - - - private void HandleLocationChanged() - { - // Schedule the async work without blocking the caller. Use a semaphore - // to ensure only one LoadLocationDataAsync runs at a time instead of - // polling _dataLoading. - _ = InvokeAsync(async () => - { - await _loadSemaphore.WaitAsync(); - try - { - _dataLoaded = false; - await LoadLocationDataAsync(); - StateHasChanged(); - } - finally - { - _loadSemaphore.Release(); - } - }); - } - - public void Dispose() - { - LocationState.OnChange -= HandleLocationChanged; - _loadSemaphore.Dispose(); - } - - private async Task LoadLocationDataAsync() { - if (_dataLoading) return; // prevent concurrent DB calls on same DbContext - _dataLoading = true; - - try { - var location = LocationState.CurrentLocation; - - if (location is not null) { - Model.LocationId = location.Id; - - _locationUnits = await UnitService.GetByLocationAsync(location.Id); - - // Fall back to all units if none have been assigned to this location yet - if (!_locationUnits.Any()) - _locationUnits = await UnitService.GetAllAsync(); - - _locationIngredients = await IngredientService.GetIngredientsByLocationAsync(location.Id); - - // Fall back to all ingredients if none have been added to this location yet - if (!_locationIngredients.Any()) - _locationIngredients = await IngredientService.GetAllAsync(); - - var allLocationRecipes = await RecipeService.GetAllByLocationIdAsync(location.Id); - _availableSubRecipes = allLocationRecipes - .Where(r => r.IsSubRecipe && r.RecipeId != Model.RecipeId) - .ToList(); - } - - _ingredientCategories = _locationIngredients - .Select(i => i.Category) - .Distinct() - .OrderBy(c => c) - .ToList(); - - RebuildLineViewModels(); - _dataLoaded = true; - } - finally { - _dataLoading = false; - } - } - - // *** Ingredient line helpers *** - - private void RebuildLineViewModels() { - _ingredientLines = Model.RecipeIngredients - .Select(ri => { - var vm = new IngredientLineViewModel(ri); - if (ri.IngredientId.HasValue) { - var ingredient = _locationIngredients.FirstOrDefault(i => i.Id == ri.IngredientId); - if (ingredient is not null) { - vm.SelectedCategory = ingredient.Category; - vm.FilteredIngredients = _locationIngredients - .Where(i => i.Category == ingredient.Category) - .OrderBy(i => i.Name) - .ToList(); - } - } - return vm; - }) - .ToList(); - } - - private void AddIngredientLine() { - var ri = new RecipeIngredient { SortOrder = _ingredientLines.Count + 1 }; - Model.RecipeIngredients.Add(ri); - _ingredientLines.Add(new IngredientLineViewModel(ri)); - } - - private void RemoveIngredientLine(IngredientLineViewModel vm) { - Model.RecipeIngredients.Remove(vm.Source); - _ingredientLines.Remove(vm); - for (int i = 0; i < _ingredientLines.Count; i++) - _ingredientLines[i].SortOrder = i + 1; - } - - private void SetLineMode(IngredientLineViewModel vm, bool subRecipeMode) { - vm.IsSubRecipeMode = subRecipeMode; - if (subRecipeMode) { - vm.Source.IngredientId = null; - vm.SelectedCategory = null; - vm.FilteredIngredients = new(); - } - else { - vm.Source.SubRecipeId = null; - } - } - - private void OnLineCategoryChanged(IngredientLineViewModel vm, string? category) { - vm.SelectedCategory = category; - vm.Source.IngredientId = null; - vm.FilteredIngredients = string.IsNullOrWhiteSpace(category) - ? new() - : _locationIngredients.Where(i => i.Category == category).OrderBy(i => i.Name).ToList(); - } - - private void OnLineIngredientChanged(IngredientLineViewModel vm, string? raw) { - if (int.TryParse(raw, out var id)) { - vm.Source.IngredientId = id; - // Auto-select the ingredient's default unit if no unit is chosen yet - if (vm.Source.UnitId == 0) { - var ingredient = _locationIngredients.FirstOrDefault(i => i.Id == id); - if (ingredient is not null) - vm.Source.UnitId = ingredient.UnitId; - } - } else { - vm.Source.IngredientId = null; - } - } - - private void OnLineSubRecipeChanged(IngredientLineViewModel vm, string? raw) => - vm.Source.SubRecipeId = int.TryParse(raw, out var id) ? id : null; - - private void OnLineUnitChanged(IngredientLineViewModel vm, string? raw) { - if (int.TryParse(raw, out var id)) vm.Source.UnitId = id; - } - - // *** Step logic *** - - private void AddStep() { - Model.Steps.Add(new RecipeStep { StepNumber = Model.Steps.Count + 1 }); - } - - private void RemoveStep(RecipeStep step) { - Model.Steps.Remove(step); - int i = 1; - foreach (var s in Model.Steps.OrderBy(x => x.StepNumber)) - s.StepNumber = i++; - } - - // *** Save logic *** - - private async Task Save() { - _submitAttempted = true; - _errorMessage = null; - _conflictDetected = false; - - if (string.IsNullOrWhiteSpace(Model.Title)) - return; - - // Validate all lines: UnitId is non-nullable in the schema and required - // for inventory transactions, so every line (ingredient or sub-recipe) must - // have a unit selected before saving. Also ensure each line has exactly one - // of IngredientId / SubRecipeId set so no orphaned lines reach the database. - var missingUnit = _ingredientLines - .Where(l => l.Source.UnitId == 0) - .ToList(); - if (missingUnit.Any()) - { - _errorMessage = $"{missingUnit.Count} line(s) are missing a unit. Please select a unit for every ingredient and sub-recipe line."; - _saving = false; - return; - } - - var missingReference = _ingredientLines - .Where(l => l.Source.IngredientId is null && l.Source.SubRecipeId is null) - .ToList(); - if (missingReference.Any()) - { - _errorMessage = $"{missingReference.Count} line(s) have no ingredient or sub-recipe selected. Please complete or remove them before saving."; - _saving = false; - return; - } - - _saving = true; - - try { - if (Model.RecipeId == 0) { - Model.CreatedAt = DateTime.UtcNow; - await RecipeService.CreateAsync(Model); - } - else { - await RecipeService.UpdateAsync(Model); - } - - await OnValidSubmit.InvokeAsync(); - } - catch (DbUpdateConcurrencyException) { - _conflictDetected = true; - } - catch (Exception ex) { - _errorMessage = $"An unexpected error occurred: {ex.Message}"; - } - finally { - _saving = false; - } - } - - // *** Conflict resolution *** - - private async Task ReloadLatest() - { - if (Model.RecipeId == 0) return; - - _saving = true; - - try - { - var latest = await RecipeService.GetByIdAsync(Model.RecipeId); - - if (latest is null) - { - _errorMessage = "Recipe no longer exists."; - return; - } - - // Update scalar properties on the existing Model instance so bindings remain intact. - Model.Title = latest.Title; - Model.Category = latest.Category; - Model.RecipeType = latest.RecipeType; - Model.YieldAmount = latest.YieldAmount; - Model.YieldUnit = latest.YieldUnit; - Model.IsSubRecipe = latest.IsSubRecipe; - Model.CreatedAt = latest.CreatedAt; - Model.LocationId = latest.LocationId; - Model.RowVersion = latest.RowVersion; - - // Replace ingredient and step collections with the latest server copies - Model.RecipeIngredients.Clear(); - foreach (var ri in (latest.RecipeIngredients ?? Enumerable.Empty()).OrderBy(r => r.SortOrder)) - Model.RecipeIngredients.Add(ri); - - Model.Steps.Clear(); - foreach (var s in (latest.Steps ?? Enumerable.Empty()).OrderBy(s => s.StepNumber)) - Model.Steps.Add(s); - - // Rebuild derived view models and refresh UI - RebuildLineViewModels(); - _conflictDetected = false; - StateHasChanged(); - } - catch (Exception) - { - _errorMessage = $"Could not reload."; - // add logging later - } - finally - { - _saving = false; - } - } - - private async Task ForceOverwrite() - { - if (Model.RecipeId == 0) return; - - _saving = true; - _errorMessage = null; - - try - { - // Snapshot every user edit that is currently in Model so we can - // restore them after fetching the latest concurrency token. - var titleSnapshot = Model.Title; - var categorySnapshot = Model.Category; - var recipeTypeSnapshot = Model.RecipeType; - var yieldAmountSnapshot = Model.YieldAmount; - var yieldUnitSnapshot = Model.YieldUnit; - var isSubRecipeSnapshot = Model.IsSubRecipe; - var locationIdSnapshot = Model.LocationId; - var createdAtSnapshot = Model.CreatedAt; - var ingredientsSnapshot = Model.RecipeIngredients.ToList(); - var stepsSnapshot = Model.Steps.ToList(); - - // Fetch only the token β€” do NOT overwrite the user's edits. - var freshToken = await RecipeService.GetRowVersionAsync(Model.RecipeId); - - if (freshToken is null) - { - _errorMessage = "Recipe no longer exists and cannot be saved."; - return; - } - - // Stamp the new token so EF Core's concurrency check will pass. - Model.RowVersion = freshToken.Value; - - // Restore the user's in-flight edits (unchanged by the fetch above). - Model.Title = titleSnapshot; - Model.Category = categorySnapshot; - Model.RecipeType = recipeTypeSnapshot; - Model.YieldAmount = yieldAmountSnapshot; - Model.YieldUnit = yieldUnitSnapshot; - Model.IsSubRecipe = isSubRecipeSnapshot; - Model.LocationId = locationIdSnapshot; - Model.CreatedAt = createdAtSnapshot; - - Model.RecipeIngredients.Clear(); - foreach (var ri in ingredientsSnapshot) - Model.RecipeIngredients.Add(ri); - - Model.Steps.Clear(); - foreach (var s in stepsSnapshot) - Model.Steps.Add(s); - - _conflictDetected = false; - } - catch (Exception) - { - _errorMessage = $"Could not prepare overwrite."; - return; - } - finally - { - _saving = false; - } - - await Save(); - } - - private void DismissConflict() => _conflictDetected = false; - - private void Cancel() => Nav.NavigateTo("/recipes"); - - // *** View model for ingredient lines *** - - private sealed class IngredientLineViewModel { - public RecipeIngredient Source { get; } - - public IngredientLineViewModel(RecipeIngredient source) - { - Source = source; - _isSubRecipeMode = source.SubRecipeId.HasValue; - } - - private bool _isSubRecipeMode; - public bool IsSubRecipeMode - { - get => _isSubRecipeMode; - set => _isSubRecipeMode = value; - } - - public string? SelectedCategory { get; set; } - public List FilteredIngredients { get; set; } = new(); - - public int? IngredientId { - get => Source.IngredientId; - set => Source.IngredientId = value; - } - - public int? SubRecipeId { - get => Source.SubRecipeId; - set => Source.SubRecipeId = value; - } - - public int UnitId { - get => Source.UnitId; - set => Source.UnitId = value; - } - - public decimal Quantity { - get => Source.Quantity; - set => Source.Quantity = value; - } - - public string? PrepNote { - get => Source.PrepNote; - set => Source.PrepNote = value; - } - - public int SortOrder { - get => Source.SortOrder; - set => Source.SortOrder = value; - } - } -} diff --git a/CulinaryCommandApp/Recipe/Pages/RecipeList.razor b/CulinaryCommandApp/Recipe/Pages/RecipeList.razor deleted file mode 100644 index 0ca866d..0000000 --- a/CulinaryCommandApp/Recipe/Pages/RecipeList.razor +++ /dev/null @@ -1,486 +0,0 @@ -@page "/recipes" -@rendermode InteractiveServer -@implements IDisposable - -@using CulinaryCommand.Services.UserContextSpace -@using CulinaryCommandApp.Recipe.Entities - -@inject IRecipeService RecipeService -@inject EnumService EnumService -@inject IUserContextService UserCtx -@inject LocationState LocationState -@inject NavigationManager Nav - -Recipes - -@if (!_ready) -{ -
- -
-} -else -{ -
- - @* ── Header ── *@ -
-
-

Recipes

-

Manage your location's recipes and prep items

-
-
- - @* ── Toolbar: search + type filter + Add button ── *@ -
-
- - -
- -
-
- -
- - @if (_priv) - { - - } -
-
- - @* ── Tabs: All / Sub-Recipes ── *@ -
- - -
- - @* ── Table ── *@ -
- - @if (LocationState.CurrentLocation is null) - { -
- -

No location selected. Use the location selector in the header.

-
- } - else if (!_pagedRecipes.Any() && !_loading) - { -
- -

No recipes found.

- @if (_priv) - { - - } -
- } - else - { - - - - - - - - - - - - - @if (_loading) - { - - - - } - else - { - @foreach (var recipe in _pagedRecipes) - { - - - - - - - - - } - } - -
- Title - - Category - - Type - - Cost / Yield - Sub-Recipe
- -
- @recipe.Title - - @if (!string.IsNullOrWhiteSpace(recipe.Category)) - { - @recipe.Category - } - else - { - β€” - } - @(recipe.RecipeType ?? "β€”") - @if (recipe.CostPerYield.HasValue) - { - - @recipe.CostPerYield.Value.ToString("C2") - @if (!string.IsNullOrWhiteSpace(recipe.YieldUnit)) - { - / @recipe.YieldUnit - } - - } - else - { - β€” - } - - @if (recipe.IsSubRecipe) - { - - Yes - - } - -
- - @if (_priv) - { - - - } -
-
- - @* ── Footer / Pagination ── *@ -
- - Showing @(_pagedRecipes.Count) of @_filteredRecipes.Count recipe@(_filteredRecipes.Count == 1 ? "" : "s") - - - @if (_totalPages > 1) - { - - } -
- } -
- -
-} - -@* ── Delete confirmation modal ── *@ -@if (_deleteTarget is not null) -{ - -} - -@code { - - // ── Auth / location ─────────────────────────────────────────────────── - private UserContext? _ctx; - private bool _priv; - - // ── Data ───────────────────────────────────────────────────────────── - private List _allRecipes = new(); - private List _recipeTypes = new(); - - // ── UI state ───────────────────────────────────────────────────────── - private bool _ready; - private bool _loading; - private string _activeTab = "all"; - private string _searchTerm = string.Empty; - private string _typeFilter = string.Empty; - - // ── Sort ───────────────────────────────────────────────────────────── - private string _sortColumn = "Title"; - private bool _sortAsc = true; - - // ── Pagination ─────────────────────────────────────────────────────── - private const int PageSize = 15; - private int _currentPage = 1; - private int _totalPages = 1; - - // ── Delete ─────────────────────────────────────────────────────────── - private Recipe? _deleteTarget; - private bool _deleting; - - // ── Computed ───────────────────────────────────────────────────────── - - private List _filteredRecipes - { - get - { - var q = _allRecipes.AsEnumerable(); - - if (_activeTab == "sub") - q = q.Where(r => r.IsSubRecipe); - - if (!string.IsNullOrWhiteSpace(_searchTerm)) - q = q.Where(r => r.Title.Contains(_searchTerm, StringComparison.OrdinalIgnoreCase)); - - if (!string.IsNullOrWhiteSpace(_typeFilter)) - q = q.Where(r => r.RecipeType == _typeFilter); - - q = _sortColumn switch - { - "Category" => _sortAsc ? q.OrderBy(r => r.Category) : q.OrderByDescending(r => r.Category), - "RecipeType" => _sortAsc ? q.OrderBy(r => r.RecipeType) : q.OrderByDescending(r => r.RecipeType), - "CostPerYield" => _sortAsc ? q.OrderBy(r => r.CostPerYield) : q.OrderByDescending(r => r.CostPerYield), - _ => _sortAsc ? q.OrderBy(r => r.Title) : q.OrderByDescending(r => r.Title), - }; - - return q.ToList(); - } - } - - private List _pagedRecipes => - _filteredRecipes - .Skip((_currentPage - 1) * PageSize) - .Take(PageSize) - .ToList(); - - // ── Lifecycle ──────────────────────────────────────────────────────── - - protected override async Task OnInitializedAsync() - { - _ctx = await UserCtx.GetAsync(); - - if (_ctx.IsAuthenticated != true) - { - Nav.NavigateTo("/login", true); - return; - } - - if (_ctx.User is null) - { - Nav.NavigateTo("/no-access", true); - return; - } - - if (LocationState.ManagedLocations.Count == 0 && _ctx.AccessibleLocations.Any()) - await LocationState.SetLocationsAsync(_ctx.AccessibleLocations); - - _priv = string.Equals(_ctx.User.Role, "Admin", StringComparison.OrdinalIgnoreCase) - || string.Equals(_ctx.User.Role, "Manager", StringComparison.OrdinalIgnoreCase); - - _recipeTypes = EnumService.GetRecipeTypes(); - - LocationState.OnChange += HandleLocationChange; - - await LoadRecipesAsync(); - - _ready = true; - } - - private async Task LoadRecipesAsync() - { - _loading = true; - StateHasChanged(); - - var loc = LocationState.CurrentLocation; - _allRecipes = loc is not null - ? await RecipeService.GetAllByLocationIdAsync(loc.Id) - : new List(); - - RecalcPagination(); - _loading = false; - } - - private void RecalcPagination() - { - var count = _filteredRecipes.Count; - _totalPages = Math.Max(1, (int)Math.Ceiling(count / (double)PageSize)); - if (_currentPage > _totalPages) _currentPage = _totalPages; - } - - // ── Handlers ───────────────────────────────────────────────────────── - - private void SetTab(string tab) - { - _activeTab = tab; - _currentPage = 1; - } - - private void SetSort(string column) - { - if (_sortColumn == column) - _sortAsc = !_sortAsc; - else - { - _sortColumn = column; - _sortAsc = true; - } - _currentPage = 1; - } - - private string SortIcon(string column) - { - if (_sortColumn != column) return "bi-chevron-expand opacity-50"; - return _sortAsc ? "bi-chevron-up" : "bi-chevron-down"; - } - - private void GoToPage(int page) - { - if (page < 1 || page > _totalPages) return; - _currentPage = page; - } - - private List GetPageButtons() - { - // Renders up to 7 buttons with ellipsis when needed: 1 … 4 5 6 … 12 - var pages = new List(); - if (_totalPages <= 7) - { - for (int i = 1; i <= _totalPages; i++) pages.Add(i); - return pages; - } - - pages.Add(1); - if (_currentPage > 3) pages.Add(-1); // ellipsis - - int start = Math.Max(2, _currentPage - 1); - int end = Math.Min(_totalPages - 1, _currentPage + 1); - for (int i = start; i <= end; i++) pages.Add(i); - - if (_currentPage < _totalPages - 2) pages.Add(-1); // ellipsis - pages.Add(_totalPages); - return pages; - } - - private void ConfirmDelete(Recipe recipe) - { - _deleteTarget = recipe; - } - - private void CancelDelete() - { - _deleteTarget = null; - } - - private async Task ExecuteDelete() - { - if (_deleteTarget is null) return; - - _deleting = true; - await RecipeService.DeleteAsync(_deleteTarget.RecipeId); - _deleteTarget = null; - _deleting = false; - - await LoadRecipesAsync(); - StateHasChanged(); - } - - private void HandleLocationChange() - { - _ = InvokeAsync(async () => - { - _currentPage = 1; - await LoadRecipesAsync(); - StateHasChanged(); - }); - } - - public void Dispose() - { - LocationState.OnChange -= HandleLocationChange; - } -} diff --git a/CulinaryCommandApp/Recipe/Pages/RecipeList.razor.css b/CulinaryCommandApp/Recipe/Pages/RecipeList.razor.css deleted file mode 100644 index a9d2787..0000000 --- a/CulinaryCommandApp/Recipe/Pages/RecipeList.razor.css +++ /dev/null @@ -1,391 +0,0 @@ -:root { - --ink: #1f2a37; - --muted: #6b7280; - --border: #e5e7eb; - --bg: #f6f7f9; - --card: #ffffff; - --green: #0a8f3c; - --green-dark: #087136; - --pill: #f0f2f5; - --shadow: 0 10px 30px rgba(31, 42, 55, 0.08); -} - -/* ── Layout ──────────────────────────────────────────────────────────────── */ - -.recipes-container { - max-width: 1280px; - margin: 0 auto; - padding: 24px 24px 40px; - background: var(--bg); - min-height: 100vh; - font-family: "Source Sans 3", "Segoe UI", sans-serif; - color: var(--ink); -} - -.recipes-container button, -.recipes-container .btn { - font-family: "Source Sans 3", "Segoe UI", sans-serif; - letter-spacing: 0.01em; - transition: all 0.2s ease; -} - -/* ── Header ──────────────────────────────────────────────────────────────── */ - -.recipes-header { - background: var(--card); - border-radius: 16px; - padding: 22px 26px; - box-shadow: var(--shadow); - border: 1px solid var(--border); - margin-bottom: 18px; -} - -.header-text h1 { - font-family: "Space Grotesk", "Source Sans 3", sans-serif; - font-size: 1.6rem; - margin: 0 0 4px; -} - -.header-text p { - margin: 0; - color: var(--muted); - font-size: 0.95rem; -} - -/* ── Toolbar ─────────────────────────────────────────────────────────────── */ - -.recipes-toolbar { - display: flex; - gap: 16px; - align-items: center; - justify-content: space-between; - flex-wrap: wrap; - background: var(--card); - border-radius: 16px; - padding: 16px 18px; - border: 1px solid var(--border); - box-shadow: var(--shadow); - margin-bottom: 14px; -} - -.search-bar { - display: flex; - align-items: center; - gap: 10px; - flex: 2 1 400px; - background: #f9fafb; - border: 1px solid var(--border); - border-radius: 12px; - padding: 10px 14px; - min-width: 280px; -} - -.search-bar i { - color: var(--muted); -} - -.search-bar input { - border: none; - outline: none; - background: transparent; - width: 100%; - font-size: 0.95rem; -} - -.toolbar-actions { - display: flex; - align-items: center; - gap: 10px; - flex-wrap: wrap; -} - -.icon-btn { - width: 36px; - height: 36px; - border-radius: 10px; - border: 1px solid var(--green); - background: var(--green); - display: inline-flex; - align-items: center; - justify-content: center; - color: var(--ink); - transition: all 0.2s ease; - font-weight: 600; -} - -.icon-btn:hover { - background: var(--green-dark); - border-color: var(--green-dark); - box-shadow: 0 6px 12px rgba(10, 143, 60, 0.25); -} - -.select-wrap .form-select { - border-radius: 10px; - border: 1px solid var(--border); - padding: 8px 30px 8px 12px; - font-size: 0.9rem; - background-color: #ffffff; -} - -.btn-add { - background: var(--green); - color: var(--ink); - border: none; - padding: 9px 14px; - border-radius: 10px; - font-weight: 600; - display: inline-flex; - align-items: center; - gap: 8px; - transition: background 0.2s ease; - box-shadow: 0 8px 16px rgba(10, 143, 60, 0.18); -} - -.btn-add:hover { - background: var(--green-dark); - transform: translateY(-1px); -} - -/* ── Tabs ────────────────────────────────────────────────────────────────── */ - -.tab-row { - display: flex; - gap: 10px; - margin-bottom: 12px; - flex-wrap: wrap; -} - -.tab-btn { - border: 1px solid var(--green); - background: #ffffff; - padding: 8px 14px; - border-radius: 999px; - font-weight: 600; - font-size: 0.9rem; - color: var(--ink); - transition: all 0.2s ease; -} - -.tab-btn:hover { - background: var(--green); - color: #ffffff; - border-color: var(--green); - box-shadow: 0 4px 12px rgba(10, 143, 60, 0.2); -} - -.tab-btn.active { - background: var(--green); - color: var(--ink); - border-color: var(--green); - box-shadow: 0 4px 12px rgba(10, 143, 60, 0.25); -} - -/* ── Table ───────────────────────────────────────────────────────────────── */ - -.recipes-table-container { - background: var(--card); - border-radius: 16px; - border: 1px solid var(--border); - box-shadow: var(--shadow); - overflow: hidden; -} - -.recipes-table { - width: 100%; - border-collapse: collapse; - font-size: 0.92rem; -} - -.recipes-table thead { - background: var(--green); - color: var(--ink); -} - -.recipes-table thead th { - padding: 14px 12px; - text-align: left; - font-weight: 600; - font-size: 0.82rem; - letter-spacing: 0.02em; - text-transform: uppercase; - cursor: pointer; - white-space: nowrap; -} - -.recipes-table thead th i { - margin-left: 6px; - opacity: 0.8; -} - -.recipes-table tbody tr { - border-bottom: 1px solid var(--border); - background: #ffffff; -} - -.recipes-table tbody tr:hover { - background: #f9fafb; -} - -.recipes-table tbody td { - padding: 14px 12px; - vertical-align: middle; -} - -.actions-col { - width: 110px; -} - -/* ── Cells ───────────────────────────────────────────────────────────────── */ - -.name-cell .item-name { - font-weight: 600; - color: var(--ink); -} - -.category-pill { - display: inline-flex; - align-items: center; - padding: 5px 11px; - border-radius: 999px; - font-size: 0.75rem; - font-weight: 700; - background: var(--pill); - color: var(--ink); -} - -.cost-badge { - display: inline-flex; - align-items: center; - padding: 4px 10px; - border-radius: 8px; - font-size: 0.82rem; - font-weight: 700; - background: #dcfce7; - color: #166534; -} - -.sub-badge { - display: inline-flex; - align-items: center; - gap: 5px; - padding: 4px 10px; - border-radius: 8px; - font-size: 0.78rem; - font-weight: 600; - background: #eff6ff; - color: #1d4ed8; -} - -/* ── Action Buttons ──────────────────────────────────────────────────────── */ - -.action-buttons { - display: flex; - gap: 6px; -} - -.btn-action { - width: 30px; - height: 30px; - border-radius: 8px; - border: 1px solid var(--border); - background: #ffffff; - display: inline-flex; - align-items: center; - justify-content: center; - color: var(--muted); - font-size: 0.85rem; - transition: all 0.15s ease; -} - -.btn-action:hover { - background: #f3f4f6; - color: var(--ink); - border-color: #d1d5db; -} - -.btn-action.delete:hover { - background: #fef2f2; - color: #dc2626; - border-color: #fca5a5; -} - -/* ── Empty State ─────────────────────────────────────────────────────────── */ - -.empty-state { - text-align: center; - padding: 56px 24px; -} - -.empty-icon { - font-size: 2.5rem; - color: var(--muted); - display: block; - margin-bottom: 12px; -} - -.empty-state p { - color: var(--muted); - margin-bottom: 16px; -} - -/* ── Footer / Pagination ─────────────────────────────────────────────────── */ - -.table-footer { - display: flex; - align-items: center; - justify-content: space-between; - padding: 14px 18px; - border-top: 1px solid var(--border); - flex-wrap: wrap; - gap: 10px; -} - -.footer-count { - font-size: 0.88rem; - color: var(--muted); -} - -.pagination { - display: flex; - align-items: center; - gap: 6px; -} - -.page-nav, -.page-btn { - width: 32px; - height: 32px; - border-radius: 8px; - border: 1px solid var(--border); - background: #ffffff; - display: inline-flex; - align-items: center; - justify-content: center; - font-size: 0.85rem; - color: var(--ink); - transition: all 0.15s ease; -} - -.page-nav:hover, -.page-btn:hover { - background: var(--green); - border-color: var(--green); - color: #ffffff; -} - -.page-btn.active { - background: var(--green); - border-color: var(--green); - color: #ffffff; - font-weight: 700; -} - -.page-nav:disabled { - opacity: 0.35; - pointer-events: none; -} - -.page-ellipsis { - color: var(--muted); - font-size: 0.85rem; -} diff --git a/CulinaryCommandApp/Recipe/Pages/RecipeView.razor b/CulinaryCommandApp/Recipe/Pages/RecipeView.razor deleted file mode 100644 index edcddb7..0000000 --- a/CulinaryCommandApp/Recipe/Pages/RecipeView.razor +++ /dev/null @@ -1,257 +0,0 @@ -@page "/recipes/view/{id:int}" -@rendermode InteractiveServer - -@using CulinaryCommand.Services.UserContextSpace -@using CulinaryCommandApp.Recipe.Entities - -@inject IRecipeService RecipeService -@inject IUserContextService UserCtx -@inject NavigationManager Nav - - - -@(_model?.Title ?? "Recipe") - -@if (!_ready) -{ -
- -
-} -else if (_notFound) -{ -
-
- Recipe not found. It may have been deleted. - Back to Recipes -
-
-} -else -{ - var recipe = _model!; - -
- - @* ── Header card ── *@ -
-
-
-
-

@recipe.Title

- @if (recipe.IsSubRecipe) - { - - Sub-Recipe - - } -
-
- @if (!string.IsNullOrWhiteSpace(recipe.Category)) - { - @recipe.Category - } - @if (!string.IsNullOrWhiteSpace(recipe.RecipeType)) - { - @recipe.RecipeType - } - @if (recipe.CreatedAt.HasValue) - { - - - @recipe.CreatedAt.Value.ToString("MMM d, yyyy") - - } -
-
- -
- @if (recipe.YieldAmount.HasValue) - { -
- Yield - - @recipe.YieldAmount.Value.ToString("G29") - @if (!string.IsNullOrWhiteSpace(recipe.YieldUnit)) - { - @recipe.YieldUnit - } - -
- } - @if (recipe.CostPerYield.HasValue) - { -
- Cost / Yield - @recipe.CostPerYield.Value.ToString("C2") -
- } -
-
- -
- - Back - - @if (_priv) - { - - Edit - - - } -
-
- -
- - @* ── Ingredients ── *@ -
-
- Ingredients - @recipe.RecipeIngredients.Count -
- - @if (!recipe.RecipeIngredients.Any()) - { -

No ingredients added.

- } - else - { - - - - - - - - - - - - @foreach (var line in recipe.RecipeIngredients.OrderBy(l => l.SortOrder)) - { - - - - - - - - } - -
#Ingredient / Sub-RecipeQuantityUnitPrep Note
@line.SortOrder - @if (line.SubRecipeId.HasValue) - { - - - @(line.SubRecipe?.Title ?? $"Sub-Recipe #{line.SubRecipeId}") - - } - else - { - @(line.Ingredient?.Name ?? "β€”") - } - @line.Quantity.ToString("G29")@(line.Unit?.Abbreviation ?? "β€”")@(line.PrepNote ?? "β€”")
- } -
- - @* ── Steps ── *@ -
-
- Preparation Steps - @recipe.Steps.Count -
- - @if (!recipe.Steps.Any()) - { -

No preparation steps added.

- } - else - { -
    - @foreach (var step in recipe.Steps.OrderBy(s => s.StepNumber)) - { -
  1. -
    -

    @step.Instructions

    - - @if (!string.IsNullOrWhiteSpace(step.Duration) - || !string.IsNullOrWhiteSpace(step.Temperature) - || !string.IsNullOrWhiteSpace(step.Equipment)) - { -
    - @if (!string.IsNullOrWhiteSpace(step.Duration)) - { - - @step.Duration - - } - @if (!string.IsNullOrWhiteSpace(step.Temperature)) - { - - @step.Temperature - - } - @if (!string.IsNullOrWhiteSpace(step.Equipment)) - { - - @step.Equipment - - } -
    - } -
    -
    2. - } -
- } -
- -
-
-} - -@code { - - [Parameter] public int Id { get; set; } - - private Recipe? _model; - private bool _ready; - private bool _notFound; - private bool _priv; - private ProduceRecipeDialog? _produceDialog; - - protected override async Task OnInitializedAsync() - { - var ctx = await UserCtx.GetAsync(); - - if (ctx.IsAuthenticated != true) - { - Nav.NavigateTo("/login", true); - return; - } - - if (ctx.User is null) - { - Nav.NavigateTo("/no-access", true); - return; - } - - _priv = string.Equals(ctx.User.Role, "Admin", StringComparison.OrdinalIgnoreCase) - || string.Equals(ctx.User.Role, "Manager", StringComparison.OrdinalIgnoreCase); - - var allowedLocationIds = ctx.AccessibleLocations.Select(l => l.Id); - _model = await RecipeService.GetByIdAsync(Id, allowedLocationIds); - _notFound = _model is null; - - _ready = true; - } -} diff --git a/CulinaryCommandApp/Recipe/Pages/RecipeView.razor.css b/CulinaryCommandApp/Recipe/Pages/RecipeView.razor.css deleted file mode 100644 index 0291ff2..0000000 --- a/CulinaryCommandApp/Recipe/Pages/RecipeView.razor.css +++ /dev/null @@ -1,321 +0,0 @@ -:root { - --ink: #1f2a37; - --muted: #6b7280; - --border: #e5e7eb; - --bg: #f6f7f9; - --card: #ffffff; - --green: #0a8f3c; - --shadow: 0 10px 30px rgba(31, 42, 55, 0.08); -} - -/* ── Layout ─────────────────────────────────────────────────────────────── */ - -.rv-container { - max-width: 900px; - margin: 0 auto; - padding: 24px 24px 48px; - font-family: "Source Sans 3", "Segoe UI", sans-serif; - color: var(--ink); - background: var(--bg); - min-height: 100vh; -} - -/* ── Header card ─────────────────────────────────────────────────────────── */ - -.rv-header-card { - background: var(--card); - border-radius: 16px; - border: 1px solid var(--border); - box-shadow: var(--shadow); - padding: 24px 28px; - margin-bottom: 20px; - display: flex; - flex-direction: column; - gap: 16px; -} - -.rv-header-main { - display: flex; - align-items: flex-start; - justify-content: space-between; - flex-wrap: wrap; - gap: 16px; -} - -.rv-title-row { - display: flex; - align-items: center; - gap: 12px; - flex-wrap: wrap; - margin-bottom: 8px; -} - -.rv-title { - font-family: "Space Grotesk", "Source Sans 3", sans-serif; - font-size: 1.75rem; - font-weight: 700; - margin: 0; - color: var(--ink); -} - -.rv-sub-badge { - display: inline-flex; - align-items: center; - gap: 5px; - padding: 4px 12px; - border-radius: 999px; - font-size: 0.78rem; - font-weight: 600; - background: #eff6ff; - color: #1d4ed8; - border: 1px solid #bfdbfe; -} - -.rv-meta-row { - display: flex; - align-items: center; - gap: 8px; - flex-wrap: wrap; -} - -.rv-pill { - display: inline-flex; - align-items: center; - padding: 4px 12px; - border-radius: 999px; - font-size: 0.78rem; - font-weight: 700; - background: #f0f2f5; - color: var(--ink); -} - -.rv-pill-type { - background: #f0fdf4; - color: #166534; -} - -.rv-meta-text { - font-size: 0.85rem; - color: var(--muted); -} - -/* ── Stats ───────────────────────────────────────────────────────────────── */ - -.rv-stat-group { - display: flex; - gap: 24px; - flex-shrink: 0; -} - -.rv-stat { - display: flex; - flex-direction: column; - align-items: flex-end; -} - -.rv-stat-label { - font-size: 0.75rem; - font-weight: 600; - text-transform: uppercase; - letter-spacing: 0.04em; - color: var(--muted); -} - -.rv-stat-value { - font-size: 1.15rem; - font-weight: 700; - color: var(--ink); -} - -.rv-stat-unit { - font-size: 0.9rem; - font-weight: 500; - color: var(--muted); -} - -.rv-cost { - color: #166534; -} - -/* ── Actions row ─────────────────────────────────────────────────────────── */ - -.rv-actions { - display: flex; - gap: 10px; - align-items: center; -} - -/* ── Body ────────────────────────────────────────────────────────────────── */ - -.rv-body { - display: flex; - flex-direction: column; - gap: 18px; -} - -/* ── Shared card ─────────────────────────────────────────────────────────── */ - -.rv-card { - background: var(--card); - border-radius: 16px; - border: 1px solid var(--border); - box-shadow: var(--shadow); - overflow: hidden; -} - -.rv-card-header { - display: flex; - align-items: center; - padding: 16px 20px; - font-weight: 700; - font-size: 0.95rem; - text-transform: uppercase; - letter-spacing: 0.04em; - background: var(--green); - color: var(--ink); - border-bottom: 1px solid var(--border); -} - -.rv-count-badge { - margin-left: auto; - background: rgba(255,255,255,0.3); - padding: 2px 10px; - border-radius: 999px; - font-size: 0.78rem; - font-weight: 700; -} - -.rv-empty { - padding: 24px 20px; - color: var(--muted); - font-style: italic; - margin: 0; -} - -/* ── Ingredient table ────────────────────────────────────────────────────── */ - -.rv-table { - width: 100%; - border-collapse: collapse; - font-size: 0.92rem; -} - -.rv-table thead tr { - background: #f9fafb; - border-bottom: 1px solid var(--border); -} - -.rv-table thead th { - padding: 10px 14px; - font-weight: 600; - font-size: 0.8rem; - text-transform: uppercase; - letter-spacing: 0.02em; - color: var(--muted); -} - -.rv-table tbody tr { - border-bottom: 1px solid var(--border); -} - -.rv-table tbody tr:last-child { - border-bottom: none; -} - -.rv-table tbody td { - padding: 12px 14px; - vertical-align: middle; -} - -.rv-sort-num { - color: var(--muted); - font-size: 0.82rem; - width: 36px; - text-align: center; -} - -.rv-subrecipe-line { - display: inline-flex; - align-items: center; - padding: 3px 10px; - border-radius: 8px; - background: #eff6ff; - color: #1d4ed8; - font-size: 0.88rem; - font-weight: 600; -} - -.rv-prepnote { - color: var(--muted); - font-style: italic; - font-size: 0.88rem; -} - -/* ── Steps list ──────────────────────────────────────────────────────────── */ - -.rv-steps { - list-style: none; - padding: 0; - margin: 0; - counter-reset: step-counter; -} - -.rv-step { - display: flex; - gap: 16px; - padding: 18px 20px; - border-bottom: 1px solid var(--border); - counter-increment: step-counter; -} - -.rv-step:last-child { - border-bottom: none; -} - -.rv-step::before { - content: counter(step-counter); - display: flex; - align-items: center; - justify-content: center; - min-width: 32px; - height: 32px; - border-radius: 999px; - background: var(--green); - color: var(--ink); - font-weight: 700; - font-size: 0.88rem; - flex-shrink: 0; - margin-top: 2px; -} - -.rv-step-body { - flex: 1; -} - -.rv-step-instructions { - margin: 0 0 10px; - font-size: 0.95rem; - line-height: 1.6; - color: var(--ink); -} - -.rv-step-instructions:only-child { - margin-bottom: 0; -} - -.rv-step-meta { - display: flex; - flex-wrap: wrap; - gap: 8px; -} - -.rv-step-tag { - display: inline-flex; - align-items: center; - padding: 3px 10px; - border-radius: 8px; - background: #f3f4f6; - border: 1px solid var(--border); - font-size: 0.8rem; - color: var(--muted); -} diff --git a/CulinaryCommandApp/Recipe/Pages/_Imports.razor b/CulinaryCommandApp/Recipe/Pages/_Imports.razor deleted file mode 100644 index 594e77f..0000000 --- a/CulinaryCommandApp/Recipe/Pages/_Imports.razor +++ /dev/null @@ -1,10 +0,0 @@ -@using Microsoft.AspNetCore.Components.Web -@using static Microsoft.AspNetCore.Components.Web.RenderMode -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Forms -@using Microsoft.JSInterop -@using CulinaryCommandApp.Recipe.Entities -@using CulinaryCommandApp.Recipe.Services -@using CulinaryCommandApp.Recipe.Services.Interfaces -@using CulinaryCommandApp.Recipe.Components -@using CulinaryCommand.Services diff --git a/CulinaryCommandApp/Recipe/Services/Interfaces/IRecipeService.cs b/CulinaryCommandApp/Recipe/Services/Interfaces/IRecipeService.cs deleted file mode 100644 index 6017ad1..0000000 --- a/CulinaryCommandApp/Recipe/Services/Interfaces/IRecipeService.cs +++ /dev/null @@ -1,51 +0,0 @@ -using Rec = CulinaryCommandApp.Recipe.Entities; - -namespace CulinaryCommandApp.Recipe.Services.Interfaces -{ - public interface IRecipeService - { - Task> GetAllAsync(); - Task> GetAllByLocationIdAsync(int locationId); - Task GetByIdAsync(int id); - - /// - /// Returns the recipe with the given only when its - /// LocationId is contained in . - /// Returns null when the recipe does not exist or the caller is not - /// permitted to access its location. - /// - Task GetByIdAsync(int id, IEnumerable allowedLocationIds); - - Task CreateAsync(Rec.Recipe recipe); - Task UpdateAsync(Rec.Recipe recipe); - Task DeleteAsync(int id); - - /// - /// Returns only the current RowVersion token for the recipe with the - /// given , or null when the recipe does not exist. - /// Use this to refresh the concurrency token without overwriting the caller's - /// in-flight edits. - /// - Task GetRowVersionAsync(int id); - - /// - /// Recursively flattens all raw ingredient lines of a recipe (including sub-recipes) - /// into a single list with quantities scaled by . - /// Throws if a circular reference is detected. - /// - Task> FlattenIngredientsAsync(int recipeId, decimal multiplier = 1m, CancellationToken ct = default); - } - - /// - /// A fully-resolved ingredient line with no further nesting β€” used for cost rollup - /// and inventory deduction when a recipe is produced. - /// - public sealed class FlatIngredientLine - { - public int IngredientId { get; init; } - public string IngredientName { get; init; } = string.Empty; - public decimal Quantity { get; init; } - public int UnitId { get; init; } - public string UnitName { get; init; } = string.Empty; - } -} diff --git a/CulinaryCommandApp/Recipe/Services/RecipeService.cs b/CulinaryCommandApp/Recipe/Services/RecipeService.cs deleted file mode 100644 index 0e063bc..0000000 --- a/CulinaryCommandApp/Recipe/Services/RecipeService.cs +++ /dev/null @@ -1,151 +0,0 @@ -using CulinaryCommand.Data; -using CulinaryCommandApp.Recipe.Services.Interfaces; -using Rec = CulinaryCommandApp.Recipe.Entities; -using Microsoft.EntityFrameworkCore; - -namespace CulinaryCommandApp.Recipe.Services -{ - public class RecipeService : IRecipeService - { - private readonly AppDbContext _db; - - public RecipeService(AppDbContext db) - { - _db = db; - } - - public async Task> GetAllAsync() - => await _db.Recipes - .Include(r => r.RecipeIngredients) - .Include(r => r.Steps) - .ToListAsync(); - - public async Task> GetAllByLocationIdAsync(int locationId) - { - return await _db.Recipes - .Where(r => r.LocationId == locationId) - .Include(r => r.RecipeIngredients) - .Include(r => r.Steps) - .ToListAsync(); - } - - public Task GetByIdAsync(int id) - { - return _db.Recipes - .Include(r => r.RecipeIngredients) - .ThenInclude(ri => ri.Ingredient) - .Include(r => r.RecipeIngredients) - .ThenInclude(ri => ri.Unit) - .Include(r => r.RecipeIngredients) - .ThenInclude(ri => ri.SubRecipe) - .Include(r => r.Steps) - .FirstOrDefaultAsync(r => r.RecipeId == id); - } - - public Task GetByIdAsync(int id, IEnumerable allowedLocationIds) - { - return _db.Recipes - .Include(r => r.RecipeIngredients) - .ThenInclude(ri => ri.Ingredient) - .Include(r => r.RecipeIngredients) - .ThenInclude(ri => ri.Unit) - .Include(r => r.RecipeIngredients) - .ThenInclude(ri => ri.SubRecipe) - .Include(r => r.Steps) - .FirstOrDefaultAsync(r => r.RecipeId == id && allowedLocationIds.Contains(r.LocationId)); - } - - public async Task CreateAsync(Rec.Recipe recipe) - { - if (string.IsNullOrWhiteSpace(recipe.Category)) - throw new Exception("Category is required."); - - _db.Recipes.Add(recipe); - await _db.SaveChangesAsync(); - } - - public async Task UpdateAsync(Rec.Recipe recipe) - { - _db.Recipes.Update(recipe); - await _db.SaveChangesAsync(); - } - - public async Task DeleteAsync(int id) - { - var recipe = await _db.Recipes.FindAsync(id); - if (recipe != null) - { - _db.Recipes.Remove(recipe); - await _db.SaveChangesAsync(); - } - } - - // ── Ingredient Flattening ──────────────────────────────────────────── - - /// - public async Task GetRowVersionAsync(int id) - { - return await _db.Recipes - .AsNoTracking() - .Where(r => r.RecipeId == id) - .Select(r => r.RowVersion) - .FirstOrDefaultAsync(); - } - - /// - public async Task> FlattenIngredientsAsync( - int recipeId, decimal multiplier = 1m, CancellationToken ct = default) - { - return await FlattenCoreAsync(recipeId, multiplier, new HashSet(), ct); - } - - private async Task> FlattenCoreAsync( - int recipeId, decimal multiplier, HashSet visited, CancellationToken ct) - { - if (!visited.Add(recipeId)) - throw new InvalidOperationException( - $"Circular sub-recipe reference detected at recipe ID {recipeId}."); - - var recipe = await _db.Recipes - .AsNoTracking() - .Include(r => r.RecipeIngredients) - .ThenInclude(ri => ri.Ingredient) - .Include(r => r.RecipeIngredients) - .ThenInclude(ri => ri.Unit) - .FirstOrDefaultAsync(r => r.RecipeId == recipeId, ct); - - if (recipe is null) - throw new InvalidOperationException($"Recipe ID {recipeId} not found."); - - var result = new List(); - - foreach (var line in recipe.RecipeIngredients) - { - var scaledQty = line.Quantity * multiplier; - - if (line.SubRecipeId.HasValue) - { - // Recurse into sub-recipe β€” scale by the quantity used on this line - var subLines = await FlattenCoreAsync(line.SubRecipeId.Value, scaledQty, visited, ct); - result.AddRange(subLines); - } - else if (line.IngredientId.HasValue && line.Ingredient is not null) - { - result.Add(new FlatIngredientLine - { - IngredientId = line.IngredientId.Value, - IngredientName = line.Ingredient.Name, - Quantity = scaledQty, - UnitId = line.UnitId, - UnitName = line.Unit?.Name ?? string.Empty, - }); - } - } - - // Allow the same sub-recipe to appear in multiple branches (diamond dep) - visited.Remove(recipeId); - - return result; - } - } -} diff --git a/CulinaryCommandApp/Services/RecipeService.cs b/CulinaryCommandApp/Services/RecipeService.cs new file mode 100644 index 0000000..0f793c0 --- /dev/null +++ b/CulinaryCommandApp/Services/RecipeService.cs @@ -0,0 +1,68 @@ +using CulinaryCommand.Data; +using CulinaryCommand.Data.Entities; +using Microsoft.EntityFrameworkCore; + +namespace CulinaryCommand.Services +{ + public class RecipeService + { + private readonly AppDbContext _db; + + public RecipeService(AppDbContext db) + { + _db = db; + } + + public async Task> GetAllAsync() + => await _db.Recipes + .Include(r => r.RecipeIngredients) + .Include(r => r.Steps) + .ToListAsync(); + + public async Task> GetAllByLocationIdAsync(int locationId) + { + return await _db.Recipes + .Where(r => r.LocationId == locationId) + .Include(r => r.RecipeIngredients) + .Include(r => r.Steps) + .ToListAsync(); + } + + public Task GetByIdAsync(int id) + { + return _db.Recipes + .Include(r => r.RecipeIngredients) + .ThenInclude(ri => ri.Ingredient) + .Include(r => r.RecipeIngredients) + .ThenInclude(ri => ri.Unit) + .Include(r => r.Steps) + .FirstOrDefaultAsync(r => r.RecipeId == id); + } + + + public async Task CreateAsync(Recipe recipe) + { + if (string.IsNullOrWhiteSpace(recipe.Category)) + throw new Exception("Category is required."); + + _db.Recipes.Add(recipe); + await _db.SaveChangesAsync(); + } + + public async Task UpdateAsync(Recipe recipe) + { + _db.Recipes.Update(recipe); + await _db.SaveChangesAsync(); + } + + public async Task DeleteAsync(int id) + { + var recipe = await _db.Recipes.FindAsync(id); + if (recipe != null) + { + _db.Recipes.Remove(recipe); + await _db.SaveChangesAsync(); + } + } + } +} \ No newline at end of file diff --git a/CulinaryCommandUnitTests/Inventory/DTOs/CreateIngredientDTOTests.cs b/CulinaryCommandUnitTests/Inventory/DTOs/CreateIngredientDTOTests.cs index 424e2e7..2873c06 100644 --- a/CulinaryCommandUnitTests/Inventory/DTOs/CreateIngredientDTOTests.cs +++ b/CulinaryCommandUnitTests/Inventory/DTOs/CreateIngredientDTOTests.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using CulinaryCommandApp.Inventory.DTOs; +using CulinaryCommand.Components.Pages.Recipes; +using CulinaryCommand.Inventory.DTOs; using Xunit; diff --git a/CulinaryCommandUnitTests/Inventory/DTOs/InventoryCatalogDTOTests.cs b/CulinaryCommandUnitTests/Inventory/DTOs/InventoryCatalogDTOTests.cs index 3c37305..c9a1111 100644 --- a/CulinaryCommandUnitTests/Inventory/DTOs/InventoryCatalogDTOTests.cs +++ b/CulinaryCommandUnitTests/Inventory/DTOs/InventoryCatalogDTOTests.cs @@ -1,4 +1,4 @@ -using CulinaryCommandApp.Inventory.DTOs; +using CulinaryCommand.Inventory.DTOs; using Xunit; namespace CulinaryCommandUnitTests.Inventory.DTOs diff --git a/CulinaryCommandUnitTests/Inventory/DTOs/InventoryItemDTOTests.cs b/CulinaryCommandUnitTests/Inventory/DTOs/InventoryItemDTOTests.cs index b17c987..7ae80b0 100644 --- a/CulinaryCommandUnitTests/Inventory/DTOs/InventoryItemDTOTests.cs +++ b/CulinaryCommandUnitTests/Inventory/DTOs/InventoryItemDTOTests.cs @@ -1,5 +1,5 @@ using System; -using CulinaryCommandApp.Inventory.DTOs; +using CulinaryCommand.Inventory.DTOs; using Xunit; namespace CulinaryCommandUnitTests.Inventory.DTOs diff --git a/CulinaryCommandUnitTests/Inventory/Entities/IngredientTest.cs b/CulinaryCommandUnitTests/Inventory/Entities/IngredientTest.cs index 65ef518..78fb6ce 100644 --- a/CulinaryCommandUnitTests/Inventory/Entities/IngredientTest.cs +++ b/CulinaryCommandUnitTests/Inventory/Entities/IngredientTest.cs @@ -1,5 +1,5 @@ using System; -using CulinaryCommandApp.Inventory.Entities; +using CulinaryCommand.Inventory.Entities; using Xunit; namespace CulinaryCommandUnitTests.Inventory.Entities diff --git a/CulinaryCommandUnitTests/Inventory/Entities/InventoryTransactionTest.cs b/CulinaryCommandUnitTests/Inventory/Entities/InventoryTransactionTest.cs index ca1ba00..4301097 100644 --- a/CulinaryCommandUnitTests/Inventory/Entities/InventoryTransactionTest.cs +++ b/CulinaryCommandUnitTests/Inventory/Entities/InventoryTransactionTest.cs @@ -1,5 +1,5 @@ using System; -using CulinaryCommandApp.Inventory.Entities; +using CulinaryCommand.Inventory.Entities; using Xunit; namespace CulinaryCommandUnitTests.Inventory.Entities diff --git a/CulinaryCommandUnitTests/Inventory/Entities/UnitTest.cs b/CulinaryCommandUnitTests/Inventory/Entities/UnitTest.cs index 963f205..b397cb7 100644 --- a/CulinaryCommandUnitTests/Inventory/Entities/UnitTest.cs +++ b/CulinaryCommandUnitTests/Inventory/Entities/UnitTest.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using CulinaryCommandApp.Inventory.Entities; +using CulinaryCommand.Inventory.Entities; using Xunit; namespace CulinaryCommandUnitTests.Inventory.Entities