From cbba5c737230ce48214331dd7521705942d5dfcb Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Thu, 31 Mar 2022 20:35:19 +0300 Subject: [PATCH] refactor: add validation data annotatison to database models --- ... 20220331173119_InitialCreate.Designer.cs} | 8 ++++- ...ate.cs => 20220331173119_InitialCreate.cs} | 12 +++---- .../TicketOfficeContextModelSnapshot.cs | 6 ++++ TicketOffice/Models/City.cs | 14 ++++++++ TicketOffice/Models/Route.cs | 13 +++++++ TicketOffice/Models/SeedData.cs | 3 +- TicketOffice/Models/Ticket.cs | 6 ++++ TicketOffice/Models/User.cs | 32 ++++++++++++++++++ .../wwwroot/db/TicketOffice-SQLite.db | Bin 45056 -> 45056 bytes 9 files changed, 86 insertions(+), 8 deletions(-) rename TicketOffice/Migrations/{20220330145408_InitialCreate.Designer.cs => 20220331173119_InitialCreate.Designer.cs} (94%) rename TicketOffice/Migrations/{20220330145408_InitialCreate.cs => 20220331173119_InitialCreate.cs} (93%) diff --git a/TicketOffice/Migrations/20220330145408_InitialCreate.Designer.cs b/TicketOffice/Migrations/20220331173119_InitialCreate.Designer.cs similarity index 94% rename from TicketOffice/Migrations/20220330145408_InitialCreate.Designer.cs rename to TicketOffice/Migrations/20220331173119_InitialCreate.Designer.cs index ed2fb5c..0144171 100644 --- a/TicketOffice/Migrations/20220330145408_InitialCreate.Designer.cs +++ b/TicketOffice/Migrations/20220331173119_InitialCreate.Designer.cs @@ -11,7 +11,7 @@ using TicketOffice.Data; namespace TicketOffice.Migrations { [DbContext(typeof(TicketOfficeContext))] - [Migration("20220330145408_InitialCreate")] + [Migration("20220331173119_InitialCreate")] partial class InitialCreate { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -33,6 +33,7 @@ namespace TicketOffice.Migrations b.Property("Name") .IsRequired() + .HasMaxLength(24) .HasColumnType("TEXT"); b.Property("RouteId") @@ -91,22 +92,27 @@ namespace TicketOffice.Migrations b.Property("Email") .IsRequired() + .HasMaxLength(48) .HasColumnType("TEXT"); b.Property("FirstName") + .HasMaxLength(24) .HasColumnType("TEXT"); b.Property("IsManager") .HasColumnType("INTEGER"); b.Property("LastName") + .HasMaxLength(24) .HasColumnType("TEXT"); b.Property("Password") .IsRequired() + .HasMaxLength(32) .HasColumnType("TEXT"); b.Property("Patronymic") + .HasMaxLength(24) .HasColumnType("TEXT"); b.HasKey("Id"); diff --git a/TicketOffice/Migrations/20220330145408_InitialCreate.cs b/TicketOffice/Migrations/20220331173119_InitialCreate.cs similarity index 93% rename from TicketOffice/Migrations/20220330145408_InitialCreate.cs rename to TicketOffice/Migrations/20220331173119_InitialCreate.cs index 81b092b..72c6fc1 100644 --- a/TicketOffice/Migrations/20220330145408_InitialCreate.cs +++ b/TicketOffice/Migrations/20220331173119_InitialCreate.cs @@ -29,11 +29,11 @@ namespace TicketOffice.Migrations { Id = table.Column(type: "INTEGER", nullable: false) .Annotation("Sqlite:Autoincrement", true), - FirstName = table.Column(type: "TEXT", nullable: true), - LastName = table.Column(type: "TEXT", nullable: true), - Patronymic = table.Column(type: "TEXT", nullable: true), - Email = table.Column(type: "TEXT", nullable: false), - Password = table.Column(type: "TEXT", nullable: false), + FirstName = table.Column(type: "TEXT", maxLength: 24, nullable: true), + LastName = table.Column(type: "TEXT", maxLength: 24, nullable: true), + Patronymic = table.Column(type: "TEXT", maxLength: 24, nullable: true), + Email = table.Column(type: "TEXT", maxLength: 48, nullable: false), + Password = table.Column(type: "TEXT", maxLength: 32, nullable: false), IsManager = table.Column(type: "INTEGER", nullable: false) }, constraints: table => @@ -47,7 +47,7 @@ namespace TicketOffice.Migrations { Id = table.Column(type: "INTEGER", nullable: false) .Annotation("Sqlite:Autoincrement", true), - Name = table.Column(type: "TEXT", nullable: false), + Name = table.Column(type: "TEXT", maxLength: 24, nullable: false), ArrivalTime = table.Column(type: "TEXT", nullable: true), DepartureTime = table.Column(type: "TEXT", nullable: true), RouteId = table.Column(type: "INTEGER", nullable: false) diff --git a/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs b/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs index d1bcbaf..d9b8e6f 100644 --- a/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs +++ b/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs @@ -31,6 +31,7 @@ namespace TicketOffice.Migrations b.Property("Name") .IsRequired() + .HasMaxLength(24) .HasColumnType("TEXT"); b.Property("RouteId") @@ -89,22 +90,27 @@ namespace TicketOffice.Migrations b.Property("Email") .IsRequired() + .HasMaxLength(48) .HasColumnType("TEXT"); b.Property("FirstName") + .HasMaxLength(24) .HasColumnType("TEXT"); b.Property("IsManager") .HasColumnType("INTEGER"); b.Property("LastName") + .HasMaxLength(24) .HasColumnType("TEXT"); b.Property("Password") .IsRequired() + .HasMaxLength(32) .HasColumnType("TEXT"); b.Property("Patronymic") + .HasMaxLength(24) .HasColumnType("TEXT"); b.HasKey("Id"); diff --git a/TicketOffice/Models/City.cs b/TicketOffice/Models/City.cs index 1d47f4b..f6eaea7 100644 --- a/TicketOffice/Models/City.cs +++ b/TicketOffice/Models/City.cs @@ -1,15 +1,29 @@ using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; namespace TicketOffice.Models; public class City { + [Key] public int Id { get; set; } + [MaxLength(24, ErrorMessage = "Назва міста не може бути більше 24 символів"), + MinLength(2, ErrorMessage = "Назва міста не може бути менше 2 символів")] + [Display(Name = "Назва міста")] + [Required(ErrorMessage = "Поле має бути заповненим")] public string Name { get; set; } + + [Display(Name = "Дата відправлення")] + [DataType(DataType.Date)] public DateTime? ArrivalTime { get; set; } + + [Display(Name = "Дата прибуття")] + [DataType(DataType.Date)] public DateTime? DepartureTime { get; set; } + + [ForeignKey("Route")] public int RouteId { get; set; } public Route Route { get; set; } } \ No newline at end of file diff --git a/TicketOffice/Models/Route.cs b/TicketOffice/Models/Route.cs index de76b0e..4a11840 100644 --- a/TicketOffice/Models/Route.cs +++ b/TicketOffice/Models/Route.cs @@ -1,14 +1,27 @@ using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; namespace TicketOffice.Models; public class Route { + [Key] public int Id { get; set; } + + [Required(ErrorMessage = "Поле має бути заповненим")] + [Display(Name = "Номер")] + [Range(1, 256)] public int Number { get; set; } + + [Required(ErrorMessage = "Поле має бути заповненим")] + [Display(Name = "Ємність")] + [Range(5, 40)] public int Capacity { get; set; } + + [Required] public ICollection Cities { get; set; } public ICollection? Tickets { get; set; } } \ No newline at end of file diff --git a/TicketOffice/Models/SeedData.cs b/TicketOffice/Models/SeedData.cs index a77e609..042d502 100644 --- a/TicketOffice/Models/SeedData.cs +++ b/TicketOffice/Models/SeedData.cs @@ -8,7 +8,8 @@ public class SeedData public static void Initialize(IServiceProvider serviceProvider) { using var context = - new TicketOfficeContext(serviceProvider.GetRequiredService>()); + new TicketOfficeContext(serviceProvider + .GetRequiredService>()); if (context == null) { diff --git a/TicketOffice/Models/Ticket.cs b/TicketOffice/Models/Ticket.cs index bcd7bb8..d433368 100644 --- a/TicketOffice/Models/Ticket.cs +++ b/TicketOffice/Models/Ticket.cs @@ -1,12 +1,18 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + namespace TicketOffice.Models; public class Ticket { + [Key] public int Id { get; set; } + [ForeignKey("User")] public int UserId { get; set; } public User User { get; set; } + [ForeignKey("Route")] public int RouteId { get; set; } public Route Route { get; set; } } \ No newline at end of file diff --git a/TicketOffice/Models/User.cs b/TicketOffice/Models/User.cs index 393358e..45f826e 100644 --- a/TicketOffice/Models/User.cs +++ b/TicketOffice/Models/User.cs @@ -1,18 +1,50 @@ using System.ComponentModel.DataAnnotations; +using System.Net.Mail; namespace TicketOffice.Models; public class User { + [Key] public int Id { get; set; } + [MaxLength(24, ErrorMessage = "Ім'я не може бути більше 24 символів"), + MinLength(4, ErrorMessage = "Ім'я не може бути менше 4 символів")] + [Display(Name = "Ім'я")] public string? FirstName { get; set; } + + [MaxLength(24, ErrorMessage = "Прізвище не може бути більше 24 символів"), + MinLength(4, ErrorMessage = "Прізвище не може бути менше 4 символів")] + [Display(Name = "Прізвище")] public string? LastName { get; set; } + + [MaxLength(24, ErrorMessage = "Ім'я по батькові не може бути більше 24 символів"), + MinLength(4, ErrorMessage = "Ім'я по батькові не може бути менше 4 символів")] + [Display(Name = "По батькові")] public string? Patronymic { get; set; } + + [MaxLength(48, ErrorMessage = "E-mail не може бути більше 48 символів"), + MinLength(6, ErrorMessage = "E-mail не може бути менше 6 символів")] + [Required(ErrorMessage = "Поле має бути заповненим")] + [Display(Name = "E-mail")] + [DataType(DataType.EmailAddress)] + [RegularExpression(@"^[^@\s]+@[^@\s]+\.[^@\s]+$", + ErrorMessage = "E-mail невалідний")] public string Email { get; set; } + + [MaxLength(32, ErrorMessage = "Пароль не може бути більше 32 символів"), + MinLength(8, ErrorMessage = "Пороль не може бути менше 8 символів")] + [Required(ErrorMessage = "Поле має бути заповненим")] + [Display(Name = "Пароль")] + [DataType(DataType.Password)] + [RegularExpression(@"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$", + ErrorMessage = "Пароль має містити 1 маленьку та велику літери, 1 цифру, 1 спеціальний символ (#, $, @ та ін.), бути написаний латиницею та мати більше 8 символів")] public string Password { get; set; } + public ICollection? Tickets { get; set; } + + [Required] public bool IsManager { get; set; } } \ No newline at end of file diff --git a/TicketOffice/wwwroot/db/TicketOffice-SQLite.db b/TicketOffice/wwwroot/db/TicketOffice-SQLite.db index 3821e933f0cd769a2f37394916898600001d95c1..5e4ed1883633968824d97242e5d1e1ac7a2f52e7 100644 GIT binary patch delta 69 zcmZp8z|`=7X~Q#lc0)sRV?#sB&2Q!Z@ryz^@t%2^C7Fpi&PAz-C8>)F1mK8~cQfOJ L|MH6#2mlcPZWS3x delta 984 zcmah|O=uHA6rP{WW;c+$6cP2(RK$akB%5r~BwGtg59&^#2jz4v`@r`02^9$DUu z1&wqzmo*CAFR@>6Wan`CtXr;^?aEBevFlD4Aw*#d!4LQfTir3^0~}SUf-t7z0iqxs zA5yV6lJP!t1HpIr1REUs7LIF_?#DCb`g}+u{Oh9U)QFDh0eqp_s5?|p2(%Hrfp&K+ zdIy?GqVXKcr?gtbtJrSRo3-7td(v&xoMgj}pRv7Jr!;ZS_PlG=S}C5w5?@SdCEJ~^ zRFkfK-L74&jwFbdq3}ZlFJS@BgBE!eX-BR^4u?PTBJemdU=lc~V}gic!7VWD|TYA2@^;Vl