Invariant state protection

src/Core.Application/Actor/CreateActorCommand.cs

@@ -23,7 +23,7 @@ public async Task<ActorDto> Handle(CreateActorCommand request, CancellationToken
         GuardAgainstEmptyOwnerId(request?.OwnerId);
         GuardAgainstIdExists(_context.Actors, request!.Id);
 
-        var Actor = ActorEntity.Create(request!.Id == Guid.Empty ? Guid.NewGuid() : request!.Id, request.FirstName, request.LastName, request.Email);
+        var Actor = ActorEntity.Create(request!.Id == Guid.Empty ? Guid.NewGuid() : request!.Id, request.FirstName, request.LastName, request.Email, request.OwnerId, request.TenantId);
         _context.Actors.Add(Actor);
         try
         {

src/Core.Application/Actor/SaveMyActorCommand.cs

@@ -9,7 +9,6 @@ public class SaveMyActorCommand : IRequest<ActorDto>, IRequiresUserContext
     public string? FirstName { get; set; }
     public string? LastName { get; set; }
     public string? Email { get; set; }
-    public Guid TenantId { get; set; }
     public IUserContext? UserContext { get; set; }
 }
 
@@ -19,17 +18,17 @@ public class SaveActorCommandHandler(IAgentFrameworkContext context) : IRequestH
 
     public async Task<ActorDto> Handle(SaveMyActorCommand request, CancellationToken cancellationToken)
     {
-        GuardAgainstEmptyTenantId(request?.TenantId);
+        GuardAgainstInvalidUserContext(request?.UserContext);
 
-        var actor = await _context.Actors.Where(x => x.OwnerId == request!.UserContext!.OwnerId && x.TenantId == request.TenantId).FirstOrDefaultAsync(cancellationToken);
+        var actor = await _context.Actors.Where(x => x.OwnerId == request!.UserContext!.OwnerId && x.TenantId == request.UserContext.TenantId).FirstOrDefaultAsync(cancellationToken);
         if (actor is not null)
         {
             actor.Update(request?.FirstName, request?.LastName ?? actor.LastName, request?.Email);
             _context.Actors.Update(actor!);
         }
         else
         {
-            actor = ActorEntity.Create(Guid.NewGuid(), request?.FirstName, request?.LastName, request?.Email);
+            actor = ActorEntity.Create(Guid.NewGuid(), request?.FirstName, request?.LastName, request?.Email, request!.UserContext!.OwnerId, request.UserContext.TenantId);
             _context.Actors.Add(actor);
         }
 
@@ -38,6 +37,21 @@ public async Task<ActorDto> Handle(SaveMyActorCommand request, CancellationToken
         return ActorDto.CreateFrom(actor);
     }
 
+    private static void GuardAgainstInvalidUserContext(IUserContext? userContext)
+    {
+        if (userContext is null)
+            throw new CustomValidationException(
+            [
+                new("UserContext", "UserContext is required to save an actor")
+            ]);
+
+        if (userContext.OwnerId == Guid.Empty)
+            throw new CustomValidationException(
+            [
+                new("OwnerId", "A valid OwnerId is required in UserContext to save an actor")
+            ]);
+    }
+
     private static void GuardAgainstEmptyTenantId(Guid? tenantId)
     {
         if (tenantId == Guid.Empty)

src/Core.Application/Actor/SaveMyActorCommandValidator.cs

@@ -5,6 +5,6 @@ public class SaveMyActorCommandValidator : Validator<SaveMyActorCommand>
     public SaveMyActorCommandValidator()
     {
         RuleFor(x => x.UserContext).NotEmpty();
-        RuleFor(x => x.TenantId).NotEmpty();
+        RuleFor(x => x.UserContext!.TenantId).NotEmpty();
     }
 }

src/Core.Application/ChatCompletion/CreateMyChatMessageCommand.cs

@@ -48,7 +48,9 @@ public async Task<ChatMessageDto> Handle(CreateMyChatMessageCommand request, Can
             request.Id,
             chatSession.Id,
             ChatMessageRole.user,
-            request.Message!
+            request.Message!,
+            request!.UserContext!.OwnerId,
+            request.UserContext.TenantId
         );
         chatSession.Messages.Add(chatMessage);
         _context.ChatMessages.Add(chatMessage);
@@ -59,7 +61,9 @@ public async Task<ChatMessageDto> Handle(CreateMyChatMessageCommand request, Can
             Guid.NewGuid(),
             chatSession.Id,
             ChatMessageRole.assistant,
-            agentReply
+            agentReply,
+            request!.UserContext!.OwnerId,
+            request.UserContext.TenantId
         );
         chatSession.Messages.Add(chatMessageResponse);
         _context.ChatMessages.Add(chatMessageResponse);

src/Core.Application/ChatCompletion/CreateMyChatSessionCommand.cs

@@ -3,9 +3,7 @@
 using Goodtocode.AgentFramework.Core.Domain.Actor;
 using Goodtocode.AgentFramework.Core.Domain.Auth;
 using Goodtocode.AgentFramework.Core.Domain.ChatCompletion;
-using Goodtocode.Domain.Entities;
 using Microsoft.Agents.AI;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.AI;
 
 namespace Goodtocode.AgentFramework.Core.Application.ChatCompletion;
@@ -39,7 +37,9 @@ public async Task<ChatSessionDto> Handle(CreateMyChatSessionCommand request, Can
                 Guid.NewGuid(),
                 request?.UserContext?.FirstName,
                 request?.UserContext?.LastName,
-                request?.UserContext?.Email
+                request?.UserContext?.Email,
+                request!.UserContext!.OwnerId,
+                request.UserContext.TenantId
             );
             _context.Actors.Add(actor);
             await _context.SaveChangesAsync(cancellationToken);
@@ -62,7 +62,9 @@ public async Task<ChatSessionDto> Handle(CreateMyChatSessionCommand request, Can
             title,
             Enum.TryParse<ChatMessageRole>(response!.Role.ToString().ToLowerInvariant(), out var role) ? role : ChatMessageRole.assistant,
             request.Message!,
-            response.ToString()
+            response.ToString(),
+            request!.UserContext!.OwnerId,
+            request.UserContext.TenantId
         );
         _context.ChatSessions.Add(chatSession);
         await _context.SaveChangesAsync(cancellationToken);

src/Core.Application/Core.Application.csproj

@@ -10,10 +10,10 @@
 		<Nullable>enable</Nullable>		
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Goodtocode.Mediator" Version="1.1.9" />
-		<PackageReference Include="Goodtocode.Validation" Version="1.1.14" />
+		<PackageReference Include="Goodtocode.Mediator" Version="1.1.13" />
+		<PackageReference Include="Goodtocode.Validation" Version="1.1.29" />
 		<PackageReference Include="Microsoft.Agents.AI.Abstractions" Version="1.0.0-preview.260128.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.2" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Core.Domain\Core.Domain.csproj" />

src/Core.Domain/Actor/ActorEntity.cs

@@ -5,34 +5,33 @@ namespace Goodtocode.AgentFramework.Core.Domain.Actor;
 
 public class ActorEntity : SecuredEntity<ActorEntity>
 {
-    protected ActorEntity() { }
-
+    protected ActorEntity() : base(Guid.Empty, Guid.Empty, Guid.Empty) {    }
     public string? FirstName { get; private set; } = string.Empty;
     public string? LastName { get; private set; } = string.Empty;
     public string? Email { get; private set; } = string.Empty;
 
-    public static ActorEntity Create(Guid id, string? firstName, string? lastName, string? email)
+    public static ActorEntity Create(Guid id, string? firstName, string? lastName, string? email, Guid ownerId, Guid tenantId)
+    {
+        return new ActorEntity(id, firstName, lastName, email, ownerId, tenantId);
+    }
+
+    private ActorEntity(Guid id, string? firstName, string? lastName, string? email, Guid ownerId, Guid tenantId) : base(id, ownerId, tenantId)
     {
-        return new ActorEntity
-        {
-            Id = id == Guid.Empty ? Guid.NewGuid() : id,
-            FirstName = firstName,
-            LastName = lastName,
-            Email = email
-        };
+        FirstName = firstName;
+        LastName = lastName;
+        Email = email;
     }
 
     public static ActorEntity Create(IUserContext userInfo)
     {
-        return new ActorEntity
-        {
-            Id = Guid.NewGuid(),
-            OwnerId = userInfo.OwnerId,
-            TenantId = userInfo.TenantId,
-            FirstName = userInfo.FirstName,
-            LastName = userInfo.LastName,
-            Email = userInfo.Email
-        };
+        return new ActorEntity(
+            Guid.NewGuid(),
+            userInfo.FirstName,
+            userInfo.LastName,
+            userInfo.Email,
+            userInfo.OwnerId,
+            userInfo.TenantId
+        );
     }
 
     public void Update(string? firstName, string? lastName, string? email)

src/Core.Domain/ChatCompletion/ChatMessageEntity.cs

@@ -4,20 +4,19 @@ namespace Goodtocode.AgentFramework.Core.Domain.ChatCompletion;
 
 public class ChatMessageEntity : SecuredEntity<ChatMessageEntity>, IDomainEntity<ChatMessageEntity>
 {
-    protected ChatMessageEntity() { }
+    protected ChatMessageEntity() : base(Guid.Empty, Guid.Empty, Guid.Empty) { }
+    private ChatMessageEntity(Guid id, Guid ownerId, Guid tenantId) : base(id, ownerId, tenantId) { }
     public Guid ChatSessionId { get; private set; }
     public ChatMessageRole Role { get; private set; }
     public string Content { get; private set; } = string.Empty;
     public virtual ChatSessionEntity? ChatSession { get; private set; }
-    public static ChatMessageEntity Create(Guid id, Guid chatSessionId, ChatMessageRole role, string content)
+    public static ChatMessageEntity Create(Guid id, Guid chatSessionId, ChatMessageRole role, string content, Guid ownerId, Guid tenantId)
     {
-        return new ChatMessageEntity
+        return new ChatMessageEntity(id, ownerId, tenantId)
         {
-            Id = id == Guid.Empty ? Guid.NewGuid() : id,
             ChatSessionId = chatSessionId,
             Role = role,
-            Content = content,
-            Timestamp = DateTime.UtcNow
+            Content = content
         };
     }
 }

src/Core.Domain/ChatCompletion/ChatSessionEntity.cs

@@ -5,23 +5,22 @@ namespace Goodtocode.AgentFramework.Core.Domain.ChatCompletion;
 
 public class ChatSessionEntity : SecuredEntity<ChatSessionEntity>
 {
-    protected ChatSessionEntity() { }
+    protected ChatSessionEntity() : base(Guid.Empty, Guid.Empty, Guid.Empty) { }
+    private ChatSessionEntity(Guid id, Guid ownerId, Guid tenantId) : base(id, ownerId, tenantId) { }
 
     public Guid ActorId { get; private set; }
     public string? Title { get; private set; } = string.Empty;
     public virtual ICollection<ChatMessageEntity> Messages { get; private set; } = [];
 
-    public static ChatSessionEntity Create(Guid id, Guid actorId, string? title, ChatMessageRole responseRole, string initialMessage, string responseMessage)
+    public static ChatSessionEntity Create(Guid id, Guid actorId, string? title, ChatMessageRole responseRole, string initialMessage, string responseMessage, Guid ownerId, Guid tenantId)
     {
-        var session = new ChatSessionEntity
+        var session = new ChatSessionEntity(id, ownerId, tenantId)
         {
-            Id = id == Guid.Empty ? Guid.NewGuid() : id,
             ActorId = actorId,
             Title = title,
-            Timestamp = DateTime.UtcNow
         };
-        session.Messages.Add(ChatMessageEntity.Create(Guid.NewGuid(), session.Id, ChatMessageRole.user, initialMessage));
-        session.Messages.Add(ChatMessageEntity.Create(Guid.NewGuid(), session.Id, responseRole, responseMessage));
+        session.Messages.Add(ChatMessageEntity.Create(Guid.NewGuid(), session.Id, ChatMessageRole.user, initialMessage, ownerId, tenantId));
+        session.Messages.Add(ChatMessageEntity.Create(Guid.NewGuid(), session.Id, responseRole, responseMessage, ownerId, tenantId));
         return session;
     }
 

src/Core.Domain/Core.Domain.csproj

@@ -12,6 +12,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="CSharpFunctionalExtensions" Version="3.6.0" />
-		<PackageReference Include="Goodtocode.Domain" Version="1.1.8" />
+		<PackageReference Include="Goodtocode.Domain" Version="1.1.20" />
 	</ItemGroup>
 </Project>

src/Infrastructure.AgentFramework/Infrastructure.AgentFramework.csproj

@@ -12,11 +12,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="Azure.AI.OpenAI" Version="2.8.0-beta.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.2" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.2" />
-		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.2" />
-		<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.2" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.3" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.3" />
+		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.3" />
+		<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.3" />
 		<PackageReference Include="Microsoft.Agents.AI" Version="1.0.0-preview.260128.1" />
 		<PackageReference Include="Microsoft.Agents.AI.OpenAI" Version="1.0.0-preview.260128.1" />
 	</ItemGroup>

src/Infrastructure.SqlServer/Infrastructure.SqlServer.csproj

@@ -10,13 +10,16 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.2" />		
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.2" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.2" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.2" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.2" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
+		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.3" />		
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.3" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
 		<PackageReference Include="System.ServiceModel.Primitives" Version="10.0.652802" />
 	</ItemGroup>