rust/Deal
1
0
Fork 0
Code Issues 7 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

Перевести «не найдено» карточек на NotFoundException

Browse Source 
CardsService (get/move/links/reminders) и CardMover бросают NotFoundException вместо null/CardResultDto(null,null)/Exists=false. CardMoveResultDto — только Error; эндпоинты без локальных 404-проверок.
This commit is contained in:
stepan
2026-09-13 18:23:53 +03:00
parent a9bfecf9cc
commit d2d6b81aa0
12 changed files with 107 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/Deal.Api/Endpoints/CardDetailsEndpoints.cs
+12 -29
View File
@@ -202,9 +202,7 @@ public static class CardDetailsEndpoints
return EndpointResults.BadRequest(result.Error);
}
return result.Card is null
? EndpointResults.NotFound(CardNotFoundDetail)
: await ReadCardAsync(context, cardId, ct);
return await ReadCardAsync(context, cardId, ct);
}
// DELETE /api/cards/{cardId}/links/{linkId}: удалить ссылку. Ответ — карточка.
@@ -220,10 +218,8 @@ public static class CardDetailsEndpoints
}
CardsService service = context.RequestServices.GetRequiredService<CardsService>();
CardResultDto result = await service.RemoveLinkAsync(cardId, linkId, ct);
return result.Card is null
? EndpointResults.NotFound(CardNotFoundDetail)
: await ReadCardAsync(context, cardId, ct);
await service.RemoveLinkAsync(cardId, linkId, ct);
return await ReadCardAsync(context, cardId, ct);
}
// POST /api/cards/{cardId}/files: загрузка вложений (multipart/form-data, поле files).
@@ -240,10 +236,7 @@ public static class CardDetailsEndpoints
}
CardsService cardsService = context.RequestServices.GetRequiredService<CardsService>();
if (await cardsService.GetCardAsync(cardId, ct) is null)
{
return EndpointResults.NotFound(CardNotFoundDetail);
}
await cardsService.GetCardAsync(cardId, ct);
IFormCollection form;
try
@@ -357,9 +350,7 @@ public static class CardDetailsEndpoints
return EndpointResults.BadRequest(result.Error);
}
return result.Card is null
? EndpointResults.NotFound(CardNotFoundDetail)
: await ReadCardAsync(context, cardId, ct);
return await ReadCardAsync(context, cardId, ct);
}
// DELETE /api/cards/{cardId}/reminder: снять напоминание. Ответ — карточка.
@@ -374,9 +365,8 @@ public static class CardDetailsEndpoints
}
CardsService service = context.RequestServices.GetRequiredService<CardsService>();
return await service.ClearReminderAsync(cardId, ct)
? await ReadCardAsync(context, cardId, ct)
: EndpointResults.NotFound(CardNotFoundDetail);
await service.ClearReminderAsync(cardId, ct);
return await ReadCardAsync(context, cardId, ct);
}
// POST /api/cards/{cardId}/reminder/snooze: «напомнить позже» (now + 24 ч). Ответ — карточка.
@@ -391,9 +381,8 @@ public static class CardDetailsEndpoints
}
CardsService service = context.RequestServices.GetRequiredService<CardsService>();
return await service.SnoozeReminderAsync(cardId, ct)
? await ReadCardAsync(context, cardId, ct)
: EndpointResults.NotFound(CardNotFoundDetail);
await service.SnoozeReminderAsync(cardId, ct);
return await ReadCardAsync(context, cardId, ct);
}
// Читает карточку через единый сервис и возвращает её как ответ (404 — карточки нет).
@@ -412,11 +401,7 @@ public static class CardDetailsEndpoints
CancellationToken ct)
{
CardsService cardsService = context.RequestServices.GetRequiredService<CardsService>();
CardDto? card = await cardsService.GetCardAsync(cardId, ct);
if (card is null)
{
return EndpointResults.NotFound(CardNotFoundDetail);
}
CardDto card = await cardsService.GetCardAsync(cardId, ct);
SourceContent content = await cardsService.ResolveSourceAsync(card, ct);
return Results.Ok(content);
@@ -428,10 +413,8 @@ public static class CardDetailsEndpoints
CancellationToken ct)
{
CardsService cardsService = context.RequestServices.GetRequiredService<CardsService>();
CardDto? card = await cardsService.GetCardAsync(cardId, ct);
return card is null
? EndpointResults.NotFound(CardNotFoundDetail)
: Results.Ok(card);
CardDto card = await cardsService.GetCardAsync(cardId, ct);
return Results.Ok(card);
}
// Имя файла для Content-Disposition без кавычек «"».
src/core/Deal.Api/Endpoints/CardsEndpoints.cs
+5 -18
View File
@@ -128,10 +128,8 @@ public static class CardsEndpoints
}
CardsService cardsService = context.RequestServices.GetRequiredService<CardsService>();
CardDto? card = await cardsService.GetCardAsync(cardId, ct);
return card is null
? EndpointResults.NotFound(CardNotFoundDetail)
: Results.Ok(card);
CardDto card = await cardsService.GetCardAsync(cardId, ct);
return Results.Ok(card);
}
private static async Task<IResult> MarkAllSeenAsync(HttpContext context, CancellationToken ct)
@@ -184,18 +182,11 @@ public static class CardsEndpoints
return EndpointResults.BadRequest(outcome.Error);
}
if (!outcome.Exists)
{
return EndpointResults.NotFound(CardNotFoundDetail);
}
await AuditAppender.AppendTenantAsync(context, AuditEvents.CardMoved, new { cardId, to = body.To }, ct);
CardsService cardsService = context.RequestServices.GetRequiredService<CardsService>();
CardDto? unified = await cardsService.GetCardAsync(cardId, ct);
return unified is null
? EndpointResults.NotFound(CardNotFoundDetail)
: Results.Ok(unified);
CardDto unified = await cardsService.GetCardAsync(cardId, ct);
return Results.Ok(unified);
}
private static async Task<IResult> TrashAsync(
@@ -353,11 +344,7 @@ public static class CardsEndpoints
}
CardsService cardsService = context.RequestServices.GetRequiredService<CardsService>();
CardDto? card = await cardsService.GetCardAsync(cardId, ct);
if (card is null)
{
return EndpointResults.NotFound(CardNotFoundDetail);
}
CardDto card = await cardsService.GetCardAsync(cardId, ct);
CardReclassifier reclassifier = context.RequestServices.GetRequiredService<CardReclassifier>();
ReclassifyResultDto result = await reclassifier.ReclassifyCardAsync(card, ct);
src/core/Deal.Infrastructure/Services/CardMover.cs
+1 -3
View File
@@ -22,8 +22,6 @@ public sealed class CardMover(CardsService cardsService) : ICardMover
CardResultDto result = CardsDefaultContainers.Contains(toContainerId)
? await cardsService.MoveStageCardAsync(cardId, toContainerId, ct)
: await cardsService.MoveDashboardCardAsync(cardId, toContainerId, ct);
return result.Error is not null
? new CardMoveResultDto(result.Error, Exists: true)
: new CardMoveResultDto(null, Exists: result.Card is not null);
return new CardMoveResultDto(result.Error);
}
}
src/core/Deal.Modules.Cards/Application/Abstractions/ICardMover.cs
+3 -1
View File
@@ -1,5 +1,6 @@
using Deal.Modules.Cards.Application.Dtos;
using Deal.Modules.Cards.Application.Models;
using Deal.SharedKernel.Errors;
namespace Deal.Modules.Cards.Application.Abstractions;
@@ -14,7 +15,8 @@ public interface ICardMover
/// <param name="cardId">Id карточки.</param>
/// <param name="toContainerId">Id контейнера назначения (стадия «Выбранных» либо дашборд-контейнер).</param>
/// <param name="ctx">Контекст перехода (инициатор, причина, обучение).</param>
/// <returns>Результат: Error (400-текст отказа) | Exists=false (карточки нет, 404) | успех (Exists=true).</returns>
/// <returns>Результат: Error (400-текст отказа) либо null (успех).</returns>
/// <exception cref="NotFoundException">Карточка не найдена.</exception>
public Task<CardMoveResultDto> MoveAsync(
string cardId,
string toContainerId,
src/core/Deal.Modules.Cards/Application/Dtos/CardMoveResultDto.cs
+2 -3
View File
@@ -5,6 +5,5 @@ namespace Deal.Modules.Cards.Application.Dtos;
/// <summary>
/// Результат перехода карточки единым механизмом <see cref="ICardMover"/>.
/// </summary>
/// <param name="Error">Текст 400-ошибки либо null.</param>
/// <param name="Exists">True — карточка найдена и переход выполнен (либо перенос был no-op).</param>
public sealed record CardMoveResultDto(string? Error, bool Exists);
/// <param name="Error">Текст 400-ошибки либо null (успех).</param>
public sealed record CardMoveResultDto(string? Error);
src/core/Deal.Modules.Kanban/Application/Services/CardsService.Operations.cs
+14 -4
View File
@@ -27,9 +27,16 @@ public sealed partial class CardsService
/// </summary>
/// <param name="cardId">Id карточки (<c>c_...</c>).</param>
/// <returns>Карточка или null — строки нет (эндпоинт отвечает 404 «Карточка не найдена»).</returns>
public Task<CardDto?> GetCardAsync(string cardId, CancellationToken ct)
/// <summary>
/// Одна карточка по id.
/// </summary>
/// <param name="cardId">Id карточки (<c>c_...</c>).</param>
/// <returns>Карточка.</returns>
/// <exception cref="NotFoundException">Карточка не найдена.</exception>
public async Task<CardDto> GetCardAsync(string cardId, CancellationToken ct)
{
return _store.GetCardAsync(cardId, ct);
return await _store.GetCardAsync(cardId, ct)
?? throw new NotFoundException(CardEntityName, cardId);
}
@@ -57,7 +64,7 @@ public sealed partial class CardsService
CardDto? card = await _store.GetCardAsync(cardId, ct);
if (card is null)
{
return new CardResultDto(null, null);
throw new NotFoundException(CardEntityName, cardId);
}
if (card.Col == CardIds.Archive || card.Col == CardIds.Trash)
@@ -81,7 +88,10 @@ public sealed partial class CardsService
await _mlClient.PushAsync(text, toCol, PushWeightUser, ct);
}
return new CardResultDto(null, await _store.GetCardAsync(cardId, ct));
return new CardResultDto(
null,
await _store.GetCardAsync(cardId, ct)
?? throw new NotFoundException(CardEntityName, cardId));
}
/// <summary>
src/core/Deal.Modules.Kanban/Application/Services/CardsService.Reminders.cs
+14 -23
View File
@@ -1,5 +1,6 @@
using Deal.Modules.Kanban.Application.Models;
using Deal.Modules.Settings.Application.Models;
using Deal.SharedKernel.Errors;
namespace Deal.Modules.Kanban.Application.Services;
@@ -22,17 +23,15 @@ public sealed partial class CardsService
/// </summary>
/// <param name="cardId">Id карточки (<c>c_...</c>).</param>
/// <param name="atMs">Время напоминания, epoch-ms.</param>
/// <returns>Результат: Error <see cref="RemindersDisabledDetail"/> (400) | Card=null без Error (404) | Card — карточка с напоминанием.</returns>
/// <returns>Результат: Error <see cref="RemindersDisabledDetail"/> (400) | Card — карточка с напоминанием.</returns>
/// <exception cref="NotFoundException">Карточка не найдена.</exception>
public async Task<CardResultDto> SetReminderAsync(
string cardId,
long atMs,
CancellationToken ct)
{
CardDto? card = await _store.GetCardAsync(cardId, ct);
if (card is null)
{
return new CardResultDto(null, null);
}
CardDto card = await _store.GetCardAsync(cardId, ct)
?? throw new NotFoundException(CardEntityName, cardId);
if (!await ReadRemindersEnabledAsync(ct))
{
@@ -41,7 +40,7 @@ public sealed partial class CardsService
await _store.SetReminderAsync(cardId, atMs, ct);
CardDto saved = await _store.GetCardAsync(cardId, ct)
?? throw new InvalidOperationException("Карточка не прочиталась после установки напоминания: " + cardId);
?? throw new NotFoundException(CardEntityName, cardId);
return new CardResultDto(null, saved);
}
@@ -49,35 +48,27 @@ public sealed partial class CardsService
/// Снимает напоминание карточки.
/// </summary>
/// <param name="cardId">Id карточки (<c>c_...</c>).</param>
/// <returns>True — карточка есть и напоминание снято; false — карточки нет (404).</returns>
public async Task<bool> ClearReminderAsync(string cardId, CancellationToken ct)
/// <exception cref="NotFoundException">Карточка не найдена.</exception>
public async Task ClearReminderAsync(string cardId, CancellationToken ct)
{
CardDto? card = await _store.GetCardAsync(cardId, ct);
if (card is null)
{
return false;
}
_ = await _store.GetCardAsync(cardId, ct)
?? throw new NotFoundException(CardEntityName, cardId);
await _store.ClearReminderAsync(cardId, ct);
return true;
}
/// <summary>
/// «Напомнить позже»
/// </summary>
/// <param name="cardId">Id карточки (<c>c_...</c>).</param>
/// <returns>True — карточка есть и напоминание отложено; false — карточки нет (404).</returns>
public async Task<bool> SnoozeReminderAsync(string cardId, CancellationToken ct)
/// <exception cref="NotFoundException">Карточка не найдена.</exception>
public async Task SnoozeReminderAsync(string cardId, CancellationToken ct)
{
CardDto? card = await _store.GetCardAsync(cardId, ct);
if (card is null)
{
return false;
}
_ = await _store.GetCardAsync(cardId, ct)
?? throw new NotFoundException(CardEntityName, cardId);
long snoozedAtMs = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() + ReminderSnoozeMs;
await _store.SetReminderAsync(cardId, snoozedAtMs, ct);
return true;
}
/// <summary>
src/core/Deal.Modules.Kanban/Application/Services/CardsService.Selected.cs
+17 -14
View File
@@ -12,6 +12,9 @@ namespace Deal.Modules.Kanban.Application.Services;
/// </summary>
public sealed partial class CardsService
{
// Имя сущности для текста ошибки «не найдено».
private const string CardLinkEntityName = "Ссылка карточки";
/// <summary>
/// 400 перенос по стадии
/// </summary>
@@ -159,18 +162,16 @@ public sealed partial class CardsService
/// <param name="cardId">Id карточки (<c>c_...</c>).</param>
/// <param name="name">Название ссылки; пустое после Trim → name = url.</param>
/// <param name="url">URL ссылки (без схемы — добавится https://).</param>
/// <returns>Результат: Error (400 «Пустая ссылка») | Card=null без Error (404) | Card — карточка со ссылкой.</returns>
/// <returns>Результат: Error (400 «Пустая ссылка») | Card — карточка со ссылкой.</returns>
/// <exception cref="NotFoundException">Карточка не найдена.</exception>
public async Task<CardResultDto> AddLinkAsync(
string cardId,
string name,
string url,
CancellationToken ct)
{
CardDto? card = await _store.GetCardAsync(cardId, ct);
if (card is null)
{
return new CardResultDto(null, null);
}
CardDto card = await _store.GetCardAsync(cardId, ct)
?? throw new NotFoundException(CardEntityName, cardId);
string normalizedUrl = (url ?? string.Empty).Trim();
if (normalizedUrl.Length == 0)
@@ -191,11 +192,11 @@ public sealed partial class CardsService
normalizedUrl);
if (!await _store.AddLinkAsync(cardId, link, ct))
{
return new CardResultDto(null, null);
throw new NotFoundException(CardEntityName, cardId);
}
CardDto saved = await _store.GetCardAsync(cardId, ct)
?? throw new InvalidOperationException("Карточка не прочиталась после добавления ссылки: " + cardId);
?? throw new NotFoundException(CardEntityName, cardId);
return new CardResultDto(null, saved);
}
@@ -204,7 +205,8 @@ public sealed partial class CardsService
/// </summary>
/// <param name="cardId">Id карточки (<c>c_...</c>).</param>
/// <param name="linkId">Id удаляемой ссылки (<c>pl_...</c>).</param>
/// <returns>Результат: Card=null без Error (404) | Card — карточка без ссылки.</returns>
/// <returns>Карточка без ссылки.</returns>
/// <exception cref="NotFoundException">Карточка или ссылка не найдены.</exception>
public async Task<CardResultDto> RemoveLinkAsync(
string cardId,
string linkId,
@@ -212,11 +214,11 @@ public sealed partial class CardsService
{
if (!await _store.RemoveLinkAsync(cardId, linkId, ct))
{
return new CardResultDto(null, null);
throw new NotFoundException(CardLinkEntityName, linkId);
}
CardDto saved = await _store.GetCardAsync(cardId, ct)
?? throw new InvalidOperationException("Карточка не прочиталась после удаления ссылки: " + cardId);
?? throw new NotFoundException(CardEntityName, cardId);
return new CardResultDto(null, saved);
}
@@ -225,7 +227,8 @@ public sealed partial class CardsService
/// </summary>
/// <param name="cardId">Id карточки (<c>c_...</c>).</param>
/// <param name="containerId">Новый контейнер-стадия — id каталога <see cref="CardsDefaultContainers"/>.</param>
/// <returns>Результат: Error «Неизвестная стадия» (400) | Card=null без Error (карточки нет, 404) | Card — карточка после переноса.</returns>
/// <returns>Результат: Error «Неизвестная стадия» (400) | Card — карточка после переноса.</returns>
/// <exception cref="NotFoundException">Карточка не найдена.</exception>
public async Task<CardResultDto> MoveStageCardAsync(
string cardId,
string containerId,
@@ -241,11 +244,11 @@ public sealed partial class CardsService
bool moved = await _store.MoveCardStageAsync(cardId, containerId, entry, nowMs, ct);
if (!moved)
{
return new CardResultDto(null, null);
throw new NotFoundException(CardEntityName, cardId);
}
CardDto card = await _store.GetCardAsync(cardId, ct)
?? throw new InvalidOperationException("Карточка не прочиталась после move: " + cardId);
?? throw new NotFoundException(CardEntityName, cardId);
return new CardResultDto(null, card);
}
src/core/tests/Deal.Tests.Unit/Contracts/CardsServiceTests.cs
+6 -8
View File
@@ -53,13 +53,12 @@ public sealed class CardsServiceTests
}
[Fact]
public async Task GetCard_Missing_ReturnsNull()
public async Task GetCard_Missing_ThrowsNotFound()
{
(CardsService service, _, _, _) = Create();
CardDto? card = await service.GetCardAsync("l_missing", CancellationToken.None);
Assert.Null(card);
await Assert.ThrowsAsync<NotFoundException>(
() => service.GetCardAsync("l_missing", CancellationToken.None));
}
@@ -146,15 +145,14 @@ public sealed class CardsServiceTests
}
[Fact]
public async Task Move_CardMissing_ReturnsNullLead()
public async Task Move_CardMissing_ThrowsNotFound()
{
(CardsService service, TestKanjStore store, _, TestMlClient ml) = Create();
store.SeedBoard(Board("b_py"));
CardResultDto result = await service.MoveDashboardCardAsync("l_ghost", "b_py", CancellationToken.None);
await Assert.ThrowsAsync<NotFoundException>(
() => service.MoveDashboardCardAsync("l_ghost", "b_py", CancellationToken.None));
Assert.Null(result.Error);
Assert.Null(result.Card); // эндпоинт отвечает 404 «Карточка не найдена»
Assert.Empty(store.Moves);
Assert.Empty(ml.Pushed);
}
src/core/tests/Deal.Tests.Unit/Infrastructure/CardMoverTests.cs
+5 -9
View File
@@ -3,10 +3,11 @@ using Deal.Modules.Cards.Application.Dtos;
using Deal.Modules.Cards.Application.Models;
using Deal.Modules.Cards.Application.Sources;
using Deal.Modules.Kanban.Application.Models;
using Deal.Tests.Unit.Support;
using Deal.Modules.Kanban.Application.Services;
using Deal.SharedKernel.Errors;
using Deal.Tests.Unit.Contracts;
using Deal.Tests.Unit.Modules.Settings;
using Deal.Tests.Unit.Support;
namespace Deal.Tests.Unit.Infrastructure;
@@ -32,7 +33,6 @@ public sealed class CardMoverTests
CardMoveResultDto result = await mover.MoveAsync("c_1", CardsDefaultContainers.Planned, UserMove, CancellationToken.None);
Assert.Null(result.Error);
Assert.True(result.Exists);
CardDto card = Assert.Single(store.CardDtos);
Assert.Equal(CardsDefaultContainers.Planned, card.Col);
Assert.Null(card.Reminder); // move по стадии сбрасывает напоминание
@@ -50,7 +50,6 @@ public sealed class CardMoverTests
CardMoveResultDto result = await mover.MoveAsync("c_1", "b_py", UserMove, CancellationToken.None);
Assert.Null(result.Error);
Assert.True(result.Exists);
Assert.Equal("b_py", Assert.Single(store.CardDtos).Col);
Assert.Single(store.Moves); // журнал CardMoves дашборд-переноса
}
@@ -64,18 +63,15 @@ public sealed class CardMoverTests
CardMoveResultDto result = await mover.MoveAsync("c_1", "b_ghost", UserMove, CancellationToken.None);
Assert.Equal(CardsService.MoveTargetInvalidDetail, result.Error);
Assert.True(result.Exists); // ошибка важнее признака наличия
}
[Fact]
public async Task Move_ToStage_CardMissing_ReportsNotFound()
public async Task Move_ToStage_CardMissing_ThrowsNotFound()
{
(CardMover mover, _) = Create();
CardMoveResultDto result = await mover.MoveAsync("c_ghost", CardsDefaultContainers.Planned, UserMove, CancellationToken.None);
Assert.Null(result.Error);
Assert.False(result.Exists);
await Assert.ThrowsAsync<NotFoundException>(
() => mover.MoveAsync("c_ghost", CardsDefaultContainers.Planned, UserMove, CancellationToken.None));
}
private static (CardMover Mover, TestKanjStore Store) Create()
src/core/tests/Deal.Tests.Unit/Modules/Kanban/CardsServiceRemindersTests.cs
+16 -23
View File
@@ -1,9 +1,10 @@
using Deal.Modules.Kanban.Application.Models;
using Deal.Tests.Unit.Support;
using Deal.Modules.Kanban.Application.Services;
using Deal.Modules.Settings.Application.Models;
using Deal.SharedKernel.Errors;
using Deal.Tests.Unit.Contracts;
using Deal.Tests.Unit.Modules.Settings;
using Deal.Tests.Unit.Support;
namespace Deal.Tests.Unit.Modules.Kanban;
@@ -47,14 +48,12 @@ public sealed class CardsServiceRemindersTests
}
[Fact]
public async Task Set_MissingCard_Returns404EvenWhenDisabled()
public async Task Set_MissingCard_ThrowsNotFoundEvenWhenDisabled()
{
(CardsService service, _, _) = Create(remindersEnabled: false);
CardResultDto result = await service.SetReminderAsync("c_missing", NowMs(), CancellationToken.None);
Assert.Null(result.Error);
Assert.Null(result.Card); // эндпоинт отвечает 404 «Карточка не найдена»
await Assert.ThrowsAsync<NotFoundException>(
() => service.SetReminderAsync("c_missing", NowMs(), CancellationToken.None));
}
[Fact]
@@ -73,25 +72,23 @@ public sealed class CardsServiceRemindersTests
[Fact]
public async Task Clear_WithReminder_ClearsItAndReturnsTrue()
public async Task Clear_WithReminder_ClearsIt()
{
(CardsService service, TestKanjStore store, _) = Create();
store.SeedCard(Card("c_1", stage: "hold") with { Reminder = new CardReminderDto(NowMs() - 1) });
bool cleared = await service.ClearReminderAsync("c_1", CancellationToken.None);
await service.ClearReminderAsync("c_1", CancellationToken.None);
Assert.True(cleared);
Assert.Null(Assert.Single(store.CardDtos).Reminder); // reminder_at=NULL, fired сброшен
}
[Fact]
public async Task Clear_MissingCard_ReturnsFalse()
public async Task Clear_MissingCard_ThrowsNotFound()
{
(CardsService service, _, _) = Create();
bool cleared = await service.ClearReminderAsync("c_missing", CancellationToken.None);
Assert.False(cleared); // эндпоинт отвечает 404 «Карточка не найдена»
await Assert.ThrowsAsync<NotFoundException>(
() => service.ClearReminderAsync("c_missing", CancellationToken.None));
}
[Fact]
@@ -100,9 +97,8 @@ public sealed class CardsServiceRemindersTests
(CardsService service, TestKanjStore store, _) = Create(remindersEnabled: false);
store.SeedCard(Card("c_1", stage: "hold") with { Reminder = new CardReminderDto(NowMs() + DayMs) });
bool cleared = await service.ClearReminderAsync("c_1", CancellationToken.None);
await service.ClearReminderAsync("c_1", CancellationToken.None);
Assert.True(cleared);
Assert.Null(Assert.Single(store.CardDtos).Reminder);
}
@@ -114,22 +110,20 @@ public sealed class CardsServiceRemindersTests
store.SeedCard(Card("c_1", stage: "hold") with { Reminder = new CardReminderDto(NowMs() - 1) });
long beforeMs = NowMs();
bool snoozed = await service.SnoozeReminderAsync("c_1", CancellationToken.None);
await service.SnoozeReminderAsync("c_1", CancellationToken.None);
Assert.True(snoozed);
long afterMs = NowMs();
CardReminderDto reminder = Assert.Single(store.CardDtos).Reminder!;
Assert.InRange(reminder.At, beforeMs + DayMs, afterMs + DayMs); // now + 24 ч
}
[Fact]
public async Task Snooze_MissingCard_ReturnsFalse()
public async Task Snooze_MissingCard_ThrowsNotFound()
{
(CardsService service, _, _) = Create();
bool snoozed = await service.SnoozeReminderAsync("c_missing", CancellationToken.None);
Assert.False(snoozed); // эндпоинт отвечает 404 «Карточка не найдена»
await Assert.ThrowsAsync<NotFoundException>(
() => service.SnoozeReminderAsync("c_missing", CancellationToken.None));
}
[Fact]
@@ -138,9 +132,8 @@ public sealed class CardsServiceRemindersTests
(CardsService service, TestKanjStore store, _) = Create(remindersEnabled: false);
store.SeedCard(Card("c_1", stage: "hold") with { Reminder = new CardReminderDto(NowMs() - 1) });
bool snoozed = await service.SnoozeReminderAsync("c_1", CancellationToken.None);
await service.SnoozeReminderAsync("c_1", CancellationToken.None);
Assert.True(snoozed);
Assert.NotNull(Assert.Single(store.CardDtos).Reminder);
}
src/core/tests/Deal.Tests.Unit/Support/CardsServiceSelectedTests.cs
+12 -17
View File
@@ -40,13 +40,12 @@ public sealed class CardsServiceSelectedTests
}
[Fact]
public async Task Get_Missing_ReturnsNull()
public async Task Get_Missing_ThrowsNotFound()
{
(CardsService service, _, _, _) = Create();
CardDto? card = await service.GetCardAsync("c_missing", CancellationToken.None);
Assert.Null(card);
await Assert.ThrowsAsync<NotFoundException>(
() => service.GetCardAsync("c_missing", CancellationToken.None));
}
@@ -319,14 +318,12 @@ public sealed class CardsServiceSelectedTests
}
[Fact]
public async Task Move_CardMissing_ReturnsNullCard()
public async Task Move_CardMissing_ThrowsNotFound()
{
(CardsService service, _, _, _) = Create();
CardResultDto result = await service.MoveStageCardAsync("c_missing", "work", CancellationToken.None);
Assert.Null(result.Error);
Assert.Null(result.Card); // 404 «Карточка не найдена» — текст у эндпоинта
await Assert.ThrowsAsync<NotFoundException>(
() => service.MoveStageCardAsync("c_missing", "work", CancellationToken.None));
}
@@ -465,14 +462,13 @@ public sealed class CardsServiceSelectedTests
}
[Fact]
public async Task AddLink_CardMissing_ReturnsNullCardBeforeUrlValidation()
public async Task AddLink_CardMissing_ThrowsBeforeUrlValidation()
{
(CardsService service, TestKanjStore store, _, _) = Create();
CardResultDto result = await service.AddLinkAsync("c_missing", string.Empty, "example.com", CancellationToken.None);
await Assert.ThrowsAsync<NotFoundException>(
() => service.AddLinkAsync("c_missing", string.Empty, "example.com", CancellationToken.None));
Assert.Null(result.Error);
Assert.Null(result.Card); // 404-семантика: карточки нет раньше валидации url
Assert.Empty(store.CardDtos);
}
@@ -514,14 +510,13 @@ public sealed class CardsServiceSelectedTests
}
[Fact]
public async Task RemoveLink_CardMissing_ReturnsNullCard()
public async Task RemoveLink_CardMissing_ThrowsNotFound()
{
(CardsService service, TestKanjStore store, _, _) = Create();
CardResultDto result = await service.RemoveLinkAsync("c_missing", "pl_1", CancellationToken.None);
await Assert.ThrowsAsync<NotFoundException>(
() => service.RemoveLinkAsync("c_missing", "pl_1", CancellationToken.None));
Assert.Null(result.Error);
Assert.Null(result.Card); // эндпоинт отвечает 404 «Карточка не найдена»
Assert.Empty(store.CardDtos);
}