From 547c6e8774038833583ccae8602632c74db482a7 Mon Sep 17 00:00:00 2001
From: "ani_konarcheva@abv.bg" <ani_konarcheva@abv.bg>
Date: Fri, 8 Apr 2022 14:05:16 +0300
Subject: [PATCH] commiting some changes

---
 RentACar/Data/Data/RentACarDbContext.cs       |  2 +-
 RentACar/Data/Models/Car.cs                   |  1 +
 .../WebApp/Controllers/RentsController.cs     |  6 +-
 RentACar/WebApp/Startup.cs                    |  3 +-
 RentACar/WebApp/Views/Cars/Index.cshtml       | 62 ++++++++++---------
 RentACar/WebApp/Views/Rents/Create.cshtml     |  5 ++
 RentACar/WebApp/Views/Rents/Index.cshtml      |  8 ++-
 RentACar/WebApp/WebApp.csproj                 |  2 +-
 RentACar/WebApp/appsettings.json              |  2 +-
 .../WebApp/bin/Debug/net5.0/appsettings.json  |  2 +-
 10 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/RentACar/Data/Data/RentACarDbContext.cs b/RentACar/Data/Data/RentACarDbContext.cs
index 80fe50b..5e28229 100644
--- a/RentACar/Data/Data/RentACarDbContext.cs
+++ b/RentACar/Data/Data/RentACarDbContext.cs
@@ -20,7 +20,7 @@ namespace Data
         {
             if (!optionsBuilder.IsConfigured)
             {
-                optionsBuilder.UseSqlServer("Server=.;Database=RentACar;Integrated Security=true;");
+                optionsBuilder.UseSqlServer("Server=.\\SQLEXPRESS;Database=RentACar;Integrated Security=true;");
             }
         }
 
diff --git a/RentACar/Data/Models/Car.cs b/RentACar/Data/Models/Car.cs
index 8416f84..ae49492 100644
--- a/RentACar/Data/Models/Car.cs
+++ b/RentACar/Data/Models/Car.cs
@@ -10,6 +10,7 @@ namespace Data.Entities
     public class Car
     {
         [Required]
+        [Key]
         public int Id { get; set; }
 
         [Required]
diff --git a/RentACar/WebApp/Controllers/RentsController.cs b/RentACar/WebApp/Controllers/RentsController.cs
index 0238e68..5658037 100644
--- a/RentACar/WebApp/Controllers/RentsController.cs
+++ b/RentACar/WebApp/Controllers/RentsController.cs
@@ -54,11 +54,11 @@ namespace WebApp.Controllers
         // For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Create([Bind("Id,StartDate,EndDate")] Rents rents)
+        public async Task<IActionResult> Create([Bind("Id,CarId,StartDate,EndDate,UserId")] Rents rents)
         {
             if (ModelState.IsValid)
             {
-                var car = _context.Cars.FirstOrDefault(car => car.Id == 1);
+                var car = _context.Cars.FirstOrDefault(car => car.Id == rents.CarId);
                 rents.Car = car;
                 _context.Add(rents);
                 await _context.SaveChangesAsync();
@@ -88,7 +88,7 @@ namespace WebApp.Controllers
         // For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Edit(int id, [Bind("Id,StartDate,EndDate")] Rents rents)
+        public async Task<IActionResult> Edit(int id, [Bind("Id,CarId,StartDate,EndDate,UserId")] Rents rents)
         {
             if (id != rents.Id)
             {
diff --git a/RentACar/WebApp/Startup.cs b/RentACar/WebApp/Startup.cs
index 083f3b5..b975999 100644
--- a/RentACar/WebApp/Startup.cs
+++ b/RentACar/WebApp/Startup.cs
@@ -39,7 +39,7 @@ namespace API
                 options.Password.RequireNonAlphanumeric = false;
                 options.Password.RequireUppercase = true;
 
-                options.User.RequireUniqueEmail = false;
+                options.User.RequireUniqueEmail = true;
             })
                 .AddRoles<IdentityRole>()
                 .AddDefaultUI()
@@ -78,6 +78,7 @@ namespace API
                     pattern: "{controller=Home}/{action=Index}/{id?}");
                 endpoints.MapRazorPages();
             });
+
         }
     }
 }
diff --git a/RentACar/WebApp/Views/Cars/Index.cshtml b/RentACar/WebApp/Views/Cars/Index.cshtml
index 8e4115b..0013ac8 100644
--- a/RentACar/WebApp/Views/Cars/Index.cshtml
+++ b/RentACar/WebApp/Views/Cars/Index.cshtml
@@ -14,6 +14,9 @@
 <table class="table">
     <thead>
         <tr>
+            <th>
+                @Html.DisplayNameFor(model => model.Id)
+            </th>
             <th>
                 @Html.DisplayNameFor(model => model.Brand)
             </th>
@@ -40,36 +43,39 @@
     <tbody>
         @foreach (var item in Model)
         {
-        <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.Brand)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Model)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Year)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.CountPassengerSeats)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Description)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.PriceForDay)
-            </td>
-            <td>
-                <a asp-controller="Rents" asp-action="Create">Select</a>
-            </td>
-            @if (this.User.IsInRole("Admin"))
-            {
+            <tr>
                 <td>
-                    <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                    <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                    <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
+                    @Html.DisplayFor(modelItem => item.Id)
                 </td>
-            }
+                <td>
+                    @Html.DisplayFor(modelItem => item.Brand)
+                </td>
+                <td>
+                    @Html.DisplayFor(modelItem => item.Model)
+                </td>
+                <td>
+                    @Html.DisplayFor(modelItem => item.Year)
+                </td>
+                <td>
+                    @Html.DisplayFor(modelItem => item.CountPassengerSeats)
+                </td>
+                <td>
+                    @Html.DisplayFor(modelItem => item.Description)
+                </td>
+                <td>
+                    @Html.DisplayFor(modelItem => item.PriceForDay)
+                </td>
+                <td>
+                    <a asp-controller="Rents" asp-action="Create">Select</a>
+                </td>
+                @if (this.User.IsInRole("Admin"))
+                {
+                    <td>
+                        <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
+                        <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
+                        <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
+                    </td>
+                }
             </tr>
         }
     </tbody>
diff --git a/RentACar/WebApp/Views/Rents/Create.cshtml b/RentACar/WebApp/Views/Rents/Create.cshtml
index c6e8065..49e13ea 100644
--- a/RentACar/WebApp/Views/Rents/Create.cshtml
+++ b/RentACar/WebApp/Views/Rents/Create.cshtml
@@ -12,6 +12,11 @@
     <div class="col-md-4">
         <form asp-action="Create">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <div class="form-group">
+                <label asp-for="CarId" class="control-label"></label>
+                <input asp-for="CarId" class="form-control" />
+                <span asp-validation-for="CarId" class="text-danger"></span>
+            </div>
             <div class="form-group">
                 <label asp-for="StartDate" class="control-label"></label>
                 <input asp-for="StartDate" class="form-control" />
diff --git a/RentACar/WebApp/Views/Rents/Index.cshtml b/RentACar/WebApp/Views/Rents/Index.cshtml
index c342a8a..ed1701b 100644
--- a/RentACar/WebApp/Views/Rents/Index.cshtml
+++ b/RentACar/WebApp/Views/Rents/Index.cshtml
@@ -13,6 +13,9 @@
 <table class="table">
     <thead>
         <tr>
+            <th>
+                @Html.DisplayNameFor(model => model.CarId)
+            </th>
             <th>
                 @Html.DisplayNameFor(model => model.StartDate)
             </th>
@@ -25,6 +28,9 @@
     <tbody>
 @foreach (var item in Model) {
         <tr>
+            <td>
+                @Html.DisplayFor(modelItem => item.CarId)
+            </td>
             <td>
                 @Html.DisplayFor(modelItem => item.StartDate)
             </td>
@@ -39,7 +45,7 @@
                     <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
                 </td>
             }
-            </tr>
+        </tr>
 }
     </tbody>
 </table>
diff --git a/RentACar/WebApp/WebApp.csproj b/RentACar/WebApp/WebApp.csproj
index 6c65f91..880cf2b 100644
--- a/RentACar/WebApp/WebApp.csproj
+++ b/RentACar/WebApp/WebApp.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
diff --git a/RentACar/WebApp/appsettings.json b/RentACar/WebApp/appsettings.json
index 5bd170a..e899df0 100644
--- a/RentACar/WebApp/appsettings.json
+++ b/RentACar/WebApp/appsettings.json
@@ -1,6 +1,6 @@
 {
     "ConnectionStrings": {
-        "DefaultConnection": "Server=.;Database=RentACar;Integrated Security=true;"
+        "DefaultConnection": "Server=.\\SQLEXPRESS;Database=RentACar;Integrated Security=true;"
     },
     "Logging": {
         "LogLevel": {
diff --git a/RentACar/WebApp/bin/Debug/net5.0/appsettings.json b/RentACar/WebApp/bin/Debug/net5.0/appsettings.json
index 5bd170a..e899df0 100644
--- a/RentACar/WebApp/bin/Debug/net5.0/appsettings.json
+++ b/RentACar/WebApp/bin/Debug/net5.0/appsettings.json
@@ -1,6 +1,6 @@
 {
     "ConnectionStrings": {
-        "DefaultConnection": "Server=.;Database=RentACar;Integrated Security=true;"
+        "DefaultConnection": "Server=.\\SQLEXPRESS;Database=RentACar;Integrated Security=true;"
     },
     "Logging": {
         "LogLevel": {