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

Model mapping PoC (#15546)

Browse Source 
* First take at new models for improved mapping between client and server

* Add variants to Media

* Re-introduced lost names

* Start breaking apart "Id" reference properties in request models as well

* Refactor to fix OpenAPI spec

* Discard TODO (not relevant)

* Split recycle bin response models

* Delete unused marker interface

* Use reference properties for content and media type handling

* Rework document and media types to be explicit in relations (do not expose "content type", it is an implementation detail)

* Mapping for document and media type copy + move

* Ensure correct response model for Media

* Regenerate OpenAPI JSON after forward merge

* Fix forward merge issues

* Fix forward merge + regenerate OpenApi.json

* Added unit tests for content state helper

* Move "allowed document types" endpoint to document type silo, refactored services and added "allowed media types"

* Regenerate OpenApi.json after forward merge

* Do not include content state for media items

* Review fix
This commit is contained in:
Kenn Jacobsen
2024-01-30 12:19:05 +01:00
committed by GitHub
parent bb46d23730
commit 9b454bec6b
158 changed files with 2788 additions and 1533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
tests/Umbraco.Tests.UnitTests/Umbraco.Cms.Api.Management/Mapping/Content/ContentStateHelperTests.cs Normal file
View File

@@ -0,0 +1,116 @@
using Moq;
using NUnit.Framework;
using Umbraco.Cms.Api.Management.Mapping.Content;
using Umbraco.Cms.Api.Management.ViewModels.Content;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Entities;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Cms.Api.Management.Mapping.Content;
[TestFixture]
public class ContentStateHelperTests
{
[TestCase(false, false, ContentState.Draft)]
[TestCase(false, true, ContentState.Published)]
[TestCase(true, false, ContentState.Draft)]
[TestCase(true, true, ContentState.PublishedPendingChanges)]
public void Culture_Invariant_Content_State(bool edited, bool published, ContentState expectedResult)
{
var content = Mock.Of<IContent>(c => c.Id == 1 && c.Published == published && c.Edited == edited);
Assert.AreEqual(expectedResult, ContentStateHelper.GetContentState(content, culture: null));
}
[TestCase(false, false)]
[TestCase(false, true)]
[TestCase(true, false)]
[TestCase(true, true)]
public void Culture_Invariant_Content_Not_Created_State(bool edited, bool published)
{
var content = Mock.Of<IContent>(c => c.Id == 0 && c.Published == published && c.Edited == edited);
Assert.AreEqual(ContentState.NotCreated, ContentStateHelper.GetContentState(content, culture: null));
}
[TestCase(false, false, ContentState.Draft)]
[TestCase(false, true, ContentState.Published)]
[TestCase(true, false, ContentState.Draft)]
[TestCase(true, true, ContentState.PublishedPendingChanges)]
public void Culture_Variant_Content_Existing_Culture_State(bool edited, bool published, ContentState expectedResult)
{
const string culture = "en";
var content = Mock.Of<IContent>(c =>
c.Id == 1
&& c.AvailableCultures == new[] { culture }
&& c.EditedCultures == (edited ? new[] { culture } : Enumerable.Empty<string>())
&& c.Published == published
&& c.PublishedCultures == (published ? new[] { culture } : Enumerable.Empty<string>()));
Assert.AreEqual(expectedResult, ContentStateHelper.GetContentState(content, culture));
}
[TestCase(false, false)]
[TestCase(false, true)]
[TestCase(true, false)]
[TestCase(true, true)]
public void Culture_Variant_Content_Missing_Culture_State(bool edited, bool published)
{
const string culture = "en";
var content = Mock.Of<IContent>(c =>
c.Id == 1
&& c.AvailableCultures == new[] { culture }
&& c.EditedCultures == (edited ? new[] { culture } : Enumerable.Empty<string>())
&& c.Published == published
&& c.PublishedCultures == (published ? new[] { culture } : Enumerable.Empty<string>()));
Assert.AreEqual(ContentState.NotCreated, ContentStateHelper.GetContentState(content, "dk"));
}
[TestCase(false, false, ContentState.Draft)]
[TestCase(false, true, ContentState.Published)]
[TestCase(true, false, ContentState.Draft)]
[TestCase(true, true, ContentState.PublishedPendingChanges)]
public void Culture_Invariant_DocumentEntitySlim_State(bool edited, bool published, ContentState expectedResult)
{
var entity = Mock.Of<IDocumentEntitySlim>(c => c.Id == 1 && c.Published == published && c.Edited == edited && c.CultureNames == new Dictionary<string, string>());
Assert.AreEqual(expectedResult, ContentStateHelper.GetContentState(entity, culture: null));
}
[TestCase(false, false)]
[TestCase(false, true)]
[TestCase(true, false)]
[TestCase(true, true)]
public void Culture_Invariant_DocumentEntitySlim_Not_Created_State(bool edited, bool published)
{
var entity = Mock.Of<IDocumentEntitySlim>(c => c.Id == 0 && c.Published == published && c.Edited == edited && c.CultureNames == new Dictionary<string, string>());
Assert.AreEqual(ContentState.NotCreated, ContentStateHelper.GetContentState(entity, culture: null));
}
[TestCase(false, false, ContentState.Draft)]
[TestCase(false, true, ContentState.Published)]
[TestCase(true, false, ContentState.Draft)]
[TestCase(true, true, ContentState.PublishedPendingChanges)]
public void Culture_Variant_DocumentEntitySlim_Existing_Culture_State(bool edited, bool published, ContentState expectedResult)
{
const string culture = "en";
var entity = Mock.Of<IDocumentEntitySlim>(c =>
c.Id == 1
&& c.CultureNames == new Dictionary<string, string> { { culture, "value does not matter" } }
&& c.EditedCultures == (edited ? new[] { culture } : Enumerable.Empty<string>())
&& c.Published == published
&& c.PublishedCultures == (published ? new[] { culture } : Enumerable.Empty<string>()));
Assert.AreEqual(expectedResult, ContentStateHelper.GetContentState(entity, culture));
}
[TestCase(false, false)]
[TestCase(false, true)]
[TestCase(true, false)]
[TestCase(true, true)]
public void Culture_Variant_DocumentEntitySlim_Missing_Culture_State(bool edited, bool published)
{
const string culture = "en";
var entity = Mock.Of<IDocumentEntitySlim>(c =>
c.Id == 1
&& c.CultureNames == new Dictionary<string, string> { { culture, "value does not matter" } }
&& c.EditedCultures == (edited ? new[] { culture } : Enumerable.Empty<string>())
&& c.Published == published
&& c.PublishedCultures == (published ? new[] { culture } : Enumerable.Empty<string>()));
Assert.AreEqual(ContentState.NotCreated, ContentStateHelper.GetContentState(entity, "dk"));
}
}