Fixed Comment Models&Mappings

9 files changed, 60 insertions, 19 deletions

diff --git a/src/DevHive.Data/Interfaces/Models/IComment.cs b/src/DevHive.Data/Interfaces/Models/IComment.cs
index f6afb3f..6368e3b 100644
--- a/src/DevHive.Data/Interfaces/Models/IComment.cs
+++ b/src/DevHive.Data/Interfaces/Models/IComment.cs
@@ -4,8 +4,12 @@ namespace DevHive.Data.Interfaces.Models
 {
 	public interface IComment : IModel
 	{
+		Guid PostId { get; set; }
+
 		Guid IssuerId { get; set; }
+
 		string Message { get; set; }
+
 		DateTime TimeCreated { get; set; }
 	}
 }
diff --git a/src/DevHive.Services/Configurations/Mapping/CommentMappings.cs b/src/DevHive.Services/Configurations/Mapping/CommentMappings.cs
index f903128..46404da 100644
--- a/src/DevHive.Services/Configurations/Mapping/CommentMappings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/CommentMappings.cs
@@ -1,7 +1,6 @@
 using DevHive.Data.Models;
 using AutoMapper;
 using DevHive.Services.Models.Post.Comment;
-using DevHive.Common.Models.Misc;
 
 namespace DevHive.Services.Configurations.Mapping
 {
@@ -9,11 +8,14 @@ namespace DevHive.Services.Configurations.Mapping
 	{
 		public CommentMappings()
 		{
-			CreateMap<CommentServiceModel, Comment>();
-			CreateMap<Comment, CommentServiceModel>();
-			CreateMap<UpdateCommentServiceModel, Comment>();
-			CreateMap<IdModel, Comment>();
-			CreateMap<Comment, IdModel>();
+			CreateMap<CreateCommentServiceModel, Comment>()
+				.ForMember(src => src.Id, dest => dest.Ignore());
+			CreateMap<UpdateCommentServiceModel, Comment>()
+				.ForMember(src => src.Id, dest => dest.MapFrom(p => p.CommentId));
+
+			CreateMap<Comment, ReadCommentServiceModel>();
+			CreateMap<Comment, UpdateCommentServiceModel>()
+				.ForMember(src => src.CommentId, dest => dest.MapFrom(p => p.Id));
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/DevHive.Services/Models/Post/Comment/CreateCommentServiceModel.cs b/src/DevHive.Services/Models/Post/Comment/CreateCommentServiceModel.cs
index 7c00b8f..4dfd848 100644
--- a/src/DevHive.Services/Models/Post/Comment/CreateCommentServiceModel.cs
+++ b/src/DevHive.Services/Models/Post/Comment/CreateCommentServiceModel.cs
@@ -2,7 +2,14 @@ using System;
 
 namespace DevHive.Services.Models.Post.Comment
 {
-	public class CreateCommentServiceModel : BaseCommentServiceModel
+	public class CreateCommentServiceModel
 	{
+		public Guid PostId { get; set; }
+
+		public Guid IssuerId { get; set; }
+
+		public string Message { get; set; }
+
+		public DateTime TimeCreated { get; set; }
 	}
 }
diff --git a/src/DevHive.Services/Models/Post/Comment/ReadCommentServiceModel.cs b/src/DevHive.Services/Models/Post/Comment/ReadCommentServiceModel.cs
index ad68b58..c6ff612 100644
--- a/src/DevHive.Services/Models/Post/Comment/ReadCommentServiceModel.cs
+++ b/src/DevHive.Services/Models/Post/Comment/ReadCommentServiceModel.cs
@@ -1,11 +1,17 @@
+using System;
+
 namespace DevHive.Services.Models.Post.Comment
 {
-	public class ReadCommentServiceModel : BaseCommentServiceModel
+	public class ReadCommentServiceModel
 	{
-		public string IssuerFirstName { get; set; }
+		public Guid CommentId { get; set; }
+
+		public Guid IssuerId { get; set; }
+
+		public Guid PostId { get; set; }
 
-		public string IssuerLastName { get; set; }
+		public string Message { get; set; }
 
-		public string IssuerUsername { get; set; }
+		public DateTime TimeCreated { get; set; }
 	}
 }
diff --git a/src/DevHive.Services/Models/Post/Comment/UpdateCommnetServiceModel.cs b/src/DevHive.Services/Models/Post/Comment/UpdateCommnetServiceModel.cs
index 424ea65..51cd739 100644
--- a/src/DevHive.Services/Models/Post/Comment/UpdateCommnetServiceModel.cs
+++ b/src/DevHive.Services/Models/Post/Comment/UpdateCommnetServiceModel.cs
@@ -2,8 +2,10 @@ using System;
 
 namespace DevHive.Services.Models.Post.Comment
 {
-	public class UpdateCommentServiceModel : BaseCommentServiceModel
+	public class UpdateCommentServiceModel
 	{
 		public Guid CommentId { get; set; }
+
+		public string NewMessage { get; set; }
 	}
 }
diff --git a/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs b/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs
index 5998e7a..296704e 100644
--- a/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs
@@ -8,10 +8,16 @@ namespace DevHive.Web.Configurations.Mapping
 	{
 		public CommentMappings()
 		{
-			CreateMap<CommentWebModel, CommentServiceModel>();
-			CreateMap<CommentWebModel, UpdateCommentServiceModel>();
-			CreateMap<CommentServiceModel, CommentWebModel>();
-			CreateMap<CommentWebModel, CommentServiceModel>();
+			CreateMap<CreateCommentWebModel, CreateCommentServiceModel>();
+			CreateMap<UpdateCommentWebModel, UpdateCommentServiceModel>();
+
+			CreateMap<ReadCommentServiceModel, ReadCommentWebModel>()
+				.ForMember(dest => dest.IssuerFirstName, src => src.Ignore())
+				.ForMember(dest => dest.IssuerLastName, src => src.Ignore())
+				.ForMember(dest => dest.IssuerUsername, src => src.Ignore());
 		}
 	}
 }
+
+
+
diff --git a/src/DevHive.Web/Models/Post/Comment/CreateCommentWebModel.cs b/src/DevHive.Web/Models/Post/Comment/CreateCommentWebModel.cs
index 3680727..85c67bf 100644
--- a/src/DevHive.Web/Models/Post/Comment/CreateCommentWebModel.cs
+++ b/src/DevHive.Web/Models/Post/Comment/CreateCommentWebModel.cs
@@ -1,6 +1,17 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
 namespace DevHive.Web.Models.Post.Comment
 {
-	public class CreateCommentWebModel : BaseCommentWebModel
+	public class CreateCommentWebModel
 	{
+		[NotNull]
+		[Required]
+		public Guid PostId { get; set; }
+
+		[NotNull]
+		[Required]
+		public string Message { get; set; }
 	}
 }
diff --git a/src/DevHive.Web/Models/Post/Comment/ReadCommentWebModel.cs b/src/DevHive.Web/Models/Post/Comment/ReadCommentWebModel.cs
index 2c4a367..5320c3c 100644
--- a/src/DevHive.Web/Models/Post/Comment/ReadCommentWebModel.cs
+++ b/src/DevHive.Web/Models/Post/Comment/ReadCommentWebModel.cs
@@ -4,6 +4,8 @@ namespace DevHive.Web.Models.Post.Comment
 {
 	public class ReadCommentWebModel
 	{
+		public Guid CommentId { get; set; }
+
 		public Guid PostId { get; set; }
 
 		public string IssuerFirstName { get; set; }
diff --git a/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs b/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs
index 49f4540..8e78a48 100644
--- a/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs
+++ b/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs
@@ -1,6 +1,7 @@
 namespace DevHive.Web.Models.Post.Comment
 {
-	public class UpdateCommentWebModel : BaseCommentWebModel
+	public class UpdateCommentWebModel
 	{
+		public string NewMessage { get; set; }
 	}
 }