From 24d2723f36c36354bf650f81c090f396fdaf6f24 Mon Sep 17 00:00:00 2001 From: sormond319 Date: Tue, 17 Nov 2026 18:46:49 -0500 Subject: [PATCH 1/2] feat: add Reviewer and Observer team roles, let authors decide, group projects by team - Reviewer reads the team's projects and records review decisions but cannot create, edit, archive, or restore requirements, or change links or documents. - Observer is read-only: no edits and no review decisions. - Both roles can be chosen when inviting and when changing a member's role. - The creator of a requirement may now approve or deny it (replaces the second-person rule of ADR-038). - /projects groups projects by team; each team heading opens that team's list. - Migration TeamReviewerObserverRoles widens the role check constraints; its rollback removes Reviewer/Observer memberships and invitations. Recorded as ADR-058. Co-Authored-By: Claude Opus 5.5 --- app/api/Data/SpecThreadDbContext.cs | 4 +- app/api/Data/TeamModels.cs | 2 +- app/api/Documents/DocumentEndpoints.cs | 2 + app/api/GitHub/EvidenceChangeEndpoints.cs | 6 + app/api/GitHub/EvidenceEndpoints.cs | 18 +- ...1221_TeamReviewerObserverRoles.Designer.cs | 1644 +++++++++++++++++ ...0261117231221_TeamReviewerObserverRoles.cs | 69 + .../SpecThreadDbContextModelSnapshot.cs | 4 +- app/api/Projects/ProjectAccess.cs | 29 +- app/api/Projects/ProjectEndpoints.cs | 1 + app/api/Requirements/FollowUpEndpoints.cs | 2 + app/api/Requirements/MilestoneEndpoints.cs | 1 + app/api/Requirements/RequirementEndpoints.cs | 12 +- app/api/Requirements/ReviewEndpoints.cs | 14 +- app/api/Teams/InvitationEndpoints.cs | 7 +- app/api/Teams/TeamManagementEndpoints.cs | 6 +- app/web/src/app/app-shell.css | 5 + app/web/src/app/invites/[token]/page.tsx | 3 +- .../documents/[documentId]/page.tsx | 4 +- .../[projectId]/documents/new/page.tsx | 3 + .../projects/[projectId]/documents/page.tsx | 4 +- .../[requirementId]/edit/page.tsx | 3 + .../requirements/[requirementId]/page.tsx | 19 +- .../[projectId]/requirements/new/page.tsx | 3 + .../[projectId]/requirements/page.tsx | 4 +- app/web/src/app/projects/new/page.tsx | 3 +- app/web/src/app/projects/page.tsx | 51 +- .../src/app/teams/[teamId]/archive/page.tsx | 3 +- .../app/teams/[teamId]/invitations/page.tsx | 3 +- .../src/app/teams/[teamId]/members/page.tsx | 3 +- .../src/app/teams/[teamId]/projects/page.tsx | 3 +- .../src/app/teams/[teamId]/settings/page.tsx | 3 +- app/web/src/components/review-panel.tsx | 19 +- .../components/teams/invitation-controls.tsx | 18 +- .../components/teams/team-members-table.tsx | 12 +- app/web/src/lib/email.ts | 4 +- app/web/src/lib/invitation-types.ts | 8 +- app/web/src/lib/invitations.ts | 3 +- app/web/src/lib/project-data.ts | 8 - app/web/src/lib/projects.ts | 34 +- app/web/src/lib/team-projects.ts | 5 +- app/web/src/lib/team-types.ts | 40 +- docs/API.md | 72 +- docs/ARCHITECTURE.md | 2 +- docs/DATABASE.md | 29 +- docs/DECISIONS.md | 46 +- docs/HANDOFF.md | 69 +- docs/PROJECT.md | 16 +- docs/TESTING.md | 20 +- .../team-reviewer-observer-roles-rollback.sql | 19 + docs/schema/team-reviewer-observer-roles.sql | 14 + .../generate-team-reviewer-observer-roles.mjs | 33 + scripts/test-database.mjs | 1 + tests/api/project-data.spec.ts | 36 +- tests/e2e/fixtures.ts | 2 +- tests/e2e/project-failures.spec.ts | 4 +- tests/e2e/projects.spec.ts | 18 +- tests/e2e/reviews.spec.ts | 63 +- tests/e2e/team-invitations.spec.ts | 11 +- tests/e2e/team-management.spec.ts | 7 + tests/schema/evidence.spec.ts | 8 +- tests/schema/github-repository.spec.ts | 4 +- tests/schema/reviews.spec.ts | 15 +- tests/schema/team-roles.spec.ts | 216 +++ 64 files changed, 2592 insertions(+), 202 deletions(-) create mode 100644 app/api/Migrations/20261117231221_TeamReviewerObserverRoles.Designer.cs create mode 100644 app/api/Migrations/20261117231221_TeamReviewerObserverRoles.cs create mode 100644 docs/schema/team-reviewer-observer-roles-rollback.sql create mode 100644 docs/schema/team-reviewer-observer-roles.sql create mode 100644 scripts/generate-team-reviewer-observer-roles.mjs create mode 100644 tests/schema/team-roles.spec.ts diff --git a/app/api/Data/SpecThreadDbContext.cs b/app/api/Data/SpecThreadDbContext.cs index c31add1..63de68a 100644 --- a/app/api/Data/SpecThreadDbContext.cs +++ b/app/api/Data/SpecThreadDbContext.cs @@ -69,7 +69,7 @@ protected override void OnModelCreating(ModelBuilder model) team.HasOne().WithMany().HasForeignKey(x => x.OwnerUserId).OnDelete(DeleteBehavior.Restrict); var teamMember = model.Entity(); - teamMember.ToTable("team_members", table => table.HasCheckConstraint("ck_team_members_role", "role IN ('admin', 'member')")); + teamMember.ToTable("team_members", table => table.HasCheckConstraint("ck_team_members_role", "role IN ('admin', 'member', 'reviewer', 'observer')")); teamMember.HasKey(x => new { x.TeamId, x.UserId }); teamMember.Property(x => x.TeamId).HasColumnName("team_id"); teamMember.Property(x => x.UserId).HasColumnName("user_id"); @@ -91,7 +91,7 @@ protected override void OnModelCreating(ModelBuilder model) var invitation = model.Entity(); invitation.ToTable("team_invitations", table => { - table.HasCheckConstraint("ck_team_invitations_role", "role IN ('admin', 'member')"); + table.HasCheckConstraint("ck_team_invitations_role", "role IN ('admin', 'member', 'reviewer', 'observer')"); table.HasCheckConstraint("ck_team_invitations_expiry", "expires_at > issued_at"); table.HasCheckConstraint("ck_team_invitations_resolution", "accepted_at IS NULL OR revoked_at IS NULL"); }); diff --git a/app/api/Data/TeamModels.cs b/app/api/Data/TeamModels.cs index 2300428..bd39e8b 100644 --- a/app/api/Data/TeamModels.cs +++ b/app/api/Data/TeamModels.cs @@ -13,7 +13,7 @@ public sealed class TeamMember { public Guid TeamId { get; set; } public required string UserId { get; set; } - // Ownership comes from Team.OwnerUserId; other members are admins or members. + // Ownership comes from Team.OwnerUserId; other members are admins, members, reviewers, or observers (ADR-058). public string Role { get; set; } = "member"; public DateTime JoinedAt { get; set; } public bool IsFavorite { get; set; } diff --git a/app/api/Documents/DocumentEndpoints.cs b/app/api/Documents/DocumentEndpoints.cs index d1a3465..0c62d71 100644 --- a/app/api/Documents/DocumentEndpoints.cs +++ b/app/api/Documents/DocumentEndpoints.cs @@ -71,6 +71,7 @@ private static async Task, ValidationProblem, await using var transaction = await db.Database.BeginTransactionAsync(cancel); var project = await ProjectEndpoints.LockProjectForCaller(db, projectId, userId, cancel); if (project is null) return TypedResults.NotFound(); + if (!TeamRoles.CanEdit(await db.CallerRoleAsync(project.TeamId, userId, cancel))) return ProjectEndpoints.EditorsOnly(); if (project.ArchivedAt is not null) return ProjectEndpoints.Archived(); var document = new Document @@ -123,6 +124,7 @@ private static async Task, NotFound, ProblemHttpRes var projectId = await db.Documents.Where(d => d.Id == documentId).Select(d => (Guid?)d.ProjectId).SingleOrDefaultAsync(cancel); var project = projectId is null ? null : await ProjectEndpoints.LockProjectForCaller(db, projectId.Value, user.CallerId(), cancel); if (project is null) return TypedResults.NotFound(); + if (!TeamRoles.CanEdit(await db.CallerRoleAsync(project.TeamId, user.CallerId(), cancel))) return ProjectEndpoints.EditorsOnly(); if (project.ArchivedAt is not null) return ProjectEndpoints.Archived(); // Idempotent: archiving again keeps the original timestamp. diff --git a/app/api/GitHub/EvidenceChangeEndpoints.cs b/app/api/GitHub/EvidenceChangeEndpoints.cs index 774889c..5196277 100644 --- a/app/api/GitHub/EvidenceChangeEndpoints.cs +++ b/app/api/GitHub/EvidenceChangeEndpoints.cs @@ -43,6 +43,7 @@ private static async Task>, NotFound var userId = user.CallerId(); var scope = await FindAsync(db, userId, requirementId, cancel); if (scope is null) return TypedResults.NotFound(); + if (!scope.CanEdit) return ProjectEndpoints.EditorsOnly(); if (scope.Archived) return ProjectEndpoints.Archived(); var repository = await db.ProjectRepositories.AsNoTracking().SingleOrDefaultAsync(r => r.ProjectId == scope.ProjectId, cancel); if (repository is null) return NoRepository(); @@ -57,6 +58,7 @@ private static async Task>, NotFound switch (await LockAndRecheckAsync(db, userId, requirementId, repository, cancel)) { case Recheck.NotFound: return TypedResults.NotFound(); + case Recheck.ReadOnly: return ProjectEndpoints.EditorsOnly(); case Recheck.Archived: return ProjectEndpoints.Archived(); case Recheck.Changed: return Changed(); } @@ -73,6 +75,7 @@ private static async Task, NotFound, ProblemHt var userId = user.CallerId(); var scope = await FindAsync(db, userId, requirementId, cancel); if (scope is null) return TypedResults.NotFound(); + if (!scope.CanEdit) return ProjectEndpoints.EditorsOnly(); if (scope.Archived) return ProjectEndpoints.Archived(); var suggestion = await db.RequirementEvidenceSuggestions.AsNoTracking() .SingleOrDefaultAsync(s => s.Id == suggestionId && s.RequirementId == requirementId, cancel); @@ -115,6 +118,7 @@ private static async Task> Rejec await using var transaction = await db.Database.BeginTransactionAsync(cancel); var found = await RequirementEndpoints.LockForMember(db, userId, requirementId, cancel); if (found is null) return TypedResults.NotFound(); + if (!found.CanEdit) return ProjectEndpoints.EditorsOnly(); if (found.Archived) return ProjectEndpoints.Archived(); var suggestion = await db.RequirementEvidenceSuggestions.SingleOrDefaultAsync(s => s.Id == suggestionId && s.RequirementId == requirementId, cancel); if (suggestion is null) return TypedResults.NotFound(); @@ -152,6 +156,7 @@ private static async Task, ValidationProblem, NotFo var userId = user.CallerId(); var scope = await FindAsync(db, userId, requirementId, cancel); if (scope is null) return TypedResults.NotFound(); + if (!scope.CanEdit) return ProjectEndpoints.EditorsOnly(); if (scope.Archived) return ProjectEndpoints.Archived(); var evidence = await db.RequirementEvidence.SingleOrDefaultAsync(e => e.Id == evidenceId && e.RequirementId == requirementId, cancel); if (evidence is null) return TypedResults.NotFound(); @@ -181,6 +186,7 @@ private static async Task, ValidationProblem, NotFo switch (await LockAndRecheckAsync(db, userId, requirementId, repository, cancel)) { case Recheck.NotFound: return TypedResults.NotFound(); + case Recheck.ReadOnly: return ProjectEndpoints.EditorsOnly(); case Recheck.Archived: return ProjectEndpoints.Archived(); case Recheck.Changed: return Changed(); } diff --git a/app/api/GitHub/EvidenceEndpoints.cs b/app/api/GitHub/EvidenceEndpoints.cs index e880f27..decd4e8 100644 --- a/app/api/GitHub/EvidenceEndpoints.cs +++ b/app/api/GitHub/EvidenceEndpoints.cs @@ -110,6 +110,7 @@ private static async Task, ValidationProblem, var userId = user.CallerId(); var scope = await FindAsync(db, userId, requirementId, cancel); if (scope is null) return TypedResults.NotFound(); + if (!scope.CanEdit) return ProjectEndpoints.EditorsOnly(); if (scope.Archived) return ProjectEndpoints.Archived(); var repository = await db.ProjectRepositories.AsNoTracking().SingleOrDefaultAsync(r => r.ProjectId == scope.ProjectId, cancel); if (repository is null) return NoRepository(); @@ -200,6 +201,7 @@ private static async Task SaveLinkAsync( switch (await LockAndRecheckAsync(db, userId, requirementId, repository, cancel)) { case Recheck.NotFound: return new(null, null); + case Recheck.ReadOnly: return new(null, ProjectEndpoints.EditorsOnly()); case Recheck.Archived: return new(null, ProjectEndpoints.Archived()); case Recheck.Changed: return new(null, Changed()); } @@ -236,6 +238,7 @@ private static async Task>, NotFound, ProblemH var userId = user.CallerId(); var scope = await FindAsync(db, userId, requirementId, cancel); if (scope is null) return TypedResults.NotFound(); + if (!scope.CanEdit) return ProjectEndpoints.EditorsOnly(); if (scope.Archived) return ProjectEndpoints.Archived(); var repository = await db.ProjectRepositories.AsNoTracking().SingleOrDefaultAsync(r => r.ProjectId == scope.ProjectId, cancel); if (repository is null) return NoRepository(); @@ -284,6 +287,7 @@ private static async Task>, NotFound, ProblemH switch (await LockAndRecheckAsync(db, userId, requirementId, repository, cancel)) { case Recheck.NotFound: return TypedResults.NotFound(); + case Recheck.ReadOnly: return ProjectEndpoints.EditorsOnly(); case Recheck.Archived: return ProjectEndpoints.Archived(); case Recheck.Changed: return Changed(); } @@ -309,6 +313,7 @@ private static async Task> Unlin var userId = user.CallerId(); var found = await RequirementEndpoints.LockForMember(db, userId, requirementId, cancel); if (found is null) return TypedResults.NotFound(); + if (!found.CanEdit) return ProjectEndpoints.EditorsOnly(); if (found.Archived) return ProjectEndpoints.Archived(); var evidence = await db.RequirementEvidence.SingleOrDefaultAsync(e => e.Id == evidenceId && e.RequirementId == requirementId, cancel); if (evidence is null) return TypedResults.NotFound(); @@ -339,10 +344,12 @@ private static void Record( // Null when the requirement does not exist or the caller is not a member of its project. private static Task FindAsync(SpecThreadDbContext db, string userId, Guid requirementId, CancellationToken cancel) => db.Requirements.AsNoTracking().Where(r => r.Id == requirementId) - .Join(db.ProjectsFor(userId), r => r.ProjectId, p => p.Id, (r, p) => new Scope(p.Id, r.ArchivedAt != null || p.ArchivedAt != null)) + .Join(db.ProjectsFor(userId), r => r.ProjectId, p => p.Id, (r, p) => new Scope(p.Id, r.ArchivedAt != null || p.ArchivedAt != null, + db.Teams.Any(t => t.Id == p.TeamId && t.OwnerUserId == userId) ? TeamRoles.Owner + : db.TeamMembers.Where(m => m.TeamId == p.TeamId && m.UserId == userId).Select(m => m.Role).First())) .SingleOrDefaultAsync(cancel); - private enum Recheck { Ready, NotFound, Archived, Changed } + private enum Recheck { Ready, NotFound, ReadOnly, Archived, Changed } // Call inside a transaction, after reading GitHub and before saving. Locks the project's team, // then confirms that what the reads relied on still holds: the caller is a member, nothing is @@ -352,6 +359,7 @@ private static async Task LockAndRecheckAsync( { var found = await RequirementEndpoints.LockForMember(db, userId, requirementId, cancel); if (found is null) return Recheck.NotFound; + if (!found.CanEdit) return Recheck.ReadOnly; if (found.Archived) return Recheck.Archived; var connected = await db.ProjectRepositories.AnyAsync(r => r.ProjectId == found.Requirement.ProjectId && r.InstallationId == repository.InstallationId && r.RepositoryId == repository.RepositoryId, cancel); @@ -586,7 +594,11 @@ private static ProblemHttpResult Failed(GitHubFailure failure, string fullName) e.Contains is null ? null : JsonSerializer.Deserialize>(e.Contains, CommitJson), e.Source, e.LinkedBy, e.LinkedAt, e.RefreshedAt); - private sealed record Scope(Guid ProjectId, bool Archived); + // `Role` is the caller's team role when read, before any lock; writes check it again under the lock. + private sealed record Scope(Guid ProjectId, bool Archived, string Role) + { + public bool CanEdit => TeamRoles.CanEdit(Role); + } private sealed record SavedLink(RequirementEvidence? Evidence, ProblemHttpResult? Problem); } diff --git a/app/api/Migrations/20261117231221_TeamReviewerObserverRoles.Designer.cs b/app/api/Migrations/20261117231221_TeamReviewerObserverRoles.Designer.cs new file mode 100644 index 0000000..187503b --- /dev/null +++ b/app/api/Migrations/20261117231221_TeamReviewerObserverRoles.Designer.cs @@ -0,0 +1,1644 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using SpecThread.Api.Data; + +#nullable disable + +namespace SpecThread.Api.Migrations +{ + [DbContext(typeof(SpecThreadDbContext))] + [Migration("20261117231221_TeamReviewerObserverRoles")] + partial class TeamReviewerObserverRoles + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasDefaultSchema("public") + .HasAnnotation("ProductVersion", "10.0.12") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("SpecThread.Api.Data.AcceptanceCriterion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("Position") + .HasColumnType("integer") + .HasColumnName("position"); + + b.Property("RequirementId") + .HasColumnType("uuid") + .HasColumnName("requirement_id"); + + b.Property("Text") + .IsRequired() + .HasColumnType("text") + .HasColumnName("text"); + + b.HasKey("Id"); + + b.HasIndex("RequirementId", "Position") + .IsUnique(); + + b.ToTable("acceptance_criteria", "public", t => + { + t.HasCheckConstraint("ck_criteria_position", "position >= 0"); + + t.HasCheckConstraint("ck_criteria_text", "length(btrim(text)) > 0"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.AuthAccount", b => + { + b.Property("Id") + .HasColumnType("text") + .HasColumnName("id"); + + b.Property("AccessToken") + .HasColumnType("text") + .HasColumnName("accessToken"); + + b.Property("AccessTokenExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("accessTokenExpiresAt"); + + b.Property("AccountId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("accountId"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("createdAt"); + + b.Property("IdToken") + .HasColumnType("text") + .HasColumnName("idToken"); + + b.Property("Password") + .HasColumnType("text") + .HasColumnName("password"); + + b.Property("ProviderId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("providerId"); + + b.Property("RefreshToken") + .HasColumnType("text") + .HasColumnName("refreshToken"); + + b.Property("RefreshTokenExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("refreshTokenExpiresAt"); + + b.Property("Scope") + .HasColumnType("text") + .HasColumnName("scope"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("updatedAt"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("userId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.HasIndex("ProviderId", "AccountId") + .IsUnique(); + + b.ToTable("account", "public"); + }); + + modelBuilder.Entity("SpecThread.Api.Data.AuthRateLimit", b => + { + b.Property("Id") + .HasColumnType("text") + .HasColumnName("id"); + + b.Property("Count") + .HasColumnType("integer") + .HasColumnName("count"); + + b.Property("Key") + .IsRequired() + .HasColumnType("text") + .HasColumnName("key"); + + b.Property("LastRequest") + .HasColumnType("bigint") + .HasColumnName("lastRequest"); + + b.HasKey("Id"); + + b.HasIndex("Key") + .IsUnique(); + + b.HasIndex("LastRequest"); + + b.ToTable("rateLimit", "public"); + }); + + modelBuilder.Entity("SpecThread.Api.Data.AuthSession", b => + { + b.Property("Id") + .HasColumnType("text") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("createdAt"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("expiresAt"); + + b.Property("IpAddress") + .HasColumnType("text") + .HasColumnName("ipAddress"); + + b.Property("Token") + .IsRequired() + .HasColumnType("text") + .HasColumnName("token"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("updatedAt"); + + b.Property("UserAgent") + .HasColumnType("text") + .HasColumnName("userAgent"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("userId"); + + b.HasKey("Id"); + + b.HasIndex("Token") + .IsUnique(); + + b.HasIndex("UserId"); + + b.ToTable("session", "public"); + }); + + modelBuilder.Entity("SpecThread.Api.Data.AuthSigningKey", b => + { + b.Property("Id") + .HasColumnType("text") + .HasColumnName("id"); + + b.Property("Alg") + .HasColumnType("text") + .HasColumnName("alg"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("createdAt"); + + b.Property("Crv") + .HasColumnType("text") + .HasColumnName("crv"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("expiresAt"); + + b.Property("PrivateKey") + .IsRequired() + .HasColumnType("text") + .HasColumnName("privateKey"); + + b.Property("PublicKey") + .IsRequired() + .HasColumnType("text") + .HasColumnName("publicKey"); + + b.HasKey("Id"); + + b.ToTable("jwks", "public"); + }); + + modelBuilder.Entity("SpecThread.Api.Data.AuthUser", b => + { + b.Property("Id") + .HasColumnType("text") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("createdAt"); + + b.Property("Email") + .IsRequired() + .HasColumnType("text") + .HasColumnName("email"); + + b.Property("EmailVerified") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(false) + .HasColumnName("emailVerified"); + + b.Property("Image") + .HasColumnType("text") + .HasColumnName("image"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("updatedAt"); + + b.HasKey("Id"); + + b.HasIndex("Email") + .IsUnique(); + + b.ToTable("user", "public"); + }); + + modelBuilder.Entity("SpecThread.Api.Data.AuthVerification", b => + { + b.Property("Id") + .HasColumnType("text") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("createdAt"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("expiresAt"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("text") + .HasColumnName("identifier"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("updatedAt"); + + b.Property("Value") + .IsRequired() + .HasColumnType("text") + .HasColumnName("value"); + + b.HasKey("Id"); + + b.HasIndex("Identifier"); + + b.ToTable("verification", "public"); + }); + + modelBuilder.Entity("SpecThread.Api.Data.Document", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("ArchivedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("archived_at"); + + b.Property("ContentType") + .IsRequired() + .HasColumnType("text") + .HasColumnName("content_type"); + + b.Property("FileName") + .IsRequired() + .HasColumnType("text") + .HasColumnName("file_name"); + + b.Property("ProjectId") + .HasColumnType("uuid") + .HasColumnName("project_id"); + + b.Property("SizeBytes") + .HasColumnType("bigint") + .HasColumnName("size_bytes"); + + b.Property("Title") + .IsRequired() + .HasColumnType("text") + .HasColumnName("title"); + + b.Property("UploadedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("uploaded_at") + .HasDefaultValueSql("now()"); + + b.Property("UploadedBy") + .IsRequired() + .HasColumnType("text") + .HasColumnName("uploaded_by"); + + b.HasKey("Id"); + + b.HasIndex("ProjectId"); + + b.HasIndex("UploadedBy"); + + b.ToTable("documents", "public", t => + { + t.HasCheckConstraint("ck_documents_content_type", "content_type IN ('application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document')"); + + t.HasCheckConstraint("ck_documents_file_name", "length(btrim(file_name)) > 0"); + + t.HasCheckConstraint("ck_documents_size", "size_bytes BETWEEN 1 AND 4194304"); + + t.HasCheckConstraint("ck_documents_title", "length(btrim(title)) > 0"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.DocumentContent", b => + { + b.Property("DocumentId") + .HasColumnType("uuid") + .HasColumnName("document_id"); + + b.Property("Content") + .IsRequired() + .HasColumnType("bytea") + .HasColumnName("content"); + + b.HasKey("DocumentId"); + + b.ToTable("document_contents", "public"); + }); + + modelBuilder.Entity("SpecThread.Api.Data.Project", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("ArchivedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("archived_at"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at") + .HasDefaultValueSql("now()"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.Property("OwnerUserId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("owner_user_id"); + + b.Property("TeamId") + .HasColumnType("uuid") + .HasColumnName("team_id"); + + b.HasKey("Id"); + + b.HasIndex("OwnerUserId"); + + b.HasIndex("TeamId"); + + b.ToTable("projects", "public", t => + { + t.HasCheckConstraint("ck_projects_name", "length(btrim(name)) > 0"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.ProjectMember", b => + { + b.Property("ProjectId") + .HasColumnType("uuid") + .HasColumnName("project_id"); + + b.Property("UserId") + .HasColumnType("text") + .HasColumnName("user_id"); + + b.Property("JoinedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("joined_at") + .HasDefaultValueSql("now()"); + + b.HasKey("ProjectId", "UserId"); + + b.HasIndex("UserId"); + + b.ToTable("project_members", "public"); + }); + + modelBuilder.Entity("SpecThread.Api.Data.ProjectRepository", b => + { + b.Property("ProjectId") + .HasColumnType("uuid") + .HasColumnName("project_id"); + + b.Property("ConnectedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("connected_at") + .HasDefaultValueSql("now()"); + + b.Property("ConnectedBy") + .IsRequired() + .HasColumnType("text") + .HasColumnName("connected_by"); + + b.Property("InstallationId") + .HasColumnType("bigint") + .HasColumnName("installation_id"); + + b.Property("IsPrivate") + .HasColumnType("boolean") + .HasColumnName("is_private"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.Property("Owner") + .IsRequired() + .HasColumnType("text") + .HasColumnName("owner"); + + b.Property("RepositoryId") + .HasColumnType("bigint") + .HasColumnName("repository_id"); + + b.HasKey("ProjectId"); + + b.HasIndex("ConnectedBy"); + + b.ToTable("project_repositories", "public", t => + { + t.HasCheckConstraint("ck_project_repositories_ids", "installation_id > 0 AND repository_id > 0"); + + t.HasCheckConstraint("ck_project_repositories_name", "length(btrim(owner)) > 0 AND length(btrim(name)) > 0"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.Requirement", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("ArchivedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("archived_at"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at") + .HasDefaultValueSql("now()"); + + b.Property("CreatedBy") + .IsRequired() + .HasColumnType("text") + .HasColumnName("created_by"); + + b.Property("Description") + .IsRequired() + .HasColumnType("text") + .HasColumnName("description"); + + b.Property("Milestone") + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("milestone"); + + b.Property("ProjectId") + .HasColumnType("uuid") + .HasColumnName("project_id"); + + b.Property("Title") + .IsRequired() + .HasColumnType("text") + .HasColumnName("title"); + + b.Property("UpdatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("updated_at") + .HasDefaultValueSql("now()"); + + b.Property("UpdatedBy") + .HasColumnType("text") + .HasColumnName("updated_by"); + + b.Property("Version") + .IsConcurrencyToken() + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasDefaultValue(1) + .HasColumnName("version"); + + b.HasKey("Id"); + + b.HasIndex("CreatedBy"); + + b.HasIndex("ProjectId"); + + b.HasIndex("UpdatedBy"); + + b.ToTable("requirements", "public", t => + { + t.HasCheckConstraint("ck_requirements_milestone", "milestone IS NULL OR (btrim(milestone) = milestone AND length(milestone) BETWEEN 1 AND 100)"); + + t.HasCheckConstraint("ck_requirements_title", "length(btrim(title)) > 0"); + + t.HasCheckConstraint("ck_requirements_version", "version > 0"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementCriteriaVersion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at") + .HasDefaultValueSql("now()"); + + b.Property("CreatedBy") + .IsRequired() + .HasColumnType("text") + .HasColumnName("created_by"); + + b.Property("Criteria") + .IsRequired() + .HasColumnType("jsonb") + .HasColumnName("criteria"); + + b.Property("Number") + .HasColumnType("integer") + .HasColumnName("number"); + + b.Property("RequirementId") + .HasColumnType("uuid") + .HasColumnName("requirement_id"); + + b.HasKey("Id"); + + b.HasIndex("CreatedBy"); + + b.HasIndex("RequirementId", "Number") + .IsUnique(); + + b.ToTable("requirement_criteria_versions", "public", t => + { + t.HasCheckConstraint("ck_requirement_criteria_versions_criteria", "jsonb_typeof(criteria) = 'array' AND NOT jsonb_path_exists(criteria, 'strict $[*] ? (@.type() != \"string\")')"); + + t.HasCheckConstraint("ck_requirement_criteria_versions_number", "number > 0"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementDocument", b => + { + b.Property("RequirementId") + .HasColumnType("uuid") + .HasColumnName("requirement_id"); + + b.Property("DocumentId") + .HasColumnType("uuid") + .HasColumnName("document_id"); + + b.Property("LinkedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("linked_at") + .HasDefaultValueSql("now()"); + + b.Property("LinkedBy") + .IsRequired() + .HasColumnType("text") + .HasColumnName("linked_by"); + + b.HasKey("RequirementId", "DocumentId"); + + b.HasIndex("DocumentId"); + + b.HasIndex("LinkedBy"); + + b.ToTable("requirement_documents", "public"); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementEvidence", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("Additions") + .HasColumnType("integer") + .HasColumnName("additions"); + + b.Property("Author") + .HasColumnType("text") + .HasColumnName("author"); + + b.Property("ChangedFiles") + .HasColumnType("integer") + .HasColumnName("changed_files"); + + b.Property("CheckCount") + .HasColumnType("integer") + .HasColumnName("check_count"); + + b.Property("Checks") + .HasColumnType("jsonb") + .HasColumnName("checks"); + + b.Property("ChecksReadAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("checks_read_at"); + + b.Property("CommitCount") + .HasColumnType("integer") + .HasColumnName("commit_count"); + + b.Property("Commits") + .HasColumnType("jsonb") + .HasColumnName("commits"); + + b.Property("Contains") + .HasColumnType("jsonb") + .HasColumnName("contains"); + + b.Property("Deletions") + .HasColumnType("integer") + .HasColumnName("deletions"); + + b.Property("GitHubClosedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("github_closed_at"); + + b.Property("GitHubCreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("github_created_at"); + + b.Property("GitHubUpdatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("github_updated_at"); + + b.Property("Kind") + .IsRequired() + .HasColumnType("text") + .HasColumnName("kind"); + + b.Property("LinkedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("linked_at") + .HasDefaultValueSql("now()"); + + b.Property("LinkedBy") + .IsRequired() + .HasColumnType("text") + .HasColumnName("linked_by"); + + b.Property("MergeSha") + .HasColumnType("text") + .HasColumnName("merge_sha"); + + b.Property("Number") + .HasColumnType("integer") + .HasColumnName("number"); + + b.Property("Prerelease") + .HasColumnType("boolean") + .HasColumnName("prerelease"); + + b.Property("RefreshedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("refreshed_at") + .HasDefaultValueSql("now()"); + + b.Property("RepositoryId") + .HasColumnType("bigint") + .HasColumnName("repository_id"); + + b.Property("RepositoryName") + .IsRequired() + .HasColumnType("text") + .HasColumnName("repository_name"); + + b.Property("RepositoryOwner") + .IsRequired() + .HasColumnType("text") + .HasColumnName("repository_owner"); + + b.Property("RequirementId") + .HasColumnType("uuid") + .HasColumnName("requirement_id"); + + b.Property("Sha") + .HasColumnType("text") + .HasColumnName("sha"); + + b.Property("Source") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("text") + .HasDefaultValue("manual") + .HasColumnName("source"); + + b.Property("State") + .HasColumnType("text") + .HasColumnName("state"); + + b.Property("Tag") + .HasColumnType("text") + .HasColumnName("tag"); + + b.Property("Title") + .IsRequired() + .HasColumnType("text") + .HasColumnName("title"); + + b.Property("Url") + .IsRequired() + .HasColumnType("text") + .HasColumnName("url"); + + b.HasKey("Id"); + + b.HasIndex("LinkedBy"); + + b.HasIndex("RequirementId", "RepositoryId", "Number") + .IsUnique(); + + b.HasIndex("RequirementId", "RepositoryId", "Sha") + .IsUnique() + .HasFilter("kind = 'commit'"); + + b.HasIndex("RequirementId", "RepositoryId", "Tag") + .IsUnique() + .HasFilter("kind = 'release'"); + + b.ToTable("requirement_evidence", "public", t => + { + t.HasCheckConstraint("ck_requirement_evidence_changes", "COALESCE(additions, 0) >= 0 AND COALESCE(deletions, 0) >= 0 AND COALESCE(changed_files, 0) >= 0 AND COALESCE(commit_count, 0) >= 0"); + + t.HasCheckConstraint("ck_requirement_evidence_checks", "COALESCE(check_count, 0) >= 0"); + + t.HasCheckConstraint("ck_requirement_evidence_identity", "(kind = 'commit' AND sha IS NOT NULL AND sha ~ '^[0-9a-f]{40}$' AND number IS NULL AND state IS NULL AND tag IS NULL) OR (kind IN ('issue', 'pull_request') AND number IS NOT NULL AND number > 0 AND state IS NOT NULL AND tag IS NULL) OR (kind = 'release' AND tag IS NOT NULL AND length(btrim(tag)) > 0 AND number IS NULL AND state IS NULL)"); + + t.HasCheckConstraint("ck_requirement_evidence_kind", "kind IN ('issue', 'pull_request', 'commit', 'release')"); + + t.HasCheckConstraint("ck_requirement_evidence_repository", "repository_id > 0"); + + t.HasCheckConstraint("ck_requirement_evidence_source", "source IN ('manual', 'suggested')"); + + t.HasCheckConstraint("ck_requirement_evidence_state", "state IS NULL OR state IN ('open', 'closed', 'merged')"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementEvidenceEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("Action") + .IsRequired() + .HasColumnType("text") + .HasColumnName("action"); + + b.Property("Actor") + .IsRequired() + .HasColumnType("text") + .HasColumnName("actor"); + + b.Property("EvidenceId") + .HasColumnType("uuid") + .HasColumnName("evidence_id"); + + b.Property("Kind") + .IsRequired() + .HasColumnType("text") + .HasColumnName("kind"); + + b.Property("Label") + .IsRequired() + .HasColumnType("text") + .HasColumnName("label"); + + b.Property("OccurredAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("occurred_at") + .HasDefaultValueSql("now()"); + + b.Property("OtherRequirementId") + .HasColumnType("uuid") + .HasColumnName("other_requirement_id"); + + b.Property("RequirementId") + .HasColumnType("uuid") + .HasColumnName("requirement_id"); + + b.Property("Title") + .IsRequired() + .HasColumnType("text") + .HasColumnName("title"); + + b.HasKey("Id"); + + b.HasIndex("Actor"); + + b.HasIndex("OtherRequirementId"); + + b.HasIndex("RequirementId", "OccurredAt"); + + b.ToTable("requirement_evidence_events", "public", t => + { + t.HasCheckConstraint("ck_requirement_evidence_events_action", "action IN ('added', 'removed', 'confirmed', 'rejected', 'moved_in', 'moved_out')"); + + t.HasCheckConstraint("ck_requirement_evidence_events_kind", "kind IN ('issue', 'pull_request', 'commit', 'release')"); + + t.HasCheckConstraint("ck_requirement_evidence_events_label", "length(btrim(label)) > 0"); + + t.HasCheckConstraint("ck_requirement_evidence_events_move", "(action IN ('moved_in', 'moved_out')) = (other_requirement_id IS NOT NULL)"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementEvidenceSuggestion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("Author") + .HasColumnType("text") + .HasColumnName("author"); + + b.Property("DecidedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("decided_at"); + + b.Property("DecidedBy") + .HasColumnType("text") + .HasColumnName("decided_by"); + + b.Property("FoundAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("found_at") + .HasDefaultValueSql("now()"); + + b.Property("Number") + .HasColumnType("integer") + .HasColumnName("number"); + + b.Property("Reference") + .IsRequired() + .HasColumnType("text") + .HasColumnName("reference"); + + b.Property("RepositoryId") + .HasColumnType("bigint") + .HasColumnName("repository_id"); + + b.Property("RequirementId") + .HasColumnType("uuid") + .HasColumnName("requirement_id"); + + b.Property("State") + .IsRequired() + .HasColumnType("text") + .HasColumnName("state"); + + b.Property("Status") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("text") + .HasDefaultValue("pending") + .HasColumnName("status"); + + b.Property("Title") + .IsRequired() + .HasColumnType("text") + .HasColumnName("title"); + + b.Property("Url") + .IsRequired() + .HasColumnType("text") + .HasColumnName("url"); + + b.HasKey("Id"); + + b.HasIndex("DecidedBy"); + + b.HasIndex("RequirementId", "RepositoryId", "Number") + .IsUnique(); + + b.ToTable("requirement_evidence_suggestions", "public", t => + { + t.HasCheckConstraint("ck_requirement_evidence_suggestions_decision", "(status = 'pending') = (decided_by IS NULL) AND (decided_by IS NULL) = (decided_at IS NULL)"); + + t.HasCheckConstraint("ck_requirement_evidence_suggestions_number", "number > 0 AND repository_id > 0"); + + t.HasCheckConstraint("ck_requirement_evidence_suggestions_state", "state IN ('open', 'closed', 'merged')"); + + t.HasCheckConstraint("ck_requirement_evidence_suggestions_status", "status IN ('pending', 'confirmed', 'rejected')"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementFollowUp", b => + { + b.Property("RequirementId") + .HasColumnType("uuid") + .HasColumnName("requirement_id"); + + b.Property("OriginalRequirementId") + .HasColumnType("uuid") + .HasColumnName("original_requirement_id"); + + b.Property("LinkedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("linked_at") + .HasDefaultValueSql("now()"); + + b.Property("LinkedBy") + .IsRequired() + .HasColumnType("text") + .HasColumnName("linked_by"); + + b.HasKey("RequirementId", "OriginalRequirementId"); + + b.HasIndex("LinkedBy"); + + b.HasIndex("OriginalRequirementId"); + + b.ToTable("requirement_follow_ups", "public", t => + { + t.HasCheckConstraint("ck_requirement_follow_ups_distinct", "requirement_id <> original_requirement_id"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementFollowUpEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("Action") + .IsRequired() + .HasColumnType("text") + .HasColumnName("action"); + + b.Property("Actor") + .IsRequired() + .HasColumnType("text") + .HasColumnName("actor"); + + b.Property("OccurredAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("occurred_at") + .HasDefaultValueSql("now()"); + + b.Property("OriginalRequirementId") + .HasColumnType("uuid") + .HasColumnName("original_requirement_id"); + + b.Property("RequirementId") + .HasColumnType("uuid") + .HasColumnName("requirement_id"); + + b.HasKey("Id"); + + b.HasIndex("Actor"); + + b.HasIndex("OriginalRequirementId"); + + b.HasIndex("RequirementId"); + + b.ToTable("requirement_follow_up_events", "public", t => + { + t.HasCheckConstraint("ck_requirement_follow_up_events_action", "action IN ('added', 'removed')"); + + t.HasCheckConstraint("ck_requirement_follow_up_events_distinct", "requirement_id <> original_requirement_id"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("CriteriaVersion") + .HasColumnType("integer") + .HasColumnName("criteria_version"); + + b.Property("DecidedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("decided_at") + .HasDefaultValueSql("now()"); + + b.Property("DecidedBy") + .IsRequired() + .HasColumnType("text") + .HasColumnName("decided_by"); + + b.Property("Decision") + .IsRequired() + .HasColumnType("text") + .HasColumnName("decision"); + + b.Property("Evidence") + .IsRequired() + .HasColumnType("jsonb") + .HasColumnName("evidence"); + + b.Property("Note") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("text") + .HasDefaultValue("") + .HasColumnName("note"); + + b.Property("RequirementId") + .HasColumnType("uuid") + .HasColumnName("requirement_id"); + + b.Property("RequirementVersion") + .HasColumnType("integer") + .HasColumnName("requirement_version"); + + b.HasKey("Id"); + + b.HasIndex("DecidedBy"); + + b.HasIndex("RequirementId", "DecidedAt"); + + b.ToTable("requirement_reviews", "public", t => + { + t.HasCheckConstraint("ck_requirement_reviews_criteria_version", "criteria_version IS NULL OR criteria_version > 0"); + + t.HasCheckConstraint("ck_requirement_reviews_decision", "decision IN ('accepted', 'rejected', 'more_evidence')"); + + t.HasCheckConstraint("ck_requirement_reviews_evidence", "jsonb_typeof(evidence) = 'array'"); + + t.HasCheckConstraint("ck_requirement_reviews_note", "decision = 'accepted' OR length(btrim(note)) > 0"); + + t.HasCheckConstraint("ck_requirement_reviews_version", "requirement_version > 0"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.Team", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at") + .HasDefaultValueSql("now()"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(10000) + .HasColumnType("character varying(10000)") + .HasColumnName("description"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)") + .HasColumnName("name"); + + b.Property("OwnerUserId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("owner_user_id"); + + b.HasKey("Id"); + + b.HasIndex("OwnerUserId"); + + b.ToTable("teams", "public", t => + { + t.HasCheckConstraint("ck_teams_name", "length(btrim(name)) > 0"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.TeamInvitation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("id") + .HasDefaultValueSql("gen_random_uuid()"); + + b.Property("AcceptedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("accepted_at"); + + b.Property("AcceptedBy") + .HasColumnType("text") + .HasColumnName("accepted_by"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("Email") + .IsRequired() + .HasMaxLength(254) + .HasColumnType("character varying(254)") + .HasColumnName("email"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("expires_at"); + + b.Property("InvitedBy") + .IsRequired() + .HasColumnType("text") + .HasColumnName("invited_by"); + + b.Property("IssuedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("issued_at"); + + b.Property("RevokedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("revoked_at"); + + b.Property("Role") + .IsRequired() + .HasColumnType("text") + .HasColumnName("role"); + + b.Property("TeamId") + .HasColumnType("uuid") + .HasColumnName("team_id"); + + b.Property("TokenHash") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("character varying(64)") + .HasColumnName("token_hash"); + + b.HasKey("Id"); + + b.HasIndex("AcceptedBy"); + + b.HasIndex("InvitedBy"); + + b.HasIndex("TokenHash") + .IsUnique(); + + b.HasIndex("TeamId", "Email") + .IsUnique() + .HasFilter("accepted_at IS NULL AND revoked_at IS NULL"); + + b.ToTable("team_invitations", "public", t => + { + t.HasCheckConstraint("ck_team_invitations_expiry", "expires_at > issued_at"); + + t.HasCheckConstraint("ck_team_invitations_resolution", "accepted_at IS NULL OR revoked_at IS NULL"); + + t.HasCheckConstraint("ck_team_invitations_role", "role IN ('admin', 'member', 'reviewer', 'observer')"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.TeamMember", b => + { + b.Property("TeamId") + .HasColumnType("uuid") + .HasColumnName("team_id"); + + b.Property("UserId") + .HasColumnType("text") + .HasColumnName("user_id"); + + b.Property("IsExpanded") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(true) + .HasColumnName("is_expanded"); + + b.Property("IsFavorite") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(false) + .HasColumnName("is_favorite"); + + b.Property("JoinedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("joined_at") + .HasDefaultValueSql("now()"); + + b.Property("Role") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("text") + .HasDefaultValue("member") + .HasColumnName("role"); + + b.HasKey("TeamId", "UserId"); + + b.HasIndex("UserId"); + + b.ToTable("team_members", "public", t => + { + t.HasCheckConstraint("ck_team_members_role", "role IN ('admin', 'member', 'reviewer', 'observer')"); + }); + }); + + modelBuilder.Entity("SpecThread.Api.Data.UserOnboarding", b => + { + b.Property("UserId") + .HasColumnType("text") + .HasColumnName("user_id"); + + b.Property("CompletedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("completed_at"); + + b.HasKey("UserId"); + + b.ToTable("user_onboarding", "public"); + }); + + modelBuilder.Entity("SpecThread.Api.Data.AcceptanceCriterion", b => + { + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("RequirementId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.AuthAccount", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.AuthSession", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.Document", b => + { + b.HasOne("SpecThread.Api.Data.Project", null) + .WithMany() + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("UploadedBy") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.DocumentContent", b => + { + b.HasOne("SpecThread.Api.Data.Document", null) + .WithOne() + .HasForeignKey("SpecThread.Api.Data.DocumentContent", "DocumentId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.Project", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("OwnerUserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Team", null) + .WithMany() + .HasForeignKey("TeamId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.ProjectMember", b => + { + b.HasOne("SpecThread.Api.Data.Project", null) + .WithMany() + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.ProjectRepository", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("ConnectedBy") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Project", null) + .WithOne() + .HasForeignKey("SpecThread.Api.Data.ProjectRepository", "ProjectId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.Requirement", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("CreatedBy") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Project", null) + .WithMany() + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("UpdatedBy") + .OnDelete(DeleteBehavior.Restrict); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementCriteriaVersion", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("CreatedBy") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("RequirementId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementDocument", b => + { + b.HasOne("SpecThread.Api.Data.Document", null) + .WithMany() + .HasForeignKey("DocumentId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("LinkedBy") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("RequirementId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementEvidence", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("LinkedBy") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("RequirementId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementEvidenceEvent", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("Actor") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("OtherRequirementId") + .OnDelete(DeleteBehavior.Restrict); + + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("RequirementId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementEvidenceSuggestion", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("DecidedBy") + .OnDelete(DeleteBehavior.Restrict); + + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("RequirementId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementFollowUp", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("LinkedBy") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("OriginalRequirementId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("RequirementId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementFollowUpEvent", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("Actor") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("OriginalRequirementId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("RequirementId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.RequirementReview", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("DecidedBy") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Requirement", null) + .WithMany() + .HasForeignKey("RequirementId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.Team", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("OwnerUserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.TeamInvitation", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("AcceptedBy") + .OnDelete(DeleteBehavior.Restrict); + + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("InvitedBy") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.Team", null) + .WithMany() + .HasForeignKey("TeamId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.TeamMember", b => + { + b.HasOne("SpecThread.Api.Data.Team", null) + .WithMany() + .HasForeignKey("TeamId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("SpecThread.Api.Data.UserOnboarding", b => + { + b.HasOne("SpecThread.Api.Data.AuthUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/app/api/Migrations/20261117231221_TeamReviewerObserverRoles.cs b/app/api/Migrations/20261117231221_TeamReviewerObserverRoles.cs new file mode 100644 index 0000000..1d3b41f --- /dev/null +++ b/app/api/Migrations/20261117231221_TeamReviewerObserverRoles.cs @@ -0,0 +1,69 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace SpecThread.Api.Migrations +{ + /// + public partial class TeamReviewerObserverRoles : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropCheckConstraint( + name: "ck_team_members_role", + schema: "public", + table: "team_members"); + + migrationBuilder.DropCheckConstraint( + name: "ck_team_invitations_role", + schema: "public", + table: "team_invitations"); + + migrationBuilder.AddCheckConstraint( + name: "ck_team_members_role", + schema: "public", + table: "team_members", + sql: "role IN ('admin', 'member', 'reviewer', 'observer')"); + + migrationBuilder.AddCheckConstraint( + name: "ck_team_invitations_role", + schema: "public", + table: "team_invitations", + sql: "role IN ('admin', 'member', 'reviewer', 'observer')"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropCheckConstraint( + name: "ck_team_members_role", + schema: "public", + table: "team_members"); + + migrationBuilder.DropCheckConstraint( + name: "ck_team_invitations_role", + schema: "public", + table: "team_invitations"); + + migrationBuilder.Sql(""" + UPDATE public.team_members m SET role = 'member' FROM public.teams t + WHERE m.team_id = t.id AND m.user_id = t.owner_user_id AND m.role IN ('reviewer', 'observer'); + DELETE FROM public.team_members WHERE role IN ('reviewer', 'observer'); + DELETE FROM public.team_invitations WHERE role IN ('reviewer', 'observer'); + """); + + migrationBuilder.AddCheckConstraint( + name: "ck_team_members_role", + schema: "public", + table: "team_members", + sql: "role IN ('admin', 'member')"); + + migrationBuilder.AddCheckConstraint( + name: "ck_team_invitations_role", + schema: "public", + table: "team_invitations", + sql: "role IN ('admin', 'member')"); + } + } +} diff --git a/app/api/Migrations/SpecThreadDbContextModelSnapshot.cs b/app/api/Migrations/SpecThreadDbContextModelSnapshot.cs index 59356e3..290f7a5 100644 --- a/app/api/Migrations/SpecThreadDbContextModelSnapshot.cs +++ b/app/api/Migrations/SpecThreadDbContextModelSnapshot.cs @@ -1261,7 +1261,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) t.HasCheckConstraint("ck_team_invitations_resolution", "accepted_at IS NULL OR revoked_at IS NULL"); - t.HasCheckConstraint("ck_team_invitations_role", "role IN ('admin', 'member')"); + t.HasCheckConstraint("ck_team_invitations_role", "role IN ('admin', 'member', 'reviewer', 'observer')"); }); }); @@ -1306,7 +1306,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("team_members", "public", t => { - t.HasCheckConstraint("ck_team_members_role", "role IN ('admin', 'member')"); + t.HasCheckConstraint("ck_team_members_role", "role IN ('admin', 'member', 'reviewer', 'observer')"); }); }); diff --git a/app/api/Projects/ProjectAccess.cs b/app/api/Projects/ProjectAccess.cs index 5c4c171..8252243 100644 --- a/app/api/Projects/ProjectAccess.cs +++ b/app/api/Projects/ProjectAccess.cs @@ -19,7 +19,34 @@ public static IQueryable ProjectsFor(this SpecThreadDbContext db, strin public static Task CanManageTeam(this SpecThreadDbContext db, Guid teamId, string userId, CancellationToken cancel) => db.Teams.AnyAsync(t => t.Id == teamId && db.TeamMembers.Any(m => m.TeamId == t.Id && m.UserId == userId && - (t.OwnerUserId == userId || m.Role == "admin")), cancel); + (t.OwnerUserId == userId || m.Role == TeamRoles.Admin)), cancel); + + // The caller's role in a team: "owner" from the team's owner ID, otherwise the membership role, + // or null for a non-member. Call after locking the team when the answer guards a write. + public static Task CallerRoleAsync(this SpecThreadDbContext db, Guid teamId, string userId, CancellationToken cancel) => + db.TeamMembers.Where(m => m.TeamId == teamId && m.UserId == userId) + .Select(m => db.Teams.Any(t => t.Id == teamId && t.OwnerUserId == userId) ? TeamRoles.Owner : m.Role) + .SingleOrDefaultAsync(cancel); +} + +// What each team role may do (ADR-058). Every member reads the team's projects, requirements, +// evidence, and decisions. Owners and Admins also manage the team and its projects. +internal static class TeamRoles +{ + public const string Owner = "owner"; + public const string Admin = "admin"; + public const string Member = "member"; + public const string Reviewer = "reviewer"; + public const string Observer = "observer"; + + // Roles a membership or invitation can hold; Owner is derived from the team's owner ID. + public static readonly string[] Assignable = [Admin, Member, Reviewer, Observer]; + + // Creating, editing, archiving, and restoring requirements and documents, and changing links. + public static bool CanEdit(string? role) => role is Owner or Admin or Member; + + // Recording a review decision. Reviewers decide without editing; Observers only read. + public static bool CanReview(string? role) => role is Owner or Admin or Member or Reviewer; } // Boundary validation for user-supplied text. Limits are recorded in ADR-024. diff --git a/app/api/Projects/ProjectEndpoints.cs b/app/api/Projects/ProjectEndpoints.cs index df8dccb..0aa800a 100644 --- a/app/api/Projects/ProjectEndpoints.cs +++ b/app/api/Projects/ProjectEndpoints.cs @@ -127,6 +127,7 @@ private static async Task, NotFound, ProblemHttpResu internal static ProblemHttpResult Archived() => TypedResults.Problem("Archived items cannot be changed.", statusCode: StatusCodes.Status409Conflict); internal static ProblemHttpResult ManagersOnly() => TypedResults.Problem("Only the team Owner or an Admin can do this.", statusCode: StatusCodes.Status403Forbidden); + internal static ProblemHttpResult EditorsOnly() => TypedResults.Problem("Your role on this team can read this project but not change it.", statusCode: StatusCodes.Status403Forbidden); private static Task Response(SpecThreadDbContext db, Guid projectId, string userId, CancellationToken cancel) => Responses(db.ProjectsFor(userId).Where(p => p.Id == projectId), db, userId).SingleAsync(cancel); diff --git a/app/api/Requirements/FollowUpEndpoints.cs b/app/api/Requirements/FollowUpEndpoints.cs index a9f431b..1e6a174 100644 --- a/app/api/Requirements/FollowUpEndpoints.cs +++ b/app/api/Requirements/FollowUpEndpoints.cs @@ -62,6 +62,7 @@ private static async Task, ValidationProblem, NotF await using var transaction = await db.Database.BeginTransactionAsync(cancel); var found = await RequirementEndpoints.LockForMember(db, userId, requirementId, cancel); if (found is null) return TypedResults.NotFound(); + if (!found.CanEdit) return ProjectEndpoints.EditorsOnly(); if (found.Archived) return ProjectEndpoints.Archived(); if (originalId == requirementId) return Invalid("A requirement can't be a follow-up of itself."); var original = await db.Requirements.AsNoTracking() @@ -107,6 +108,7 @@ private static async Task> Remov await using var transaction = await db.Database.BeginTransactionAsync(cancel); var found = await RequirementEndpoints.LockForMember(db, userId, requirementId, cancel); if (found is null) return TypedResults.NotFound(); + if (!found.CanEdit) return ProjectEndpoints.EditorsOnly(); var link = await db.RequirementFollowUps .SingleOrDefaultAsync(f => f.RequirementId == requirementId && f.OriginalRequirementId == originalRequirementId, cancel); if (link is null) return TypedResults.NotFound(); diff --git a/app/api/Requirements/MilestoneEndpoints.cs b/app/api/Requirements/MilestoneEndpoints.cs index f902704..1767bda 100644 --- a/app/api/Requirements/MilestoneEndpoints.cs +++ b/app/api/Requirements/MilestoneEndpoints.cs @@ -42,6 +42,7 @@ private static async Task, ValidationProblem, NotF await using var transaction = await db.Database.BeginTransactionAsync(cancel); var found = await RequirementEndpoints.LockForMember(db, user.CallerId(), requirementId, cancel); if (found is null) return TypedResults.NotFound(); + if (!found.CanEdit) return ProjectEndpoints.EditorsOnly(); if (found.Archived) return ProjectEndpoints.Archived(); found.Requirement.Milestone = milestone; try diff --git a/app/api/Requirements/RequirementEndpoints.cs b/app/api/Requirements/RequirementEndpoints.cs index 4a4655d..c5feb97 100644 --- a/app/api/Requirements/RequirementEndpoints.cs +++ b/app/api/Requirements/RequirementEndpoints.cs @@ -77,6 +77,7 @@ private static async Task, ValidationProble await using var transaction = await db.Database.BeginTransactionAsync(cancel); var project = await ProjectEndpoints.LockProjectForCaller(db, projectId, userId, cancel); if (project is null) return TypedResults.NotFound(); + if (!TeamRoles.CanEdit(await db.CallerRoleAsync(project.TeamId, userId, cancel))) return ProjectEndpoints.EditorsOnly(); if (project.ArchivedAt is not null) return ProjectEndpoints.Archived(); var refused = await CheckDocuments(db, projectId, input.DocumentIds, new HashSet(), cancel); if (refused is not null) return refused; @@ -135,6 +136,7 @@ private static async Task, ValidationProblem, No await using var transaction = await db.Database.BeginTransactionAsync(cancel); var found = await LockForMember(db, userId, requirementId, cancel); if (found is null) return TypedResults.NotFound(); + if (!found.CanEdit) return ProjectEndpoints.EditorsOnly(); var requirement = found.Requirement; if (found.ProjectArchived || requirement.ArchivedAt is not null) return ProjectEndpoints.Archived(); if (requirement.Version != request.Version) return Stale(); @@ -197,6 +199,7 @@ private static async Task, NotFound, ProblemHttp await using var transaction = await db.Database.BeginTransactionAsync(cancel); var found = await LockForMember(db, user.CallerId(), requirementId, cancel); if (found is null) return TypedResults.NotFound(); + if (!found.CanEdit) return ProjectEndpoints.EditorsOnly(); if (found.ProjectArchived) return ProjectEndpoints.Archived(); // Idempotent: archiving again keeps the original timestamp, and restoring an active one changes nothing. @@ -230,14 +233,15 @@ private static async Task, NotFound, ProblemHttp var project = await ProjectEndpoints.LockProjectForCaller(db, projectId.Value, userId, cancel); if (project is null) return null; var requirement = await db.Requirements.SingleAsync(r => r.Id == requirementId, cancel); - return new MemberRequirement(requirement, project.ArchivedAt != null); + var role = await db.CallerRoleAsync(project.TeamId, userId, cancel); + return new MemberRequirement(requirement, project.ArchivedAt != null, role!); } // Null when the requirement does not exist or the caller is not a member of its project. private static Task FindForMember( IQueryable requirements, SpecThreadDbContext db, string userId, Guid requirementId, CancellationToken cancel) => requirements.Where(r => r.Id == requirementId) - .Join(db.ProjectsFor(userId), r => r.ProjectId, p => p.Id, (r, p) => new MemberRequirement(r, p.ArchivedAt != null)) + .Join(db.ProjectsFor(userId), r => r.ProjectId, p => p.Id, (r, p) => new MemberRequirement(r, p.ArchivedAt != null, "")) .SingleOrDefaultAsync(cancel); private static ValidInput? Validate( @@ -326,9 +330,11 @@ private static async Task> MissingEvidenceAsync(SpecThreadDbContext EvidencePolicy.Missing(await db.RequirementEvidence.AsNoTracking().Where(e => e.RequirementId == requirementId) .Select(e => new EvidenceFacts(e.Id, e.Kind, e.State, e.Checks, e.Contains)).ToListAsync(cancel)); - internal sealed record MemberRequirement(Requirement Requirement, bool ProjectArchived) + // `Role` is the caller's team role as of the lock (ADR-058); reads that do not lock leave it empty. + internal sealed record MemberRequirement(Requirement Requirement, bool ProjectArchived, string Role) { public bool Archived => ProjectArchived || Requirement.ArchivedAt is not null; + public bool CanEdit => TeamRoles.CanEdit(Role); } private sealed record ValidInput(string Title, string Description, List Criteria, List DocumentIds); diff --git a/app/api/Requirements/ReviewEndpoints.cs b/app/api/Requirements/ReviewEndpoints.cs index ea4dca0..b0085a0 100644 --- a/app/api/Requirements/ReviewEndpoints.cs +++ b/app/api/Requirements/ReviewEndpoints.cs @@ -8,8 +8,9 @@ namespace SpecThread.Api.Requirements; // Records a person's decision on a requirement: accepted, rejected, or more evidence requested -// (ADR-038). Any project member reads the decisions. Any member except the requirement's author -// records one. Decisions are only ever added, so the history stays as it was made. +// (ADR-038). Any project member reads the decisions. Owners, Admins, Members, and Reviewers record +// one, including on requirements they wrote; Observers only read (ADR-058). Decisions are only +// ever added, so the history stays as it was made. internal static class ReviewEndpoints { public const int MaxNoteLength = 2_000; @@ -51,13 +52,9 @@ private static async Task, ValidationProblem, No await using var transaction = await db.Database.BeginTransactionAsync(cancel); var found = await RequirementEndpoints.LockForMember(db, userId, requirementId, cancel); if (found is null) return TypedResults.NotFound(); + if (!TeamRoles.CanReview(found.Role)) return ObserversCannotDecide(); if (found.Archived) return ProjectEndpoints.Archived(); var requirement = found.Requirement; - // A second person has to look: nobody decides on a requirement they wrote. - if (requirement.CreatedBy == userId) - { - return TypedResults.Problem("You created this requirement, so another project member has to review it.", statusCode: StatusCodes.Status403Forbidden); - } // Nobody decides on text they have not seen. if (requirement.Version != request.Version) { @@ -113,6 +110,9 @@ private static Task IsMemberAsync(SpecThreadDbContext db, string userId, G .Join(db.ProjectsFor(userId), r => r.ProjectId, p => p.Id, (r, p) => r.Id) .AnyAsync(cancel); + private static ProblemHttpResult ObserversCannotDecide() => + TypedResults.Problem("Observers can read decisions but not record them.", statusCode: StatusCodes.Status403Forbidden); + private static ReviewResponse ToResponse(RequirementReview r) => new(r.Id, r.RequirementId, r.Decision, r.Note, r.RequirementVersion, ReadSnapshot(r), r.DecidedBy, r.DecidedAt, r.CriteriaVersion); } diff --git a/app/api/Teams/InvitationEndpoints.cs b/app/api/Teams/InvitationEndpoints.cs index c97a165..797f817 100644 --- a/app/api/Teams/InvitationEndpoints.cs +++ b/app/api/Teams/InvitationEndpoints.cs @@ -39,7 +39,7 @@ private static async Task>, NotFound, Proble Invitation = i, Inviter = db.Set().Where(u => u.Id == i.InvitedBy).Select(u => u.Name).First(), Permitted = db.TeamMembers.Any(m => m.TeamId == teamId && m.UserId == i.InvitedBy && - (i.InvitedBy == team.OwnerUserId || i.Role == "member" && m.Role == "admin")), + (i.InvitedBy == team.OwnerUserId || i.Role != TeamRoles.Admin && m.Role == TeamRoles.Admin)), }).ToListAsync(cancel); return TypedResults.Ok(rows.Select(row => Describe(row.Invitation, row.Inviter, row.Permitted, now)).ToList()); } @@ -55,7 +55,7 @@ private static async Task, ValidationP var errors = new InputErrors(); var email = errors.Required("email", request.Email, InputErrors.MaxEmailLength)?.ToLowerInvariant(); if (email is not null && (!MailAddress.TryCreate(email, out var address) || address.Address != email)) errors.Add("email", "Enter a valid email address."); - if (request.Role is not ("member" or "admin")) errors.Add("role", "Choose Admin or Member."); + if (request.Role is null || !TeamRoles.Assignable.Contains(request.Role)) errors.Add("role", "Choose Admin, Member, Reviewer, or Observer."); if (errors.Any) return TypedResults.ValidationProblem(errors.ToDictionary()); if (!await CanIssue(db, team, caller, request.Role!, cancel)) return AdminInvitesOwnerOnly(); if (await db.TeamMembers.Where(m => m.TeamId == teamId).Join(db.Set(), m => m.UserId, u => u.Id, (m, u) => u.Email) @@ -165,9 +165,10 @@ private static async Task, NotFound, ProblemHttpResult> return TypedResults.Ok(response); } + // The Owner invites any role; Admins invite every role except Admin (ADR-058). private static Task CanIssue(SpecThreadDbContext db, Team team, string userId, string role, CancellationToken cancel) => db.TeamMembers.AnyAsync(m => m.TeamId == team.Id && m.UserId == userId && - (team.OwnerUserId == userId || role == "member" && m.Role == "admin"), cancel); + (team.OwnerUserId == userId || role != TeamRoles.Admin && m.Role == TeamRoles.Admin), cancel); private static string Issue(TeamInvitation invitation, DateTime now) { var token = Convert.ToHexString(RandomNumberGenerator.GetBytes(32)).ToLowerInvariant(); diff --git a/app/api/Teams/TeamManagementEndpoints.cs b/app/api/Teams/TeamManagementEndpoints.cs index 4c65244..d085637 100644 --- a/app/api/Teams/TeamManagementEndpoints.cs +++ b/app/api/Teams/TeamManagementEndpoints.cs @@ -60,7 +60,7 @@ private static async Task, NotFound, ValidationPr if (target is null) return TypedResults.NotFound(); if (userId == team.OwnerUserId) return OwnerStays(); var errors = new InputErrors(); - if (request.Role is not ("admin" or "member")) errors.Add("role", "Choose Admin or Member."); + if (request.Role is null || !TeamRoles.Assignable.Contains(request.Role)) errors.Add("role", "Choose Admin, Member, Reviewer, or Observer."); if (errors.Any) return TypedResults.ValidationProblem(errors.ToDictionary()); target.Role = request.Role!; await db.SaveChangesAsync(cancel); @@ -82,8 +82,8 @@ private static async Task> Remov if (userId != callerId && team.OwnerUserId != callerId) { var caller = await db.TeamMembers.SingleAsync(m => m.TeamId == teamId && m.UserId == callerId, cancel); - if (caller.Role != "admin" || target.Role != "member") - return TypedResults.Problem("Admins can remove regular Members; only the Owner can remove an Admin.", statusCode: StatusCodes.Status403Forbidden); + if (caller.Role != TeamRoles.Admin || target.Role == TeamRoles.Admin) + return TypedResults.Problem("Admins can remove Members, Reviewers, and Observers; only the Owner can remove an Admin.", statusCode: StatusCodes.Status403Forbidden); } db.TeamMembers.Remove(target); await db.SaveChangesAsync(cancel); diff --git a/app/web/src/app/app-shell.css b/app/web/src/app/app-shell.css index 094d4d1..d680001 100644 --- a/app/web/src/app/app-shell.css +++ b/app/web/src/app/app-shell.css @@ -243,6 +243,11 @@ a.row:focus-visible { outline-offset: -2px; } .app-shell .scaffold-page > .notice { margin-top: 20px; } .app-shell .page-loading { margin: 0; color: var(--app-text-3); } .project-count { margin: 20px 0 8px; color: var(--app-text-3); font-size: 13px; } +.project-group + .project-group { margin-top: 24px; } +.project-group-heading { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; margin-bottom: 8px; } +.project-group-heading h2 { margin: 0; font-size: 15px; font-weight: 600; } +.project-group-link { display: inline-flex; align-items: center; gap: 2px; margin-left: auto; color: var(--app-text-2); font-size: 13px; text-decoration: none; } +.project-group-link:hover { color: var(--app-text); text-decoration: underline; } .settings-block { max-width: 460px; margin-top: 24px; } .settings-block > * + * { margin-top: 16px; } .settings-block p { margin-bottom: 0; color: var(--app-text-2); } diff --git a/app/web/src/app/invites/[token]/page.tsx b/app/web/src/app/invites/[token]/page.tsx index 9bd29d2..376c98b 100644 --- a/app/web/src/app/invites/[token]/page.tsx +++ b/app/web/src/app/invites/[token]/page.tsx @@ -5,6 +5,7 @@ import { apiFetch } from "@/lib/api"; import { getInvitationPreview } from "@/lib/invitations"; import { AcceptInvitation, InvitationSwitchAccount } from "@/components/teams/accept-invitation"; import styles from "@/components/teams/teams.module.css"; +import { teamRoleLabels } from "@/lib/team-types"; export const metadata = { title: "Team invitation · SpecThread", referrer: "no-referrer", robots: { index: false, follow: false } }; @@ -25,7 +26,7 @@ export default async function Page({ params }: { params: Promise<{ token: string

{joined ? "You’ve joined this team" : invitation?.status === "pending" ? "You’re invited to a team" : "Invitation unavailable"}

{invitation ? <>
Team
{invitation.teamName}
Invited by
{invitation.inviterName}
-
Invited email
{invitation.email}
Role
{invitation.role === "admin" ? "Admin" : "Member"}
+
Invited email
{invitation.email}
Role
{teamRoleLabels[invitation.role]}
Expires
{joined ? Open team : invitation.status !== "pending" ? diff --git a/app/web/src/app/projects/[projectId]/documents/[documentId]/page.tsx b/app/web/src/app/projects/[projectId]/documents/[documentId]/page.tsx index 92c20e3..2b3d20d 100644 --- a/app/web/src/app/projects/[projectId]/documents/[documentId]/page.tsx +++ b/app/web/src/app/projects/[projectId]/documents/[documentId]/page.tsx @@ -4,7 +4,7 @@ import { ArrowLeft, Download } from "lucide-react"; import { DocumentArchive } from "@/components/document-archive"; import { documentTypeLabel, formatFileSize } from "@/lib/documents"; import { requireDocument, requireProject } from "@/lib/project-data"; -import { formatDate } from "@/lib/projects"; +import { canEditProject, formatDate } from "@/lib/projects"; type Props = PageProps<"/projects/[projectId]/documents/[documentId]">; @@ -17,7 +17,7 @@ export async function generateMetadata({ params }: Props): Promise { export default async function Page({ params }: Props) { const { projectId, documentId } = await params; const [project, document] = await Promise.all([requireProject(projectId), requireDocument(projectId, documentId)]); - const editable = !project.archivedAt && !document.archivedAt; + const editable = !project.archivedAt && !document.archivedAt && canEditProject(project); const base = `/projects/${project.id}/documents`; return ( diff --git a/app/web/src/app/projects/[projectId]/documents/new/page.tsx b/app/web/src/app/projects/[projectId]/documents/new/page.tsx index 287ed6b..06bf280 100644 --- a/app/web/src/app/projects/[projectId]/documents/new/page.tsx +++ b/app/web/src/app/projects/[projectId]/documents/new/page.tsx @@ -2,6 +2,7 @@ import type { Metadata } from "next"; import { uploadDocument } from "@/app/projects/document-actions"; import { DocumentUploadForm } from "@/components/document-upload-form"; import { requireProject } from "@/lib/project-data"; +import { canEditProject } from "@/lib/projects"; export const metadata: Metadata = { title: "Upload document" }; @@ -16,6 +17,8 @@ export default async function Page({ params }: PageProps<"/projects/[projectId]/ {project.archivedAt ?

This project is archived, so documents can't be added.

+ : !canEditProject(project) + ?

Your role on this team can read this project but not change it.

: ( <>

Everyone in {project.teamName} can open and download the documents in this project.

diff --git a/app/web/src/app/projects/[projectId]/documents/page.tsx b/app/web/src/app/projects/[projectId]/documents/page.tsx index e3e9cd3..b154644 100644 --- a/app/web/src/app/projects/[projectId]/documents/page.tsx +++ b/app/web/src/app/projects/[projectId]/documents/page.tsx @@ -3,7 +3,7 @@ import Link from "next/link"; import { FileText, Upload } from "lucide-react"; import { documentTypeLabel, formatFileSize } from "@/lib/documents"; import { listDocuments, requireProject } from "@/lib/project-data"; -import { formatDate } from "@/lib/projects"; +import { canEditProject, formatDate } from "@/lib/projects"; export const metadata: Metadata = { title: "Documentation" }; @@ -17,7 +17,7 @@ export default async function Page({ params }: PageProps<"/projects/[projectId]/

Documentation

{documents.length} - {!project.archivedAt && ( + {!project.archivedAt && canEditProject(project) && (
diff --git a/app/web/src/app/projects/[projectId]/requirements/[requirementId]/edit/page.tsx b/app/web/src/app/projects/[projectId]/requirements/[requirementId]/edit/page.tsx index b76a8c4..5e17a21 100644 --- a/app/web/src/app/projects/[projectId]/requirements/[requirementId]/edit/page.tsx +++ b/app/web/src/app/projects/[projectId]/requirements/[requirementId]/edit/page.tsx @@ -4,6 +4,7 @@ import { updateRequirement } from "@/app/projects/requirement-actions"; import { RequirementForm } from "@/components/requirement-form"; import { listDocuments, listMembers, listReviews, requireProject, requireRequirement } from "@/lib/project-data"; import { documentChoices } from "@/lib/requirements"; +import { canEditProject } from "@/lib/projects"; export const metadata: Metadata = { title: "Edit requirement" }; @@ -37,6 +38,8 @@ export default async function Page({ params }: PageProps<"/projects/[projectId]/ ?

This requirement is archived and can no longer be changed.

: requirement.archivedAt ?

This requirement is archived. Restore it to edit it again.

+ : !canEditProject(project) + ?

Your role on this team can read this project but not change it. Back to the requirement

: ; @@ -28,21 +28,23 @@ export async function generateMetadata({ params }: Props): Promise { * Shows who created a requirement and when, its description, ordered acceptance criteria and their * version, milestone, linked documents, follow-up links, evidence and its Evidence complete status, * and review decisions, with - * edit and archive while it can change. + * edit and archive while it can change and the viewer's team role allows it (ADR-058). */ export default async function Page({ params }: Props) { const { projectId, requirementId } = await params; // One round of parallel reads. Each is authorized by the API, and requireRequirement still // shows the not-found page before anything renders when the requirement is in another project. - const [project, requirement, members, repository, evidence, reviews, viewer, followUps, requirements, milestones, evidenceHistory, suggestions] = await Promise.all([ + const [project, requirement, members, repository, evidence, reviews, followUps, requirements, milestones, evidenceHistory, suggestions] = await Promise.all([ requireProject(projectId), requireRequirement(projectId, requirementId), listMembers(projectId), - getProjectRepository(projectId), listEvidence(requirementId), listReviews(requirementId), viewerId(), + getProjectRepository(projectId), listEvidence(requirementId), listReviews(requirementId), listFollowUps(requirementId), listRequirements(projectId), listMilestones(projectId), listEvidenceHistory(requirementId), listEvidenceSuggestions(requirementId), ]); const people = Object.fromEntries(members.map(member => [member.userId, member.name])); const nameOf = (userId: string) => people[userId] ?? "a former member"; - const editable = !project.archivedAt && !requirement.archivedAt; + // Reviewers and Observers read everything; only Owners, Admins, and Members change it (ADR-058). + const changeable = !project.archivedAt && !requirement.archivedAt; + const editable = changeable && canEditProject(project); const base = `/projects/${project.id}/requirements`; // Requirements this one could follow up: not itself, and not already linked either way. const linked = new Set([requirement.id, ...[...followUps.followUpOf, ...followUps.followedUpBy].map(link => link.requirementId)]); @@ -149,11 +151,10 @@ export default async function Page({ params }: Props) { link.id)} people={people} - canReview={!editable ? "read-only" : viewer === requirement.createdBy ? "author" : "yes"} - soloTeam={members.length === 1 ? { name: project.teamName, invitations: `/teams/${project.teamId}/invitations` } : null} /> + canReview={changeable && canReviewProject(project)} /> {editable && } - {requirement.archivedAt && !project.archivedAt && } + {requirement.archivedAt && !project.archivedAt && canEditProject(project) && } ); } diff --git a/app/web/src/app/projects/[projectId]/requirements/new/page.tsx b/app/web/src/app/projects/[projectId]/requirements/new/page.tsx index c79c1a5..94400fe 100644 --- a/app/web/src/app/projects/[projectId]/requirements/new/page.tsx +++ b/app/web/src/app/projects/[projectId]/requirements/new/page.tsx @@ -3,6 +3,7 @@ import { createRequirement } from "@/app/projects/requirement-actions"; import { RequirementForm } from "@/components/requirement-form"; import { listDocuments, listMilestones, requireProject } from "@/lib/project-data"; import { documentChoices } from "@/lib/requirements"; +import { canEditProject } from "@/lib/projects"; export const metadata: Metadata = { title: "New requirement" }; @@ -19,6 +20,8 @@ export default async function Page({ params }: PageProps<"/projects/[projectId]/ {project.archivedAt ?

This project is archived, so requirements can't be added.

+ : !canEditProject(project) + ?

Your role on this team can read this project but not change it.

: