AppStd/DigitalData.Core
Template
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Cookie-basierte Lokalisierung implementiert, ToLocal Erweiterungsmethoden hinzugefügt und Translation-Service entfernt. Stattdessen wird IStringLocalizer<T> verwendet, abhängig von der Situation wie Cookie-basierter Kultur oder Kultur basierend auf der Route.

Browse Source
This commit is contained in:
Developer 02
2024-04-29 13:31:37 +02:00
parent 1281d37239
commit 8188fa759f
15 changed files with 148 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DigitalData.Core.Application/BasicCRUDService.cs
View File

@@ -1,7 +1,8 @@
using AutoMapper;
using DigitalData.Core.Contracts.Application;
using DigitalData.Core.Contracts.Infrastructure;
using DigitalData.Core.Contracts.CultureServices;
using Microsoft.Extensions.Localization;
namespace DigitalData.Core.Application
{
@@ -28,8 +29,8 @@ namespace DigitalData.Core.Application
/// <param name="repository">The CRUD repository for accessing and manipulating entity data.</param>
/// <param name="translationService">The service used for key-based text translations, facilitating localization.</param>
/// <param name="mapper">The AutoMapper instance for mapping between DTOs and entities.</param>
public BasicCRUDService(TCRUDRepository repository, IKeyTranslationService translationService, IMapper mapper) :
base(repository, translationService, mapper)
public BasicCRUDService(TCRUDRepository repository, IStringLocalizer defaultLocalizer, IMapper mapper) :
base(repository, defaultLocalizer, mapper)
{
}
}

14
DigitalData.Core.Application/CRUDService.cs
View File

@@ -1,9 +1,9 @@
using DigitalData.Core.Contracts.Application;
using DigitalData.Core.Contracts.Infrastructure;
using DigitalData.Core.Contracts.CultureServices;
using AutoMapper;
using System.Reflection;
using System.ComponentModel.DataAnnotations;
using Microsoft.Extensions.Localization;
namespace DigitalData.Core.Application
{
@@ -28,7 +28,7 @@ namespace DigitalData.Core.Application
/// <param name="repository">The CRUD repository for accessing the database.</param>
/// <param name="translationService">The service for translating messages based on culture.</param>
/// <param name="mapper">The AutoMapper instance for mapping between DTOs and entity objects.</param>
public CRUDService(TCRUDRepository repository, IKeyTranslationService translationService, IMapper mapper) : base(translationService)
public CRUDService(TCRUDRepository repository, IStringLocalizer defaultLocalizer, IMapper mapper) : base(defaultLocalizer)
{
_repository = repository;
_mapper = mapper;
@@ -62,7 +62,7 @@ namespace DigitalData.Core.Application
var entity = await _repository.ReadByIdAsync(id);
if (entity is null)
{
var translatedMessage = _translationService.Translate(MessageKey.EntityDoesNotExist);
var translatedMessage = MessageKey.EntityDoesNotExist.LocalizedBy(_localizer);
return Failed<TReadDto>();
}
else
@@ -93,7 +93,7 @@ namespace DigitalData.Core.Application
return Successful();
else
{
var translatedMessage = _translationService.Translate(MessageKey.UpdateFailed);
var translatedMessage = MessageKey.UpdateFailed.LocalizedBy(_localizer);
return Failed();
}
}
@@ -109,8 +109,8 @@ namespace DigitalData.Core.Application
if (entity is null)
{
var deletionFailedMessage = _translationService.Translate(MessageKey.DeletionFailed);
var entityDoesNotExistMessage = _translationService.Translate(MessageKey.EntityDoesNotExist);
var deletionFailedMessage = MessageKey.DeletionFailed.LocalizedBy(_localizer);
var entityDoesNotExistMessage = MessageKey.EntityDoesNotExist.LocalizedBy(_localizer);
return new ServiceMessage(isSuccess: false, deletionFailedMessage, entityDoesNotExistMessage);
}
@@ -120,7 +120,7 @@ namespace DigitalData.Core.Application
return Successful();
else
{
var deletionFailedMessage = _translationService.Translate(MessageKey.DeletionFailed);
var deletionFailedMessage = MessageKey.DeletionFailed.LocalizedBy(_localizer);
return Failed(deletionFailedMessage);
}
}

1
DigitalData.Core.Application/DigitalData.Core.Application.csproj
View File

@@ -10,6 +10,7 @@
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />

4
DigitalData.Core.Application/DirectorySearchService.cs
View File

@@ -5,7 +5,7 @@ using System.DirectoryServices;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Configuration;
using System.DirectoryServices.AccountManagement;
using DigitalData.Core.Contracts.CultureServices;
using Microsoft.Extensions.Localization;
namespace DigitalData.Core.Application
{
@@ -19,7 +19,7 @@ namespace DigitalData.Core.Application
private readonly DateTimeOffset _userCacheExpiration;
public Dictionary<string, string> CustomSearchFilters { get; }
public DirectorySearchService(IConfiguration configuration, ILogger<DirectorySearchService> logger, IMemoryCache memoryCache, IKeyTranslationService translationService) : base(translationService)
public DirectorySearchService(IConfiguration configuration, ILogger<DirectorySearchService> logger, IMemoryCache memoryCache, IStringLocalizer defaultLocalizer) : base(defaultLocalizer)
{
_memoryCache = memoryCache;

15
DigitalData.Core.Application/ResponseService.cs
View File

@@ -1,16 +1,15 @@
using DigitalData.Core.Contracts.Application;
using DigitalData.Core.Contracts.CultureServices;
using static System.Runtime.InteropServices.JavaScript.JSType;
using Microsoft.Extensions.Localization;
namespace DigitalData.Core.Application
{
public class ResponseService : IResponseService
{
protected readonly IKeyTranslationService _translationService;
protected readonly IStringLocalizer _localizer;
public ResponseService(IKeyTranslationService translationService)
public ResponseService(IStringLocalizer defaultLocalizer)
{
_translationService = translationService;
_localizer = defaultLocalizer;
}
#region WITHOUT_MESSAGE
@@ -22,8 +21,7 @@ namespace DigitalData.Core.Application
/// <returns>A service message reflecting the operation outcome.</returns>
public IServiceMessage CreateMessage(bool isSuccess = false) => new ServiceMessage()
{
IsSuccess = isSuccess,
KeyTranslator = _translationService.Translate
IsSuccess = isSuccess
};
/// <summary>
@@ -36,8 +34,7 @@ namespace DigitalData.Core.Application
public IServiceResult<T> CreateResult<T>(T? data = default, bool isSuccess = false) => new ServiceResult<T>()
{
IsSuccess = isSuccess,
Data = data,
KeyTranslator = _translationService.Translate
Data = data
};
/// <summary>

4
DigitalData.Core.Application/ServiceBase.cs
View File

@@ -1,6 +1,6 @@
using AutoMapper;
using DigitalData.Core.Contracts.Application;
using DigitalData.Core.Contracts.CultureServices;
using Microsoft.Extensions.Localization;
namespace DigitalData.Core.Application
{
@@ -9,7 +9,7 @@ namespace DigitalData.Core.Application
/// </summary>
public class ServiceBase : ResponseService, IServiceBase, IResponseService
{
public ServiceBase(IKeyTranslationService translationService) : base(translationService)
public ServiceBase(IStringLocalizer defaultLocalizer) : base(defaultLocalizer)
{
}
}

7
DigitalData.Core.Application/ServiceMessage.cs
View File

@@ -110,13 +110,6 @@ namespace DigitalData.Core.Application
[JsonIgnore]
public ICollection<string> CriticalMessages { get; init; } = new List<string>();
/// <summary>
/// A function that translates a message key from a string to its localized or transformed representation.
/// This property allows for custom translation logic to be applied based on the application's needs.
/// </summary>
[JsonIgnore]
public Func<string, string> KeyTranslator { get; init; } = key => key;
/// <summary>
/// Adds a new message to the collection of messages associated with the service operation.
/// </summary>

91
DigitalData.Core.Application/ServiceMessageExtensions.cs
View File

@@ -1,4 +1,5 @@
using DigitalData.Core.Contracts.Application;
using Microsoft.Extensions.Localization;
namespace DigitalData.Core.Application
{
@@ -47,6 +48,24 @@ namespace DigitalData.Core.Application
public static bool HasSecurityBreachOrDataIntegrityFlag(this IServiceMessage serviceMessage) => serviceMessage.HasFlag(Flag.SecurityBreachOrDataIntegrity);
#endregion
#region StringLocalizer
/// <summary>
/// Retrieves the localized string for the specified key.
/// </summary>
/// <param name="key">The key for the localized string.</param>
/// <param name="localizer">The localizer to use for retrieving the localized string.</param>
/// <returns>The localized string associated with the specified key.</returns>
public static string LocalizedBy(this string key, IStringLocalizer localizer) => localizer[key];
/// <summary>
/// Retrieves the localized string for the specified enumeration key.
/// </summary>
/// <param name="key">The enumeration key for the localized string.</param>
/// <param name="localizer">The localizer to use for retrieving the localized string.</param>
/// <returns>The localized string associated with the specified enumeration key.</returns>
public static string LocalizedBy(this Enum key, IStringLocalizer localizer) => localizer[key.ToString()];
#endregion
#region ClientMessage
/// <summary>
/// Adds a single client message to the service message.
@@ -59,18 +78,6 @@ namespace DigitalData.Core.Application
serviceMessage.ClientMessages.Add(message);
return serviceMessage;
}
/// <summary>
/// Adds a client message based on an enumeration key to the service message.
/// </summary>
/// <param name="serviceMessage">The service message to modify.</param>
/// <param name="messageKey">The enum key representing the message.</param>
/// <returns>The modified service message instance.</returns>
public static T WithClientMessageKey<T>(this T serviceMessage, Enum messageKey) where T : IServiceMessage
{
var message = serviceMessage.KeyTranslator(messageKey.ToString());
return serviceMessage.WithClientMessage(message);
}
#endregion
#region TraceMessages
@@ -85,18 +92,6 @@ namespace DigitalData.Core.Application
serviceMessage.TraceMessages.Add(message);
return serviceMessage;
}
/// <summary>
/// Adds a trace message based on an enumeration key to the service message.
/// </summary>
/// <param name="serviceMessage">The service message to modify.</param>
/// <param name="messageKey">The enum key representing the trace message.</param>
/// <returns>The modified service message instance.</returns>
public static T WithTraceMessageKey<T>(this T serviceMessage, Enum messageKey) where T : IServiceMessage
{
var message = serviceMessage.KeyTranslator(messageKey.ToString());
return serviceMessage.WithTraceMessage(message);
}
#endregion
#region DebugMessages
@@ -111,18 +106,6 @@ namespace DigitalData.Core.Application
serviceMessage.DebugMessages.Add(message);
return serviceMessage;
}
/// <summary>
/// Adds a debug message based on an enumeration key to the service message.
/// </summary>
/// <param name="serviceMessage">The service message to modify.</param>
/// <param name="messageKey">The enum key representing the debug message.</param>
/// <returns>The modified service message instance.</returns>
public static T WithDebugMessageKey<T>(this T serviceMessage, Enum messageKey) where T : IServiceMessage
{
var message = serviceMessage.KeyTranslator(messageKey.ToString());
return serviceMessage.WithDebugMessage(message);
}
#endregion
#region WarningMessages
@@ -137,18 +120,6 @@ namespace DigitalData.Core.Application
serviceMessage.WarningMessages.Add(message);
return serviceMessage;
}
/// <summary>
/// Adds a warning message based on an enumeration key to the service message.
/// </summary>
/// <param name="serviceMessage">The service message to modify.</param>
/// <param name="messageKey">The enum key representing the warning message.</param>
/// <returns>The modified service message instance.</returns>
public static T WithWarningMessageKey<T>(this T serviceMessage, Enum messageKey) where T : IServiceMessage
{
var message = serviceMessage.KeyTranslator(messageKey.ToString());
return serviceMessage.WithWarningMessage(message);
}
#endregion
#region ErrorMessages
@@ -163,18 +134,6 @@ namespace DigitalData.Core.Application
serviceMessage.ErrorMessages.Add(message);
return serviceMessage;
}
/// <summary>
/// Adds an error message based on an enumeration key to the service message.
/// </summary>
/// <param name="serviceMessage">The service message to modify.</param>
/// <param name="messageKey">The enum key representing the error message.</param>
/// <returns>The modified service message instance.</returns>
public static T WithErrorMessageKey<T>(this T serviceMessage, Enum messageKey) where T : IServiceMessage
{
var message = serviceMessage.KeyTranslator(messageKey.ToString());
return serviceMessage.WithErrorMessage(message);
}
#endregion
#region CriticalMessages
@@ -189,18 +148,6 @@ namespace DigitalData.Core.Application
serviceMessage.CriticalMessages.Add(message);
return serviceMessage;
}
/// <summary>
/// Adds a critical message based on an enumeration key to the service message.
/// </summary>
/// <param name="serviceMessage">The service message to modify.</param>
/// <param name="messageKey">The enum key representing the critical message.</param>
/// <returns>The modified service message instance.</returns>
public static T WithCriticalMessageKey<T>(this T serviceMessage, Enum messageKey) where T : IServiceMessage
{
var message = serviceMessage.KeyTranslator(messageKey.ToString());
return serviceMessage.WithCriticalMessage(message);
}
#endregion
}
}

4
DigitalData.Core.Application/obj/DigitalData.Core.Application.csproj.nuget.dgspec.json
View File

@@ -66,6 +66,10 @@
"target": "Package",
"version": "[7.0.0, )"
},
"Microsoft.Extensions.Localization.Abstractions": {
"target": "Package",
"version": "[7.0.16, )"
},
"Microsoft.Extensions.Logging": {
"target": "Package",
"version": "[7.0.0, )"

37
DigitalData.Core.Application/obj/project.assets.json
View File

@@ -153,6 +153,19 @@
"buildTransitive/net6.0/_._": {}
}
},
"Microsoft.Extensions.Localization.Abstractions/7.0.16": {
"type": "package",
"compile": {
"lib/net7.0/Microsoft.Extensions.Localization.Abstractions.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net7.0/Microsoft.Extensions.Localization.Abstractions.dll": {
"related": ".xml"
}
}
},
"Microsoft.Extensions.Logging/7.0.0": {
"type": "package",
"dependencies": {
@@ -807,6 +820,25 @@
"useSharedDesignerContext.txt"
]
},
"Microsoft.Extensions.Localization.Abstractions/7.0.16": {
"sha512": "wUwfDVcOMRUZv+zX45Vyh/MkXpdOy7nIvRRf3n2iiYoh76M0Dr/wx8Ppxk3v9H556z2e0QwLVQqqkd+oj+CGRQ==",
"type": "package",
"path": "microsoft.extensions.localization.abstractions/7.0.16",
"files": [
".nupkg.metadata",
".signature.p7s",
"Icon.png",
"THIRD-PARTY-NOTICES.TXT",
"lib/net462/Microsoft.Extensions.Localization.Abstractions.dll",
"lib/net462/Microsoft.Extensions.Localization.Abstractions.xml",
"lib/net7.0/Microsoft.Extensions.Localization.Abstractions.dll",
"lib/net7.0/Microsoft.Extensions.Localization.Abstractions.xml",
"lib/netstandard2.0/Microsoft.Extensions.Localization.Abstractions.dll",
"lib/netstandard2.0/Microsoft.Extensions.Localization.Abstractions.xml",
"microsoft.extensions.localization.abstractions.7.0.16.nupkg.sha512",
"microsoft.extensions.localization.abstractions.nuspec"
]
},
"Microsoft.Extensions.Logging/7.0.0": {
"sha512": "Nw2muoNrOG5U5qa2ZekXwudUn2BJcD41e65zwmDHb1fQegTX66UokLWZkJRpqSSHXDOWZ5V0iqhbxOEky91atA==",
"type": "package",
@@ -1496,6 +1528,7 @@
"AutoMapper >= 13.0.1",
"Microsoft.Extensions.Caching.Abstractions >= 7.0.0",
"Microsoft.Extensions.Configuration >= 7.0.0",
"Microsoft.Extensions.Localization.Abstractions >= 7.0.16",
"Microsoft.Extensions.Logging >= 7.0.0",
"System.DirectoryServices.AccountManagement >= 7.0.1",
"System.IdentityModel.Tokens.Jwt >= 7.5.1",
@@ -1569,6 +1602,10 @@
"target": "Package",
"version": "[7.0.0, )"
},
"Microsoft.Extensions.Localization.Abstractions": {
"target": "Package",
"version": "[7.0.16, )"
},
"Microsoft.Extensions.Logging": {
"target": "Package",
"version": "[7.0.0, )"