From fac1bf2d1772e60cbecc1cf0381c6063a0e97ffd Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Sat, 23 Jan 2021 20:59:12 +0200
Subject: Post&Comment Models implemented; Mappings Configured

---
 .../Configurations/Mapping/PostMappings.cs          | 12 +++++++++---
 .../Models/Post/Comment/BaseCommentServiceModel.cs  | 15 ---------------
 .../Models/Post/Comment/CommentServiceModel.cs      |  9 ---------
 .../Models/Post/Post/BasePostServiceModel.cs        | 11 -----------
 .../Models/Post/Post/CreatePostServiceModel.cs      |  8 +++++++-
 .../Models/Post/Post/PostServiceModel.cs            | 12 ------------
 .../Models/Post/Post/ReadPostServiceModel.cs        | 21 +++++++++++++++++++++
 .../Models/Post/Post/UpdatePostServiceModel.cs      | 12 ++++++++++--
 8 files changed, 47 insertions(+), 53 deletions(-)
 delete mode 100644 src/DevHive.Services/Models/Post/Comment/BaseCommentServiceModel.cs
 delete mode 100644 src/DevHive.Services/Models/Post/Comment/CommentServiceModel.cs
 delete mode 100644 src/DevHive.Services/Models/Post/Post/BasePostServiceModel.cs
 delete mode 100644 src/DevHive.Services/Models/Post/Post/PostServiceModel.cs
 create mode 100644 src/DevHive.Services/Models/Post/Post/ReadPostServiceModel.cs

(limited to 'src/DevHive.Services')

diff --git a/src/DevHive.Services/Configurations/Mapping/PostMappings.cs b/src/DevHive.Services/Configurations/Mapping/PostMappings.cs
index 7f99c66..e4924a5 100644
--- a/src/DevHive.Services/Configurations/Mapping/PostMappings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/PostMappings.cs
@@ -1,6 +1,5 @@
 using DevHive.Data.Models;
 using AutoMapper;
-using DevHive.Services.Models.Post;
 using DevHive.Services.Models.Post.Post;
 
 namespace DevHive.Services.Configurations.Mapping
@@ -9,8 +8,15 @@ namespace DevHive.Services.Configurations.Mapping
 	{
 		public PostMappings()
 		{
-			CreateMap<PostServiceModel, Post>();
-			CreateMap<Post, PostServiceModel>();
+			CreateMap<CreatePostServiceModel, Post>();
+				// .ForMember(dest => dest.Files, src => src.Ignore());
+			CreateMap<UpdatePostServiceModel, Post>()
+				.ForMember(dest => dest.Id, src => src.MapFrom(p => p.PostId))
+				// .ForMember(dest => dest.Files, src => src.Ignore())
+				.ForMember(dest => dest.Message, src => src.MapFrom(p => p.NewMessage));
+
+			CreateMap<Post, ReadPostServiceModel>()
+				.ForMember(dest => dest.PostId, src => src.MapFrom(p => p.Id));
 		}
 	}
 }
diff --git a/src/DevHive.Services/Models/Post/Comment/BaseCommentServiceModel.cs b/src/DevHive.Services/Models/Post/Comment/BaseCommentServiceModel.cs
deleted file mode 100644
index dae7ec3..0000000
--- a/src/DevHive.Services/Models/Post/Comment/BaseCommentServiceModel.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace DevHive.Services.Models.Post.Comment
-{
-	public class BaseCommentServiceModel
-	{
-		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/CommentServiceModel.cs b/src/DevHive.Services/Models/Post/Comment/CommentServiceModel.cs
deleted file mode 100644
index a0fa53e..0000000
--- a/src/DevHive.Services/Models/Post/Comment/CommentServiceModel.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace DevHive.Services.Models.Post.Comment
-{
-	public class CommentServiceModel : CreateCommentServiceModel
-	{
-
-	}
-}
\ No newline at end of file
diff --git a/src/DevHive.Services/Models/Post/Post/BasePostServiceModel.cs b/src/DevHive.Services/Models/Post/Post/BasePostServiceModel.cs
deleted file mode 100644
index 45a677c..0000000
--- a/src/DevHive.Services/Models/Post/Post/BasePostServiceModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace DevHive.Services.Models.Post.Post
-{
-	public class BasePostServiceModel
-	{
-		public Guid Id { get; set; }
-		public Guid IssuerId { get; set; }
-		public string Message { get; set; }
-	}
-}
\ No newline at end of file
diff --git a/src/DevHive.Services/Models/Post/Post/CreatePostServiceModel.cs b/src/DevHive.Services/Models/Post/Post/CreatePostServiceModel.cs
index 1bf60ae..6b83f3e 100644
--- a/src/DevHive.Services/Models/Post/Post/CreatePostServiceModel.cs
+++ b/src/DevHive.Services/Models/Post/Post/CreatePostServiceModel.cs
@@ -2,8 +2,14 @@ using System;
 
 namespace DevHive.Services.Models.Post.Post
 {
-	public class CreatePostServiceModel : BasePostServiceModel
+	public class CreatePostServiceModel
 	{
+		public Guid IssuerId { get; set; }
+
+		public string Message { get; set; }
+
 		public DateTime TimeCreated { get; set; }
+
+		// public List<IFormFile> Files { get; set; }
 	}
 }
diff --git a/src/DevHive.Services/Models/Post/Post/PostServiceModel.cs b/src/DevHive.Services/Models/Post/Post/PostServiceModel.cs
deleted file mode 100644
index b9c2128..0000000
--- a/src/DevHive.Services/Models/Post/Post/PostServiceModel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace DevHive.Services.Models.Post.Post
-{
-	public class PostServiceModel : CreatePostServiceModel
-	{
-
-		//public File[] Files { get; set; }
-
-		//public Comment[] Comments { get; set; }
-	}
-}
\ No newline at end of file
diff --git a/src/DevHive.Services/Models/Post/Post/ReadPostServiceModel.cs b/src/DevHive.Services/Models/Post/Post/ReadPostServiceModel.cs
new file mode 100644
index 0000000..52b9232
--- /dev/null
+++ b/src/DevHive.Services/Models/Post/Post/ReadPostServiceModel.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using DevHive.Services.Models.Post.Comment;
+
+namespace DevHive.Services.Models.Post.Post
+{
+	public class ReadPostServiceModel
+	{
+		public Guid PostId { get; set; }
+
+		public Guid CreatorId { get; set; }
+
+		public string Message { get; set; }
+
+		public DateTime TimeCreated { get; set; }
+
+		public List<ReadCommentServiceModel> Comments { get; set; }
+
+		//public List<string> Files { get; set; }
+	}
+}
diff --git a/src/DevHive.Services/Models/Post/Post/UpdatePostServiceModel.cs b/src/DevHive.Services/Models/Post/Post/UpdatePostServiceModel.cs
index 5a4f621..67ee711 100644
--- a/src/DevHive.Services/Models/Post/Post/UpdatePostServiceModel.cs
+++ b/src/DevHive.Services/Models/Post/Post/UpdatePostServiceModel.cs
@@ -1,5 +1,13 @@
+using System;
+
 namespace DevHive.Services.Models.Post.Post
 {
-	public class UpdatePostServiceModel : BasePostServiceModel
-	{ }
+	public class UpdatePostServiceModel
+	{
+		public Guid PostId { get; set; }
+
+		public string NewMessage { get; set; }
+
+		// public List<IFormFile> Files { get; set; }
+	}
 }
-- 
cgit v1.2.3