Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/api/Data/SpecThreadDbContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ protected override void OnModelCreating(ModelBuilder model)
team.HasOne<AuthUser>().WithMany().HasForeignKey(x => x.OwnerUserId).OnDelete(DeleteBehavior.Restrict);

var teamMember = model.Entity<TeamMember>();
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");
Expand All @@ -91,7 +91,7 @@ protected override void OnModelCreating(ModelBuilder model)
var invitation = model.Entity<TeamInvitation>();
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");
});
Expand Down
2 changes: 1 addition & 1 deletion app/api/Data/TeamModels.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
2 changes: 2 additions & 0 deletions app/api/Documents/DocumentEndpoints.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ private static async Task<Results<Created<DocumentResponse>, 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
Expand Down Expand Up @@ -123,6 +124,7 @@ private static async Task<Results<Ok<DocumentResponse>, 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.
Expand Down
6 changes: 6 additions & 0 deletions app/api/GitHub/EvidenceChangeEndpoints.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ private static async Task<Results<Ok<List<EvidenceSuggestionResponse>>, 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();
Expand All @@ -57,6 +58,7 @@ private static async Task<Results<Ok<List<EvidenceSuggestionResponse>>, 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();
}
Expand All @@ -73,6 +75,7 @@ private static async Task<Results<Created<EvidenceResponse>, 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);
Expand Down Expand Up @@ -115,6 +118,7 @@ private static async Task<Results<NoContent, NotFound, ProblemHttpResult>> 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();
Expand Down Expand Up @@ -152,6 +156,7 @@ private static async Task<Results<Ok<EvidenceResponse>, 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();
Expand Down Expand Up @@ -181,6 +186,7 @@ private static async Task<Results<Ok<EvidenceResponse>, 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();
}
Expand Down
18 changes: 15 additions & 3 deletions app/api/GitHub/EvidenceEndpoints.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ private static async Task<Results<Created<EvidenceResponse>, 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();
Expand Down Expand Up @@ -200,6 +201,7 @@ private static async Task<SavedLink> 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());
}
Expand Down Expand Up @@ -236,6 +238,7 @@ private static async Task<Results<Ok<List<EvidenceResponse>>, 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();
Expand Down Expand Up @@ -284,6 +287,7 @@ private static async Task<Results<Ok<List<EvidenceResponse>>, 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();
}
Expand All @@ -309,6 +313,7 @@ private static async Task<Results<NoContent, NotFound, ProblemHttpResult>> 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();
Expand Down Expand Up @@ -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<Scope?> 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
Expand All @@ -352,6 +359,7 @@ private static async Task<Recheck> 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);
Expand Down Expand Up @@ -586,7 +594,11 @@ private static ProblemHttpResult Failed(GitHubFailure failure, string fullName)
e.Contains is null ? null : JsonSerializer.Deserialize<Dictionary<Guid, bool>>(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);
}
Expand Down
Loading
Loading