chore: add comments, remove warning messages

Readme.md

@@ -0,0 +1,23 @@
+## auto.bus (Ticket Office) – пошук та купівля квитків на автобус онлайн
+
+- C#, Microsoft.EntityFrameworkCore, Razor Pages
+
+### Встановлення:
+
+1. Скомпілювати проєкт
+2. Скопіювати каталог ~/Ticket\ Office/wwwroot/ у кореневий каталог скомпільованого проєкту
+3. Запустити скомпільований проєкт
+
+* ~ – кореневий каталог вихідного коду проєкту
+
+### Доступні маршрути:
+
+#### № 027
+
+- Сватове -> Красноріченське -> Кремінна -> Рубіжне -> Сєвєродонецьк -> Лисичанськ -> Сєвєродонецьк -> Рубіжне -> Кремінна -> Красноріченське -> Сватове 
+- (Дата: дата встановлення проєкту)
+
+#### № 013
+
+- Кремінна -> Рубіжне -> Сєвєродонецьк -> Станиця Луганська -> Сєвєродонецьк -> Рубіжне -> Кремінна 
+- (Дата: дата встановлення проєкту)

TicketOffice/Data/TicketOfficeContext.cs

@@ -1,10 +1,5 @@
 #nullable disable
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
-using TicketOffice.Models;
 
 namespace TicketOffice.Data
 {
@@ -15,13 +10,13 @@ namespace TicketOffice.Data
         {
         }
 
-        public DbSet<TicketOffice.Models.User> User { get; set; }
+        public DbSet<Models.User> User { get; set; }
 
-        public DbSet<TicketOffice.Models.Route> Route { get; set; }
+        public DbSet<Models.Route> Route { get; set; }
         
-        public DbSet<TicketOffice.Models.RouteCity> RouteCity { get; set; }
+        public DbSet<Models.RouteCity> RouteCity { get; set; }
-        public DbSet<TicketOffice.Models.TicketCity> TicketCity { get; set; }
+        public DbSet<Models.TicketCity> TicketCity { get; set; }
 
-        public DbSet<TicketOffice.Models.Ticket> Ticket { get; set; }
+        public DbSet<Models.Ticket> Ticket { get; set; }
     }
 }

TicketOffice/Migrations/20220529081528_Initial_Create.Designer.cs

@@ -11,7 +11,7 @@ using TicketOffice.Data;
 namespace TicketOffice.Migrations
 {
     [DbContext(typeof(TicketOfficeContext))]
-    [Migration("20220526065734_Initial_Create")]
+    [Migration("20220529081528_Initial_Create")]
     partial class Initial_Create
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -133,26 +133,11 @@ namespace TicketOffice.Migrations
                         .HasMaxLength(48)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("FirstName")
-                        .HasMaxLength(24)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsManager")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastName")
-                        .HasMaxLength(24)
-                        .HasColumnType("TEXT");
-
                     b.Property<string>("Password")
                         .IsRequired()
                         .HasMaxLength(32)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("Patronymic")
-                        .HasMaxLength(24)
-                        .HasColumnType("TEXT");
-
                     b.HasKey("Id");
 
                     b.ToTable("User");

TicketOffice/Migrations/20220529081528_Initial_Create.cs

@@ -29,12 +29,8 @@ namespace TicketOffice.Migrations
                 {
                     Id = table.Column<int>(type: "INTEGER", nullable: false)
                         .Annotation("Sqlite:Autoincrement", true),
-                    FirstName = table.Column<string>(type: "TEXT", maxLength: 24, nullable: true),
-                    LastName = table.Column<string>(type: "TEXT", maxLength: 24, nullable: true),
-                    Patronymic = table.Column<string>(type: "TEXT", maxLength: 24, nullable: true),
                     Email = table.Column<string>(type: "TEXT", maxLength: 48, nullable: false),
-                    Password = table.Column<string>(type: "TEXT", maxLength: 32, nullable: false),
+                    Password = table.Column<string>(type: "TEXT", maxLength: 32, nullable: false)
-                    IsManager = table.Column<bool>(type: "INTEGER", nullable: false)
                 },
                 constraints: table =>
                 {

TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs

@@ -131,26 +131,11 @@ namespace TicketOffice.Migrations
                         .HasMaxLength(48)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("FirstName")
-                        .HasMaxLength(24)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsManager")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastName")
-                        .HasMaxLength(24)
-                        .HasColumnType("TEXT");
-
                     b.Property<string>("Password")
                         .IsRequired()
                         .HasMaxLength(32)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("Patronymic")
-                        .HasMaxLength(24)
-                        .HasColumnType("TEXT");
-
                     b.HasKey("Id");
 
                     b.ToTable("User");

TicketOffice/Models/Route.cs

@@ -1,7 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.AspNetCore.Components;
-using Microsoft.EntityFrameworkCore;
 
 namespace TicketOffice.Models;
 
@@ -21,7 +18,7 @@ public class Route
     public int Capacity { get; set; }
     
     [Required]
-    public ICollection<RouteCity> Cities { get; set; }
+    public ICollection<RouteCity> Cities { get; set; } = null!;
 
     public ICollection<Ticket>? Tickets { get; set; }
 }

TicketOffice/Models/RouteCity.cs

@@ -12,7 +12,7 @@ public class RouteCity
      MinLength(2, ErrorMessage = "Назва міста не може бути менше 2 символів")]
     [Display(Name = "Назва міста")]
     [Required(ErrorMessage = "Поле має бути заповненим")]
-    public string Name { get; set; }
+    public string Name { get; set; } = null!;
 
     [Display(Name = "Дата відправлення")]
     [DataType(DataType.Date)]
@@ -24,5 +24,5 @@ public class RouteCity
     
     [ForeignKey("Route")]
     public int RouteId { get; set; }
-    public Route Route { get; set; }
+    public Route Route { get; set; } = null!;
 }

TicketOffice/Models/SeedData.cs

@@ -13,12 +13,13 @@ public class SeedData
 
         if (context == null)
         {
-            throw new ArgumentNullException("Null TicketOfficeContext");
+            throw new ArgumentNullException(nameof(serviceProvider));
         }
 
-        if (context.User.Any() | context.Route.Any() | context.RouteCity.Any() | context.Ticket.Any())
+        if (context.User.Any() | context.Route.Any() |
+            context.RouteCity.Any() | context.Ticket.Any()) // Data has been seeded
         {
-            return; // Data has been seeded
+            return;
         }
 
         context.Database.EnsureCreated();
@@ -29,95 +30,360 @@ public class SeedData
             {
                 Email = "danylo.nazarko@nure.ua",
                 Password = "*Hashed Password*",
-                IsManager = false,
-            },
-            new User
-            {
-                Email = "ruslan.shanin@nure.ua",
-                Password = "*Hashed Password*",
-                IsManager = false
             }
         });
         
         context.Route.AddRange(new Route[]
         {
-            new Route {
+            new Route()
-                Number = 2,
+            {
+                Number = 027,
                 Capacity = 30,
-                Cities = new RouteCity[]
+                Cities = new List<RouteCity>()
                 {
+                    new RouteCity
+                    {
+                        Name = "Сватове",
+                        
+                        ArrivalTime = null,
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            6,
+                            30,
+                            0)
+                    },
+                    new RouteCity
+                    {
+                        Name = "Красноріченське",
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            7,
+                            10,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            7,
+                            20,
+                            0)
+                    },
                     new RouteCity
                     {
                         Name = "Кремінна",
-                        ArrivalTime = new DateTime(2022, 03, 28, 8, 15, 0),
+                        
-                        DepartureTime = new DateTime(2022, 03, 28, 8, 35, 0),
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            7,
+                            50,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            8,
+                            0,
+                            0)
                     },
                     new RouteCity
                     {
                         Name = "Рубіжне",
-                        ArrivalTime = new DateTime(2022, 03, 28, 9, 5, 0),
+                        
-                        DepartureTime = new DateTime(2022, 03, 28, 9, 25, 0),
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            8,
+                            30,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            8,
+                            40,
+                            0)
                     },
                     new RouteCity
                     {
                         Name = "Сєвєродонецьк",
-                        ArrivalTime = new DateTime(2022, 03, 28, 9, 55, 0)
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            9,
+                            10,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            9,
+                            20,
+                            0)
+                    },
+                    new RouteCity
+                    {
+                        Name = "Лисичанськ",
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            9,
+                            50,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            12,
+                            0,
+                            0),
+                    },
+                    new RouteCity
+                    {
+                        Name = "Сєвєродонецьк",
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            12,
+                            30,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            12,
+                            40,
+                            0)
+                    },
+                    new RouteCity
+                    {
+                        Name = "Рубіжне",
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            13,
+                            10,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            13,
+                            20,
+                            0)
+                    },
+                    new RouteCity
+                    {
+                        Name = "Кремінна",
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            13,
+                            50,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            14,
+                            0,
+                            0)
+                    },
+                    new RouteCity
+                    {
+                        Name = "Красноріченське",
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            14,
+                            30,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            14,
+                            40,
+                            0)
+                    },
+                    new RouteCity
+                    {
+                        Name = "Сватове",
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            15,
+                            20,
+                            0),
+                
+                        DepartureTime = null
                     }
                 }
             },
-            new Route
+            new Route()
             {
-                Number = 1,
+                Number = 013,
                 Capacity = 25,
-                Cities = new RouteCity[]
+                Cities = new List<RouteCity>()
-                {
-                    new RouteCity
-                    {
-                        Name = "Сєвєродонецьк",
-                        ArrivalTime = new DateTime(2022, 03, 28, 15, 55, 0),
-                        DepartureTime = new DateTime(2022, 03, 28, 16, 15, 0),
-                    },
-                    new RouteCity
-                    {
-                        Name = "Рубіжне",
-                        ArrivalTime = new DateTime(2022, 03, 28, 16, 45, 0),
-                        DepartureTime = new DateTime(2022, 03, 28, 17, 5, 0),
-                    },
-                    new RouteCity
-                    {
-                        Name = "Кремінна",
-                        ArrivalTime = new DateTime(2022, 03, 28, 17, 40, 0)
-                    }
-                }
-            },
-            new Route
-            {
-                Number = 3,
-                Capacity = 30,
-                Cities = new RouteCity[]
                 {
                     new RouteCity
                     {
                         Name = "Кремінна",
-                        ArrivalTime = new DateTime(2022, 03, 28, 9, 20, 0),
+                        
-                        DepartureTime = new DateTime(2022, 03, 28, 8, 40, 0),
+                        ArrivalTime = null,
-                    },
+                
-                    new RouteCity
+                        DepartureTime = new DateTime(
-                    {
+                            DateTime.Today.Year, 
-                        Name = "Житлівка",
+                            DateTime.Today.Month,
-                        ArrivalTime = new DateTime(2022, 03, 28, 10, 0, 0),
+                            DateTime.Today.Day, 
-                        DepartureTime = new DateTime(2022, 03, 28, 10, 15, 0),
+                            7,
+                            0,
+                            0)
                     },
                     new RouteCity
                     {
                         Name = "Рубіжне",
-                        ArrivalTime = new DateTime(2022, 03, 28, 11, 5, 0),
+                        
-                        DepartureTime = new DateTime(2022, 03, 28, 11, 20, 0),
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            7,
+                            30,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            7,
+                            40,
+                            0)
                     },
                     new RouteCity
                     {
                         Name = "Сєвєродонецьк",
-                        ArrivalTime = new DateTime(2022, 03, 28, 11, 55, 0)
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            8,
+                            10,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            8,
+                            20,
+                            0)
+                    },
+                    new RouteCity
+                    {
+                        Name = "Станиця Луганська",
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            9,
+                            20,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            11,
+                            20,
+                            0)
+                    },
+                    new RouteCity
+                    {
+                        Name = "Сєвєродонецьк",
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            12,
+                            20,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            12,
+                            30,
+                            0)
+                    },
+                    new RouteCity
+                    {
+                        Name = "Рубіжне",
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            13,
+                            0,
+                            0),
+                
+                        DepartureTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            13,
+                            10,
+                            0)
+                    },
+                    new RouteCity
+                    {
+                        Name = "Кремінна",
+                        
+                        ArrivalTime = new DateTime(
+                            DateTime.Today.Year, 
+                            DateTime.Today.Month,
+                            DateTime.Today.Day, 
+                            13,
+                            40,
+                            0),
+                
+                        DepartureTime = null
                     }
                 }
             }

TicketOffice/Models/Ticket.cs

@@ -10,24 +10,24 @@ public class Ticket
     
     [Required(ErrorMessage = "Поле має бути заповненим")]
     [Display(Name = "Ім'я пасажира")]
-    public string PassengerFirstName { get; set; }
+    public string PassengerFirstName { get; set; } = null!;
 
     [Required(ErrorMessage = "Поле має бути заповненим")]
     [Display(Name = "Прізвище пасажира")]
-    public string PassengerLastName { get; set; }
+    public string PassengerLastName { get; set; } = null!;
 
     [Required(ErrorMessage = "Поле має бути заповненим")]
     [Display(Name = "Номер місця пасажира")]
     public int PassengerPlace { get; set; }
 
     [Required]
-    public ICollection<TicketCity> Cities { get; set; }
+    public ICollection<TicketCity> Cities { get; set; } = null!;
 
     [ForeignKey("User")]
     public int UserId { get; set; }
-    public User User { get; set; }
+    public User User { get; set; } = null!;
 
     [ForeignKey("Route")]
     public int RouteId { get; set; }
-    public Route Route { get; set; }
+    public Route Route { get; set; } = null!;
 }

TicketOffice/Models/TicketCity.cs

@@ -12,7 +12,7 @@ public class TicketCity
      MinLength(2, ErrorMessage = "Назва міста не може бути менше 2 символів")]
     [Display(Name = "Назва міста")]
     [Required(ErrorMessage = "Поле має бути заповненим")]
-    public string Name { get; set; }
+    public string Name { get; set; } = null!;
 
     [Display(Name = "Дата відправлення")]
     [DataType(DataType.Date)]
@@ -24,5 +24,5 @@ public class TicketCity
     
     [ForeignKey("Ticket")]
     public int TicketId { get; set; }
-    public Ticket Ticket { get; set; }
+    public Ticket Ticket { get; set; } = null!;
 }

TicketOffice/Models/User.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using System.Net.Mail;
 
 namespace TicketOffice.Models;
 
@@ -8,22 +7,6 @@ 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 = "Поле має бути заповненим")]
@@ -31,7 +14,7 @@ public class User
     [DataType(DataType.EmailAddress)]
     [RegularExpression(@"^[^@\s]+@[^@\s]+\.[^@\s]+$",
      ErrorMessage = "E-mail невалідний")]
-    public string Email { get; set; }
+    public string Email { get; set; } = null!;
 
     [MaxLength(32, ErrorMessage = "Пароль має бути менше 32 символів"),
      MinLength(8, ErrorMessage = "Пороль має бути більше 8 символів")]
@@ -40,11 +23,8 @@ public class User
     [DataType(DataType.Password)]
     [RegularExpression(@"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$",
      ErrorMessage = "Проль має містити великі та малі латинські літери, цифри та спеціальні знаки (@, $, % та ін.)")]
-    public string Password { get; set; }
+    public string Password { get; set; } = null!;
 
 
     public ICollection<Ticket>? Tickets { get; set; }
-    
-    [Required]
-    public bool IsManager { get; set; }
 }

TicketOffice/Pages/Auth/Account.cshtml

@@ -1,6 +1,6 @@
 @page
 @using System.Globalization
-@model TicketOffice.Pages.Account.IndexModel
+@model TicketOffice.Pages.Auth.AccountModel
 @{
     Layout = "~/Pages/Shared/_Layout.cshtml";
     ViewData["Title"] = "Аккаунт";
@@ -62,14 +62,6 @@
     }
 </div>
 
-@* <div class="divider"></div> *@
-@* *@
-@* <div class="section"> *@
-@*     <div class="section-header">Керування аккаунтом</div> *@
-@* </div> *@
-
-@* Popup windows *@
-
 @if (Model.Tickets is not {Count: 0})
 {
     foreach (var ticket in Model.Tickets)

TicketOffice/Pages/Auth/Account.cshtml.cs

@@ -4,27 +4,34 @@ using Microsoft.EntityFrameworkCore;
 using TicketOffice.Data;
 using TicketOffice.Models;
 
-namespace TicketOffice.Pages.Account;
+namespace TicketOffice.Pages.Auth;
 
-public class IndexModel : PageModel
+public class AccountModel : PageModel
 {
-    public List<Ticket> Tickets { get; set; }
+    private readonly TicketOfficeContext context;
-    [BindProperty(SupportsGet = true)] public int ReturnTicketId { get; set; }
     
-    private readonly TicketOfficeContext _context;
+    public AccountModel(TicketOfficeContext context)
-
-    public IndexModel(TicketOfficeContext context, ILogger<IndexModel> logger)
     {
-        _context = context;
+        this.context = context;
     }
 
+    // User's tickets.
+    public List<Ticket> Tickets { get; set; } = null!;
+
+    // Will be set when user confirm ticket return.
+    [BindProperty(SupportsGet = true)] 
+    public int ReturnTicketId { get; set; }
+
+    // Called when GET request is sent to the page. Checks if the session is
+    // valid then retrieves all user's tickets. 
     public ActionResult OnGet()
     {
         if (!ValidateSession())
             return RedirectToPage("/Auth/Login");
 
-        Tickets = _context.Ticket
+        Tickets = context.Ticket
-                .Where(t => t.UserId == HttpContext.Session.GetInt32("UserId"))
+                .Where(t => 
+                    t.UserId == HttpContext.Session.GetInt32("UserId"))
                 .Include(t => t.Route)
                 .Include(t => t.Cities)
                 .ToList();
@@ -32,21 +39,25 @@ public class IndexModel : PageModel
         return Page();
     }
 
+    // Called when user confirms ticket return.
     public ActionResult OnGetReturnTicket()
     {
         OnGet();
 
-        Ticket returnTicket = _context.Ticket.Find(ReturnTicketId);
+        Ticket? returnTicket = context.Ticket.Find(ReturnTicketId);
 
-        if (returnTicket is not null)
+        if (returnTicket != null)
         {
-            _context.Remove(returnTicket);
+            context.Remove(returnTicket);
-            _context.SaveChanges();
+            context.SaveChanges();
             return RedirectToPage("./Account");
         }
         
         return NotFound();
     }
 
-    private bool ValidateSession() => HttpContext.Session.GetInt32("UserId") is not null;
+    private bool ValidateSession()
+    {
+        return HttpContext.Session.GetInt32("UserId") != null;
+    }
 }

TicketOffice/Pages/Auth/Index.cshtml.cs

@@ -5,5 +5,15 @@ namespace TicketOffice.Pages.Auth;
 
 public class IndexModel : PageModel
 {
-    public ActionResult OnGet() => HttpContext.Session.GetInt32("UserId") is not null ? RedirectToPage("/Auth/Account") : RedirectToPage("/Auth/Login");
+    // Called when GET request is sent to the page. Determines what page
+    // user will be redirected to depending on his/her authorization status.
+    public ActionResult OnGet()
+    {
+        if (HttpContext.Session.GetInt32("UserId") != null)
+        {
+            return RedirectToPage("/Auth/Account");
+        }
+
+        return RedirectToPage("/Auth/Login");
+    }
 }

TicketOffice/Pages/Auth/Login.cshtml

@@ -14,13 +14,13 @@
             Авторизація
         </div>
         
-        <input class="field" type="text" placeholder="E-mail" autocomplete="off" asp-for="User.Email"/>
+        <input class="field" type="text" placeholder="E-mail" autocomplete="off" asp-for="User!.Email"/>
         <div class="validation-error">
             <span>@Model.EmailValidationError</span>
         </div>
         <br>
 
-        <input class="field" type="password" placeholder="Пароль" autocomplete="off" asp-for="User.Password"/>
+        <input class="field" type="password" placeholder="Пароль" autocomplete="off" asp-for="User!.Password"/>
         <div class="validation-error">
             <span>@Model.PasswordValidationError</span>
         </div>

TicketOffice/Pages/Auth/Login.cshtml.cs

@@ -1,7 +1,6 @@
 using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.EntityFrameworkCore;
 using TicketOffice.Data;
 using TicketOffice.Models;
 
@@ -9,28 +8,45 @@ namespace TicketOffice.Pages.Auth;
 
 public class LoginModel : PageModel
 {
-    [BindProperty] public User? User { get; set; }
+    // Error massage displaying when email validation failed.
+    public string EmailValidationError = null!;
     
-    public string EmailValidationError;
+    // Error massage displaying when password validation failed.
-    public string PasswordValidationError;
+    public string PasswordValidationError = null!;
 
-    private readonly TicketOfficeContext _context;
+    private readonly TicketOfficeContext context;
     
     public LoginModel(TicketOfficeContext context)
     {
-        _context = context;
+        this.context = context;
     }
     
-    public ActionResult OnGet() => ValidateSession() ? RedirectToPage("/Auth/Account") : Page();
+    // Object representing a user who wants to login.
+    [BindProperty] 
+    public new User? User { get; set; }
 
+    // Called when GET request is sent to the page. Validates the session and
+    // redirects to "Account" page if user already logged in.
+    public ActionResult OnGet()
+    {
+        if (ValidateSession())
+        {
+            return RedirectToPage("/Auth/Account");
+        }
+
+        return Page();
+    }
+
+    // Called when POST request is sent to the page. Validates login form and
+    // redirects to "Account" page if the validation succeed.
     public ActionResult OnPost()
     {
         if (ValidateForm())
         {
-            User user = _context.User.FirstOrDefault(u => u.Email == User.Email);
+            User? user = context.User
+                .FirstOrDefault(u => u.Email == User!.Email);
             
-            HttpContext.Session.SetInt32("UserId", user.Id);
+            HttpContext.Session.SetInt32("UserId", user!.Id);
-            HttpContext.Session.SetInt32("IsManager", user.IsManager ? 1 : 0);
             return RedirectToPage("/Auth/Account");
         }
 
@@ -39,13 +55,14 @@ public class LoginModel : PageModel
 
     private bool ValidateForm()
     {
-        User? user = _context.User.FirstOrDefault(u => u.Email == User.Email);
+        User? user = context.User.FirstOrDefault(u => u.Email == User!.Email);
 
-        return ValidateEmail(User.Email, out EmailValidationError) && ValidatePassword(User.Password, out PasswordValidationError);
+        return ValidateEmail(User!.Email, out EmailValidationError) &&
+               ValidatePassword(User.Password, out PasswordValidationError);
         
         bool ValidateEmail(string email, out string validationError)
         {
-            if (user is not null)
+            if (user != null)
             {
                 validationError = String.Empty;
                 return true;
@@ -71,7 +88,7 @@ public class LoginModel : PageModel
 
         bool ValidatePassword(string password, out string validationError)
         {
-            if (user.Password == password)
+            if (user!.Password == password)
             {
                 validationError = String.Empty;
                 return true;
@@ -88,5 +105,8 @@ public class LoginModel : PageModel
         }
     }
 
-    private bool ValidateSession() => HttpContext.Session.GetInt32("UserId") is not null;
+    private bool ValidateSession()
+    {
+        return HttpContext.Session.GetInt32("UserId") != null;
+    }
 }

TicketOffice/Pages/Auth/Registration.cshtml.cs

@@ -1,7 +1,6 @@
 using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.EntityFrameworkCore;
 using TicketOffice.Data;
 using TicketOffice.Models;
 
@@ -9,31 +8,47 @@ namespace TicketOffice.Pages.Auth;
 
 public class RegistrationModel : PageModel
 {
-    [BindProperty] public User User { get; set; }
+    // Error massage displaying when email validation failed.
+    public string EmailValidationError = null!;
     
-    public string EmailValidationError;
+    // Error massage displaying when password validation failed.
-    public string PasswordValidationError;
+    public string PasswordValidationError = null!;
 
-    private readonly TicketOfficeContext _context;
+    private readonly TicketOfficeContext context;
     
     public RegistrationModel(TicketOfficeContext context)
     {
-        _context = context;
+        this.context = context;
     }
     
-    public ActionResult OnGet() => ValidateSession() ? RedirectToPage("/Auth/Account") : Page();
+    [BindProperty]
+    public new User User { get; set; } = null!;
 
+    // Called when GET request is sent to the page. Validates the session and
+    // redirects to "Account" page if user already logged in.
+    public ActionResult OnGet()
+    {
+        if (ValidateSession())
+        {
+            return RedirectToPage("/Auth/Account");
+        }
+
+        return Page();
+    }
+
+    // Called when POST request is sent to the page. Validates registration form,
+    // adds new user to the database and redirects to "Account" page if the
+    // validation succeed.
     public ActionResult OnPost()
     {
         if (ValidateForm())
         {
-            _context.User.Add(User);
+            context.User.Add(User);
-            _context.SaveChanges();
+            context.SaveChanges();
 
-            User = _context.User.FirstOrDefault(u => u.Email == User.Email);
+            User = context.User.FirstOrDefault(u => u.Email == User.Email)!;
             
             HttpContext.Session.SetInt32("UserId", User.Id);
-
             return RedirectToPage("/Auth/Account");
         }
             
@@ -42,7 +57,10 @@ public class RegistrationModel : PageModel
 
     private bool ValidateForm()
     {
-        return ValidateEmail(User.Email, out EmailValidationError) && ValidatePassword(User.Password, out PasswordValidationError);
+        return ValidateEmail(User.Email, out EmailValidationError) &&
+               ValidatePassword(User.Password,
+                   out PasswordValidationError);
+        
 
         bool ValidateEmail(string email, out string validationError)
         {
@@ -60,9 +78,10 @@ public class RegistrationModel : PageModel
                 return false;
             }
 
-            User user = _context.User.FirstOrDefault(u => u.Email == User.Email);
+            User? user = context.User
+                .FirstOrDefault(u => u.Email == User.Email);
 
-            if (user is not null)
+            if (user != null)
             {
                 validationError = "E-mail уже зареєстровано";
                 return false;
@@ -86,11 +105,14 @@ public class RegistrationModel : PageModel
                 return false;
             }
                 
-            Regex passwordRegex = new Regex(@"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$");
+            Regex passwordRegex = 
+                new Regex(@"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$");
                 
             if (!passwordRegex.IsMatch(passowrd))
             {
-                validationError = "Пароль має містити великі та малі латинські літери, цифри та спеціальні знаки (@, $, % та ін.)";
+                validationError = "Пароль має містити " +
+                                  "великі та малі латинські літери, " +
+                                  "цифри та спеціальні знаки (@, $, % та ін.)";
                 return false;
             }
         
@@ -99,5 +121,8 @@ public class RegistrationModel : PageModel
         }
     }
     
-    bool ValidateSession() => HttpContext.Session.GetInt32("UserId") is not null;
+    private bool ValidateSession()
+    {
+        return HttpContext.Session.GetInt32("UserId") != null;
+    }
 }

TicketOffice/Pages/Error.cshtml.cs

@@ -8,17 +8,17 @@ namespace TicketOffice.Pages;
 [IgnoreAntiforgeryToken]
 public class ErrorModel : PageModel
 {
-    public string? RequestId { get; set; }
-
     public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 
-    private readonly ILogger<ErrorModel> _logger;
+    private readonly ILogger<ErrorModel> logger;
 
     public ErrorModel(ILogger<ErrorModel> logger)
     {
-        _logger = logger;
+        this.logger = logger;
     }
 
+    public string? RequestId { get; set; }
+
     public void OnGet()
     {
         RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;

TicketOffice/Pages/Routes/Index.cshtml

@@ -1,6 +1,5 @@
 @page
 @using System.Globalization
-@using TicketOffice.Models
 @model TicketOffice.Pages.Routes.IndexModel
 @{
     Layout = "~/Pages/Shared/_Layout.cshtml";
@@ -35,7 +34,7 @@
                 <div class="title">
                     Дата відправлення
                 </div>
-                <input class="search-input" type="date" value="@Model.Date.ToString("yyyy-MM-dd")" asp-for="Date">
+                <input class="search-input" type="date" value="@Model.Date!.Value.ToString("yyyy-MM-dd")" asp-for="Date">
             </div>
             <div class="search-btn">
                 <input type="submit" class="search-btn" value="Пошук"/>
@@ -53,15 +52,15 @@
                         № автобуса
                         @if (Model.SortString == "increasingNumber")
                         {
-                            <a class="link-btn-sort" asp-page-handler="SortByNumber" asp-route-SortString="descendingNumber" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>🠕</a>
+                            <a class="link-btn-sort" asp-page-handler="SortByNumber" asp-route-SortString="descendingNumber" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>🠕</a>
                         }
                         else if (Model.SortString == "descendingNumber")
                         {
-                            <a class="link-btn-sort" asp-page-handler="SortByNumber" asp-route-SortString="increasingNumber" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>🠗</a>
+                            <a class="link-btn-sort" asp-page-handler="SortByNumber" asp-route-SortString="increasingNumber" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>🠗</a>
                         }
                         else
                         {
-                            <a class="link-btn-sort" asp-page-handler="SortByNumber" asp-route-SortString="increasingNumber" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>⮁</a>
+                            <a class="link-btn-sort" asp-page-handler="SortByNumber" asp-route-SortString="increasingNumber" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>⮁</a>
                         }
                     </th>
                     <th>
@@ -75,30 +74,30 @@
                             Відправлення
                             @if (Model.SortString == "increasingDeparture")
                             {
-                                <a class="link-btn-sort" asp-page-handler="SortByDeparture" asp-route-SortString="descendingDeparture" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>🠕</a>
+                                <a class="link-btn-sort" asp-page-handler="SortByDeparture" asp-route-SortString="descendingDeparture" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>🠕</a>
                             }
                             else if (Model.SortString == "descendingDeparture")
                             {
-                                <a class="link-btn-sort" asp-page-handler="SortByDeparture" asp-route-SortString="increasingDeparture" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>🠗</a>
+                                <a class="link-btn-sort" asp-page-handler="SortByDeparture" asp-route-SortString="increasingDeparture" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>🠗</a>
                             }
                             else
                             {
-                                <a class="link-btn-sort" asp-page-handler="SortByDeparture" asp-route-SortString="increasingDeparture" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>⮁</a>
+                                <a class="link-btn-sort" asp-page-handler="SortByDeparture" asp-route-SortString="increasingDeparture" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>⮁</a>
                             }
                         </div>
                         <div class="arrival">
                             Прибуття
                             @if (Model.SortString == "increasingArrival")
                             {
-                                <a class="link-btn-sort" asp-page-handler="SortByArrival" asp-route-SortString="descendingArrival" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>🠕</a>
+                                <a class="link-btn-sort" asp-page-handler="SortByArrival" asp-route-SortString="descendingArrival" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>🠕</a>
                             }
                             else if (Model.SortString == "descendingArrival")
                             {
-                                <a class="link-btn-sort" asp-page-handler="SortByArrival" asp-route-SortString="increasingArrival" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>🠗</a>
+                                <a class="link-btn-sort" asp-page-handler="SortByArrival" asp-route-SortString="increasingArrival" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>🠗</a>
                             }
                             else
                             {
-                                <a class="link-btn-sort" asp-page-handler="SortByArrival" asp-route-SortString="increasingArrival" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>⮁</a>
+                                <a class="link-btn-sort" asp-page-handler="SortByArrival" asp-route-SortString="increasingArrival" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>⮁</a>
                             }
                         </div>
                     </th>
@@ -106,15 +105,15 @@
                         Тривалість
                         @if (Model.SortString == "increasingDuration")
                         {
-                            <a class="link-btn-sort" asp-page-handler="SortByDuration" asp-route-SortString="descendingDuration" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>🠕</a>
+                            <a class="link-btn-sort" asp-page-handler="SortByDuration" asp-route-SortString="descendingDuration" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>🠕</a>
                         }
                         else if (Model.SortString == "descendingDuration")
                         {
-                            <a class="link-btn-sort" asp-page-handler="SortByDuration" asp-route-SortString="increasingDuration" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>🠗</a>
+                            <a class="link-btn-sort" asp-page-handler="SortByDuration" asp-route-SortString="increasingDuration" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>🠗</a>
                         }
                         else
                         {
-                            <a class="link-btn-sort" asp-page-handler="SortByDuration" asp-route-SortString="increasingDuration" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date.ToString("yyyy-MM-dd")>⮁</a>
+                            <a class="link-btn-sort" asp-page-handler="SortByDuration" asp-route-SortString="increasingDuration" asp-route-From=@Model.From a in a  asp-route-To=@Model.To asp-route-Date=@Model.Date!.Value.ToString("yyyy-MM-dd")>⮁</a>
                         }
                     </th>
                     <th>
@@ -143,7 +142,7 @@
                                     Відправлення
                                 </span>
                                 <span>
-                                    @route.Cities.First().ArrivalTime?.ToString("f").Split(",")[0].ToLower(),
+                                    @route.Cities.First().DepartureTime?.ToString("f").Split(",")[0].ToLower(),
                                     @route.Cities.First().DepartureTime?.ToString("dd.MM.yyyy")
                                 </span>
                             </div>
@@ -156,12 +155,13 @@
                             </div>
                         </td>
                         <td class="time">
-                            <div>@route.Cities.First().DepartureTime?.ToString("HH:mm")</div>
+                            <div>@route.Cities.First().DepartureTime?.ToString("t")</div>
-                            <div>@route.Cities.Last().ArrivalTime?.ToString("HH:mm")</div>
+                            <div>@route.Cities.Last().ArrivalTime?.ToString("t")</div>
                         </td>
                         <td class="duration">
                             @{ TimeSpan? duration = route.Cities.Last().ArrivalTime - route.Cities.First().DepartureTime; }
-                            @($"{duration?.TotalHours.ToString().Split(",")[0]}:{duration?.Minutes}")
+
+                            @($"{duration?.TotalHours.ToString(CultureInfo.CurrentCulture).Split(",")[0]}:{duration?.Minutes:00}")
                         </td>
                         <td class="capacity">
                             @Model.GetRemainingCapacity(route)
@@ -178,7 +178,7 @@
     else if (Model.Routes == null)
     {
         <div class="search-error">
-            <p>Уведіть дату й місто відправлення або прибуття</p>
+            <p>Уведіть дату, місто відправлення й прибуття</p>
         </div>
     }
     else
@@ -190,7 +190,7 @@
     
 </div>
 
-@if (Model.Routes is not null)
+@if (Model.Routes != null)
 {
     foreach (var route in Model.Routes)
     {
@@ -274,7 +274,9 @@
             </div>
         </div>
         
-        <div class="popup-container-ticket-order" id="popup-ticket-@route.Id" style='display:@(Model.Ticket is not null && Model.Ticket.RouteId == route.Id ? "inherit" : "none")'>
+        <div class="popup-container-ticket-order" id="popup-ticket-@route.Id"
+         style='display:@(Model.Ticket != null && Model.Ticket.RouteId == 
+         route.Id ? "inherit" : "none")'>
             <div class="ticket">
                 <div class="ticket-header">
                     Купити квиток
@@ -285,33 +287,31 @@
                             <div class="ticket-input-item" style="margin-right: 0.5rem">
                                 @if (HttpContext.Session.GetInt32("UserId").HasValue)
                                 {
-                                    <input class="ticket-input-lastname" type="text" placeholder="Прізвище" asp-for="Ticket.PassengerLastName"/>
+                                    <input class="ticket-input-lastname" type="text" placeholder="Прізвище" asp-for="Ticket!.PassengerLastName"/>
                                 }
                                 else
                                 {
                                     <input class="ticket-input-lastname" type="text" placeholder="Прізвище" readonly/>
                                 }
-                                <div 
+                                <div class="ticket-validation-error"><span>@(Model.Ticket != null && Model.Ticket.RouteId == route.Id ? Model.PassengerLastNameValidationError : "")</span></div>
-                                class="ticket-validation-error"><span>@(Model.Ticket is not null && Model.Ticket.RouteId == route.Id ? Model.PassengerLastNameValidationError : "")</span></div>
                             </div>
                             <div class="ticket-input-item" style="margin-left: 0.5rem; margin-right: 0.5rem">
                                 @if (HttpContext.Session.GetInt32("UserId").HasValue)
                                 {
-                                    <input class="ticket-input-firstname" type="text" placeholder="Ім'я" asp-for="Ticket.PassengerFirstName"/>
+                                    <input class="ticket-input-firstname" type="text" placeholder="Ім'я" asp-for="Ticket!.PassengerFirstName"/>
                                 }
                                 else
                                 {
                                     <input class="ticket-input-firstname" type="text" placeholder="Ім'я" readonly/>
                                 }
-                                <div 
+                                <div class="ticket-validation-error"><span>@(Model.Ticket != null && Model.Ticket.RouteId == route.Id ? Model.PassengerFirstNameValidationError : "")</span></div>
-                                class="ticket-validation-error"><span>@(Model.Ticket is not null && Model.Ticket.RouteId == route.Id ? Model.PassengerFirstNameValidationError : "")</span></div>
                             </div>
                             <div class="ticket-input-item" style="margin-left: 0.5rem">
-                                <select class="ticket-place-select" required asp-for="Ticket.PassengerPlace">
+                                <select class="ticket-place-select" required asp-for="Ticket!.PassengerPlace">
                                     <option selected disabled value="">Місце</option>
                                     @for (int i = 1; i <= route.Capacity; i++)
                                     {
-                                        if (route.Tickets.Any(t => @Model.GetCitiesNames(t.Cities.ToList()).Intersect(@Model.GetCitiesNames(route.Cities.ToList())).ToList().Any() && t.PassengerPlace == i))
+                                        if (Model.IsTakenPlace(route, i))
                                         {
                                             <option value="@i" disabled>@i - Місце зайняте</option>
                                         }
@@ -321,11 +321,10 @@
                                         }
                                     }
                                 </select>
-                                <div 
+                                <div class="ticket-validation-error"><span>@(Model.Ticket != null && Model.Ticket.RouteId == route.Id ? Model.PassengerPlaceValidationError : "")</span></div>
-                                class="ticket-validation-error"><span>@(Model.Ticket is not null && Model.Ticket.RouteId == route.Id ? Model.PassengerPlaceValidationError : "")</span></div>
                             </div>
-                            <input type="number" value="@route.Id" style="display: none;" asp-for="Ticket.RouteId"/>
+                            <input type="number" value="@route.Id" style="display: none;" asp-for="Ticket!.RouteId"/>
-                            <input type="number" value="@HttpContext.Session.GetInt32("UserId")" style="display: none;" asp-for="Ticket.UserId"/>
+                            <input type="number" value="@HttpContext.Session.GetInt32("UserId")" style="display: none;" asp-for="Ticket!.UserId"/>
                         </form>
                         <div class="ticket-info">
                             <div class="ticket-info-line">

TicketOffice/Pages/Routes/Index.cshtml.cs

@@ -9,71 +9,104 @@ namespace TicketOffice.Pages.Routes;
 
 public class IndexModel : PageModel
 {
-    [BindProperty] public List<Route> Routes { get; set; }
+    // Error massage displaying when passenger's last name validation failed.
-    [BindProperty] public Ticket Ticket { get; set; }
+    public string? PassengerLastNameValidationError;
     
-    public string PassengerLastNameValidationError;
+    // Error massage displaying when passenger's first name validation failed.
-    public string PassengerFirstNameValidationError;
+    public string? PassengerFirstNameValidationError;
-    public string PassengerPlaceValidationError;
     
-    [BindProperty(SupportsGet = true)] public string From { get; set; }
+    // Error massage displaying when passenger's place validation failed.
-    [BindProperty(SupportsGet = true)] public string To { get; set; }
+    public string? PassengerPlaceValidationError;
 
-    [BindProperty(SupportsGet = true)] public DateTime Date { get; set; } = new DateTime(2022, 03, 28, 0, 0, 0).Date;
+    private readonly TicketOfficeContext context;
-
-    [BindProperty(SupportsGet = true)] public string SortString { get; set; }
-
-    private readonly TicketOfficeContext _context;
 
     public IndexModel(TicketOfficeContext context)
     {
-        _context = context;
+        this.context = context;
     }
 
+    // Route list representing search results.
+    [BindProperty] 
+    public List<Route>? Routes { get; set; }
+
+    // Object representing ticket which user wants to buy.
+    [BindProperty] 
+    public Ticket? Ticket { get; set; }
+
+    // Search condition: departure city.
+    [BindProperty(SupportsGet = true)]
+    public string? From { get; set; }
+
+    // Search condition: arrival city.
+    [BindProperty(SupportsGet = true)]
+    public string? To { get; set; }
+
+    // Search condition: departure date.
+    [BindProperty(SupportsGet = true)]
+    public DateTime? Date { get; set; } = DateTime.Today;
+    
+    // Sort condition: determines in which order tickets will be displayed.
+    // in the search results table
+    [BindProperty(SupportsGet = true)]
+    public string? SortString { get; set; }
+
+    // Called when GET request is sent to the page. Retrieves routes based on
+    // search conditions and sorts them.
     public ActionResult OnGet()
     {
         GetRoutes();
         return Page();
     }
 
+    // Called when POST request is sent to the page (when user tries to buy a
+    // ticket). Validates input, creates new ticket in the database and
+    // redirects to "Account" page, where all bought tickets are shown.
     public ActionResult OnPost()
     {
-        if (!PassengerNameValidation(Ticket.PassengerLastName,
+        GetRoutes();
+        
+        if (!PassengerNameValidation(Ticket!.PassengerLastName,
                 out PassengerLastNameValidationError) |
             !PassengerNameValidation(Ticket.PassengerFirstName,
                 out PassengerFirstNameValidationError) |
             !PassengerPlaceValidation(Ticket.PassengerPlace,
                 out PassengerPlaceValidationError))
+        {
             return OnGet();
+        }
 
-        GetRoutes();
         CopyCitiesToTicket();
-        _context.Ticket.Add(Ticket);
         RevertChangesToRouteCities();
-        _context.SaveChanges();
+        
+        context.Ticket.Add(Ticket);
+        context.SaveChanges();
        
         return RedirectToPage("/Auth/Account");
     }
 
+    // Sorts routes by routes' number.
     public void OnGetSortByNumber()
     {
         OnGet();
 
         if (SortString == "increasingNumber")
         {
-            Routes.Sort((x, y) => Math.Clamp(x.Number - y.Number, -1, 1));
+            Routes!.Sort((x, y) =>
+                Math.Clamp(x.Number - y.Number, -1, 1));
         }
         else
         {
-            Routes.Sort((x, y) => Math.Clamp(y.Number - x.Number, -1, 1));
+            Routes!.Sort((x, y) =>
+                Math.Clamp(y.Number - x.Number, -1, 1));
         }
     }
 
+    // Sorts routes by routes' departure time .
     public void OnGetSortByDeparture()
     {
         OnGet();
 
-        Routes.Sort((x, y) =>
+        Routes!.Sort((x, y) =>
         {
             TimeSpan? totalDuration;
 
@@ -88,16 +121,17 @@ public class IndexModel : PageModel
                                 x.Cities.First().DepartureTime;
             }
 
-            return Math.Clamp((int) totalDuration.Value.TotalMilliseconds, -1,
+            return 
-                1);
+                Math.Clamp((int) totalDuration!.Value.TotalMilliseconds, -1, 1);
         });
     }
 
+    // Sorts routes by routes' arrival time.
     public void OnGetSortByArrival()
     {
         OnGet();
 
-        Routes.Sort((x, y) =>
+        Routes!.Sort((x, y) =>
         {
             TimeSpan? totalDuration;
 
@@ -112,21 +146,23 @@ public class IndexModel : PageModel
                                 x.Cities.Last().ArrivalTime;
             }
 
-            return Math.Clamp((int) totalDuration.Value.TotalMilliseconds, -1,
+            return 
-                1);
+                Math.Clamp((int) totalDuration!.Value.TotalMilliseconds, -1, 1);
         });
     }
 
+    // Sorts routes by routes' duration.
     public void OnGetSortByDuration()
     {
         OnGet();
 
-        Routes.Sort((x, y) =>
+        Routes!.Sort((x, y) =>
         {
             TimeSpan? xDuration = x.Cities.Last().ArrivalTime -
                                   x.Cities.First().DepartureTime;
             TimeSpan? yDuration = y.Cities.Last().ArrivalTime -
                                   y.Cities.First().DepartureTime;
+            
             TimeSpan? totalDuration;
 
             if (SortString == "increasingDuration")
@@ -138,113 +174,185 @@ public class IndexModel : PageModel
                 totalDuration = yDuration - xDuration;
             }
 
-            return Math.Clamp((int) totalDuration.Value.TotalMilliseconds, -1,
+            return 
-                1);
+                Math.Clamp((int) totalDuration!.Value.TotalMilliseconds, -1, 1);
         });
     }
 
-    public List<string> GetCitiesNames(List<RouteCity> Cities)
+    // Returns remaining route's capacity depending on
-    {
+    // arrival and departure cities.
-        List<string> citiesNames = new List<string>();
-
-        foreach (var city in Cities)
-        {
-            citiesNames.Add(city.Name);
-        }
-
-        return citiesNames;
-    }
-    
-    public List<string> GetCitiesNames(List<TicketCity> Cities)
-    {
-        List<string> citiesNames = new List<string>();
-
-        foreach (var city in Cities)
-        {
-            citiesNames.Add(city.Name);
-        }
-
-        return citiesNames;
-    }
-
     public int GetRemainingCapacity(Route route)
     {
-        return route.Capacity - route.Tickets.Count(t => 
+        int remainingCapacity = route.Capacity;
-            GetCitiesNames(t.Cities.ToList())
+
-                .Intersect(GetCitiesNames(route.Cities.ToList()))
+        foreach (var ticket in route.Tickets!)
-                .ToList().Any());
+        {
+            List<DateTime?> intersection = GetCitiesDates(route.Cities.ToList())
+                .Intersect(GetCitiesDates(ticket.Cities.ToList()))
+                .ToList();
+
+            if (intersection.Count > 1)
+            {
+                remainingCapacity--;
+            }
+        }
+
+        return remainingCapacity;
     }
 
+    // Returns false is place is available otherwise returns false
+    public bool IsTakenPlace(Route route, int place)
+    {
+        foreach (var ticket in route.Tickets!.Where(t => t.PassengerPlace == place))
+        {
+            List<DateTime?> intersection = GetCitiesDates(route.Cities.ToList())
+                .Intersect(GetCitiesDates(ticket.Cities.ToList()))
+                .ToList();
+
+            if (intersection.Count > 1)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+    
+    // Returns list of route cities' departure dates.
+    public List<DateTime?> GetCitiesDates(List<RouteCity> cities)
+    {
+        List<DateTime?> citiesDates = new List<DateTime?>();
+
+        foreach (var city in cities)
+        {
+            citiesDates.Add(city.DepartureTime);
+        }
+
+        return citiesDates;
+    }
+    
+    // Overload of the method above. Returns list of ticket cities' departure dates.
+    public List<DateTime?> GetCitiesDates(List<TicketCity> cities)
+    {
+        List<DateTime?> citiesDates = new List<DateTime?>();
+
+        foreach (var city in cities)
+        {
+            citiesDates.Add(city.DepartureTime);
+        }
+
+        return citiesDates;
+    }
 
     private void RetrieveAllRoutes()
     {
-        Routes = _context.Route
+        Routes = context.Route
             .Include(r => r.Cities)
             .Include(r => r.Tickets)
             .ToList();
 
-        // Add cities to tickets
+        // Add cities to tickets.
         for (int i = 0; i < Routes.Count; i++)
         {
-            for (int j = 0; j < Routes[i].Tickets.Count; j++)
+            for (int j = 0; j < Routes[i].Tickets!.Count; j++)
             {
-                Routes[i].Tickets.ToList()[j].Cities = _context.TicketCity
+                Routes[i].Tickets!.ToList()[j].Cities = context.TicketCity
-                    .Where(tc => tc.Ticket == Routes[i].Tickets.ToList()[j])
+                    .Where(tc => tc.Ticket == Routes[i].Tickets!.ToList()[j])
                     .ToList();
             }
         }
     }
 
-    private void FilterRoutesByFrom()
+    private void FilterRoutesByCities()
     {
+        if (From == To)
+        {
+            Routes!.RemoveAll(_ => true);
+            return;
+        }
         
-        Routes.ForEach(r => r.Cities = r.Cities
+        Routes!.RemoveAll(r =>
-            .SkipWhile(c => c.Name.ToLower() != From.Trim().ToLower())
+            r.Cities.All(c => c.Name.ToLower() != From!.ToLower().Trim())
-            .ToList());
+            || r.Cities.All(c => c.Name.ToLower() != To!.ToLower().Trim()));
 
-        Routes.RemoveAll(r => r.Cities.Count < 2);
+        if (Routes.Count == 0)
-    }
+        {
+            return;
+        }
         
-    private void FilterRoutesByTo()
+        RouteCity? fromCityFirst;
-    {
+        RouteCity? toCityFirst;
         
-        Routes.ForEach(r => r.Cities = r.Cities
+        RouteCity? fromCityLast;
-            .Reverse().SkipWhile(c => c.Name.ToLower() != To.Trim().ToLower())
+        RouteCity? toCityLast;
-            .Reverse().ToList());
 
-        Routes.RemoveAll(r => r.Cities.Count < 2);
+        foreach (var route in Routes!)
+        {
+            fromCityLast = route.Cities.LastOrDefault(c =>
+                c.Name.ToLower() == From!.ToLower().Trim());
+
+            toCityLast = route.Cities.LastOrDefault(c =>
+                c.Name.ToLower() == To!.ToLower().Trim());
+
+            if (fromCityLast == null || toCityLast == null)
+            {
+                continue;
+            }
+            
+            if (fromCityLast.Id > toCityLast.Id)
+            {
+                fromCityFirst = route.Cities.First(c =>
+                    c.Name.ToLower() == From!.ToLower().Trim());
+
+                toCityFirst = route.Cities.First(c =>
+                    c.Name.ToLower() == To!.ToLower().Trim());
+                
+                route.Cities = route.Cities
+                    .SkipWhile(c => c != fromCityFirst)
+                    .TakeWhile(c => 
+                        route.Cities.ToList().IndexOf(c) !=
+                        route.Cities.ToList().IndexOf(toCityFirst) + 1)
+                    .ToList();
+            }
+            else
+            {
+                route.Cities = route.Cities
+                    .SkipWhile(c => c != fromCityLast)
+                    .TakeWhile(c =>
+                        route.Cities.ToList().IndexOf(c) !=
+                        route.Cities.ToList().IndexOf(toCityLast) + 1)
+                    .ToList();
+            }
+        }
     }
 
     private void FilterRoutesByDate()
     {
-        Routes.RemoveAll(r =>
+        if (Date < DateTime.Today)
-            r.Cities.First().DepartureTime.Value.DayOfYear != Date.DayOfYear);
+        {
+            Routes!.RemoveAll(_ => true);
+            return;
+        }
+        
+        Routes!.RemoveAll(r =>
+            r.Cities.First().DepartureTime!.Value.DayOfYear != Date?.DayOfYear);
     }
 
     private void GetRoutes()
     {
-        if (!string.IsNullOrWhiteSpace(From) || !string.IsNullOrWhiteSpace(To))
+        if (string.IsNullOrWhiteSpace(From) || string.IsNullOrWhiteSpace(To) ||
+            Date == null)
         {
-            RetrieveAllRoutes();
+            return;
         }
         
-        if (!string.IsNullOrWhiteSpace(From))
+        RetrieveAllRoutes();
-        {
+        FilterRoutesByCities();
-            FilterRoutesByFrom();
+        FilterRoutesByDate();
-        }
-
-        if (!string.IsNullOrWhiteSpace(To))
-        {
-            FilterRoutesByTo();
-        }
-
-        if (!string.IsNullOrWhiteSpace(From) || !string.IsNullOrWhiteSpace(To))
-        {
-            FilterRoutesByDate();
-        }
     }
 
-    private bool PassengerNameValidation(string? name,
+    private bool PassengerNameValidation(
+        string? name,
         out string validationError)
     {
         if (String.IsNullOrEmpty(name))
@@ -257,7 +365,9 @@ public class IndexModel : PageModel
         return true;
     }
 
-    private bool PassengerPlaceValidation(int place, out string validationError)
+    private bool PassengerPlaceValidation(
+        int place,
+        out string validationError)
     {
         if (place == 0)
         {
@@ -265,11 +375,9 @@ public class IndexModel : PageModel
             return false;
         }
 
-        Ticket? ticket = _context.Ticket.FirstOrDefault(t =>
+        if (IsTakenPlace(
-            t.RouteId == Ticket.RouteId &&
+                Routes?.Where(r => r.Id == Ticket!.RouteId).ToList()[0]!,
-            t.PassengerPlace == Ticket.PassengerPlace);
+                Ticket!.PassengerPlace))
-
-        if (ticket is not null)
         {
             validationError = "Місце вже зайняте";
             return false;
@@ -281,9 +389,12 @@ public class IndexModel : PageModel
 
     private void CopyCitiesToTicket()
     {
-        List<RouteCity> RouteCities = Routes.Find(r => r.Id == Ticket.RouteId).Cities.ToList();
+        List<RouteCity> routeCities = 
-        Ticket.Cities = new List<TicketCity>();
+            Routes!.Find(r => r.Id == Ticket!.RouteId)!.Cities.ToList();
-        foreach (var city in RouteCities)
+        
+        Ticket!.Cities = new List<TicketCity>();
+        
+        foreach (var city in routeCities)
         {
             Ticket.Cities.Add(new TicketCity
             {
@@ -296,8 +407,9 @@ public class IndexModel : PageModel
 
     private void RevertChangesToRouteCities()
     {
-        _context.ChangeTracker.Entries()
+        context.ChangeTracker.Entries()
-            .Where(e => e.Metadata.Name == "TicketOffice.Models.RouteCity")
+            .Where(e =>
+                e.Metadata.Name == "TicketOffice.Models.RouteCity")
             .ToList().ForEach(e => e.State = EntityState.Unchanged);
     }
 }

TicketOffice/Program.cs

@@ -6,7 +6,7 @@ var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddRazorPages()
-    .AddSessionStateTempDataProvider();;
+    .AddSessionStateTempDataProvider();
 
 builder.Services.AddDbContext<TicketOfficeContext>(options =>
     options.UseSqlite(builder.Configuration.GetConnectionString("TicketOfficeContext")));
@@ -15,7 +15,7 @@ builder.Services.AddDistributedMemoryCache();
 builder.Services.AddSession(options =>
 {
     options.Cookie.Name = ".AutoBus.Session";
-    options.IdleTimeout = TimeSpan.FromSeconds(3600);
+    options.IdleTimeout = TimeSpan.FromSeconds(1800);
     options.Cookie.IsEssential = true;
 });
 
@@ -25,15 +25,12 @@ using var scope = app.Services.CreateScope();
 var services = scope.ServiceProvider;
 SeedData.Initialize(services);
 
-// Configure the HTTP request pipeline.
 if (!app.Environment.IsDevelopment())
 {
     app.UseExceptionHandler("/Error");
-    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
     app.UseHsts();
 }
 
-
 app.UseHttpsRedirection();
 app.UseStaticFiles();
 

TicketOffice/TicketOffice.csproj

@@ -32,6 +32,15 @@
     <ItemGroup>
       <_ContentIncludedByDefault Remove="Pages\Auth\Registration\Index.cshtml" />
       <_ContentIncludedByDefault Remove="Pages\Auth\Login\Index.cshtml" />
+      <_ContentIncludedByDefault Remove="Pages\Management\Index.cshtml" />
+      <_ContentIncludedByDefault Remove="Pages\Management\Routes\Create.cshtml" />
+      <_ContentIncludedByDefault Remove="Pages\Management\Routes\Delete.cshtml" />
+      <_ContentIncludedByDefault Remove="Pages\Management\Routes\Edit.cshtml" />
+      <_ContentIncludedByDefault Remove="Pages\Management\Routes\Index.cshtml" />
+      <_ContentIncludedByDefault Remove="Pages\Management\Tickets\Create.cshtml" />
+      <_ContentIncludedByDefault Remove="Pages\Management\Tickets\Delete.cshtml" />
+      <_ContentIncludedByDefault Remove="Pages\Management\Tickets\Edit.cshtml" />
+      <_ContentIncludedByDefault Remove="Pages\Management\Tickets\Index.cshtml" />
     </ItemGroup>
 
 </Project>

TicketOffice/appsettings.Development.json

@@ -1,9 +0,0 @@
-{
-  "DetailedErrors": true,
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

TicketOffice/wwwroot/css/Account.css

@@ -92,7 +92,7 @@ body {
     display: inline-block;
     color: #1d4965;
     font-size: 0.8rem;
-    font-weight: 50 0;
+    font-weight: 500;
     background: linear-gradient(0deg,#79b6db,#b3dbf2);
     border: none;
     border-radius: .3rem;

TicketOffice/wwwroot/css/CityListPopup.css

@@ -10,13 +10,13 @@
 }
 
 .popup-city-list {
-    width: 40rem;
+    width: 42rem;
     height: fit-content;
     max-height: 30rem;
     background: #eaeef1;
     position: fixed;
     top: calc(50% - 15rem);
-    left: calc(50% - 20rem);
+    left: calc(50% - 21rem);
     border-radius: 0.5rem;
     box-shadow: 0 10px 15px 5px #6c6e6f;
 }
@@ -34,11 +34,10 @@
 
 .popup-body-city-list {
     width: calc(100% - 2rem);
-    height: calc(100% - 7.5rem);
+    height: calc(30rem - 7.5rem);
     padding: 0 1rem;
     margin-top: 0.5rem;
     overflow-y: auto;
-    overflow-x: hidden;
 }
 
 tr.tr-intermediate {