Updated project with hierarchy

icom85 · Nov 9, 2015 · 1699292 · 1699292
1 parent 38548cb
commit 1699292
Show file tree

Hide file tree

Showing 18 changed files with 180 additions and 101 deletions.
diff --git a/RadGridViewEFCodeFirst.Data/App.config b/RadGridViewEFCodeFirst.Data/App.config
@@ -11,6 +11,6 @@
     </providers>
   </entityFramework>
   <connectionStrings>
-    <add name="RadGridViewEFCodeFirstConnection" connectionString="Data Source=.\SQLExpress;Initial Catalog=RadGridViewEFCodeFirst;Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="RadGridViewEFCodeFirstConnection" connectionString="Data Source=.\SQLExpress;Initial Catalog=RadGridViewEFCodeFirstInHierarchy;Integrated Security=True" providerName="System.Data.SqlClient" />
   </connectionStrings>
 </configuration>
diff --git a/RadGridViewEFCodeFirst.Data/Common/DataGenerator.cs b/RadGridViewEFCodeFirst.Data/Common/DataGenerator.cs
@@ -0,0 +1,51 @@
+using RadGridViewEFCodeFirst.Data.Contracts;
+using RadGridViewEFCodeFirst.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RadGridViewEFCodeFirst.Data.Common
+{
+    public class DataGenerator
+    {
+        public static void PopulateData(IRadGridViewEFCodeFirstData data) 
+        {
+            for (int i = 1; i <= 100; i++)
+            {
+                OrderType orderType = new OrderType()
+                {
+                    OrderTypeId = i,
+                    Description = "Test" + i
+                };
+
+                Order order = new Order()
+                {
+                    OrderId = i,
+                    Description = "Description" + i,
+                    OrderTypeId = orderType.OrderTypeId
+                };
+
+                Shipper shipper = new Shipper()
+                {
+                    ShipperId = i,
+                    Name = "Name " + i,
+                    OrderTypeId = orderType.OrderTypeId,
+                    Address = "Address " + i,
+                };
+
+                data.OrderTypes.Add(orderType);
+                data.Orders.Add(order);
+                data.Shippers.Add(shipper);
+
+                if (i % 100 == 0)
+                {
+                    data.SaveChanges();
+                }
+            }
+
+            data.SaveChanges();
+        }
+    }
+}
diff --git a/RadGridViewEFCodeFirst.Data/Contracts/IGenericRepository.cs b/RadGridViewEFCodeFirst.Data/Contracts/IGenericRepository.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RadGridViewEFCodeFirst.Data.Contracts
 {

diff --git a/RadGridViewEFCodeFirst.Data/Contracts/IRadGridViewEFCodeFirstContext.cs b/RadGridViewEFCodeFirst.Data/Contracts/IRadGridViewEFCodeFirstContext.cs
@@ -1,11 +1,9 @@
-using RadGridViewEFCodeFirst.Models;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Data.Entity;
 using System.Data.Entity.Infrastructure;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
+using RadGridViewEFCodeFirst.Models;
 
 namespace RadGridViewEFCodeFirst.Data.Contracts
 {
@@ -15,6 +13,8 @@ public interface IRadGridViewEFCodeFirstContext
 
         IDbSet<OrderType> OrderTypes { get; set; }
 
+        IDbSet<Shipper> Shippers { get; set; }
+
         IDbSet<T> Set<T>() where T : class;
 
         DbEntityEntry<T> Entry<T>(T entity) where T : class;

diff --git a/RadGridViewEFCodeFirst.Data/Contracts/IRadGridViewEFCodeFirstData.cs b/RadGridViewEFCodeFirst.Data/Contracts/IRadGridViewEFCodeFirstData.cs
@@ -1,9 +1,7 @@
-using RadGridViewEFCodeFirst.Models;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
+using RadGridViewEFCodeFirst.Models;
 
 namespace RadGridViewEFCodeFirst.Data.Contracts
 {
@@ -12,5 +10,9 @@ public interface IRadGridViewEFCodeFirstData
         IGenericRepository<Order> Orders { get; }
 
         IGenericRepository<OrderType> OrderTypes { get; }
+
+        IGenericRepository<Shipper> Shippers { get; }
+
+        void SaveChanges();
     }
 }
diff --git a/RadGridViewEFCodeFirst.Data/Migrations/Configuration.cs b/RadGridViewEFCodeFirst.Data/Migrations/Configuration.cs
@@ -1,15 +1,13 @@
 namespace RadGridViewEFCodeFirst.Data.Migrations
 {
     using System;
-    using System.Data.Entity;
     using System.Data.Entity.Migrations;
     using System.Linq;
 
     internal sealed class Configuration : DbMigrationsConfiguration<RadGridViewEFCodeFirst.Data.RadGridViewEFCodeFirstContext>
     {
         public Configuration()
         {
-            AutomaticMigrationsEnabled = false;
             this.AutomaticMigrationsEnabled = true;
             this.AutomaticMigrationDataLossAllowed = true;
             this.ContextKey = "RadGridViewEFCodeFirst.Data.RadGridViewEFCodeFirstContext";

diff --git a/RadGridViewEFCodeFirst.Data/RadGridViewEFCodeFirst.Data.csproj b/RadGridViewEFCodeFirst.Data/RadGridViewEFCodeFirst.Data.csproj
@@ -48,14 +48,17 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Common\DataGenerator.cs" />
     <Compile Include="Contracts\IGenericRepository.cs" />
     <Compile Include="Contracts\IRadGridViewEFCodeFirstContext.cs" />
     <Compile Include="Contracts\IRadGridViewEFCodeFirstData.cs" />
-    <Compile Include="Migrations\Configuration.cs" />
+    <Compile Include="Migrations\Configuration.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RadGridViewEFCodeFirstContext.cs" />
     <Compile Include="RadGridViewEFCodeFirstData.cs" />
-    <Compile Include="Repositories\GenericRepository.cs" />
+    <Compile Include="RadGridViewEFCodeFirstRepository.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

diff --git a/RadGridViewEFCodeFirst.Data/RadGridViewEFCodeFirstContext.cs b/RadGridViewEFCodeFirst.Data/RadGridViewEFCodeFirstContext.cs
@@ -1,12 +1,10 @@
-using RadGridViewEFCodeFirst.Data.Contracts;
-using RadGridViewEFCodeFirst.Data.Migrations;
-using RadGridViewEFCodeFirst.Models;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Data.Entity;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
+using RadGridViewEFCodeFirst.Data.Contracts;
+using RadGridViewEFCodeFirst.Data.Migrations;
+using RadGridViewEFCodeFirst.Models;
 
 namespace RadGridViewEFCodeFirst.Data
 {
@@ -19,10 +17,11 @@ public RadGridViewEFCodeFirstContext()
         }
 
         public IDbSet<Order> Orders { get; set; }
-
 
         public IDbSet<OrderType> OrderTypes  { get; set; }
 
+        public IDbSet<Shipper> Shippers { get; set; }
+
         public new IDbSet<T> Set<T>() where T : class
         {
             return base.Set<T>();

diff --git a/RadGridViewEFCodeFirst.Data/RadGridViewEFCodeFirstData.cs b/RadGridViewEFCodeFirst.Data/RadGridViewEFCodeFirstData.cs
@@ -1,11 +1,9 @@
-using RadGridViewEFCodeFirst.Data.Contracts;
-using RadGridViewEFCodeFirst.Data.Repositories;
-using RadGridViewEFCodeFirst.Models;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
+using RadGridViewEFCodeFirst.Data.Contracts;
+using RadGridViewEFCodeFirst.Models;
 
 namespace RadGridViewEFCodeFirst.Data
 {
@@ -41,6 +39,14 @@ public IGenericRepository<OrderType> OrderTypes
             }
         }
 
+        public IGenericRepository<Shipper> Shippers
+        {
+            get
+            {
+                return this.GetRepository<Shipper>();
+            }
+        }
+
         public void SaveChanges()
         {
             this.context.SaveChanges();
@@ -51,8 +57,7 @@ private IGenericRepository<T> GetRepository<T>() where T : class
             var typeOfModel = typeof(T);
             if (!this.repositories.ContainsKey(typeOfModel))
             {
-                var type = typeof(GenericRepository<T>);
-
+                Type type = typeof(RadGridViewEFCodeFirstRepository<T>);
                 this.repositories.Add(typeOfModel, Activator.CreateInstance(type, this.context));
             }
 

diff --git a/...st.Data/Repositories/GenericRepository.cs → ....Data/RadGridViewEFCodeFirstRepository.cs b/...st.Data/Repositories/GenericRepository.cs → ....Data/RadGridViewEFCodeFirstRepository.cs
@@ -1,21 +1,19 @@
-using RadGridViewEFCodeFirst.Data.Contracts;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Data.Entity;
 using System.Data.Entity.Infrastructure;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace RadGridViewEFCodeFirst.Data.Repositories
+using RadGridViewEFCodeFirst.Data.Contracts;
+
+namespace RadGridViewEFCodeFirst.Data
 {
-    public class GenericRepository<T> : IGenericRepository<T> where T : class
+    public class RadGridViewEFCodeFirstRepository<T> : IGenericRepository<T> where T : class
     {
         private IRadGridViewEFCodeFirstContext context;
         private IDbSet<T> set;
 
-        public GenericRepository(IRadGridViewEFCodeFirstContext context)
+        public RadGridViewEFCodeFirstRepository(IRadGridViewEFCodeFirstContext context)
         {
             this.context = context;
             this.set = context.Set<T>();

diff --git a/RadGridViewEFCodeFirst.Models/App.config b/RadGridViewEFCodeFirst.Models/App.config
@@ -11,6 +11,6 @@
     </providers>
   </entityFramework>
   <connectionStrings>
-    <add name="RadGridViewEFCodeFirstConnection" connectionString="Data Source=.\SQLExpress;Initial Catalog=RadGridViewEFCodeFirst;Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="RadGridViewEFCodeFirstConnection" connectionString="Data Source=.\SQLExpress;Initial Catalog=RadGridViewEFCodeFirstInHierarchy;Integrated Security=True" providerName="System.Data.SqlClient" />
   </connectionStrings>
 </configuration>
diff --git a/RadGridViewEFCodeFirst.Models/Order.cs b/RadGridViewEFCodeFirst.Models/Order.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RadGridViewEFCodeFirst.Models
 {

diff --git a/RadGridViewEFCodeFirst.Models/OrderType.cs b/RadGridViewEFCodeFirst.Models/OrderType.cs
@@ -9,10 +9,12 @@ namespace RadGridViewEFCodeFirst.Models
     public class OrderType
     {
         private ICollection<Order> orders;
+        private ICollection<Shipper> shippers;
 
         public OrderType()
         {
             this.orders = new HashSet<Order>();
+            this.shippers = new HashSet<Shipper>();
         }
 
         public int OrderTypeId { get; set; }
@@ -29,6 +31,18 @@ public virtual ICollection<Order> Orders
             }
         }
 
+        public virtual ICollection<Shipper> Shippers
+        {
+            get
+            {
+                return this.shippers;
+            }
+            set
+            {
+                this.shippers = value;
+            }
+        }
+
         public string  Description { get; set; }
     }
 }
diff --git a/RadGridViewEFCodeFirst.Models/RadGridViewEFCodeFirst.Models.csproj b/RadGridViewEFCodeFirst.Models/RadGridViewEFCodeFirst.Models.csproj
@@ -51,11 +51,10 @@
     <Compile Include="Order.cs" />
     <Compile Include="OrderType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Shipper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/RadGridViewEFCodeFirst.WinFormsClient/App.config b/RadGridViewEFCodeFirst.WinFormsClient/App.config
@@ -14,6 +14,6 @@
     </providers>
   </entityFramework>
   <connectionStrings>
-    <add name="RadGridViewEFCodeFirstConnection" connectionString="Data Source=.\SQLExpress;Initial Catalog=RadGridViewEFCodeFirst;Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="RadGridViewEFCodeFirstConnection" connectionString="Data Source=.\SQLExpress;Initial Catalog=RadGridViewEFCodeFirstInHierarchy;Integrated Security=True" providerName="System.Data.SqlClient" />
   </connectionStrings>
 </configuration>