From c168df0990672c2129a70b903087c8bc2cda707c Mon Sep 17 00:00:00 2001 From: Syndamia Date: Wed, 9 Dec 2020 13:01:19 +0200 Subject: Updated User class private members to follow our team's code style conventions --- Models/Classes/User.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Models') diff --git a/Models/Classes/User.cs b/Models/Classes/User.cs index 1e3b946..c40a69a 100644 --- a/Models/Classes/User.cs +++ b/Models/Classes/User.cs @@ -9,9 +9,9 @@ namespace Models.Classes [Table("Users")] public class User : IdentityUser { - private string firstName; - private string lastName; - private string profilePicture; + private string _firstName; + private string _lastName; + private string _profilePicture; [Required] [Range(3, 50)] @@ -30,11 +30,11 @@ namespace Models.Classes [Range(3, 30)] public string FirstName { - get => this.firstName; + get => this._firstName; set { ValidateString("FirstName", 3, 30, value, false); - this.firstName = value; + this._firstName = value; } } @@ -42,21 +42,21 @@ namespace Models.Classes [Range(3, 30)] public string LastName { - get => this.lastName; + get => this._lastName; set { ValidateString("LastName", 3, 30, value, false); - this.lastName = value; + this._lastName = value; } } public string ProfilePicture { - get => this.profilePicture; + get => this._profilePicture; set { ValidateURL(value); - this.profilePicture = value; + this._profilePicture = value; } } -- cgit v1.2.3 From c37b614ff35135da4b0560b32470fbcc1c6b51f7 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Wed, 9 Dec 2020 13:13:23 +0200 Subject: Removed test class from models --- Models/Classes/Test.cs | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Models/Classes/Test.cs (limited to 'Models') diff --git a/Models/Classes/Test.cs b/Models/Classes/Test.cs deleted file mode 100644 index 3e965dd..0000000 --- a/Models/Classes/Test.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Models.Classes -{ - public class Test - { - public void TestMe() - { - - } - } -} \ No newline at end of file -- cgit v1.2.3 From 12716303151a3f88bfb614132925eca47a9f39dd Mon Sep 17 00:00:00 2001 From: Syndamia Date: Wed, 9 Dec 2020 14:53:15 +0200 Subject: Fixed User class string validation --- Models/Classes/User.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Models') diff --git a/Models/Classes/User.cs b/Models/Classes/User.cs index c40a69a..e5a83d6 100644 --- a/Models/Classes/User.cs +++ b/Models/Classes/User.cs @@ -72,9 +72,10 @@ namespace Models.Classes throw new ArgumentException($"{name} length cannot be less than {minLength} and more than {maxLength}."); foreach (char character in value) // more efficient than Linq - { - if (!Char.IsLetter(character) || (canBeDigit && !Char.IsDigit(character))) - throw new ArgumentException($"{name} contains invalid characters."); + { + if (!Char.IsLetter(character)) + if (!(Char.IsDigit(character) && canBeDigit)) + throw new ArgumentException($"{name} contains invalid characters."); } } -- cgit v1.2.3