kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use consistent naming in SiteRepository

Browse Source
This commit is contained in:
sbwalker 2024-03-21 15:32:25 -04:00
parent bbc77f81ca
commit 4b05a49b46
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Oqtane.Server/Repository/SiteRepository.cs
View File

@ -4,7 +4,6 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Internal;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Oqtane.Enums; using Oqtane.Enums;
@ -55,25 +54,25 @@ namespace Oqtane.Repository
// asynchronous methods // asynchronous methods
public async Task<IEnumerable<Site>> GetSitesAsync() public async Task<IEnumerable<Site>> GetSitesAsync()
{ {
using var ctx = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
return await ctx.Site.OrderBy(item => item.Name).ToListAsync(); return await db.Site.OrderBy(item => item.Name).ToListAsync();
} }
public async Task<Site> AddSiteAsync(Site site) public async Task<Site> AddSiteAsync(Site site)
{ {
site.SiteGuid = Guid.NewGuid().ToString(); site.SiteGuid = Guid.NewGuid().ToString();
using var ctx = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
ctx.Site.Add(site); db.Site.Add(site);
await ctx.SaveChangesAsync(); await db.SaveChangesAsync();
CreateSite(site); CreateSite(site);
return site; return site;
} }
public async Task<Site> UpdateSiteAsync(Site site) public async Task<Site> UpdateSiteAsync(Site site)
{ {
using var ctx = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
ctx.Entry(site).State = EntityState.Modified; db.Entry(site).State = EntityState.Modified;
await ctx.SaveChangesAsync(); await db.SaveChangesAsync();
return site; return site;
} }
@ -84,23 +83,23 @@ namespace Oqtane.Repository
public async Task<Site> GetSiteAsync(int siteId, bool tracking) public async Task<Site> GetSiteAsync(int siteId, bool tracking)
{ {
using var ctx = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
if (tracking) if (tracking)
{ {
return await ctx.Site.FindAsync(siteId); return await db.Site.FindAsync(siteId);
} }
else else
{ {
return await ctx.Site.AsNoTracking().FirstOrDefaultAsync(item => item.SiteId == siteId); return await db.Site.AsNoTracking().FirstOrDefaultAsync(item => item.SiteId == siteId);
} }
} }
public async Task DeleteSiteAsync(int siteId) public async Task DeleteSiteAsync(int siteId)
{ {
using var ctx = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
var site = ctx.Site.Find(siteId); var site = db.Site.Find(siteId);
ctx.Site.Remove(site); db.Site.Remove(site);
await ctx.SaveChangesAsync(); await db.SaveChangesAsync();
} }
// synchronous methods // synchronous methods
@ -112,19 +111,19 @@ namespace Oqtane.Repository
public Site AddSite(Site site) public Site AddSite(Site site)
{ {
using var ctx = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
site.SiteGuid = Guid.NewGuid().ToString(); site.SiteGuid = Guid.NewGuid().ToString();
ctx.Site.Add(site); db.Site.Add(site);
ctx.SaveChanges(); db.SaveChanges();
CreateSite(site); CreateSite(site);
return site; return site;
} }
public Site UpdateSite(Site site) public Site UpdateSite(Site site)
{ {
using var ctx = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
ctx.Entry(site).State = EntityState.Modified; db.Entry(site).State = EntityState.Modified;
ctx.SaveChanges(); db.SaveChanges();
return site; return site;
} }
@ -135,23 +134,23 @@ namespace Oqtane.Repository
public Site GetSite(int siteId, bool tracking) public Site GetSite(int siteId, bool tracking)
{ {
using var ctx = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
if (tracking) if (tracking)
{ {
return ctx.Site.Find(siteId); return db.Site.Find(siteId);
} }
else else
{ {
return ctx.Site.AsNoTracking().FirstOrDefault(item => item.SiteId == siteId); return db.Site.AsNoTracking().FirstOrDefault(item => item.SiteId == siteId);
} }
} }
public void DeleteSite(int siteId) public void DeleteSite(int siteId)
{ {
using var ctx = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
var site = ctx.Site.Find(siteId); var site = db.Site.Find(siteId);
ctx.Site.Remove(site); db.Site.Remove(site);
ctx.SaveChanges(); db.SaveChanges();
} }