From cc9734b155d1cd71536030dd1b2b387792f70e6f Mon Sep 17 00:00:00 2001 From: transtrike Date: Sat, 23 Jan 2021 17:12:14 +0200 Subject: Comment Models fixed --- src/DevHive.Data/Models/Comment.cs | 5 +++++ .../Models/Post/Comment/BaseCommentServiceModel.cs | 5 ++++- .../Post/Comment/CreateCommentServiceModel.cs | 3 +-- .../Models/Post/Comment/ReadCommentServiceModel.cs | 11 +++++++++++ .../Post/Comment/UpdateCommnetServiceModel.cs | 1 + .../Models/Post/Comment/BaseCommentWebModel.cs | 21 +++++++++++++++++++++ .../Models/Post/Comment/CreateCommentWebModel.cs | 6 ++++++ .../Models/Post/Comment/ReadCommentWebModel.cs | 19 +++++++++++++++++++ .../Models/Post/Comment/UpdateCommentWebModel.cs | 6 ++++++ 9 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 src/DevHive.Services/Models/Post/Comment/ReadCommentServiceModel.cs create mode 100644 src/DevHive.Web/Models/Post/Comment/BaseCommentWebModel.cs create mode 100644 src/DevHive.Web/Models/Post/Comment/CreateCommentWebModel.cs create mode 100644 src/DevHive.Web/Models/Post/Comment/ReadCommentWebModel.cs create mode 100644 src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs (limited to 'src') diff --git a/src/DevHive.Data/Models/Comment.cs b/src/DevHive.Data/Models/Comment.cs index a07bd59..5f4207d 100644 --- a/src/DevHive.Data/Models/Comment.cs +++ b/src/DevHive.Data/Models/Comment.cs @@ -6,8 +6,13 @@ namespace DevHive.Data.Models public class Comment : IComment { public Guid Id { get; set; } + + 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/BaseCommentServiceModel.cs b/src/DevHive.Services/Models/Post/Comment/BaseCommentServiceModel.cs index 54d6838..dae7ec3 100644 --- a/src/DevHive.Services/Models/Post/Comment/BaseCommentServiceModel.cs +++ b/src/DevHive.Services/Models/Post/Comment/BaseCommentServiceModel.cs @@ -4,9 +4,12 @@ namespace DevHive.Services.Models.Post.Comment { public class BaseCommentServiceModel { - public Guid Id { get; set; } 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/CreateCommentServiceModel.cs b/src/DevHive.Services/Models/Post/Comment/CreateCommentServiceModel.cs index 33f3bfe..7c00b8f 100644 --- a/src/DevHive.Services/Models/Post/Comment/CreateCommentServiceModel.cs +++ b/src/DevHive.Services/Models/Post/Comment/CreateCommentServiceModel.cs @@ -4,6 +4,5 @@ namespace DevHive.Services.Models.Post.Comment { public class CreateCommentServiceModel : BaseCommentServiceModel { - public DateTime TimeCreated { get; set; } } -} \ No newline at end of file +} diff --git a/src/DevHive.Services/Models/Post/Comment/ReadCommentServiceModel.cs b/src/DevHive.Services/Models/Post/Comment/ReadCommentServiceModel.cs new file mode 100644 index 0000000..ad68b58 --- /dev/null +++ b/src/DevHive.Services/Models/Post/Comment/ReadCommentServiceModel.cs @@ -0,0 +1,11 @@ +namespace DevHive.Services.Models.Post.Comment +{ + public class ReadCommentServiceModel : BaseCommentServiceModel + { + public string IssuerFirstName { get; set; } + + public string IssuerLastName { get; set; } + + public string IssuerUsername { get; set; } + } +} diff --git a/src/DevHive.Services/Models/Post/Comment/UpdateCommnetServiceModel.cs b/src/DevHive.Services/Models/Post/Comment/UpdateCommnetServiceModel.cs index 9516a2b..424ea65 100644 --- a/src/DevHive.Services/Models/Post/Comment/UpdateCommnetServiceModel.cs +++ b/src/DevHive.Services/Models/Post/Comment/UpdateCommnetServiceModel.cs @@ -4,5 +4,6 @@ namespace DevHive.Services.Models.Post.Comment { public class UpdateCommentServiceModel : BaseCommentServiceModel { + public Guid CommentId { get; set; } } } diff --git a/src/DevHive.Web/Models/Post/Comment/BaseCommentWebModel.cs b/src/DevHive.Web/Models/Post/Comment/BaseCommentWebModel.cs new file mode 100644 index 0000000..9ba0b87 --- /dev/null +++ b/src/DevHive.Web/Models/Post/Comment/BaseCommentWebModel.cs @@ -0,0 +1,21 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.Diagnostics.CodeAnalysis; + +namespace DevHive.Web.Models.Post.Comment +{ + public class BaseCommentWebModel + { + [NotNull] + [Required] + public Guid PostId { get; set; } + + [NotNull] + [Required] + public Guid CommentId { get; set; } + + [NotNull] + [Required] + public string Message { get; set; } + } +} diff --git a/src/DevHive.Web/Models/Post/Comment/CreateCommentWebModel.cs b/src/DevHive.Web/Models/Post/Comment/CreateCommentWebModel.cs new file mode 100644 index 0000000..3680727 --- /dev/null +++ b/src/DevHive.Web/Models/Post/Comment/CreateCommentWebModel.cs @@ -0,0 +1,6 @@ +namespace DevHive.Web.Models.Post.Comment +{ + public class CreateCommentWebModel : BaseCommentWebModel + { + } +} diff --git a/src/DevHive.Web/Models/Post/Comment/ReadCommentWebModel.cs b/src/DevHive.Web/Models/Post/Comment/ReadCommentWebModel.cs new file mode 100644 index 0000000..2c4a367 --- /dev/null +++ b/src/DevHive.Web/Models/Post/Comment/ReadCommentWebModel.cs @@ -0,0 +1,19 @@ +using System; + +namespace DevHive.Web.Models.Post.Comment +{ + public class ReadCommentWebModel + { + public Guid PostId { get; set; } + + public string IssuerFirstName { get; set; } + + public string IssuerLastName { get; set; } + + public string IssuerUsername { get; set; } + + public string Message { get; set; } + + public DateTime TimeCreated { get; set; } + } +} diff --git a/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs b/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs new file mode 100644 index 0000000..49f4540 --- /dev/null +++ b/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs @@ -0,0 +1,6 @@ +namespace DevHive.Web.Models.Post.Comment +{ + public class UpdateCommentWebModel : BaseCommentWebModel + { + } +} -- cgit v1.2.3