Merge branch 'dev' of github.com:Team-Kaleidoscope/DevHive into dev

3 files changed, 7 insertions, 9 deletions

diff --git a/src/DevHive.Data/Models/Post.cs b/src/DevHive.Data/Models/Post.cs
index 8fb3e91..3f3d8c9 100644
--- a/src/DevHive.Data/Models/Post.cs
+++ b/src/DevHive.Data/Models/Post.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using DevHive.Data.Interfaces.Models;
+using DevHive.Data.RelationModels;
 
 namespace DevHive.Data.Models
 {
@@ -18,9 +19,8 @@ namespace DevHive.Data.Models
 
 		public List<Comment> Comments { get; set; } = new();
 
-		// public Guid RatingId { get; set; }
-		// public Rating Rating { get; set; } = new();
+		public Rating Rating { get; set; } = new();
 
-		public List<string> FileUrls { get; set; } = new();
+		public List<PostAttachments> Attachments { get; set; } = new();
 	}
 }
diff --git a/src/DevHive.Data/Models/Rating.cs b/src/DevHive.Data/Models/Rating.cs
index d07692d..e1bedd2 100644
--- a/src/DevHive.Data/Models/Rating.cs
+++ b/src/DevHive.Data/Models/Rating.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using DevHive.Data.Interfaces.Models;
-using DevHive.Data.RelationModels;
 
 namespace DevHive.Data.Models
 {
@@ -9,11 +8,10 @@ namespace DevHive.Data.Models
 	{
 		public Guid Id { get; set; }
 
-		// public Guid PostId { get; set; }
-		// public Post Post { get; set; }
+		public Guid PostId { get; set; }
 
+		public Post Post { get; set; }
+		
 		public int Rate { get; set; }
-
-		// public HashSet<User> UsersThatRated { get; set; } = new();
 	}
 }
diff --git a/src/DevHive.Data/Models/User.cs b/src/DevHive.Data/Models/User.cs
index d73f989..f666677 100644
--- a/src/DevHive.Data/Models/User.cs
+++ b/src/DevHive.Data/Models/User.cs
@@ -30,6 +30,6 @@ namespace DevHive.Data.Models
 
 		public HashSet<Comment> Comments { get; set; } = new();
 
-		// public HashSet<RatedPost> RatedPosts { get; set; } = new();
+		public HashSet<RatedPost> RatedPosts { get; set; } = new();
 	}
 }