saherelm/xCategoryService
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Category and SubCategory Referencing and Providers ...

Browse Source
This commit is contained in:
saherelm
2026-07-24 01:13:38 +03:30
parent 234f39876b
commit a8e073901f
9 changed files with 543 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controllers/XCategoryProviderControllerBase.cs
+52
View File
@@ -336,6 +336,58 @@ namespace xCategoryService.Controllers
} }
} }
/// <summary>
/// Add Category Item for by It's Locales ...
/// </summary>
/// <param name="item"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
[HttpPost("Resources/AddResource")]
public virtual async Task<ActionResult<XCategoryResourceDto>> AddResource(
[FromBody] XCategoryResourceDto item,
CancellationToken cancellationToken = default
)
{
//
try
{
//
// Validate ...
if (!ModelState.IsValid)
{
XException.InvalidArgs.Throw();
}
await ValidationProvider
.GroupValidationBuilder()
.AddNotNull(item)
.AddNotNull(item.Titles)
.AddNotZeroChilds(item.Titles.Locales)
.ValidateGroupAsync();
//
// Reading Requirements ...
var userInfo = await GetUserInfo();
var connectionId = GetConnectionId();
//
var result = await provider.AddResource(
item: item,
userInfo: userInfo,
connectionId: connectionId,
cancellationToken: cancellationToken
);
//
return Ok(result.ToDynamicObject());
}
catch (Exception ex)
{
//
var result = GetExceptionActionResult(ex);
return result;
}
}
/// <summary> /// <summary>
/// Remove Item for Specified Language ... /// Remove Item for Specified Language ...
/// </summary> /// </summary>
Controllers/XSubCategoryProviderControllerBase.cs
+52
View File
@@ -336,6 +336,58 @@ namespace xCategoryService.Controllers
} }
} }
/// <summary>
/// Add Item by it's Locales and Reference ...
/// </summary>
/// <param name="item"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
[HttpPost("Resources/AddResource")]
public virtual async Task<ActionResult<XSubCategoryResourceDto>> AddResource(
[FromBody] XSubCategoryResourceDto item,
CancellationToken cancellationToken = default
)
{
//
try
{
//
// Validate ...
if (!ModelState.IsValid)
{
XException.InvalidArgs.Throw();
}
await ValidationProvider
.GroupValidationBuilder()
.AddNotNull(item)
.AddNotNull(item.Titles)
.AddNotZeroChilds(item.Titles.Locales)
.ValidateGroupAsync();
//
// Reading Requirements ...
var userInfo = await GetUserInfo();
var connectionId = GetConnectionId();
//
var result = await provider.AddResource(
item: item,
userInfo: userInfo,
connectionId: connectionId,
cancellationToken: cancellationToken
);
//
return Ok(result.ToDynamicObject());
}
catch (Exception ex)
{
//
var result = GetExceptionActionResult(ex);
return result;
}
}
/// <summary> /// <summary>
/// Remove Item for Specified Language ... /// Remove Item for Specified Language ...
/// </summary> /// </summary>
DI/XDIHelperExtension.cs
+9 -9
View File
@@ -75,7 +75,7 @@ namespace xCategoryService.DI
) )
{ {
// //
#region Using Hubs ... #region Using Hubs ...
// //
var pushHelper = new XPushServiceHelper(); var pushHelper = new XPushServiceHelper();
@@ -86,8 +86,8 @@ namespace xCategoryService.DI
// //
// SubCategory ... // SubCategory ...
// pushHelper.AddHub<XSubCategoryDtoHub>("subCategoryDto"); pushHelper.AddHub<XSubCategoryDtoHub>("subCategoryDto");
// pushHelper.AddHub<XSubCategoryEntityHub>("subCategoryEntity"); pushHelper.AddHub<XSubCategoryEntityHub>("subCategoryEntity");
// //
app.UseXPushService(pushHelper); app.UseXPushService(pushHelper);
@@ -108,11 +108,11 @@ namespace xCategoryService.DI
// Using XSubCategory Repository Descriptor ... // Using XSubCategory Repository Descriptor ...
if (!subCategoryDescriptor.IsNull()) if (!subCategoryDescriptor.IsNull())
{ {
// // //
// app.UseXRepository( app.UseXRepository(
// descriptor: subCategoryDescriptor, descriptor: subCategoryDescriptor,
// isDevelopmentEnvironment: isDevelopmentEnvironment isDevelopmentEnvironment: isDevelopmentEnvironment
// ); );
} }
} }
@@ -323,7 +323,7 @@ namespace xCategoryService.DI
// Provider ... // Provider ...
services.Add( services.Add(
new ServiceDescriptor(typeof(IXSubCategoryProvider), typeof(XSubCategoryProvider), lifeTime) new ServiceDescriptor(typeof(IXSubCategoryProvider), typeof(XSubCategoryProvider), lifeTime)
); );
#endregion #endregion
#endregion #endregion
Interfaces/IXCategoryProvider.cs
+15
View File
@@ -56,6 +56,21 @@ namespace xCategoryService.Interfaces
CancellationToken cancellationToken = default CancellationToken cancellationToken = default
); );
/// <summary>
/// Add Item by It's Locales ...
/// </summary>
/// <param name="item"></param>
/// <param name="connectionId"></param>
/// <param name="userInfo"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
Task<XCategoryResourceDto> AddResource(
XCategoryResourceDto item,
string connectionId = null,
XUserClaimsInfoDto userInfo = null,
CancellationToken cancellationToken = default
);
/// <summary> /// <summary>
/// Remove Item for Specified Language ... /// Remove Item for Specified Language ...
/// </summary> /// </summary>
Interfaces/IXCategoryProviderController.cs
+12
View File
@@ -52,6 +52,18 @@ namespace xCategoryService.Interfaces
CancellationToken cancellationToken = default CancellationToken cancellationToken = default
); );
/// <summary>
/// Add Item by It's Locales ...
/// </summary>
/// <param name="item"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
[HttpPost("Resources/AddResource")]
Task<ActionResult<XCategoryResourceDto>> AddResource(
[FromBody] XCategoryResourceDto item,
CancellationToken cancellationToken = default
);
/// <summary> /// <summary>
/// Remove Item for Specified Language ... /// Remove Item for Specified Language ...
/// </summary> /// </summary>
Interfaces/IXSubCategoryProvider.cs
+15
View File
@@ -56,6 +56,21 @@ namespace xCategoryService.Interfaces
CancellationToken cancellationToken = default CancellationToken cancellationToken = default
); );
/// <summary>
/// Add Item by it's Locales and Reference ...
/// </summary>
/// <param name="item"></param>
/// <param name="connectionId"></param>
/// <param name="userInfo"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
Task<XSubCategoryResourceDto> AddResource(
XSubCategoryResourceDto item,
string connectionId = null,
XUserClaimsInfoDto userInfo = null,
CancellationToken cancellationToken = default
);
/// <summary> /// <summary>
/// Remove Item for Specified Language ... /// Remove Item for Specified Language ...
/// </summary> /// </summary>
Interfaces/IXSubCategoryProviderController.cs
+12
View File
@@ -52,6 +52,18 @@ namespace xCategoryService.Interfaces
CancellationToken cancellationToken = default CancellationToken cancellationToken = default
); );
/// <summary>
/// Add Item by it's Locales and Reference ...
/// </summary>
/// <param name="item"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
[HttpPost("Resources/AddResource")]
Task<ActionResult<XSubCategoryResourceDto>> AddResource(
[FromBody] XSubCategoryResourceDto item,
CancellationToken cancellationToken = default
);
/// <summary> /// <summary>
/// Remove Item for Specified Language ... /// Remove Item for Specified Language ...
/// </summary> /// </summary>
Providers/XCategoryProvider.cs
+173
View File
@@ -295,6 +295,179 @@ namespace xCategoryService.Providers
return result; return result;
} }
/// <summary>
/// Add Category by It's Locales ...
/// </summary>
/// <param name="item"></param>
/// <param name="connectionId"></param>
/// <param name="userInfo"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
public async Task<XCategoryResourceDto> AddResource(
XCategoryResourceDto item,
string connectionId = null,
XUserClaimsInfoDto userInfo = null,
CancellationToken cancellationToken = default
)
{
//
// Validate ...
var isValid =
!item.IsNullOrDefault() &&
!item.Titles.IsNullOrDefault() &&
item.Titles.Locales.HasChild() &&
!item.Titles.Locales.Any(il =>
il.Language.IsNullOrEmpty() ||
il.Value.IsNullOrEmpty());
if (!isValid)
{
XException.InvalidArgs.Throw();
}
//
// Normalize ...
if (item.Item.IsNullOrDefault())
{
item.Item = new XCategoryDto();
}
//
// Check Permission ...
isValid = HasPermision(userInfo);
if (!isValid)
{
XException.NotAllowed.Throw();
}
//
var id = -1;
try
{
//
// Add Category for ID Generation ...
item.Item = await base.Add(
item: item.Item,
userInfo: userInfo,
connectionId: null, // Since here We dont want notification ...
cancellationToken: cancellationToken
);
isValid = !item.Item.IsNullOrDefault();
if (!isValid)
{
XException.ActionFailed.Throw();
}
id = item.Item.Id;
//
foreach (var il in item.Titles.Locales)
{
//
var title = il.Value;
var language = il.Language;
//
var descriptionItem =
item.Descriptions.IsNullOrDefault() ||
!item.Descriptions.Locales.HasChild()
? null
: item.Descriptions.Locales
.FirstOrDefault(ides =>
ides.Language
.Equals(
language,
StringComparison.InvariantCultureIgnoreCase));
var description =
descriptionItem.IsNullOrDefault()
? string.Empty
: descriptionItem.Value;
//
// Try to Add Resources ...
var titleResource = await titleResourceProvider
.AddOrUpdateLocale(
identifier: id,
locale: new XLocaleResourceDto
{
Value = title,
Language = language
},
connectionId: connectionId,
cancellationToken: cancellationToken
);
var descriptionResource = await descriptionResourceProvider
.AddOrUpdateLocale(
identifier: id,
locale: new XLocaleResourceDto
{
Value = description,
Language = language
},
connectionId: connectionId,
cancellationToken: cancellationToken
);
//
// Update Category Dto if not ...
if (item.Item.Title.IsNullOrEmpty() ||
!item.Item.Title
.Equals(
titleResource.Resource,
StringComparison.InvariantCultureIgnoreCase)
)
{
//
item.Item.Title = titleResource.Resource;
item.Item.Description = descriptionResource.Resource;
item.Item = await base.Update(
id: id,
item: item.Item,
userInfo: userInfo,
connectionId: null,
cancellationToken: cancellationToken
);
}
}
}
catch
{
XException.InvalidArgs.Throw();
}
//
// Validate Id ...
isValid = id.IsValidIntId();
if (!isValid)
{
XException.ActionFailed.Throw();
}
//
// Retrieve Category Resourv=ce ...
var result = await GetResource(
id: id,
cancellationToken: cancellationToken
);
//
// Sending Push Notification ...
isValid =
isValid &&
!result.IsNullOrDefault();
if (isValid)
{
//
await provider.SendPush(
connectionId: connectionId,
cancellationToken: cancellationToken,
payLoad: result.ToJSON(camelCase: true),
action: XBaseEntityHubAction.Add.GetStringValue()
);
}
//
return result;
}
/// <summary> /// <summary>
/// Remove Item for Specified Language ... /// Remove Item for Specified Language ...
/// </summary> /// </summary>
Providers/XSubCategoryProvider.cs
+203 -2
View File
@@ -135,7 +135,7 @@ namespace xCategoryService.Providers
identifier: id, identifier: id,
cancellationToken: cancellationToken cancellationToken: cancellationToken
); );
var descriptionResource = await titleResourceProvider.GetResource( var descriptionResource = await descriptionResourceProvider.GetResource(
identifier: id, identifier: id,
cancellationToken: cancellationToken cancellationToken: cancellationToken
); );
@@ -307,6 +307,207 @@ namespace xCategoryService.Providers
return result; return result;
} }
/// <summary>
/// Add Item by it's Locales and Reference ...
/// </summary>
/// <param name="item"></param>
/// <param name="connectionId"></param>
/// <param name="userInfo"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
public async Task<XSubCategoryResourceDto> AddResource(
XSubCategoryResourceDto item,
string connectionId = null,
XUserClaimsInfoDto userInfo = null,
CancellationToken cancellationToken = default
)
{
//
// Validate ...
var isValid =
!item.IsNullOrDefault() &&
!item.Titles.IsNullOrDefault() &&
item.Titles.Locales.HasChild() &&
!item.Titles.Locales.Any(tl =>
tl.Value.IsNullOrEmpty() ||
tl.Language.IsNullOrEmpty());
if (!isValid)
{
XException.InvalidArgs.Throw();
}
//
// Normalize ...
if (item.Item.IsNullOrDefault())
{
item.Item = new XSubCategoryDto();
}
//
// Check Permission ...
isValid = HasPermision(userInfo);
if (!isValid)
{
XException.NotAllowed.Throw();
}
//
var id = -1;
try
{
//
// Handle Category Generation ...
if (!item.Category.IsNullOrDefault())
{
//
// Handle Category ...
try
{
// Try to Add Category ...
item.Category = await categoryProvider.Refresh(
resource: item.Category,
userInfo: userInfo,
connectionId: connectionId,
cancellationToken: cancellationToken
);
}
catch { }
}
//
// Add SubCategory for ID Generation ...
item.Item = await base.Add(
item: item.Item,
userInfo: userInfo,
connectionId: null, // Since here We dont want notification ...
cancellationToken: cancellationToken
);
isValid = !item.Item.IsNullOrDefault();
if (!isValid)
{
XException.ActionFailed.Throw();
}
id = item.Item.Id;
//
foreach (var il in item.Titles.Locales)
{
//
var title = il.Value;
var language = il.Language;
//
var descriptionItem =
item.Descriptions.IsNullOrDefault() ||
!item.Descriptions.Locales.HasChild()
? null
: item.Descriptions.Locales
.FirstOrDefault(ides =>
ides.Language
.Equals(
language,
StringComparison.InvariantCultureIgnoreCase));
var description =
descriptionItem.IsNullOrDefault()
? string.Empty
: descriptionItem.Value;
//
// Try to Add Resources ...
var titleResource = await titleResourceProvider
.AddOrUpdateLocale(
identifier: id,
locale: new XLocaleResourceDto
{
Value = title,
Language = language
},
connectionId: connectionId,
cancellationToken: cancellationToken
);
var descriptionResource = await descriptionResourceProvider
.AddOrUpdateLocale(
identifier: id,
locale: new XLocaleResourceDto
{
Value = description,
Language = language
},
connectionId: connectionId,
cancellationToken: cancellationToken
);
//
// Update Category Dto if not ...
if (item.Item.Title.IsNullOrEmpty() ||
!item.Item.Title
.Equals(
titleResource.Resource,
StringComparison.InvariantCultureIgnoreCase)
)
{
//
item.Item.Title = titleResource.Resource;
item.Item.Description = descriptionResource.Resource;
item.Item = await base.Update(
id: id,
item: item.Item,
userInfo: userInfo,
connectionId: null,
cancellationToken: cancellationToken
);
}
}
}
catch
{
XException.InvalidArgs.Throw();
}
//
// Validate Id ...
isValid = id.IsValidIntId();
if (!isValid)
{
XException.ActionFailed.Throw();
}
//
// Add Resource Reference to Category ...
isValid = await categoryProvider.AddReference(
providedForId: id,
connectionId: null,
model: item.Category.Item,
cancellationToken: cancellationToken
);
//
// Retrieve Category Resourv=ce ...
var result = await GetResource(
id: id,
cancellationToken: cancellationToken
);
//
// Sending Push Notification ...
isValid =
isValid &&
!result.IsNullOrDefault();
if (isValid)
{
//
await provider.SendPush(
connectionId: connectionId,
cancellationToken: cancellationToken,
payLoad: result.ToJSON(camelCase: true),
action: XBaseEntityHubAction.Add.GetStringValue()
);
}
//
return result;
}
/// <summary> /// <summary>
/// Remove Item for Specified Language ... /// Remove Item for Specified Language ...
/// </summary> /// </summary>
@@ -867,7 +1068,7 @@ namespace xCategoryService.Providers
// //
// Descriptions ... // Descriptions ...
var updateDescriptions = result.Descriptions.Locales.Where( var updateDescriptions = result.Descriptions.Locales.Where(
l => resource.Descriptions.Locales.Any(r => l => resource.Descriptions.Locales.Any(r =>
r.Value r.Value
.Equals(l.Value, StringComparison.InvariantCultureIgnoreCase) && .Equals(l.Value, StringComparison.InvariantCultureIgnoreCase) &&
r.Language r.Language