refactor dbcontexts

ravi-shiva · Nov 2, 2017 · 7e94203 · 7e94203
1 parent c868b68
commit 7e94203
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/ContosoUniversity.Data/DbContexts/ApplicationContext.cs b/ContosoUniversity.Data/DbContexts/ApplicationContext.cs
@@ -1,7 +1,7 @@
 using ContosoUniversity.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace ContosoUniversity.Data
+namespace ContosoUniversity.Data.DbContexts
 {
  public class ApplicationContext : DbContext
  {
@@ -25,15 +25,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
  {
  schema = null;
  }
- modelBuilder.Entity<Course>().ToTable("Course", schema);
- modelBuilder.Entity<Enrollment>().ToTable("Enrollment", schema);
- modelBuilder.Entity<Student>().ToTable("Student", schema);
- modelBuilder.Entity<Department>().ToTable("Department", schema);
- modelBuilder.Entity<Instructor>().ToTable("Instructor", schema);
- modelBuilder.Entity<OfficeAssignment>().ToTable("OfficeAssignment", schema);
- modelBuilder.Entity<CourseAssignment>().ToTable("CourseAssignment", schema);
- modelBuilder.Entity<Person>().ToTable("Person", schema);
- modelBuilder.Entity<CourseAssignment>().HasKey(c => new { c.CourseID, c.InstructorID });
+
+ var config = new DbContextConfig();
+ config.ApplicationContextConfig(modelBuilder, schema);
+
  }
  }
 }
diff --git a/ContosoUniversity.Data/DbContexts/ApplicationContextFactory.cs b/ContosoUniversity.Data/DbContexts/ApplicationContextFactory.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using ContosoUniversity.Data.DbContexts;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.Extensions.Configuration;
 using System;

diff --git a/ContosoUniversity.Data/DbContexts/SecureApplicationContext.cs b/ContosoUniversity.Data/DbContexts/SecureApplicationContext.cs
@@ -20,13 +20,8 @@ protected override void OnModelCreating(ModelBuilder builder)
  dbSchema = null;
  }
 
- builder.Entity<ApplicationUser>().ToTable("Users", dbSchema);
- builder.Entity<IdentityRole>().ToTable("Role", dbSchema);
- builder.Entity<IdentityUserClaim<string>>().ToTable("UserClaim", dbSchema);
- builder.Entity<IdentityUserRole<string>>().ToTable("UserRole", dbSchema);
- builder.Entity<IdentityUserLogin<string>>().ToTable("UserLogin", dbSchema);
- builder.Entity<IdentityRoleClaim<string>>().ToTable("RoleClaim", dbSchema);
- builder.Entity<IdentityUserToken<string>>().ToTable("UserToken", dbSchema);
+ var config = new DbContextConfig();
+ config.SecureApplicationContextConfig(builder, dbSchema);
  }
  }
 }