From d6d6db882e94abed055f2bd2fe6a8a5c08b0294b Mon Sep 17 00:00:00 2001 From: jspngl Date: Mon, 16 Nov 2026 23:19:06 -0500 Subject: [PATCH 1/2] feat(api): add catalog category, Business Central code, and quality class --- docs/database/catalog.md | 56 ++ docs/database/images/catalog.png | Bin 0 -> 82026 bytes docs/database/prices.dbml | 14 +- docs/database/prices.md | 17 +- docs/database/quality-classes.dbml | 14 +- docs/database/receipts.dbml | 14 +- docs/database/schema.dbml | 17 +- docs/database/schema.md | 13 +- .../sql/0006_add_catalog_item_details.sql | 35 + .../Catalog/CatalogItemValidator.cs | 68 ++ .../Controllers/CatalogItemsController.cs | 166 +++++ .../CatalogItemConfiguration.cs | 40 +- ...17040905_AddCatalogItemDetails.Designer.cs | 651 ++++++++++++++++++ .../20261117040905_AddCatalogItemDetails.cs | 179 +++++ .../MoissonDbContextModelSnapshot.cs | 53 ++ .../Dtos/CatalogItemDto.cs | 14 + .../Dtos/CatalogItemRequest.cs | 11 + .../Entities/CatalogItem.cs | 50 ++ .../Api/CatalogEndpointTests.cs | 195 ++++++ .../Api/CatalogItemValidatorTests.cs | 107 +++ .../Api/CatalogItemsMigrationTests.cs | 132 ++++ .../Api/PricesMigrationTests.cs | 18 +- .../Fixtures/CatalogApiFactory.cs | 37 + 23 files changed, 1878 insertions(+), 23 deletions(-) create mode 100644 docs/database/catalog.md create mode 100644 docs/database/images/catalog.png create mode 100644 docs/database/sql/0006_add_catalog_item_details.sql create mode 100644 src/MoissonMontreal.Api/Catalog/CatalogItemValidator.cs create mode 100644 src/MoissonMontreal.Api/Controllers/CatalogItemsController.cs create mode 100644 src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.Designer.cs create mode 100644 src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.cs create mode 100644 src/MoissonMontreal.Core/Dtos/CatalogItemDto.cs create mode 100644 src/MoissonMontreal.Core/Dtos/CatalogItemRequest.cs create mode 100644 tests/MoissonMontreal.Tests/Api/CatalogEndpointTests.cs create mode 100644 tests/MoissonMontreal.Tests/Api/CatalogItemValidatorTests.cs create mode 100644 tests/MoissonMontreal.Tests/Api/CatalogItemsMigrationTests.cs create mode 100644 tests/MoissonMontreal.Tests/Fixtures/CatalogApiFactory.cs diff --git a/docs/database/catalog.md b/docs/database/catalog.md new file mode 100644 index 0000000..c546ede --- /dev/null +++ b/docs/database/catalog.md @@ -0,0 +1,56 @@ +# Food catalog + +The catalog is the list of foods Moisson Montréal can receive. Each row is one kind of food. A donation of that food points at the row, and the price grid stores the price of one unit over time. Accounting matches the row through its Business Central code. + +food_items is one donation: the donor, the quantity and the date. catalog_items is the food itself. + +## Diagram + +![Food catalog diagram](images/catalog.png) + +The columns in this picture are the catalog item. The quality class column is a link to the quality_classes table: it stores the class code, such as A, B or C. The full database diagram in [schema.md](schema.md) shows that link together with the price grid. + +## Tables + +### catalog_items + +One row per kind of food. The table was created for the price grid, and these columns complete it. + +- **id**: code that identifies the catalog item, assigned automatically +- **name**: name of the food, for example Pain +- **category**: group the food belongs to, for example Boulangerie +- **business_central_code**: code of this food in Business Central. Two catalog items cannot share a code +- **unit**: unit used to count the food, such as kg or caisse. Free text for now, until issue #28 decides how the price of one unit works +- **quality_class**: quality class of this food. It must be a class that exists, such as A, B or C. The class is stored on the catalog item +- **created_at**: date and time the item was added, stored in UTC +- **updated_at**: date and time of the last change, stored in UTC. Empty until the item is edited + +## Quality class + +The quality class belongs to the catalog item, so every donation of that food can use the same class. The classes and their percentages live in the quality_classes table. A catalog item can only use a class that is already there. + +A donation still keeps the quality class it was given, on food_items. That value is what a receipt uses. + +## Business Central code + +The code is how the catalog item is matched with the accounting system. The database rejects a second item with the same code. The comparison is exact, so `BC-PAIN` and `bc-pain` are two different codes. + +## Rules enforced by the database + +1. A name, a category, a Business Central code and a unit cannot be empty. +2. A Business Central code can belong to only one catalog item. +3. The quality class must be a quality class that exists. +4. A quality class cannot be deleted while a catalog item uses it. + +## API + +List, create and edit are available at `api/catalog-items`. Creating or editing an item with a Business Central code that is already used returns a conflict. A quality class that does not exist is refused. + +## Migration + +- Entity Framework migration: [20261117040905_AddCatalogItemDetails](../../src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.cs) +- Equivalent SQL script: [0006_add_catalog_item_details.sql](sql/0006_add_catalog_item_details.sql) +- Table settings: [CatalogItemConfiguration.cs](../../src/MoissonMontreal.Api/Data/Configurations/CatalogItemConfiguration.cs) +- API: [CatalogItemsController.cs](../../src/MoissonMontreal.Api/Controllers/CatalogItemsController.cs) + +The SQL script must be run after [0005_create_quality_classes.sql](sql/0005_create_quality_classes.sql). It records itself in the migration history, so Entity Framework will not apply it a second time. diff --git a/docs/database/images/catalog.png b/docs/database/images/catalog.png new file mode 100644 index 0000000000000000000000000000000000000000..97d720e3585c3baefbcf1b14c021ac2f919d4098 GIT binary patch literal 82026 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 CaAoiS literal 0 HcmV?d00001 diff --git a/docs/database/prices.dbml b/docs/database/prices.dbml index 1769b88..c352757 100644 --- a/docs/database/prices.dbml +++ b/docs/database/prices.dbml @@ -8,17 +8,27 @@ Table catalog_items { id uuid [not null, default: `gen_random_uuid()`] name varchar(255) [not null] + category varchar(100) [not null] + business_central_code varchar(50) [not null, note: 'Unique code used to match the item in Business Central'] + unit varchar(20) [not null, note: 'Free text until the price of one unit is decided'] + quality_class varchar(1) [not null, note: 'Code of the quality class. The class lives on the catalog item'] created_at timestamptz [not null, default: `now()`, note: 'Stored in UTC'] + updated_at timestamptz [null, note: 'Stored in UTC, empty if never changed'] indexes { id [pk, name: 'pk_catalog_items'] + business_central_code [unique, name: 'ix_catalog_items_business_central_code'] + quality_class [name: 'ix_catalog_items_quality_class'] } checks { `length(name) > 0` [name: 'ck_catalog_items_name_not_empty'] + `length(category) > 0` [name: 'ck_catalog_items_category_not_empty'] + `length(business_central_code) > 0` [name: 'ck_catalog_items_business_central_code_not_empty'] + `length(unit) > 0` [name: 'ck_catalog_items_unit_not_empty'] } - Note: 'Types of food recognized by the app. Category, Business Central code, unit and quality come with #27' + Note: 'Types of food recognized by the app, with the Business Central code and the quality class' } Table prices { @@ -115,4 +125,6 @@ Ref fk_food_items_catalog_items_catalog_item_id: food_items.catalog_item_id > ca Ref fk_food_items_quality_classes_quality: food_items.quality > quality_classes.code [delete: restrict] +Ref fk_catalog_items_quality_classes_quality_class: catalog_items.quality_class > quality_classes.code [delete: restrict] + Ref fk_prices_catalog_items_catalog_item_id: prices.catalog_item_id > catalog_items.id [delete: restrict] diff --git a/docs/database/prices.md b/docs/database/prices.md index 9de707d..fc61dea 100644 --- a/docs/database/prices.md +++ b/docs/database/prices.md @@ -16,13 +16,16 @@ The donors and food_items tables come from an earlier step. They are shown in th One row per type of food, such as bread or apples. A donation of bread and the next donation of bread are two different rows in food_items, but they share one catalog item, and so one price history. -| Column | Meaning | -| --- | --- | -| id | Code that identifies the catalog item, assigned automatically | -| name | Name of the food. It cannot be empty. | -| created_at | Date and time the item was added, stored in UTC | +- **id**: code that identifies the catalog item, assigned automatically +- **name**: name of the food. It cannot be empty. +- **category**: group the food belongs to, for example Boulangerie +- **business_central_code**: code of this food in Business Central. Two catalog items cannot share a code +- **unit**: unit used to count the food, such as kg or caisse +- **quality_class**: quality class of this food. It must be a class that exists +- **created_at**: date and time the item was added, stored in UTC +- **updated_at**: date and time of the last change, stored in UTC. Empty until the item is edited -This is the smallest catalog the price grid needs. Issue #27 adds the category, the Business Central code (which will be unique), the unit and the quality to this same table. Until then, two catalog items can have the same name. +The category, the Business Central code, the unit and the quality class are described in [Food catalog](catalog.md). ### prices @@ -80,7 +83,7 @@ Adding a new price to the grid therefore never changes a receipt that already ex ## Units and precision -- A price is for one unit of the catalog item, for example 1 kg or 1 case. The unit itself is added to catalog_items in issue #27, following the decision of issue #28. +- A price is for one unit of the catalog item, for example 1 kg or 1 case. The unit is stored on the catalog item as free text until issue #28 decides how the price of one unit is defined. - unit_price keeps 4 decimal places, the same as receipt_items.unit_price, so a price can be copied onto a receipt without losing anything. - A price with more than 4 decimals is rounded half away from zero by the database. For example, $0.12345 is stored as $0.1235. - The largest price allowed is $99,999,999.9999. A larger value is refused. diff --git a/docs/database/quality-classes.dbml b/docs/database/quality-classes.dbml index 8016bc9..56f1ec3 100644 --- a/docs/database/quality-classes.dbml +++ b/docs/database/quality-classes.dbml @@ -77,17 +77,27 @@ Table food_items { Table catalog_items { id uuid [not null, default: `gen_random_uuid()`] name varchar(255) [not null] + category varchar(100) [not null] + business_central_code varchar(50) [not null, note: 'Unique code used to match the item in Business Central'] + unit varchar(20) [not null, note: 'Free text until the price of one unit is decided'] + quality_class varchar(1) [not null, note: 'Code of the quality class. The class lives on the catalog item'] created_at timestamptz [not null, default: `now()`, note: 'Stored in UTC'] + updated_at timestamptz [null, note: 'Stored in UTC, empty if never changed'] indexes { id [pk, name: 'pk_catalog_items'] + business_central_code [unique, name: 'ix_catalog_items_business_central_code'] + quality_class [name: 'ix_catalog_items_quality_class'] } checks { `length(name) > 0` [name: 'ck_catalog_items_name_not_empty'] + `length(category) > 0` [name: 'ck_catalog_items_category_not_empty'] + `length(business_central_code) > 0` [name: 'ck_catalog_items_business_central_code_not_empty'] + `length(unit) > 0` [name: 'ck_catalog_items_unit_not_empty'] } - Note: 'Types of food recognized by the app. Category, Business Central code, unit and quality come with #27' + Note: 'Types of food recognized by the app, with the Business Central code and the quality class' } Ref fk_food_items_donors_donor_id: food_items.donor_id > donors.id [delete: restrict] @@ -96,6 +106,8 @@ Ref fk_food_items_catalog_items_catalog_item_id: food_items.catalog_item_id > ca Ref fk_food_items_quality_classes_quality: food_items.quality > quality_classes.code [delete: restrict] +Ref fk_catalog_items_quality_classes_quality_class: catalog_items.quality_class > quality_classes.code [delete: restrict] + Records quality_classes(code, name, percentage, min_percentage, max_percentage) { 'A', 'Grocery quality', 100.00, 100.00, 100.00 'B', 'Imperfect', 50.00, 50.00, 75.00 diff --git a/docs/database/receipts.dbml b/docs/database/receipts.dbml index d09a3b9..6f40ae1 100644 --- a/docs/database/receipts.dbml +++ b/docs/database/receipts.dbml @@ -77,17 +77,27 @@ Table quality_classes { Table catalog_items { id uuid [not null, default: `gen_random_uuid()`] name varchar(255) [not null] + category varchar(100) [not null] + business_central_code varchar(50) [not null, note: 'Unique code used to match the item in Business Central'] + unit varchar(20) [not null, note: 'Free text until the price of one unit is decided'] + quality_class varchar(1) [not null, note: 'Code of the quality class. The class lives on the catalog item'] created_at timestamptz [not null, default: `now()`, note: 'Stored in UTC'] + updated_at timestamptz [null, note: 'Stored in UTC, empty if never changed'] indexes { id [pk, name: 'pk_catalog_items'] + business_central_code [unique, name: 'ix_catalog_items_business_central_code'] + quality_class [name: 'ix_catalog_items_quality_class'] } checks { `length(name) > 0` [name: 'ck_catalog_items_name_not_empty'] + `length(category) > 0` [name: 'ck_catalog_items_category_not_empty'] + `length(business_central_code) > 0` [name: 'ck_catalog_items_business_central_code_not_empty'] + `length(unit) > 0` [name: 'ck_catalog_items_unit_not_empty'] } - Note: 'Types of food recognized by the app. Category, Business Central code, unit and quality come with #27' + Note: 'Types of food recognized by the app, with the Business Central code and the quality class' } Table receipts { @@ -142,6 +152,8 @@ Ref fk_food_items_catalog_items_catalog_item_id: food_items.catalog_item_id > ca Ref fk_food_items_quality_classes_quality: food_items.quality > quality_classes.code [delete: restrict] +Ref fk_catalog_items_quality_classes_quality_class: catalog_items.quality_class > quality_classes.code [delete: restrict] + Ref fk_receipts_donors_donor_id: receipts.donor_id > donors.id [delete: restrict] Ref fk_receipt_items_receipts_receipt_id_donor_id: receipt_items.(receipt_id, donor_id) > receipts.(id, donor_id) [delete: cascade] diff --git a/docs/database/schema.dbml b/docs/database/schema.dbml index f826f64..18afbc7 100644 --- a/docs/database/schema.dbml +++ b/docs/database/schema.dbml @@ -1,7 +1,8 @@ // Full database schema of the Moisson Montreal receipt app // Paste this file into https://dbdiagram.io to render the diagram. // Matches the migrations 20261103000127_CreateUsersAndRoles, 20261105163138_CreateDonorsAndFoodItems, -// 20261107041912_CreateReceipts, 20261110175320_CreateCatalogItemsAndPrices and 20261112060008_CreateQualityClasses. +// 20261107041912_CreateReceipts, 20261110175320_CreateCatalogItemsAndPrices, +// 20261112060008_CreateQualityClasses and 20261117040905_AddCatalogItemDetails. Project moisson_montreal { database_type: 'PostgreSQL' @@ -164,17 +165,27 @@ Table receipt_items { Table catalog_items { id uuid [not null, default: `gen_random_uuid()`] name varchar(255) [not null] + category varchar(100) [not null] + business_central_code varchar(50) [not null, note: 'Unique code used to match the item in Business Central'] + unit varchar(20) [not null, note: 'Free text until the price of one unit is decided'] + quality_class varchar(1) [not null, note: 'Code of the quality class. The class lives on the catalog item'] created_at timestamptz [not null, default: `now()`, note: 'Stored in UTC'] + updated_at timestamptz [null, note: 'Stored in UTC, empty if never changed'] indexes { id [pk, name: 'pk_catalog_items'] + business_central_code [unique, name: 'ix_catalog_items_business_central_code'] + quality_class [name: 'ix_catalog_items_quality_class'] } checks { `length(name) > 0` [name: 'ck_catalog_items_name_not_empty'] + `length(category) > 0` [name: 'ck_catalog_items_category_not_empty'] + `length(business_central_code) > 0` [name: 'ck_catalog_items_business_central_code_not_empty'] + `length(unit) > 0` [name: 'ck_catalog_items_unit_not_empty'] } - Note: 'Types of food recognized by the app. Category, Business Central code, unit and quality come with #27' + Note: 'Types of food recognized by the app, with the Business Central code and the quality class' } Table prices { @@ -212,6 +223,8 @@ Ref fk_receipt_items_food_items_food_item_id_donor_id: receipt_items.(food_item_ Ref fk_prices_catalog_items_catalog_item_id: prices.catalog_item_id > catalog_items.id [delete: restrict] +Ref fk_catalog_items_quality_classes_quality_class: catalog_items.quality_class > quality_classes.code [delete: restrict] + TableGroup accounts { roles users diff --git a/docs/database/schema.md b/docs/database/schema.md index 19d6ddd..0e108f1 100644 --- a/docs/database/schema.md +++ b/docs/database/schema.md @@ -73,9 +73,9 @@ More detail: [Receipts and their prices](receipts.md). ### catalog_items -The types of food the app knows, such as bread or apples. A donation of bread and the next donation of bread are two different food items, but they share the same catalog item, and so the same price. For now a catalog item only has a name. Its category, Business Central code, unit and quality come with issue #27. +The types of food the app knows, such as bread or apples. A donation of bread and the next donation of bread are two different food items, but they share the same catalog item, and so the same price. Each catalog item has a name, a category, a unique Business Central code, a unit and a quality class. -More detail: [Price grid](prices.md). +More detail: [Food catalog](catalog.md) and [Price grid](prices.md). ### prices @@ -119,7 +119,7 @@ The database itself refuses anything that would break these rules, even if there - A food item cannot be deleted while it is on a receipt. - A role cannot be deleted while someone has it. - A catalog item cannot be deleted while it has prices or while a donation points to it. -- A quality class cannot be deleted while a food item uses it. +- A quality class cannot be deleted while a food item or a catalog item uses it. **Exact amounts** - All amounts are stored as exact decimal numbers, so no cent is lost along the way. @@ -130,11 +130,12 @@ The database itself refuses anything that would break these rules, even if there **Valid values** - A quantity and a price must be greater than zero. - A quality percentage must be between 0 and 100. -- A food item must have a quality class that exists. +- A food item and a catalog item must have a quality class that exists. - A quality class keeps a default percentage within its own range, and the range stays between 0 % and 100 %. - Two quality classes cannot have the same code or the same name, and a code is one capital letter from A to Z. - A receipt total cannot be negative. -- Donor names, food names, catalog item names and units cannot be empty. +- Donor names, food names, catalog item names, categories, Business Central codes and units cannot be empty. +- Two catalog items cannot have the same Business Central code. **Accounts** - Two employees cannot have the same email or the same Microsoft account. @@ -153,7 +154,6 @@ These parts of the project are planned in their own issues and will add tables l | Feature | Issue | | --- | --- | | Price lookup by date | #25 | -| Food catalog details: category, Business Central code, unit and quality | #27 | | Calculation of a donation's value | #30 | | Receipt statuses: prepared, approved at two levels, issued, cancelled and replaced | #31 | | Receipt numbering, unique and with no gaps | #32 | @@ -181,6 +181,7 @@ Each table comes from one of these migrations: | receipts, receipt_items | [20261107041912_CreateReceipts](../../src/MoissonMontreal.Api/Data/Migrations/20261107041912_CreateReceipts.cs) | [0003_create_receipts.sql](sql/0003_create_receipts.sql) | [receipts.md](receipts.md) | | catalog_items, prices | [20261110175320_CreateCatalogItemsAndPrices](../../src/MoissonMontreal.Api/Data/Migrations/20261110175320_CreateCatalogItemsAndPrices.cs) | [0004_create_catalog_items_and_prices.sql](sql/0004_create_catalog_items_and_prices.sql) | [prices.md](prices.md) | | quality_classes | [20261112060008_CreateQualityClasses](../../src/MoissonMontreal.Api/Data/Migrations/20261112060008_CreateQualityClasses.cs) | [0005_create_quality_classes.sql](sql/0005_create_quality_classes.sql) | [quality-classes.md](quality-classes.md) | +| catalog item details | [20261117040905_AddCatalogItemDetails](../../src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.cs) | [0006_add_catalog_item_details.sql](sql/0006_add_catalog_item_details.sql) | [catalog.md](catalog.md) | The SQL scripts must be run in order on an empty database. diff --git a/docs/database/sql/0006_add_catalog_item_details.sql b/docs/database/sql/0006_add_catalog_item_details.sql new file mode 100644 index 0000000..0bc7059 --- /dev/null +++ b/docs/database/sql/0006_add_catalog_item_details.sql @@ -0,0 +1,35 @@ +START TRANSACTION; +ALTER TABLE catalog_items ADD category character varying(100) NOT NULL DEFAULT ''; + +ALTER TABLE catalog_items ADD business_central_code character varying(50) NOT NULL DEFAULT ''; + +ALTER TABLE catalog_items ADD unit character varying(20) NOT NULL DEFAULT ''; + +ALTER TABLE catalog_items ADD quality_class character varying(1) NOT NULL DEFAULT ''; + +ALTER TABLE catalog_items ADD updated_at timestamp with time zone; + +ALTER TABLE catalog_items ALTER COLUMN category DROP DEFAULT; + +ALTER TABLE catalog_items ALTER COLUMN business_central_code DROP DEFAULT; + +ALTER TABLE catalog_items ALTER COLUMN unit DROP DEFAULT; + +ALTER TABLE catalog_items ALTER COLUMN quality_class DROP DEFAULT; + +CREATE UNIQUE INDEX ix_catalog_items_business_central_code ON catalog_items (business_central_code); + +CREATE INDEX ix_catalog_items_quality_class ON catalog_items (quality_class); + +ALTER TABLE catalog_items ADD CONSTRAINT ck_catalog_items_category_not_empty CHECK (length(category) > 0); + +ALTER TABLE catalog_items ADD CONSTRAINT ck_catalog_items_business_central_code_not_empty CHECK (length(business_central_code) > 0); + +ALTER TABLE catalog_items ADD CONSTRAINT ck_catalog_items_unit_not_empty CHECK (length(unit) > 0); + +ALTER TABLE catalog_items ADD CONSTRAINT fk_catalog_items_quality_classes_quality_class FOREIGN KEY (quality_class) REFERENCES quality_classes (code) ON DELETE RESTRICT; + +INSERT INTO "__EFMigrationsHistory" (migration_id, product_version) +VALUES ('20261117040905_AddCatalogItemDetails', '10.0.13'); + +COMMIT; diff --git a/src/MoissonMontreal.Api/Catalog/CatalogItemValidator.cs b/src/MoissonMontreal.Api/Catalog/CatalogItemValidator.cs new file mode 100644 index 0000000..77f1b79 --- /dev/null +++ b/src/MoissonMontreal.Api/Catalog/CatalogItemValidator.cs @@ -0,0 +1,68 @@ +using System.Text.RegularExpressions; +using MoissonMontreal.Core.Dtos; +using MoissonMontreal.Core.Entities; + +namespace MoissonMontreal.Api.Catalog; + +///

+/// Checks a catalog item request and returns the values ready to store. +/// +public static partial class CatalogItemValidator +{ + /// + /// Trims each field and reports every problem. A true result means can be saved. + /// The quality class must also exist in the quality_classes table; this method only checks its shape. + /// + public static bool TryNormalize(CatalogItemRequest request, out CatalogItemFields fields, out Dictionary errors) + { + var found = new Dictionary(); + var name = Required(request.Name, nameof(CatalogItemRequest.Name), CatalogItem.NameMaxLength, found); + var category = Required(request.Category, nameof(CatalogItemRequest.Category), CatalogItem.CategoryMaxLength, found); + var code = Required(request.BusinessCentralCode, nameof(CatalogItemRequest.BusinessCentralCode), CatalogItem.BusinessCentralCodeMaxLength, found); + var unit = Required(request.Unit, nameof(CatalogItemRequest.Unit), CatalogItem.UnitMaxLength, found); + var qualityClass = Quality(request.QualityClass, found); + + fields = new CatalogItemFields(name, category, code, unit, qualityClass); + errors = found; + return found.Count == 0; + } + + private static string Required(string? value, string field, int maxLength, Dictionary errors) + { + var trimmed = value?.Trim() ?? string.Empty; + if (trimmed.Length == 0) + { + errors[field] = [$"{field} is required."]; + } + else if (trimmed.Length > maxLength) + { + errors[field] = [$"{field} must be {maxLength} characters or fewer."]; + } + + return trimmed; + } + + private static string Quality(string? value, Dictionary errors) + { + var trimmed = value?.Trim() ?? string.Empty; + if (!QualityClassCode().IsMatch(trimmed)) + { + errors[nameof(CatalogItemRequest.QualityClass)] = ["QualityClass must be one capital letter, such as A, B or C."]; + } + + return trimmed; + } + + [GeneratedRegex("^[A-Z]$")] + private static partial Regex QualityClassCode(); +} + +/// +/// Trimmed catalog fields that passed validation. +/// +public readonly record struct CatalogItemFields( + string Name, + string Category, + string BusinessCentralCode, + string Unit, + string QualityClass); diff --git a/src/MoissonMontreal.Api/Controllers/CatalogItemsController.cs b/src/MoissonMontreal.Api/Controllers/CatalogItemsController.cs new file mode 100644 index 0000000..67f8f06 --- /dev/null +++ b/src/MoissonMontreal.Api/Controllers/CatalogItemsController.cs @@ -0,0 +1,166 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using MoissonMontreal.Api.Catalog; +using MoissonMontreal.Api.Data; +using MoissonMontreal.Api.Data.Configurations; +using MoissonMontreal.Core.Dtos; +using MoissonMontreal.Core.Entities; +using Npgsql; + +namespace MoissonMontreal.Api.Controllers; + +/// +/// Lists, creates and edits the foods in the catalog. +/// +[ApiController] +[Route("api/catalog-items")] +public class CatalogItemsController(MoissonDbContext db) : ControllerBase +{ + /// + /// Returns every catalog item, ordered by name. + /// + [HttpGet] + public async Task>> List(CancellationToken cancellationToken) + { + var items = await db.CatalogItems + .OrderBy(item => item.Name) + .ThenBy(item => item.BusinessCentralCode) + .Select(item => new CatalogItemDto( + item.Id, + item.Name, + item.Category, + item.BusinessCentralCode, + item.Unit, + item.QualityClassCode, + item.CreatedAt, + item.UpdatedAt)) + .ToListAsync(cancellationToken); + + return items; + } + + /// + /// Returns one catalog item. + /// + [HttpGet("{id:guid}")] + public async Task> Get(Guid id, CancellationToken cancellationToken) + { + var item = await db.CatalogItems.SingleOrDefaultAsync(item => item.Id == id, cancellationToken); + return item is null ? NotFound() : ToDto(item); + } + + /// + /// Adds a catalog item. The Business Central code must be new, and the quality class must exist. + /// + [HttpPost] + public async Task> Create(CatalogItemRequest request, CancellationToken cancellationToken) + { + var fields = await TryReadAsync(request, cancellationToken); + if (fields is null) + { + return ValidationProblem(new ValidationProblemDetails(LastErrors)); + } + + var item = new CatalogItem + { + Name = fields.Value.Name, + Category = fields.Value.Category, + BusinessCentralCode = fields.Value.BusinessCentralCode, + Unit = fields.Value.Unit, + QualityClassCode = fields.Value.QualityClass, + }; + db.CatalogItems.Add(item); + + if (await SaveConflictAsync(cancellationToken) is { } conflict) + { + return conflict; + } + + return CreatedAtAction(nameof(Get), new { id = item.Id }, ToDto(item)); + } + + /// + /// Replaces the fields of a catalog item. The Business Central code must stay unique. + /// + [HttpPut("{id:guid}")] + public async Task> Update(Guid id, CatalogItemRequest request, CancellationToken cancellationToken) + { + var fields = await TryReadAsync(request, cancellationToken); + if (fields is null) + { + return ValidationProblem(new ValidationProblemDetails(LastErrors)); + } + + var item = await db.CatalogItems.SingleOrDefaultAsync(item => item.Id == id, cancellationToken); + if (item is null) + { + return NotFound(); + } + + item.Name = fields.Value.Name; + item.Category = fields.Value.Category; + item.BusinessCentralCode = fields.Value.BusinessCentralCode; + item.Unit = fields.Value.Unit; + item.QualityClassCode = fields.Value.QualityClass; + item.UpdatedAt = DateTimeOffset.UtcNow; + + if (await SaveConflictAsync(cancellationToken) is { } conflict) + { + return conflict; + } + + return ToDto(item); + } + + private Dictionary LastErrors { get; set; } = []; + + private async Task TryReadAsync(CatalogItemRequest request, CancellationToken cancellationToken) + { + if (!CatalogItemValidator.TryNormalize(request, out var fields, out var errors)) + { + LastErrors = errors; + return null; + } + + var qualityExists = await db.QualityClasses.AnyAsync(quality => quality.Code == fields.QualityClass, cancellationToken); + if (!qualityExists) + { + LastErrors = new Dictionary + { + [nameof(CatalogItemRequest.QualityClass)] = ["QualityClass must be a quality class that exists."], + }; + return null; + } + + return fields; + } + + private async Task SaveConflictAsync(CancellationToken cancellationToken) + { + try + { + await db.SaveChangesAsync(cancellationToken); + return null; + } + catch (DbUpdateException exception) when (exception.InnerException is PostgresException postgres + && postgres.ConstraintName == CatalogItemConfiguration.BusinessCentralCodeIndex) + { + return Conflict(new ProblemDetails + { + Status = StatusCodes.Status409Conflict, + Title = "Business Central code already used", + Detail = "A catalog item with this Business Central code already exists.", + }); + } + } + + private static CatalogItemDto ToDto(CatalogItem item) => new( + item.Id, + item.Name, + item.Category, + item.BusinessCentralCode, + item.Unit, + item.QualityClassCode, + item.CreatedAt, + item.UpdatedAt); +} diff --git a/src/MoissonMontreal.Api/Data/Configurations/CatalogItemConfiguration.cs b/src/MoissonMontreal.Api/Data/Configurations/CatalogItemConfiguration.cs index 095f0df..fe5e7f5 100644 --- a/src/MoissonMontreal.Api/Data/Configurations/CatalogItemConfiguration.cs +++ b/src/MoissonMontreal.Api/Data/Configurations/CatalogItemConfiguration.cs @@ -10,16 +10,50 @@ namespace MoissonMontreal.Api.Data.Configurations; public class CatalogItemConfiguration : IEntityTypeConfiguration { /// - /// Configures the columns and constraint of the catalog_items table. + /// Name of the unique index on the Business Central code. + /// + public const string BusinessCentralCodeIndex = "ix_catalog_items_business_central_code"; + + /// + /// Configures the columns, the unique Business Central code and the link to the quality class. /// /// Builder used to configure the catalog item entity. public void Configure(EntityTypeBuilder builder) { - builder.ToTable(t => t.HasCheckConstraint("ck_catalog_items_name_not_empty", "length(name) > 0")); + builder.ToTable(t => + { + t.HasCheckConstraint("ck_catalog_items_name_not_empty", "length(name) > 0"); + t.HasCheckConstraint("ck_catalog_items_category_not_empty", "length(category) > 0"); + t.HasCheckConstraint("ck_catalog_items_business_central_code_not_empty", "length(business_central_code) > 0"); + t.HasCheckConstraint("ck_catalog_items_unit_not_empty", "length(unit) > 0"); + }); builder.Property(c => c.Id).HasDefaultValueSql("gen_random_uuid()"); - builder.Property(c => c.Name).HasMaxLength(255); + builder.Property(c => c.Name).HasMaxLength(CatalogItem.NameMaxLength); + + builder.Property(c => c.Category).HasMaxLength(CatalogItem.CategoryMaxLength); + + builder.Property(c => c.BusinessCentralCode).HasMaxLength(CatalogItem.BusinessCentralCodeMaxLength); + + builder.HasIndex(c => c.BusinessCentralCode) + .IsUnique() + .HasDatabaseName(BusinessCentralCodeIndex); + + builder.Property(c => c.Unit).HasMaxLength(CatalogItem.UnitMaxLength); + + builder.Property(c => c.QualityClassCode) + .HasColumnName("quality_class") + .HasMaxLength(1); + + builder.HasIndex(c => c.QualityClassCode) + .HasDatabaseName("ix_catalog_items_quality_class"); + + builder.HasOne(c => c.QualityClass) + .WithMany() + .HasForeignKey(c => c.QualityClassCode) + .OnDelete(DeleteBehavior.Restrict) + .HasConstraintName("fk_catalog_items_quality_classes_quality_class"); builder.Property(c => c.CreatedAt).HasDefaultValueSql("now()"); } diff --git a/src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.Designer.cs b/src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.Designer.cs new file mode 100644 index 0000000..3c149a9 --- /dev/null +++ b/src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.Designer.cs @@ -0,0 +1,651 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using MoissonMontreal.Api.Data; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace MoissonMontreal.Api.Data.Migrations +{ + [DbContext(typeof(MoissonDbContext))] + [Migration("20261117040905_AddCatalogItemDetails")] + partial class AddCatalogItemDetails + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "10.0.13") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.CatalogItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("BusinessCentralCode") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("character varying(50)") + .HasColumnName("business_central_code"); + + b.Property("Category") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("category"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at") + .HasDefaultValueSql("now()"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("name"); + + b.Property("QualityClassCode") + .IsRequired() + .HasMaxLength(1) + .HasColumnType("character varying(1)") + .HasColumnName("quality_class"); + + b.Property("Unit") + .IsRequired() + .HasMaxLength(20) + .HasColumnType("character varying(20)") + .HasColumnName("unit"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("updated_at"); + + b.HasKey("Id") + .HasName("pk_catalog_items"); + + b.HasIndex("BusinessCentralCode") + .IsUnique() + .HasDatabaseName("ix_catalog_items_business_central_code"); + + b.HasIndex("QualityClassCode") + .HasDatabaseName("ix_catalog_items_quality_class"); + + b.ToTable("catalog_items", null, t => + { + t.HasCheckConstraint("ck_catalog_items_business_central_code_not_empty", "length(business_central_code) > 0"); + + t.HasCheckConstraint("ck_catalog_items_category_not_empty", "length(category) > 0"); + + t.HasCheckConstraint("ck_catalog_items_name_not_empty", "length(name) > 0"); + + t.HasCheckConstraint("ck_catalog_items_unit_not_empty", "length(unit) > 0"); + }); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.Donor", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("Address") + .HasColumnType("text") + .HasColumnName("address"); + + b.Property("ContactPerson") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("contact_person"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at") + .HasDefaultValueSql("now()"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("name"); + + b.Property("PostalCode") + .HasMaxLength(20) + .HasColumnType("character varying(20)") + .HasColumnName("postal_code"); + + b.HasKey("Id") + .HasName("pk_donors"); + + b.ToTable("donors", null, t => + { + t.HasCheckConstraint("ck_donors_name_not_empty", "length(name) > 0"); + }); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.FoodItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("CatalogItemId") + .HasColumnType("uuid") + .HasColumnName("catalog_item_id"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at") + .HasDefaultValueSql("now()"); + + b.Property("DonationDate") + .HasColumnType("date") + .HasColumnName("donation_date"); + + b.Property("DonorId") + .HasColumnType("uuid") + .HasColumnName("donor_id"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("name"); + + b.Property("Quality") + .IsRequired() + .HasMaxLength(1) + .HasColumnType("character varying(1)") + .HasColumnName("quality"); + + b.Property("Quantity") + .HasPrecision(12, 2) + .HasColumnType("numeric(12,2)") + .HasColumnName("quantity"); + + b.Property("Unit") + .IsRequired() + .HasMaxLength(20) + .HasColumnType("character varying(20)") + .HasColumnName("unit"); + + b.HasKey("Id") + .HasName("pk_food_items"); + + b.HasAlternateKey("Id", "DonorId") + .HasName("ak_food_items_id_donor_id"); + + b.HasIndex("CatalogItemId") + .HasDatabaseName("ix_food_items_catalog_item_id"); + + b.HasIndex("DonorId") + .HasDatabaseName("ix_food_items_donor_id"); + + b.HasIndex("Quality") + .HasDatabaseName("ix_food_items_quality"); + + b.ToTable("food_items", null, t => + { + t.HasCheckConstraint("ck_food_items_name_not_empty", "length(name) > 0"); + + t.HasCheckConstraint("ck_food_items_quantity_positive", "quantity > 0"); + + t.HasCheckConstraint("ck_food_items_unit_not_empty", "length(unit) > 0"); + }); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.Price", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("CatalogItemId") + .HasColumnType("uuid") + .HasColumnName("catalog_item_id"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at") + .HasDefaultValueSql("now()"); + + b.Property("EffectiveDate") + .HasColumnType("date") + .HasColumnName("effective_date"); + + b.Property("UnitPrice") + .HasPrecision(12, 4) + .HasColumnType("numeric(12,4)") + .HasColumnName("unit_price"); + + b.HasKey("Id") + .HasName("pk_prices"); + + b.HasIndex("CatalogItemId", "EffectiveDate") + .IsUnique() + .HasDatabaseName("ix_prices_catalog_item_id_effective_date"); + + b.ToTable("prices", null, t => + { + t.HasCheckConstraint("ck_prices_unit_price_positive", "unit_price > 0"); + }); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.QualityClass", b => + { + b.Property("Code") + .HasMaxLength(1) + .HasColumnType("character varying(1)") + .HasColumnName("code"); + + b.Property("MaxPercentage") + .HasPrecision(5, 2) + .HasColumnType("numeric(5,2)") + .HasColumnName("max_percentage"); + + b.Property("MinPercentage") + .HasPrecision(5, 2) + .HasColumnType("numeric(5,2)") + .HasColumnName("min_percentage"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("name"); + + b.Property("Percentage") + .HasPrecision(5, 2) + .HasColumnType("numeric(5,2)") + .HasColumnName("percentage"); + + b.HasKey("Code") + .HasName("pk_quality_classes"); + + b.HasIndex("Name") + .IsUnique() + .HasDatabaseName("ix_quality_classes_name"); + + b.ToTable("quality_classes", null, t => + { + t.HasCheckConstraint("ck_quality_classes_code_format", "code ~ '^[A-Z]$'"); + + t.HasCheckConstraint("ck_quality_classes_name_not_empty", "length(name) > 0"); + + t.HasCheckConstraint("ck_quality_classes_percentage_in_range", "percentage BETWEEN min_percentage AND max_percentage"); + + t.HasCheckConstraint("ck_quality_classes_range_valid", "min_percentage >= 0 AND min_percentage <= max_percentage AND max_percentage <= 100"); + }); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.Receipt", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at") + .HasDefaultValueSql("now()"); + + b.Property("DonorId") + .HasColumnType("uuid") + .HasColumnName("donor_id"); + + b.Property("ReceiptDate") + .ValueGeneratedOnAdd() + .HasColumnType("date") + .HasColumnName("receipt_date") + .HasDefaultValueSql("(now() AT TIME ZONE 'America/Montreal')::date"); + + b.Property("TotalAmount") + .HasPrecision(12, 2) + .HasColumnType("numeric(12,2)") + .HasColumnName("total_amount"); + + b.HasKey("Id") + .HasName("pk_receipts"); + + b.HasAlternateKey("Id", "DonorId") + .HasName("ak_receipts_id_donor_id"); + + b.HasIndex("DonorId") + .HasDatabaseName("ix_receipts_donor_id"); + + b.ToTable("receipts", null, t => + { + t.HasCheckConstraint("ck_receipts_total_amount_not_negative", "total_amount >= 0"); + }); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.ReceiptItem", b => + { + b.Property("ReceiptId") + .HasColumnType("uuid") + .HasColumnName("receipt_id"); + + b.Property("FoodItemId") + .HasColumnType("uuid") + .HasColumnName("food_item_id"); + + b.Property("DonorId") + .HasColumnType("uuid") + .HasColumnName("donor_id"); + + b.Property("QualityPercent") + .HasPrecision(5, 2) + .HasColumnType("numeric(5,2)") + .HasColumnName("quality_percent"); + + b.Property("Quantity") + .HasPrecision(12, 2) + .HasColumnType("numeric(12,2)") + .HasColumnName("quantity"); + + b.Property("Unit") + .IsRequired() + .HasMaxLength(20) + .HasColumnType("character varying(20)") + .HasColumnName("unit"); + + b.Property("UnitPrice") + .HasPrecision(12, 4) + .HasColumnType("numeric(12,4)") + .HasColumnName("unit_price"); + + b.HasKey("ReceiptId", "FoodItemId") + .HasName("pk_receipt_items"); + + b.HasIndex("FoodItemId") + .IsUnique() + .HasDatabaseName("ix_receipt_items_food_item_id"); + + b.HasIndex("FoodItemId", "DonorId") + .HasDatabaseName("ix_receipt_items_food_item_id_donor_id"); + + b.HasIndex("ReceiptId", "DonorId") + .HasDatabaseName("ix_receipt_items_receipt_id_donor_id"); + + b.ToTable("receipt_items", null, t => + { + t.HasCheckConstraint("ck_receipt_items_quality_percent_range", "quality_percent BETWEEN 0 AND 100"); + + t.HasCheckConstraint("ck_receipt_items_quantity_positive", "quantity > 0"); + + t.HasCheckConstraint("ck_receipt_items_unit_not_empty", "length(unit) > 0"); + + t.HasCheckConstraint("ck_receipt_items_unit_price_positive", "unit_price > 0"); + }); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.Role", b => + { + b.Property("Id") + .HasColumnType("integer") + .HasColumnName("id"); + + b.Property("Code") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("character varying(50)") + .HasColumnName("code"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("name"); + + b.HasKey("Id") + .HasName("pk_roles"); + + b.HasIndex("Code") + .IsUnique() + .HasDatabaseName("ix_roles_code"); + + b.HasIndex("Name") + .IsUnique() + .HasDatabaseName("ix_roles_name"); + + b.ToTable("roles", (string)null); + + b.HasData( + new + { + Id = 1, + Code = "Supply", + Name = "Supply" + }, + new + { + Id = 2, + Code = "SupplyDirector", + Name = "Supply Director" + }, + new + { + Id = 3, + Code = "Finance", + Name = "Finance" + }, + new + { + Id = 4, + Code = "Admin", + Name = "Admin" + }); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at") + .HasDefaultValueSql("now()"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)") + .HasColumnName("display_name"); + + b.Property("Email") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)") + .HasColumnName("email"); + + b.Property("EntraObjectId") + .HasColumnType("uuid") + .HasColumnName("entra_object_id"); + + b.Property("IsActive") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(true) + .HasColumnName("is_active"); + + b.Property("RoleId") + .HasColumnType("integer") + .HasColumnName("role_id"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("updated_at"); + + b.HasKey("Id") + .HasName("pk_users"); + + b.HasIndex("Email") + .IsUnique() + .HasDatabaseName("ix_users_email"); + + b.HasIndex("EntraObjectId") + .IsUnique() + .HasDatabaseName("ix_users_entra_object_id"); + + b.HasIndex("RoleId") + .HasDatabaseName("ix_users_role_id"); + + b.ToTable("users", null, t => + { + t.HasCheckConstraint("ck_users_email_lowercase", "email = lower(email)"); + }); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.CatalogItem", b => + { + b.HasOne("MoissonMontreal.Core.Entities.QualityClass", "QualityClass") + .WithMany() + .HasForeignKey("QualityClassCode") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_catalog_items_quality_classes_quality_class"); + + b.Navigation("QualityClass"); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.FoodItem", b => + { + b.HasOne("MoissonMontreal.Core.Entities.CatalogItem", "CatalogItem") + .WithMany() + .HasForeignKey("CatalogItemId") + .OnDelete(DeleteBehavior.Restrict) + .HasConstraintName("fk_food_items_catalog_items_catalog_item_id"); + + b.HasOne("MoissonMontreal.Core.Entities.Donor", "Donor") + .WithMany("FoodItems") + .HasForeignKey("DonorId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_food_items_donors_donor_id"); + + b.HasOne("MoissonMontreal.Core.Entities.QualityClass", "QualityClass") + .WithMany() + .HasForeignKey("Quality") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_food_items_quality_classes_quality"); + + b.Navigation("CatalogItem"); + + b.Navigation("Donor"); + + b.Navigation("QualityClass"); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.Price", b => + { + b.HasOne("MoissonMontreal.Core.Entities.CatalogItem", "CatalogItem") + .WithMany("Prices") + .HasForeignKey("CatalogItemId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_prices_catalog_items_catalog_item_id"); + + b.Navigation("CatalogItem"); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.Receipt", b => + { + b.HasOne("MoissonMontreal.Core.Entities.Donor", "Donor") + .WithMany() + .HasForeignKey("DonorId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_receipts_donors_donor_id"); + + b.Navigation("Donor"); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.ReceiptItem", b => + { + b.HasOne("MoissonMontreal.Core.Entities.FoodItem", "FoodItem") + .WithMany() + .HasForeignKey("FoodItemId", "DonorId") + .HasPrincipalKey("Id", "DonorId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_receipt_items_food_items_food_item_id_donor_id"); + + b.HasOne("MoissonMontreal.Core.Entities.Receipt", "Receipt") + .WithMany("Items") + .HasForeignKey("ReceiptId", "DonorId") + .HasPrincipalKey("Id", "DonorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_receipt_items_receipts_receipt_id_donor_id"); + + b.Navigation("FoodItem"); + + b.Navigation("Receipt"); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.User", b => + { + b.HasOne("MoissonMontreal.Core.Entities.Role", "Role") + .WithMany("Users") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_users_roles_role_id"); + + b.Navigation("Role"); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.CatalogItem", b => + { + b.Navigation("Prices"); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.Donor", b => + { + b.Navigation("FoodItems"); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.Receipt", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("MoissonMontreal.Core.Entities.Role", b => + { + b.Navigation("Users"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.cs b/src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.cs new file mode 100644 index 0000000..65e1f93 --- /dev/null +++ b/src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.cs @@ -0,0 +1,179 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace MoissonMontreal.Api.Data.Migrations +{ + /// + public partial class AddCatalogItemDetails : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "business_central_code", + table: "catalog_items", + type: "character varying(50)", + maxLength: 50, + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "category", + table: "catalog_items", + type: "character varying(100)", + maxLength: 100, + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "quality_class", + table: "catalog_items", + type: "character varying(1)", + maxLength: 1, + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "unit", + table: "catalog_items", + type: "character varying(20)", + maxLength: 20, + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "updated_at", + table: "catalog_items", + type: "timestamp with time zone", + nullable: true); + + migrationBuilder.AlterColumn( + name: "business_central_code", + table: "catalog_items", + type: "character varying(50)", + maxLength: 50, + nullable: false, + oldClrType: typeof(string), + oldType: "character varying(50)", + oldMaxLength: 50, + oldDefaultValue: ""); + + migrationBuilder.AlterColumn( + name: "category", + table: "catalog_items", + type: "character varying(100)", + maxLength: 100, + nullable: false, + oldClrType: typeof(string), + oldType: "character varying(100)", + oldMaxLength: 100, + oldDefaultValue: ""); + + migrationBuilder.AlterColumn( + name: "quality_class", + table: "catalog_items", + type: "character varying(1)", + maxLength: 1, + nullable: false, + oldClrType: typeof(string), + oldType: "character varying(1)", + oldMaxLength: 1, + oldDefaultValue: ""); + + migrationBuilder.AlterColumn( + name: "unit", + table: "catalog_items", + type: "character varying(20)", + maxLength: 20, + nullable: false, + oldClrType: typeof(string), + oldType: "character varying(20)", + oldMaxLength: 20, + oldDefaultValue: ""); + + migrationBuilder.CreateIndex( + name: "ix_catalog_items_business_central_code", + table: "catalog_items", + column: "business_central_code", + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_catalog_items_quality_class", + table: "catalog_items", + column: "quality_class"); + + migrationBuilder.AddCheckConstraint( + name: "ck_catalog_items_business_central_code_not_empty", + table: "catalog_items", + sql: "length(business_central_code) > 0"); + + migrationBuilder.AddCheckConstraint( + name: "ck_catalog_items_category_not_empty", + table: "catalog_items", + sql: "length(category) > 0"); + + migrationBuilder.AddCheckConstraint( + name: "ck_catalog_items_unit_not_empty", + table: "catalog_items", + sql: "length(unit) > 0"); + + migrationBuilder.AddForeignKey( + name: "fk_catalog_items_quality_classes_quality_class", + table: "catalog_items", + column: "quality_class", + principalTable: "quality_classes", + principalColumn: "code", + onDelete: ReferentialAction.Restrict); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "fk_catalog_items_quality_classes_quality_class", + table: "catalog_items"); + + migrationBuilder.DropIndex( + name: "ix_catalog_items_business_central_code", + table: "catalog_items"); + + migrationBuilder.DropIndex( + name: "ix_catalog_items_quality_class", + table: "catalog_items"); + + migrationBuilder.DropCheckConstraint( + name: "ck_catalog_items_business_central_code_not_empty", + table: "catalog_items"); + + migrationBuilder.DropCheckConstraint( + name: "ck_catalog_items_category_not_empty", + table: "catalog_items"); + + migrationBuilder.DropCheckConstraint( + name: "ck_catalog_items_unit_not_empty", + table: "catalog_items"); + + migrationBuilder.DropColumn( + name: "business_central_code", + table: "catalog_items"); + + migrationBuilder.DropColumn( + name: "category", + table: "catalog_items"); + + migrationBuilder.DropColumn( + name: "quality_class", + table: "catalog_items"); + + migrationBuilder.DropColumn( + name: "unit", + table: "catalog_items"); + + migrationBuilder.DropColumn( + name: "updated_at", + table: "catalog_items"); + } + } +} diff --git a/src/MoissonMontreal.Api/Data/Migrations/MoissonDbContextModelSnapshot.cs b/src/MoissonMontreal.Api/Data/Migrations/MoissonDbContextModelSnapshot.cs index 30f0202..2cf2555 100644 --- a/src/MoissonMontreal.Api/Data/Migrations/MoissonDbContextModelSnapshot.cs +++ b/src/MoissonMontreal.Api/Data/Migrations/MoissonDbContextModelSnapshot.cs @@ -30,6 +30,18 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnName("id") .HasDefaultValueSql("gen_random_uuid()"); + b.Property("BusinessCentralCode") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("character varying(50)") + .HasColumnName("business_central_code"); + + b.Property("Category") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("category"); + b.Property("CreatedAt") .ValueGeneratedOnAdd() .HasColumnType("timestamp with time zone") @@ -42,12 +54,41 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("character varying(255)") .HasColumnName("name"); + b.Property("QualityClassCode") + .IsRequired() + .HasMaxLength(1) + .HasColumnType("character varying(1)") + .HasColumnName("quality_class"); + + b.Property("Unit") + .IsRequired() + .HasMaxLength(20) + .HasColumnType("character varying(20)") + .HasColumnName("unit"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("updated_at"); + b.HasKey("Id") .HasName("pk_catalog_items"); + b.HasIndex("BusinessCentralCode") + .IsUnique() + .HasDatabaseName("ix_catalog_items_business_central_code"); + + b.HasIndex("QualityClassCode") + .HasDatabaseName("ix_catalog_items_quality_class"); + b.ToTable("catalog_items", null, t => { + t.HasCheckConstraint("ck_catalog_items_business_central_code_not_empty", "length(business_central_code) > 0"); + + t.HasCheckConstraint("ck_catalog_items_category_not_empty", "length(category) > 0"); + t.HasCheckConstraint("ck_catalog_items_name_not_empty", "length(name) > 0"); + + t.HasCheckConstraint("ck_catalog_items_unit_not_empty", "length(unit) > 0"); }); }); @@ -482,6 +523,18 @@ protected override void BuildModel(ModelBuilder modelBuilder) }); }); + modelBuilder.Entity("MoissonMontreal.Core.Entities.CatalogItem", b => + { + b.HasOne("MoissonMontreal.Core.Entities.QualityClass", "QualityClass") + .WithMany() + .HasForeignKey("QualityClassCode") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired() + .HasConstraintName("fk_catalog_items_quality_classes_quality_class"); + + b.Navigation("QualityClass"); + }); + modelBuilder.Entity("MoissonMontreal.Core.Entities.FoodItem", b => { b.HasOne("MoissonMontreal.Core.Entities.CatalogItem", "CatalogItem") diff --git a/src/MoissonMontreal.Core/Dtos/CatalogItemDto.cs b/src/MoissonMontreal.Core/Dtos/CatalogItemDto.cs new file mode 100644 index 0000000..ec0f047 --- /dev/null +++ b/src/MoissonMontreal.Core/Dtos/CatalogItemDto.cs @@ -0,0 +1,14 @@ +namespace MoissonMontreal.Core.Dtos; + +/// +/// A catalog item returned by the API. +/// +public record CatalogItemDto( + Guid Id, + string Name, + string Category, + string BusinessCentralCode, + string Unit, + string QualityClass, + DateTimeOffset CreatedAt, + DateTimeOffset? UpdatedAt); diff --git a/src/MoissonMontreal.Core/Dtos/CatalogItemRequest.cs b/src/MoissonMontreal.Core/Dtos/CatalogItemRequest.cs new file mode 100644 index 0000000..fec60d7 --- /dev/null +++ b/src/MoissonMontreal.Core/Dtos/CatalogItemRequest.cs @@ -0,0 +1,11 @@ +namespace MoissonMontreal.Core.Dtos; + +/// +/// Fields sent when a catalog item is created or edited. +/// +public record CatalogItemRequest( + string? Name, + string? Category, + string? BusinessCentralCode, + string? Unit, + string? QualityClass); diff --git a/src/MoissonMontreal.Core/Entities/CatalogItem.cs b/src/MoissonMontreal.Core/Entities/CatalogItem.cs index fe00b92..ed97341 100644 --- a/src/MoissonMontreal.Core/Entities/CatalogItem.cs +++ b/src/MoissonMontreal.Core/Entities/CatalogItem.cs @@ -6,6 +6,26 @@ namespace MoissonMontreal.Core.Entities; /// public class CatalogItem { + /// + /// Longest name stored for a catalog item. + /// + public const int NameMaxLength = 255; + + /// + /// Longest category stored for a catalog item. + /// + public const int CategoryMaxLength = 100; + + /// + /// Longest Business Central code stored for a catalog item. + /// + public const int BusinessCentralCodeMaxLength = 50; + + /// + /// Longest unit stored for a catalog item. The unit is free text until the price-per-unit decision in issue 28. + /// + public const int UnitMaxLength = 20; + /// /// Identifier of the catalog item, assigned by the database. /// @@ -16,11 +36,41 @@ public class CatalogItem /// public string Name { get; set; } = string.Empty; + /// + /// Group the food belongs to, such as Bakery. Cannot be empty. + /// + public string Category { get; set; } = string.Empty; + + /// + /// Code of this food in Business Central. Two catalog items cannot share a code. + /// + public string BusinessCentralCode { get; set; } = string.Empty; + + /// + /// Unit used to count this food, as free text for now (for example kg or caisse). + /// + public string Unit { get; set; } = string.Empty; + + /// + /// Code of the quality class of this food. It must match an existing quality class. + /// + public string QualityClassCode { get; set; } = string.Empty; + + /// + /// Quality class of this food. The class lives on the catalog item. + /// + public QualityClass QualityClass { get; set; } = null!; + /// /// Date and time the catalog item was created, set by the database. /// public DateTimeOffset CreatedAt { get; set; } + /// + /// Date and time of the last change, or null if the item was never changed. + /// + public DateTimeOffset? UpdatedAt { get; set; } + /// /// Every price this item has had, one per effective date. /// diff --git a/tests/MoissonMontreal.Tests/Api/CatalogEndpointTests.cs b/tests/MoissonMontreal.Tests/Api/CatalogEndpointTests.cs new file mode 100644 index 0000000..ff19f28 --- /dev/null +++ b/tests/MoissonMontreal.Tests/Api/CatalogEndpointTests.cs @@ -0,0 +1,195 @@ +using System.Net; +using System.Net.Http.Headers; +using System.Net.Http.Json; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using MoissonMontreal.Api.Data; +using MoissonMontreal.Core.Dtos; +using MoissonMontreal.Tests.Fixtures; + +namespace MoissonMontreal.Tests.Api; + +[Trait("Category", "Integration")] +public class CatalogEndpointTests(CatalogApiFactory factory) : IClassFixture +{ + [Fact] + public async Task List_ReturnsUnauthorized_WhenTokenIsMissing() + { + using var client = factory.CreateClient(); + + var response = await client.GetAsync("/api/catalog-items"); + + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + } + + [Fact] + public async Task List_ReturnsTheCatalogOrderedByName() + { + await ClearAsync(); + using var client = CreateClient(); + await CreateAsync(client, Request(name: "Pommes", code: "BC-APPLES")); + await CreateAsync(client, Request(name: "Pain", code: "BC-BREAD")); + + var response = await client.GetAsync("/api/catalog-items"); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + var items = await response.Content.ReadFromJsonAsync>(); + Assert.Equal(["Pain", "Pommes"], items!.Select(item => item.Name)); + } + + [Fact] + public async Task Create_ReturnsTheSavedItem() + { + using var client = CreateClient(); + + var response = await client.PostAsJsonAsync("/api/catalog-items", Request()); + + Assert.Equal(HttpStatusCode.Created, response.StatusCode); + var item = await response.Content.ReadFromJsonAsync(); + Assert.Equal("Pain", item!.Name); + Assert.Equal("Boulangerie", item.Category); + Assert.Equal("BC-001", item.BusinessCentralCode); + Assert.Equal("kg", item.Unit); + Assert.Equal("A", item.QualityClass); + Assert.NotEqual(Guid.Empty, item.Id); + Assert.NotEqual(default, item.CreatedAt); + Assert.Null(item.UpdatedAt); + Assert.Equal($"/api/catalog-items/{item.Id}", response.Headers.Location?.AbsolutePath); + } + + [Fact] + public async Task Get_ReturnsTheItem() + { + using var client = CreateClient(); + var created = await CreateAsync(client, Request(code: "BC-GET")); + + var response = await client.GetAsync($"/api/catalog-items/{created.Id}"); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + var item = await response.Content.ReadFromJsonAsync(); + Assert.Equal(created.Id, item!.Id); + } + + [Fact] + public async Task Get_ReturnsNotFound_WhenTheItemDoesNotExist() + { + using var client = CreateClient(); + + var response = await client.GetAsync($"/api/catalog-items/{Guid.NewGuid()}"); + + Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); + } + + [Fact] + public async Task Update_ReplacesTheFields() + { + using var client = CreateClient(); + var created = await CreateAsync(client, Request(code: "BC-EDIT")); + + var response = await client.PutAsJsonAsync( + $"/api/catalog-items/{created.Id}", + Request(name: "Pain complet", category: "Boulangerie", code: "BC-EDIT-2", unit: "caisse", qualityClass: "B")); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + var item = await response.Content.ReadFromJsonAsync(); + Assert.Equal("Pain complet", item!.Name); + Assert.Equal("BC-EDIT-2", item.BusinessCentralCode); + Assert.Equal("caisse", item.Unit); + Assert.Equal("B", item.QualityClass); + Assert.NotNull(item.UpdatedAt); + } + + [Fact] + public async Task Update_KeepsTheSameBusinessCentralCode() + { + using var client = CreateClient(); + var created = await CreateAsync(client, Request(code: "BC-SAME")); + + var response = await client.PutAsJsonAsync($"/api/catalog-items/{created.Id}", Request(name: "Pain bio", code: "BC-SAME")); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task Update_ReturnsNotFound_WhenTheItemDoesNotExist() + { + using var client = CreateClient(); + + var response = await client.PutAsJsonAsync($"/api/catalog-items/{Guid.NewGuid()}", Request(code: "BC-MISSING")); + + Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); + } + + [Fact] + public async Task Create_ReturnsConflict_WhenTheBusinessCentralCodeExists() + { + using var client = CreateClient(); + await CreateAsync(client, Request(code: "BC-DUP")); + + var response = await client.PostAsJsonAsync("/api/catalog-items", Request(name: "Riz", code: "BC-DUP")); + + Assert.Equal(HttpStatusCode.Conflict, response.StatusCode); + } + + [Fact] + public async Task Update_ReturnsConflict_WhenTheBusinessCentralCodeBelongsToAnotherItem() + { + using var client = CreateClient(); + await CreateAsync(client, Request(name: "Riz", code: "BC-RICE")); + var bread = await CreateAsync(client, Request(code: "BC-BREAD-2")); + + var response = await client.PutAsJsonAsync($"/api/catalog-items/{bread.Id}", Request(code: "BC-RICE")); + + Assert.Equal(HttpStatusCode.Conflict, response.StatusCode); + } + + [Fact] + public async Task Create_ReturnsBadRequest_WhenTheQualityClassDoesNotExist() + { + using var client = CreateClient(); + + var response = await client.PostAsJsonAsync("/api/catalog-items", Request(qualityClass: "Z", code: "BC-BAD")); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + var problem = await response.Content.ReadFromJsonAsync(); + Assert.Contains(nameof(CatalogItemRequest.QualityClass), problem!.Errors.Keys); + } + + [Fact] + public async Task Create_ReturnsBadRequest_WhenTheNameIsBlank() + { + using var client = CreateClient(); + + var response = await client.PostAsJsonAsync("/api/catalog-items", Request(name: " ", code: "BC-BLANK")); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + } + + private HttpClient CreateClient() + { + var client = factory.CreateClient(); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", factory.CreateToken()); + return client; + } + + private static CatalogItemRequest Request( + string name = "Pain", + string category = "Boulangerie", + string code = "BC-001", + string unit = "kg", + string qualityClass = "A") => new(name, category, code, unit, qualityClass); + + private static async Task CreateAsync(HttpClient client, CatalogItemRequest request) + { + var response = await client.PostAsJsonAsync("/api/catalog-items", request); + Assert.Equal(HttpStatusCode.Created, response.StatusCode); + return (await response.Content.ReadFromJsonAsync())!; + } + + private async Task ClearAsync() + { + await using var context = new MoissonDbContext( + new DbContextOptionsBuilder().UseNpgsql(factory.ConnectionString).Options); + await context.CatalogItems.ExecuteDeleteAsync(); + } +} diff --git a/tests/MoissonMontreal.Tests/Api/CatalogItemValidatorTests.cs b/tests/MoissonMontreal.Tests/Api/CatalogItemValidatorTests.cs new file mode 100644 index 0000000..6dc5687 --- /dev/null +++ b/tests/MoissonMontreal.Tests/Api/CatalogItemValidatorTests.cs @@ -0,0 +1,107 @@ +using MoissonMontreal.Api.Catalog; +using MoissonMontreal.Core.Dtos; +using MoissonMontreal.Core.Entities; + +namespace MoissonMontreal.Tests.Api; + +public class CatalogItemValidatorTests +{ + [Fact] + public void TryNormalize_TrimsEachField() + { + var request = new CatalogItemRequest(" Pain ", " Boulangerie ", " BC-001 ", " kg ", " A "); + + var ok = CatalogItemValidator.TryNormalize(request, out var fields, out var errors); + + Assert.True(ok); + Assert.Empty(errors); + Assert.Equal(new CatalogItemFields("Pain", "Boulangerie", "BC-001", "kg", "A"), fields); + } + + [Theory] + [InlineData("A")] + [InlineData("B")] + [InlineData("Z")] + public void TryNormalize_AcceptsASingleCapitalLetter(string qualityClass) + { + var ok = CatalogItemValidator.TryNormalize(Valid() with { QualityClass = qualityClass }, out var fields, out _); + + Assert.True(ok); + Assert.Equal(qualityClass, fields.QualityClass); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void TryNormalize_RejectsABlankName(string? name) + { + var ok = CatalogItemValidator.TryNormalize(Valid() with { Name = name }, out _, out var errors); + + Assert.False(ok); + Assert.Contains(nameof(CatalogItemRequest.Name), errors.Keys); + } + + [Fact] + public void TryNormalize_RejectsANameThatIsTooLong() + { + var ok = CatalogItemValidator.TryNormalize( + Valid() with { Name = new string('a', CatalogItem.NameMaxLength + 1) }, + out _, + out var errors); + + Assert.False(ok); + Assert.Contains(nameof(CatalogItemRequest.Name), errors.Keys); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void TryNormalize_RejectsABlankCategory(string? category) + { + var ok = CatalogItemValidator.TryNormalize(Valid() with { Category = category }, out _, out var errors); + + Assert.False(ok); + Assert.Contains(nameof(CatalogItemRequest.Category), errors.Keys); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void TryNormalize_RejectsABlankBusinessCentralCode(string? code) + { + var ok = CatalogItemValidator.TryNormalize(Valid() with { BusinessCentralCode = code }, out _, out var errors); + + Assert.False(ok); + Assert.Contains(nameof(CatalogItemRequest.BusinessCentralCode), errors.Keys); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public void TryNormalize_RejectsABlankUnit(string? unit) + { + var ok = CatalogItemValidator.TryNormalize(Valid() with { Unit = unit }, out _, out var errors); + + Assert.False(ok); + Assert.Contains(nameof(CatalogItemRequest.Unit), errors.Keys); + } + + [Theory] + [InlineData("a")] + [InlineData("AB")] + [InlineData("")] + [InlineData(null)] + public void TryNormalize_RejectsAQualityClassThatIsNotOneCapitalLetter(string? qualityClass) + { + var ok = CatalogItemValidator.TryNormalize(Valid() with { QualityClass = qualityClass }, out _, out var errors); + + Assert.False(ok); + Assert.Contains(nameof(CatalogItemRequest.QualityClass), errors.Keys); + } + + private static CatalogItemRequest Valid() => new("Pain", "Boulangerie", "BC-001", "kg", "A"); +} diff --git a/tests/MoissonMontreal.Tests/Api/CatalogItemsMigrationTests.cs b/tests/MoissonMontreal.Tests/Api/CatalogItemsMigrationTests.cs new file mode 100644 index 0000000..301371d --- /dev/null +++ b/tests/MoissonMontreal.Tests/Api/CatalogItemsMigrationTests.cs @@ -0,0 +1,132 @@ +using System.Data.Common; +using Microsoft.EntityFrameworkCore; +using MoissonMontreal.Api.Data; +using MoissonMontreal.Api.Data.Configurations; +using MoissonMontreal.Core.Entities; +using MoissonMontreal.Tests.Fixtures; + +namespace MoissonMontreal.Tests.Api; + +[Trait("Category", "Integration")] +public class CatalogItemsMigrationTests(PostgresFixture postgres) : IClassFixture +{ + [Fact] + public async Task CatalogItem_StoresCategoryBusinessCentralCodeUnitAndQualityClass() + { + var seed = await SeedAsync(); + + await using var context = CreateContext(); + var saved = await context.CatalogItems.Include(item => item.QualityClass).SingleAsync(item => item.Id == seed.Id); + + Assert.Equal("Boulangerie", saved.Category); + Assert.Equal(seed.Code, saved.BusinessCentralCode); + Assert.Equal("kg", saved.Unit); + Assert.Equal("A", saved.QualityClassCode); + Assert.Equal("A", saved.QualityClass.Code); + Assert.Null(saved.UpdatedAt); + } + + [Fact] + public async Task SaveChanges_Throws_WhenBusinessCentralCodeIsDuplicated() + { + var seed = await SeedAsync(); + + await using var context = CreateContext(); + context.CatalogItems.Add(Item(code: seed.Code, name: "Pain blanc")); + + await PostgresConstraintAssertions.AssertViolatesConstraintAsync(context, CatalogItemConfiguration.BusinessCentralCodeIndex); + } + + [Fact] + public async Task SaveChanges_Throws_WhenCategoryIsEmpty() + { + await using var context = CreateContext(); + await context.Database.MigrateAsync(); + context.CatalogItems.Add(Item(category: "")); + + await PostgresConstraintAssertions.AssertViolatesConstraintAsync(context, "ck_catalog_items_category_not_empty"); + } + + [Fact] + public async Task SaveChanges_Throws_WhenBusinessCentralCodeIsEmpty() + { + await using var context = CreateContext(); + await context.Database.MigrateAsync(); + context.CatalogItems.Add(Item(code: "")); + + await PostgresConstraintAssertions.AssertViolatesConstraintAsync(context, "ck_catalog_items_business_central_code_not_empty"); + } + + [Fact] + public async Task SaveChanges_Throws_WhenUnitIsEmpty() + { + await using var context = CreateContext(); + await context.Database.MigrateAsync(); + context.CatalogItems.Add(Item(unit: "")); + + await PostgresConstraintAssertions.AssertViolatesConstraintAsync(context, "ck_catalog_items_unit_not_empty"); + } + + [Fact] + public async Task SaveChanges_Throws_WhenQualityClassDoesNotExist() + { + await using var context = CreateContext(); + await context.Database.MigrateAsync(); + context.CatalogItems.Add(Item(qualityClass: "Z")); + + await PostgresConstraintAssertions.AssertViolatesConstraintAsync(context, "fk_catalog_items_quality_classes_quality_class"); + } + + [Fact] + public async Task DeleteQualityClass_Throws_WhenACatalogItemUsesIt() + { + await SeedAsync(); + + await using var context = CreateContext(); + var quality = await context.QualityClasses.SingleAsync(q => q.Code == "A"); + context.QualityClasses.Remove(quality); + + await PostgresConstraintAssertions.AssertViolatesConstraintAsync(context, "fk_catalog_items_quality_classes_quality_class"); + } + + private async Task SeedAsync() + { + await using var context = CreateContext(); + await context.Database.MigrateAsync(); + + var code = "BC-" + Guid.NewGuid().ToString("N")[..12]; + var item = Item(code: code); + context.CatalogItems.Add(item); + await context.SaveChangesAsync(); + return new Seed(item.Id, code); + } + + private static CatalogItem Item( + string name = "Pain", + string category = "Boulangerie", + string code = "BC-PAIN", + string unit = "kg", + string qualityClass = "A") => new() + { + Name = name, + Category = category, + BusinessCentralCode = code, + Unit = unit, + QualityClassCode = qualityClass, + }; + + private MoissonDbContext CreateContext(string? database = null) + { + var connectionString = postgres.ConnectionString; + if (database is not null) + { + var builder = new DbConnectionStringBuilder { ConnectionString = connectionString }; + builder["Database"] = database; + connectionString = builder.ConnectionString; + } + + return new MoissonDbContext(new DbContextOptionsBuilder().UseNpgsql(connectionString).Options); + } + + private sealed record Seed(Guid Id, string Code); +} diff --git a/tests/MoissonMontreal.Tests/Api/PricesMigrationTests.cs b/tests/MoissonMontreal.Tests/Api/PricesMigrationTests.cs index d91fd6b..7b4f9c6 100644 --- a/tests/MoissonMontreal.Tests/Api/PricesMigrationTests.cs +++ b/tests/MoissonMontreal.Tests/Api/PricesMigrationTests.cs @@ -211,7 +211,14 @@ public async Task SaveChanges_Throws_WhenCatalogItemNameIsEmpty() await using var context = CreateContext(); await context.Database.MigrateAsync(); - context.CatalogItems.Add(new CatalogItem { Name = "" }); + context.CatalogItems.Add(new CatalogItem + { + Name = "", + Category = "Boulangerie", + BusinessCentralCode = "BC-EMPTY", + Unit = "kg", + QualityClassCode = "A", + }); await PostgresConstraintAssertions.AssertViolatesConstraintAsync(context, "ck_catalog_items_name_not_empty"); } @@ -359,7 +366,14 @@ private async Task AddCatalogItemAsync(string name) await using var context = CreateContext(); await context.Database.MigrateAsync(); - var item = new CatalogItem { Name = name }; + var item = new CatalogItem + { + Name = name, + Category = "Boulangerie", + BusinessCentralCode = "BC-" + Guid.NewGuid().ToString("N")[..12], + Unit = "kg", + QualityClassCode = "A", + }; context.CatalogItems.Add(item); await context.SaveChangesAsync(); diff --git a/tests/MoissonMontreal.Tests/Fixtures/CatalogApiFactory.cs b/tests/MoissonMontreal.Tests/Fixtures/CatalogApiFactory.cs new file mode 100644 index 0000000..d87475a --- /dev/null +++ b/tests/MoissonMontreal.Tests/Fixtures/CatalogApiFactory.cs @@ -0,0 +1,37 @@ +using Microsoft.AspNetCore.Hosting; +using Microsoft.EntityFrameworkCore; +using MoissonMontreal.Api.Data; +using Testcontainers.PostgreSql; + +namespace MoissonMontreal.Tests.Fixtures; + +/// +/// API host signed in with a test token and backed by a disposable PostgreSQL database. +/// +public sealed class CatalogApiFactory : AuthenticatedApiFactory, IAsyncLifetime +{ + private readonly PostgreSqlContainer _container = new PostgreSqlBuilder("postgres:17").Build(); + + public string ConnectionString => _container.GetConnectionString(); + + public async Task InitializeAsync() + { + await _container.StartAsync(); + + var options = new DbContextOptionsBuilder().UseNpgsql(ConnectionString).Options; + await using var context = new MoissonDbContext(options); + await context.Database.MigrateAsync(); + } + + async Task IAsyncLifetime.DisposeAsync() + { + await _container.DisposeAsync(); + await base.DisposeAsync(); + } + + protected override void ConfigureWebHost(IWebHostBuilder builder) + { + base.ConfigureWebHost(builder); + builder.UseSetting("ConnectionStrings:Moisson", ConnectionString); + } +} From d16a04723a0916bcf6f70be1ddd31923b27bdbc6 Mon Sep 17 00:00:00 2001 From: jspngl Date: Tue, 17 Nov 2026 15:21:07 -0500 Subject: [PATCH 2/2] fix(api): address review feedback on catalog items --- docs/database/catalog.md | 4 +- .../sql/0006_add_catalog_item_details.sql | 6 + .../Controllers/CatalogItemsController.cs | 106 ++++++++++-------- .../CatalogItemConfiguration.cs | 7 +- .../20261117040905_AddCatalogItemDetails.cs | 16 ++- .../Api/CatalogEndpointTests.cs | 61 ++++++++-- .../Api/CatalogItemsMigrationTests.cs | 28 +++++ .../Fixtures/CatalogApiFactory.cs | 21 ++++ 8 files changed, 185 insertions(+), 64 deletions(-) diff --git a/docs/database/catalog.md b/docs/database/catalog.md index c546ede..523b3b2 100644 --- a/docs/database/catalog.md +++ b/docs/database/catalog.md @@ -44,7 +44,7 @@ The code is how the catalog item is matched with the accounting system. The data ## API -List, create and edit are available at `api/catalog-items`. Creating or editing an item with a Business Central code that is already used returns a conflict. A quality class that does not exist is refused. +List, create and edit are available at `api/catalog-items`. Any signed-in employee can list the catalog. Creating or editing an item requires the ManagePriceGrid permission, so only an Admin can do it. Creating or editing an item with a Business Central code that is already used returns a conflict. A quality class that does not exist is refused. ## Migration @@ -53,4 +53,6 @@ List, create and edit are available at `api/catalog-items`. Creating or editing - Table settings: [CatalogItemConfiguration.cs](../../src/MoissonMontreal.Api/Data/Configurations/CatalogItemConfiguration.cs) - API: [CatalogItemsController.cs](../../src/MoissonMontreal.Api/Controllers/CatalogItemsController.cs) +Catalog items that existed before this migration get placeholder values, so the new rules can be added: category `To classify`, Business Central code `TO-FIX-` followed by the item id, unit `unit` and quality class A. Fix these items by hand after the migration. + The SQL script must be run after [0005_create_quality_classes.sql](sql/0005_create_quality_classes.sql). It records itself in the migration history, so Entity Framework will not apply it a second time. diff --git a/docs/database/sql/0006_add_catalog_item_details.sql b/docs/database/sql/0006_add_catalog_item_details.sql index 0bc7059..a98fc55 100644 --- a/docs/database/sql/0006_add_catalog_item_details.sql +++ b/docs/database/sql/0006_add_catalog_item_details.sql @@ -9,6 +9,12 @@ ALTER TABLE catalog_items ADD quality_class character varying(1) NOT NULL DEFAUL ALTER TABLE catalog_items ADD updated_at timestamp with time zone; +UPDATE catalog_items +SET category = 'To classify', + business_central_code = 'TO-FIX-' || id::text, + unit = 'unit', + quality_class = 'A'; + ALTER TABLE catalog_items ALTER COLUMN category DROP DEFAULT; ALTER TABLE catalog_items ALTER COLUMN business_central_code DROP DEFAULT; diff --git a/src/MoissonMontreal.Api/Controllers/CatalogItemsController.cs b/src/MoissonMontreal.Api/Controllers/CatalogItemsController.cs index 67f8f06..91b8dcf 100644 --- a/src/MoissonMontreal.Api/Controllers/CatalogItemsController.cs +++ b/src/MoissonMontreal.Api/Controllers/CatalogItemsController.cs @@ -1,8 +1,11 @@ +using System.Linq.Expressions; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using MoissonMontreal.Api.Catalog; using MoissonMontreal.Api.Data; using MoissonMontreal.Api.Data.Configurations; +using MoissonMontreal.Core.Authorization; using MoissonMontreal.Core.Dtos; using MoissonMontreal.Core.Entities; using Npgsql; @@ -11,11 +14,26 @@ namespace MoissonMontreal.Api.Controllers; /// /// Lists, creates and edits the foods in the catalog. +/// Any signed-in employee can read the catalog. Creating and editing an item requires . /// [ApiController] [Route("api/catalog-items")] public class CatalogItemsController(MoissonDbContext db) : ControllerBase { + private const string QualityClassMissing = "QualityClass must be a quality class that exists."; + + private static readonly Expression> AsDto = item => new CatalogItemDto( + item.Id, + item.Name, + item.Category, + item.BusinessCentralCode, + item.Unit, + item.QualityClassCode, + item.CreatedAt, + item.UpdatedAt); + + private static readonly Func ToDto = AsDto.Compile(); + /// /// Returns every catalog item, ordered by name. /// @@ -25,15 +43,7 @@ public async Task>> List(Cancellation var items = await db.CatalogItems .OrderBy(item => item.Name) .ThenBy(item => item.BusinessCentralCode) - .Select(item => new CatalogItemDto( - item.Id, - item.Name, - item.Category, - item.BusinessCentralCode, - item.Unit, - item.QualityClassCode, - item.CreatedAt, - item.UpdatedAt)) + .Select(AsDto) .ToListAsync(cancellationToken); return items; @@ -53,25 +63,26 @@ public async Task> Get(Guid id, CancellationToken c /// Adds a catalog item. The Business Central code must be new, and the quality class must exist. /// [HttpPost] + [Authorize(Policy = Permissions.ManagePriceGrid)] public async Task> Create(CatalogItemRequest request, CancellationToken cancellationToken) { - var fields = await TryReadAsync(request, cancellationToken); - if (fields is null) + var (fields, errors) = await TryReadAsync(request, cancellationToken); + if (errors is not null) { - return ValidationProblem(new ValidationProblemDetails(LastErrors)); + return ValidationProblem(new ValidationProblemDetails(errors)); } var item = new CatalogItem { - Name = fields.Value.Name, - Category = fields.Value.Category, - BusinessCentralCode = fields.Value.BusinessCentralCode, - Unit = fields.Value.Unit, - QualityClassCode = fields.Value.QualityClass, + Name = fields.Name, + Category = fields.Category, + BusinessCentralCode = fields.BusinessCentralCode, + Unit = fields.Unit, + QualityClassCode = fields.QualityClass, }; db.CatalogItems.Add(item); - if (await SaveConflictAsync(cancellationToken) is { } conflict) + if (await TrySaveAsync(cancellationToken) is { } conflict) { return conflict; } @@ -83,12 +94,13 @@ public async Task> Create(CatalogItemRequest reques /// Replaces the fields of a catalog item. The Business Central code must stay unique. /// [HttpPut("{id:guid}")] + [Authorize(Policy = Permissions.ManagePriceGrid)] public async Task> Update(Guid id, CatalogItemRequest request, CancellationToken cancellationToken) { - var fields = await TryReadAsync(request, cancellationToken); - if (fields is null) + var (fields, errors) = await TryReadAsync(request, cancellationToken); + if (errors is not null) { - return ValidationProblem(new ValidationProblemDetails(LastErrors)); + return ValidationProblem(new ValidationProblemDetails(errors)); } var item = await db.CatalogItems.SingleOrDefaultAsync(item => item.Id == id, cancellationToken); @@ -97,14 +109,14 @@ public async Task> Update(Guid id, CatalogItemReque return NotFound(); } - item.Name = fields.Value.Name; - item.Category = fields.Value.Category; - item.BusinessCentralCode = fields.Value.BusinessCentralCode; - item.Unit = fields.Value.Unit; - item.QualityClassCode = fields.Value.QualityClass; + item.Name = fields.Name; + item.Category = fields.Category; + item.BusinessCentralCode = fields.BusinessCentralCode; + item.Unit = fields.Unit; + item.QualityClassCode = fields.QualityClass; item.UpdatedAt = DateTimeOffset.UtcNow; - if (await SaveConflictAsync(cancellationToken) is { } conflict) + if (await TrySaveAsync(cancellationToken) is { } conflict) { return conflict; } @@ -112,30 +124,30 @@ public async Task> Update(Guid id, CatalogItemReque return ToDto(item); } - private Dictionary LastErrors { get; set; } = []; - - private async Task TryReadAsync(CatalogItemRequest request, CancellationToken cancellationToken) + private async Task<(CatalogItemFields Fields, Dictionary? Errors)> TryReadAsync( + CatalogItemRequest request, + CancellationToken cancellationToken) { if (!CatalogItemValidator.TryNormalize(request, out var fields, out var errors)) { - LastErrors = errors; - return null; + return (fields, errors); } var qualityExists = await db.QualityClasses.AnyAsync(quality => quality.Code == fields.QualityClass, cancellationToken); if (!qualityExists) { - LastErrors = new Dictionary - { - [nameof(CatalogItemRequest.QualityClass)] = ["QualityClass must be a quality class that exists."], - }; - return null; + return (fields, QualityClassErrors()); } - return fields; + return (fields, null); } - private async Task SaveConflictAsync(CancellationToken cancellationToken) + private static Dictionary QualityClassErrors() => new() + { + [nameof(CatalogItemRequest.QualityClass)] = [QualityClassMissing], + }; + + private async Task TrySaveAsync(CancellationToken cancellationToken) { try { @@ -152,15 +164,11 @@ public async Task> Update(Guid id, CatalogItemReque Detail = "A catalog item with this Business Central code already exists.", }); } + catch (DbUpdateException exception) when (exception.InnerException is PostgresException postgres + && postgres.ConstraintName == CatalogItemConfiguration.QualityClassForeignKey) + { + // The quality class was deleted after TryReadAsync checked it. + return ValidationProblem(new ValidationProblemDetails(QualityClassErrors())); + } } - - private static CatalogItemDto ToDto(CatalogItem item) => new( - item.Id, - item.Name, - item.Category, - item.BusinessCentralCode, - item.Unit, - item.QualityClassCode, - item.CreatedAt, - item.UpdatedAt); } diff --git a/src/MoissonMontreal.Api/Data/Configurations/CatalogItemConfiguration.cs b/src/MoissonMontreal.Api/Data/Configurations/CatalogItemConfiguration.cs index fe5e7f5..e61d3f3 100644 --- a/src/MoissonMontreal.Api/Data/Configurations/CatalogItemConfiguration.cs +++ b/src/MoissonMontreal.Api/Data/Configurations/CatalogItemConfiguration.cs @@ -14,6 +14,11 @@ public class CatalogItemConfiguration : IEntityTypeConfiguration /// public const string BusinessCentralCodeIndex = "ix_catalog_items_business_central_code"; + /// + /// Name of the foreign key from the catalog item to its quality class. + /// + public const string QualityClassForeignKey = "fk_catalog_items_quality_classes_quality_class"; + /// /// Configures the columns, the unique Business Central code and the link to the quality class. /// @@ -53,7 +58,7 @@ public void Configure(EntityTypeBuilder builder) .WithMany() .HasForeignKey(c => c.QualityClassCode) .OnDelete(DeleteBehavior.Restrict) - .HasConstraintName("fk_catalog_items_quality_classes_quality_class"); + .HasConstraintName(QualityClassForeignKey); builder.Property(c => c.CreatedAt).HasDefaultValueSql("now()"); } diff --git a/src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.cs b/src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.cs index 65e1f93..d8239e0 100644 --- a/src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.cs +++ b/src/MoissonMontreal.Api/Data/Migrations/20261117040905_AddCatalogItemDetails.cs @@ -8,7 +8,12 @@ namespace MoissonMontreal.Api.Data.Migrations /// public partial class AddCatalogItemDetails : Migration { - /// + /// + /// Adds the catalog item details. The UPDATE that fills existing rows is written by hand, not generated: + /// without it, rows that already exist would keep empty values and fail the checks, the unique index and the + /// foreign key added below. Keep it if this migration is regenerated. + /// + /// Builder used to describe the operations. protected override void Up(MigrationBuilder migrationBuilder) { migrationBuilder.AddColumn( @@ -49,6 +54,15 @@ protected override void Up(MigrationBuilder migrationBuilder) type: "timestamp with time zone", nullable: true); + // Items created before this migration get placeholder values to fix by hand. The id keeps each code unique. + migrationBuilder.Sql(""" + UPDATE catalog_items + SET category = 'To classify', + business_central_code = 'TO-FIX-' || id::text, + unit = 'unit', + quality_class = 'A'; + """); + migrationBuilder.AlterColumn( name: "business_central_code", table: "catalog_items", diff --git a/tests/MoissonMontreal.Tests/Api/CatalogEndpointTests.cs b/tests/MoissonMontreal.Tests/Api/CatalogEndpointTests.cs index ff19f28..6013e9f 100644 --- a/tests/MoissonMontreal.Tests/Api/CatalogEndpointTests.cs +++ b/tests/MoissonMontreal.Tests/Api/CatalogEndpointTests.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using MoissonMontreal.Api.Data; +using MoissonMontreal.Core.Authorization; using MoissonMontreal.Core.Dtos; using MoissonMontreal.Tests.Fixtures; @@ -26,7 +27,7 @@ public async Task List_ReturnsUnauthorized_WhenTokenIsMissing() public async Task List_ReturnsTheCatalogOrderedByName() { await ClearAsync(); - using var client = CreateClient(); + using var client = await CreateClientAsync(); await CreateAsync(client, Request(name: "Pommes", code: "BC-APPLES")); await CreateAsync(client, Request(name: "Pain", code: "BC-BREAD")); @@ -40,7 +41,7 @@ public async Task List_ReturnsTheCatalogOrderedByName() [Fact] public async Task Create_ReturnsTheSavedItem() { - using var client = CreateClient(); + using var client = await CreateClientAsync(); var response = await client.PostAsJsonAsync("/api/catalog-items", Request()); @@ -60,7 +61,7 @@ public async Task Create_ReturnsTheSavedItem() [Fact] public async Task Get_ReturnsTheItem() { - using var client = CreateClient(); + using var client = await CreateClientAsync(); var created = await CreateAsync(client, Request(code: "BC-GET")); var response = await client.GetAsync($"/api/catalog-items/{created.Id}"); @@ -73,7 +74,7 @@ public async Task Get_ReturnsTheItem() [Fact] public async Task Get_ReturnsNotFound_WhenTheItemDoesNotExist() { - using var client = CreateClient(); + using var client = await CreateClientAsync(); var response = await client.GetAsync($"/api/catalog-items/{Guid.NewGuid()}"); @@ -83,7 +84,7 @@ public async Task Get_ReturnsNotFound_WhenTheItemDoesNotExist() [Fact] public async Task Update_ReplacesTheFields() { - using var client = CreateClient(); + using var client = await CreateClientAsync(); var created = await CreateAsync(client, Request(code: "BC-EDIT")); var response = await client.PutAsJsonAsync( @@ -102,7 +103,7 @@ public async Task Update_ReplacesTheFields() [Fact] public async Task Update_KeepsTheSameBusinessCentralCode() { - using var client = CreateClient(); + using var client = await CreateClientAsync(); var created = await CreateAsync(client, Request(code: "BC-SAME")); var response = await client.PutAsJsonAsync($"/api/catalog-items/{created.Id}", Request(name: "Pain bio", code: "BC-SAME")); @@ -113,7 +114,7 @@ public async Task Update_KeepsTheSameBusinessCentralCode() [Fact] public async Task Update_ReturnsNotFound_WhenTheItemDoesNotExist() { - using var client = CreateClient(); + using var client = await CreateClientAsync(); var response = await client.PutAsJsonAsync($"/api/catalog-items/{Guid.NewGuid()}", Request(code: "BC-MISSING")); @@ -123,7 +124,7 @@ public async Task Update_ReturnsNotFound_WhenTheItemDoesNotExist() [Fact] public async Task Create_ReturnsConflict_WhenTheBusinessCentralCodeExists() { - using var client = CreateClient(); + using var client = await CreateClientAsync(); await CreateAsync(client, Request(code: "BC-DUP")); var response = await client.PostAsJsonAsync("/api/catalog-items", Request(name: "Riz", code: "BC-DUP")); @@ -134,7 +135,7 @@ public async Task Create_ReturnsConflict_WhenTheBusinessCentralCodeExists() [Fact] public async Task Update_ReturnsConflict_WhenTheBusinessCentralCodeBelongsToAnotherItem() { - using var client = CreateClient(); + using var client = await CreateClientAsync(); await CreateAsync(client, Request(name: "Riz", code: "BC-RICE")); var bread = await CreateAsync(client, Request(code: "BC-BREAD-2")); @@ -146,7 +147,7 @@ public async Task Update_ReturnsConflict_WhenTheBusinessCentralCodeBelongsToAnot [Fact] public async Task Create_ReturnsBadRequest_WhenTheQualityClassDoesNotExist() { - using var client = CreateClient(); + using var client = await CreateClientAsync(); var response = await client.PostAsJsonAsync("/api/catalog-items", Request(qualityClass: "Z", code: "BC-BAD")); @@ -155,18 +156,54 @@ public async Task Create_ReturnsBadRequest_WhenTheQualityClassDoesNotExist() Assert.Contains(nameof(CatalogItemRequest.QualityClass), problem!.Errors.Keys); } + [Theory] + [InlineData(RoleCodes.Supply)] + [InlineData(RoleCodes.SupplyDirector)] + [InlineData(RoleCodes.Finance)] + public async Task Create_ReturnsForbidden_WhenRoleCannotManageThePriceGrid(string role) + { + using var client = await CreateClientAsync(role); + + var response = await client.PostAsJsonAsync("/api/catalog-items", Request(code: $"BC-FORBIDDEN-{role}")); + + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task Update_ReturnsForbidden_WhenRoleCannotManageThePriceGrid() + { + using var adminClient = await CreateClientAsync(); + var created = await CreateAsync(adminClient, Request(code: "BC-NO-EDIT")); + using var client = await CreateClientAsync(RoleCodes.Supply); + + var response = await client.PutAsJsonAsync($"/api/catalog-items/{created.Id}", Request(name: "Pain bio", code: "BC-NO-EDIT")); + + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task List_ReturnsOk_WhenRoleCannotManageThePriceGrid() + { + using var client = await CreateClientAsync(RoleCodes.Supply); + + var response = await client.GetAsync("/api/catalog-items"); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + [Fact] public async Task Create_ReturnsBadRequest_WhenTheNameIsBlank() { - using var client = CreateClient(); + using var client = await CreateClientAsync(); var response = await client.PostAsJsonAsync("/api/catalog-items", Request(name: " ", code: "BC-BLANK")); Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); } - private HttpClient CreateClient() + private async Task CreateClientAsync(string role = RoleCodes.Admin) { + await factory.SignInAsAsync(role); var client = factory.CreateClient(); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", factory.CreateToken()); return client; diff --git a/tests/MoissonMontreal.Tests/Api/CatalogItemsMigrationTests.cs b/tests/MoissonMontreal.Tests/Api/CatalogItemsMigrationTests.cs index 301371d..6690955 100644 --- a/tests/MoissonMontreal.Tests/Api/CatalogItemsMigrationTests.cs +++ b/tests/MoissonMontreal.Tests/Api/CatalogItemsMigrationTests.cs @@ -1,5 +1,7 @@ using System.Data.Common; using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; using MoissonMontreal.Api.Data; using MoissonMontreal.Api.Data.Configurations; using MoissonMontreal.Core.Entities; @@ -10,6 +12,32 @@ namespace MoissonMontreal.Tests.Api; [Trait("Category", "Integration")] public class CatalogItemsMigrationTests(PostgresFixture postgres) : IClassFixture { + private const string MigrationBeforeCatalogItemDetails = "20261112060008_CreateQualityClasses"; + + [Fact] + public async Task Migrate_FillsExistingCatalogItems_WithPlaceholderValues() + { + await using var context = CreateContext("catalog_upgrade"); + await context.GetService().MigrateAsync(MigrationBeforeCatalogItemDetails); + await context.Database.ExecuteSqlRawAsync(""" + INSERT INTO catalog_items (id, name) VALUES + ('00000000-0000-0000-0000-0000000000c1', 'Pain'), + ('00000000-0000-0000-0000-0000000000c2', 'Pommes'); + """); + + await context.Database.MigrateAsync(); + + var items = await context.CatalogItems.OrderBy(item => item.Name).ToListAsync(); + Assert.Equal(["Pain", "Pommes"], items.Select(item => item.Name)); + Assert.All(items, item => + { + Assert.Equal("To classify", item.Category); + Assert.Equal($"TO-FIX-{item.Id}", item.BusinessCentralCode); + Assert.Equal("unit", item.Unit); + Assert.Equal("A", item.QualityClassCode); + }); + } + [Fact] public async Task CatalogItem_StoresCategoryBusinessCentralCodeUnitAndQualityClass() { diff --git a/tests/MoissonMontreal.Tests/Fixtures/CatalogApiFactory.cs b/tests/MoissonMontreal.Tests/Fixtures/CatalogApiFactory.cs index d87475a..5bdf9dc 100644 --- a/tests/MoissonMontreal.Tests/Fixtures/CatalogApiFactory.cs +++ b/tests/MoissonMontreal.Tests/Fixtures/CatalogApiFactory.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using MoissonMontreal.Api.Data; +using MoissonMontreal.Core.Entities; using Testcontainers.PostgreSql; namespace MoissonMontreal.Tests.Fixtures; @@ -23,6 +24,26 @@ public async Task InitializeAsync() await context.Database.MigrateAsync(); } + /// + /// Makes the signed-in test employee the only user, with the given role. + /// + public async Task SignInAsAsync(string roleCode) + { + await using var context = new MoissonDbContext( + new DbContextOptionsBuilder().UseNpgsql(ConnectionString).Options); + await context.Users.ExecuteDeleteAsync(); + var roleId = await context.Roles.Where(r => r.Code == roleCode).Select(r => r.Id).SingleAsync(); + context.Users.Add(new User + { + Email = Email, + DisplayName = Name, + RoleId = roleId, + IsActive = true, + EntraObjectId = Guid.Parse(ObjectId), + }); + await context.SaveChangesAsync(); + } + async Task IAsyncLifetime.DisposeAsync() { await _container.DisposeAsync();