feat(data): add task numbers schema, allocator, and backfill migration
TaskEntity.Number is a global, monotonically increasing, never-reused integer (displayed as #123), allocated from AppSettingsEntity.NextTaskNumber via a single UPDATE...RETURNING statement rather than MAX(number)+1, which would reissue a deleted task's number. Both insert paths (TaskRepository. AddAsync and CreateChildAsync) route through the new TaskNumberAllocator, with a bounded retry on a unique-index collision. One migration adds the columns, backfills existing rows in creation order, and creates the unique index afterwards. Data-layer only; MCP/UI wiring is later slices.
This commit is contained in:
mika kuns
@@ -47,8 +47,8 @@ public sealed class ForeignKeyTests : IDisposable
|
||||
await using (var ctx = Open())
|
||||
{
|
||||
ctx.Lists.Add(new ListEntity { Id = listId, Name = "L", CreatedAt = DateTime.UtcNow });
|
||||
ctx.Tasks.Add(new TaskEntity { Id = parentId, ListId = listId, Title = "Predecessor", Status = TaskStatus.Idle, CreatedAt = DateTime.UtcNow });
|
||||
ctx.Tasks.Add(new TaskEntity { Id = childId, ListId = listId, Title = "Blocked", Status = TaskStatus.Idle, BlockedByTaskId = parentId, CreatedAt = DateTime.UtcNow });
|
||||
ctx.Tasks.Add(new TaskEntity { Id = parentId, Number = 1, ListId = listId, Title = "Predecessor", Status = TaskStatus.Idle, CreatedAt = DateTime.UtcNow });
|
||||
ctx.Tasks.Add(new TaskEntity { Id = childId, Number = 2, ListId = listId, Title = "Blocked", Status = TaskStatus.Idle, BlockedByTaskId = parentId, CreatedAt = DateTime.UtcNow });
|
||||
await ctx.SaveChangesAsync();
|
||||
}
|
||||
|
||||
@@ -79,8 +79,8 @@ public sealed class ForeignKeyTests : IDisposable
|
||||
await using (var ctx = Open())
|
||||
{
|
||||
ctx.Lists.Add(new ListEntity { Id = listId, Name = "L", CreatedAt = DateTime.UtcNow });
|
||||
ctx.Tasks.Add(new TaskEntity { Id = predecessorId, ListId = listId, Title = "Predecessor", Status = TaskStatus.Idle, CreatedAt = DateTime.UtcNow });
|
||||
ctx.Tasks.Add(new TaskEntity { Id = dependentId, ListId = listId, Title = "Dependent", Status = TaskStatus.Idle, DependsOnTaskId = predecessorId, CreatedAt = DateTime.UtcNow });
|
||||
ctx.Tasks.Add(new TaskEntity { Id = predecessorId, Number = 1, ListId = listId, Title = "Predecessor", Status = TaskStatus.Idle, CreatedAt = DateTime.UtcNow });
|
||||
ctx.Tasks.Add(new TaskEntity { Id = dependentId, Number = 2, ListId = listId, Title = "Dependent", Status = TaskStatus.Idle, DependsOnTaskId = predecessorId, CreatedAt = DateTime.UtcNow });
|
||||
await ctx.SaveChangesAsync();
|
||||
}
|
||||
|
||||
|
||||
@@ -42,16 +42,16 @@ public sealed class MoveToListTests : IDisposable
|
||||
await SeedListsAsync("source", "target");
|
||||
_ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = "t1", ListId = "source", Title = "Task", CreatedAt = DateTime.UtcNow, SortOrder = 0,
|
||||
Id = "t1", Number = 1, ListId = "source", Title = "Task", CreatedAt = DateTime.UtcNow, SortOrder = 0,
|
||||
});
|
||||
// Existing tasks already in the target list, so we can assert the moved task lands after them.
|
||||
_ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = "existing1", ListId = "target", Title = "Existing 1", CreatedAt = DateTime.UtcNow, SortOrder = 0,
|
||||
Id = "existing1", Number = 2, ListId = "target", Title = "Existing 1", CreatedAt = DateTime.UtcNow, SortOrder = 0,
|
||||
});
|
||||
_ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = "existing2", ListId = "target", Title = "Existing 2", CreatedAt = DateTime.UtcNow, SortOrder = 1,
|
||||
Id = "existing2", Number = 3, ListId = "target", Title = "Existing 2", CreatedAt = DateTime.UtcNow, SortOrder = 1,
|
||||
});
|
||||
await _ctx.SaveChangesAsync();
|
||||
_ctx.ChangeTracker.Clear();
|
||||
@@ -69,16 +69,16 @@ public sealed class MoveToListTests : IDisposable
|
||||
await SeedListsAsync("source", "target");
|
||||
_ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = "parent", ListId = "source", Title = "Parent", CreatedAt = DateTime.UtcNow, SortOrder = 0,
|
||||
Id = "parent", Number = 1, ListId = "source", Title = "Parent", CreatedAt = DateTime.UtcNow, SortOrder = 0,
|
||||
});
|
||||
_ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = "child", ListId = "source", Title = "Child", CreatedAt = DateTime.UtcNow,
|
||||
Id = "child", Number = 2, ListId = "source", Title = "Child", CreatedAt = DateTime.UtcNow,
|
||||
SortOrder = 1, ParentTaskId = "parent",
|
||||
});
|
||||
_ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = "grandchild", ListId = "source", Title = "Grandchild", CreatedAt = DateTime.UtcNow,
|
||||
Id = "grandchild", Number = 3, ListId = "source", Title = "Grandchild", CreatedAt = DateTime.UtcNow,
|
||||
SortOrder = 2, ParentTaskId = "child",
|
||||
});
|
||||
await _ctx.SaveChangesAsync();
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
using ClaudeDo.Data;
|
||||
using ClaudeDo.Data.Models;
|
||||
using ClaudeDo.Data.Repositories;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
|
||||
|
||||
namespace ClaudeDo.Data.Tests;
|
||||
|
||||
public sealed class TaskNumberAllocatorTests : IDisposable
|
||||
{
|
||||
private readonly string _dbPath;
|
||||
private readonly DbContextOptions<ClaudeDoDbContext> _options;
|
||||
private readonly ClaudeDoDbContext _ctx;
|
||||
|
||||
public TaskNumberAllocatorTests()
|
||||
{
|
||||
_dbPath = Path.Combine(Path.GetTempPath(), $"claudedo_tasknum_{Guid.NewGuid():N}.db");
|
||||
_options = new DbContextOptionsBuilder<ClaudeDoDbContext>()
|
||||
.UseSqlite($"Data Source={_dbPath}")
|
||||
.Options;
|
||||
_ctx = new ClaudeDoDbContext(_options);
|
||||
_ctx.Database.EnsureCreated();
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_ctx.Dispose();
|
||||
foreach (var suffix in new[] { "", "-wal", "-shm" })
|
||||
try { File.Delete(_dbPath + suffix); } catch { }
|
||||
}
|
||||
|
||||
private async Task<string> SeedListAsync(string id = "l1")
|
||||
{
|
||||
_ctx.Lists.Add(new ListEntity { Id = id, Name = "Test List", CreatedAt = DateTime.UtcNow });
|
||||
await _ctx.SaveChangesAsync();
|
||||
return id;
|
||||
}
|
||||
|
||||
private static TaskEntity NewTask(string listId, string title = "T")
|
||||
=> new()
|
||||
{
|
||||
Id = Guid.NewGuid().ToString(),
|
||||
ListId = listId,
|
||||
Title = title,
|
||||
Status = TaskStatus.Idle,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
};
|
||||
|
||||
[Fact]
|
||||
public async Task AddAsync_assigns_increasing_unique_numbers()
|
||||
{
|
||||
await SeedListAsync();
|
||||
var repo = new TaskRepository(_ctx);
|
||||
|
||||
var first = NewTask("l1");
|
||||
await repo.AddAsync(first);
|
||||
var second = NewTask("l1");
|
||||
await repo.AddAsync(second);
|
||||
|
||||
Assert.True(first.Number > 0);
|
||||
Assert.True(second.Number > first.Number);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task CreateChildAsync_also_allocates_a_number()
|
||||
{
|
||||
await SeedListAsync();
|
||||
var parent = NewTask("l1");
|
||||
await new TaskRepository(_ctx).AddAsync(parent);
|
||||
|
||||
var child = await new TaskRepository(_ctx).CreateChildAsync(parent.Id, "Child", null, null);
|
||||
|
||||
Assert.True(child.Number > 0);
|
||||
Assert.NotEqual(parent.Number, child.Number);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Deleting_the_highest_numbered_task_does_not_recycle_its_number()
|
||||
{
|
||||
await SeedListAsync();
|
||||
var repo = new TaskRepository(_ctx);
|
||||
|
||||
var t1 = NewTask("l1");
|
||||
await repo.AddAsync(t1);
|
||||
var t2 = NewTask("l1");
|
||||
await repo.AddAsync(t2);
|
||||
Assert.True(t2.Number > t1.Number);
|
||||
|
||||
await repo.DeleteAsync(t2.Id);
|
||||
|
||||
var t3 = NewTask("l1");
|
||||
await repo.AddAsync(t3);
|
||||
|
||||
Assert.True(t3.Number > t2.Number);
|
||||
Assert.NotEqual(t2.Number, t3.Number);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Repeated_creation_never_assigns_the_same_number_twice()
|
||||
{
|
||||
var listId = await SeedListAsync();
|
||||
|
||||
var numbers = new List<int>();
|
||||
for (var i = 0; i < 20; i++)
|
||||
{
|
||||
await using var ctx = new ClaudeDoDbContext(_options);
|
||||
var task = NewTask(listId, $"T{i}");
|
||||
await new TaskRepository(ctx).AddAsync(task);
|
||||
numbers.Add(task.Number);
|
||||
}
|
||||
|
||||
Assert.Equal(numbers.Count, numbers.Distinct().Count());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Concurrent_creation_never_assigns_the_same_number_twice()
|
||||
{
|
||||
var listId = await SeedListAsync();
|
||||
|
||||
var tasks = Enumerable.Range(0, 10).Select(async i =>
|
||||
{
|
||||
await using var ctx = new ClaudeDoDbContext(_options);
|
||||
var task = NewTask(listId, $"C{i}");
|
||||
await new TaskRepository(ctx).AddAsync(task);
|
||||
return task.Number;
|
||||
});
|
||||
|
||||
var numbers = await Task.WhenAll(tasks);
|
||||
|
||||
Assert.Equal(numbers.Length, numbers.Distinct().Count());
|
||||
Assert.All(numbers, n => Assert.True(n > 0));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetByNumberAsync_finds_the_task_and_returns_null_for_unknown_numbers()
|
||||
{
|
||||
await SeedListAsync();
|
||||
var task = NewTask("l1");
|
||||
await new TaskRepository(_ctx).AddAsync(task);
|
||||
|
||||
var found = await new TaskRepository(_ctx).GetByNumberAsync(task.Number);
|
||||
var missing = await new TaskRepository(_ctx).GetByNumberAsync(task.Number + 999);
|
||||
|
||||
Assert.NotNull(found);
|
||||
Assert.Equal(task.Id, found!.Id);
|
||||
Assert.Null(missing);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
using ClaudeDo.Data;
|
||||
using ClaudeDo.Data.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace ClaudeDo.Data.Tests;
|
||||
|
||||
// EnsureCreated (used by every other Data.Tests fixture) builds the schema straight from the
|
||||
// current model and skips migrations entirely, so it can never exercise the AddTaskNumbers
|
||||
// backfill. This test runs a real Migrate() against a database seeded with pre-migration rows.
|
||||
public sealed class TaskNumberMigrationTests : IDisposable
|
||||
{
|
||||
private const string MigrationBeforeTaskNumbers = "20260810115437_AddFailureReason";
|
||||
|
||||
private readonly string _dbPath;
|
||||
private readonly DbContextOptions<ClaudeDoDbContext> _options;
|
||||
|
||||
public TaskNumberMigrationTests()
|
||||
{
|
||||
_dbPath = Path.Combine(Path.GetTempPath(), $"claudedo_tasknum_migration_{Guid.NewGuid():N}.db");
|
||||
_options = new DbContextOptionsBuilder<ClaudeDoDbContext>()
|
||||
.UseSqlite($"Data Source={_dbPath}")
|
||||
.Options;
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
foreach (var suffix in new[] { "", "-wal", "-shm" })
|
||||
try { File.Delete(_dbPath + suffix); } catch { }
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Migrate_backfills_task_numbers_in_creation_order_with_id_tiebreak()
|
||||
{
|
||||
await using (var ctx = new ClaudeDoDbContext(_options))
|
||||
{
|
||||
var migrator = ctx.Database.GetInfrastructure().GetRequiredService<IMigrator>();
|
||||
migrator.Migrate(MigrationBeforeTaskNumbers);
|
||||
|
||||
var conn = ctx.Database.GetDbConnection();
|
||||
await conn.OpenAsync();
|
||||
|
||||
await ExecAsync(conn, """
|
||||
INSERT INTO lists (id, name, created_at) VALUES ('l1', 'List', '2026-01-01 00:00:00.0000000');
|
||||
""");
|
||||
|
||||
// Inserted out of creation order, and 'd'/'c' share a timestamp to exercise the id tiebreak.
|
||||
await ExecAsync(conn, InsertTaskSql("d", "2026-01-03 00:00:00.0000000"));
|
||||
await ExecAsync(conn, InsertTaskSql("a", "2026-01-01 00:00:00.0000000"));
|
||||
await ExecAsync(conn, InsertTaskSql("c", "2026-01-03 00:00:00.0000000"));
|
||||
await ExecAsync(conn, InsertTaskSql("b", "2026-01-02 00:00:00.0000000"));
|
||||
|
||||
migrator.Migrate();
|
||||
}
|
||||
|
||||
await using var verify = new ClaudeDoDbContext(_options);
|
||||
var byId = await verify.Tasks.AsNoTracking().ToDictionaryAsync(t => t.Id, t => t.Number);
|
||||
|
||||
Assert.Equal(1, byId["a"]);
|
||||
Assert.Equal(2, byId["b"]);
|
||||
Assert.Equal(3, byId["c"]);
|
||||
Assert.Equal(4, byId["d"]);
|
||||
|
||||
var numbers = byId.Values.OrderBy(n => n).ToList();
|
||||
Assert.Equal(new[] { 1, 2, 3, 4 }, numbers);
|
||||
|
||||
var settings = await verify.AppSettings.AsNoTracking().FirstAsync(s => s.Id == AppSettingsEntity.SingletonId);
|
||||
Assert.Equal(5, settings.NextTaskNumber);
|
||||
}
|
||||
|
||||
private static string InsertTaskSql(string id, string createdAt) => $"""
|
||||
INSERT INTO tasks (id, list_id, title, status, created_at)
|
||||
VALUES ('{id}', 'l1', 'Task {id}', 'idle', '{createdAt}');
|
||||
""";
|
||||
|
||||
private static async Task ExecAsync(System.Data.Common.DbConnection conn, string sql)
|
||||
{
|
||||
await using var cmd = conn.CreateCommand();
|
||||
cmd.CommandText = sql;
|
||||
await cmd.ExecuteNonQueryAsync();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user