moved models to entities

ContosoUniversity.Data/ApplicationContext.cs

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using ContosoUniversity.Data.Entities;
+using Microsoft.EntityFrameworkCore;
 
 namespace ContosoUniversity.Data
 {
@@ -8,9 +9,23 @@ public ApplicationContext(DbContextOptions<ApplicationContext> options) : base(o
         {
         }
 
+        public DbSet<Course> Courses { get; set; }
+        public DbSet<Enrollment> Enrollments { get; set; }
+        public DbSet<Student> Students { get; set; }
+        public DbSet<Department> Departments { get; set; }
+        public DbSet<Instructor> Instructors { get; set; }
+
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
-
+            modelBuilder.Entity<Course>().ToTable("Course", "Contoso");
+            modelBuilder.Entity<Enrollment>().ToTable("Enrollment", "Contoso");
+            modelBuilder.Entity<Student>().ToTable("Student", "Contoso");
+            modelBuilder.Entity<Department>().ToTable("Department", "Contoso");
+            modelBuilder.Entity<Instructor>().ToTable("Instructor", "Contoso");
+            modelBuilder.Entity<OfficeAssignment>().ToTable("OfficeAssignment", "Contoso");
+            modelBuilder.Entity<CourseAssignment>().ToTable("CourseAssignment", "Contoso");
+            modelBuilder.Entity<Person>().ToTable("Person", "Contoso");
+            modelBuilder.Entity<CourseAssignment>().HasKey(c => new { c.CourseID, c.InstructorID });
         }
     }
 }

ContosoUniversity.Data/ContosoUniversity.Data.csproj

@@ -4,12 +4,6 @@
     <TargetFramework>netcoreapp1.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Entities\**" />
-    <EmbeddedResource Remove="Entities\**" />
-    <None Remove="Entities\**" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />

ContosoUniversity/Models/Course.cs → ContosoUniversity.Data/Entities/Course.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace ContosoUniversity.Models
+namespace ContosoUniversity.Data.Entities
 {
     public class Course
     {
@@ -18,7 +18,7 @@ public class Course
 
         public int DepartmentID { get; set; }
 
-        public Department Department { get; set; }        
+        public Department Department { get; set; }
         public ICollection<Enrollment> Enrollments { get; set; }
         public ICollection<CourseAssignment> CourseAssignments { get; set; }
     }

ContosoUniversity/Models/CourseAssignment.cs → ContosoUniversity.Data/Entities/CourseAssignment.cs

@@ -1,4 +1,4 @@
-namespace ContosoUniversity.Models
+namespace ContosoUniversity.Data.Entities
 {
     public class CourseAssignment
     {

ContosoUniversity/Models/Department.cs → ContosoUniversity.Data/Entities/Department.cs

@@ -3,7 +3,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace ContosoUniversity.Models
+namespace ContosoUniversity.Data.Entities
 {
     public class Department
     {
@@ -28,6 +28,5 @@ public class Department
 
         public Instructor Administrator { get; set; }
         public ICollection<Course> Courses { get; set; }
-
     }
 }

ContosoUniversity.Data/Entities/Enrollment.cs

@@ -0,0 +1,17 @@
+using ContosoUniversity.Data.Enums;
+using System.ComponentModel.DataAnnotations;
+
+namespace ContosoUniversity.Data.Entities
+{
+    public class Enrollment
+    {
+        public long EnrollmentID { get; set; }
+        public long CourseID { get; set; }
+        public long StudentID { get; set; }
+
+        [DisplayFormat(NullDisplayText = "No Grade")]
+        public Grade? Grade { get; set; }
+        public Course Course { get; set; }
+        public Student Student { get; set; }
+    }
+}

ContosoUniversity/Models/Instructor.cs → ContosoUniversity.Data/Entities/Instructor.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
-namespace ContosoUniversity.Models
+namespace ContosoUniversity.Data.Entities
 {
     public class Instructor : Person
     {

ContosoUniversity/Models/OfficeAssignment.cs → ContosoUniversity.Data/Entities/OfficeAssignment.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace ContosoUniversity.Models
+namespace ContosoUniversity.Data.Entities
 {
     public class OfficeAssignment
     {

ContosoUniversity/Models/Person.cs → ContosoUniversity.Data/Entities/Person.cs

@@ -1,7 +1,8 @@
-using System.ComponentModel.DataAnnotations;
+using ContosoUniversity.Data;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace ContosoUniversity.Models
+namespace ContosoUniversity.Data.Entities
 {
     public class Person
     {

ContosoUniversity/Models/Student.cs → ContosoUniversity.Data/Entities/Student.cs

@@ -3,15 +3,15 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace ContosoUniversity.Models
+namespace ContosoUniversity.Data.Entities
 {
     public class Student : Person
     {
         [Display(Name = "Enrollment Date")]
         [DataType(DataType.Date)]
         [DisplayFormat(DataFormatString = "{0:yyyy-MM-dd}", ApplyFormatInEditMode = true)]
         public DateTime EnrollmentDate { get; set; }
-        
+
         public ICollection<Enrollment> Enrollments { get; set; }
     }
 }

ContosoUniversity/Models/Grade.cs → ContosoUniversity.Data/Enums/Grade.cs

@@ -1,4 +1,4 @@
-namespace ContosoUniversity.Models
+namespace ContosoUniversity.Data.Enums
 {
     public enum Grade
     {

ContosoUniversity/Controllers/CoursesController.cs

@@ -1,20 +1,18 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using ContosoUniversity.Data;
-using ContosoUniversity.Models;
+using ContosoUniversity.Data.Entities;
 
 namespace ContosoUniversity.Controllers
 {
     public class CoursesController : Controller
     {
-        private readonly SchoolContext _context;
+        private readonly ApplicationContext _context;
 
-        public CoursesController(SchoolContext context)
+        public CoursesController(ApplicationContext context)
         {
             _context = context;    
         }

ContosoUniversity/Controllers/DepartmentsController.cs

@@ -1,12 +1,10 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using ContosoUniversity.Data;
-using ContosoUniversity.Models;
+using ContosoUniversity.Data.Entities;
 
 namespace ContosoUniversity.Controllers
 {

ContosoUniversity/Controllers/InstructorsController.cs

@@ -3,19 +3,18 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using ContosoUniversity.Data;
-using ContosoUniversity.Models;
 using ContosoUniversity.Models.SchoolViewModels;
+using ContosoUniversity.Data.Entities;
 
 namespace ContosoUniversity.Controllers
 {
     public class InstructorsController : Controller
     {
-        private readonly SchoolContext _context;
+        private readonly ApplicationContext _context;
 
-        public InstructorsController(SchoolContext context)
+        public InstructorsController(ApplicationContext context)
         {
             _context = context;    
         }

ContosoUniversity/Controllers/StudentsController.cs

@@ -7,6 +7,7 @@
 using Microsoft.EntityFrameworkCore;
 using ContosoUniversity.Data;
 using ContosoUniversity.Models;
+using ContosoUniversity.Data.Entities;
 
 namespace ContosoUniversity.Controllers
 {

ContosoUniversity/Data/DbInitializer.cs

@@ -1,8 +1,7 @@
-using ContosoUniversity.Models;
+using ContosoUniversity.Data.Entities;
+using ContosoUniversity.Data.Enums;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace ContosoUniversity.Data
 {

ContosoUniversity/Data/SchoolContext.cs

@@ -1,4 +1,4 @@
-using ContosoUniversity.Models;
+using ContosoUniversity.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace ContosoUniversity.Data
@@ -20,14 +20,14 @@ public SchoolContext(DbContextOptions<SchoolContext> options) : base(options)
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
-            modelBuilder.Entity<Course>().ToTable("Course");
-            modelBuilder.Entity<Enrollment>().ToTable("Enrollment");
-            modelBuilder.Entity<Student>().ToTable("Student");
-            modelBuilder.Entity<Department>().ToTable("Department");
-            modelBuilder.Entity<Instructor>().ToTable("Instructor");
-            modelBuilder.Entity<OfficeAssignment>().ToTable("OfficeAssignment");
-            modelBuilder.Entity<CourseAssignment>().ToTable("CourseAssignment");
-            modelBuilder.Entity<Person>().ToTable("Person");
+            modelBuilder.Entity<Course>().ToTable("Course", "Contoso");
+            modelBuilder.Entity<Enrollment>().ToTable("Enrollment", "Contoso");
+            modelBuilder.Entity<Student>().ToTable("Student", "Contoso");
+            modelBuilder.Entity<Department>().ToTable("Department", "Contoso");
+            modelBuilder.Entity<Instructor>().ToTable("Instructor", "Contoso");
+            modelBuilder.Entity<OfficeAssignment>().ToTable("OfficeAssignment", "Contoso");
+            modelBuilder.Entity<CourseAssignment>().ToTable("CourseAssignment", "Contoso");
+            modelBuilder.Entity<Person>().ToTable("Person", "Contoso");
             modelBuilder.Entity<CourseAssignment>().HasKey(c => new { c.CourseID, c.InstructorID });
 
         }

ContosoUniversity/Models/SchoolViewModels/InstructorIndexData.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using ContosoUniversity.Data.Entities;
+using System.Collections.Generic;
 
 namespace ContosoUniversity.Models.SchoolViewModels
 {

ContosoUniversity/Views/Courses/Create.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Course
+@model ContosoUniversity.Data.Entities.Course
 
 @{
     ViewData["Title"] = "Create";

ContosoUniversity/Views/Courses/Delete.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Course
+@model ContosoUniversity.Data.Entities.Course
 
 @{
     ViewData["Title"] = "Delete";

ContosoUniversity/Views/Courses/Details.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Course
+@model ContosoUniversity.Data.Entities.Course
 
 @{
     ViewData["Title"] = "Details";

ContosoUniversity/Views/Courses/Edit.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Course
+@model ContosoUniversity.Data.Entities.Course
 
 @{
     ViewData["Title"] = "Edit";

ContosoUniversity/Views/Courses/Index.cshtml

@@ -1,4 +1,4 @@
-@model IEnumerable<ContosoUniversity.Models.Course>
+@model IEnumerable<ContosoUniversity.Data.Entities.Course>
 
 @{
     ViewData["Title"] = "Courses";

ContosoUniversity/Views/Departments/Create.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Department
+@model ContosoUniversity.Data.Entities.Department
 
 @{
     ViewData["Title"] = "Create";

ContosoUniversity/Views/Departments/Delete.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Department
+@model ContosoUniversity.Data.Entities.Department
 
 @{
     ViewData["Title"] = "Delete";

ContosoUniversity/Views/Departments/Details.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Department
+@model ContosoUniversity.Data.Entities.Department
 
 @{
     ViewData["Title"] = "Details";

ContosoUniversity/Views/Departments/Edit.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Department
+@model ContosoUniversity.Data.Entities.Department
 
 @{
     ViewData["Title"] = "Edit";

ContosoUniversity/Views/Departments/Index.cshtml

@@ -1,4 +1,4 @@
-@model IEnumerable<ContosoUniversity.Models.Department>
+@model IEnumerable<ContosoUniversity.Data.Entities.Department>
 
 @{
     ViewData["Title"] = "Departments";

ContosoUniversity/Views/Instructors/Create.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Instructor
+@model ContosoUniversity.Data.Entities.Instructor
 
 @{
     ViewData["Title"] = "Create";

ContosoUniversity/Views/Instructors/Delete.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Instructor
+@model ContosoUniversity.Data.Entities.Instructor
 
 @{
     ViewData["Title"] = "Delete";

ContosoUniversity/Views/Instructors/Details.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Instructor
+@model ContosoUniversity.Data.Entities.Instructor
 
 @{
     ViewData["Title"] = "Details";

ContosoUniversity/Views/Instructors/Edit.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Instructor
+@model ContosoUniversity.Data.Entities.Instructor
 
 @{
     ViewData["Title"] = "Edit";

ContosoUniversity/Views/Students/Create.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Student
+@model ContosoUniversity.Data.Entities.Student
 
 @{
     ViewData["Title"] = "Create";

ContosoUniversity/Views/Students/Delete.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Student
+@model ContosoUniversity.Data.Entities.Student
 
 @{
     ViewData["Title"] = "Delete";

ContosoUniversity/Views/Students/Details.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Student
+@model ContosoUniversity.Data.Entities.Student
 
 @{
     ViewData["Title"] = "Details";

ContosoUniversity/Views/Students/Edit.cshtml

@@ -1,4 +1,4 @@
-@model ContosoUniversity.Models.Student
+@model ContosoUniversity.Data.Entities.Student
 
 @{
     ViewData["Title"] = "Edit";