Skip to content
Open
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
42 changes: 42 additions & 0 deletions src/Analysim.Core/Entities/ProjectComment.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
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; } // ASK ABOUT THIS "Delete your own comments (but still leave the space for it)"

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

// Replies to this comment
public ICollection<ProjectComment> Replies { get; set; } = new List<ProjectComment>();
}
}
3 changes: 3 additions & 0 deletions src/Analysim.Core/Entities/User.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ 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 string RegistrationSurvey {get; set;}

Expand Down
35 changes: 31 additions & 4 deletions src/Analysim.Infrastructure/Data/ApplicationDbContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,36 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
.WithMany(n=>n.observableNotebookDatasets)
.HasForeignKey(d=>d.NotebookID)
.OnDelete(DeleteBehavior.Cascade);

// 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);

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

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


Expand All @@ -122,9 +152,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
public DbSet<NotebookContent> NotebookContent { get; set; }
public DbSet<BlobFileContent> BlobFileContent { get; set; }





public DbSet<ProjectComment> ProjectComments { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,46 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.ToTable("Projects");
});

modelBuilder.Entity("Core.Entities.ProjectComment", b =>
{
b.Property<int>("CommentID")
.ValueGeneratedOnAdd()
.HasColumnType("integer");

NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentID"));

b.Property<string>("Content")
.HasColumnType("text");

b.Property<DateTime>("CreatedAt")
.HasColumnType("timestamp with time zone");

b.Property<bool>("IsDeleted")
.HasColumnType("boolean");

b.Property<int?>("ParentCommentID")
.HasColumnType("integer");

b.Property<int>("ProjectID")
.HasColumnType("integer");

b.Property<DateTime>("UpdatedAt")
.HasColumnType("timestamp with time zone");

b.Property<int>("UserID")
.HasColumnType("integer");

b.HasKey("CommentID");

b.HasIndex("ParentCommentID");

b.HasIndex("ProjectID");

b.HasIndex("UserID");

b.ToTable("ProjectComments");
});

modelBuilder.Entity("Core.Entities.ProjectTag", b =>
{
b.Property<int>("ProjectID")
Expand Down Expand Up @@ -428,21 +468,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
new
{
Id = 1,
ConcurrencyStamp = "ebd0169f-30be-4ab7-9fb9-038a9de20efb",
ConcurrencyStamp = "fa79cb69-0854-4116-be7e-0cc32666a38c",
Name = "Admin",
NormalizedName = "ADMIN"
},
new
{
Id = 2,
ConcurrencyStamp = "371acb40-c941-4714-9c2c-bc9de9bff144",
ConcurrencyStamp = "c0e380b3-6959-457d-b623-72d23bd85ed1",
Name = "Customer",
NormalizedName = "CUSTOMER"
},
new
{
Id = 3,
ConcurrencyStamp = "7ee39326-5034-4323-85cc-6da801861458",
ConcurrencyStamp = "6c80828f-17ef-44b7-8820-bcc50e82e8f3",
Name = "Moderator",
NormalizedName = "MODERATOR"
});
Expand Down Expand Up @@ -612,6 +652,32 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Navigation("notebook");
});

modelBuilder.Entity("Core.Entities.ProjectComment", b =>
{
b.HasOne("Core.Entities.ProjectComment", "ParentComment")
.WithMany("Replies")
.HasForeignKey("ParentCommentID")
.OnDelete(DeleteBehavior.Restrict);

b.HasOne("Core.Entities.Project", "Project")
.WithMany("ProjectComments")
.HasForeignKey("ProjectID")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();

b.HasOne("Core.Entities.User", "User")
.WithMany("ProjectComments")
.HasForeignKey("UserID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();

b.Navigation("ParentComment");

b.Navigation("Project");

b.Navigation("User");
});

modelBuilder.Entity("Core.Entities.ProjectTag", b =>
{
b.HasOne("Core.Entities.Project", "Project")
Expand Down Expand Up @@ -738,11 +804,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Navigation("Notebooks");

b.Navigation("ProjectComments");

b.Navigation("ProjectTags");

b.Navigation("ProjectUsers");
});

modelBuilder.Entity("Core.Entities.ProjectComment", b =>
{
b.Navigation("Replies");
});

modelBuilder.Entity("Core.Entities.Tag", b =>
{
b.Navigation("ProjectTags");
Expand All @@ -756,6 +829,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Navigation("Following");

b.Navigation("ProjectComments");

b.Navigation("ProjectUsers");
});
#pragma warning restore 612, 618
Expand Down
Loading
Loading