From ef14a1e9b7ecbcf23fdf3e47a260b81772fc3816 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Thu, 13 May 2021 15:41:39 +0300 Subject: Updated user controller models being of type UserViewModel, when they should be like UserWebModel --- .../Web/Configurations/ControllerUserMappings.cs | 10 +++--- ExamTemplate/Web/Controllers/AccountController.cs | 36 +++++++++++----------- ExamTemplate/Web/Models/User/EditUserViewModel.cs | 19 ------------ ExamTemplate/Web/Models/User/EditUserWebModel.cs | 19 ++++++++++++ ExamTemplate/Web/Models/User/LoginUserViewModel.cs | 15 --------- ExamTemplate/Web/Models/User/LoginUserWebModel.cs | 15 +++++++++ .../Web/Models/User/RegisterUserViewModel.cs | 23 -------------- .../Web/Models/User/RegisterUserWebModel.cs | 23 ++++++++++++++ ExamTemplate/Web/Models/User/UserViewModel.cs | 9 ------ ExamTemplate/Web/Models/User/UserWebModel.cs | 9 ++++++ ExamTemplate/Web/Views/Account/Edit.cshtml | 2 +- ExamTemplate/Web/Views/Account/Login.cshtml | 2 +- ExamTemplate/Web/Views/Account/Profile.cshtml | 2 +- ExamTemplate/Web/Views/Account/Register.cshtml | 2 +- 14 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 ExamTemplate/Web/Models/User/EditUserViewModel.cs create mode 100644 ExamTemplate/Web/Models/User/EditUserWebModel.cs delete mode 100644 ExamTemplate/Web/Models/User/LoginUserViewModel.cs create mode 100644 ExamTemplate/Web/Models/User/LoginUserWebModel.cs delete mode 100644 ExamTemplate/Web/Models/User/RegisterUserViewModel.cs create mode 100644 ExamTemplate/Web/Models/User/RegisterUserWebModel.cs delete mode 100644 ExamTemplate/Web/Models/User/UserViewModel.cs create mode 100644 ExamTemplate/Web/Models/User/UserWebModel.cs (limited to 'ExamTemplate') diff --git a/ExamTemplate/Web/Configurations/ControllerUserMappings.cs b/ExamTemplate/Web/Configurations/ControllerUserMappings.cs index 9b798e6..05c57e2 100644 --- a/ExamTemplate/Web/Configurations/ControllerUserMappings.cs +++ b/ExamTemplate/Web/Configurations/ControllerUserMappings.cs @@ -8,11 +8,11 @@ namespace ExamTemplate.Services.Configurations { public ControllerUserMappings() { - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); } } } diff --git a/ExamTemplate/Web/Controllers/AccountController.cs b/ExamTemplate/Web/Controllers/AccountController.cs index 414304f..2c2eb32 100644 --- a/ExamTemplate/Web/Controllers/AccountController.cs +++ b/ExamTemplate/Web/Controllers/AccountController.cs @@ -29,22 +29,22 @@ namespace ExamTemplate.Web.Controllers [HttpPost] [AllowAnonymous] - public async Task Register(RegisterUserViewModel registerUserViewModel) + public async Task Register(RegisterUserWebModel registerUserWebModel) { if (!ModelState.IsValid) - return View(registerUserViewModel); + return View(registerUserWebModel); - RegisterUserServiceModel registerUserServiceModel = this._autoMapper.Map(registerUserViewModel); + RegisterUserServiceModel registerUserServiceModel = this._autoMapper.Map(registerUserWebModel); bool result = await this._userService.RegisterUserAsync(registerUserServiceModel); if (result) - return await this.Login(new LoginUserViewModel { + return await this.Login(new LoginUserWebModel { Username = registerUserServiceModel.Username, Password = registerUserServiceModel.Password }); else - return View(registerUserViewModel); + return View(registerUserWebModel); } [HttpGet] @@ -56,19 +56,19 @@ namespace ExamTemplate.Web.Controllers [HttpPost] [AllowAnonymous] - public async Task Login(LoginUserViewModel loginUserViewModel) + public async Task Login(LoginUserWebModel loginUserWebModel) { if (!ModelState.IsValid) - return View(loginUserViewModel); + return View(loginUserWebModel); - LoginUserServiceModel loginUserServiceModel = this._autoMapper.Map(loginUserViewModel); + LoginUserServiceModel loginUserServiceModel = this._autoMapper.Map(loginUserWebModel); bool result = await this._userService.LoginUserAsync(loginUserServiceModel); if (result) return RedirectToAction("Index", "Home"); else - return View(loginUserViewModel); + return View(loginUserWebModel); } [HttpPost] @@ -88,9 +88,9 @@ namespace ExamTemplate.Web.Controllers if (userServiceModel == default(UserServiceModel)) return RedirectToAction("ErrorNotFound", "Home"); - UserViewModel userViewModel = this._autoMapper.Map(userServiceModel); + UserWebModel userWebModel = this._autoMapper.Map(userServiceModel); - return View(userViewModel); + return View(userWebModel); } [HttpGet] @@ -101,31 +101,31 @@ namespace ExamTemplate.Web.Controllers if (userServiceModel == default(UserServiceModel)) return RedirectToAction("ErrorNotFound", "Home"); - EditUserViewModel editUserViewModel = this._autoMapper.Map(userServiceModel); + EditUserWebModel editUserWebModel = this._autoMapper.Map(userServiceModel); - return View(editUserViewModel); + return View(editUserWebModel); } [HttpPost] - public async Task Edit(EditUserViewModel editUserViewModel) + public async Task Edit(EditUserWebModel editUserWebModel) { if (!ModelState.IsValid) - return View(editUserViewModel); + return View(editUserWebModel); if (!this._userService.IsSignedIn(HttpContext.User)) return RedirectToAction("Login"); UserServiceModel loggedInUser = await this._userService.GetUserByClaimsAsync(HttpContext.User); - UserServiceModel userServiceModel = this._autoMapper.Map(editUserViewModel); + UserServiceModel userServiceModel = this._autoMapper.Map(editUserWebModel); bool result = await this._userService.EditUserAsync(HttpContext.User, userServiceModel); if (result) { - if (loggedInUser.Username != editUserViewModel.Username) + if (loggedInUser.Username != editUserWebModel.Username) await this._userService.LogoutAsync(); - return RedirectToAction("Profile", new { username = editUserViewModel.Username }); + return RedirectToAction("Profile", new { username = editUserWebModel.Username }); } else return RedirectToAction("Profile", new { username = loggedInUser.Username }); diff --git a/ExamTemplate/Web/Models/User/EditUserViewModel.cs b/ExamTemplate/Web/Models/User/EditUserViewModel.cs deleted file mode 100644 index 56f3d05..0000000 --- a/ExamTemplate/Web/Models/User/EditUserViewModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace ExamTemplate.Web.Models.User -{ - public class EditUserViewModel - { - [Required] - [MinLength(1)] - public string FirstName { get; set; } - - [Required] - [MinLength(1)] - public string LastName { get; set; } - - [Required] - [MinLength(1)] - public string Username { get; set; } - } -} diff --git a/ExamTemplate/Web/Models/User/EditUserWebModel.cs b/ExamTemplate/Web/Models/User/EditUserWebModel.cs new file mode 100644 index 0000000..119a585 --- /dev/null +++ b/ExamTemplate/Web/Models/User/EditUserWebModel.cs @@ -0,0 +1,19 @@ +using System.ComponentModel.DataAnnotations; + +namespace ExamTemplate.Web.Models.User +{ + public class EditUserWebModel + { + [Required] + [MinLength(1)] + public string FirstName { get; set; } + + [Required] + [MinLength(1)] + public string LastName { get; set; } + + [Required] + [MinLength(1)] + public string Username { get; set; } + } +} diff --git a/ExamTemplate/Web/Models/User/LoginUserViewModel.cs b/ExamTemplate/Web/Models/User/LoginUserViewModel.cs deleted file mode 100644 index dd917cf..0000000 --- a/ExamTemplate/Web/Models/User/LoginUserViewModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace ExamTemplate.Web.Models.User -{ - public class LoginUserViewModel - { - [Required] - [MinLength(1)] - public string Username { get; set; } - - [Required] - [MinLength(1)] - public string Password { get; set; } - } -} diff --git a/ExamTemplate/Web/Models/User/LoginUserWebModel.cs b/ExamTemplate/Web/Models/User/LoginUserWebModel.cs new file mode 100644 index 0000000..0f4ef73 --- /dev/null +++ b/ExamTemplate/Web/Models/User/LoginUserWebModel.cs @@ -0,0 +1,15 @@ +using System.ComponentModel.DataAnnotations; + +namespace ExamTemplate.Web.Models.User +{ + public class LoginUserWebModel + { + [Required] + [MinLength(1)] + public string Username { get; set; } + + [Required] + [MinLength(1)] + public string Password { get; set; } + } +} diff --git a/ExamTemplate/Web/Models/User/RegisterUserViewModel.cs b/ExamTemplate/Web/Models/User/RegisterUserViewModel.cs deleted file mode 100644 index ef6015b..0000000 --- a/ExamTemplate/Web/Models/User/RegisterUserViewModel.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace ExamTemplate.Web.Models.User -{ - public class RegisterUserViewModel - { - [Required] - [MinLength(1)] - public string FirstName { get; set; } - - [Required] - [MinLength(1)] - public string LastName { get; set; } - - [Required] - [MinLength(1)] - public string Username { get; set; } - - [Required] - [MinLength(3)] - public string Password { get; set; } - } -} diff --git a/ExamTemplate/Web/Models/User/RegisterUserWebModel.cs b/ExamTemplate/Web/Models/User/RegisterUserWebModel.cs new file mode 100644 index 0000000..c443dd2 --- /dev/null +++ b/ExamTemplate/Web/Models/User/RegisterUserWebModel.cs @@ -0,0 +1,23 @@ +using System.ComponentModel.DataAnnotations; + +namespace ExamTemplate.Web.Models.User +{ + public class RegisterUserWebModel + { + [Required] + [MinLength(1)] + public string FirstName { get; set; } + + [Required] + [MinLength(1)] + public string LastName { get; set; } + + [Required] + [MinLength(1)] + public string Username { get; set; } + + [Required] + [MinLength(3)] + public string Password { get; set; } + } +} diff --git a/ExamTemplate/Web/Models/User/UserViewModel.cs b/ExamTemplate/Web/Models/User/UserViewModel.cs deleted file mode 100644 index 4cd815f..0000000 --- a/ExamTemplate/Web/Models/User/UserViewModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace ExamTemplate.Web.Models.User -{ - public class UserViewModel - { - public string FirstName { get; set; } - public string LastName { get; set; } - public string Username { get; set; } - } -} diff --git a/ExamTemplate/Web/Models/User/UserWebModel.cs b/ExamTemplate/Web/Models/User/UserWebModel.cs new file mode 100644 index 0000000..af8d6c7 --- /dev/null +++ b/ExamTemplate/Web/Models/User/UserWebModel.cs @@ -0,0 +1,9 @@ +namespace ExamTemplate.Web.Models.User +{ + public class UserWebModel + { + public string FirstName { get; set; } + public string LastName { get; set; } + public string Username { get; set; } + } +} diff --git a/ExamTemplate/Web/Views/Account/Edit.cshtml b/ExamTemplate/Web/Views/Account/Edit.cshtml index 0839cc7..a088742 100644 --- a/ExamTemplate/Web/Views/Account/Edit.cshtml +++ b/ExamTemplate/Web/Views/Account/Edit.cshtml @@ -1,4 +1,4 @@ -@model EditUserViewModel +@model EditUserWebModel @{ ViewData["Title"] = "Edit Profile"; } diff --git a/ExamTemplate/Web/Views/Account/Login.cshtml b/ExamTemplate/Web/Views/Account/Login.cshtml index 82a90c0..daa3f3e 100644 --- a/ExamTemplate/Web/Views/Account/Login.cshtml +++ b/ExamTemplate/Web/Views/Account/Login.cshtml @@ -1,4 +1,4 @@ -@model ExamTemplate.Web.Models.User.LoginUserViewModel +@model LoginUserWebModel @{ ViewData["Title"] = "Login"; } diff --git a/ExamTemplate/Web/Views/Account/Profile.cshtml b/ExamTemplate/Web/Views/Account/Profile.cshtml index 322cb85..33fc882 100644 --- a/ExamTemplate/Web/Views/Account/Profile.cshtml +++ b/ExamTemplate/Web/Views/Account/Profile.cshtml @@ -3,7 +3,7 @@ @inject SignInManager SignInManager @inject UserManager UserManager -@model UserViewModel +@model UserWebModel @{ ViewData["Title"] = Model.Username + "'s Profile"; } diff --git a/ExamTemplate/Web/Views/Account/Register.cshtml b/ExamTemplate/Web/Views/Account/Register.cshtml index 9514ed3..e436d72 100644 --- a/ExamTemplate/Web/Views/Account/Register.cshtml +++ b/ExamTemplate/Web/Views/Account/Register.cshtml @@ -1,4 +1,4 @@ -@model ExamTemplate.Web.Models.User.RegisterUserViewModel +@model RegisterUserWebModel @{ ViewData["Title"] = "Register"; } -- cgit v1.2.3