Merge branch 'PromptOperations'

Aquilatery · Dec 1, 2024 · 32500b7 · 32500b7
2 parents 21b3d17 + 389f483
commit 32500b7
Show file tree

Hide file tree

Showing 30 changed files with 737 additions and 442 deletions.
diff --git a/src/AkilliPrompt.Domain/Entities/Prompt.cs b/src/AkilliPrompt.Domain/Entities/Prompt.cs
@@ -20,17 +20,19 @@ public sealed class Prompt : EntityBase
     public ICollection<UserFavoritePrompt> UserFavoritePrompts { get; set; } = [];
     public ICollection<UserLikePrompt> UserLikePrompts { get; set; } = [];
     public ICollection<Placeholder> Placeholders { get; set; } = [];
+    public ICollection<PromptComment> PromptComments { get; set; } = [];
 
 
-    public static Prompt Create(string title, string description, string content, bool isActive)
+    public static Prompt Create(string title, string description, string content, bool isActive, Guid creatorId)
     {
         return new Prompt
         {
             Id = Guid.CreateVersion7(),
             Title = title,
             Description = description,
             Content = content,
-            IsActive = isActive
+            IsActive = isActive,
+            CreatorId = creatorId
         };
     }
 

diff --git a/...ompt.Domain/Entities/UserPromptComment.cs → ...liPrompt.Domain/Entities/PromptComment.cs b/...ompt.Domain/Entities/UserPromptComment.cs → ...liPrompt.Domain/Entities/PromptComment.cs
@@ -1,10 +1,9 @@
-using System;
 using AkilliPrompt.Domain.Common;
 using AkilliPrompt.Domain.Identity;
 
 namespace AkilliPrompt.Domain.Entities;
 
-public sealed class UserPromptComment : EntityBase
+public sealed class PromptComment : EntityBase
 {
     public int Level { get; set; }
     public string Content { get; set; }
@@ -16,7 +15,7 @@ public sealed class UserPromptComment : EntityBase
     public ApplicationUser User { get; set; }
 
     public Guid? ParentCommentId { get; set; }
-    public UserPromptComment ParentComment { get; set; }
+    public PromptComment ParentComment { get; set; }
 
-    public ICollection<UserPromptComment> ChildComments { get; set; } = [];
+    public ICollection<PromptComment> ChildComments { get; set; } = [];
 }
diff --git a/src/AkilliPrompt.Domain/Identity/ApplicationUser.cs b/src/AkilliPrompt.Domain/Identity/ApplicationUser.cs
@@ -16,7 +16,7 @@ public sealed class ApplicationUser : IdentityUser<Guid>, ICreatedByEntity, IMod
     public DateTimeOffset? ModifiedAt { get; set; }
 
     public ICollection<UserSocialMediaAccount> UserSocialMediaAccounts { get; set; } = [];
-    public ICollection<UserPromptComment> UserPromptComments { get; set; } = [];
+    public ICollection<PromptComment> PromptComments { get; set; } = [];
     public ICollection<UserFavoritePrompt> UserFavoritePrompts { get; set; } = [];
     public ICollection<UserLikePrompt> UserLikePrompts { get; set; } = [];
     public ICollection<Prompt> CreatedPrompts { get; set; } = [];

diff --git a/src/AkilliPrompt.Persistence/AkilliPrompt.Persistence.csproj b/src/AkilliPrompt.Persistence/AkilliPrompt.Persistence.csproj
@@ -20,8 +20,4 @@
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="EntityFramework\Configurations\" />
-  </ItemGroup>
-
 </Project>
diff --git a/...rations/UserPromptCommentConfiguration.cs → ...figurations/PromptCommentConfiguration.cs b/...rations/UserPromptCommentConfiguration.cs → ...figurations/PromptCommentConfiguration.cs
@@ -4,9 +4,9 @@
 
 namespace AkilliPrompt.Persistence.EntityFramework.Configurations;
 
-public sealed class UserPromptCommentConfiguration : IEntityTypeConfiguration<UserPromptComment>
+public sealed class UserPromptCommentConfiguration : IEntityTypeConfiguration<PromptComment>
 {
-    public void Configure(EntityTypeBuilder<UserPromptComment> builder)
+    public void Configure(EntityTypeBuilder<PromptComment> builder)
     {
         // Id
         builder.HasKey(x => x.Id);
@@ -24,7 +24,7 @@ public void Configure(EntityTypeBuilder<UserPromptComment> builder)
 
         // User Relationship
         builder.HasOne(x => x.User)
-            .WithMany(u => u.UserPromptComments)
+            .WithMany(u => u.PromptComments)
             .HasForeignKey(x => x.UserId);
 
         // Parent Comment Relationship

diff --git a/src/AkilliPrompt.Persistence/EntityFramework/Configurations/PromptConfiguration.cs b/src/AkilliPrompt.Persistence/EntityFramework/Configurations/PromptConfiguration.cs
@@ -66,6 +66,11 @@ public void Configure(EntityTypeBuilder<Prompt> builder)
             .WithOne(p => p.Prompt)
             .HasForeignKey(p => p.PromptId);
 
+        // PromptComments Relationship
+        builder.HasMany<PromptComment>(x => x.PromptComments)
+            .WithOne(y => y.Prompt)
+            .HasForeignKey(y => y.PromptId);
+
 
         // CreatedAt
         builder.Property(p => p.CreatedAt)

diff --git a/src/AkilliPrompt.Persistence/EntityFramework/Contexts/ApplicationDbContext.cs b/src/AkilliPrompt.Persistence/EntityFramework/Contexts/ApplicationDbContext.cs
@@ -19,7 +19,7 @@ public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
     public DbSet<Prompt> Prompts { get; set; }
     public DbSet<PromptCategory> PromptCategories { get; set; }
     public DbSet<UserSocialMediaAccount> UserSocialMediaAccounts { get; set; }
-    public DbSet<UserPromptComment> UserPromptComments { get; set; }
+    public DbSet<PromptComment> PromptComments { get; set; }
     public DbSet<UserFavoritePrompt> UserFavoritePrompts { get; set; }
     public DbSet<UserLikePrompt> UserLikePrompts { get; set; }
     public DbSet<RefreshToken> RefreshTokens { get; set; }

diff --git a/src/AkilliPrompt.Persistence/EntityFramework/Interceptors/EntityInterceptor.cs b/src/AkilliPrompt.Persistence/EntityFramework/Interceptors/EntityInterceptor.cs
@@ -43,13 +43,13 @@ private void UpdateEntities(DbContext? context)
 
                     if (entry.State == EntityState.Added)
                     {
-                        entry.Entity.CreatedByUserId = _currentUserService.UserId?.ToString();
+                        entry.Entity.CreatedByUserId = _currentUserService.UserId == Guid.Empty ? null : _currentUserService.UserId.ToString();
                         entry.Entity.CreatedAt = utcNow;
                     }
 
                     if (entry.State == EntityState.Modified)
                     {
-                        entry.Entity.ModifiedByUserId = _currentUserService.UserId?.ToString();
+                        entry.Entity.ModifiedByUserId = _currentUserService.UserId == Guid.Empty ? null : _currentUserService.UserId.ToString();
                         entry.Entity.ModifiedAt = utcNow;
                     }
                 }