Stable run using Multi tenancy across entire estate

Audit logging and error logging active

PostFundManagement.Domain/Entities/Activity.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<ActivityConfiguration, Activity>]
 public class Activity : Models.Activity, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/AuditLog.cs

@@ -1,8 +1,8 @@
-using PostFundManagement.Domain.Models;
 using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<AuditLogConfiguration, AuditLog>]
 public sealed class AuditLog : Models.AuditLog;
 
 public sealed class AuditLogConfiguration : IEntityTypeConfiguration<AuditLog>
@@ -16,9 +16,7 @@ public sealed class AuditLogConfiguration : IEntityTypeConfiguration<AuditLog>
         builder.Property(f => f.EntityName).IsRequired().HasMaxLength(LabelLength);
         builder.Property(f => f.EntityId).IsRequired();
         builder.Property(f => f.Action).IsRequired().HasMaxLength(ShortLabelLength);
-        builder.Property(f => f.Changes).IsRequired(false).HasColumnType("jsonb")
-            .HasConversion(model => JsonSerializer.Serialize(model, JsonSerializerOptions.Default),
-                provider => JsonSerializer.Deserialize<AuditChanges>(provider, JsonSerializerOptions.Default));
+        builder.Property(f => f.Changes).IsRequired(false);
         builder.Property(f => f.PerformedBy).IsRequired();
         builder.Property(f => f.Timestamp).IsRequired().HasDefaultValueSql("now()");
     }

PostFundManagement.Domain/Entities/Award.cs

@@ -2,6 +2,7 @@ using PostFundManagement.Domain.Abstractions;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<AwardConfiguration, Award>]
 public class Award : Models.Award, ITenantEntity
 {
     public virtual User? Creator { get; set; }

PostFundManagement.Domain/Entities/Beneficiary.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<BeneficiaryConfiguration, Beneficiary>]
 public class Beneficiary : Models.Beneficiary, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Budget.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<BudgetConfiguration, Budget>]
 public class Budget : Models.Budget, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/ChangeRequest.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<ChangeRequestConfiguration, ChangeRequest>]
 public class ChangeRequest : Models.ChangeRequest, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/ComplianceItem.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<ComplianceItemConfiguration, ComplianceItem>]
 public class ComplianceItem : Models.ComplianceItem, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Contract.cs

@@ -2,6 +2,7 @@ using PostFundManagement.Domain.Abstractions;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<ContractConfiguration, Contract>]
 public class Contract : Models.Contract, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Disbursement.cs

@@ -2,6 +2,7 @@ using PostFundManagement.Domain.Abstractions;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<DisbursementConfiguration, Disbursement>]
 public class Disbursement : Models.Disbursement, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Evidence.cs

@@ -2,6 +2,7 @@ using PostFundManagement.Domain.Abstractions;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<EvidenceConfiguration, Evidence>]
 public class Evidence : Models.Evidence, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Indicator.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<IndicatorConfiguration, Indicator>]
 public class Indicator : Models.Indicator, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Instrument.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<InstrumentConfiguration, Instrument>]
 public class Instrument : Models.Instrument, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Invite.cs

@@ -2,6 +2,7 @@ using PostFundManagement.Domain.Abstractions;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<InviteConfiguration, Invite>]
 public class Invite : Models.Invite, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Issue.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<IssueConfiguration, Issue>]
 public class Issue : Models.Issue, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Milestone.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<MilestoneConfiguration, Milestone>]
 public class Milestone : Models.Milestone, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Notification.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<NotificationConfiguration, Notification>]
 public class Notification : Models.Notification, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Organisation.cs

@@ -2,6 +2,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<OrganisationConfiguration, Organisation>]
 public class Organisation : Models.Organisation
 {
     public virtual User? Creator { get; set; }

PostFundManagement.Domain/Entities/Outcome.cs

@@ -1,9 +1,13 @@
+using PostFundManagement.Domain.Abstractions;
 using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
-public class Outcome : Models.Outcome
+[EntityTypeConfiguration<OutcomeConfiguration, Outcome>]
+public class Outcome : Models.Outcome, ITenantEntity
 {
+    public virtual Tenant? Tenant { get; set; }
+
     public virtual Beneficiary? Beneficiary { get; set; }
 
     public virtual User? Creator { get; set; }
@@ -16,12 +20,19 @@ public sealed class OutcomeConfiguration : IEntityTypeConfiguration<Outcome>
         builder.ToTable(nameof(Outcome).Pluralize());
 
         builder.HasKey(pk => pk.Id);
+        builder.Property(f => f.TenantId).IsRequired();
         builder.Property(f => f.BeneficiaryId).IsRequired();
         builder.Property(f => f.CreatedBy).IsRequired();
         builder.Property(f => f.CreatedAt).IsRequired().HasDefaultValueSql("now()");
         builder.Property(f => f.Name).IsRequired().HasMaxLength(LabelLength);
         builder.Property(f => f.Description).IsRequired().HasMaxLength(TextLength);
 
+        builder.HasOne(f => f.Tenant)
+            .WithMany()
+            .HasForeignKey(fk => fk.TenantId)
+            .IsRequired()
+            .OnDelete(DeleteBehavior.NoAction);
+
         builder.HasOne(f => f.Beneficiary)
             .WithMany()
             .HasForeignKey(fk => fk.BeneficiaryId)

PostFundManagement.Domain/Entities/Portfolio.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<PortfolioConfiguration, Portfolio>]
 public class Portfolio : Models.Portfolio, ITenantEntity
 {
     public virtual User? Creator { get; set; }

PostFundManagement.Domain/Entities/Programme.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<ProgrammeConfiguration, Programme>]
 public class Programme : Models.Programme, ITenantEntity
 {
     public virtual User? Creator { get; set; }

PostFundManagement.Domain/Entities/Project.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<ProjectConfiguration, Project>]
 public class Project : Models.Project, ITenantEntity
 {
     public virtual User? Creator { get; set; }

PostFundManagement.Domain/Entities/Risk.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<RiskConfiguration, Risk>]
 public class Risk : Models.Risk, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Rule.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<RuleConfiguration, Rule>]
 public class Rule : Models.Rule, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/SiteVisit.cs

@@ -3,6 +3,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<SiteVisitConfiguration, SiteVisit>]
 public class SiteVisit : Models.SiteVisit, ITenantEntity
 {
     public virtual Tenant? Tenant { get; set; }

PostFundManagement.Domain/Entities/Tenant.cs

@@ -2,6 +2,7 @@
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<TenantConfiguration, Tenant>]
 public class Tenant : Models.Tenant
 {
     public virtual User? Creator { get; set; }

PostFundManagement.Domain/Entities/TenantOrganisation.cs

@@ -1,5 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<TenantOrganisationConfiguration, TenantOrganisation>]
 public class TenantOrganisation : Models.TenantOrganisation
 {
     public virtual Tenant? Tenant { get; set; }
@@ -16,8 +17,6 @@ public sealed class TenantOrganisationConfiguration : IEntityTypeConfiguration<T
         builder.ToTable(nameof(TenantOrganisation).Pluralize());
 
         builder.HasKey(pk => pk.Id);
-        builder.HasIndex(to => new { to.TenantId, to.OrganisationId }).IsUnique();
-
         builder.Property(f => f.CreatedAt).IsRequired().HasDefaultValueSql("now()");
         builder.Property(f => f.CreatedBy).IsRequired();
         builder.Property(f => f.TenantId).IsRequired();

PostFundManagement.Domain/Entities/TenantUser.cs

@@ -1,5 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<TenantUserConfiguration, TenantUser>]
 public class TenantUser : Models.TenantUser
 {
     public virtual Tenant? Tenant { get; set; }
@@ -17,9 +18,7 @@ public sealed class TenantUserConfiguration : IEntityTypeConfiguration<TenantUse
     {
         builder.ToTable(nameof(TenantUser).Pluralize());
 
-        builder.HasKey(pk => pk.Id);
-        builder.HasIndex(tu => new { tu.TenantId, tu.UserId }).IsUnique();
-
+        builder.HasKey(pk => pk.Id);        
         builder.Property(f => f.CreatedAt).IsRequired().HasDefaultValueSql("now()");
         builder.Property(f => f.CreatedBy).IsRequired();
         builder.Property(f => f.UserId).IsRequired();

PostFundManagement.Domain/Entities/User.cs

@@ -2,6 +2,7 @@ using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 
+[EntityTypeConfiguration<UserConfiguration, User>]
 public sealed class User : Models.User;
 
 public sealed class UserConfiguration : IEntityTypeConfiguration<User>