diff --git a/scripts/Seed-Offerings.ps1 b/scripts/Seed-Offerings.ps1 index db7b607..124855a 100644 --- a/scripts/Seed-Offerings.ps1 +++ b/scripts/Seed-Offerings.ps1 @@ -40,10 +40,14 @@ if (-not $packages -or $packages.Count -eq 0) { throw "No packages in $PackagesF # Refuse unfinished templates: no guessed copy ends up in a CMS. foreach ($p in $packages) { - foreach ($field in 'slug', 'title', 'description', 'price', 'priceNote', 'ctaLabel') { + foreach ($field in 'slug', 'title', 'price') { $v = $p.$field if ([string]::IsNullOrWhiteSpace($v) -or $v -like 'TODO*') { throw "Package '$($p.slug)': '$field' is empty or still TODO." } } + # description, priceNote and ctaLabel may be empty (the API accepts empty strings), but never TODO. + foreach ($field in 'description', 'priceNote', 'ctaLabel') { + if ("$($p.$field)" -like 'TODO*') { throw "Package '$($p.slug)': '$field' is still TODO." } + } if (-not $p.features -or $p.features.Count -eq 0 -or ($p.features | Where-Object { $_ -like 'TODO*' })) { throw "Package '$($p.slug)': 'features' is empty or still TODO." } diff --git a/scripts/offerings-asf.json b/scripts/offerings-asf.json index 1797f2d..2fa2133 100644 --- a/scripts/offerings-asf.json +++ b/scripts/offerings-asf.json @@ -2,31 +2,43 @@ { "slug": "zwangerschap", "title": "Zwangerschap", - "description": "TODO (uit web/src/content/packages.ts)", + "description": "", "price": "€ 175", - "priceNote": "TODO", - "features": ["TODO", "TODO", "TODO"], - "ctaLabel": "TODO", + "priceNote": "", + "features": [ + "1 uur fotografie", + "Minstens 30 zorgvuldig nabewerkte foto's", + "Persoonlijke online fotogalerij" + ], + "ctaLabel": "", "layout": "card" }, { "slug": "newborn", "title": "Newborn", - "description": "TODO (uit web/src/content/packages.ts)", + "description": "", "price": "€ 185", - "priceNote": "TODO", - "features": ["TODO", "TODO", "TODO"], - "ctaLabel": "TODO", + "priceNote": "", + "features": [ + "1-2 uur fotografie", + "Minstens 40 zorgvuldig nabewerkte foto's", + "Persoonlijke online fotogalerij" + ], + "ctaLabel": "", "layout": "card" }, { "slug": "gezin", "title": "Gezin", - "description": "TODO (uit web/src/content/packages.ts)", + "description": "", "price": "€ 175", - "priceNote": "TODO", - "features": ["TODO", "TODO", "TODO"], - "ctaLabel": "TODO", + "priceNote": "", + "features": [ + "1 uur fotografie", + "Minstens 30 zorgvuldig nabewerkte foto's", + "Persoonlijke online fotogalerij" + ], + "ctaLabel": "", "layout": "card" } ] diff --git a/src/SlpModularCms.Api.AndreaSlopFotografie.Tests/HostConfigurationTests.cs b/src/SlpModularCms.Api.AndreaSlopFotografie.Tests/HostConfigurationTests.cs index 7f33718..8c8cee1 100644 --- a/src/SlpModularCms.Api.AndreaSlopFotografie.Tests/HostConfigurationTests.cs +++ b/src/SlpModularCms.Api.AndreaSlopFotografie.Tests/HostConfigurationTests.cs @@ -80,12 +80,13 @@ public class HostConfigurationTests } [Fact] - public void Host_ReferencesOfferings_ButNotTheMasterModule() + public void Host_DoesNotReferenceTheMasterModule() { + // Offerings has no compile-time reference from the host (modules are discovered at runtime), so its + // presence is asserted through /System/capabilities in HostPipelineTests instead. var referenced = typeof(Program).Assembly.GetReferencedAssemblies().Select(a => a.Name); - referenced.Should().Contain("SlpModularCms.Modules.Offerings") - .And.NotContain("SlpModularCms.Modules.Master"); + referenced.Should().NotContain("SlpModularCms.Modules.Master"); } [Fact] diff --git a/src/SlpModularCms.Modules.Offerings.Tests/Services/OfferingsServiceTests.cs b/src/SlpModularCms.Modules.Offerings.Tests/Services/OfferingsServiceTests.cs index 53b9101..659ca5a 100644 --- a/src/SlpModularCms.Modules.Offerings.Tests/Services/OfferingsServiceTests.cs +++ b/src/SlpModularCms.Modules.Offerings.Tests/Services/OfferingsServiceTests.cs @@ -375,4 +375,23 @@ public class OfferingsServiceTests ok.Should().Be(valid); } + + [Theory] + [InlineData(typeof(CreateOfferingRequest), "Description", true)] + [InlineData(typeof(CreateOfferingRequest), "PriceNote", true)] + [InlineData(typeof(CreateOfferingRequest), "CtaLabel", true)] + [InlineData(typeof(UpdateOfferingRequest), "Description", true)] + [InlineData(typeof(UpdateOfferingRequest), "PriceNote", true)] + [InlineData(typeof(UpdateOfferingRequest), "CtaLabel", true)] + [InlineData(typeof(CreateOfferingRequest), "Title", false)] + [InlineData(typeof(CreateOfferingRequest), "Price", false)] + public void Request_accepts_empty_text_only_for_description_pricenote_and_cta(Type request, string name, bool emptyAllowed) + { + var parameter = request.GetConstructors()[0].GetParameters().Single(p => p.Name == name); + var required = (System.ComponentModel.DataAnnotations.RequiredAttribute)parameter + .GetCustomAttributes(typeof(System.ComponentModel.DataAnnotations.RequiredAttribute), false).Single(); + + required.IsValid(string.Empty).Should().Be(emptyAllowed); + required.IsValid(null).Should().BeFalse(); + } } diff --git a/src/SlpModularCms.Modules.Offerings/Models/CreateOfferingRequest.cs b/src/SlpModularCms.Modules.Offerings/Models/CreateOfferingRequest.cs index 9ba7a28..556ccee 100644 --- a/src/SlpModularCms.Modules.Offerings/Models/CreateOfferingRequest.cs +++ b/src/SlpModularCms.Modules.Offerings/Models/CreateOfferingRequest.cs @@ -4,11 +4,11 @@ namespace SlpModularCms.Modules.Offerings.Models; public record CreateOfferingRequest( [Required, MaxLength(100)] string Title, - [Required, MaxLength(500)] string Description, + [Required(AllowEmptyStrings = true), MaxLength(500)] string Description, [Required, MaxLength(50)] string Price, - [Required, MaxLength(100)] string PriceNote, + [Required(AllowEmptyStrings = true), MaxLength(100)] string PriceNote, [Required, FeaturesValidation] List Features, - [Required, MaxLength(50)] string CtaLabel, + [Required(AllowEmptyStrings = true), MaxLength(50)] string CtaLabel, bool Featured = false, [MaxLength(130)] string? Slug = null, Guid? CategoryId = null, diff --git a/src/SlpModularCms.Modules.Offerings/Models/UpdateOfferingRequest.cs b/src/SlpModularCms.Modules.Offerings/Models/UpdateOfferingRequest.cs index 2feeca7..c359c18 100644 --- a/src/SlpModularCms.Modules.Offerings/Models/UpdateOfferingRequest.cs +++ b/src/SlpModularCms.Modules.Offerings/Models/UpdateOfferingRequest.cs @@ -4,11 +4,11 @@ namespace SlpModularCms.Modules.Offerings.Models; public record UpdateOfferingRequest( [Required, MaxLength(100)] string Title, - [Required, MaxLength(500)] string Description, + [Required(AllowEmptyStrings = true), MaxLength(500)] string Description, [Required, MaxLength(50)] string Price, - [Required, MaxLength(100)] string PriceNote, + [Required(AllowEmptyStrings = true), MaxLength(100)] string PriceNote, [Required, FeaturesValidation] List Features, - [Required, MaxLength(50)] string CtaLabel, + [Required(AllowEmptyStrings = true), MaxLength(50)] string CtaLabel, bool Featured = false, [MaxLength(130)] string? Slug = null, Guid? CategoryId = null,