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

taskfactory now static updated callers

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

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

@@ -6,9 +6,9 @@ namespace Umbraco.Core.Persistence.Factories
/// <summary>
/// Creates the model mappings for Tasks
/// </summary>
internal class TaskFactory
internal static class TaskFactory
{
public Task BuildEntity(TaskDto dto)
public static Task BuildEntity(TaskDto dto)
{
var entity = new Task(new TaskType(dto.TaskTypeDto.Alias) { Id = dto.TaskTypeDto.Id });
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Persistence.Factories
}
}
public TaskDto BuildDto(Task entity)
public static TaskDto BuildDto(Task entity)
{
var dto = new TaskDto
{

27
src/Umbraco.Core/Persistence/Repositories/Implement/TaskRepository.cs
View File

@@ -29,9 +29,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
var taskDto = Database.Fetch<TaskDto>(SqlContext.SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
if (taskDto == null)
return null;
var factory = new TaskFactory();
var entity = factory.BuildEntity(taskDto);
var entity = TaskFactory.BuildEntity(taskDto);
return entity;
}
@@ -43,10 +42,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
{
sql.Where("cmsTask.id IN (@ids)", new { ids = ids });
}
var factory = new TaskFactory();
var dtos = Database.Fetch<TaskDto>(sql);
return dtos.Select(factory.BuildEntity);
return dtos.Select(TaskFactory.BuildEntity);
}
protected override IEnumerable<Task> PerformGetByQuery(IQuery<Task> query)
@@ -55,9 +53,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
var translator = new SqlTranslator<Task>(sqlClause, query);
var sql = translator.Translate();
var factory = new TaskFactory();
var dtos = Database.Fetch<TaskDto>(sql);
return dtos.Select(factory.BuildEntity);
return dtos.Select(TaskFactory.BuildEntity);
}
protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
@@ -107,9 +104,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
{
entity.TaskType.Id = taskType.Id;
}
var factory = new TaskFactory();
var dto = factory.BuildDto(entity);
var dto = TaskFactory.BuildDto(entity);
var id = Convert.ToInt32(Database.Insert(dto));
entity.Id = id;
@@ -120,9 +116,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
protected override void PersistUpdatedItem(Task entity)
{
entity.UpdatingEntity();
var factory = new TaskFactory();
var dto = factory.BuildDto(entity);
var dto = TaskFactory.BuildDto(entity);
Database.Update(dto);
@@ -138,8 +133,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
}
var dtos = Database.Fetch<TaskDto>(sql);
var factory = new TaskFactory();
return dtos.Select(factory.BuildEntity);
return dtos.Select(TaskFactory.BuildEntity);
}
private Sql<ISqlContext> GetGetTasksQuery(int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false)