kai/ColaFlow
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(backend): Day 15 Task 1&2 - Add TenantId to Epic/Story/WorkTask and implement TenantContext

Browse Source 
This commit completes Day 15's primary objectives:
1. Database Migration - Add TenantId columns to Epic, Story, and WorkTask entities
2. TenantContext Service - Implement tenant context retrieval from JWT claims

Changes:
- Added TenantId property to Epic, Story, and WorkTask domain entities
- Updated entity factory methods to require TenantId parameter
- Modified Project.CreateEpic to pass TenantId from parent aggregate
- Modified Epic.CreateStory and Story.CreateTask to propagate TenantId
- Added EF Core configurations for TenantId mapping with proper indexes
- Created EF Core migration: AddTenantIdToEpicStoryTask
  * Adds tenant_id columns to Epics, Stories, and Tasks tables
  * Creates indexes: ix_epics_tenant_id, ix_stories_tenant_id, ix_tasks_tenant_id
  * Uses default Guid.Empty for existing data (backward compatible)
- Implemented ITenantContext interface in Application layer
- Implemented TenantContext service in Infrastructure layer
  * Retrieves tenant ID from JWT claims (tenant_id or tenantId)
  * Throws UnauthorizedAccessException if tenant context unavailable
- Registered TenantContext as scoped service in DI container
- Added Global Query Filters for Epic, Story, and WorkTask entities
  * Ensures automatic tenant isolation at database query level
  * Prevents cross-tenant data access

Architecture:
- Follows the same pattern as Issue Management Module (Day 14)
- Maintains consistency with Project entity multi-tenancy implementation
- Ensures data isolation through both domain logic and database filters

Note: Unit tests require updates to pass TenantId parameter - will be addressed in follow-up commits

Reference: Day 15 roadmap (DAY15-22-PROJECTMANAGEMENT-ROADMAP.md)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Yaojia Wang
2025-11-04 16:44:09 +01:00
parent 810fbeb1a0
commit 12a4248430
14 changed files with 544 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

325
colaflow-api/src/Modules/ProjectManagement/ColaFlow.Modules.ProjectManagement.Infrastructure/Migrations/20251104153716_AddTenantIdToEpicStoryTask.Designer.cs generated Normal file
View File

@@ -0,0 +1,325 @@
// <auto-generated />
using System;
using ColaFlow.Modules.ProjectManagement.Infrastructure.Persistence;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace ColaFlow.Modules.ProjectManagement.Infrastructure.Migrations
{
[DbContext(typeof(PMDbContext))]
[Migration("20251104153716_AddTenantIdToEpicStoryTask")]
partial class AddTenantIdToEpicStoryTask
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("project_management")
.HasAnnotation("ProductVersion", "9.0.10")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Epic", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<DateTime>("CreatedAt")
.HasColumnType("timestamp with time zone");
b.Property<Guid>("CreatedBy")
.HasColumnType("uuid");
b.Property<string>("Description")
.IsRequired()
.HasMaxLength(2000)
.HasColumnType("character varying(2000)");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(200)
.HasColumnType("character varying(200)");
b.Property<string>("Priority")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<Guid>("ProjectId")
.HasColumnType("uuid");
b.Property<string>("Status")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<Guid>("TenantId")
.HasColumnType("uuid")
.HasColumnName("tenant_id");
b.Property<DateTime?>("UpdatedAt")
.HasColumnType("timestamp with time zone");
b.HasKey("Id");
b.HasIndex("CreatedAt");
b.HasIndex("ProjectId");
b.HasIndex("TenantId")
.HasDatabaseName("ix_epics_tenant_id");
b.ToTable("Epics", "project_management");
});
modelBuilder.Entity("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Project", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<DateTime>("CreatedAt")
.HasColumnType("timestamp with time zone");
b.Property<string>("Description")
.IsRequired()
.HasMaxLength(2000)
.HasColumnType("character varying(2000)");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(200)
.HasColumnType("character varying(200)");
b.Property<Guid>("OwnerId")
.HasColumnType("uuid");
b.Property<string>("Status")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<Guid>("TenantId")
.HasColumnType("uuid");
b.Property<DateTime?>("UpdatedAt")
.HasColumnType("timestamp with time zone");
b.HasKey("Id");
b.HasIndex("CreatedAt");
b.HasIndex("OwnerId");
b.HasIndex("TenantId");
b.ToTable("Projects", "project_management");
});
modelBuilder.Entity("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Story", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<decimal?>("ActualHours")
.HasColumnType("numeric");
b.Property<Guid?>("AssigneeId")
.HasColumnType("uuid");
b.Property<DateTime>("CreatedAt")
.HasColumnType("timestamp with time zone");
b.Property<Guid>("CreatedBy")
.HasColumnType("uuid");
b.Property<string>("Description")
.IsRequired()
.HasMaxLength(4000)
.HasColumnType("character varying(4000)");
b.Property<Guid>("EpicId")
.HasColumnType("uuid");
b.Property<decimal?>("EstimatedHours")
.HasColumnType("numeric");
b.Property<string>("Priority")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<string>("Status")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<Guid>("TenantId")
.HasColumnType("uuid")
.HasColumnName("tenant_id");
b.Property<string>("Title")
.IsRequired()
.HasMaxLength(200)
.HasColumnType("character varying(200)");
b.Property<DateTime?>("UpdatedAt")
.HasColumnType("timestamp with time zone");
b.HasKey("Id");
b.HasIndex("AssigneeId");
b.HasIndex("CreatedAt");
b.HasIndex("EpicId");
b.HasIndex("TenantId")
.HasDatabaseName("ix_stories_tenant_id");
b.ToTable("Stories", "project_management");
});
modelBuilder.Entity("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.WorkTask", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<decimal?>("ActualHours")
.HasColumnType("numeric");
b.Property<Guid?>("AssigneeId")
.HasColumnType("uuid");
b.Property<DateTime>("CreatedAt")
.HasColumnType("timestamp with time zone");
b.Property<Guid>("CreatedBy")
.HasColumnType("uuid");
b.Property<string>("Description")
.IsRequired()
.HasMaxLength(4000)
.HasColumnType("character varying(4000)");
b.Property<decimal?>("EstimatedHours")
.HasColumnType("numeric");
b.Property<string>("Priority")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<string>("Status")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<Guid>("StoryId")
.HasColumnType("uuid");
b.Property<Guid>("TenantId")
.HasColumnType("uuid")
.HasColumnName("tenant_id");
b.Property<string>("Title")
.IsRequired()
.HasMaxLength(200)
.HasColumnType("character varying(200)");
b.Property<DateTime?>("UpdatedAt")
.HasColumnType("timestamp with time zone");
b.HasKey("Id");
b.HasIndex("AssigneeId");
b.HasIndex("CreatedAt");
b.HasIndex("StoryId");
b.HasIndex("TenantId")
.HasDatabaseName("ix_tasks_tenant_id");
b.ToTable("Tasks", "project_management");
});
modelBuilder.Entity("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Epic", b =>
{
b.HasOne("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Project", null)
.WithMany("Epics")
.HasForeignKey("ProjectId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Project", b =>
{
b.OwnsOne("ColaFlow.Modules.ProjectManagement.Domain.ValueObjects.ProjectKey", "Key", b1 =>
{
b1.Property<Guid>("ProjectId")
.HasColumnType("uuid");
b1.Property<string>("Value")
.IsRequired()
.HasMaxLength(20)
.HasColumnType("character varying(20)")
.HasColumnName("Key");
b1.HasKey("ProjectId");
b1.HasIndex("Value")
.IsUnique();
b1.ToTable("Projects", "project_management");
b1.WithOwner()
.HasForeignKey("ProjectId");
});
b.Navigation("Key")
.IsRequired();
});
modelBuilder.Entity("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Story", b =>
{
b.HasOne("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Epic", null)
.WithMany("Stories")
.HasForeignKey("EpicId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.WorkTask", b =>
{
b.HasOne("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Story", null)
.WithMany("Tasks")
.HasForeignKey("StoryId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Epic", b =>
{
b.Navigation("Stories");
});
modelBuilder.Entity("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Project", b =>
{
b.Navigation("Epics");
});
modelBuilder.Entity("ColaFlow.Modules.ProjectManagement.Domain.Aggregates.ProjectAggregate.Story", b =>
{
b.Navigation("Tasks");
});
#pragma warning restore 612, 618
}
}
}

91
colaflow-api/src/Modules/ProjectManagement/ColaFlow.Modules.ProjectManagement.Infrastructure/Migrations/20251104153716_AddTenantIdToEpicStoryTask.cs Normal file
View File

@@ -0,0 +1,91 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace ColaFlow.Modules.ProjectManagement.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class AddTenantIdToEpicStoryTask : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "tenant_id",
schema: "project_management",
table: "Tasks",
type: "uuid",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
migrationBuilder.AddColumn<Guid>(
name: "tenant_id",
schema: "project_management",
table: "Stories",
type: "uuid",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
migrationBuilder.AddColumn<Guid>(
name: "tenant_id",
schema: "project_management",
table: "Epics",
type: "uuid",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
migrationBuilder.CreateIndex(
name: "ix_tasks_tenant_id",
schema: "project_management",
table: "Tasks",
column: "tenant_id");
migrationBuilder.CreateIndex(
name: "ix_stories_tenant_id",
schema: "project_management",
table: "Stories",
column: "tenant_id");
migrationBuilder.CreateIndex(
name: "ix_epics_tenant_id",
schema: "project_management",
table: "Epics",
column: "tenant_id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "ix_tasks_tenant_id",
schema: "project_management",
table: "Tasks");
migrationBuilder.DropIndex(
name: "ix_stories_tenant_id",
schema: "project_management",
table: "Stories");
migrationBuilder.DropIndex(
name: "ix_epics_tenant_id",
schema: "project_management",
table: "Epics");
migrationBuilder.DropColumn(
name: "tenant_id",
schema: "project_management",
table: "Tasks");
migrationBuilder.DropColumn(
name: "tenant_id",
schema: "project_management",
table: "Stories");
migrationBuilder.DropColumn(
name: "tenant_id",
schema: "project_management",
table: "Epics");
}
}
}

21
colaflow-api/src/Modules/ProjectManagement/ColaFlow.Modules.ProjectManagement.Infrastructure/Migrations/PMDbContextModelSnapshot.cs
View File

@@ -57,6 +57,10 @@ namespace ColaFlow.Modules.ProjectManagement.Infrastructure.Migrations
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<Guid>("TenantId")
.HasColumnType("uuid")
.HasColumnName("tenant_id");
b.Property<DateTime?>("UpdatedAt")
.HasColumnType("timestamp with time zone");
@@ -66,6 +70,9 @@ namespace ColaFlow.Modules.ProjectManagement.Infrastructure.Migrations
b.HasIndex("ProjectId");
b.HasIndex("TenantId")
.HasDatabaseName("ix_epics_tenant_id");
b.ToTable("Epics", "project_management");
});
@@ -150,6 +157,10 @@ namespace ColaFlow.Modules.ProjectManagement.Infrastructure.Migrations
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<Guid>("TenantId")
.HasColumnType("uuid")
.HasColumnName("tenant_id");
b.Property<string>("Title")
.IsRequired()
.HasMaxLength(200)
@@ -166,6 +177,9 @@ namespace ColaFlow.Modules.ProjectManagement.Infrastructure.Migrations
b.HasIndex("EpicId");
b.HasIndex("TenantId")
.HasDatabaseName("ix_stories_tenant_id");
b.ToTable("Stories", "project_management");
});
@@ -207,6 +221,10 @@ namespace ColaFlow.Modules.ProjectManagement.Infrastructure.Migrations
b.Property<Guid>("StoryId")
.HasColumnType("uuid");
b.Property<Guid>("TenantId")
.HasColumnType("uuid")
.HasColumnName("tenant_id");
b.Property<string>("Title")
.IsRequired()
.HasMaxLength(200)
@@ -223,6 +241,9 @@ namespace ColaFlow.Modules.ProjectManagement.Infrastructure.Migrations
b.HasIndex("StoryId");
b.HasIndex("TenantId")
.HasDatabaseName("ix_tasks_tenant_id");
b.ToTable("Tasks", "project_management");
});

10
colaflow-api/src/Modules/ProjectManagement/ColaFlow.Modules.ProjectManagement.Infrastructure/Persistence/Configurations/EpicConfiguration.cs
View File

@@ -26,6 +26,14 @@ public class EpicConfiguration : IEntityTypeConfiguration<Epic>
.IsRequired()
.ValueGeneratedNever();
// TenantId (required for multi-tenancy)
builder.Property(e => e.TenantId)
.HasConversion(
id => id.Value,
value => TenantId.From(value))
.IsRequired()
.HasColumnName("tenant_id");
// ProjectId (foreign key)
builder.Property(e => e.ProjectId)
.HasConversion(
@@ -78,6 +86,8 @@ public class EpicConfiguration : IEntityTypeConfiguration<Epic>
.OnDelete(DeleteBehavior.Cascade);
// Indexes
builder.HasIndex(e => e.TenantId)
.HasDatabaseName("ix_epics_tenant_id");
builder.HasIndex(e => e.ProjectId);
builder.HasIndex(e => e.CreatedAt);
}

10
colaflow-api/src/Modules/ProjectManagement/ColaFlow.Modules.ProjectManagement.Infrastructure/Persistence/Configurations/StoryConfiguration.cs
View File

@@ -26,6 +26,14 @@ public class StoryConfiguration : IEntityTypeConfiguration<Story>
.IsRequired()
.ValueGeneratedNever();
// TenantId (required for multi-tenancy)
builder.Property(s => s.TenantId)
.HasConversion(
id => id.Value,
value => TenantId.From(value))
.IsRequired()
.HasColumnName("tenant_id");
// EpicId (foreign key)
builder.Property(s => s.EpicId)
.HasConversion(
@@ -88,6 +96,8 @@ public class StoryConfiguration : IEntityTypeConfiguration<Story>
.OnDelete(DeleteBehavior.Cascade);
// Indexes
builder.HasIndex(s => s.TenantId)
.HasDatabaseName("ix_stories_tenant_id");
builder.HasIndex(s => s.EpicId);
builder.HasIndex(s => s.AssigneeId);
builder.HasIndex(s => s.CreatedAt);

10
colaflow-api/src/Modules/ProjectManagement/ColaFlow.Modules.ProjectManagement.Infrastructure/Persistence/Configurations/WorkTaskConfiguration.cs
View File

@@ -26,6 +26,14 @@ public class WorkTaskConfiguration : IEntityTypeConfiguration<WorkTask>
.IsRequired()
.ValueGeneratedNever();
// TenantId (required for multi-tenancy)
builder.Property(t => t.TenantId)
.HasConversion(
id => id.Value,
value => TenantId.From(value))
.IsRequired()
.HasColumnName("tenant_id");
// StoryId (foreign key)
builder.Property(t => t.StoryId)
.HasConversion(
@@ -81,6 +89,8 @@ public class WorkTaskConfiguration : IEntityTypeConfiguration<WorkTask>
builder.Property(t => t.UpdatedAt);
// Indexes
builder.HasIndex(t => t.TenantId)
.HasDatabaseName("ix_tasks_tenant_id");
builder.HasIndex(t => t.StoryId);
builder.HasIndex(t => t.AssigneeId);
builder.HasIndex(t => t.CreatedAt);

11
colaflow-api/src/Modules/ProjectManagement/ColaFlow.Modules.ProjectManagement.Infrastructure/Persistence/PMDbContext.cs
View File

@@ -34,9 +34,18 @@ public class PMDbContext : DbContext
// Apply all entity configurations from this assembly
modelBuilder.ApplyConfigurationsFromAssembly(Assembly.GetExecutingAssembly());
// Multi-tenant Global Query Filter for Project
// Multi-tenant Global Query Filters
modelBuilder.Entity<Project>().HasQueryFilter(p =>
p.TenantId == GetCurrentTenantId());
modelBuilder.Entity<Epic>().HasQueryFilter(e =>
e.TenantId == GetCurrentTenantId());
modelBuilder.Entity<Story>().HasQueryFilter(s =>
s.TenantId == GetCurrentTenantId());
modelBuilder.Entity<WorkTask>().HasQueryFilter(t =>
t.TenantId == GetCurrentTenantId());
}
private TenantId GetCurrentTenantId()

33
colaflow-api/src/Modules/ProjectManagement/ColaFlow.Modules.ProjectManagement.Infrastructure/Services/TenantContext.cs Normal file
View File

@@ -0,0 +1,33 @@
using Microsoft.AspNetCore.Http;
using System.Security.Claims;
using ColaFlow.Modules.ProjectManagement.Application.Common.Interfaces;
namespace ColaFlow.Modules.ProjectManagement.Infrastructure.Services;
/// <summary>
/// Implementation of ITenantContext that retrieves tenant ID from JWT claims
/// </summary>
public sealed class TenantContext : ITenantContext
{
private readonly IHttpContextAccessor _httpContextAccessor;
public TenantContext(IHttpContextAccessor httpContextAccessor)
{
_httpContextAccessor = httpContextAccessor;
}
public Guid GetCurrentTenantId()
{
var httpContext = _httpContextAccessor.HttpContext;
if (httpContext == null)
throw new InvalidOperationException("HTTP context is not available");
var user = httpContext.User;
var tenantClaim = user.FindFirst("tenant_id") ?? user.FindFirst("tenantId");
if (tenantClaim == null || !Guid.TryParse(tenantClaim.Value, out var tenantId))
throw new UnauthorizedAccessException("Tenant ID not found in claims");
return tenantId;
}
}