From 6a85255c78a448256fab68cd361983ffc85f2b03 Mon Sep 17 00:00:00 2001 From: transtrike Date: Fri, 11 Dec 2020 14:35:39 +0200 Subject: Renamed Models to Data --- Models/Classes/Language.cs | 7 --- Models/Classes/Roles.cs | 9 --- Models/Classes/Technology.cs | 7 --- Models/Classes/User.cs | 93 ------------------------------- Models/DTOs/UserDTO.cs | 11 ---- Models/Interfaces/Database/IRepository.cs | 24 -------- Models/Models.csproj | 14 ----- Models/Profiles/UserProfile.cs | 14 ----- 8 files changed, 179 deletions(-) delete mode 100644 Models/Classes/Language.cs delete mode 100644 Models/Classes/Roles.cs delete mode 100644 Models/Classes/Technology.cs delete mode 100644 Models/Classes/User.cs delete mode 100644 Models/DTOs/UserDTO.cs delete mode 100644 Models/Interfaces/Database/IRepository.cs delete mode 100644 Models/Models.csproj delete mode 100644 Models/Profiles/UserProfile.cs (limited to 'Models') diff --git a/Models/Classes/Language.cs b/Models/Classes/Language.cs deleted file mode 100644 index 95f7120..0000000 --- a/Models/Classes/Language.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Models.Classes -{ - public class Language - { - public int Id { get; set; } - } -} diff --git a/Models/Classes/Roles.cs b/Models/Classes/Roles.cs deleted file mode 100644 index 12f4665..0000000 --- a/Models/Classes/Roles.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Microsoft.AspNetCore.Identity; - -namespace Models.Classes -{ - public class Roles : IdentityRole - { - - } -} \ No newline at end of file diff --git a/Models/Classes/Technology.cs b/Models/Classes/Technology.cs deleted file mode 100644 index 3ffeebb..0000000 --- a/Models/Classes/Technology.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Models.Classes -{ - public class Technology - { - public int Id { get; set; } - } -} diff --git a/Models/Classes/User.cs b/Models/Classes/User.cs deleted file mode 100644 index 72ecb26..0000000 --- a/Models/Classes/User.cs +++ /dev/null @@ -1,93 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.AspNetCore.Identity; -using System.Collections.Generic; - -namespace Models.Classes -{ - [Table("Users")] - public class User : IdentityUser - { - private string _firstName; - private string _lastName; - private string _profilePicture; - - [Required] - [Range(3, 50)] - [Display(Name = "Username")] - public override string UserName - { - get => base.UserName; - set - { - ValidateString("Username", 3, 50, value, true); - base.UserName = value; - } - } - - [Required] - [Range(3, 30)] - public string FirstName - { - get => this._firstName; - set - { - ValidateString("FirstName", 3, 30, value, false); - this._firstName = value; - } - } - - [Required] - [Range(3, 30)] - public string LastName - { - get => this._lastName; - set - { - ValidateString("LastName", 3, 30, value, false); - this._lastName = value; - } - } - - public string ProfilePicture - { - get => this._profilePicture; - set - { - ValidateURL(value); - this._profilePicture = value; - } - } - - // public List Friends { get; set; } - - /// - /// Throws an argument exception if the given value is not composed only of letters, and if specified, also of digits. - /// Does nothing otherwise. - /// - private static void ValidateString(string name, int minLength, int maxLength, string value, bool canBeDigit) - { - if (value.Length < minLength || value.Length > maxLength) - 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)) - if (!(Char.IsDigit(character) && canBeDigit)) - throw new ArgumentException($"{name} contains invalid characters."); - } - } - - /// - /// Throws an exception if the absolute url isn't valid. - /// Does nothing otherwise. - /// - private static void ValidateURL(string urlValue) - { - // Throws an error is URL is invalid - Uri validatedUri; - Uri.TryCreate(urlValue, UriKind.Absolute, out validatedUri); - } - } -} diff --git a/Models/DTOs/UserDTO.cs b/Models/DTOs/UserDTO.cs deleted file mode 100644 index 6c4e273..0000000 --- a/Models/DTOs/UserDTO.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Models.DTOs -{ - public class UserDTO - { - public int Id { get; set; } - public string UserName { get; set; } - public string Email { get; set; } - public string FirstName { get; set; } - public string LastName { get; set; } - } -} \ No newline at end of file diff --git a/Models/Interfaces/Database/IRepository.cs b/Models/Interfaces/Database/IRepository.cs deleted file mode 100644 index 449a807..0000000 --- a/Models/Interfaces/Database/IRepository.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace Models.Interfaces.Database -{ - public interface IRepository - where TEntity : class - { - //Add Entity to database - Task AddAsync(TEntity entity); - - //Return *count* instances of Entity from the database - IEnumerable Query(int count); - - //Find entity by id - Task FindByIdAsync(object id); - - //Modify Entity from database - Task EditAsync(object id, TEntity newEntity); - - //Delete Entity from database - Task DeleteAsync(object id); - } -} \ No newline at end of file diff --git a/Models/Models.csproj b/Models/Models.csproj deleted file mode 100644 index 94e0981..0000000 --- a/Models/Models.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net5.0 - Models - - - - - - - - - diff --git a/Models/Profiles/UserProfile.cs b/Models/Profiles/UserProfile.cs deleted file mode 100644 index df74920..0000000 --- a/Models/Profiles/UserProfile.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Models.Classes; -using Models.DTOs; -using AutoMapper; - -namespace Models.Profiles -{ - public class UserProfile : Profile - { - public UserProfile() - { - CreateMap(); - } - } -} -- cgit v1.2.3