diff --git a/src/Titano.Data/Repositories/MediaCardRepository.cs b/src/Titano.Data/Repositories/MediaCardRepository.cs index d42c6971..6b73e5a9 100644 --- a/src/Titano.Data/Repositories/MediaCardRepository.cs +++ b/src/Titano.Data/Repositories/MediaCardRepository.cs @@ -116,6 +116,15 @@ public sealed class MediaCardRepository r.GetStringOrNull(4), r.GetGuidOrNull(5), r.GetGuidOrNull(6), r.GetDateTimeOffset(7)), cancellationToken); + /// The files one import job recorded from a card, by path (the import's verification result). + public Task> ListImportsByJobAsync(Guid cardId, Guid jobId, CancellationToken cancellationToken = default) => + _db.ListAsync( + "SELECT card_id, path, size, mtime, sha256, frame_id, job_id, imported_at FROM import_history WHERE card_id = $1 AND job_id = $2 ORDER BY path", + [cardId, jobId], + r => new ImportRecord(r.GetGuid(0), new ImportKey(r.GetString(1), r.GetInt64(2), r.GetDateTimeOffset(3)), + r.GetStringOrNull(4), r.GetGuidOrNull(5), r.GetGuidOrNull(6), r.GetDateTimeOffset(7)), + cancellationToken); + private static MediaCard Map(DbRow r) => new() { Id = r.GetGuid(0), diff --git a/tests/Titano.Data.Tests/Repositories/MediaCardRepositoryTests.cs b/tests/Titano.Data.Tests/Repositories/MediaCardRepositoryTests.cs index efc1352a..85386ada 100644 --- a/tests/Titano.Data.Tests/Repositories/MediaCardRepositoryTests.cs +++ b/tests/Titano.Data.Tests/Repositories/MediaCardRepositoryTests.cs @@ -71,6 +71,30 @@ public abstract class MediaCardRepositoryTests(TestContext context) : Repository Assert.Equal(0, (await db.MediaCards.GetImportedKeysAsync(card.Id, Ct)).Count); } + [Test] + public async Task AJobListsOnlyTheFilesItRecorded() + { + var db = await OpenTitanoAsync(); + var card = Card(); + await db.MediaCards.UpsertAsync(card, Ct); + var modified = new DateTimeOffset(2026, 9, 28, 18, 0, 0, TimeSpan.Zero); + var first = Guid.CreateVersion7(); + var second = Guid.CreateVersion7(); + await db.MediaCards.RecordImportsAsync( + [ + new ImportRecord(card.Id, new ImportKey("DCIM/100CANON/IMG_0002.CR3", 10, modified), null, null, first, TestData.Now), + new ImportRecord(card.Id, new ImportKey("DCIM/100CANON/IMG_0001.CR3", 10, modified), null, null, first, TestData.Now), + new ImportRecord(card.Id, new ImportKey("DCIM/100CANON/IMG_0003.CR3", 10, modified), null, null, second, TestData.Now), + ], Ct); + // Importing a file again moves it to the later job. + await db.MediaCards.RecordImportsAsync([new ImportRecord(card.Id, new ImportKey("DCIM/100CANON/IMG_0002.CR3", 10, modified), null, null, second, TestData.Now)], Ct); + + Assert.SequenceEqual(["DCIM/100CANON/IMG_0001.CR3"], (await db.MediaCards.ListImportsByJobAsync(card.Id, first, Ct)).Select(r => r.Key.Path)); + Assert.SequenceEqual(["DCIM/100CANON/IMG_0002.CR3", "DCIM/100CANON/IMG_0003.CR3"], + (await db.MediaCards.ListImportsByJobAsync(card.Id, second, Ct)).Select(r => r.Key.Path)); + Assert.Empty(await db.MediaCards.ListImportsByJobAsync(Card().Id, second, Ct)); + } + private static MediaCard Card() => new() { Id = Guid.CreateVersion7(),