Hero: planning en hero-brede aan/uit verwijderd (hero altijd aan, live zodra er een titel is); migratie, API, admin, tests en docs bijgewerkt
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -9,7 +9,7 @@ namespace SlpModularCms.Modules.Hero.Tests;
|
||||
public class HeroFocusSaveTests
|
||||
{
|
||||
private static HeroSaveRequest Save(Guid imageId, IReadOnlyList<HeroImageFocusRequest>? focus)
|
||||
=> new("Andrea Slop", null, null, "single", [], true, null, null, [new HeroSlideRequest(null, imageId, "foto")], focus);
|
||||
=> new("Andrea Slop", null, null, "single", [], [new HeroSlideRequest(null, imageId, "foto")], focus);
|
||||
|
||||
[Fact]
|
||||
public async Task TheLiveHero_KeepsItsOldSet_UntilTheNewSetIsCut_AndThenSwitchesToIt()
|
||||
@@ -112,7 +112,7 @@ public class HeroFocusSaveTests
|
||||
var live = rig.Db.HeroImages.Single().SetHash;
|
||||
|
||||
// The save stops after the new files were written (here: the hero refers to a slide of another hero).
|
||||
var failing = new HeroSaveRequest("Andrea Slop", null, null, "single", [], true, null, null, [new HeroSlideRequest(Guid.NewGuid(), id, "foto")],
|
||||
var failing = new HeroSaveRequest("Andrea Slop", null, null, "single", [], [new HeroSlideRequest(Guid.NewGuid(), id, "foto")],
|
||||
[new HeroImageFocusRequest(id, new FocusDto(0.9, 0.9, 2))]);
|
||||
var act = async () => await rig.Service.SaveAsync(failing, HeroTestRig.Admin, default);
|
||||
await act.Should().ThrowAsync<HeroSaveRejectedException>();
|
||||
@@ -273,7 +273,7 @@ public class HeroFocusSaveTests
|
||||
var ready = await rig.Upload(HeroTestRig.Photo(seed: 3));
|
||||
var first = await rig.UploadWithoutRendering(HeroTestRig.Photo(seed: 1));
|
||||
var second = await rig.UploadWithoutRendering(HeroTestRig.Photo(seed: 2));
|
||||
var request = new HeroSaveRequest("Titel", null, null, "slideshow", [], true, null, null,
|
||||
var request = new HeroSaveRequest("Titel", null, null, "slideshow", [],
|
||||
[new HeroSlideRequest(null, Guid.Parse(first.Id), "een"), new HeroSlideRequest(null, Guid.Parse(second.Id), "twee"), new HeroSlideRequest(null, Guid.Parse(ready.Id), "drie")]);
|
||||
|
||||
var saved = await rig.Service.SaveAsync(request, HeroTestRig.Admin, default);
|
||||
|
||||
@@ -82,7 +82,7 @@ public class HeroSaveRequestValidationTests
|
||||
private static HeroSaveRequest Valid() => new(
|
||||
"Websites,\napps\n& meer.", null, "Een lead.", "single",
|
||||
[new HeroButtonRequest("Bekijk pakketten", "#pakketten"), new HeroButtonRequest("Plan een gesprek", "#contact")],
|
||||
true, null, null, []);
|
||||
[]);
|
||||
|
||||
private static List<ValidationResult> Run(HeroSaveRequest request)
|
||||
{
|
||||
@@ -133,16 +133,6 @@ public class HeroSaveRequestValidationTests
|
||||
Run(Valid() with { Buttons = [new HeroButtonRequest("", ""), new HeroButtonRequest(null, null)] }).Should().BeEmpty("empty buttons are ignored");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TheSchedule_MustRunForward()
|
||||
{
|
||||
var t = new DateTimeOffset(2026, 12, 1, 0, 0, 0, TimeSpan.Zero);
|
||||
Members(Run(Valid() with { StartsAt = t, EndsAt = t })).Should().Contain("EndsAt");
|
||||
Members(Run(Valid() with { StartsAt = t, EndsAt = t.AddDays(-1) })).Should().Contain("EndsAt");
|
||||
Run(Valid() with { StartsAt = t, EndsAt = t.AddDays(1) }).Should().BeEmpty();
|
||||
Run(Valid() with { StartsAt = null, EndsAt = t }).Should().BeEmpty();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ASlide_NeedsAnImage_AndAnAltTextOrTheDecorativeFlag()
|
||||
{
|
||||
@@ -310,23 +300,13 @@ public class HeroMappingTests
|
||||
hero.Slides.Should().HaveCount(80);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(true, null, null, true)]
|
||||
[InlineData(false, null, null, false)]
|
||||
[InlineData(true, "2026-11-17", null, false)]
|
||||
[InlineData(true, "2026-11-16T12:00:00Z", null, true)]
|
||||
[InlineData(true, null, "2026-11-16T12:00:00Z", false)]
|
||||
[InlineData(true, null, "2026-11-16T12:00:01Z", true)]
|
||||
[InlineData(true, "2026-11-01", "2026-12-01", true)]
|
||||
public void TheScheduleAndTheSwitch_DecideWhetherItIsLive(bool active, string? start, string? end, bool live)
|
||||
[Fact]
|
||||
public void TheHeroIsAlwaysOn_ItIsLiveAsSoonAsItHasATitle()
|
||||
{
|
||||
var hero = Hero(Slide(0));
|
||||
hero.IsActive = active;
|
||||
hero.StartsAt = start is null ? null : DateTimeOffset.Parse(start, System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.AssumeUniversal);
|
||||
hero.EndsAt = end is null ? null : DateTimeOffset.Parse(end, System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.AssumeUniversal);
|
||||
|
||||
(HeroMapping.ToPublic(hero, Now, 50) is not null).Should().Be(live);
|
||||
HeroMapping.ToAdmin(hero, Now, 50).IsLive.Should().Be(live);
|
||||
(HeroMapping.ToPublic(hero, Now, 50) is not null).Should().BeTrue();
|
||||
HeroMapping.ToAdmin(hero, Now, 50).IsLive.Should().BeTrue();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
||||
@@ -34,7 +34,7 @@ public class HeroSaveTimingTests(ITestOutputHelper output)
|
||||
var slides = ids.Select(id => new HeroSlideRequest(null, id, "foto")).ToList();
|
||||
var focus = ids.Select(id => new HeroImageFocusRequest(id, new FocusDto(0.3, 0.4, 1), null, null)).ToList();
|
||||
watch.Restart();
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], true, null, null, slides, focus), HeroTestRig.Admin, default);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], slides, focus), HeroTestRig.Admin, default);
|
||||
output.WriteLine($"save request with 8 slides and 8 changed focus points: {watch.ElapsedMilliseconds} ms");
|
||||
|
||||
watch.Restart();
|
||||
@@ -43,12 +43,12 @@ public class HeroSaveTimingTests(ITestOutputHelper output)
|
||||
|
||||
watch.Restart();
|
||||
var again = focus.Select(f => f with { Focus = new FocusDto(0.6, 0.4, 1) }).ToList();
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], true, null, null, slides, again), HeroTestRig.Admin, default);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], slides, again), HeroTestRig.Admin, default);
|
||||
output.WriteLine($"save request with 8 changed focus points again: {watch.ElapsedMilliseconds} ms");
|
||||
await rig.RenderPending();
|
||||
|
||||
watch.Restart();
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], true, null, null, slides, null), HeroTestRig.Admin, default);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], slides, null), HeroTestRig.Admin, default);
|
||||
output.WriteLine($"save without focus changes: {watch.ElapsedMilliseconds} ms");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,12 +147,12 @@ public class HeroImageServiceTests
|
||||
{
|
||||
using var rig = new HeroTestRig();
|
||||
var image = await rig.Upload(HeroTestRig.Photo());
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], true, null, null, [new HeroSlideRequest(null, Guid.Parse(image.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], [new HeroSlideRequest(null, Guid.Parse(image.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
var inUse = async () => await rig.Images.DeleteAsync(Guid.Parse(image.Id), HeroTestRig.Admin, CancellationToken.None);
|
||||
await inUse.Should().ThrowAsync<HeroImageInUseException>();
|
||||
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], true, null, null, []), HeroTestRig.Admin, CancellationToken.None);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], []), HeroTestRig.Admin, CancellationToken.None);
|
||||
await rig.Images.DeleteAsync(Guid.Parse(image.Id), HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
rig.Db.HeroImages.Should().BeEmpty();
|
||||
@@ -227,7 +227,7 @@ public class HeroImageServiceTests
|
||||
public class HeroServiceTests
|
||||
{
|
||||
private static HeroSaveRequest Request(IReadOnlyList<HeroSlideRequest>? slides = null, string title = "Andrea Slop") => new(
|
||||
title, "Lifestyle fotograaf", null, "slideshow", [new HeroButtonRequest("Lees meer", "/over-mij")], true, null, null, slides ?? []);
|
||||
title, "Lifestyle fotograaf", null, "slideshow", [new HeroButtonRequest("Lees meer", "/over-mij")], slides ?? []);
|
||||
|
||||
[Fact]
|
||||
public async Task TheFirstSave_CreatesTheHero_WithItsSlidesInOrder()
|
||||
@@ -312,7 +312,7 @@ public class HeroServiceTests
|
||||
using var rig = new HeroTestRig();
|
||||
|
||||
var saved = await rig.Service.SaveAsync(
|
||||
new HeroSaveRequest("Websites,\r\napps\u0007\n& meer.", " <b>tag</b> ", "lead\nregel twee", "single", [new HeroButtonRequest(" Knop ", " #contact ")], true, null, null, []),
|
||||
new HeroSaveRequest("Websites,\r\napps\u0007\n& meer.", " <b>tag</b> ", "lead\nregel twee", "single", [new HeroButtonRequest(" Knop ", " #contact ")], []),
|
||||
HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
saved.Title.Should().Be("Websites,\napps\n& meer.");
|
||||
@@ -327,7 +327,7 @@ public class HeroServiceTests
|
||||
using var rig = new HeroTestRig();
|
||||
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Websites,\napps\n& meer.", null, "Lead.", "single",
|
||||
[new HeroButtonRequest("Bekijk pakketten", "#pakketten"), new HeroButtonRequest("Plan een gesprek", "#contact")], true, null, null, null), HeroTestRig.Admin, CancellationToken.None);
|
||||
[new HeroButtonRequest("Bekijk pakketten", "#pakketten"), new HeroButtonRequest("Plan een gesprek", "#contact")], null), HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
var pub = (await rig.Public.GetActiveAsync(CancellationToken.None))!;
|
||||
pub.Title.Should().Be("Websites,\napps\n& meer.");
|
||||
@@ -336,20 +336,6 @@ public class HeroServiceTests
|
||||
pub.Slides.Should().BeEmpty();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ThePublicHero_FollowsTheScheduleOfTheClock()
|
||||
{
|
||||
using var rig = new HeroTestRig();
|
||||
var start = rig.Time.Now.AddDays(1);
|
||||
await rig.Service.SaveAsync(Request() with { StartsAt = start, EndsAt = start.AddDays(7) }, HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
(await rig.Public.GetActiveAsync(CancellationToken.None)).Should().BeNull();
|
||||
rig.Time.Now = start.AddHours(1);
|
||||
(await rig.Public.GetActiveAsync(CancellationToken.None)).Should().NotBeNull();
|
||||
rig.Time.Now = start.AddDays(7);
|
||||
(await rig.Public.GetActiveAsync(CancellationToken.None)).Should().BeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task WithoutAHero_TheAdminGetsEmptyDefaults_AndThePublicGetsNothing()
|
||||
{
|
||||
@@ -417,7 +403,7 @@ public class HeroMediaCleanupTests
|
||||
// The same photo with the same focus comes back: the same set again, referenced by a new row.
|
||||
var again = await rig.Upload(photo);
|
||||
rig.Db.HeroImages.Single().SetHash.Should().Be(set);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], true, null, null, [new HeroSlideRequest(null, Guid.Parse(again.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], [new HeroSlideRequest(null, Guid.Parse(again.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
rig.Time.Now = rig.Time.Now.AddDays(8);
|
||||
await rig.Cleanup.RunOnceAsync(CancellationToken.None);
|
||||
@@ -447,7 +433,7 @@ public class HeroMediaCleanupTests
|
||||
{
|
||||
using var rig = new HeroTestRig();
|
||||
var image = await rig.Upload(HeroTestRig.Photo());
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], true, null, null, [new HeroSlideRequest(null, Guid.Parse(image.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], [new HeroSlideRequest(null, Guid.Parse(image.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
rig.Time.Now = rig.Time.Now.AddDays(30);
|
||||
await rig.Cleanup.RunOnceAsync(CancellationToken.None);
|
||||
|
||||
@@ -82,7 +82,7 @@ public sealed class HeroTestRig : IDisposable
|
||||
public async Task<SlpModularCms.Modules.Hero.Models.HeroImageDto> SetFocus(Guid imageId, SlpModularCms.Modules.Hero.Models.HeroFocusRequest request)
|
||||
{
|
||||
await Service.SaveAsync(
|
||||
new SlpModularCms.Modules.Hero.Models.HeroSaveRequest("Titel", null, null, "single", [], true, null, null, [],
|
||||
new SlpModularCms.Modules.Hero.Models.HeroSaveRequest("Titel", null, null, "single", [], [],
|
||||
[new SlpModularCms.Modules.Hero.Models.HeroImageFocusRequest(imageId, request.Focus, request.Wide, request.Tall)]),
|
||||
Admin, CancellationToken.None);
|
||||
await RenderPending();
|
||||
|
||||
Reference in New Issue
Block a user