Merge branch 'release/1.2.3'

Author: Ubuntu

Streetcode/Streetcode.BLL/Constants/MessageData/MessageDataConstants.cs

@@ -3,5 +3,6 @@
 public static class MessageDataConstants
 {
     public const string FeedbackMessageTitle = "Відгук";
-    public const string ForgotPasswordTitle = "HistoryCode забули пароль";
+    public const string ForgotPasswordTitle = "Запит на відновлення пароля";
+    public const string DeleteConfirmationTitle = "Підтвердження видалення аккаунту";
 }

Streetcode/Streetcode.BLL/DTO/Authentication/Login/LoginRequestDTO.cs

@@ -7,16 +7,9 @@ namespace Streetcode.BLL.DTO.Authentication.Login;
 
 public class LoginRequestDTO
 {
-    [Required]
-    [ValidEmail]
-    [DefaultValue(AuthConstants.Email)]
     public string Login { get; set; } = null!;
 
-    [Required]
-    [DefaultValue(AuthConstants.Password)]
-    [MaxLength(30, ErrorMessage = "Password maximum length is 30")]
     public string Password { get; set; } = null!;
 
-    [Required]
     public string CaptchaToken { get; set; } = null!;
 }

Streetcode/Streetcode.BLL/DTO/Authentication/Register/RegisterRequestDTO.cs

@@ -5,26 +5,13 @@ namespace Streetcode.BLL.DTO.Authentication.Register;
 
 public class RegisterRequestDTO
 {
-    [Required]
-    [MaxLength(50)]
     public string Name { get; set; } = null!;
 
-    [Required]
-    [MaxLength(50)]
     public string Surname { get; set; } = null!;
 
-    [Required]
-    [ValidEmail]
     public string Email { get; set; } = null!;
 
-    [Required]
-    [MaxLength(30, ErrorMessage = "Password maximum length is 30")]
-    [StrongPassword]
     public string Password { get; set; } = null!;
 
-    [Required]
-    [Display(Name = "Confirm password")]
-    [MaxLength(30, ErrorMessage = "Password maximum length is 30")]
-    [Compare(nameof(Password))]
     public string PasswordConfirmation { get; set; } = null!;
 }

Streetcode/Streetcode.BLL/DTO/Media/Images/ImageDTO.cs

@@ -7,5 +7,6 @@ public class ImageDTO
     public string BlobName { get; set; } = null!;
     public string Base64 { get; set; } = null!;
     public string MimeType { get; set; } = null!;
+    public ulong ImageHash { get; set; }
     public ImageDetailsDto? ImageDetails { get; set; }
 }

Streetcode/Streetcode.BLL/DTO/News/CreateUpdateNewsDTO.cs

@@ -12,12 +12,14 @@ public abstract class CreateUpdateNewsDTO
     [Required(AllowEmptyStrings = false)]
     [StringLength(25000, ErrorMessage = "Max Length is 25000")]
     public string Text { get; set; } = null!;
+
     [Required]
     public int ImageId { get; set; }
 
     [Required(AllowEmptyStrings = false)]
     [StringLength(200, ErrorMessage = "Max Length is 200")]
     public string URL { get; set; } = null!;
+
     [Required]
     public DateTime CreationDate { get; set; }
 }

Streetcode/Streetcode.BLL/DTO/Streetcode/Create/StreetcodeCreateDTO.cs

@@ -20,8 +20,6 @@ public class StreetcodeCreateDTO : StreetcodeCreateUpdateDTO
 
     public int? AudioId { get; set; }
 
-    public IEnumerable<int> ImagesIds { get; set; } = new List<int>();
-
     public IEnumerable<StreetcodeTagDTO>? Tags { get; set; } = new List<StreetcodeTagDTO>();
 
     public IEnumerable<SubtitleCreateDTO>? Subtitles { get; set; } = new List<SubtitleCreateDTO>();

Streetcode/Streetcode.BLL/DTO/Streetcode/TextContent/GetAllTermsResponseDto.cs

@@ -0,0 +1,8 @@
+namespace Streetcode.BLL.DTO.Streetcode.TextContent
+{
+    public class GetAllTermsResponseDto
+    {
+        public int TotalAmount { get; set; }
+        public IEnumerable<TermDTO> Terms { get; set; } = new List<TermDTO>();
+    }
+}

Streetcode/Streetcode.BLL/DTO/Users/BaseUserDTO.cs

@@ -4,11 +4,18 @@ namespace Streetcode.BLL.DTO.Users;
 
 public abstract class BaseUserDTO
 {
+    public string Id { get; set; } = null!;
+
     public string Name { get; set; } = null!;
+
     public string Surname { get; set; } = null!;
+
     public string UserName { get; set; } = null!;
+
     public string? AboutYourself { get; set; }
+
     public int? AvatarId { get; set; } = null!;
+
     public List<ExpertiseDTO> Expertises { get; set; } = new();
 
     public string Role { get; set; } = null!;

Streetcode/Streetcode.BLL/DTO/Users/UpdateUserDTO.cs

@@ -5,13 +5,19 @@ namespace Streetcode.BLL.DTO.Users;
 
 public class UpdateUserDTO
 {
+    public string Id { get; set; } = null!;
+
     public string Name { get; set; } = null!;
+
     public string Surname { get; set; } = null!;
+
     public string UserName { get; set; } = null!;
+
     public string? AboutYourself { get; set; }
+
     public int? AvatarId { get; set; } = null!;
+
     public List<ExpertiseDTO> Expertises { get; set; } = new();
-    [Phone]
+
     public string PhoneNumber { get; set; } = null!;
-    public string Email { get; set; } = null!;
 }

Streetcode/Streetcode.BLL/DTO/Users/UserDTO.cs

@@ -3,6 +3,7 @@
     public class UserDTO : BaseUserDTO
     {
         public string PhoneNumber { get; set; } = null!;
+
         public string Email { get; set; } = null!;
     }
 }