Migrations added; CRUD over Posts&Comments successfully completed

7 files changed, 12 insertions, 18 deletions

diff --git a/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs b/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs
index 296704e..a28ee16 100644
--- a/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs
@@ -11,10 +11,7 @@ namespace DevHive.Web.Configurations.Mapping
 			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());
+			CreateMap<ReadCommentServiceModel, ReadCommentWebModel>();
 		}
 	}
 }
diff --git a/src/DevHive.Web/Configurations/Mapping/PostMappings.cs b/src/DevHive.Web/Configurations/Mapping/PostMappings.cs
index 0e966cc..bc7bc06 100644
--- a/src/DevHive.Web/Configurations/Mapping/PostMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/PostMappings.cs
@@ -11,10 +11,7 @@ namespace DevHive.Web.Configurations.Mapping
 			CreateMap<CreatePostWebModel, CreatePostServiceModel>();
 			CreateMap<UpdatePostWebModel, UpdatePostServiceModel>();
 
-			CreateMap<ReadPostServiceModel, ReadPostWebModel>()
-				.ForMember(dest => dest.CreatorFirstName, src => src.Ignore())
-				.ForMember(dest => dest.CreatorLastName, src => src.Ignore())
-				.ForMember(dest => dest.CreatorUsername, src => src.Ignore());
+			CreateMap<ReadPostServiceModel, ReadPostWebModel>();
 		}
 	}
 }
diff --git a/src/DevHive.Web/Controllers/PostController.cs b/src/DevHive.Web/Controllers/PostController.cs
index 8b8b525..b5e1c98 100644
--- a/src/DevHive.Web/Controllers/PostController.cs
+++ b/src/DevHive.Web/Controllers/PostController.cs
@@ -31,7 +31,7 @@ namespace DevHive.Web.Controllers
 		{
 			CreatePostServiceModel createPostServiceModel =
 				this._postMapper.Map<CreatePostServiceModel>(createPostWebModel);
-			createPostServiceModel.IssuerId = userId;
+			createPostServiceModel.CreatorId = userId;
 
 			Guid id = await this._postService.CreatePost(createPostServiceModel);
 
@@ -46,7 +46,7 @@ namespace DevHive.Web.Controllers
 		{
 			CreateCommentServiceModel createCommentServiceModel =
 				this._postMapper.Map<CreateCommentServiceModel>(createCommentWebModel);
-			createCommentServiceModel.IssuerId = userId;
+			createCommentServiceModel.CreatorId = userId;
 
 			Guid id = await this._postService.AddComment(createCommentServiceModel);
 
@@ -83,11 +83,12 @@ namespace DevHive.Web.Controllers
 		[HttpPut]
 		public async Task<IActionResult> Update(Guid userId, [FromBody] UpdatePostWebModel updatePostWebModel, [FromHeader] string authorization)
 		{
-			if (!await this._postService.ValidateJwtForPost(userId, authorization))
+			if (!await this._postService.ValidateJwtForPost(updatePostWebModel.PostId, authorization))
 				return new UnauthorizedResult();
 
 			UpdatePostServiceModel updatePostServiceModel =
 				this._postMapper.Map<UpdatePostServiceModel>(updatePostWebModel);
+			updatePostServiceModel.CreatorId = userId;
 
 			Guid id = await this._postService.UpdatePost(updatePostServiceModel);
 
@@ -100,11 +101,12 @@ namespace DevHive.Web.Controllers
 		[Route("Comment")]
 		public async Task<IActionResult> UpdateComment(Guid userId, [FromBody] UpdateCommentWebModel updateCommentWebModel, [FromHeader] string authorization)
 		{
-			if (!await this._postService.ValidateJwtForComment(userId, authorization))
+			if (!await this._postService.ValidateJwtForComment(updateCommentWebModel.CommentId, authorization))
 				return new UnauthorizedResult();
 
 			UpdateCommentServiceModel updateCommentServiceModel =
 				this._postMapper.Map<UpdateCommentServiceModel>(updateCommentWebModel);
+			updateCommentServiceModel.CreatorId = userId;
 
 			Guid id = await this._postService.UpdateComment(updateCommentServiceModel);
 
diff --git a/src/DevHive.Web/Controllers/RoleController.cs b/src/DevHive.Web/Controllers/RoleController.cs
index 0206542..c68a32b 100644
--- a/src/DevHive.Web/Controllers/RoleController.cs
+++ b/src/DevHive.Web/Controllers/RoleController.cs
@@ -23,7 +23,7 @@ namespace DevHive.Web.Controllers
 		}
 
 		[HttpPost]
-		[Authorize(Policy = "Administrator")]
+		// [Authorize(Policy = "Administrator")]
 		public async Task<IActionResult> Create([FromBody] CreateRoleWebModel createRoleWebModel)
 		{
 			CreateRoleServiceModel roleServiceModel =
diff --git a/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs b/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs
index 6dff49e..cb1c60a 100644
--- a/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs
+++ b/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs
@@ -6,6 +6,8 @@ namespace DevHive.Web.Models.Post.Comment
 	{
 		public Guid CommentId { get; set; }
 
+		public Guid PostId { get; set; }
+
 		public string NewMessage { get; set; }
 	}
 }
diff --git a/src/DevHive.Web/Models/Post/Post/CreatePostWebModel.cs b/src/DevHive.Web/Models/Post/Post/CreatePostWebModel.cs
index 647b30e..b7b4cf4 100644
--- a/src/DevHive.Web/Models/Post/Post/CreatePostWebModel.cs
+++ b/src/DevHive.Web/Models/Post/Post/CreatePostWebModel.cs
@@ -8,10 +8,6 @@ namespace DevHive.Web.Models.Post.Post
 	{
 		[NotNull]
 		[Required]
-		public Guid CreatorId { get; set; }
-
-		[NotNull]
-		[Required]
 		public string Message { get; set; }
 
 		// public List<IFormFile> Files { get; set; }
diff --git a/src/DevHive.Web/Models/Post/Post/UpdatePostWebModel.cs b/src/DevHive.Web/Models/Post/Post/UpdatePostWebModel.cs
index fe42715..685f08b 100644
--- a/src/DevHive.Web/Models/Post/Post/UpdatePostWebModel.cs
+++ b/src/DevHive.Web/Models/Post/Post/UpdatePostWebModel.cs
@@ -12,6 +12,6 @@ namespace DevHive.Web.Models.Post.Post
 
 		[NotNull]
 		[Required]
-		public string Message { get; set; }
+		public string NewMessage { get; set; }
 	}
 }