From b66bdb4a54f97af7b072d9ce735cb2d8d2a359d3 Mon Sep 17 00:00:00 2001 From: mkoper02 Date: Sun, 24 Mar 2024 00:25:30 +0100 Subject: [PATCH 1/5] backend: created basic DTO classes --- Server/ReasnAPI/ReasnAPI/Models/.gitkeep | 0 Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs | 11 +++++++++++ Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs | 10 ++++++++++ Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs | 14 ++++++++++++++ Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs | 9 +++++++++ Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs | 8 ++++++++ .../ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs | 12 ++++++++++++ .../ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs | 9 +++++++++ Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs | 8 ++++++++ Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs | 13 +++++++++++++ 10 files changed, 94 insertions(+) delete mode 100644 Server/ReasnAPI/ReasnAPI/Models/.gitkeep create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs diff --git a/Server/ReasnAPI/ReasnAPI/Models/.gitkeep b/Server/ReasnAPI/ReasnAPI/Models/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs new file mode 100644 index 00000000..825b4497 --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs @@ -0,0 +1,11 @@ +using System; + +namespace ReasnAPI.Models.DTO { + public class AddressDto { + public string Country { get; set; } + public string City { get; set; } + public string Street { get; set; } + public string State { get; set; } + public string ZipCode { get; set; } + } +} \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs new file mode 100644 index 00000000..6d687892 --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs @@ -0,0 +1,10 @@ +using System; + +namespace ReasnAPI.Models.DTO { + public class CommentDto { + public int EventId { get; set; } + public string Content { get; set; } + public DateTime Created { get; set; } + public int UserId { get; set; } + } +} \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs new file mode 100644 index 00000000..15837066 --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs @@ -0,0 +1,14 @@ +using System; + +namespace ReasnAPI.Models.DTO { + public class EventDto { + public string Name { get; set; } + public int AddressId { get; set; } + public string Description { get; set; } + public int OrganizerId { get; set; } + public DateTime StartAt { get; set; } + public DateTime EndAt { get; set; } + public string Slug { get; set; } + public int StatusId { get; set; } + } +} \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs new file mode 100644 index 00000000..89bd7e20 --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs @@ -0,0 +1,9 @@ +using System; + +namespace ReasnAPI.Models.DTO { + public class ImageDto { + public byte[] ImageData { get; set; } + public int ObjectId { get; set; } + public int ObjectTypeId { get; set; } + } +} \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs new file mode 100644 index 00000000..a79961ea --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs @@ -0,0 +1,8 @@ +using System; + +namespace ReasnAPI.Models.DTO { + public class IntrestDto { + public string Name { get; set; } + public int Level { get; set; } + } +} \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs new file mode 100644 index 00000000..20086c8c --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ReasnAPI.Models.DTO { + public class ParameterDto { + public string? Key { get; set; } + public string? Value { get; set; } + } +} \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs new file mode 100644 index 00000000..6946b650 --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs @@ -0,0 +1,9 @@ +using System; + +namespace ReasnAPI.Models.DTO { + public class ParticipantDto { + public int EventId { get; set; } + public int UserId { get; set; } + public int StatudId { get; set; } + } +} \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs new file mode 100644 index 00000000..5efbf46e --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs @@ -0,0 +1,8 @@ +using System; + +namespace ReasnAPI.Models.DTO { + public class StatusDto { + public string Name { get; set; } + public int ObjectTypeId { get; set; } + } +} \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs new file mode 100644 index 00000000..f8de62cb --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs @@ -0,0 +1,13 @@ +using System; + +namespace ReasnAPI.Models.DTO { + public class UserDto { + public string Username { get; set; } + public string Name { get; set; } + public string Surname { get; set; } + public string Email { get; set; } + public string Phone { get; set; } + public int RoleId { get; set; } + public AddressDto Address { get; set; } + } +} \ No newline at end of file From 982d3e331fdbbb5f376d21cfd419a9bddcce5b8f Mon Sep 17 00:00:00 2001 From: mkoper02 Date: Sun, 24 Mar 2024 13:02:43 +0100 Subject: [PATCH 2/5] Added nullable and non-nullable properties to parameters --- Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs | 10 +++++----- Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs | 6 +++--- Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs | 4 ++-- Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs | 8 ++------ Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs | 12 ++++++------ 8 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs index 825b4497..a9e86b0f 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs @@ -2,10 +2,10 @@ namespace ReasnAPI.Models.DTO { public class AddressDto { - public string Country { get; set; } - public string City { get; set; } - public string Street { get; set; } - public string State { get; set; } - public string ZipCode { get; set; } + public string Country { get; set; } = null!; + public string City { get; set; } = null!; + public string Street { get; set; } = null!; + public string? State { get; set; } + public string? ZipCode { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs index 6d687892..b4e60123 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs @@ -3,7 +3,7 @@ namespace ReasnAPI.Models.DTO { public class CommentDto { public int EventId { get; set; } - public string Content { get; set; } + public string Content { get; set; } = null!; public DateTime Created { get; set; } public int UserId { get; set; } } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs index 15837066..cb0d3bc9 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs @@ -2,13 +2,13 @@ namespace ReasnAPI.Models.DTO { public class EventDto { - public string Name { get; set; } + public string Name { get; set; } = null!; public int AddressId { get; set; } - public string Description { get; set; } + public string Description { get; set; } = null!; public int OrganizerId { get; set; } public DateTime StartAt { get; set; } public DateTime EndAt { get; set; } - public string Slug { get; set; } + public string? Slug { get; set; } public int StatusId { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs index 89bd7e20..bf580d0a 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs @@ -1,8 +1,8 @@ using System; namespace ReasnAPI.Models.DTO { - public class ImageDto { - public byte[] ImageData { get; set; } + public class ImageDto { + public byte[] ImageData { get; set; } = null!; public int ObjectId { get; set; } public int ObjectTypeId { get; set; } } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs index a79961ea..cd25a4fe 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs @@ -2,7 +2,7 @@ namespace ReasnAPI.Models.DTO { public class IntrestDto { - public string Name { get; set; } + public string Name { get; set; } = null!; public int Level { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs index 20086c8c..ad9d7ade 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs @@ -1,12 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ReasnAPI.Models.DTO { public class ParameterDto { - public string? Key { get; set; } - public string? Value { get; set; } + public string Key { get; set; } = null!; + public string Value { get; set; } = null!; } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs index 5efbf46e..61d9d02b 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs @@ -2,7 +2,7 @@ namespace ReasnAPI.Models.DTO { public class StatusDto { - public string Name { get; set; } + public string Name { get; set; } = null!; public int ObjectTypeId { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs index f8de62cb..a3f15fed 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs @@ -2,12 +2,12 @@ namespace ReasnAPI.Models.DTO { public class UserDto { - public string Username { get; set; } - public string Name { get; set; } - public string Surname { get; set; } - public string Email { get; set; } - public string Phone { get; set; } + public string Username { get; set; } = null!; + public string Name { get; set; } = null!; + public string Surname { get; set; } = null!; + public string Email { get; set; } = null!; + public string? Phone { get; set; } public int RoleId { get; set; } - public AddressDto Address { get; set; } + public AddressDto? Address { get; set; } } } \ No newline at end of file From 4d47a257a6efb4cd834adb66c7331bd63ab4e54b Mon Sep 17 00:00:00 2001 From: mkoper02 Date: Sun, 24 Mar 2024 18:57:01 +0100 Subject: [PATCH 3/5] Changes based on PR for DTOs - fixed spelling and added new parameters --- Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs | 2 ++ Server/ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs index b4e60123..b80159e7 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs @@ -4,7 +4,7 @@ namespace ReasnAPI.Models.DTO { public class CommentDto { public int EventId { get; set; } public string Content { get; set; } = null!; - public DateTime Created { get; set; } + public DateTime CreatedAt { get; set; } public int UserId { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs index cb0d3bc9..d7824f01 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs @@ -8,6 +8,8 @@ public class EventDto { public int OrganizerId { get; set; } public DateTime StartAt { get; set; } 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; } } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs index 6946b650..67e2e994 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs @@ -4,6 +4,6 @@ namespace ReasnAPI.Models.DTO { public class ParticipantDto { public int EventId { get; set; } public int UserId { get; set; } - public int StatudId { get; set; } + public int StatusId { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs index a3f15fed..09002da9 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs @@ -8,6 +8,7 @@ public class UserDto { public string Email { get; set; } = null!; public string? Phone { get; set; } public int RoleId { get; set; } - public AddressDto? Address { get; set; } + public int AddressId { get; set; } + public List? Intrests { get; set; } } } \ No newline at end of file From de1eaa79e992e961b1d6e40cf3eea3eabee46d68 Mon Sep 17 00:00:00 2001 From: mkoper02 Date: Sun, 24 Mar 2024 21:39:40 +0100 Subject: [PATCH 4/5] New DTOs, changed properties and new parameters --- Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs | 1 + Server/ReasnAPI/ReasnAPI/Models/DTO/RoleDto.cs | 5 +++++ Server/ReasnAPI/ReasnAPI/Models/DTO/TagDto.cs | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTO/RoleDto.cs create mode 100644 Server/ReasnAPI/ReasnAPI/Models/DTO/TagDto.cs diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs index a9e86b0f..5a435787 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs @@ -5,7 +5,7 @@ public class AddressDto { public string Country { get; set; } = null!; public string City { get; set; } = null!; public string Street { get; set; } = null!; - public string? State { get; set; } + public string State { get; set; } = null!; public string? ZipCode { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs index d7824f01..6d3c238d 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs @@ -12,5 +12,6 @@ public class EventDto { public DateTime UpdatedAt { get; set; } public string? Slug { get; set; } public int StatusId { get; set; } + public List? Tags { get; set; } } } \ No newline at end of file diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/RoleDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/RoleDto.cs new file mode 100644 index 00000000..fe97f58e --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/RoleDto.cs @@ -0,0 +1,5 @@ +namespace ReasnAPI.Models.DTO { + public class RoleDto { + public string Name { get; set; } = null!; + } +} diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/TagDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTO/TagDto.cs new file mode 100644 index 00000000..0ec2effb --- /dev/null +++ b/Server/ReasnAPI/ReasnAPI/Models/DTO/TagDto.cs @@ -0,0 +1,5 @@ +namespace ReasnAPI.Models.DTO { + public class TagDto { + public string Name { get; set; } = null!; + } +} From 88f765c9ae81042693d72d9eb4361854457f80aa Mon Sep 17 00:00:00 2001 From: mkoper02 Date: Mon, 25 Mar 2024 11:17:33 +0100 Subject: [PATCH 5/5] Changed namespace to plural form --- Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/AddressDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/CommentDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/EventDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/ImageDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/IntrestDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/ParameterDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/ParticipantDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/RoleDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/StatusDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/TagDto.cs | 2 +- Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/UserDto.cs | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) rename Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/AddressDto.cs (90%) rename Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/CommentDto.cs (87%) rename Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/EventDto.cs (94%) rename Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/ImageDto.cs (85%) rename Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/IntrestDto.cs (81%) rename Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/ParameterDto.cs (82%) rename Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/ParticipantDto.cs (84%) rename Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/RoleDto.cs (70%) rename Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/StatusDto.cs (81%) rename Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/TagDto.cs (70%) rename Server/ReasnAPI/ReasnAPI/Models/{DTO => DTOs}/UserDto.cs (93%) diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/AddressDto.cs similarity index 90% rename from Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs rename to Server/ReasnAPI/ReasnAPI/Models/DTOs/AddressDto.cs index 5a435787..223eacdd 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/AddressDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/AddressDto.cs @@ -1,6 +1,6 @@ using System; -namespace ReasnAPI.Models.DTO { +namespace ReasnAPI.Models.DTOs { public class AddressDto { public string Country { get; set; } = null!; public string City { get; set; } = null!; diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/CommentDto.cs similarity index 87% rename from Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs rename to Server/ReasnAPI/ReasnAPI/Models/DTOs/CommentDto.cs index b80159e7..b552bfe7 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/CommentDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/CommentDto.cs @@ -1,6 +1,6 @@ using System; -namespace ReasnAPI.Models.DTO { +namespace ReasnAPI.Models.DTOs { public class CommentDto { public int EventId { get; set; } public string Content { get; set; } = null!; diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/EventDto.cs similarity index 94% rename from Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs rename to Server/ReasnAPI/ReasnAPI/Models/DTOs/EventDto.cs index 6d3c238d..d35c8120 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/EventDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/EventDto.cs @@ -1,6 +1,6 @@ using System; -namespace ReasnAPI.Models.DTO { +namespace ReasnAPI.Models.DTOs { public class EventDto { public string Name { get; set; } = null!; public int AddressId { get; set; } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ImageDto.cs similarity index 85% rename from Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs rename to Server/ReasnAPI/ReasnAPI/Models/DTOs/ImageDto.cs index bf580d0a..d19282b9 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/ImageDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ImageDto.cs @@ -1,6 +1,6 @@ using System; -namespace ReasnAPI.Models.DTO { +namespace ReasnAPI.Models.DTOs { public class ImageDto { public byte[] ImageData { get; set; } = null!; public int ObjectId { get; set; } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/IntrestDto.cs similarity index 81% rename from Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs rename to Server/ReasnAPI/ReasnAPI/Models/DTOs/IntrestDto.cs index cd25a4fe..5eb19a65 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/IntrestDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/IntrestDto.cs @@ -1,6 +1,6 @@ using System; -namespace ReasnAPI.Models.DTO { +namespace ReasnAPI.Models.DTOs { public class IntrestDto { public string Name { get; set; } = null!; public int Level { get; set; } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParameterDto.cs similarity index 82% rename from Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs rename to Server/ReasnAPI/ReasnAPI/Models/DTOs/ParameterDto.cs index ad9d7ade..4f953bdb 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/ParameterDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParameterDto.cs @@ -1,6 +1,6 @@ using System; -namespace ReasnAPI.Models.DTO { +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/DTO/ParticipantDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParticipantDto.cs similarity index 84% rename from Server/ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs rename to Server/ReasnAPI/ReasnAPI/Models/DTOs/ParticipantDto.cs index 67e2e994..c951ff50 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/ParticipantDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/ParticipantDto.cs @@ -1,6 +1,6 @@ using System; -namespace ReasnAPI.Models.DTO { +namespace ReasnAPI.Models.DTOs { public class ParticipantDto { public int EventId { get; set; } public int UserId { get; set; } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/RoleDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/RoleDto.cs similarity index 70% rename from Server/ReasnAPI/ReasnAPI/Models/DTO/RoleDto.cs rename to Server/ReasnAPI/ReasnAPI/Models/DTOs/RoleDto.cs index fe97f58e..b1267f14 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/RoleDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/RoleDto.cs @@ -1,4 +1,4 @@ -namespace ReasnAPI.Models.DTO { +namespace ReasnAPI.Models.DTOs { public class RoleDto { public string Name { get; set; } = null!; } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/StatusDto.cs similarity index 81% rename from Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs rename to Server/ReasnAPI/ReasnAPI/Models/DTOs/StatusDto.cs index 61d9d02b..42e1cb57 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/StatusDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/StatusDto.cs @@ -1,6 +1,6 @@ using System; -namespace ReasnAPI.Models.DTO { +namespace ReasnAPI.Models.DTOs { public class StatusDto { public string Name { get; set; } = null!; public int ObjectTypeId { get; set; } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/TagDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/TagDto.cs similarity index 70% rename from Server/ReasnAPI/ReasnAPI/Models/DTO/TagDto.cs rename to Server/ReasnAPI/ReasnAPI/Models/DTOs/TagDto.cs index 0ec2effb..cf6c939b 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/TagDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/TagDto.cs @@ -1,4 +1,4 @@ -namespace ReasnAPI.Models.DTO { +namespace ReasnAPI.Models.DTOs { public class TagDto { public string Name { get; set; } = null!; } diff --git a/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs b/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs similarity index 93% rename from Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs rename to Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs index 09002da9..2ea5e75f 100644 --- a/Server/ReasnAPI/ReasnAPI/Models/DTO/UserDto.cs +++ b/Server/ReasnAPI/ReasnAPI/Models/DTOs/UserDto.cs @@ -1,6 +1,6 @@ using System; -namespace ReasnAPI.Models.DTO { +namespace ReasnAPI.Models.DTOs { public class UserDto { public string Username { get; set; } = null!; public string Name { get; set; } = null!;