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

Merge pull request #2534 from umbraco/temp-U4-11122

Browse Source 
U4-11122 - Update DB and Service/Repo layer to handle language changes: mandatory, default
This commit is contained in:
Claus
2018-03-22 15:18:15 +01:00
committed by GitHub
parent 730c4eaf2d 01b48a5aab
commit e6010fcd1e
11 changed files with 150 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/LanguageColumns.cs Normal file
View File

@@ -0,0 +1,15 @@
namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
{
public class LanguageColumns : MigrationBase
{
protected LanguageColumns(IMigrationContext context) : base(context)
{
}
public override void Migrate()
{
Create.Column("isDefaultVariantLang").OnTable(Constants.DatabaseSchema.Tables.Language).AsBoolean().NotNullable();
Create.Column("mandatory").OnTable(Constants.DatabaseSchema.Tables.Language).AsBoolean().NotNullable();
}
}
}

1
src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/SuperZero.cs
View File

@@ -1,5 +1,6 @@
namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
{
public class SuperZero : MigrationBase
{
public SuperZero(IMigrationContext context)

10
src/Umbraco.Core/Models/ILanguage.cs
View File

@@ -23,5 +23,15 @@ namespace Umbraco.Core.Models
/// </summary>
[IgnoreDataMember]
CultureInfo CultureInfo { get; }
/// <summary>
/// Defines if this language is the default variant language when language variants are in use
/// </summary>
bool IsDefaultVariantLanguage { get; set; }
/// <summary>
/// If true, a variant node cannot be published unless this language variant is created
/// </summary>
bool Mandatory { get; set; }
}
}

16
src/Umbraco.Core/Models/Language.cs
View File

@@ -17,6 +17,8 @@ namespace Umbraco.Core.Models
private string _isoCode;
private string _cultureName;
private bool _isDefaultVariantLanguage;
private bool _mandatory;
public Language(string isoCode)
{
@@ -28,6 +30,8 @@ namespace Umbraco.Core.Models
{
public readonly PropertyInfo IsoCodeSelector = ExpressionHelper.GetPropertyInfo<Language, string>(x => x.IsoCode);
public readonly PropertyInfo CultureNameSelector = ExpressionHelper.GetPropertyInfo<Language, string>(x => x.CultureName);
public readonly PropertyInfo IsDefaultVariantLanguageSelector = ExpressionHelper.GetPropertyInfo<Language, bool>(x => x.IsDefaultVariantLanguage);
public readonly PropertyInfo MandatorySelector = ExpressionHelper.GetPropertyInfo<Language, bool>(x => x.Mandatory);
}
/// <summary>
@@ -55,5 +59,17 @@ namespace Umbraco.Core.Models
/// </summary>
[IgnoreDataMember]
public CultureInfo CultureInfo => CultureInfo.GetCultureInfo(IsoCode);
public bool IsDefaultVariantLanguage
{
get => _isDefaultVariantLanguage;
set => SetPropertyValueAndDetectChanges(value, ref _isDefaultVariantLanguage, Ps.Value.IsDefaultVariantLanguageSelector);
}
public bool Mandatory
{
get => _mandatory;
set => SetPropertyValueAndDetectChanges(value, ref _mandatory, Ps.Value.MandatorySelector);
}
}
}

12
src/Umbraco.Core/Persistence/Dtos/LanguageDto.cs
View File

@@ -22,5 +22,17 @@ namespace Umbraco.Core.Persistence.Dtos
[NullSetting(NullSetting = NullSettings.Null)]
[Length(100)]
public string CultureName { get; set; }
/// <summary>
/// Defines if this language is the default variant language when language variants are in use
/// </summary>
[Column("isDefaultVariantLang")]
public bool IsDefaultVariantLanguage { get; set; }
/// <summary>
/// If true, a variant node cannot be published unless this language variant is created
/// </summary>
[Column("mandatory")]
public bool Mandatory { get; set; }
}
}

4
src/Umbraco.Core/Persistence/Factories/LanguageFactory.cs
View File

@@ -8,7 +8,7 @@ namespace Umbraco.Core.Persistence.Factories
{
public ILanguage BuildEntity(LanguageDto dto)
{
var lang = new Language(dto.IsoCode) { CultureName = dto.CultureName, Id = dto.Id };
var lang = new Language(dto.IsoCode) { CultureName = dto.CultureName, Id = dto.Id, IsDefaultVariantLanguage = dto.IsDefaultVariantLanguage, Mandatory = dto.Mandatory };
// reset dirty initial properties (U4-1946)
lang.ResetDirtyProperties(false);
return lang;
@@ -16,7 +16,7 @@ namespace Umbraco.Core.Persistence.Factories
public LanguageDto BuildDto(ILanguage entity)
{
var dto = new LanguageDto { CultureName = entity.CultureName, IsoCode = entity.IsoCode };
var dto = new LanguageDto { CultureName = entity.CultureName, IsoCode = entity.IsoCode, IsDefaultVariantLanguage = entity.IsDefaultVariantLanguage, Mandatory = entity.Mandatory };
if (entity.HasIdentity)
dto.Id = short.Parse(entity.Id.ToString(CultureInfo.InvariantCulture));

17
src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
View File

@@ -107,6 +107,14 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
{
((EntityBase)entity).AddingEntity();
if (entity.IsDefaultVariantLanguage)
{
//if this entity is flagged as the default, we need to set all others to false
Database.Execute($"UPDATE {SqlSyntax.GetQuotedColumnName(Constants.DatabaseSchema.Tables.Language)} SET {SqlSyntax.GetQuotedColumnName("isDefaultVariantLang")} = 0");
//We need to clear the whole cache since all languages will be updated
IsolatedCache.ClearAllCache();
}
var factory = new LanguageFactory();
var dto = factory.BuildDto(entity);
@@ -114,12 +122,21 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
entity.Id = id;
entity.ResetDirtyProperties();
}
protected override void PersistUpdatedItem(ILanguage entity)
{
((EntityBase)entity).UpdatingEntity();
if (entity.IsDefaultVariantLanguage)
{
//if this entity is flagged as the default, we need to set all others to false
Database.Execute($"UPDATE {SqlSyntax.GetQuotedColumnName(Constants.DatabaseSchema.Tables.Language)} SET {SqlSyntax.GetQuotedColumnName("isDefaultVariantLang")} = 0");
//We need to clear the whole cache since all languages will be updated
IsolatedCache.ClearAllCache();
}
var factory = new LanguageFactory();
var dto = factory.BuildDto(entity);

2
src/Umbraco.Core/Services/Implement/LocalizationService.cs
View File

@@ -411,7 +411,7 @@ namespace Umbraco.Core.Services.Implement
}
}
#region Event Handlers
#region Events
/// <summary>
/// Occurs before Delete
/// </summary>

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -315,6 +315,7 @@
<Compile Include="KeyValuePairExtensions.cs" />
<Compile Include="Migrations\MigrationBase_Extra.cs" />
<Compile Include="Migrations\Upgrade\V_8_0_0\DataTypeMigration.cs" />
<Compile Include="Migrations\Upgrade\V_8_0_0\LanguageColumns.cs" />
<Compile Include="Migrations\Upgrade\V_8_0_0\PropertyEditorsMigration.cs" />
<Compile Include="Migrations\Upgrade\V_8_0_0\SuperZero.cs" />
<Compile Include="Migrations\Upgrade\V_8_0_0\TagsMigration.cs" />

53
src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
View File

@@ -219,6 +219,59 @@ namespace Umbraco.Tests.Persistence.Repositories
// Assert
Assert.That(languageBR.HasIdentity, Is.True);
Assert.That(languageBR.Id, Is.EqualTo(6)); //With 5 existing entries the Id should be 6
Assert.IsFalse(languageBR.IsDefaultVariantLanguage);
Assert.IsFalse(languageBR.Mandatory);
}
}
[Test]
public void Can_Perform_Add_On_LanguageRepository_With_Boolean_Properties()
{
// Arrange
var provider = TestObjects.GetScopeProvider(Logger);
using (var scope = provider.CreateScope())
{
var repository = CreateRepository(provider);
// Act
var languageBR = new Language("pt-BR") { CultureName = "pt-BR", IsDefaultVariantLanguage = true, Mandatory = true };
repository.Save(languageBR);
// Assert
Assert.That(languageBR.HasIdentity, Is.True);
Assert.That(languageBR.Id, Is.EqualTo(6)); //With 5 existing entries the Id should be 6
Assert.IsTrue(languageBR.IsDefaultVariantLanguage);
Assert.IsTrue(languageBR.Mandatory);
}
}
[Test]
public void Can_Perform_Add_On_LanguageRepository_With_New_Deafult()
{
// Arrange
var provider = TestObjects.GetScopeProvider(Logger);
using (var scope = provider.CreateScope())
{
var repository = CreateRepository(provider);
var languageBR = (ILanguage)new Language("pt-BR") { CultureName = "pt-BR", IsDefaultVariantLanguage = true, Mandatory = true };
repository.Save(languageBR);
var languageEN = new Language("en-AU") { CultureName = "en-AU" };
repository.Save(languageEN);
Assert.IsTrue(languageBR.IsDefaultVariantLanguage);
Assert.IsTrue(languageBR.Mandatory);
// Act
var languageNZ = new Language("en-NZ") { CultureName = "en-NZ", IsDefaultVariantLanguage = true, Mandatory = true };
repository.Save(languageNZ);
languageBR = repository.Get(languageBR.Id);
// Assert
Assert.IsFalse(languageBR.IsDefaultVariantLanguage);
Assert.IsTrue(languageNZ.IsDefaultVariantLanguage);
}
}

22
src/Umbraco.Tests/Services/LocalizationServiceTests.cs
View File

@@ -364,6 +364,28 @@ namespace Umbraco.Tests.Services
Assert.NotNull(result);
}
[Test]
public void Set_Default_Language()
{
var localizationService = ServiceContext.LocalizationService;
var language = new Core.Models.Language("en-AU");
language.IsDefaultVariantLanguage = true;
localizationService.Save(language);
var result = localizationService.GetLanguageById(language.Id);
Assert.IsTrue(result.IsDefaultVariantLanguage);
var language2 = new Core.Models.Language("en-NZ");
language2.IsDefaultVariantLanguage = true;
localizationService.Save(language2);
var result2 = localizationService.GetLanguageById(language2.Id);
//re-get
result = localizationService.GetLanguageById(language.Id);
Assert.IsTrue(result2.IsDefaultVariantLanguage);
Assert.IsFalse(result.IsDefaultVariantLanguage);
}
[Test]
public void Deleted_Language_Should_Not_Exist()
{