From 5fdfd725086e58334f7b7516b017462d36763738 Mon Sep 17 00:00:00 2001 From: Maciej Koperdowski Date: Sun, 19 May 2024 21:54:37 +0200 Subject: [PATCH 1/3] DTO update after scaffold --- Server/ReasnAPI/ReasnAPI/Models/DTOs/AddressDto.cs | 8 ++++---- Server/ReasnAPI/ReasnAPI/Models/DTOs/CommentDto.cs | 8 ++++---- Server/ReasnAPI/ReasnAPI/Models/DTOs/EventDto.cs | 13 ++++++++----- Server/ReasnAPI/ReasnAPI/Models/DTOs/ImageDto.cs | 12 +++++++----- Server/ReasnAPI/ReasnAPI/Models/DTOs/InterestDto.cs | 7 +++++++ Server/ReasnAPI/ReasnAPI/Models/DTOs/IntrestDto.cs | 8 -------- .../ReasnAPI/ReasnAPI/Models/DTOs/ParameterDto.cs | 8 ++++---- .../ReasnAPI/ReasnAPI/Models/DTOs/ParticipantDto.cs | 12 +++++++----- Server/ReasnAPI/ReasnAPI/Models/DTOs/RoleDto.cs | 5 ----- Server/ReasnAPI/ReasnAPI/Models/DTOs/StatusDto.cs | 8 -------- Server/ReasnAPI/ReasnAPI/Models/DTOs/TagDto.cs | 6 ++++-- Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs | 6 +++--- 12 files changed, 48 insertions(+), 53 deletions(-) create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTOs/InterestDto.cs delete mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTOs/IntrestDto.cs delete mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTOs/RoleDto.cs delete mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTOs/StatusDto.cs diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/AddressDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/AddressDto.cs index 223eacdd..1500dfaa 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/AddressDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/AddressDto.cs @@ -1,7 +1,7 @@ -using System; - -namespace ReasnAPI.Models.DTOs { - public class AddressDto { +namespace ReasnAPI.Models.DTOs +{ + public class AddressDto + { public string Country { get; set; } = null!; public string City { get; set; } = null!; public string Street { get; set; } = null!; diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/CommentDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/CommentDto.cs index b552bfe7..3678a5ce 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/CommentDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/CommentDto.cs @@ -1,7 +1,7 @@ -using System; - -namespace ReasnAPI.Models.DTOs { - public class CommentDto { +namespace ReasnAPI.Models.DTOs +{ + public class CommentDto + { public int EventId { get; set; } public string Content { get; set; } = null!; public DateTime CreatedAt { get; set; } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/EventDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/EventDto.cs index d35c8120..5a55c085 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/EventDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/EventDto.cs @@ -1,7 +1,9 @@ -using System; +using ReasnAPI.Models.Enums; -namespace ReasnAPI.Models.DTOs { - public class EventDto { +namespace ReasnAPI.Models.DTOs +{ + public class EventDto + { public string Name { get; set; } = null!; public int AddressId { get; set; } public string Description { get; set; } = null!; @@ -10,8 +12,9 @@ public class EventDto { public DateTime EndAt { get; set; } public DateTime CreatedAt { get; set; } public DateTime UpdatedAt { get; set; } - public string? Slug { get; set; } - public int StatusId { get; set; } + public string Slug { get; set; } = null!; + public EventStatus Status { get; set; } public List? Tags { get; set; } + public List? Parameters { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/ImageDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ImageDto.cs index d19282b9..d9635d6b 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/ImageDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ImageDto.cs @@ -1,9 +1,11 @@ -using System; - -namespace ReasnAPI.Models.DTOs { - public class ImageDto { +using ReasnAPI.Models.Enums; + +namespace ReasnAPI.Models.DTOs +{ + public class ImageDto + { public byte[] ImageData { get; set; } = null!; public int ObjectId { get; set; } - public int ObjectTypeId { get; set; } + public ObjectType ObjectType { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/InterestDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/InterestDto.cs new file mode 100644 index 00000000..87eb141e --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/InterestDto.cs @@ -0,0 +1,7 @@ +namespace ReasnAPI.Models.DTOs +{ + public class InterestDto + { + public string Name { get; set; } = null!; + } +} \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/IntrestDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/IntrestDto.cs deleted file mode 100644 index 5eb19a65..00000000 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/IntrestDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace ReasnAPI.Models.DTOs { - public class IntrestDto { - public string Name { get; set; } = null!; - public int Level { get; set; } - } -} \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParameterDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParameterDto.cs index 4f953bdb..34a8a03f 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParameterDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParameterDto.cs @@ -1,7 +1,7 @@ -using System; - -namespace ReasnAPI.Models.DTOs { - public class ParameterDto { +namespace ReasnAPI.Models.DTOs +{ + public class ParameterDto + { public string Key { get; set; } = null!; public string Value { get; set; } = null!; } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParticipantDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParticipantDto.cs index c951ff50..227d1ef4 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParticipantDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParticipantDto.cs @@ -1,9 +1,11 @@ -using System; - -namespace ReasnAPI.Models.DTOs { - public class ParticipantDto { +using ReasnAPI.Models.Enums; + +namespace ReasnAPI.Models.DTOs +{ + public class ParticipantDto + { public int EventId { get; set; } public int UserId { get; set; } - public int StatusId { get; set; } + public ParticipantStatus Status { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/RoleDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/RoleDto.cs deleted file mode 100644 index b1267f14..00000000 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/RoleDto.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace ReasnAPI.Models.DTOs { - public class RoleDto { - public string Name { get; set; } = null!; - } -} diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/StatusDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/StatusDto.cs deleted file mode 100644 index 42e1cb57..00000000 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/StatusDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace ReasnAPI.Models.DTOs { - public class StatusDto { - public string Name { get; set; } = null!; - public int ObjectTypeId { get; set; } - } -} \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/TagDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/TagDto.cs index cf6c939b..db70f31b 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/TagDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/TagDto.cs @@ -1,5 +1,7 @@ -namespace ReasnAPI.Models.DTOs { - public class TagDto { +namespace ReasnAPI.Models.DTOs +{ + public class TagDto + { public string Name { get; set; } = null!; } } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs index 2ea5e75f..f24bcf0e 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs @@ -1,4 +1,4 @@ -using System; +using ReasnAPI.Models.Enums; namespace ReasnAPI.Models.DTOs { public class UserDto { @@ -7,8 +7,8 @@ public class UserDto { public string Surname { get; set; } = null!; public string Email { get; set; } = null!; public string? Phone { get; set; } - public int RoleId { get; set; } + public UserRole Role { get; set; } public int AddressId { get; set; } - public List? Intrests { get; set; } + public List? Interests { get; set; } } } \ No newline at end of file From a7e442ac5dc2782474620a66c01349478e21a325 Mon Sep 17 00:00:00 2001 From: Maciej Koperdowski Date: Sun, 19 May 2024 22:19:13 +0200 Subject: [PATCH 2/3] Created UserInterestDto --- Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/DTOs/UserInterestDto.cs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTOs/UserInterestDto.cs diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs index f24bcf0e..f06d2717 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs @@ -9,6 +9,6 @@ public class UserDto { public string? Phone { get; set; } public UserRole Role { get; set; } public int AddressId { get; set; } - public List? Interests { get; set; } + public List? Interests { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserInterestDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserInterestDto.cs new file mode 100644 index 00000000..fdc6abd9 --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserInterestDto.cs @@ -0,0 +1,8 @@ +namespace ReasnAPI.Models.DTOs +{ + public class UserInterestDto + { + public int InterestId { get; set; } + public int Level { get; set; } + } +} From 21df152b9a83be1761a790825eaa067b90feb7ac Mon Sep 17 00:00:00 2001 From: Maciej Koperdowski Date: Sun, 19 May 2024 23:02:35 +0200 Subject: [PATCH 3/3] Update UserInterestDto --- Server/ReasnAPI/ReasnAPI/Models/DTOs/UserInterestDto.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserInterestDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserInterestDto.cs index fdc6abd9..2612e00a 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserInterestDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserInterestDto.cs @@ -2,7 +2,7 @@ { public class UserInterestDto { - public int InterestId { get; set; } + public InterestDto Interest { get; set; } = null!; public int Level { get; set; } } }