From 0a1a8a3033c50efb5785dbe267080ed72d9295d4 Mon Sep 17 00:00:00 2001
From: Simon Schneider <Simon.Schneider@plan-b-gmbh.com>
Date: Mon, 30 Mar 2020 13:48:40 +0200
Subject: [PATCH] #140 Delete function and postalCode fix

---
 .../Contracts/IRestaurantService.cs           | 11 +++-
 .../Controllers/RestaurantController.cs       | 41 ++++++++++++-
 .../Models/RestaurantViewModel.cs             | 30 ++++++----
 .../Services/RestaurantService.cs             | 24 +++++++-
 .../Views/Restaurant/Delete.cshtml            | 57 +++++++++++++++++++
 .../Views/Restaurant/Index.cshtml             |  2 +-
 6 files changed, 144 insertions(+), 21 deletions(-)
 create mode 100644 PlanB.Butler.Admin/PlanB.Butler.Admin/Views/Restaurant/Delete.cshtml

diff --git a/PlanB.Butler.Admin/PlanB.Butler.Admin/Contracts/IRestaurantService.cs b/PlanB.Butler.Admin/PlanB.Butler.Admin/Contracts/IRestaurantService.cs
index 8d2009f..31d93dd 100644
--- a/PlanB.Butler.Admin/PlanB.Butler.Admin/Contracts/IRestaurantService.cs
+++ b/PlanB.Butler.Admin/PlanB.Butler.Admin/Contracts/IRestaurantService.cs
@@ -24,10 +24,10 @@ public interface IRestaurantService
         /// </summary>
         /// <param name="restaurant">The meal.</param>
         /// <returns>True or false.</returns>
-        Task<bool> CreateRestaurant(RestaurantViewModel restaurant);
+        Task<RestaurantViewModel> CreateRestaurant(RestaurantViewModel restaurant);
 
         /// <summary>
-        /// Updates the restaurant.
+        /// Updates the restaurant. 
         /// </summary>
         /// <param name="restaurant">The restuarant.</param>
         /// <returns>Restaurant.</returns>
@@ -39,5 +39,12 @@ public interface IRestaurantService
         /// <param name="id">The identifier.</param>
         /// <returns>Restaurant by Id.</returns>
         Task<RestaurantViewModel> GetRestaurant(string id);
+
+        /// <summary>
+        /// Deletes the meal.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>Meal by Id.</returns>
+        Task<bool> DeleteRestaurant(string id);
     }
 }
diff --git a/PlanB.Butler.Admin/PlanB.Butler.Admin/Controllers/RestaurantController.cs b/PlanB.Butler.Admin/PlanB.Butler.Admin/Controllers/RestaurantController.cs
index 0f3d521..e7be729 100644
--- a/PlanB.Butler.Admin/PlanB.Butler.Admin/Controllers/RestaurantController.cs
+++ b/PlanB.Butler.Admin/PlanB.Butler.Admin/Controllers/RestaurantController.cs
@@ -19,7 +19,7 @@ namespace PlanB.Butler.Admin.Controllers
     public class RestaurantController : Controller
     {
         /// GET: /<controller>
-        private IRestaurantService restaurantService;
+        private readonly IRestaurantService restaurantService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RestaurantController"/> class.
@@ -53,7 +53,7 @@ public IActionResult Create()
         /// <returns>Meal.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Create([Bind("Id,CorrelationId,Date,Price,Name,Restaurant")] Models.RestaurantViewModel restaurant)
+        public async Task<IActionResult> Create([Bind("Id,CorrelationId,Date,Price,Name,Restaurant,PhoneNumber,City, Street, PostalCode, Url, Email")] Models.RestaurantViewModel restaurant)
         {
             if (this.ModelState.IsValid)
             {
@@ -72,7 +72,7 @@ public async Task<IActionResult> Create([Bind("Id,CorrelationId,Date,Price,Name,
         /// <returns>IActionResult.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Edit(string id, [Bind("Id,CorrelationId,Date,Price,Name,Restaurant,PhoneNumber,City")] Models.RestaurantViewModel restaurant)
+        public async Task<IActionResult> Edit(string id, [Bind("Id,CorrelationId,Date,Price,Name,Restaurant,PhoneNumber,City, Street, PostalCode, Url, Email")] Models.RestaurantViewModel restaurant)
         {
             if (id != restaurant.Id)
             {
@@ -110,6 +110,41 @@ public async Task<IActionResult> Edit(string id)
 
             return this.View(restaurant);
         }
+        /// <summary>
+        /// Deletes the specified identifier.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>IActionResult.</returns>
+        public async Task<IActionResult> Delete(string id)
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                return this.NotFound();
+            }
+
+            var restaurant = await this.restaurantService.GetRestaurant(id);
+
+            if (restaurant == null)
+            {
+                return this.NotFound();
+            }
+
+            return this.View(restaurant);
+        }
+
+        /// <summary>
+        /// Deletes the confirmed.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>IActionResult.</returns>
+        [HttpPost]
+        [ActionName("Delete")]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> DeleteConfirmed(string id)
+        {
+            await this.restaurantService.DeleteRestaurant(id);
 
+            return this.RedirectToAction(nameof(this.Index));
+        }
     }
 }
diff --git a/PlanB.Butler.Admin/PlanB.Butler.Admin/Models/RestaurantViewModel.cs b/PlanB.Butler.Admin/PlanB.Butler.Admin/Models/RestaurantViewModel.cs
index e3a1859..61f9330 100644
--- a/PlanB.Butler.Admin/PlanB.Butler.Admin/Models/RestaurantViewModel.cs
+++ b/PlanB.Butler.Admin/PlanB.Butler.Admin/Models/RestaurantViewModel.cs
@@ -39,12 +39,30 @@ public string Id
         [JsonProperty("url")]
         public Uri Url { get; set; }
 
+        /// <summary>
+        /// Gets or sets the correlationid.
+        /// </summary>
+        /// <value>
+        /// The correlationid.
+        /// </value>
         [JsonProperty("correlationid")]
         public Guid? CorrelationId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>
+        /// The name.
+        /// </value>
         [JsonProperty("name")]
         public string Name { get; set; }
 
+        /// <summary>
+        /// Gets or sets the street.
+        /// </summary>
+        /// <value>
+        /// The street.
+        /// </value>
         [JsonProperty("street")]
         public string Street { get; set; }
 
@@ -83,17 +101,5 @@ public string Id
         /// </value>
         [JsonProperty("emailAddress")]
         public string EmailAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the date.
-        /// </summary>
-        /// <value>
-        /// The date.
-        /// </value>
-        [DisplayFormat(DataFormatString = "{0:dd.MM.yyyy}")]
-        [DataType(DataType.Date)]
-        [JsonProperty("date")]
-        public DateTime Date { get; set; }
-
     }
 }
diff --git a/PlanB.Butler.Admin/PlanB.Butler.Admin/Services/RestaurantService.cs b/PlanB.Butler.Admin/PlanB.Butler.Admin/Services/RestaurantService.cs
index 9014d4e..803fa13 100644
--- a/PlanB.Butler.Admin/PlanB.Butler.Admin/Services/RestaurantService.cs
+++ b/PlanB.Butler.Admin/PlanB.Butler.Admin/Services/RestaurantService.cs
@@ -47,7 +47,7 @@ public RestaurantService(HttpClient httpClient, IConfiguration configuration)
         /// <returns>
         /// True or false.
         /// </returns>
-        public async Task<bool> CreateRestaurant(RestaurantViewModel restaurant)
+        public async Task <RestaurantViewModel> CreateRestaurant(RestaurantViewModel restaurant)
         {
             Guid correlationId = Guid.NewGuid();
             restaurant.CorrelationId = correlationId;
@@ -63,8 +63,9 @@ public async Task<bool> CreateRestaurant(RestaurantViewModel restaurant)
             Util.AddDefaultEsbHeaders(httpRequestMessage, correlationId, this.config["FunctionsKey"]);
             var result = await this.httpClient.SendAsync(httpRequestMessage);
             result.EnsureSuccessStatusCode();
-            var success = result.IsSuccessStatusCode;
-            return success;
+
+            RestaurantViewModel responseModel = JsonConvert.DeserializeObject<RestaurantViewModel>(result.Content.ReadAsStringAsync().Result);
+            return responseModel;
         }   
 
         /// <summary>
@@ -133,5 +134,22 @@ public async Task<RestaurantViewModel> UpdateRestaurant(RestaurantViewModel rest
             var updatedRestaurant = JsonConvert.DeserializeObject<RestaurantViewModel>(responseString);
             return updatedRestaurant;
         }
+
+        /// <summary>
+        /// Deletes the restaurant.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>
+        /// Succes or failure.
+        /// </returns>
+        public async Task<bool> DeleteRestaurant(string id)
+        {
+            var uri = this.config["RestaurantUri"].TrimEnd('/') + "/" + id;
+
+            this.httpClient.DefaultRequestHeaders.Add(Constants.FunctionsKeyHeader, this.config["FunctionsKey"]);
+            var response = await this.httpClient.DeleteAsync(uri);
+
+            return response.IsSuccessStatusCode;
+        }
     }
 }
diff --git a/PlanB.Butler.Admin/PlanB.Butler.Admin/Views/Restaurant/Delete.cshtml b/PlanB.Butler.Admin/PlanB.Butler.Admin/Views/Restaurant/Delete.cshtml
new file mode 100644
index 0000000..0573424
--- /dev/null
+++ b/PlanB.Butler.Admin/PlanB.Butler.Admin/Views/Restaurant/Delete.cshtml
@@ -0,0 +1,57 @@
+@model PlanB.Butler.Admin.Models.RestaurantViewModel
+
+@{
+    ViewData["Title"] = "Delete";
+}
+
+<h1>Delete</h1>
+
+<h3>Are you sure you want to delete this?</h3>
+<div>
+    <h4>MealViewModel</h4>
+    <hr />
+    <dl class="row">      
+        <dt class="col-sm-2">
+            @Html.DisplayNameFor(model => model.City)
+        </dt>
+        <dd class="col-sm-10">
+            @Html.DisplayFor(model => model.City)
+        </dd>
+        <dt class="col-sm-2">
+            @Html.DisplayNameFor(model => model.PostalCode)
+        </dt>
+        <dd class="col-sm-10">
+            @Html.DisplayFor(model => model.PostalCode)
+        </dd>
+
+        <dt class="col-sm-2">
+            @Html.DisplayNameFor(model => model.Name)
+        </dt>
+        <dd class="col-sm-10">
+            @Html.DisplayFor(model => model.Name)
+        </dd>
+        <dt class="col-sm-2">
+            @Html.DisplayNameFor(model => model.Street)
+        </dt>
+        <dd class="col-sm-10">
+            @Html.DisplayFor(model => model.Street)
+        </dd>       
+        <dt class="col-sm-2">
+            @Html.DisplayNameFor(model => model.EmailAddress)
+        </dt>
+        <dd class="col-sm-10">
+            @Html.DisplayFor(model => model.EmailAddress)
+        </dd>
+        <dt class="col-sm-2">
+            @Html.DisplayNameFor(model => model.PhoneNumber)
+        </dt>
+        <dd class="col-sm-10">
+            @Html.DisplayFor(model => model.PhoneNumber)
+        </dd>
+    </dl>
+    
+    <form asp-action="Delete">
+        <input type="submit" value="Delete" class="btn btn-danger" /> |
+        <a asp-action="Index">Back to List</a>
+    </form>
+</div>
diff --git a/PlanB.Butler.Admin/PlanB.Butler.Admin/Views/Restaurant/Index.cshtml b/PlanB.Butler.Admin/PlanB.Butler.Admin/Views/Restaurant/Index.cshtml
index f0d89ac..a79a43b 100644
--- a/PlanB.Butler.Admin/PlanB.Butler.Admin/Views/Restaurant/Index.cshtml
+++ b/PlanB.Butler.Admin/PlanB.Butler.Admin/Views/Restaurant/Index.cshtml
@@ -54,7 +54,7 @@
                 @Html.DisplayFor(modelItem => item.EmailAddress)
             </td>
             <td>
-                @Html.DisplayNameFor(model => model.PostalCode)
+                @Html.DisplayFor(modelItem => item.PostalCode)
             </td>
             <td>
                 <a asp-action="Edit" asp-route-id="@item.Id">Edit</a>