Merge pull request #26 from LuongXuanNhat/11.Post_Extension

#27 | Deloy test sussces
LuongXuanNhat · Nov 10, 2023 · 921203c · 921203c
2 parents fa098c1 + 6634db9
commit 921203c
Show file tree

Hide file tree

Showing 28 changed files with 2,329 additions and 123 deletions.
diff --git a/VNH.Application/Common/Contants/SystemConstants.cs b/VNH.Application/Common/Contants/SystemConstants.cs
@@ -10,5 +10,9 @@ public static class SystemConstants
     {
         public const string Token = "Token";
         public const string BaseAddress = "BaseAddress";
+        public const string UrlWeb = "https://vuanhpham25-001-site1.gtempurl.com/";
+        //// public const string UrlWeb = "https://localhost:7138/";
+        public const string ConnectString = "Data Source=SQL5110.site4now.net;Initial Catalog=db_aa121e_vuanhpham25;User Id=db_aa121e_vuanhpham25_admin;Password=30102002Mai";
+        public const string ConnectStringDevelop = "Data Source=.;Initial Catalog=VietNamHistory_2;Integrated Security=True;Encrypt=true;TrustServerCertificate=true;";
     }
 }
diff --git a/VNH.Application/DTOs/Catalog/Posts/PostResponsetDto.cs b/VNH.Application/DTOs/Catalog/Posts/PostResponsetDto.cs
@@ -1,4 +1,6 @@
 using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System.ComponentModel.DataAnnotations.Schema;
 using VNH.Application.DTOs.Catalog.HashTags;
 using VNH.Application.DTOs.Catalog.Users;
 using VNH.Domain;
@@ -7,11 +9,13 @@ namespace VNH.Application.DTOs.Catalog.Posts
 {
     public class PostResponsetDto
     {
-        public string Id { get; set; }
-        public string Title { get; set; }
-        public string Content { get; set; }
-        public string Image { get; set; }
-        public string TopicName { get; set; }
+        public string Id { get; set; } = string.Empty;
+        public string Title { get; set; } = string.Empty;
+        public string Content { get; set; } = string.Empty;
+        public string Image { get; set; } = string.Empty;
+        public DateTime? CreatedAt { get; set; }
+        public DateTime? UpdatedAt { get; set; }
+        public string TopicName { get; set; } = string.Empty;
         public List<TagDto> Tags { get; set; } = new List<TagDto>();
         public UserShortDto UserShort { get; set; } = new UserShortDto();
         public int ViewNumber { get; set; } = 0;

diff --git a/VNH.Application/DTOs/Catalog/Users/UserUpdateDto.cs b/VNH.Application/DTOs/Catalog/Users/UserUpdateDto.cs
@@ -9,13 +9,13 @@ namespace VNH.Application.DTOs.Catalog.Users
     public class UserUpdateDto
     {
         [StringLength(100)]
-        public string Fullname { get; set; } = string.Empty;
+        public string? Fullname { get; set; } = string.Empty;
         [Column(TypeName = "datetime")]
         [DisplayFormat(DataFormatString = "{0:dd-MM-yyyy}", ApplyFormatInEditMode = true)]
         public DateTime? DateOfBirth { get; set; }
         public Gender Gender { get; set; }
-        public virtual string Email { get; set; } = string.Empty;
-        public virtual string PhoneNumber { get; set; } = string.Empty;
-        public virtual string Introduction { get; set; } = string.Empty;
+        public virtual string? Email { get; set; } = string.Empty;
+        public virtual string? PhoneNumber { get; set; } = string.Empty;
+        public virtual string? Introduction { get; set; } = string.Empty;
     }
 }
diff --git a/VNH.Application/Interfaces/Catalog/Accounts/IAccountService.cs b/VNH.Application/Interfaces/Catalog/Accounts/IAccountService.cs
@@ -13,14 +13,15 @@ namespace VNH.Application.Interfaces.Catalog.Accounts
     public interface IAccountService
     {
         Task<ApiResult<string>> Authenticate(LoginRequest request);
-        Task<ApiResult<bool>> Register(RegisterRequest request);
-        Task<ApiResult<bool>> EmailConfirm(string numberConfirm, string email);
+        Task<ApiResult<string>> Register(RegisterRequest request);
+        Task<ApiResult<string>> EmailConfirm(string numberConfirm, string email);
         ClaimsPrincipal ValidateToken(string jwtToken);
         Task<ApiResult<LoginRequest>> ForgetPassword(string email);
         Task<ApiResult<ResetPassDto>> ConfirmCode(string email);
-        Task<ApiResult<bool>> ResetPassword(ResetPassDto resetPass);
+        Task<ApiResult<string>> ResetPassword(ResetPassDto resetPass);
         Task LockAccount(User user);
-        Task<ApiResult<bool>> ChangePassword(ChangePasswordDto changePasswodDto);
+        Task<ApiResult<string>> ChangePassword(ChangePasswordDto changePasswodDto);
         Task<ApiResult<string>> LoginExtend(string email, string name);
+        Task<ApiResult<string>> ChangeEmail(string currentEmail ,string email);
     }
 }
diff --git a/VNH.Application/Interfaces/Catalog/Posts/IPostService.cs b/VNH.Application/Interfaces/Catalog/Posts/IPostService.cs
@@ -9,7 +9,7 @@ public interface IPostService
         Task<ApiResult<PostResponsetDto>> Update(CreatePostDto requestDto, string name);
         Task<ApiResult<PostResponsetDto>> Detail(string Id);
         Task<ApiResult<List<PostResponsetDto>>> GetAll();
-        Task<ApiResult<bool>> Delete(string id);
+        Task<ApiResult<string>> Delete(string id);
 
         Task<ApiResult<string>> AddOrUnLikePost(string id, string userId);
         Task<ApiResult<string>> AddOrRemoveSavePost(string postId, string userId);

diff --git a/VNH.Application/Interfaces/Common/IImageService.cs b/VNH.Application/Interfaces/Common/IImageService.cs
@@ -9,6 +9,7 @@ namespace VNH.Application.Interfaces.Common
 {
     public interface IImageService
     {
+        Task<string> SaveFile(IFormFile file);
         Task<byte[]> ConvertFormFileToByteArray(IFormFile formFile);
         string ConvertByteArrayToString(byte[]? byteArray, Encoding encoding);
         byte[] CompressImage(byte[] originalImage, int KbNumber);

diff --git a/VNH.Application/Interfaces/Common/IStorageService.cs b/VNH.Application/Interfaces/Common/IStorageService.cs
@@ -0,0 +1,10 @@
+
+namespace VNH.Application.Interfaces.Common
+{
+    public interface IStorageService
+    {
+        string GetFileUrl(string fileName);
+        Task SaveFileAsync(Stream mediaBinaryStream, string fileName);
+        Task DeleteFileAsync(string fileName);
+    }
+}
diff --git a/VNH.Domain/Entities/Course.cs b/VNH.Domain/Entities/Course.cs
@@ -30,7 +30,7 @@ public Course()
         public DateTime? CreatedAt { get; set; }
         [Column(TypeName = "datetime")]
         public DateTime? UpdatedAt { get; set; }
-
+        public string Image { get; set; } = string.Empty;
         [ForeignKey("UserId")]
         [InverseProperty("Courses")]
         public virtual User User { get; set; }

diff --git a/VNH.Domain/Entities/Document.cs b/VNH.Domain/Entities/Document.cs
@@ -21,11 +21,11 @@ public Document()
         [Required]
         [StringLength(255)]
         public string Title { get; set; }
-        [StringLength(255)]
+        [StringLength(500)]
         public string Description { get; set; }
         [StringLength(255)]
         [Unicode(false)]
-        public string UrlImage { get; set; }
+        public string Image { get; set; } = string.Empty;
         [StringLength(255)]
         [Unicode(false)]
         public string FileName { get; set; }

diff --git a/VNH.Domain/Entities/News.cs b/VNH.Domain/Entities/News.cs
@@ -16,9 +16,9 @@ public partial class News
         [StringLength(255)]
         public string Title { get; set; }
         [Column(TypeName = "text")]
-        public string Description { get; set; }
+        public string Description { get; set; } = string.Empty;
         [Column(TypeName = "text")]
-        public string Image { get; set; }
+        public string Image { get; set; } = string.Empty;
         [Column(TypeName = "datetime")]
         public DateTime? PubDate { get; set; }
         [Required]

diff --git a/VNH.Domain/Entities/Post.cs b/VNH.Domain/Entities/Post.cs
@@ -33,7 +33,7 @@ public Post()
         [Column(TypeName = "datetime")]
         public DateTime? UpdatedAt { get; set; }
         public Guid? UserId { get; set; }
-        public byte[] Image { get; set; }
+        public string Image { get; set; } = string.Empty;
         public int ViewNumber { get; set; }
 
         [ForeignKey("TopicId")]

diff --git a/VNH.Domain/Entities/User.cs b/VNH.Domain/Entities/User.cs
@@ -47,7 +47,7 @@ public User()
         public DateTime? DateOfBirth { get; set; }
         public string Introduction { get; set; }
         public Gender Gender { get; set; }
-        public byte[] Image { get; set; }
+        public string Image { get; set; } = string.Empty;
         public string NumberConfirm { get; set; } // Confirm Email
         [InverseProperty("User")]
         public virtual ICollection<AnswerVote> AnswerVotes { get; set; }

diff --git a/VNH.Infrastructure/DependencyInjectionInfrastructure.cs b/VNH.Infrastructure/DependencyInjectionInfrastructure.cs
@@ -108,6 +108,9 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
                            .AllowAnyHeader()
                            .AllowAnyMethod()
                            .AllowCredentials();
+                    //builder.AllowAnyOrigin()
+                    //   .AllowAnyHeader()
+                    //   .AllowAnyMethod();
                 });
             });
             services.AddOptions();
@@ -116,8 +119,9 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
             services.Configure<MailSettings>(mailsettings);
             services.AddSingleton<ISendMailService, SendMailService>();
 
-            services.AddSingleton<IImageService, ImageService>();
+            services.AddSingleton<IStorageService, StorageService>();
 
+            services.AddScoped<IImageService, ImageService>();
             services.AddScoped<IHashTag, TagService>();
             services.AddScoped<IAccountService, AccountService>();
             services.AddScoped<ITopicService, TopicService>();

diff --git a/VNH.Infrastructure/Implement/Catalog/Account/AccountService.cs b/VNH.Infrastructure/Implement/Catalog/Account/AccountService.cs
@@ -117,18 +117,18 @@ public async Task<ApiResult<ResetPassDto>> ConfirmCode(string email)
             return new ApiSuccessResult<ResetPassDto>(result);
         }
 
-        public async Task<ApiResult<bool>> EmailConfirm(string numberConfirm, string email)
+        public async Task<ApiResult<string>> EmailConfirm(string numberConfirm, string email)
         {
             var user = await _userManager.FindByEmailAsync(email);
-            if (user is null) return new ApiErrorResult<bool>("Lỗi xác nhận email");
+            if (user is null) return new ApiErrorResult<string>("Lỗi xác nhận email");
             if (user.NumberConfirm.Equals(numberConfirm))
             {
                 user.EmailConfirmed = true;
                 _dataContext.User.Update(user);
                 await _dataContext.SaveChangesAsync();
-                return new ApiSuccessResult<bool>();
+                return new ApiSuccessResult<string>();
             }
-            return new ApiErrorResult<bool>("Xác thực không thành công");
+            return new ApiErrorResult<string>("Xác thực không thành công");
         }
 
         public async Task<ApiResult<LoginRequest>> ForgetPassword(string email)
@@ -158,12 +158,12 @@ public async Task<ApiResult<LoginRequest>> ForgetPassword(string email)
             return new ApiSuccessResult<LoginRequest>(result);
         }
 
-        public async Task<ApiResult<bool>> Register(RegisterRequest request)
+        public async Task<ApiResult<string>> Register(RegisterRequest request)
         {
             try
             {
                 var user = await _userManager.FindByEmailAsync(request.Email);
-                if (user != null) return new ApiErrorResult<bool>("Email đã tồn tại");
+                if (user != null) return new ApiErrorResult<string>("Email đã tồn tại");
                 var confirmNumber = GetConfirmCode();
                 user = new User()
                 {
@@ -185,16 +185,16 @@ public async Task<ApiResult<bool>> Register(RegisterRequest request)
                         await SendConfirmCodeToEmail(request.Email, confirmNumber);
 
                         await _userManager.AddToRoleAsync(getUser, role);
-                        return new ApiSuccessResult<bool>();
+                        return new ApiSuccessResult<string>();
                     }
                 }
 
-                return new ApiErrorResult<bool>("Đăng ký không thành công : Mật khẩu không hợp lệ, yêu cầu gồm có ít 6 ký tự bao gồm ký tự: Hoa, thường, số, ký tự đặc biệt ");
+                return new ApiErrorResult<string>("Đăng ký không thành công : Mật khẩu không hợp lệ, yêu cầu gồm có ít 6 ký tự bao gồm ký tự: Hoa, thường, số, ký tự đặc biệt ");
             }
             catch (Exception ex)
             {
                 _logger.LogError("Xảy ra lỗi trong quá trình đăng ký | ", ex.Message);
-                return new ApiErrorResult<bool>("Lỗi đăng ký!");
+                return new ApiErrorResult<string>("Lỗi đăng ký!");
             }
         }
 
@@ -310,15 +310,15 @@ public ClaimsPrincipal ValidateToken(string jwtToken)
             return principal;
         }
 
-        public async Task<ApiResult<bool>> ResetPassword(ResetPassDto resetPass)
+        public async Task<ApiResult<string>> ResetPassword(ResetPassDto resetPass)
         {
             var user = await _userManager.FindByEmailAsync(resetPass.Email);
-            if (user is null) return new ApiErrorResult<bool>("Lỗi");
+            if (user is null) return new ApiErrorResult<string>("Lỗi");
             var resetPasswordResult = await _userManager.ResetPasswordAsync(user, resetPass.Token, resetPass.Password);
             if (!resetPasswordResult.Succeeded)
             {
                 _logger.LogError("Xảy ra lỗi trong quá trình xử lý | ", resetPasswordResult.Errors.Select(e => e.Description));
-                return new ApiErrorResult<bool>("Lỗi!");
+                return new ApiErrorResult<string>("Lỗi!");
             }
             if (user.AccessFailedCount is 5)
             {
@@ -327,7 +327,7 @@ public async Task<ApiResult<bool>> ResetPassword(ResetPassDto resetPass)
                 _dataContext.User.Update(user);
                 await _dataContext.SaveChangesAsync();
             }
-            return new ApiSuccessResult<bool>();
+            return new ApiSuccessResult<string>();
         }
 
         public async Task LockAccount(User user)
@@ -338,20 +338,20 @@ public async Task LockAccount(User user)
             await _dataContext.SaveChangesAsync();
         }
 
-        public async Task<ApiResult<bool>> ChangePassword(ChangePasswordDto changePasswodDto)
+        public async Task<ApiResult<string>> ChangePassword(ChangePasswordDto changePasswodDto)
         {
             var user = await _userManager.FindByEmailAsync(changePasswodDto.Email);
             var passwordCheckResult = await _userManager.CheckPasswordAsync(user, changePasswodDto.Password);
             if (!passwordCheckResult)
             {
-            return new ApiErrorResult<bool>("Mật khẩu hiện tại không đúng");
+            return new ApiErrorResult<string>("Mật khẩu hiện tại không đúng");
             } 
             var changePasswordResult = await _userManager.ChangePasswordAsync(user, changePasswodDto.Password, changePasswodDto.NewPassword);
             if (changePasswordResult.Succeeded)
             {
-                return new ApiSuccessResult<bool>();
+                return new ApiSuccessResult<string>();
             }
-            return new ApiErrorResult<bool>("Đổi mật khẩu không thành công");
+            return new ApiErrorResult<string>("Đổi mật khẩu không thành công");
         }
 
         public async Task<ApiResult<string>> LoginExtend(string email, string name)
@@ -367,5 +367,20 @@ public async Task<ApiResult<string>> LoginExtend(string email, string name)
             await _signInManager.SignInAsync(user, isPersistent: false);
             return new ApiSuccessResult<string>(await GetToken(user));
         }
+
+        public async Task<ApiResult<string>> ChangeEmail(string currentEmail, string email)
+        {
+            var user = await _userManager.FindByEmailAsync(currentEmail);
+            var token = await _userManager.GenerateChangeEmailTokenAsync(user, email);
+            user.UserName = email;
+            user.NormalizedEmail = email;
+            user.NormalizedUserName = email;
+            var changeEmailResult = await _userManager.ChangeEmailAsync(user, email, token);
+            if (changeEmailResult.Succeeded)
+            {
+                return new ApiSuccessResult<string>( await GetToken(user));
+            }
+            return new ApiErrorResult<string>("Đổi email không thành công");
+        }
     }
 }