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

tasktype now static

Browse Source
This commit is contained in:
Ismail Mayat
2018-06-29 12:14:37 +01:00
parent aca08a8021
commit 9e16d92c99
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Persistence/Factories/TaskTypeFactory.cs
View File

@@ -3,9 +3,9 @@ using Umbraco.Core.Persistence.Dtos;
namespace Umbraco.Core.Persistence.Factories namespace Umbraco.Core.Persistence.Factories
{ {
internal class TaskTypeFactory internal static class TaskTypeFactory
{ {
public TaskType BuildEntity(TaskTypeDto dto) public static TaskType BuildEntity(TaskTypeDto dto)
{ {
var entity = new TaskType(dto.Alias) {Id = dto.Id}; var entity = new TaskType(dto.Alias) {Id = dto.Id};
// reset dirty initial properties (U4-1946) // reset dirty initial properties (U4-1946)
@@ -13,7 +13,7 @@ namespace Umbraco.Core.Persistence.Factories
return entity; return entity;
} }
public TaskTypeDto BuildDto(TaskType entity) public static TaskTypeDto BuildDto(TaskType entity)
{ {
var dto = new TaskTypeDto var dto = new TaskTypeDto
{ {

25
src/Umbraco.Core/Persistence/Repositories/Implement/TaskTypeRepository.cs
View File

@@ -28,9 +28,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
var taskDto = Database.Fetch<TaskTypeDto>(SqlContext.SqlSyntax.SelectTop(sql, 1)).FirstOrDefault(); var taskDto = Database.Fetch<TaskTypeDto>(SqlContext.SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
if (taskDto == null) if (taskDto == null)
return null; return null;
var factory = new TaskTypeFactory(); var entity = TaskTypeFactory.BuildEntity(taskDto);
var entity = factory.BuildEntity(taskDto);
return entity; return entity;
} }
@@ -42,10 +41,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
{ {
sql.Where("cmsTaskType.id IN (@ids)", new { ids }); sql.Where("cmsTaskType.id IN (@ids)", new { ids });
} }
var factory = new TaskTypeFactory();
var dtos = Database.Fetch<TaskTypeDto>(sql); var dtos = Database.Fetch<TaskTypeDto>(sql);
return dtos.Select(factory.BuildEntity); return dtos.Select(TaskTypeFactory.BuildEntity);
} }
protected override IEnumerable<TaskType> PerformGetByQuery(IQuery<TaskType> query) protected override IEnumerable<TaskType> PerformGetByQuery(IQuery<TaskType> query)
@@ -53,10 +51,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
var sqlClause = GetBaseQuery(false); var sqlClause = GetBaseQuery(false);
var translator = new SqlTranslator<TaskType>(sqlClause, query); var translator = new SqlTranslator<TaskType>(sqlClause, query);
var sql = translator.Translate(); var sql = translator.Translate();
var factory = new TaskTypeFactory();
var dtos = Database.Fetch<TaskTypeDto>(sql); var dtos = Database.Fetch<TaskTypeDto>(sql);
return dtos.Select(factory.BuildEntity); return dtos.Select(TaskTypeFactory.BuildEntity);
} }
protected override Sql<ISqlContext> GetBaseQuery(bool isCount) protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
@@ -93,9 +90,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
{ {
throw new InvalidOperationException("A task type already exists with the given alias " + entity.Alias); throw new InvalidOperationException("A task type already exists with the given alias " + entity.Alias);
} }
var factory = new TaskTypeFactory(); var dto = TaskTypeFactory.BuildDto(entity);
var dto = factory.BuildDto(entity);
var id = Convert.ToInt32(Database.Insert(dto)); var id = Convert.ToInt32(Database.Insert(dto));
entity.Id = id; entity.Id = id;
@@ -106,9 +102,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
protected override void PersistUpdatedItem(TaskType entity) protected override void PersistUpdatedItem(TaskType entity)
{ {
entity.UpdatingEntity(); entity.UpdatingEntity();
var factory = new TaskTypeFactory(); var dto = TaskTypeFactory.BuildDto(entity);
var dto = factory.BuildDto(entity);
Database.Update(dto); Database.Update(dto);