last ...

Configuration/Entities/XContentEntityConfiguration.cs

@@ -1,9 +1,9 @@
 using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using xContentService.Constants;
-using xContentService.Models.Entities;
 using xDataService.Providers;
+using xContentService.Constants;
+using Microsoft.EntityFrameworkCore;
+using xContentService.Models.Entities;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace xContentService.Configuration.Entities
 {

Controllers/XContentRepositoryControllerBase.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Linq;
+using xCommons.Providers;
+using xCommons.Configurations;
+using xDataService.Interfaces;
+using xDataService.Controllers;
+using Microsoft.Extensions.Logging;
+using xContentService.Models.Entities;
+using Microsoft.EntityFrameworkCore.Query;
+using xContentService.Interfaces.Entities;
+
+namespace xContentService.Controllers
+{
+    public abstract class XContentRepositoryControllerBase : XBaseRepositoryController<XContent, Guid>, IXBaseRepositoryController<XContent, Guid>
+    {
+        protected XContentRepositoryControllerBase(
+            ILogger<XContentRepositoryControllerBase> logger, 
+            XAppConfiguration appConfiguration, 
+            XValidationProvider validationProvider, 
+            IXContentRepository repository, 
+            Func<IQueryable<XContent>, IOrderedQueryable<XContent>> defaultOrderBuilder = null, 
+            Func<IQueryable<XContent>, IIncludableQueryable<XContent, object>> defaultIncludeBuilder = null
+        ) : base(
+            logger, 
+            appConfiguration, 
+            validationProvider, 
+            repository, 
+            defaultOrderBuilder, 
+            defaultIncludeBuilder
+        )
+        { }
+    }
+}

Controllers/XContentRepositoryProviderControllerBase.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Linq;
+using xCommons.Providers;
+using xPushService.Interfaces;
+using xCommons.Configurations;
+using xPushService.Controllers;
+using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
+using xContentService.Models.Entities;
+using xContentService.Providers.Entities;
+using Microsoft.EntityFrameworkCore.Query;
+using xContentService.Interfaces.Entities;
+
+namespace xContentService.Controllers
+{
+    public abstract class XContentRepositoryProviderControllerBase : XBaseRepositoryProviderController<XContent, Guid, XContentEntityHub>, IXBaseRepositoryProviderController<XContent, Guid, XContentEntityHub>
+    {
+        protected XContentRepositoryProviderControllerBase(
+            ILogger<XContentRepositoryProviderControllerBase> logger,
+            XAppConfiguration appConfiguration,
+            IXIdentityProvider identityProvider,
+            XValidationProvider validationProvider,
+            IXContentRepositoryProvider provider,
+            Func<IQueryable<XContent>, IOrderedQueryable<XContent>> defaultOrderBuilder = null, Func<IQueryable<XContent>, IIncludableQueryable<XContent, object>> defaultIncludeBuilder = null
+        ) : base(
+            logger,
+            appConfiguration,
+            identityProvider,
+            validationProvider,
+            provider,
+            defaultOrderBuilder,
+            defaultIncludeBuilder
+        )
+        { }
+    }
+}

Controllers/XContentServiceControllerBase.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Linq;
+using xCommons.Providers;
+using xCommons.Configurations;
+using xDataService.Interfaces;
+using xDataService.Controllers;
+using xContentService.Models.Dtos;
+using Microsoft.Extensions.Logging;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Dtos;
+using Microsoft.EntityFrameworkCore.Query;
+
+namespace xContentService.Controllers
+{
+    public abstract class XContentServiceControllerBase : XBaseServiceController<XContent, XContentDto, Guid>, IXBaseServiceController<XContent, XContentDto, Guid>
+    {
+        protected XContentServiceControllerBase(
+            ILogger<XContentServiceControllerBase> logger,
+            XAppConfiguration appConfiguration,
+            XValidationProvider validationProvider,
+            IXContentRepositoryService repositoryService,
+            Func<IQueryable<XContent>, IOrderedQueryable<XContent>> defaultOrderBuilder = null,
+            Func<IQueryable<XContent>, IIncludableQueryable<XContent, object>> defaultIncludeBuilder = null
+        ) : base(
+            logger,
+            appConfiguration,
+            validationProvider,
+            repositoryService,
+            defaultOrderBuilder,
+            defaultIncludeBuilder
+        )
+        { }
+    }
+}

Controllers/XContentServiceProviderControllerBase.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Linq;
+using xCommons.Providers;
+using xCommons.Configurations;
+using xPushService.Interfaces;
+using xPushService.Controllers;
+using xContentService.Models.Dtos;
+using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
+using xContentService.Providers.Dtos;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Dtos;
+using Microsoft.EntityFrameworkCore.Query;
+
+namespace xContentService.Controllers
+{
+    public abstract class XContentServiceProviderControllerBase : XBaseServiceProviderController<XContent, XContentDto, Guid, XContentDtoHub>, IXBaseServiceProviderController<XContent, XContentDto, Guid, XContentDtoHub>
+    {
+        protected XContentServiceProviderControllerBase(
+            ILogger<XContentServiceProviderControllerBase> logger, 
+            XAppConfiguration appConfiguration, 
+            IXIdentityProvider identityProvider, 
+            XValidationProvider validationProvider, 
+            IXContentServiceProvider provider, 
+            Func<IQueryable<XContent>, IOrderedQueryable<XContent>> defaultOrderBuilder = null, 
+            Func<IQueryable<XContent>, IIncludableQueryable<XContent, object>> defaultIncludeBuilder = null
+        ) : base(
+            logger, 
+            appConfiguration, 
+            identityProvider, 
+            validationProvider, 
+            provider, 
+            defaultOrderBuilder, 
+            defaultIncludeBuilder
+        )
+        { }
+    }
+}

Controllers/XControllerProviderControllerBase.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Linq;
+using System.Threading;
+using xCommons.Providers;
+using xCommons.Extensions;
+using xExceptions.Constants;
+using System.Threading.Tasks;
+using xCommons.Configurations;
+using xTagService.Controllers;
+using Microsoft.AspNetCore.Mvc;
+using xContentService.Interfaces;
+using xContentService.Models.Dtos;
+using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
+using xContentService.Providers.Dtos;
+using xContentService.Models.Entities;
+using Microsoft.EntityFrameworkCore.Query;
+using xContentService.Interfaces.Controllers;
+
+namespace xContentService.Controllers
+{
+    public abstract class XContentProviderControllerBase : XBaseProvidedHasTagControllerBase<XContent, XContentDto, Guid, XContentDtoHub>, IXContentProviderController
+    {
+        private readonly IXContentProvider provider;
+
+        protected XContentProviderControllerBase(
+            ILogger<XBaseProvidedHasTagControllerBase<XContent, XContentDto, Guid, XContentDtoHub>> logger,
+            XAppConfiguration appConfiguration,
+            IXIdentityProvider identityProvider,
+            XValidationProvider validationProvider,
+            IXContentProvider provider,
+            IXContentTagProvided tagProvided,
+            Func<IQueryable<XContent>, IOrderedQueryable<XContent>> defaultOrderBuilder = null,
+            Func<IQueryable<XContent>, IIncludableQueryable<XContent, object>> defaultIncludeBuilder = null
+        ) : base(
+            logger,
+            appConfiguration,
+            identityProvider,
+            validationProvider,
+            provider,
+            tagProvided,
+            defaultOrderBuilder,
+            defaultIncludeBuilder
+        )
+        {
+            this.provider = provider;
+        }
+
+        /// <summary>
+        /// Add an item ...
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="language"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        [HttpPost("Add")]
+        public async Task<ActionResult<XContentDto>> Add(
+            [FromBody] XContentDto item,
+            [FromQuery] string language = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            try
+            {
+                //
+                // Validate ...
+                if (!ModelState.IsValid)
+                {
+                    XException.InvalidArgs.Throw();
+                }
+                await ValidationProvider
+                    .GroupValidationBuilder()
+                    .AddNotNull(item)
+                    .AddNotEmpty(item.Title)
+                    .ValidateGroupAsync();
+
+                //
+                var userInfo = await GetUserInfo();
+                var connectionId = GetConnectionId();
+
+                //
+                // Normalize Language ...
+                if (language.IsNullOrEmpty())
+                {
+                    language = AppConfiguration.DefaultLanguage;
+                }
+                if (language.IsNullOrEmpty())
+                {
+                    XException.InvalidData.Throw();
+                }
+
+                //
+                var result = await provider.Add(
+                    item: item,
+                    userInfo: userInfo,
+                    language: language,
+                    connectionId: connectionId,
+                    cancellationToken: cancellationToken
+                );
+
+                //
+                return result;
+            }
+            catch (Exception ex)
+            {
+                //
+                var result = GetExceptionActionResult(ex);
+                return result;
+            }
+        }
+    }
+}

Extensions/XModelExtensions.cs

@@ -0,0 +1,46 @@
+using xCommons.Extensions;
+using xContentService.Models.Dtos;
+using xContentService.Models.Entities;
+
+namespace xContentService.Extensions
+{
+    /// <summary>
+    /// All Service Model's Extensions ...
+    /// </summary>
+    public static class XModelExtensions
+    {
+        /// <summary>
+        /// Validate a Model ...
+        /// </summary>
+        /// <param name="source"></param>
+        /// <returns></returns>
+        public static bool IsValid(this XContent source)
+        {
+            //
+            var result =
+                !source.IsNullOrDefault() &&
+                !source.Title.IsNullOrEmpty() &&
+                !source.OwnerId.IsNullOrEmpty();
+
+            //
+            return result;
+        }
+
+        /// <summary>
+        /// Validate a Model ...
+        /// </summary>
+        /// <param name="source"></param>
+        /// <returns></returns>
+        public static bool IsValid(this XContentDto source)
+        {
+            //
+            var result =
+                !source.IsNullOrDefault() &&
+                !source.Title.IsNullOrEmpty() &&
+                !source.OwnerId.IsNullOrEmpty();
+
+            //
+            return result;
+        }
+    }
+}

Helpers/XContentServiceHelper.cs

@@ -1,12 +1,12 @@
 using System;
 using GraphQL.Types;
-using xContentService.Interfaces.Entities;
-using xContentService.Models.Entities;
-using xContentService.Providers.Entities;
-using xContentService.Providers.GraphQL;
 using xDataService.Db;
 using xDataService.Models;
 using xDataService.Providers;
+using xContentService.Models.Entities;
+using xContentService.Providers.GraphQL;
+using xContentService.Providers.Entities;
+using xContentService.Interfaces.Entities;
 
 namespace xContentService.Helpers
 {

Interfaces/Controllers/IXContentProviderController.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Threading;
+using xTagService.Interfaces;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using xContentService.Models.Dtos;
+using xContentService.Providers.Dtos;
+using xContentService.Models.Entities;
+
+namespace xContentService.Interfaces.Controllers
+{
+    public interface IXContentProviderController : IXBaseProvidedHasTagController<XContent, XContentDto, Guid, XContentDtoHub>
+    {
+        /// <summary>
+        /// Add an item ...
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="language"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        [HttpPost("Add")]
+        Task<ActionResult<XContentDto>> Add(
+            [FromBody] XContentDto item,
+            [FromQuery] string language = null,
+            CancellationToken cancellationToken = default
+        );        
+    }
+}

Interfaces/Dtos/IXContentDtoHub.cs

@@ -1,7 +1,7 @@
 using System;
+using xPushService.Interfaces;
 using xContentService.Models.Dtos;
 using xContentService.Models.Entities;
-using xPushService.Interfaces;
 
 namespace xContentService.Interfaces.Dtos
 {

Interfaces/Dtos/IXContentRepositoryService.cs

@@ -1,60 +1,10 @@
 using System;
-using System.Threading;
-using System.Threading.Tasks;
 using xDataService.Interfaces;
-using System.Collections.Generic;
 using xContentService.Models.Dtos;
 using xContentService.Models.Entities;
 
 namespace xContentService.Interfaces.Dtos
 {
     public interface IXContentRepositoryService : IXBaseRepositoryService<XContent, XContentDto, Guid>
-    {
-        //
-        #region Enrichers ...
-        /// <summary>
-        /// Enrich Specified Item ...
-        /// </summary>
-        /// <param name="source"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<XContentDto> Enrich(
-            XContent source,
-            CancellationToken cancellationToken = default
-        );
-
-        /// <summary>
-        /// Enrich Specified Item ...
-        /// </summary>
-        /// <param name="source"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<XContentDto> Enrich(
-            XContentDto source,
-            CancellationToken cancellationToken = default
-        );
-
-        /// <summary>
-        /// Enrich Specified Items ...
-        /// </summary>
-        /// <param name="sources"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<IEnumerable<XContentDto>> EnrichRange(
-            IEnumerable<XContent> sources,
-            CancellationToken cancellationToken = default
-        );
-
-        /// <summary>
-        /// Enrich Specified Items ...
-        /// </summary>
-        /// <param name="sources"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<IEnumerable<XContentDto>> EnrichRange(
-            IEnumerable<XContentDto> sources,
-            CancellationToken cancellationToken = default
-        );
-        #endregion        
-    }
+    { }
 }

Interfaces/Dtos/IXContentServiceProvider.cs

@@ -1,8 +1,8 @@
 using System;
-using xContentService.Models.Dtos;
-using xContentService.Models.Entities;
-using xContentService.Providers.Dtos;
 using xPushService.Interfaces;
+using xContentService.Models.Dtos;
+using xContentService.Providers.Dtos;
+using xContentService.Models.Entities;
 
 namespace xContentService.Interfaces.Dtos
 {

Interfaces/Entities/IXContentEntityHub.cs

@@ -1,6 +1,6 @@
 using System;
-using xContentService.Models.Entities;
 using xPushService.Interfaces;
+using xContentService.Models.Entities;
 
 namespace xContentService.Interfaces.Entities
 {

Interfaces/Entities/IXContentGraphQLTypeHelper.cs

@@ -1,6 +1,6 @@
 using System;
-using xContentService.Models.Entities;
 using xDataService.Interfaces;
+using xContentService.Models.Entities;
 
 namespace xContentService.Interfaces.Entities
 {

Interfaces/Entities/IXContentKeyGenerator.cs

@@ -1,6 +1,6 @@
 using System;
-using xContentService.Models.Entities;
 using xDataService.Interfaces;
+using xContentService.Models.Entities;
 
 namespace xContentService.Interfaces.Entities
 {

Interfaces/Entities/IXContentRepository.cs

@@ -1,6 +1,6 @@
 using System;
-using xContentService.Models.Entities;
 using xDataService.Interfaces;
+using xContentService.Models.Entities;
 
 namespace xContentService.Interfaces.Entities
 {

Interfaces/Entities/IXContentRepositoryEvents.cs

@@ -1,5 +1,5 @@
-using xContentService.Models.Entities;
 using xDataService.Interfaces;
+using xContentService.Models.Entities;
 
 namespace xContentService.Interfaces.Entities
 {

Interfaces/Entities/IXContentRepositoryProvider.cs

@@ -1,7 +1,7 @@
 using System;
+using xPushService.Interfaces;
 using xContentService.Models.Entities;
 using xContentService.Providers.Entities;
-using xPushService.Interfaces;
 
 namespace xContentService.Interfaces.Entities
 {

Interfaces/Entities/IXContentSeeder.cs

@@ -1,6 +1,6 @@
 using System;
-using xContentService.Models.Entities;
 using xDataService.Interfaces;
+using xContentService.Models.Entities;
 
 namespace xContentService.Interfaces.Entities
 {

Interfaces/IXContentProvider.cs

@@ -1,7 +1,46 @@
+using System;
+using System.Threading;
+using xTagService.Interfaces;
+using System.Threading.Tasks;
+using xIdentityModels.Models;
+using xContentService.Models.Dtos;
+using xContentService.Providers.Dtos;
+using xContentService.Models.Entities;
+
 namespace xContentService.Interfaces
 {
-    public interface IXContentProvider
+    public interface IXContentProvider : IXBaseProvidedHasTag<XContent, XContentDto, Guid, XContentDtoHub>
     {
+        /// <summary>
+        /// Add an item values ...
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="userInfo"></param>
+        /// <param name="connectionId"></param>
+        /// <param name="language"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public Task<XContentDto> Add(
+            XContentDto item,
+            XUserClaimsInfoDto userInfo = null,
+            string connectionId = null,
+            string language = null,
+            CancellationToken cancellationToken = default
+        );
 
+        /// <summary>
+        /// Create Content Used Locales for Creating Posts ...
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="userInfo"></param>
+        /// <param name="connectionId"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        // public Task<XContentDto> Create(
+        //     XContentDto item,
+        //     XUserClaimsInfoDto userInfo = null,
+        //     string connectionId = null,
+        //     CancellationToken cancellationToken = default
+        // );               
     }
 }

Models/Dtos/XContentDto.cs

@@ -11,13 +11,15 @@ namespace xContentService.Models.Dtos
     {
         public string OwnerId { get; set; }
         public virtual XPersonDto Owner { get; set; }
-        
+
         public string Title { get; set; }
         public virtual XResourceDto TitleResource { get; set; }
-        
+
         public string Description { get; set; }
         public virtual XResourceDto DescriptionResource { get; set; }
-        
+
+        public string[] Tags { get; set; }
+
         public DateTime CreatedOn { get; set; }
         public DateTime UpdatedAt { get; set; }
     }

Models/Entities/XContent.cs

@@ -1,6 +1,6 @@
 using System;
-using System.ComponentModel.DataAnnotations;
 using xModels.Base;
+using System.ComponentModel.DataAnnotations;
 
 namespace xContentService.Models.Entities
 {

Providers/Dtos/XContentDtoHub.cs

@@ -1,9 +1,9 @@
 using System;
+using xPushService.Base;
+using xContentService.Models.Dtos;
 using Microsoft.Extensions.Logging;
 using xContentService.Interfaces.Dtos;
-using xContentService.Models.Dtos;
 using xContentService.Models.Entities;
-using xPushService.Base;
 
 namespace xContentService.Providers.Dtos
 {

Providers/Dtos/XContentRepositoryService.cs

@@ -1,16 +1,8 @@
 using System;
 using AutoMapper;
-using System.Linq;
-using xModels.Dtos;
-using System.Threading;
-using xCommons.Extensions;
 using xDataService.Providers;
-using System.Threading.Tasks;
 using System.Collections.Generic;
-using xContentService.Interfaces;
 using xContentService.Models.Dtos;
-using xIdentityService.Interfaces;
-using xIdentityService.Extensions;
 using xContentService.Interfaces.Dtos;
 using xContentService.Models.Entities;
 using xContentService.Interfaces.Entities;
@@ -19,156 +11,13 @@ namespace xContentService.Providers.Dtos
 {
     public class XContentRepositoryService : XBaseRepositoryService<XContent, XContentDto, Guid>, IXContentRepositoryService
     {
-        private readonly IXIdentityProvider identityProvider;
-        private readonly IXContentTitleResourceProvider titleResourceProvider;
-        private readonly IXContentDescriptionResourceProvider descriptionResourceProvider;
-
         public XContentRepositoryService(
             IXContentRepository repository,
-            IXIdentityProvider identityProvider,
-            IXContentTitleResourceProvider titleResourceProvider,
-            IXContentDescriptionResourceProvider descriptionResourceProvider,
             IEnumerable<Profile> mapperProfiles = null
         ) : base(
             repository,
             mapperProfiles
         )
-        {
-            this.identityProvider = identityProvider;
-            this.titleResourceProvider = titleResourceProvider;
-            this.descriptionResourceProvider = descriptionResourceProvider;
-        }
-
-        //
-        #region Enrichers ...
-        /// <summary>
-        /// Enrich Specified Item ...
-        /// </summary>
-        /// <param name="source"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        public async Task<XContentDto> Enrich(
-            XContent source,
-            CancellationToken cancellationToken = default
-        )
-        {
-            //
-            // Mapping Default ...
-            var result = Mapper.Map<XContentDto>(source);
-            result = await Enrich(
-                source: result,
-                cancellationToken: cancellationToken
-            );
-
-            //
-            return result;
-        }
-
-        /// <summary>
-        /// Enrich Specified Item ...
-        /// </summary>
-        /// <param name="source"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        public async Task<XContentDto> Enrich(
-            XContentDto source,
-            CancellationToken cancellationToken = default
-        )
-        {
-            //
-            // Handdle Owner ...
-            XPersonDto owner = null;
-            if (!source.OwnerId.IsNullOrEmpty())
-            {
-                //
-                // Try to Retrieve User Info ...
-                var device = identityProvider.GetDevice();
-                var userInfo = await identityProvider.GetUserInfo(
-                    device: device,
-                    userSelectByParam: source.OwnerId
-                );
-                owner = userInfo.ToXPersonDto();
-            }
-
-            //
-            // Hanlde Content Title ...
-            string contentTitle = string.Empty;
-            XResourceDto titleResource = await titleResourceProvider.GetResource(
-                identifier: source.Id,
-                cancellationToken: cancellationToken
-            );
-            if (!titleResource.IsNullOrDefault())
-            {
-                contentTitle = titleResource.Resource;
-            }
-
-            //
-            // Hanlde Content Description ...
-            string contentDescription = string.Empty;
-            XResourceDto descriptionResource = await descriptionResourceProvider.GetResource(
-                identifier: source.Id,
-                cancellationToken: cancellationToken
-            );
-            if (!descriptionResource.IsNullOrDefault())
-            {
-                contentDescription = descriptionResource.Resource;
-            }
-
-            //
-            // Attach Extracted Items ...
-            var result = Mapper.Map<XContentDto>(source, options =>
-            {
-                //
-                options.Items[nameof(source.Owner)] = owner;
-                options.Items[nameof(source.Title)] = contentTitle;
-                options.Items[nameof(source.TitleResource)] = titleResource;
-                options.Items[nameof(source.Description)] = contentDescription;
-                options.Items[nameof(source.DescriptionResource)] = descriptionResource;
-            });
-
-            //
-            return result;
-        }
-
-        /// <summary>
-        /// Enrich Specified Items ...
-        /// </summary>
-        /// <param name="sources"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        public async Task<IEnumerable<XContentDto>> EnrichRange(
-            IEnumerable<XContent> sources, 
-            CancellationToken cancellationToken = default
-        )
-        {
-            //
-            var tasks = sources
-                .Select(x => Enrich(x, cancellationToken));
-
-            //
-            var result = await Task.WhenAll(tasks);
-            return result;
-        }
-
-        /// <summary>
-        /// Enrich Specified Items ...
-        /// </summary>
-        /// <param name="sources"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        public async Task<IEnumerable<XContentDto>> EnrichRange(
-            IEnumerable<XContentDto> sources, 
-            CancellationToken cancellationToken = default
-        )
-        {
-            //
-            var tasks = sources
-                .Select(x => Enrich(x, cancellationToken));
-
-            //
-            var result = await Task.WhenAll(tasks);
-            return result;
-        }
-        #endregion
+        { }
     }
 }

Providers/Dtos/XContentServiceProvider.cs

@@ -1,11 +1,11 @@
 using System;
+using xPushService.Base;
+using xDataService.Configuration;
+using xContentService.Models.Dtos;
+using xIdentityService.Interfaces;
 using Microsoft.AspNetCore.SignalR;
 using xContentService.Interfaces.Dtos;
-using xContentService.Models.Dtos;
 using xContentService.Models.Entities;
-using xDataService.Configuration;
-using xIdentityService.Interfaces;
-using xPushService.Base;
 
 namespace xContentService.Providers.Dtos
 {

Providers/Enrichers/XContentEnricher.cs

@@ -15,16 +15,19 @@ namespace xContentService.Providers.Enrichers
 {
     public class XContentEnricher : IXContentEnricher
     {
+        private readonly IXContentTagProvided tagProvider;
         private readonly IXIdentityProvider identityProvider;
         private readonly IXContentTitleResourceProvider titleResourceProvider;
         private readonly IXContentDescriptionResourceProvider descriptionResourceProvider;
 
         public XContentEnricher(
+            IXContentTagProvided tagProvider,
             IXIdentityProvider identityProvider,
             IXContentTitleResourceProvider titleResourceProvider,
             IXContentDescriptionResourceProvider descriptionResourceProvider
         )
         {
+            this.tagProvider = tagProvider;
             this.identityProvider = identityProvider;
             this.titleResourceProvider = titleResourceProvider;
             this.descriptionResourceProvider = descriptionResourceProvider;
@@ -105,10 +108,18 @@ namespace xContentService.Providers.Enrichers
                 contentDescription = descriptionResource.Resource;
             }
 
+            //
+            var tags = await tagProvider.GetTags(
+                id: source.Id,
+                cancellationToken: cancellationToken
+            );
+
+
             //
             // Attach Extracted Items ...
             var result = source.MapConvert();
             result.Owner = owner;
+            result.Tags = [..tags];
             result.Title = contentTitle;
             result.TitleResource = titleResource;
             result.Description = contentDescription;

Providers/Entities/XContentEFRepository.cs

@@ -1,10 +1,10 @@
 using System;
-using xContentService.Interfaces.Entities;
-using xContentService.Models.Entities;
-using xDataService.Configuration;
 using xDataService.Db;
-using xDataService.Interfaces;
 using xDataService.Providers;
+using xDataService.Interfaces;
+using xDataService.Configuration;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Entities;
 
 namespace xContentService.Providers.Entities
 {

Providers/Entities/XContentEntityHub.cs

@@ -1,8 +1,8 @@
 using System;
-using Microsoft.Extensions.Logging;
-using xContentService.Interfaces.Entities;
-using xContentService.Models.Entities;
 using xPushService.Base;
+using Microsoft.Extensions.Logging;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Entities;
 
 namespace xContentService.Providers.Entities
 {

Providers/Entities/XContentInMemoryRepository.cs

@@ -1,8 +1,8 @@
 using System;
-using xContentService.Interfaces.Entities;
-using xContentService.Models.Entities;
-using xDataService.Configuration;
 using xDataService.Providers;
+using xDataService.Configuration;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Entities;
 
 namespace xContentService.Providers.Entities
 {

Providers/Entities/XContentKeyGenerator.cs

@@ -1,6 +1,6 @@
-using xContentService.Interfaces.Entities;
-using xContentService.Models.Entities;
 using xDataService.Providers;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Entities;
 
 namespace xContentService.Providers.Entities
 {

Providers/Entities/XContentMongoRepository.cs

@@ -1,8 +1,8 @@
 using System;
-using xContentService.Interfaces.Entities;
-using xContentService.Models.Entities;
-using xDataService.Configuration;
 using xDataService.Providers;
+using xDataService.Configuration;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Entities;
 
 namespace xContentService.Providers.Entities
 {

Providers/Entities/XContentRepositoryEvents.cs

@@ -1,6 +1,6 @@
-using xContentService.Interfaces.Entities;
-using xContentService.Models.Entities;
 using xDataService.Providers;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Entities;
 
 namespace xContentService.Providers.Entities
 {

Providers/Entities/XContentRepositoryProvider.cs

@@ -1,10 +1,10 @@
 using System;
-using Microsoft.AspNetCore.SignalR;
-using xContentService.Interfaces.Entities;
-using xContentService.Models.Entities;
+using xPushService.Base;
 using xDataService.Configuration;
 using xIdentityService.Interfaces;
-using xPushService.Base;
+using Microsoft.AspNetCore.SignalR;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Entities;
 
 namespace xContentService.Providers.Entities
 {

Providers/Entities/XContentSeederBase.cs

@@ -1,8 +1,8 @@
 using System;
-using xContentService.Interfaces.Entities;
-using xContentService.Models.Entities;
-using xDataService.Configuration;
 using xDataService.Providers;
+using xDataService.Configuration;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Entities;
 
 namespace xContentService.Providers.Entities
 {

Providers/GraphQL/XContentGraphQLTypeHelper.cs

@@ -1,8 +1,8 @@
 using System;
-using xContentService.Constants;
-using xContentService.Interfaces.Entities;
-using xContentService.Models.Entities;
 using xDataService.GraphQL;
+using xContentService.Constants;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Entities;
 
 namespace xContentService.Providers.GraphQL
 {

Providers/GraphQL/XContentGraphQuery.cs

@@ -1,9 +1,9 @@
 using System;
 using GraphQL.Types;
-using xContentService.Interfaces.Entities;
-using xContentService.Models.Entities;
-using xDataService.Configuration;
 using xDataService.GraphQL;
+using xDataService.Configuration;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Entities;
 
 namespace xContentService.Providers.GraphQL
 {

Providers/GraphQL/XContentGraphType.cs

@@ -1,6 +1,6 @@
 using System;
-using xContentService.Models.Entities;
 using xDataService.GraphQL;
+using xContentService.Models.Entities;
 
 namespace xContentService.Providers.GraphQL
 {

Providers/XContentEntityRegisterar.cs

@@ -1,9 +1,9 @@
 using System;
-using Microsoft.EntityFrameworkCore;
-using xContentService.Configuration.Entities;
-using xContentService.Models.Entities;
-using xDataService.Interfaces;
 using xDataService.Providers;
+using xDataService.Interfaces;
+using Microsoft.EntityFrameworkCore;
+using xContentService.Models.Entities;
+using xContentService.Configuration.Entities;
 
 namespace xContentService.Providers
 {

Providers/XContentProvider.cs

@@ -1,9 +1,693 @@
+using System;
+using System.Linq;
+using xModels.Dtos;
+using System.Threading;
+using xCommons.Extensions;
+using xTagService.Providers;
+using xExceptions.Constants;
+using xIdentityModels.Models;
+using System.Threading.Tasks;
+using xPushService.Constants;
+using System.Linq.Expressions;
+using xCommons.Configurations;
+using xContentService.Constants;
 using xContentService.Interfaces;
+using System.Collections.Generic;
+using xContentService.Extensions;
+using xContentService.Models.Dtos;
+using xContentService.Providers.Dtos;
+using xContentService.Models.Entities;
+using xContentService.Interfaces.Dtos;
+using Microsoft.EntityFrameworkCore.Query;
+using xContentService.Interfaces.Enrichers;
 
 namespace xContentService.Providers
 {
-    public class XContentProvider : IXContentProvider
+    public class XContentProvider : XBaseProvidedHasTag<XContent, XContentDto, Guid, XContentDtoHub>, IXContentProvider
     {
-        
+        private readonly IXContentEnricher enricher;
+        private readonly XAppConfiguration configuration;
+        private readonly IXContentTagProvider tagProvider;
+        private readonly IXContentServiceProvider provider;
+        private readonly IXContentTitleResourceProvider titleResourceProvider;
+        private readonly IXContentDescriptionResourceProvider descriptionResourceProvider;
+
+        public XContentProvider(
+            IXContentEnricher enricher,
+            XAppConfiguration configuration,
+            IXContentTagProvider tagProvider,
+            IXContentServiceProvider provider,
+            IXContentTitleResourceProvider titleResourceProvider,
+            IXContentDescriptionResourceProvider descriptionResourceProvider
+        ) : base(
+            provider: provider,
+            tagProvider: tagProvider,
+            permittedRoles: [XContentServiceConstants.XAdminRole]
+        )
+        {
+            this.provider = provider;
+            this.enricher = enricher;
+            this.tagProvider = tagProvider;
+            this.configuration = configuration;
+            this.titleResourceProvider = titleResourceProvider;
+            this.descriptionResourceProvider = descriptionResourceProvider;
+        }
+
+        public override bool IsOwned(
+            XContent item,
+            XUserClaimsInfoDto userInfo
+        )
+        {
+            //
+            var result =
+                !item.IsNullOrDefault() &&
+                !userInfo.IsNullOrDefault() &&
+                !item.OwnerId.IsNullOrEmpty() &&
+                userInfo.UserId == item.OwnerId;
+
+            //
+            return result;
+        }
+
+        public override bool IsOwned(
+            XContentDto item,
+            XUserClaimsInfoDto userInfo
+        )
+        {
+            //
+            var result =
+                !item.IsNullOrDefault() &&
+                !userInfo.IsNullOrDefault() &&
+                !item.OwnerId.IsNullOrEmpty() &&
+                userInfo.UserId == item.OwnerId;
+
+            //
+            return result;
+        }
+
+        //
+        #region Overrides ...
+        /// <summary>
+        /// Get Specified Item by ID ...
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="includeBuilder"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public override async Task<XContentDto> Get(
+            Guid id,
+            Func<IQueryable<XContent>, IIncludableQueryable<XContent, object>> includeBuilder = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            // Retrieve Item ...
+            var result = await provider.GetAsync(
+                id: id,
+                includeBuilder: null,
+                ignoreSoftDeleteds: true,
+                cancellationToken: cancellationToken
+            );
+
+            //
+            // Handle Enrichment ...
+            if (!result.IsNullOrDefault())
+            {
+                //
+                result = await enricher.Enrich(
+                    source: result,
+                    cancellationToken: cancellationToken
+                );
+            }
+
+            //
+            return result;
+        }
+
+        /// <summary>
+        /// Get All Exists Items ...
+        /// </summary>
+        /// <param name="orderBuilder"></param>
+        /// <param name="includeBuilder"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public override async Task<IEnumerable<XContentDto>> GetAll(
+            Func<IQueryable<XContent>, IOrderedQueryable<XContent>> orderBuilder = null,
+            Func<IQueryable<XContent>, IIncludableQueryable<XContent, object>> includeBuilder = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            // Retrieve Items ...
+            var result = await provider.GetAllAsync(
+                ignoreSoftDeleteds: true,
+                orderBuilder: orderBuilder,
+                includeBuilder: includeBuilder,
+                cancellationToken: cancellationToken
+            );
+
+            //
+            // Handle Enrichment ...
+            if (result.HasChild())
+            {
+                //
+                result = await enricher.EnrichRange(
+                    sources: result,
+                    cancellationToken: cancellationToken
+                );
+            }
+
+            //
+            return result;
+        }
+
+        /// <summary>
+        /// find an item by providing a Conditional Expression ...
+        /// </summary>
+        /// <param name="predicate"></param>
+        /// <param name="includeBuilder"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public override async Task<XContentDto> FindOne(
+            Expression<Func<XContent, bool>> predicate,
+            Func<IQueryable<XContent>, IIncludableQueryable<XContent, object>> includeBuilder = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            // Detect Item ...
+            var result = await provider.FindOneAsync(
+                predicate: predicate,
+                ignoreSoftDeleteds: true,
+                includeBuilder: includeBuilder,
+                cancellationToken: cancellationToken
+            );
+
+            //
+            // Handle Enrichment ...
+            if (!result.IsNullOrDefault())
+            {
+                //
+                result = await enricher.Enrich(
+                    source: result,
+                    cancellationToken: cancellationToken
+                );
+            }
+
+            //
+            return result;
+        }
+
+        /// <summary>
+        /// find a collection of Items by proving a Conditional Expression ...
+        /// </summary>
+        /// <param name="predicate"></param>
+        /// <param name="orderBuilder"></param>
+        /// <param name="includeBuilder"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public override async Task<IEnumerable<XContentDto>> FindMany(
+            Expression<Func<XContent, bool>> predicate,
+            Func<IQueryable<XContent>, IOrderedQueryable<XContent>> orderBuilder = null,
+            Func<IQueryable<XContent>, IIncludableQueryable<XContent, object>> includeBuilder = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            // Detect Items ...
+            var result = await provider.FindManyAsync(
+                predicate: predicate,
+                ignoreSoftDeleteds: true,
+                orderBuilder: orderBuilder,
+                includeBuilder: includeBuilder,
+                cancellationToken: cancellationToken
+            );
+
+            //
+            // Handle Enrichment ...
+            if (result.HasChild())
+            {
+                //
+                result = await enricher.EnrichRange(
+                    sources: result,
+                    cancellationToken: cancellationToken
+                );
+            }
+
+            //
+            return result;
+        }
+
+        /// <summary>
+        /// retrieve Items based on XQuery Pagination structure ...
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="predicate"></param>
+        /// <param name="orderBuilder"></param>
+        /// <param name="includeBuilder"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public override async Task<XQueryResult<XContentDto>> Query(
+            XQuery query,
+            Expression<Func<XContent, bool>> predicate = null,
+            Func<IQueryable<XContent>, IOrderedQueryable<XContent>> orderBuilder = null,
+            Func<IQueryable<XContent>, IIncludableQueryable<XContent, object>> includeBuilder = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            // Query Items ...
+            var result = await provider.QueryAsync(
+                query: query,
+                predicate: predicate,
+                ignoreSoftDeleteds: true,
+                orderBuilder: orderBuilder,
+                includeBuilder: includeBuilder,
+                cancellationToken: cancellationToken
+            );
+
+            //
+            // Handle Enrichment ...
+            if (!result.IsNullOrDefault() && result.Items.HasChild())
+            {
+                //
+                result.Items = await enricher.EnrichRange(
+                    sources: result.Items,
+                    cancellationToken: cancellationToken
+                );
+            }
+
+            //
+            return result;
+        }
+
+        /// <summary>
+        /// retrieve Owned Items based on XQuery Pagination structure ...
+        /// if supported ...
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="userInfo"></param>
+        /// <param name="predicate"></param>
+        /// <param name="orderBuilder"></param>
+        /// <param name="includeBuilder"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public override async Task<XQueryResult<XContentDto>> QueryOwned(
+            XQuery query,
+            XUserClaimsInfoDto userInfo = null,
+            Expression<Func<XContent, bool>> predicate = null,
+            Func<IQueryable<XContent>, IOrderedQueryable<XContent>> orderBuilder = null,
+            Func<IQueryable<XContent>, IIncludableQueryable<XContent, object>> includeBuilder = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            // Prepare Predicator ...
+            Expression<Func<XContent, bool>> predicateor = null;
+            if (!predicate.IsNull())
+            {
+                //
+                var predicateFnc = predicate.Compile();
+                predicateor = x =>
+                    predicateFnc(x) &&
+                    IsOwned(x, userInfo);
+            }
+            else
+            {
+                predicateor = x => IsOwned(x, userInfo);
+            }
+
+            //
+            // Query Items ...
+            var result = await provider.QueryAsync(
+                query: query,
+                predicate: predicateor,
+                ignoreSoftDeleteds: true,
+                orderBuilder: orderBuilder,
+                includeBuilder: includeBuilder,
+                cancellationToken: cancellationToken
+            );
+
+            //
+            // Handle Enrichment ...
+            if (!result.IsNullOrDefault() && result.Items.HasChild())
+            {
+                //
+                result.Items = await enricher.EnrichRange(
+                    sources: result.Items,
+                    cancellationToken: cancellationToken
+                );
+            }
+
+            //
+            return result;
+        }
+
+        /// <summary>
+        /// Add an item values ...
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="userInfo"></param>
+        /// <param name="connectionId"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public override async Task<XContentDto> Add(
+            XContentDto item,
+            XUserClaimsInfoDto userInfo = null,
+            string connectionId = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            var result = await Add(
+                item: item,
+                language: null,
+                userInfo: userInfo,
+                connectionId: connectionId,
+                cancellationToken: cancellationToken
+            );
+
+            //
+            return result;
+        }
+
+        /// <summary>
+        /// Add an item values ...
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="userInfo"></param>
+        /// <param name="connectionId"></param>
+        /// <param name="language"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<XContentDto> Add(
+            XContentDto item,
+            XUserClaimsInfoDto userInfo = null,
+            string connectionId = null,
+            string language = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            // Validate ...
+            var isValid = !item.IsNullOrDefault();
+            if (!isValid)
+            {
+                XException.InvalidArgs.Throw();
+            }
+
+            //
+            // Normalize ...
+
+            //
+            // Language ...
+            if (language.IsNullOrEmpty())
+            {
+                language = configuration.DefaultLanguage;
+            }
+
+            //
+            // Owner Id ...
+            if (item.OwnerId.IsNullOrEmpty())
+            {
+                //
+                if (!userInfo.IsNullOrDefault())
+                {
+                    item.OwnerId = userInfo.UserId;
+                }
+            }
+
+            //
+            // Created On ...
+            item.CreatedOn = DateTime.UtcNow;
+
+            //
+            // Validate Normalized Items ...
+            isValid = item.IsValid();
+            if (!isValid)
+            {
+                XException.InvalidData.Throw();
+            }
+
+            //
+            // Handle Insert Temp ...
+            var result = await provider.AddAsync(
+                item: item,
+                saveChanges: true,
+                connectionId: null, // Ignor Push Notifications ...,
+                cancellationToken: cancellationToken
+            );
+            isValid = !result.IsNullOrDefault();
+            if (!isValid)
+            {
+                XException.ActionFailed.Throw();
+            }
+
+            //
+            // Handle Insert Title/Description ...
+
+            //
+            var titleResource = await titleResourceProvider.AddOrUpdateLocale(
+                connectionId: null,
+                identifier: result.Id,
+                locale: new XLocaleResourceDto
+                {
+                    Language = language,
+                    Value = result.Title,
+                },
+                cancellationToken: cancellationToken
+            );
+
+            //
+            XResourceDto descriptionResource = null;
+            if (!result.Description.IsNullOrEmpty())
+            {
+                //
+                descriptionResource = await descriptionResourceProvider.AddOrUpdateLocale(
+                    connectionId: null,
+                    identifier: result.Id,
+                    locale: new XLocaleResourceDto
+                    {
+                        Language = language,
+                        Value = result.Description,
+                    },
+                    cancellationToken: cancellationToken
+                );
+            }
+
+            //
+            // Fill Item Title and Description ...
+            if (titleResource.IsNullOrDefault())
+            {
+                result.Title = titleResource.Resource;
+            }
+            if (descriptionResource.IsNullOrDefault())
+            {
+                result.Description = descriptionResource.Resource;
+            }
+
+            //
+            // Update Item ...
+            result = await Update(
+                item: result,
+                id: result.Id,
+                userInfo: userInfo,
+                connectionId: null,
+                cancellationToken: cancellationToken
+            );
+            isValid = !result.IsNullOrDefault();
+            if (!isValid)
+            {
+                XException.ActionFailed.Throw();
+            }
+
+            //
+            // Handle Enrichment ...
+            if (isValid)
+            {
+                //
+                result = await enricher.Enrich(
+                    source: result,
+                    cancellationToken: cancellationToken
+                );
+            }
+
+            //
+            // Handle Push Notifications ...
+            if (isValid && !connectionId.IsNullOrEmpty())
+            {
+                //
+                await provider.SendPush(
+                    connectionId: connectionId,
+                    cancellationToken: cancellationToken,
+                    payLoad: result.ToJSON(camelCase: true),
+                    action: XBaseEntityHubAction.Add.GetStringValue()
+                );
+            }
+
+            //
+            return result;
+        }
+
+        /// <summary>
+        /// Update an item values ...
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="item"></param>
+        /// <param name="userInfo"></param>
+        /// <param name="connectionId"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public override async Task<XContentDto> Update(
+            Guid id,
+            XContentDto item,
+            XUserClaimsInfoDto userInfo = null,
+            string connectionId = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            // Check Permission ...
+            var hasPermission =
+                IsOwned(item, userInfo) ||
+                HasPermision(userInfo);
+            if (!hasPermission)
+            {
+                XException.NotAllowed.Throw();
+            }
+
+            //
+            // Handle Resources ...
+            if (!item.TitleResource.IsNullOrDefault())
+            {
+                item.TitleResource = await titleResourceProvider.AddOrUpdateResource(
+                    identifier: item.Id,
+                    connectionId: connectionId,
+                    resource: item.TitleResource,
+                    cancellationToken: cancellationToken
+                );
+            }
+
+            //
+            // Handle Update on ...
+            item.UpdatedAt = DateTime.UtcNow;
+
+            //
+            var result = await provider.UpdateAsync(
+                id: id,
+                item: item,
+                saveChanges: true,
+                connectionId: null,
+                cancellationToken: cancellationToken
+            );
+            var isValid = !result.IsNullOrDefault();
+
+            //
+            // Handle Enrichment ...
+            if (isValid)
+            {
+                //
+                result = await enricher.Enrich(
+                    source: result,
+                    cancellationToken: cancellationToken
+                );
+            }
+
+            //
+            // Handle Notification ...
+            if (isValid && !connectionId.IsNullOrEmpty())
+            {
+                //
+                await provider.SendPush(
+                    connectionId: connectionId,
+                    cancellationToken: cancellationToken,
+                    payLoad: result.ToJSON(camelCase: true),
+                    action: XBaseEntityHubAction.Update.GetStringValue()
+                );
+            }
+
+            //
+            return result;
+        }
+
+        /// <summary>
+        /// remove an Item ...
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="userInfo"></param>
+        /// <param name="connectionId"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public override async Task<XContentDto> Remove(
+            Guid id,
+            XUserClaimsInfoDto userInfo = null,
+            string connectionId = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            // Check Permission ...
+            var item = await Get(
+                id: id,
+                cancellationToken: cancellationToken
+            );
+            var hasPermission =
+                IsOwned(item, userInfo) ||
+                HasPermision(userInfo);
+            if (!hasPermission)
+            {
+                XException.NotAllowed.Throw();
+            }
+
+            //
+            // Handle Item Remove ...
+            var result = await provider.RemoveAsync(
+                id: id,
+                saveChanges: true,
+                softDelete: false,
+                connectionId: null,
+                cancellationToken: cancellationToken
+            );
+            if (result.IsNullOrDefault())
+            {
+                XException.ActionFailed.Throw();
+            }
+
+            //
+            // Remove Titles/Descriptions ...
+
+            //
+            // Titles ...
+            await titleResourceProvider.RemoveLocales(
+                connectionId: null,
+                identifier: result.Id,
+                cancellationToken: cancellationToken
+            );
+
+            //
+            // Descriptions ...
+            await descriptionResourceProvider.RemoveLocales(
+                connectionId: null,
+                identifier: result.Id,
+                cancellationToken: cancellationToken
+            );
+
+            //
+            // Handle Notifications ...
+            if (!connectionId.IsNullOrEmpty())
+            {
+                //
+                await provider.SendPush(
+                    connectionId: connectionId,
+                    cancellationToken: cancellationToken,
+                    payLoad: result.ToJSON(camelCase: true),
+                    action: XBaseEntityHubAction.Delete.GetStringValue()
+                );
+            }
+
+            //
+            return result;
+        }
+        #endregion
     }
 }