Delete

Author: jbogard

ContosoUniversity/Features/Instructors/CreateEdit.cs

@@ -99,6 +99,9 @@ public async Task<Command> Handle(Query message)
                 else
                 {
                     model = await _db.Instructors
+                        .Include(m => m.CourseAssignments)
+                        .ThenInclude(ca => ca.Course)
+                        .Include(m => m.OfficeAssignment)
                         .Where(i => i.Id == message.Id)
                         .Map()
                         .SingleOrDefaultAsync<Command>();

ContosoUniversity/Features/Instructors/CreateEdit.cshtml

@@ -10,7 +10,7 @@
 <hr />
 <div class="row">
     <div class="col-md-4">
-        <form>
+        <form method="post">
             @Html.ValidationDiv()
             @Html.FormBlock(m => m.LastName)
             @Html.FormBlock(m => m.FirstMidName)

ContosoUniversity/Features/Instructors/Delete.cs

@@ -0,0 +1,85 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using AutoMapper.QueryableExtensions;
+using ContosoUniversity.Data;
+using ContosoUniversity.Models;
+using FluentValidation;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace ContosoUniversity.Features.Instructors
+{
+    public class Delete
+    {
+        public class Query : IRequest<Command>
+        {
+            public int? Id { get; set; }
+        }
+
+        public class Validator : AbstractValidator<Query>
+        {
+            public Validator()
+            {
+                RuleFor(m => m.Id).NotNull();
+            }
+        }
+
+        public class Command : IRequest
+        {
+            public int? ID { get; set; }
+
+            public string LastName { get; set; }
+            [Display(Name = "First Name")]
+            public string FirstMidName { get; set; }
+
+            [DisplayFormat(DataFormatString = "{0:yyyy-MM-dd}")]
+            public DateTime? HireDate { get; set; }
+
+            [Display(Name = "Location")]
+            public string OfficeAssignmentLocation { get; set; }
+        }
+
+        public class QueryHandler : IAsyncRequestHandler<Query, Command>
+        {
+            private readonly SchoolContext _db;
+
+            public QueryHandler(SchoolContext db) => _db = db;
+
+            public Task<Command> Handle(Query message) => _db
+                .Instructors
+                .Where(i => i.Id == message.Id)
+                .ProjectTo<Command>()
+                .SingleOrDefaultAsync();
+        }
+
+        public class CommandHandler : IAsyncRequestHandler<Command>
+        {
+            private readonly SchoolContext _db;
+
+            public CommandHandler(SchoolContext db) => _db = db;
+
+            public async Task Handle(Command message)
+            {
+                Instructor instructor = await _db.Instructors
+                    .Include(i => i.OfficeAssignment)
+                    .Where(i => i.Id == message.ID)
+                    .SingleAsync();
+
+                instructor.Handle(message);
+
+                _db.Instructors.Remove(instructor);
+
+                var department = await _db.Departments
+                    .Where(d => d.InstructorID == message.ID)
+                    .SingleOrDefaultAsync();
+                if (department != null)
+                {
+                    department.InstructorID = null;
+                }
+
+            }
+        }
+    }
+}

ContosoUniversity/Features/Instructors/Delete.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Instructor
+@model ContosoUniversity.Features.Instructors.Delete.Command
 
 @{
     ViewData["Title"] = "Delete";
@@ -12,28 +12,28 @@
     <hr />
     <dl class="dl-horizontal">
         <dt>
-            @Html.DisplayNameFor(model => model.LastName)
+            <display-label-tag for="LastName"/>
         </dt>
         <dd>
-            @Html.DisplayFor(model => model.LastName)
+            <display-tag for="LastName"/>
         </dd>
         <dt>
-            @Html.DisplayNameFor(model => model.FirstMidName)
+            <display-label-tag for="FirstMidName" />
         </dt>
         <dd>
-            @Html.DisplayFor(model => model.FirstMidName)
+            <display-tag for="FirstMidName" />
         </dd>
         <dt>
-            @Html.DisplayNameFor(model => model.HireDate)
+            <display-label-tag for="HireDate" />
         </dt>
         <dd>
-            @Html.DisplayFor(model => model.HireDate)
+            <display-tag for="HireDate" />
         </dd>
     </dl>
 
     <form asp-action="Delete">
-        <input type="hidden" asp-for="ID" />
-        <input type="submit" value="Delete" class="btn btn-default" /> |
+        <input-tag for="ID"/>
+        <input type="submit" value="Delete" class="btn btn-default"/> |
         <a asp-action="Index">Back to List</a>
     </form>
 </div>

ContosoUniversity/Features/Instructors/InstructorsController.cs

@@ -13,14 +13,9 @@ namespace ContosoUniversity.Features.Instructors
 {
     public class InstructorsController : Controller
     {
-        private readonly SchoolContext _context;
         private readonly IMediator _mediator;
 
-        public InstructorsController(SchoolContext context, IMediator mediator)
-        {
-            _context = context;
-            _mediator = mediator;
-        }
+        public InstructorsController(IMediator mediator) => _mediator = mediator;
 
         public async Task<IActionResult> Index(Index.Query query) 
             => View(await _mediator.Send(query));
@@ -29,12 +24,8 @@ public async Task<IActionResult> Index(Index.Query query)
         public async Task<IActionResult> Details(Details.Query query)
             => View(await _mediator.Send(query));
 
-        public async Task<IActionResult> Create()
-        {
-            var model = await _mediator.Send(new CreateEdit.Query());
-
-            return View(nameof(CreateEdit), model);
-        }
+        public async Task<IActionResult> Create() 
+            => View(nameof(CreateEdit), await _mediator.Send(new CreateEdit.Query()));
 
         [HttpPost]
         [ValidateAntiForgeryToken]
@@ -45,12 +36,8 @@ public async Task<IActionResult> Create(CreateEdit.Command command)
             return this.RedirectToActionJson(nameof(Index));
         }
 
-        public async Task<IActionResult> Edit(CreateEdit.Query query)
-        {
-            var model = await _mediator.Send(query);
-
-            return View(nameof(CreateEdit), model);
-        }
+        public async Task<IActionResult> Edit(CreateEdit.Query query) 
+            => View(nameof(CreateEdit), await _mediator.Send(query));
 
         [HttpPost]
         [ValidateAntiForgeryToken]
@@ -60,47 +47,16 @@ public async Task<IActionResult> Edit(CreateEdit.Command command)
 
             return this.RedirectToActionJson(nameof(Index));
         }
-        // GET: Instructors/Delete/5
-        public async Task<IActionResult> Delete(int? id)
-        {
-            if (id == null)
-            {
-                return NotFound();
-            }
-
-            var instructor = await _context.Instructors
-                .SingleOrDefaultAsync(m => m.Id == id);
-            if (instructor == null)
-            {
-                return NotFound();
-            }
-
-            return View(instructor);
-        }
+        public async Task<IActionResult> Delete(Delete.Query query) 
+            => View(await _mediator.Send(query));
 
-        // POST: Instructors/Delete/5
-        [HttpPost, ActionName("Delete")]
+        [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> DeleteConfirmed(int id)
+        public async Task<ActionResult> Delete(Delete.Command command)
         {
-            Instructor instructor = await _context.Instructors
-                .Include(i => i.CourseAssignments)
-                .SingleAsync(i => i.Id == id);
-
-            var departments = await _context.Departments
-                .Where(d => d.Id == id)
-                .ToListAsync();
-            departments.ForEach(d => d.InstructorID = null);
-
-            _context.Instructors.Remove(instructor);
-
-            await _context.SaveChangesAsync();
-            return RedirectToAction("Index");
-        }
+            await _mediator.Send(command);
 
-        private bool InstructorExists(int id)
-        {
-            return _context.Instructors.Any(e => e.Id == id);
+            return this.RedirectToActionJson(nameof(Index));
         }
     }
 }

ContosoUniversity/Features/Instructors/MappingProfile.cs

@@ -16,7 +16,7 @@ public MappingProfile()
             CreateMap<CourseAssignment, CreateEdit.Command.CourseAssignment>();
 
             CreateMap<Instructor, Details.Model>();
-            //CreateMap<Instructor, Delete.Command>();
+            CreateMap<Instructor, Delete.Command>();
         }
     }
 }

ContosoUniversity/Models/Instructor.cs

@@ -14,8 +14,8 @@ public class Instructor : Person
         [Display(Name = "Hire Date")]
         public DateTime HireDate { get; set; }
 
-        public ICollection<CourseAssignment> CourseAssignments { get; set; }
-        public OfficeAssignment OfficeAssignment { get; set; }
+        public ICollection<CourseAssignment> CourseAssignments { get; private set; } = new List<CourseAssignment>();
+        public OfficeAssignment OfficeAssignment { get; private set; }
 
         public void Handle(CreateEdit.Command message,
             IEnumerable<Course> courses)
@@ -25,7 +25,7 @@ public void Handle(CreateEdit.Command message,
             UpdateInstructorCourses(message.SelectedCourses, courses);
         }
 
-//        public void Handle(Delete.Command message) => OfficeAssignment = null;
+        public void Handle(Delete.Command message) => OfficeAssignment = null;
 
         private void UpdateDetails(CreateEdit.Command message)
         {