Merge pull request #83 from soft-eng-practicum/postgre-versioning

implemented notebook saving and versioning.

Author: cengique

src/Analysim.Core/Entities/Notebook.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Analysim.Core.Entities;
 using Core.Entities;
 
 namespace Core.Entities
@@ -49,6 +50,11 @@ public ICollection<ObservableNotebookDataset> observableNotebookDatasets
             get;set;
         }
 
+        public ICollection<NotebookContent> NotebookContents
+        {
+            get;set;
+        }
+
 
 
     }

src/Analysim.Core/Entities/NotebookContent.cs

@@ -0,0 +1,34 @@
+using Core.Entities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Analysim.Core.Entities
+{
+    public class NotebookContent
+    {
+        [Key, Column(Order = 1)]
+        [ForeignKey("Notebook")]
+        public int NotebookID { get; set; }
+        public Notebook Notebook { get; set; }
+
+        [Key, Column(Order = 2)]
+        public int Version { get; set; }
+
+        [Required(ErrorMessage = "Notebook Content is a required field.")]
+        public byte[] Content { get; set; }
+
+        [Required(ErrorMessage = "Notebook Author is a required field.")]
+        public string Author { get; set; }
+
+        [Required(ErrorMessage = "Notebook Size is a required field.")]
+        public int Size { get; set; }
+
+        [Required(ErrorMessage = "Notebook Date is a required field.")]
+        public DateTimeOffset DateCreated { get; set; }
+    }
+}

src/Analysim.Infrastructure/Data/ApplicationDbContext.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Core.Entities;
+using Analysim.Core.Entities;
 
 namespace Infrastructure.Data
 {
@@ -21,6 +22,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<ProjectUser>().HasKey(pu => new { pu.UserID, pu.ProjectID });
             modelBuilder.Entity<ProjectTag>().HasKey(pt => new { pt.ProjectID, pt.TagID });
             modelBuilder.Entity<UserUser>().HasKey(uu => new { uu.UserID, uu.FollowerID });
+            modelBuilder.Entity<NotebookContent>().HasKey(nc => new { nc.NotebookID, nc.Version });
 
             // Many To Many Relationship (ProjectUser -> User)
             modelBuilder.Entity<ProjectUser>()
@@ -77,12 +79,20 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                         .WithOne(p => p.Project)
                         .HasForeignKey(p => p.ProjectID);
 
+            // One To Many Relationship (Notebook -> NotebookContent)
+            modelBuilder.Entity<Notebook>()
+                        .HasMany(n => n.NotebookContents)
+                        .WithOne(n => n.Notebook)
+                        .HasForeignKey(n => n.NotebookID)
+                        .OnDelete(DeleteBehavior.Cascade);
+
             modelBuilder.Entity<IdentityRole<int>>().HasData(
                 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)
@@ -100,6 +110,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<Notebook> Notebook {get;set;}
         public DbSet<ObservableNotebookDataset> ObservableNotebookDataset { get;set;}
+        public DbSet<NotebookContent> NotebookContent { get; set; }
 
 
 

src/Analysim.Infrastructure/Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -22,6 +22,35 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
+            modelBuilder.Entity("Analysim.Core.Entities.NotebookContent", b =>
+                {
+                    b.Property<int>("NotebookID")
+                        .HasColumnType("integer")
+                        .HasColumnOrder(1);
+
+                    b.Property<int>("Version")
+                        .HasColumnType("integer")
+                        .HasColumnOrder(2);
+
+                    b.Property<string>("Author")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<byte[]>("Content")
+                        .IsRequired()
+                        .HasColumnType("bytea");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("Size")
+                        .HasColumnType("integer");
+
+                    b.HasKey("NotebookID", "Version");
+
+                    b.ToTable("NotebookContent");
+                });
+
             modelBuilder.Entity("Core.Entities.BlobFile", b =>
                 {
                     b.Property<int>("BlobFileID")
@@ -375,21 +404,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         new
                         {
                             Id = 1,
-                            ConcurrencyStamp = "54f675a4-9023-4eae-b3cb-5465a1fd9ad1",
+                            ConcurrencyStamp = "93ca655e-a94a-403a-a5e7-cf1db3905ccd",
                             Name = "Admin",
                             NormalizedName = "ADMIN"
                         },
                         new
                         {
                             Id = 2,
-                            ConcurrencyStamp = "546de497-8f57-423b-bc75-704996fad40a",
+                            ConcurrencyStamp = "0a6522d2-c24e-4969-8491-a2b3475b8678",
                             Name = "Customer",
                             NormalizedName = "CUSTOMER"
                         },
                         new
                         {
                             Id = 3,
-                            ConcurrencyStamp = "1b82e1d9-15ec-410f-9f54-fe0661fe72cb",
+                            ConcurrencyStamp = "2a2b0fb9-7f18-4cbc-9fcb-bb72c436400b",
                             Name = "Moderator",
                             NormalizedName = "MODERATOR"
                         });
@@ -498,6 +527,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("AspNetUserTokens", (string)null);
                 });
 
+            modelBuilder.Entity("Analysim.Core.Entities.NotebookContent", b =>
+                {
+                    b.HasOne("Core.Entities.Notebook", "Notebook")
+                        .WithMany("NotebookContents")
+                        .HasForeignKey("NotebookID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Notebook");
+                });
+
             modelBuilder.Entity("Core.Entities.BlobFile", b =>
                 {
                     b.HasOne("Core.Entities.Project", "Project")
@@ -645,6 +685,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Core.Entities.Notebook", b =>
                 {
+                    b.Navigation("NotebookContents");
+
                     b.Navigation("observableNotebookDatasets");
                 });