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

Remove "additional data" from entities (#16024)

Browse Source 
* Remove "additional data" from entities

* Fix merge issue

---------

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
Kenn Jacobsen
2024-04-11 10:55:21 +02:00
committed by GitHub
parent faee63627f
commit acae5f2d57
20 changed files with 48 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilder.cs
View File

@@ -1,7 +1,6 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.
using System;
using Umbraco.Cms.Core.Models.Entities;
using Umbraco.Cms.Tests.Common.Builders.Interfaces;
@@ -20,7 +19,6 @@ public class DocumentEntitySlimBuilder
IWithSortOrderBuilder,
IWithParentIdBuilder
{
private GenericDictionaryBuilder<DocumentEntitySlimBuilder, string, object> _additionalDataBuilder;
private string _contentTypeAlias;
private string _contentTypeIcon;
private string _contentTypeThumbnail;
@@ -128,13 +126,6 @@ public class DocumentEntitySlimBuilder
return this;
}
public GenericDictionaryBuilder<DocumentEntitySlimBuilder, string, object> AddAdditionalData()
{
var builder = new GenericDictionaryBuilder<DocumentEntitySlimBuilder, string, object>(this);
_additionalDataBuilder = builder;
return builder;
}
public override DocumentEntitySlim Build()
{
var id = _id ?? 1;
@@ -172,15 +163,6 @@ public class DocumentEntitySlimBuilder
Published = published
};
if (_additionalDataBuilder != null)
{
var additionalData = _additionalDataBuilder.Build();
foreach (var kvp in additionalData)
{
documentEntitySlim.AdditionalData.Add(kvp.Key, kvp.Value);
}
}
return documentEntitySlim;
}
}

19
tests/Umbraco.Tests.Common/Builders/MemberBuilder.cs
View File

@@ -1,8 +1,6 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.
using System;
using System.Collections.Generic;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Tests.Common.Builders.Extensions;
using Umbraco.Cms.Tests.Common.Builders.Interfaces;
@@ -24,7 +22,6 @@ public class MemberBuilder
IWithSortOrderBuilder,
IAccountBuilder
{
private GenericDictionaryBuilder<MemberBuilder, string, object> _additionalDataBuilder;
private DateTime? _createDate;
private int? _creatorId;
private string _email;
@@ -201,13 +198,6 @@ public class MemberBuilder
return builder;
}
public GenericDictionaryBuilder<MemberBuilder, string, object> AddAdditionalData()
{
var builder = new GenericDictionaryBuilder<MemberBuilder, string, object>(this);
_additionalDataBuilder = builder;
return builder;
}
public GenericDictionaryBuilder<MemberBuilder, string, object> AddPropertyData()
{
var builder = new GenericDictionaryBuilder<MemberBuilder, string, object>(this);
@@ -281,15 +271,6 @@ public class MemberBuilder
member.Groups = _memberGroupsBuilder.Build();
}
if (_additionalDataBuilder != null)
{
var additionalData = _additionalDataBuilder.Build();
foreach (var kvp in additionalData)
{
member.AdditionalData.Add(kvp.Key, kvp.Value);
}
}
if (_propertyDataBuilder != null)
{
var propertyData = _propertyDataBuilder.Build();

18
tests/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
View File

@@ -1,7 +1,6 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.
using System;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Tests.Common.Builders.Interfaces;
@@ -16,7 +15,6 @@ public class MemberGroupBuilder
IWithUpdateDateBuilder,
IWithNameBuilder
{
private GenericDictionaryBuilder<MemberGroupBuilder, string, object> _additionalDataBuilder;
private DateTime? _createDate;
private int? _creatorId;
@@ -61,13 +59,6 @@ public class MemberGroupBuilder
set => _updateDate = value;
}
public GenericDictionaryBuilder<MemberGroupBuilder, string, object> AddAdditionalData()
{
var builder = new GenericDictionaryBuilder<MemberGroupBuilder, string, object>(this);
_additionalDataBuilder = builder;
return builder;
}
public override MemberGroup Build()
{
var id = _id ?? 1;
@@ -87,15 +78,6 @@ public class MemberGroupBuilder
CreatorId = creatorId
};
if (_additionalDataBuilder != null)
{
var additionalData = _additionalDataBuilder.Build();
foreach (var kvp in additionalData)
{
memberGroup.AdditionalData.Add(kvp.Key, kvp.Value);
}
}
return memberGroup;
}
}