From 9e16d92c9920bab087fcadbc41869e4a4c2ae213 Mon Sep 17 00:00:00 2001 From: Ismail Mayat Date: Fri, 29 Jun 2018 12:14:37 +0100 Subject: [PATCH] tasktype now static --- .../Persistence/Factories/TaskTypeFactory.cs | 6 ++--- .../Implement/TaskTypeRepository.cs | 25 ++++++++----------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Factories/TaskTypeFactory.cs b/src/Umbraco.Core/Persistence/Factories/TaskTypeFactory.cs index f4851c192f..01a25ff852 100644 --- a/src/Umbraco.Core/Persistence/Factories/TaskTypeFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/TaskTypeFactory.cs @@ -3,9 +3,9 @@ using Umbraco.Core.Persistence.Dtos; 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}; // reset dirty initial properties (U4-1946) @@ -13,7 +13,7 @@ namespace Umbraco.Core.Persistence.Factories return entity; } - public TaskTypeDto BuildDto(TaskType entity) + public static TaskTypeDto BuildDto(TaskType entity) { var dto = new TaskTypeDto { diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/TaskTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TaskTypeRepository.cs index abd21002a1..8669e7a9dc 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/TaskTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TaskTypeRepository.cs @@ -28,9 +28,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement var taskDto = Database.Fetch(SqlContext.SqlSyntax.SelectTop(sql, 1)).FirstOrDefault(); if (taskDto == null) return null; - - var factory = new TaskTypeFactory(); - var entity = factory.BuildEntity(taskDto); + + var entity = TaskTypeFactory.BuildEntity(taskDto); return entity; } @@ -42,10 +41,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement { sql.Where("cmsTaskType.id IN (@ids)", new { ids }); } - - var factory = new TaskTypeFactory(); + var dtos = Database.Fetch(sql); - return dtos.Select(factory.BuildEntity); + return dtos.Select(TaskTypeFactory.BuildEntity); } protected override IEnumerable PerformGetByQuery(IQuery query) @@ -53,10 +51,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement var sqlClause = GetBaseQuery(false); var translator = new SqlTranslator(sqlClause, query); var sql = translator.Translate(); - - var factory = new TaskTypeFactory(); + var dtos = Database.Fetch(sql); - return dtos.Select(factory.BuildEntity); + return dtos.Select(TaskTypeFactory.BuildEntity); } protected override Sql 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); } - - var factory = new TaskTypeFactory(); - var dto = factory.BuildDto(entity); + + var dto = TaskTypeFactory.BuildDto(entity); var id = Convert.ToInt32(Database.Insert(dto)); entity.Id = id; @@ -106,9 +102,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override void PersistUpdatedItem(TaskType entity) { entity.UpdatingEntity(); - - var factory = new TaskTypeFactory(); - var dto = factory.BuildDto(entity); + + var dto = TaskTypeFactory.BuildDto(entity); Database.Update(dto);