yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build after merge

Browse Source
This commit is contained in:
Bjarke Berg
2021-10-29 10:14:52 +02:00
parent 02bf61667d
commit bf5f1364fd
13 changed files with 1028 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/Umbraco.Infrastructure/Persistence/Repositories/Implement/AuditEntryRepository.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Logging;
using NPoco;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Persistence.Querying;
@@ -16,26 +17,47 @@ using Umbraco.Extensions;
namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
{
/// <summary>
/// Represents the NPoco implementation of <see cref="IAuditEntryRepository"/>.
/// Represents the NPoco implementation of <see cref="IAuditEntryRepository" />.
/// </summary>
internal class AuditEntryRepository : EntityRepositoryBase<int, IAuditEntry>, IAuditEntryRepository
{
/// <summary>
/// Initializes a new instance of the <see cref="AuditEntryRepository"/> class.
/// Initializes a new instance of the <see cref="AuditEntryRepository" /> class.
/// </summary>
public AuditEntryRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger<AuditEntryRepository> logger)
: base(scopeAccessor, cache, logger)
{ }
{
}
/// <inheritdoc />
public IEnumerable<IAuditEntry> GetPage(long pageIndex, int pageCount, out long records)
{
Sql<ISqlContext> sql = Sql()
.Select<AuditEntryDto>()
.From<AuditEntryDto>()
.OrderByDescending<AuditEntryDto>(x => x.EventDateUtc);
Page<AuditEntryDto> page = Database.Page<AuditEntryDto>(pageIndex + 1, pageCount, sql);
records = page.TotalItems;
return page.Items.Select(AuditEntryFactory.BuildEntity);
}
/// <inheritdoc />
public bool IsAvailable()
{
var tables = SqlSyntax.GetTablesInSchema(Database).ToArray();
return tables.InvariantContains(Constants.DatabaseSchema.Tables.AuditEntry);
}
/// <inheritdoc />
protected override IAuditEntry PerformGet(int id)
{
var sql = Sql()
Sql<ISqlContext> sql = Sql()
.Select<AuditEntryDto>()
.From<AuditEntryDto>()
.Where<AuditEntryDto>(x => x.Id == id);
var dto = Database.FirstOrDefault<AuditEntryDto>(sql);
AuditEntryDto dto = Database.FirstOrDefault<AuditEntryDto>(sql);
return dto == null ? null : AuditEntryFactory.BuildEntity(dto);
}
@@ -44,7 +66,7 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
{
if (ids.Length == 0)
{
var sql = Sql()
Sql<ISqlContext> sql = Sql()
.Select<AuditEntryDto>()
.From<AuditEntryDto>();
@@ -53,9 +75,9 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
var entries = new List<IAuditEntry>();
foreach (var group in ids.InGroupsOf(Constants.Sql.MaxParameterCount))
foreach (IEnumerable<int> group in ids.InGroupsOf(Constants.Sql.MaxParameterCount))
{
var sql = Sql()
Sql<ISqlContext> sql = Sql()
.Select<AuditEntryDto>()
.From<AuditEntryDto>()
.WhereIn<AuditEntryDto>(x => x.Id, group);
@@ -69,68 +91,41 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
/// <inheritdoc />
protected override IEnumerable<IAuditEntry> PerformGetByQuery(IQuery<IAuditEntry> query)
{
var sqlClause = GetBaseQuery(false);
Sql<ISqlContext> sqlClause = GetBaseQuery(false);
var translator = new SqlTranslator<IAuditEntry>(sqlClause, query);
var sql = translator.Translate();
Sql<ISqlContext> sql = translator.Translate();
return Database.Fetch<AuditEntryDto>(sql).Select(AuditEntryFactory.BuildEntity);
}
/// <inheritdoc />
protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
{
var sql = Sql();
Sql<ISqlContext> sql = Sql();
sql = isCount ? sql.SelectCount() : sql.Select<AuditEntryDto>();
sql = sql.From<AuditEntryDto>();
return sql;
}
/// <inheritdoc />
protected override string GetBaseWhereClause()
{
return $"{Cms.Core.Constants.DatabaseSchema.Tables.AuditEntry}.id = @id";
}
protected override string GetBaseWhereClause() => $"{Constants.DatabaseSchema.Tables.AuditEntry}.id = @id";
/// <inheritdoc />
protected override IEnumerable<string> GetDeleteClauses()
{
protected override IEnumerable<string> GetDeleteClauses() =>
throw new NotSupportedException("Audit entries cannot be deleted.");
}
/// <inheritdoc />
protected override void PersistNewItem(IAuditEntry entity)
{
entity.AddingEntity();
var dto = AuditEntryFactory.BuildDto(entity);
AuditEntryDto dto = AuditEntryFactory.BuildDto(entity);
Database.Insert(dto);
entity.Id = dto.Id;
entity.ResetDirtyProperties();
}
/// <inheritdoc />
protected override void PersistUpdatedItem(IAuditEntry entity)
{
protected override void PersistUpdatedItem(IAuditEntry entity) =>
throw new NotSupportedException("Audit entries cannot be updated.");
}
/// <inheritdoc />
public IEnumerable<IAuditEntry> GetPage(long pageIndex, int pageCount, out long records)
{
var sql = Sql()
.Select<AuditEntryDto>()
.From<AuditEntryDto>()
.OrderByDescending<AuditEntryDto>(x => x.EventDateUtc);
var page = Database.Page<AuditEntryDto>(pageIndex + 1, pageCount, sql);
records = page.TotalItems;
return page.Items.Select(AuditEntryFactory.BuildEntity);
}
/// <inheritdoc />
public bool IsAvailable()
{
var tables = SqlSyntax.GetTablesInSchema(Database).ToArray();
return tables.InvariantContains(Cms.Core.Constants.DatabaseSchema.Tables.AuditEntry);
}
}
}