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

Amends to key value service/repository to better match existing repository patterns.

Browse Source
This commit is contained in:
Andy Butland
2020-02-17 22:12:42 +01:00
parent f92b43260a
commit 0bba475533
14 changed files with 272 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
View File

@@ -4,12 +4,11 @@ using System.Linq;
using NPoco;
using Umbraco.Core.Cache;
using Umbraco.Core.Logging;
using Umbraco.Core.Migrations;
using Umbraco.Core.Models;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Dtos;
using Umbraco.Core.Persistence.Querying;
using Umbraco.Core.Scoping;
using Umbraco.Infrastructure.Persistence.Repositories;
namespace Umbraco.Core.Persistence.Repositories.Implement
{
@@ -19,56 +18,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
: base(scopeAccessor, AppCaches.NoCache, logger)
{ }
public void Initialize()
{
var context = new MigrationContext(Database, Logger);
var initMigration = new InitialMigration(context);
initMigration.Migrate();
}
public string GetValue(string key)
{
return GetDtoByKey(key)?.Value;
}
public void SetValue(string key, string value)
{
var dto = GetDtoByKey(key);
if (dto == null)
{
dto = new KeyValueDto
{
Key = key,
Value = value,
UpdateDate = DateTime.Now
};
Database.Insert(dto);
}
else
{
UpdateDtoValue(dto, value);
}
}
public bool TrySetValue(string key, string originalValue, string newValue)
{
var dto = GetDtoByKey(key);
if (dto == null || dto.Value != originalValue)
return false;
UpdateDtoValue(dto, newValue);
return true;
}
private void UpdateDtoValue(KeyValueDto dto, string value)
{
dto.Value = value;
dto.UpdateDate = DateTime.Now;
Database.Update(dto);
}
/// <summary>
/// Gets a value directly from the database, no scope, nothing.
/// </summary>
@@ -84,6 +33,18 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
return database.FirstOrDefault<KeyValueDto>(sql)?.Value;
}
#region Overrides of IReadWriteQueryRepository<string, IKeyValue>
public override void Save(IKeyValue entity)
{
if (Get(entity.Identifier) == null)
PersistNewItem(entity);
else
PersistUpdatedItem(entity);
}
#endregion
#region Overrides of NPocoRepositoryBase<string, IKeyValue>
protected override Guid NodeObjectTypeId => throw new NotImplementedException();
@@ -114,16 +75,11 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
protected override IKeyValue PerformGet(string id)
{
var dto = GetDtoByKey(id);
var sql = GetBaseQuery(false).Where<KeyValueDto>(x => x.Key == id);
var dto = Database.Fetch<KeyValueDto>(sql).FirstOrDefault();
return dto == null ? null : Map(dto);
}
private KeyValueDto GetDtoByKey(string key)
{
var sql = GetBaseQuery(false).Where<KeyValueDto>(x => x.Key == key);
return Database.Fetch<KeyValueDto>(sql).FirstOrDefault();
}
protected override IEnumerable<IKeyValue> PerformGetAll(params string[] ids)
{
var sql = GetBaseQuery(false).WhereIn<KeyValueDto>(x => x.Key, ids);
@@ -170,64 +126,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
Value = dto.Value,
UpdateDate = dto.UpdateDate,
};
}
}
#endregion
/// <summary>
/// A custom migration that executes standalone during the Initialize phase of the KeyValueService.
/// </summary>
internal class InitialMigration : MigrationBase
{
public InitialMigration(IMigrationContext context)
: base(context)
{ }
public override void Migrate()
{
// as long as we are still running 7 this migration will be invoked,
// but due to multiple restarts during upgrades, maybe the table
// exists already
if (TableExists(Constants.DatabaseSchema.Tables.KeyValue))
return;
Logger.Info<KeyValueRepository>("Creating KeyValue structure.");
// the locks table was initially created with an identity (auto-increment) primary key,
// but we don't want this, especially as we are about to insert a new row into the table,
// so here we drop that identity
DropLockTableIdentity();
// insert the lock object for key/value
Insert.IntoTable(Constants.DatabaseSchema.Tables.Lock).Row(new { id = Constants.Locks.KeyValues, name = "KeyValues", value = 1 }).Do();
// create the key-value table
Create.Table<KeyValueDto>().Do();
}
private void DropLockTableIdentity()
{
// one cannot simply drop an identity, that requires a bit of work
// create a temp. id column and copy values
Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("nid").AsInt32().Nullable().Do();
Execute.Sql("update umbracoLock set nid = id").Do();
// drop the id column entirely (cannot just drop identity)
Delete.PrimaryKey("PK_umbracoLock").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
Delete.Column("id").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
// recreate the id column without identity and copy values
Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("id").AsInt32().Nullable().Do();
Execute.Sql("update umbracoLock set id = nid").Do();
// drop the temp. id column
Delete.Column("nid").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
// complete the primary key
Alter.Table(Constants.DatabaseSchema.Tables.Lock).AlterColumn("id").AsInt32().NotNullable().PrimaryKey("PK_umbracoLock").Do();
}
}
#endregion
}
}