Skip to content
Closed
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
3 changes: 3 additions & 0 deletions src/Analysim.Core/Entities/Project.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ public class Project

public ICollection<Notebook> Notebooks {get;set;} = new List<Notebook>();

// Comments
public ICollection<ProjectComment> ProjectComments { get; set; } = new List<ProjectComment>();


public int ForkedFromProjectID { get; set; }
}
Expand Down
47 changes: 47 additions & 0 deletions src/Analysim.Core/Entities/ProjectComment.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

namespace Core.Entities
{
public class ProjectComment
{
// PK
[KeyAttribute]
public int CommentID { get; set; }

// Comment Author
[ForeignKey("User")]
public int UserID { get; set; }
public User User { get; set; } = null!;

// Project comment is linked to
[ForeignKey("Project")]
public int ProjectID { get; set; }
public Project Project{ get; set; } = null!;

// Is this comment a reply?
[ForeignKey("ParentComment")]
public int? ParentCommentID { get; set; }
public ProjectComment? ParentComment { get; set; }

Check warning on line 27 in src/Analysim.Core/Entities/ProjectComment.cs

View workflow job for this annotation

GitHub Actions / backend-smoke-test

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 27 in src/Analysim.Core/Entities/ProjectComment.cs

View workflow job for this annotation

GitHub Actions / backend-smoke-test

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

// Comment content
public string Content { get; set; } = string.Empty;

// Soft Delete
public bool IsDeleted { get; set; }

// Pending Review
public bool IsPendingReview { get; set; }

// Timestamps
public DateTime CreatedAt { get; set; }
public DateTime UpdatedAt { get; set; }

// Replies to this comment
public ICollection<ProjectComment> Replies { get; set; } = new List<ProjectComment>();
public ICollection<ProjectCommentLike> CommentLikes { get; set; } = new List<ProjectCommentLike>();
public ICollection<ProjectCommentFlag> CommentFlags { get; set; } = new List<ProjectCommentFlag>();
}
}
30 changes: 30 additions & 0 deletions src/Analysim.Core/Entities/ProjectCommentFlag.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

namespace Core.Entities
{
public class ProjectCommentFlag
{
// PK
[KeyAttribute]
public int FlagID { get; set; }

// Comment
[ForeignKey("ProjectComment")]
public int CommentID { get; set; }
public ProjectComment ProjectComment { get; set; } = null!;

// Flagger
[ForeignKey("User")]
public int UserID { get; set; }
public User User { get; set; } = null!;

// Snapshot comment content
public string CommentContentSnapshot { get; set; } = null!;

// Timestamp
public DateTime CreatedAt { get; set; }
}
}
23 changes: 23 additions & 0 deletions src/Analysim.Core/Entities/ProjectCommentLike.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

namespace Core.Entities
{
public class ProjectCommentLike
{
// Comment
[ForeignKey("ProjectComment")]
public int CommentID { get; set; }
public ProjectComment ProjectComment { get; set; } = null!;

// Liker
[ForeignKey("User")]
public int UserID { get; set; }
public User User { get; set; } = null!;

// Timestamp
public DateTime CreatedAt { get; set; }
}
}
5 changes: 5 additions & 0 deletions src/Analysim.Core/Entities/User.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ public class User : IdentityUser<int>
public ICollection<UserUser> Following { get; } = new List<UserUser>();
public ICollection<ProjectUser> ProjectUsers { get; } = new List<ProjectUser>();
public ICollection<BlobFile> BlobFiles { get; } = new List<BlobFile>();

// Comments
public ICollection<ProjectComment> ProjectComments { get; set; } = new List<ProjectComment>();
public ICollection<ProjectCommentLike> CommentLikes { get; set; } = new List<ProjectCommentLike>();
public ICollection<ProjectCommentFlag> CommentFlags { get; set; } = new List<ProjectCommentFlag>();

public string RegistrationSurvey {get; set;}

Expand Down
98 changes: 86 additions & 12 deletions src/Analysim.Infrastructure/Data/ApplicationDbContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class ApplicationDbContext : IdentityDbContext<User, IdentityRole<int>, i
{
public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options)
{

}

protected override void OnModelCreating(ModelBuilder modelBuilder)
Expand Down Expand Up @@ -96,35 +96,109 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
.OnDelete(DeleteBehavior.Cascade);

modelBuilder.Entity<IdentityRole<int>>().HasData(
new IdentityRole<int> { Id = 1, Name = "Admin", NormalizedName = "ADMIN"},
new IdentityRole<int> { Id = 1, Name = "Admin", NormalizedName = "ADMIN" },
new IdentityRole<int> { Id = 2, Name = "Customer", NormalizedName = "CUSTOMER" },
new IdentityRole<int> { Id = 3, Name = "Moderator", NormalizedName = "MODERATOR" }
);

// Many To One Relationship ( ObservableNotebookDataset -> Notebook)
modelBuilder.Entity<ObservableNotebookDataset>()
.HasOne(d=>d.notebook)
.WithMany(n=>n.observableNotebookDatasets)
.HasForeignKey(d=>d.NotebookID)
.HasOne(d => d.notebook)
.WithMany(n => n.observableNotebookDatasets)
.HasForeignKey(d => d.NotebookID)
.OnDelete(DeleteBehavior.Cascade);

#region Project Comments

// One To Many Relationship (Project -> ProjectComment)
modelBuilder.Entity<Project>()
.HasMany(p => p.ProjectComments)
.WithOne(pc => pc.Project)
.HasForeignKey(pc => pc.ProjectID)
.OnDelete(DeleteBehavior.Cascade);

// One To Many Relationship (User -> ProjectComment)
modelBuilder.Entity<User>()
.HasMany(u => u.ProjectComments)
.WithOne(pc => pc.User)
.HasForeignKey(pc => pc.UserID)
.OnDelete(DeleteBehavior.Restrict);

// Self Reference Relationship (ProjectComment -> Replies)
modelBuilder.Entity<ProjectComment>()
.HasOne(pc => pc.ParentComment)
.WithMany(pc => pc.Replies)
.HasForeignKey(pc => pc.ParentCommentID)
.OnDelete(DeleteBehavior.Restrict);

// ProjectCommentLike composite key
modelBuilder.Entity<ProjectCommentLike>()
.HasKey(cl => new { cl.CommentID, cl.UserID });

// One To Many Relationship (ProjectComment -> ProjectCommentLike)
modelBuilder.Entity<ProjectCommentLike>()
.HasOne(cl => cl.ProjectComment)
.WithMany(pc => pc.CommentLikes)
.HasForeignKey(cl => cl.CommentID)
.OnDelete(DeleteBehavior.Cascade);

// One To Many Relationship (User -> ProjectCommentLike)
modelBuilder.Entity<ProjectCommentLike>()
.HasOne(cl => cl.User)
.WithMany(u => u.CommentLikes)
.HasForeignKey(cl => cl.UserID)
.OnDelete(DeleteBehavior.Cascade);

// One To Many Relationship (ProjectComment -> ProjectCommentFlag)
modelBuilder.Entity<ProjectCommentFlag>()
.HasOne(cf => cf.ProjectComment)
.WithMany(pc => pc.CommentFlags)
.HasForeignKey(cf => cf.CommentID)
.OnDelete(DeleteBehavior.Cascade);

// One To Many Relationship (User -> ProjectCommentFlag)
modelBuilder.Entity<ProjectCommentFlag>()
.HasOne(cf => cf.User)
.WithMany(u => u.CommentFlags)
.HasForeignKey(cf => cf.UserID)
.OnDelete(DeleteBehavior.Cascade);

// Unique flag per user per comment
modelBuilder.Entity<ProjectCommentFlag>()
.HasIndex(cf => new { cf.CommentID, cf.UserID })
.IsUnique();

// Indexes for common lookups
modelBuilder.Entity<ProjectComment>()
.HasIndex(pc => pc.ProjectID);

modelBuilder.Entity<ProjectComment>()
.HasIndex(pc => pc.ParentCommentID);

modelBuilder.Entity<ProjectCommentLike>()
.HasIndex(cl => cl.UserID);

modelBuilder.Entity<ProjectCommentFlag>()
.HasIndex(cf => cf.UserID);

#endregion
}


public DbSet<Tag> Tag { get; set; }
public DbSet<BlobFile> BlobFiles { get; set; }
public DbSet<Project> Projects { get; set; }
public DbSet<ProjectUser> ProjectUsers { get; set; }
public DbSet<ProjectTag> ProjectTags { get; set; }
public DbSet<UserUser> UserUsers { get; set; }

public DbSet<Notebook> Notebook {get;set;}
public DbSet<ObservableNotebookDataset> ObservableNotebookDataset { get;set;}
public DbSet<Notebook> Notebook { get; set; }
public DbSet<ObservableNotebookDataset> ObservableNotebookDataset { get; set; }
public DbSet<NotebookContent> NotebookContent { get; set; }
public DbSet<BlobFileContent> BlobFileContent { get; set; }





public DbSet<ProjectComment> ProjectComments { get; set; }
public DbSet<ProjectCommentLike> ProjectCommentLikes { get; set; }
public DbSet<ProjectCommentFlag> ProjectCommentFlags { get; set; }
}
}
Loading
Loading