Add plugin DbContext functionality

Leonid · Leonid · commit 54457316fd02 · 2018-06-29T16:21:52.000+03:00
diff --git a/eFormAPI/EformBase.Pn/Infrastructure/Data/Base/BaseEntity.cs b/eFormAPI/EformBase.Pn/Infrastructure/Data/Base/BaseEntity.cs
@@ -0,0 +1,12 @@
+﻿using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace EformBase.Pn.Infrastructure.Data.Base
+{
+    public class BaseEntity
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; set; }
+    }
+}
diff --git a/eFormAPI/EformBase.Pn/Infrastructure/Data/BaseDbContext.cs b/eFormAPI/EformBase.Pn/Infrastructure/Data/BaseDbContext.cs
@@ -1,8 +1,8 @@
 ﻿using System.Data.Entity;
-using eFormAPI.Web.Infrastructure.Data.Entities;
+using EformBase.Pn.Infrastructure.Data.Entities;
 using Microsoft.AspNet.Identity.EntityFramework;
 
-namespace eFormAPI.Web.Infrastructure.Data
+namespace EformBase.Pn.Infrastructure.Data
 {
     public class BaseDbContext : IdentityDbContext<EformUser, EformRole,
         int, EformUserLogin, EformUserRole, EformUserClaim>
diff --git a/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformRole.cs b/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformRole.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNet.Identity.EntityFramework;
 
-namespace eFormAPI.Web.Infrastructure.Data.Entities
+namespace EformBase.Pn.Infrastructure.Data.Entities
 {
     public class EformRole : IdentityRole<int, EformUserRole>
     {
diff --git a/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformRoleStore.cs b/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformRoleStore.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNet.Identity.EntityFramework;
 
-namespace eFormAPI.Web.Infrastructure.Data.Entities
+namespace EformBase.Pn.Infrastructure.Data.Entities
 {
     public class EformRoleStore : RoleStore<EformRole, int, EformUserRole>
     {
diff --git a/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUser.cs b/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUser.cs
@@ -3,7 +3,7 @@
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 
-namespace eFormAPI.Web.Infrastructure.Data.Entities
+namespace EformBase.Pn.Infrastructure.Data.Entities
 {
     public class EformUser : IdentityUser<int, EformUserLogin, EformUserRole,
         EformUserClaim>
diff --git a/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserClaim.cs b/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserClaim.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNet.Identity.EntityFramework;
 
-namespace eFormAPI.Web.Infrastructure.Data.Entities
+namespace EformBase.Pn.Infrastructure.Data.Entities
 {
     public class EformUserClaim : IdentityUserClaim<int>
     {
diff --git a/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserLogin.cs b/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserLogin.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNet.Identity.EntityFramework;
 
-namespace eFormAPI.Web.Infrastructure.Data.Entities
+namespace EformBase.Pn.Infrastructure.Data.Entities
 {
     public class EformUserLogin : IdentityUserLogin<int>
     {
diff --git a/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserRole.cs b/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserRole.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNet.Identity.EntityFramework;
 
-namespace eFormAPI.Web.Infrastructure.Data.Entities
+namespace EformBase.Pn.Infrastructure.Data.Entities
 {
     public class EformUserRole : IdentityUserRole<int>
     {
diff --git a/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserStore.cs b/eFormAPI/EformBase.Pn/Infrastructure/Data/Entities/EformUserStore.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNet.Identity.EntityFramework;
 
-namespace eFormAPI.Web.Infrastructure.Data.Entities
+namespace EformBase.Pn.Infrastructure.Data.Entities
 {
     public class EformUserStore : UserStore<EformUser, EformRole, int,
         EformUserLogin, EformUserRole, EformUserClaim>
diff --git a/eFormAPI/EformBase.Pn/eFormApi.BasePn.csproj b/eFormAPI/EformBase.Pn/eFormApi.BasePn.csproj
@@ -70,6 +70,27 @@
     <Reference Include="EPPlus, Version=4.5.2.1, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
       <HintPath>..\packages\EPPlus.4.5.2.1\lib\net40\EPPlus.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.EntityFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.2.1.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.Cookies, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.2.1.0\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.OAuth, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.2.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
+    </Reference>
     <Reference Include="Microting.eForm, Version=2.1.280.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Microting.eForm.2.1.280\lib\net45\Microting.eForm.dll</HintPath>
     </Reference>
@@ -83,7 +104,10 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.11\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.6\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="Rebus, Version=4.2.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -100,11 +124,14 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -120,6 +147,15 @@
   <ItemGroup>
     <Compile Include="Consts\EformRoles.cs" />
     <Compile Include="Helpers\LocaleHelper.cs" />
+    <Compile Include="Infrastructure\Data\BaseDbContext.cs" />
+    <Compile Include="Infrastructure\Data\Base\BaseEntity.cs" />
+    <Compile Include="Infrastructure\Data\Entities\EformRole.cs" />
+    <Compile Include="Infrastructure\Data\Entities\EformRoleStore.cs" />
+    <Compile Include="Infrastructure\Data\Entities\EformUser.cs" />
+    <Compile Include="Infrastructure\Data\Entities\EformUserClaim.cs" />
+    <Compile Include="Infrastructure\Data\Entities\EformUserLogin.cs" />
+    <Compile Include="Infrastructure\Data\Entities\EformUserRole.cs" />
+    <Compile Include="Infrastructure\Data\Entities\EformUserStore.cs" />
     <Compile Include="Infrastructure\Handlers\GenerateJasperFilesHandler.cs" />
     <Compile Include="Infrastructure\EFormCoreHelper.cs" />
     <Compile Include="Infrastructure\Installers\RebusInstaller.cs" />
diff --git a/eFormAPI/EformBase.Pn/packages.config b/eFormAPI/EformBase.Pn/packages.config
@@ -6,13 +6,19 @@
   <package id="Castle.Windsor" version="4.1.0" targetFramework="net46" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net46" />
   <package id="EPPlus" version="4.5.2.1" targetFramework="net46" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net46" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net46" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net46" />
+  <package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net46" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net46" />
+  <package id="Microsoft.Owin" version="2.1.0" targetFramework="net46" />
+  <package id="Microsoft.Owin.Security" version="2.1.0" targetFramework="net46" />
+  <package id="Microsoft.Owin.Security.Cookies" version="2.1.0" targetFramework="net46" />
+  <package id="Microsoft.Owin.Security.OAuth" version="2.1.0" targetFramework="net46" />
   <package id="Microting.eForm" version="2.1.280" targetFramework="net46" />
   <package id="MySql.Data" version="6.9.12" targetFramework="net46" />
   <package id="MySql.Data.Entity" version="6.9.12" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
-  <package id="NLog" version="4.3.11" targetFramework="net46" />
+  <package id="NLog" version="4.5.6" targetFramework="net46" />
+  <package id="Owin" version="1.0" targetFramework="net46" />
   <package id="Rebus" version="4.2.1" targetFramework="net46" />
   <package id="Rebus.Castle.Windsor" version="4.1.0" targetFramework="net46" />
   <package id="Rebus.SqlServer" version="4.0.0" targetFramework="net46" />
diff --git a/eFormAPI/eFormAPI/App_Start/AutofacConfig.cs b/eFormAPI/eFormAPI/App_Start/AutofacConfig.cs
@@ -2,8 +2,8 @@
 using System.Web.Http;
 using Autofac;
 using Autofac.Integration.WebApi;
-using eFormAPI.Web.Infrastructure.Data;
 using eFormAPI.Web.Infrastructure.Identity;
+using EformBase.Pn.Infrastructure.Data;
 
 namespace eFormAPI.Web
 {
diff --git a/eFormAPI/eFormAPI/App_Start/Startup.Auth.cs b/eFormAPI/eFormAPI/App_Start/Startup.Auth.cs
@@ -1,8 +1,14 @@
 ﻿using System;
+using System.Data.Entity;
+using System.Data.Entity.Infrastructure;
+using System.Data.Entity.Migrations;
+using System.Linq;
+using Castle.Core.Internal;
 using eFormAPI.Web.Infrastructure.Attributes;
-using eFormAPI.Web.Infrastructure.Data;
+using eFormAPI.Web.Infrastructure.Helpers;
 using eFormAPI.Web.Infrastructure.Identity;
 using eFormAPI.Web.Infrastructure.Identity.Providers;
+using EformBase.Pn.Infrastructure.Data;
 using Microsoft.Owin;
 using Microsoft.Owin.Security.Cookies;
 using Microsoft.Owin.Security.OAuth;
@@ -49,6 +55,37 @@ public void ConfigureAuth(IAppBuilder app)
             // Culture
             app.Use(typeof(LocaleMiddleware));
 
+            // Load Plugins
+            var assemblies = PluginHelper.GetPluginAssemblies();
+            // Migrate databases
+            foreach (var assembly in assemblies)
+            {
+                var contextList = assembly.GetTypes().Where(x => x.BaseType?.Name == nameof(DbContext)).ToList();
+                foreach (var dbContextType in contextList)
+                {
+                    var dbContext = dbContextType.CreateInstance<DbContext>();
+                    var migrationConfigurationType = assembly.GetTypes()
+                        .FirstOrDefault(x => x.Name == "PnMigrationConfiguration");
+                    // migrate DB
+                    try
+                    {
+                        var connectionString = dbContext.Database.Connection.ConnectionString;
+                        var migrationConfiguration = migrationConfigurationType
+                            .CreateInstance<DbMigrationsConfiguration>();
+                        migrationConfiguration.TargetDatabase =
+                            new DbConnectionInfo(connectionString, "System.Data.SqlClient");
+                        migrationConfiguration.AutomaticMigrationsEnabled = true;
+                        var migrator = new DbMigrator(migrationConfiguration);
+                        migrator.Update();
+                    }
+                    catch (Exception exception)
+                    {
+                        throw new Exception($"Error while migrating plugins DB: {exception.Message}");
+                    }
+                }
+            }
+
+
             // Uncomment the following lines to enable logging in with third party login providers
             //app.UseMicrosoftAccountAuthentication(
             //    clientId: "",
@@ -69,4 +106,4 @@ public void ConfigureAuth(IAppBuilder app)
             //});
         }
     }
-}
+}
diff --git a/eFormAPI/eFormAPI/App_Start/WebApiConfig.cs b/eFormAPI/eFormAPI/App_Start/WebApiConfig.cs
@@ -1,13 +1,12 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
+﻿using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http.Formatting;
 using System.Net.Http.Headers;
 using System.Reflection;
 using System.Web.Http;
 using System.Web.Http.Dispatcher;
 using Autofac.Integration.WebApi;
+using eFormAPI.Web.Infrastructure.Helpers;
 using Microsoft.Owin.Security.Cookies;
 using Microsoft.Owin.Security.OAuth;
 using Newtonsoft.Json;
@@ -52,39 +51,10 @@ public class EformAssembliesResolver : DefaultAssembliesResolver
     {
         public override ICollection<Assembly> GetAssemblies()
         {
-            var path = System.Web.Hosting.HostingEnvironment.MapPath("~/Plugins");
-            if (path == null)
-            {
-                throw new Exception("Plugin path not found");
-            }
-
-            if (!Directory.Exists(path))
-            {
-                try
-                {
-                    Directory.CreateDirectory(path);
-                }
-                catch
-                {
-                    throw new Exception("Unable to create directory for plugins");
-                }
-            }
-                      
-           
-            
             var assemblies = new List<Assembly>(base.GetAssemblies());
-            var directories = Directory.EnumerateDirectories(path);
-            foreach (var directory in directories)
-            {
-                var pluginList = Directory.GetFiles(directory)
-                    .Where(x => x.EndsWith("Pn.dll") && Path.GetFileName(x) != "EformBase.Pn.dll")
-                    .ToList();
-
-                foreach (var plugin in pluginList)
-                {
-                    assemblies.Add(Assembly.LoadFrom(Path.Combine(plugin)));
-                }
-            }
+            // Load Plugins
+            var pluginsAssemblies = PluginHelper.GetPluginAssemblies();
+            assemblies.AddRange(pluginsAssemblies);
             return assemblies;
         }
     }
diff --git a/eFormAPI/eFormAPI/Controllers/AccountController.cs b/eFormAPI/eFormAPI/Controllers/AccountController.cs
@@ -6,14 +6,14 @@
 using System.Web.Configuration;
 using System.Web.Http;
 using Castle.Core.Internal;
-using eFormAPI.Web.Infrastructure.Data;
-using eFormAPI.Web.Infrastructure.Data.Entities;
 using eFormAPI.Web.Infrastructure.Identity;
 using eFormAPI.Web.Infrastructure.Models.Auth;
 using eFormAPI.Web.Infrastructure.Models.Settings.User;
 using eFormAPI.Web.Infrastructure.Models.User;
 using EformBase.Pn.Consts;
 using EformBase.Pn.Helpers;
+using EformBase.Pn.Infrastructure.Data;
+using EformBase.Pn.Infrastructure.Data.Entities;
 using EformBase.Pn.Infrastructure.Models.API;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.Owin;
diff --git a/eFormAPI/eFormAPI/Controllers/AdminController.cs b/eFormAPI/eFormAPI/Controllers/AdminController.cs
@@ -5,14 +5,14 @@
 using System.Linq;
 using System.Net.Http;
 using System.Web.Http;
-using eFormAPI.Web.Infrastructure.Data;
-using eFormAPI.Web.Infrastructure.Data.Entities;
 using eFormAPI.Web.Infrastructure.Helpers;
 using eFormAPI.Web.Infrastructure.Identity;
 using eFormAPI.Web.Infrastructure.Models.Common;
 using eFormAPI.Web.Infrastructure.Models.User;
 using EformBase.Pn.Consts;
 using EformBase.Pn.Helpers;
+using EformBase.Pn.Infrastructure.Data;
+using EformBase.Pn.Infrastructure.Data.Entities;
 using EformBase.Pn.Infrastructure.Models.API;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.Owin;
diff --git a/eFormAPI/eFormAPI/Infrastructure/Helpers/PluginHelper.cs b/eFormAPI/eFormAPI/Infrastructure/Helpers/PluginHelper.cs
@@ -0,0 +1,46 @@
+﻿using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace eFormAPI.Web.Infrastructure.Helpers
+{
+    public static class PluginHelper
+    {
+        public static List<Assembly> GetPluginAssemblies()
+        {
+            var path = System.Web.Hosting.HostingEnvironment.MapPath("~/Plugins");
+            if (path == null)
+            {
+                throw new Exception("Plugin path not found");
+            }
+
+            if (!Directory.Exists(path))
+            {
+                try
+                {
+                    Directory.CreateDirectory(path);
+                }
+                catch
+                {
+                    throw new Exception("Unable to create directory for plugins");
+                }
+            }
+            var assemblies = new List<Assembly>();
+            var directories = Directory.EnumerateDirectories(path);
+            foreach (var directory in directories)
+            {
+                var pluginList = Directory.GetFiles(directory)
+                    .Where(x => x.EndsWith("Pn.dll") && Path.GetFileName(x) != "EformBase.Pn.dll")
+                    .ToList();
+
+                foreach (var plugin in pluginList)
+                {
+                    assemblies.Add(Assembly.LoadFrom(Path.Combine(plugin)));
+                }
+            }
+            return assemblies;
+        }
+    }
+}
diff --git a/eFormAPI/eFormAPI/Infrastructure/Helpers/SettingsHelper.cs b/eFormAPI/eFormAPI/Infrastructure/Helpers/SettingsHelper.cs
@@ -2,10 +2,10 @@
 using System.Configuration;
 using System.Linq;
 using System.Web.Configuration;
-using eFormAPI.Web.Infrastructure.Data;
-using eFormAPI.Web.Infrastructure.Data.Entities;
 using eFormAPI.Web.Infrastructure.Identity;
 using eFormAPI.Web.Infrastructure.Models.Settings.Initial;
+using EformBase.Pn.Infrastructure.Data;
+using EformBase.Pn.Infrastructure.Data.Entities;
 using Microsoft.AspNet.Identity;
 using NLog;
 
diff --git a/eFormAPI/eFormAPI/Infrastructure/Identity/EformRoleManager.cs b/eFormAPI/eFormAPI/Infrastructure/Identity/EformRoleManager.cs
diff --git a/eFormAPI/eFormAPI/Infrastructure/Identity/EformSignInManager.cs b/eFormAPI/eFormAPI/Infrastructure/Identity/EformSignInManager.cs
diff --git a/eFormAPI/eFormAPI/Infrastructure/Identity/EformUserManager.cs b/eFormAPI/eFormAPI/Infrastructure/Identity/EformUserManager.cs
diff --git a/eFormAPI/eFormAPI/Infrastructure/Identity/Providers/ApplicationOAuthProvider.cs b/eFormAPI/eFormAPI/Infrastructure/Identity/Providers/ApplicationOAuthProvider.cs
diff --git a/eFormAPI/eFormAPI/Migrations/EformMigrationsConfiguration.cs b/eFormAPI/eFormAPI/Migrations/EformMigrationsConfiguration.cs
diff --git a/eFormAPI/eFormAPI/Web.config b/eFormAPI/eFormAPI/Web.config
diff --git a/eFormAPI/eFormAPI/eFormAPI.Web.csproj b/eFormAPI/eFormAPI/eFormAPI.Web.csproj
diff --git a/eFormAPI/eFormAPI/packages.config b/eFormAPI/eFormAPI/packages.config

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Microsoft.AspNet.Identity.EntityFramework;`
`2`	`2`
`3`		`-namespace eFormAPI.Web.Infrastructure.Data.Entities`
	`3`	`+namespace EformBase.Pn.Infrastructure.Data.Entities`
`4`	`4`	`{`
`5`	`5`	`public class EformRole : IdentityRole<int, EformUserRole>`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Microsoft.AspNet.Identity;`
`4`	`4`	`using Microsoft.AspNet.Identity.EntityFramework;`
`5`	`5`
`6`		`-namespace eFormAPI.Web.Infrastructure.Data.Entities`
	`6`	`+namespace EformBase.Pn.Infrastructure.Data.Entities`
`7`	`7`	`{`
`8`	`8`	`public class EformUser : IdentityUser<int, EformUserLogin, EformUserRole,`
`9`	`9`	`EformUserClaim>`