Refactoring entity model

.gitignore

@@ -1,6 +1,9 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+# Visual Studio 2015 cache/options directory
+.vs/
+
 # Specific
 _git/
 /SSL/
@@ -202,6 +205,7 @@ FakesAssemblies/
 # Visual Studio 6 workspace options file
 *.opt
 
+
 ### Windows ###
 # Windows image file caches
 Thumbs.db

src/Core/DAL/Rambler.Cinema.DAL.Entities/BaseEntity.cs

@@ -4,7 +4,7 @@
 namespace Rambler.Cinema.DAL.Entities
 {
     public class BaseEntity
-    {
+    {        
         [Timestamp]
         public byte[] TimeStamp { get; set; }
 

src/Core/DAL/Rambler.Cinema.DAL.Entities/ContactPerson.cs

@@ -7,8 +7,7 @@ namespace Rambler.Cinema.DAL.Entities
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class ContactPerson: Person
-    {
-
+    {                
         ICollection<Phone> _phones;
         public virtual ICollection<Phone> Phones
         {
@@ -23,14 +22,13 @@ public virtual ICollection<Phone> Phones
         public virtual int DepartmentId { get; set; }
         [ForeignKey("DepartmentId")]
         [Required]
-        public virtual Department Department { get; set; }      
-
+        public virtual Department Department { get; set; }
 
-        ICollection<Cinema> _cinemas;
+        ICollection<Cinema> _cinema;
         public virtual ICollection<Cinema> Cinemas
         {
-            get { return _cinemas ?? (_cinemas = new List<Cinema>()); }
-            set { _cinemas = value; }
+            get { return _cinema ?? (_cinema = new List<Cinema>()); }
+            set { _cinema = value; }
         }
 
         string DebuggerDisplay => $"{GivenName} {MiddleName} {SurName}: {Title} in {Department?.Name}";

src/Core/DAL/Rambler.Cinema.DAL.Entities/ICinemaDbContext.cs

@@ -8,6 +8,7 @@ public interface ICinemaDbContext
         DbSet<Address> Addresses { get; set; }
         DbSet<Department> Departments { get; set; }
         DbSet<Person> Persons { get; set; }
+        DbSet<ContactPerson> ContactPersons { get; set; }
         DbSet<Phone> Phones { get; set; }
         DbSet<Genre> Genres { get; set; }
 

src/Core/DAL/Rambler.Cinema.DAL.Entities/Phone.cs

@@ -29,13 +29,18 @@ public class Phone: BaseEntity
 
         string DebuggerDisplay => $"{Number} is {PhoneType}";
 
-
-        public virtual int? PersonId { get; set; }
-        [ForeignKey("PersonId")]        
-        public virtual ContactPerson Person { get; set; }
-
-        public virtual int? CinemaId { get; set; }
-        [ForeignKey("CinemaId")]
-        public virtual Cinema Cinema { get; set; }
+        ICollection<ContactPerson> _сontactPersons;
+        public virtual ICollection<ContactPerson> ContactPersons
+        {
+            get { return _сontactPersons ?? (_сontactPersons = new List<ContactPerson>()); }
+            set { _сontactPersons = value; }
+        }
+
+        ICollection<Cinema> _cinemas;
+        public virtual ICollection<Cinema> Cinemas
+        {
+            get { return _cinemas ?? (_cinemas = new List<Cinema>()); }
+            set { _cinemas = value; }
+        }
     }
 }

src/Core/DAL/Rambler.Cinema.EntFrameworkDB/CinemaDbContext.cs

@@ -39,6 +39,7 @@ public CinemaDbContext(DbConnection dbConnection)
         public virtual DbSet<Address> Addresses { get; set; }
         public virtual DbSet<Department> Departments { get; set; }
         public virtual DbSet<Person> Persons { get; set; }
+        public virtual DbSet<ContactPerson> ContactPersons { get; set; }
         public virtual DbSet<Phone> Phones { get; set; }
         public virtual DbSet<Genre> Genres { get; set; }
 
@@ -91,6 +92,26 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
                   cs.ToTable("Cinema_ContactPerson");
               });
 
+            modelBuilder.Entity<DAL.Entities.Cinema>()
+              .HasMany<Phone>(s => s.Phones)
+              .WithMany(c => c.Cinemas)
+              .Map(cs =>
+              {
+                  cs.MapLeftKey("CinemaId");
+                  cs.MapRightKey("PhoneId");
+                  cs.ToTable("Cinema_Phone");
+              });
+
+            modelBuilder.Entity<DAL.Entities.ContactPerson>()
+              .HasMany<Phone>(s => s.Phones)
+              .WithMany(c => c.ContactPersons)
+              .Map(cs =>
+              {
+                  cs.MapLeftKey("PersonId");
+                  cs.MapRightKey("PhoneId");
+                  cs.ToTable("Person_Phone");
+              });
+
             //turn off cascading del. on supervisor person
             modelBuilder.Entity<DAL.Entities.Cinema>()
                 .HasRequired(e => e.Supervisor)                
@@ -99,21 +120,21 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
                 .WillCascadeOnDelete(false);
 
 
-            modelBuilder.Entity<ContactPerson>()
+            /*modelBuilder.Entity<ContactPerson>()
                 .HasMany(e => e.Phones)
-                .WithOptional(e=>e.Person)
-                .WillCascadeOnDelete(true);
+                .WithOptional(e=>e.ContactPerson)
+                .WillCascadeOnDelete(false);
 
             modelBuilder.Entity<DAL.Entities.Cinema>()
                 .HasMany(e => e.Phones)
                 .WithOptional(e => e.Cinema)
-                .WillCascadeOnDelete(true);
+                .WillCascadeOnDelete(false);*/
 
 
             /*modelBuilder.Entity<Phone>()
-                .HasMany<ContactPerson>(s => s.Person)
-                .WithOptional(c => c.Phones)
-                .WillCascadeOnDelete();*/
+                .HasRequired<ContactPerson>(s => s.ContactPerson)
+                .WithOptional(c => c.)
+                .WillCascadeOnDelete(true);*/
 
 
 
@@ -132,6 +153,7 @@ void RegisterRemovers()
             {
                 f.FilmSessions.RegisterDeleteOnRemove(this);  
                 f.Phones.RegisterDeleteOnRemove(this);
+                //f.Contacts.RegisterDeleteOnRemove(this);
             });
 
             this.RegisterForDelete<ContactPerson>(f =>

src/Core/DAL/Rambler.Cinema.EntFrameworkDB/EntityDbContextBase.cs

@@ -83,7 +83,7 @@ DbEntityValidationException ExtractErrorsUp(DbEntityValidationException ex)
 
         void AssignDates()
         {
-            var entities = ChangeTracker.Entries().Where(x => x.Entity is BaseEntity && (x.State == EntityState.Added || x.State == EntityState.Modified));
+            var entities = ChangeTracker.Entries().Where(x => x.Entity is BaseEntity && (x.State == EntityState.Added || x.State == EntityState.Modified)).ToArray();
 
             foreach (var entity in entities)
             {