From 6ad47159552ad501f8cd1a242099aa62bc5eaa99 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Sat, 31 Aug 2019 00:04:53 -0400 Subject: [PATCH] optimize for IEnumerable and remove unnecessary exception handling in repostory --- Oqtane.Server/Repository/AliasRepository.cs | 63 +++------- .../Interfaces/IPermissionRepository.cs | 4 +- Oqtane.Server/Repository/ModuleRepository.cs | 93 ++++----------- .../Repository/PageModuleRepository.cs | 89 ++++---------- Oqtane.Server/Repository/PageRepository.cs | 88 ++++---------- .../Repository/PermissionRepository.cs | 98 ++++------------ Oqtane.Server/Repository/RoleRepository.cs | 75 +++--------- Oqtane.Server/Repository/SettingRepository.cs | 59 ++-------- Oqtane.Server/Repository/SiteRepository.cs | 57 ++------- .../Repository/SiteUserRepository.cs | 81 +++---------- Oqtane.Server/Repository/TenantRepository.cs | 65 +++-------- Oqtane.Server/Repository/TenantResolver.cs | 22 +--- Oqtane.Server/Repository/UserRepository.cs | 66 ++--------- .../Repository/UserRoleRepository.cs | 85 +++----------- Oqtane.Server/Scripts/00.00.00.sql | 110 ++++++++++++++++++ 15 files changed, 322 insertions(+), 733 deletions(-) diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs index 1ebda180..e8fd87b9 100644 --- a/Oqtane.Server/Repository/AliasRepository.cs +++ b/Oqtane.Server/Repository/AliasRepository.cs @@ -20,72 +20,37 @@ namespace Oqtane.Repository public IEnumerable GetAliases() { - try + return _cache.GetOrCreate("aliases", entry => { - return _cache.GetOrCreate("aliases", entry => - { - entry.SlidingExpiration = TimeSpan.FromMinutes(30); - return db.Alias.ToList(); - }); - } - catch - { - throw; - } + entry.SlidingExpiration = TimeSpan.FromMinutes(30); + return db.Alias.ToList(); + }); } public Alias AddAlias(Alias Alias) { - try - { - db.Alias.Add(Alias); - db.SaveChanges(); - return Alias; - } - catch - { - throw; - } + db.Alias.Add(Alias); + db.SaveChanges(); + return Alias; } public Alias UpdateAlias(Alias Alias) { - try - { - db.Entry(Alias).State = EntityState.Modified; - db.SaveChanges(); - return Alias; - } - catch - { - throw; - } + db.Entry(Alias).State = EntityState.Modified; + db.SaveChanges(); + return Alias; } public Alias GetAlias(int AliasId) { - try - { - return db.Alias.Find(AliasId); - } - catch - { - throw; - } + return db.Alias.Find(AliasId); } public void DeleteAlias(int AliasId) { - try - { - Alias alias = db.Alias.Find(AliasId); - db.Alias.Remove(alias); - db.SaveChanges(); - } - catch - { - throw; - } + Alias alias = db.Alias.Find(AliasId); + db.Alias.Remove(alias); + db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs index c569d86b..4b4b01c5 100644 --- a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs @@ -13,7 +13,7 @@ namespace Oqtane.Repository void UpdatePermissions(int SiteId, string EntityName, int EntityId, string Permissions); Permission GetPermission(int PermissionId); void DeletePermission(int PermissionId); - string EncodePermissions(int EntityId, List Permissions); - List DecodePermissions(string Permissions, int SiteId, string EntityName, int EntityId); + string EncodePermissions(int EntityId, IEnumerable Permissions); + IEnumerable DecodePermissions(string Permissions, int SiteId, string EntityName, int EntityId); } } diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs index cc453ff7..2754161c 100644 --- a/Oqtane.Server/Repository/ModuleRepository.cs +++ b/Oqtane.Server/Repository/ModuleRepository.cs @@ -18,98 +18,55 @@ namespace Oqtane.Repository public IEnumerable GetModules() { - try - { - return db.Module.ToList(); - } - catch - { - throw; - } + return db.Module; } public IEnumerable GetModules(int SiteId, string ModuleDefinitionName) { - try + IEnumerable permissions = Permissions.GetPermissions(SiteId, "Module").ToList(); + IEnumerable modules = db.Module + .Where(item => item.SiteId == SiteId) + .Where(item => item.ModuleDefinitionName == ModuleDefinitionName); + foreach (Module module in modules) { - List permissions = Permissions.GetPermissions(SiteId, "Module").ToList(); - List modules = db.Module - .Where(item => item.SiteId == SiteId) - .Where(item => item.ModuleDefinitionName == ModuleDefinitionName) - .ToList(); - foreach (Module module in modules) - { - module.Permissions = Permissions.EncodePermissions(module.ModuleId, permissions); - } - return modules; - } - catch - { - throw; + module.Permissions = Permissions.EncodePermissions(module.ModuleId, permissions); } + return modules; } public Module AddModule(Module Module) { - try - { - db.Module.Add(Module); - db.SaveChanges(); - Permissions.UpdatePermissions(Module.SiteId, "Module", Module.ModuleId, Module.Permissions); - return Module; - } - catch - { - throw; - } + db.Module.Add(Module); + db.SaveChanges(); + Permissions.UpdatePermissions(Module.SiteId, "Module", Module.ModuleId, Module.Permissions); + return Module; } public Module UpdateModule(Module Module) { - try - { - db.Entry(Module).State = EntityState.Modified; - db.SaveChanges(); - Permissions.UpdatePermissions(Module.SiteId, "Module", Module.ModuleId, Module.Permissions); - return Module; - } - catch - { - throw; - } + db.Entry(Module).State = EntityState.Modified; + db.SaveChanges(); + Permissions.UpdatePermissions(Module.SiteId, "Module", Module.ModuleId, Module.Permissions); + return Module; } public Module GetModule(int ModuleId) { - try + Module module = db.Module.Find(ModuleId); + if (module != null) { - Module module = db.Module.Find(ModuleId); - if (module != null) - { - List permissions = Permissions.GetPermissions("Module", module.ModuleId).ToList(); - module.Permissions = Permissions.EncodePermissions(module.ModuleId, permissions); - } - return module; - } - catch - { - throw; + List permissions = Permissions.GetPermissions("Module", module.ModuleId).ToList(); + module.Permissions = Permissions.EncodePermissions(module.ModuleId, permissions); } + return module; } public void DeleteModule(int ModuleId) { - try - { - Module Module = db.Module.Find(ModuleId); - Permissions.UpdatePermissions(Module.SiteId, "Module", ModuleId, ""); - db.Module.Remove(Module); - db.SaveChanges(); - } - catch - { - throw; - } + Module Module = db.Module.Find(ModuleId); + Permissions.UpdatePermissions(Module.SiteId, "Module", ModuleId, ""); + db.Module.Remove(Module); + db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs index 0a8aef19..9eb829d1 100644 --- a/Oqtane.Server/Repository/PageModuleRepository.cs +++ b/Oqtane.Server/Repository/PageModuleRepository.cs @@ -18,97 +18,54 @@ namespace Oqtane.Repository public IEnumerable GetPageModules() { - try - { - return db.PageModule.ToList(); - } - catch - { - throw; - } + return db.PageModule; } public IEnumerable GetPageModules(int PageId) { - try + IEnumerable pagemodules = db.PageModule.Where(item => item.PageId == PageId) + .Include(item => item.Module); // eager load modules + if (pagemodules != null && pagemodules.Any()) { - List pagemodules = db.PageModule.Where(item => item.PageId == PageId) - .Include(item => item.Module) // eager load modules - .ToList(); - if (pagemodules != null && pagemodules.Any()) + IEnumerable permissions = Permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList(); + foreach (PageModule pagemodule in pagemodules) { - List permissions = Permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList(); - foreach (PageModule pagemodule in pagemodules) - { - pagemodule.Module.Permissions = Permissions.EncodePermissions(pagemodule.ModuleId, permissions); - } + pagemodule.Module.Permissions = Permissions.EncodePermissions(pagemodule.ModuleId, permissions); } - return pagemodules; - } - catch - { - throw; } + return pagemodules; } public PageModule AddPageModule(PageModule PageModule) { - try - { - db.PageModule.Add(PageModule); - db.SaveChanges(); - return PageModule; - } - catch - { - throw; - } + db.PageModule.Add(PageModule); + db.SaveChanges(); + return PageModule; } public PageModule UpdatePageModule(PageModule PageModule) { - try - { - db.Entry(PageModule).State = EntityState.Modified; - db.SaveChanges(); - return PageModule; - } - catch - { - throw; - } + db.Entry(PageModule).State = EntityState.Modified; + db.SaveChanges(); + return PageModule; } public PageModule GetPageModule(int PageModuleId) { - try + PageModule pagemodule = db.PageModule.Include(item => item.Module) // eager load modules + .SingleOrDefault(item => item.PageModuleId == PageModuleId); + if (pagemodule != null) { - PageModule pagemodule = db.PageModule.Include(item => item.Module) // eager load modules - .SingleOrDefault(item => item.PageModuleId == PageModuleId); - if (pagemodule != null) - { - List permissions = Permissions.GetPermissions("Module", pagemodule.ModuleId).ToList(); - pagemodule.Module.Permissions = Permissions.EncodePermissions(pagemodule.ModuleId, permissions); - } - return pagemodule; - } - catch - { - throw; + IEnumerable permissions = Permissions.GetPermissions("Module", pagemodule.ModuleId); + pagemodule.Module.Permissions = Permissions.EncodePermissions(pagemodule.ModuleId, permissions); } + return pagemodule; } public void DeletePageModule(int PageModuleId) { - try - { - PageModule PageModule = db.PageModule.Find(PageModuleId); - db.PageModule.Remove(PageModule); - db.SaveChanges(); - } - catch - { - throw; - } + PageModule PageModule = db.PageModule.Find(PageModuleId); + db.PageModule.Remove(PageModule); + db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs index 250f6390..5b849d1b 100644 --- a/Oqtane.Server/Repository/PageRepository.cs +++ b/Oqtane.Server/Repository/PageRepository.cs @@ -18,95 +18,53 @@ namespace Oqtane.Repository public IEnumerable GetPages() { - try - { - return db.Page.ToList(); - } - catch - { - throw; - } + return db.Page.ToList(); } public IEnumerable GetPages(int SiteId) { - try + IEnumerable permissions = Permissions.GetPermissions(SiteId, "Page").ToList(); + IEnumerable pages = db.Page.Where(item => item.SiteId == SiteId); + foreach(Page page in pages) { - List permissions = Permissions.GetPermissions(SiteId, "Page").ToList(); - List pages = db.Page.Where(item => item.SiteId == SiteId).ToList(); - foreach(Page page in pages) - { - page.Permissions = Permissions.EncodePermissions(page.PageId, permissions); - } - return pages; - } - catch - { - throw; + page.Permissions = Permissions.EncodePermissions(page.PageId, permissions); } + return pages; } public Page AddPage(Page Page) { - try - { - db.Page.Add(Page); - db.SaveChanges(); - Permissions.UpdatePermissions(Page.SiteId, "Page", Page.PageId, Page.Permissions); - return Page; - } - catch - { - throw; - } + db.Page.Add(Page); + db.SaveChanges(); + Permissions.UpdatePermissions(Page.SiteId, "Page", Page.PageId, Page.Permissions); + return Page; } public Page UpdatePage(Page Page) { - try - { - db.Entry(Page).State = EntityState.Modified; - db.SaveChanges(); - Permissions.UpdatePermissions(Page.SiteId, "Page", Page.PageId, Page.Permissions); - return Page; - } - catch - { - throw; - } + db.Entry(Page).State = EntityState.Modified; + db.SaveChanges(); + Permissions.UpdatePermissions(Page.SiteId, "Page", Page.PageId, Page.Permissions); + return Page; } public Page GetPage(int PageId) { - try + Page page = db.Page.Find(PageId); + if (page != null) { - Page page = db.Page.Find(PageId); - if (page != null) - { - List permissions = Permissions.GetPermissions("Page", page.PageId).ToList(); - page.Permissions = Permissions.EncodePermissions(page.PageId, permissions); - } - return page; - } - catch - { - throw; + IEnumerable permissions = Permissions.GetPermissions("Page", page.PageId); + page.Permissions = Permissions.EncodePermissions(page.PageId, permissions); } + return page; } public void DeletePage(int PageId) { - try - { - Page Page = db.Page.Find(PageId); - Permissions.UpdatePermissions(Page.SiteId, "Page", PageId, ""); - db.Page.Remove(Page); - db.SaveChanges(); - } - catch - { - throw; - } + Page Page = db.Page.Find(PageId); + Permissions.UpdatePermissions(Page.SiteId, "Page", PageId, ""); + db.Page.Remove(Page); + db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs index 682e797e..a4b3f323 100644 --- a/Oqtane.Server/Repository/PermissionRepository.cs +++ b/Oqtane.Server/Repository/PermissionRepository.cs @@ -22,80 +22,46 @@ namespace Oqtane.Repository public IEnumerable GetPermissions(int SiteId, string EntityName) { - try - { - return db.Permission.Where(item => item.SiteId == SiteId) - .Where(item => item.EntityName == EntityName) - .Include(item => item.Role); // eager load roles - } - catch - { - throw; - } + return db.Permission.Where(item => item.SiteId == SiteId) + .Where(item => item.EntityName == EntityName) + .Include(item => item.Role); // eager load roles } public IEnumerable GetPermissions(string EntityName, int EntityId) { - try - { - return db.Permission.Where(item => item.EntityName == EntityName) - .Where(item => item.EntityId == EntityId) - .Include(item => item.Role); // eager load roles - } - catch - { - throw; - } + return db.Permission.Where(item => item.EntityName == EntityName) + .Where(item => item.EntityId == EntityId) + .Include(item => item.Role); // eager load roles } public IEnumerable GetPermissions(string EntityName, int EntityId, string PermissionName) { - try - { - return db.Permission.Where(item => item.EntityName == EntityName) - .Where(item => item.EntityId == EntityId) - .Where(item => item.PermissionName == PermissionName) - .Include(item => item.Role); // eager load roles - } - catch - { - throw; - } + return db.Permission.Where(item => item.EntityName == EntityName) + .Where(item => item.EntityId == EntityId) + .Where(item => item.PermissionName == PermissionName) + .Include(item => item.Role); // eager load roles } public Permission AddPermission(Permission Permission) { - try - { - db.Permission.Add(Permission); - db.SaveChanges(); - return Permission; - } - catch - { - throw; - } + db.Permission.Add(Permission); + db.SaveChanges(); + return Permission; } public Permission UpdatePermission(Permission Permission) { - try - { - db.Entry(Permission).State = EntityState.Modified; - db.SaveChanges(); - return Permission; - } - catch - { - throw; - } + db.Entry(Permission).State = EntityState.Modified; + db.SaveChanges(); + return Permission; } public void UpdatePermissions(int SiteId, string EntityName, int EntityId, string Permissions) { // get current permissions and delete - List permissions = db.Permission.Where(item => item.EntityName == EntityName) - .Where(item => item.EntityId == EntityId).ToList(); + IEnumerable permissions = db.Permission + .Where(item => item.EntityName == EntityName) + .Where(item => item.EntityId == EntityId); foreach(Permission permission in permissions) { db.Permission.Remove(permission); @@ -111,32 +77,18 @@ namespace Oqtane.Repository public Permission GetPermission(int PermissionId) { - try - { - return db.Permission.Find(PermissionId); - } - catch - { - throw; - } + return db.Permission.Find(PermissionId); } public void DeletePermission(int PermissionId) { - try - { - Permission Permission = db.Permission.Find(PermissionId); - db.Permission.Remove(Permission); - db.SaveChanges(); - } - catch - { - throw; - } + Permission Permission = db.Permission.Find(PermissionId); + db.Permission.Remove(Permission); + db.SaveChanges(); } // permissions are stored in the format "{permissionname:!rolename1;![userid1];rolename2;rolename3;[userid2];[userid3]}" where "!" designates Deny permissions - public string EncodePermissions(int EntityId, List Permissions) + public string EncodePermissions(int EntityId, IEnumerable Permissions) { List permissionstrings = new List(); string permissionname = ""; @@ -189,7 +141,7 @@ namespace Oqtane.Repository return JsonSerializer.Serialize(permissionstrings); } - public List DecodePermissions(string PermissionStrings, int SiteId, string EntityName, int EntityId) + public IEnumerable DecodePermissions(string PermissionStrings, int SiteId, string EntityName, int EntityId) { List permissions = new List(); List roles = Roles.GetRoles(SiteId, true).ToList(); diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs index fe99ecf8..97958b07 100644 --- a/Oqtane.Server/Repository/RoleRepository.cs +++ b/Oqtane.Server/Repository/RoleRepository.cs @@ -16,93 +16,44 @@ namespace Oqtane.Repository public IEnumerable GetRoles() { - try - { - return db.Role.ToList(); - } - catch - { - throw; - } + return db.Role; } public IEnumerable GetRoles(int SiteId) { - try - { - return db.Role.Where(item => item.SiteId == SiteId).ToList(); - } - catch - { - throw; - } + return db.Role.Where(item => item.SiteId == SiteId); } public IEnumerable GetRoles(int SiteId, bool IncludeGlobalRoles) { - try - { - return db.Role.Where(item => item.SiteId == SiteId || item.SiteId == null).ToList(); - } - catch - { - throw; - } + return db.Role.Where(item => item.SiteId == SiteId || item.SiteId == null); } public Role AddRole(Role Role) { - try - { - db.Role.Add(Role); - db.SaveChanges(); - return Role; - } - catch - { - throw; - } + db.Role.Add(Role); + db.SaveChanges(); + return Role; } public Role UpdateRole(Role Role) { - try - { - db.Entry(Role).State = EntityState.Modified; - db.SaveChanges(); - return Role; - } - catch - { - throw; - } + db.Entry(Role).State = EntityState.Modified; + db.SaveChanges(); + return Role; } public Role GetRole(int RoleId) { - try - { - return db.Role.Find(RoleId); - } - catch - { - throw; - } + return db.Role.Find(RoleId); } public void DeleteRole(int RoleId) { - try - { - Role Role = db.Role.Find(RoleId); - db.Role.Remove(Role); - db.SaveChanges(); - } - catch - { - throw; - } + Role Role = db.Role.Find(RoleId); + db.Role.Remove(Role); + db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/SettingRepository.cs b/Oqtane.Server/Repository/SettingRepository.cs index a12040ec..b191c9c5 100644 --- a/Oqtane.Server/Repository/SettingRepository.cs +++ b/Oqtane.Server/Repository/SettingRepository.cs @@ -16,69 +16,34 @@ namespace Oqtane.Repository public IEnumerable GetSettings(string EntityName, int EntityId) { - try - { - return db.Setting.Where(item => item.EntityName == EntityName) - .Where(item => item.EntityId == EntityId).ToList(); - } - catch - { - throw; - } + return db.Setting.Where(item => item.EntityName == EntityName) + .Where(item => item.EntityId == EntityId); } public Setting AddSetting(Setting Setting) { - try - { - db.Setting.Add(Setting); - db.SaveChanges(); - return Setting; - } - catch - { - throw; - } + db.Setting.Add(Setting); + db.SaveChanges(); + return Setting; } public Setting UpdateSetting(Setting Setting) { - try - { - db.Entry(Setting).State = EntityState.Modified; - db.SaveChanges(); - return Setting; - } - catch - { - throw; - } + db.Entry(Setting).State = EntityState.Modified; + db.SaveChanges(); + return Setting; } public Setting GetSetting(int SettingId) { - try - { - return db.Setting.Find(SettingId); - } - catch - { - throw; - } + return db.Setting.Find(SettingId); } public void DeleteSetting(int SettingId) { - try - { - Setting Setting = db.Setting.Find(SettingId); - db.Setting.Remove(Setting); - db.SaveChanges(); - } - catch - { - throw; - } + Setting Setting = db.Setting.Find(SettingId); + db.Setting.Remove(Setting); + db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index 88ec72df..3f200162 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -16,68 +16,33 @@ namespace Oqtane.Repository public IEnumerable GetSites() { - try - { - return db.Site.ToList(); - } - catch - { - throw; - } + return db.Site; } public Site AddSite(Site Site) { - try - { - db.Site.Add(Site); - db.SaveChanges(); - return Site; - } - catch - { - throw; - } + db.Site.Add(Site); + db.SaveChanges(); + return Site; } public Site UpdateSite(Site Site) { - try - { - db.Entry(Site).State = EntityState.Modified; - db.SaveChanges(); - return Site; - } - catch - { - throw; - } + db.Entry(Site).State = EntityState.Modified; + db.SaveChanges(); + return Site; } public Site GetSite(int siteId) { - try - { - return db.Site.Find(siteId); - } - catch - { - throw; - } + return db.Site.Find(siteId); } public void DeleteSite(int siteId) { - try - { - Site site = db.Site.Find(siteId); - db.Site.Remove(site); - db.SaveChanges(); - } - catch - { - throw; - } + Site site = db.Site.Find(siteId); + db.Site.Remove(site); + db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/SiteUserRepository.cs b/Oqtane.Server/Repository/SiteUserRepository.cs index f0209b48..4d7cb1b6 100644 --- a/Oqtane.Server/Repository/SiteUserRepository.cs +++ b/Oqtane.Server/Repository/SiteUserRepository.cs @@ -16,94 +16,45 @@ namespace Oqtane.Repository public IEnumerable GetSiteUsers() { - try - { - return db.SiteUser.ToList(); - } - catch - { - throw; - } + return db.SiteUser; } public IEnumerable GetSiteUsers(int SiteId) { - try - { - return db.SiteUser.Where(item => item.SiteId == SiteId) - .Include(item => item.User) // eager load users - .ToList(); - } - catch - { - throw; - } + return db.SiteUser.Where(item => item.SiteId == SiteId) + .Include(item => item.User); // eager load users } public SiteUser AddSiteUser(SiteUser SiteUser) { - try - { - db.SiteUser.Add(SiteUser); - db.SaveChanges(); - return SiteUser; - } - catch - { - throw; - } + db.SiteUser.Add(SiteUser); + db.SaveChanges(); + return SiteUser; } public SiteUser UpdateSiteUser(SiteUser SiteUser) { - try - { - db.Entry(SiteUser).State = EntityState.Modified; - db.SaveChanges(); - return SiteUser; - } - catch - { - throw; - } + db.Entry(SiteUser).State = EntityState.Modified; + db.SaveChanges(); + return SiteUser; } public SiteUser GetSiteUser(int SiteUserId) { - try - { - return db.SiteUser.Include(item => item.User) // eager load users - .SingleOrDefault(item => item.SiteUserId == SiteUserId); - } - catch - { - throw; - } + return db.SiteUser.Include(item => item.User) // eager load users + .SingleOrDefault(item => item.SiteUserId == SiteUserId); } public SiteUser GetSiteUser(int SiteId, int UserId) { - try - { - return db.SiteUser.Where(item => item.SiteId == SiteId).Where(item => item.UserId == UserId).FirstOrDefault(); - } - catch - { - throw; - } + return db.SiteUser.Where(item => item.SiteId == SiteId) + .Where(item => item.UserId == UserId).FirstOrDefault(); } public void DeleteSiteUser(int SiteUserId) { - try - { - SiteUser SiteUser = db.SiteUser.Find(SiteUserId); - db.SiteUser.Remove(SiteUser); - db.SaveChanges(); - } - catch - { - throw; - } + SiteUser SiteUser = db.SiteUser.Find(SiteUserId); + db.SiteUser.Remove(SiteUser); + db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/TenantRepository.cs b/Oqtane.Server/Repository/TenantRepository.cs index 58d7df30..e64a57e3 100644 --- a/Oqtane.Server/Repository/TenantRepository.cs +++ b/Oqtane.Server/Repository/TenantRepository.cs @@ -21,72 +21,37 @@ namespace Oqtane.Repository public IEnumerable GetTenants() { - try + return _cache.GetOrCreate("tenants", entry => { - return _cache.GetOrCreate("tenants", entry => - { - entry.SlidingExpiration = TimeSpan.FromMinutes(30); - return db.Tenant.ToList(); - }); - } - catch - { - throw; - } + entry.SlidingExpiration = TimeSpan.FromMinutes(30); + return db.Tenant.ToList(); + }); } public Tenant AddTenant(Tenant Tenant) { - try - { - db.Tenant.Add(Tenant); - db.SaveChanges(); - return Tenant; - } - catch - { - throw; - } + db.Tenant.Add(Tenant); + db.SaveChanges(); + return Tenant; } public Tenant UpdateTenant(Tenant Tenant) { - try - { - db.Entry(Tenant).State = EntityState.Modified; - db.SaveChanges(); - return Tenant; - } - catch - { - throw; - } + db.Entry(Tenant).State = EntityState.Modified; + db.SaveChanges(); + return Tenant; } public Tenant GetTenant(int TenantId) { - try - { - return db.Tenant.Find(TenantId); - } - catch - { - throw; - } + return db.Tenant.Find(TenantId); } public void DeleteTenant(int TenantId) - { - try - { - Tenant tenant = db.Tenant.Find(TenantId); - db.Tenant.Remove(tenant); - db.SaveChanges(); - } - catch - { - throw; - } + { + Tenant tenant = db.Tenant.Find(TenantId); + db.Tenant.Remove(tenant); + db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/TenantResolver.cs b/Oqtane.Server/Repository/TenantResolver.cs index 3c8de2f8..579c99b9 100644 --- a/Oqtane.Server/Repository/TenantResolver.cs +++ b/Oqtane.Server/Repository/TenantResolver.cs @@ -35,28 +35,14 @@ namespace Oqtane.Repository public Alias GetAlias() { - try - { - IEnumerable aliases = _aliasrepository.GetAliases(); // cached - return aliases.Where(item => item.Name == aliasname).FirstOrDefault(); - } - catch - { - throw; - } + IEnumerable aliases = _aliasrepository.GetAliases(); // cached + return aliases.Where(item => item.Name == aliasname).FirstOrDefault(); } public Tenant GetTenant() { - try - { - IEnumerable tenants = _tenantrepository.GetTenants(); // cached - return tenants.Where(item => item.TenantId == GetAlias().TenantId).FirstOrDefault(); - } - catch - { - throw; - } + IEnumerable tenants = _tenantrepository.GetTenants(); // cached + return tenants.Where(item => item.TenantId == GetAlias().TenantId).FirstOrDefault(); } } } \ No newline at end of file diff --git a/Oqtane.Server/Repository/UserRepository.cs b/Oqtane.Server/Repository/UserRepository.cs index c31b73d4..e182dae4 100644 --- a/Oqtane.Server/Repository/UserRepository.cs +++ b/Oqtane.Server/Repository/UserRepository.cs @@ -16,80 +16,38 @@ namespace Oqtane.Repository public IEnumerable GetUsers() { - try - { - return db.User.ToList(); - } - catch - { - throw; - } + return db.User; } public User AddUser(User user) { - try - { - db.User.Add(user); - db.SaveChanges(); - return user; - } - catch - { - throw; - } + db.User.Add(user); + db.SaveChanges(); + return user; } public User UpdateUser(User user) { - try - { - db.Entry(user).State = EntityState.Modified; - db.SaveChanges(); - return user; - } - catch - { - throw; - } + db.Entry(user).State = EntityState.Modified; + db.SaveChanges(); + return user; } public User GetUser(int userId) { - try - { - return db.User.Find(userId); - } - catch - { - throw; - } + return db.User.Find(userId); } public User GetUser(string Username) { - try - { - return db.User.Where(item => item.Username == Username).FirstOrDefault(); - } - catch - { - throw; - } + return db.User.Where(item => item.Username == Username).FirstOrDefault(); } public void DeleteUser(int userId) { - try - { - User user = db.User.Find(userId); - db.User.Remove(user); - db.SaveChanges(); - } - catch - { - throw; - } + User user = db.User.Find(userId); + db.User.Remove(user); + db.SaveChanges(); } } } diff --git a/Oqtane.Server/Repository/UserRoleRepository.cs b/Oqtane.Server/Repository/UserRoleRepository.cs index 82911356..e752c832 100644 --- a/Oqtane.Server/Repository/UserRoleRepository.cs +++ b/Oqtane.Server/Repository/UserRoleRepository.cs @@ -16,97 +16,46 @@ namespace Oqtane.Repository public IEnumerable GetUserRoles() { - try - { - return db.UserRole.ToList(); - } - catch - { - throw; - } + return db.UserRole; } public IEnumerable GetUserRoles(int UserId) { - try - { - return db.UserRole.Where(item => item.UserId == UserId) - .Include(item => item.Role) // eager load roles - .ToList(); - } - catch - { - throw; - } + return db.UserRole.Where(item => item.UserId == UserId) + .Include(item => item.Role); // eager load roles } public IEnumerable GetUserRoles(int UserId, int SiteId) { - try - { - return db.UserRole.Where(item => item.UserId == UserId) - .Include(item => item.Role) // eager load roles - .Where(item => item.Role.SiteId == SiteId) - .ToList(); - } - catch - { - throw; - } + return db.UserRole.Where(item => item.UserId == UserId) + .Include(item => item.Role) // eager load roles + .Where(item => item.Role.SiteId == SiteId); } public UserRole AddUserRole(UserRole UserRole) { - try - { - db.UserRole.Add(UserRole); - db.SaveChanges(); - return UserRole; - } - catch - { - throw; - } + db.UserRole.Add(UserRole); + db.SaveChanges(); + return UserRole; } public UserRole UpdateUserRole(UserRole UserRole) { - try - { - db.Entry(UserRole).State = EntityState.Modified; - db.SaveChanges(); - return UserRole; - } - catch - { - throw; - } + db.Entry(UserRole).State = EntityState.Modified; + db.SaveChanges(); + return UserRole; } public UserRole GetUserRole(int UserRoleId) { - try - { - return db.UserRole.Include(item => item.Role) // eager load roles - .SingleOrDefault(item => item.UserRoleId == UserRoleId); - } - catch - { - throw; - } + return db.UserRole.Include(item => item.Role) // eager load roles + .SingleOrDefault(item => item.UserRoleId == UserRoleId); } public void DeleteUserRole(int UserRoleId) { - try - { - UserRole UserRole = db.UserRole.Find(UserRoleId); - db.UserRole.Remove(UserRole); - db.SaveChanges(); - } - catch - { - throw; - } + UserRole UserRole = db.UserRole.Find(UserRoleId); + db.UserRole.Remove(UserRole); + db.SaveChanges(); } } } diff --git a/Oqtane.Server/Scripts/00.00.00.sql b/Oqtane.Server/Scripts/00.00.00.sql index 6e34d641..094073f4 100644 --- a/Oqtane.Server/Scripts/00.00.00.sql +++ b/Oqtane.Server/Scripts/00.00.00.sql @@ -232,6 +232,38 @@ REFERENCES [dbo].[Module] ([ModuleId]) ON DELETE CASCADE GO +ALTER TABLE dbo.Role ADD CONSTRAINT FK_Role_Site FOREIGN KEY (SiteId) +REFERENCES dbo.Site (SiteId) +ON DELETE CASCADE +GO + +ALTER TABLE dbo.UserRole ADD CONSTRAINT FK_UserRole_User FOREIGN KEY (UserId) +REFERENCES dbo.[User] (UserId) +ON DELETE CASCADE +GO + +ALTER TABLE dbo.UserRole ADD CONSTRAINT FK_UserRole_Role FOREIGN KEY (RoleId) +REFERENCES dbo.Role (RoleId) +GO + +ALTER TABLE dbo.Permission ADD CONSTRAINT FK_Permission_Site FOREIGN KEY (SiteId) +REFERENCES dbo.Site (SiteId) +ON DELETE CASCADE +GO + +ALTER TABLE dbo.Permission ADD CONSTRAINT FK_Permission_User FOREIGN KEY (UserId) +REFERENCES dbo.[User] (UserId) +GO + +ALTER TABLE dbo.Permission ADD CONSTRAINT FK_Permission_Role FOREIGN KEY (RoleId) +REFERENCES dbo.Role (RoleId) +GO + +ALTER TABLE dbo.PageModule ADD CONSTRAINT FK_PageModule_Page FOREIGN KEY (PageId) +REFERENCES dbo.Page (PageId) +ON DELETE CASCADE +GO + /* Create indexes @@ -246,6 +278,44 @@ CREATE UNIQUE NONCLUSTERED INDEX IX_Setting ON dbo.Setting ) ON [PRIMARY] GO +CREATE UNIQUE NONCLUSTERED INDEX IX_User ON dbo.[User] + ( + Username + ) ON [PRIMARY] +GO + +CREATE UNIQUE NONCLUSTERED INDEX IX_SiteUser ON dbo.SiteUser + ( + SiteId, + UserId + ) ON [PRIMARY] +GO + +CREATE UNIQUE NONCLUSTERED INDEX IX_Permission ON dbo.Permission + ( + SiteId, + EntityName, + EntityId, + PermissionName, + RoleId, + UserId + ) ON [PRIMARY] +GO + +CREATE UNIQUE NONCLUSTERED INDEX IX_Page ON dbo.Page + ( + SiteId, + [Path] + ) ON [PRIMARY] +GO + +CREATE UNIQUE NONCLUSTERED INDEX IX_UserRole ON dbo.UserRole + ( + RoleId, + UserId + ) ON [PRIMARY] +GO + /* Create seed data @@ -293,6 +363,8 @@ VALUES (1, 1, N'Page1', N'', N'Oqtane.Client.Themes.Theme1.Theme1, Oqtane.Client GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 1, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 1, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 1, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -307,6 +379,8 @@ VALUES (3, 1, N'Page3', N'page3', N'Oqtane.Client.Themes.Theme3.Theme3, Oqtane.C GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 3, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 3, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 3, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -328,6 +402,8 @@ VALUES (6, 1, N'Login', N'login', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.C GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 6, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 6, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 6, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -335,6 +411,8 @@ VALUES (7, 1, N'Register', N'register', N'Oqtane.Client.Themes.Theme2.Theme2, Oq GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 7, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 7, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 7, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -370,6 +448,8 @@ VALUES (12, 2, N'Page1', N'', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Clien GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 12, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 12, 'View', 3, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 12, 'Edit', 3, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -377,6 +457,8 @@ VALUES (13, 2, N'Page2', N'page2', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane. GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 13, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 13, 'View', 3, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 13, 'Edit', 3, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -384,6 +466,8 @@ VALUES (14, 2, N'Login', N'login', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane. GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 14, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 14, 'View', 3, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 14, 'Edit', 3, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -391,6 +475,8 @@ VALUES (15, 2, N'Register', N'register', N'Oqtane.Client.Themes.Theme2.Theme2, O GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 15, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 15, 'View', 3, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 15, 'Edit', 3, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -410,6 +496,8 @@ VALUES (1, 1, N'Oqtane.Client.Modules.Weather, Oqtane.Client', '', getdate(), '' GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 1, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 1, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 1, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -417,6 +505,8 @@ VALUES (2, 1, N'Oqtane.Client.Modules.Counter, Oqtane.Client', '', getdate(), '' GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 2, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 2, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 2, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -424,6 +514,8 @@ VALUES (3, 1, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', '', getdate(), ' GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 3, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 3, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 3, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -431,6 +523,8 @@ VALUES (4, 1, N'Oqtane.Client.Modules.Weather, Oqtane.Client', '', getdate(), '' GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 4, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 4, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 4, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -438,6 +532,8 @@ VALUES (5, 1, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', '', getdate(), ' GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 5, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 5, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 5, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -445,6 +541,8 @@ VALUES (6, 1, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', '', getdate(), ' GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 6, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 6, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 6, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -466,6 +564,8 @@ VALUES (9, 1, N'Oqtane.Client.Modules.Admin.Login, Oqtane.Client', '', getdate() GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 9, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 9, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 9, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -473,6 +573,8 @@ VALUES (10, 1, N'Oqtane.Client.Modules.Admin.Register, Oqtane.Client', '', getda GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 10, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 10, 'View', 1, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 10, 'Edit', 1, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -515,6 +617,8 @@ VALUES (16, 2, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', '', getdate(), GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 16, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 16, 'View', 3, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 16, 'Edit', 3, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -522,6 +626,8 @@ VALUES (17, 2, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', '', getdate(), GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 17, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 17, 'View', 3, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 17, 'Edit', 3, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -529,6 +635,8 @@ VALUES (18, 2, N'Oqtane.Client.Modules.Admin.Login, Oqtane.Client', '', getdate( GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 18, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 18, 'View', 3, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 18, 'Edit', 3, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) @@ -536,6 +644,8 @@ VALUES (19, 2, N'Oqtane.Client.Modules.Admin.Register, Oqtane.Client', '', getda GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 19, 'View', -1, null, 1, '', getdate(), '', getdate()) GO +INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 19, 'View', 3, null, 1, '', getdate(), '', getdate()) +GO INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 19, 'Edit', 3, null, 1, '', getdate(), '', getdate()) GO INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn])