apply sorting ...

Base/XTestProviderControllerBase.cs

@@ -1,15 +1,15 @@
 using System;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.Extensions.Logging;
-using xCommons.Configurations;
 using xCommons.Providers;
-using xIdentityService.Interfaces;
+using xServices.Providers;
-using xPushService.Controllers;
 using xServices.Interfaces;
 using xServices.Models.Dtos;
+using xCommons.Configurations;
+using xPushService.Controllers;
 using xServices.Models.Entities;
-using xServices.Providers;
+using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xServices.Base
 {

Configurations/XTestTypeConfiguration.cs

@@ -1,7 +1,7 @@
 using System;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using xDataService.Providers;
 using xServices.Models.Entities;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace xServices.Configurations
 {

Controllers/CategoryProviderController.cs

@@ -1,20 +1,20 @@
 using System;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Query;
+using xCommons.Providers;
+using xCommons.Configurations;
+using xCategoryService.Interfaces;
+using xIdentityService.Interfaces;
 using Microsoft.Extensions.Logging;
 using xCategoryService.Controllers;
-using xCategoryService.Interfaces;
 using xCategoryService.Models.Entities;
-using xCommons.Configurations;
+using Microsoft.EntityFrameworkCore.Query;
-using xCommons.Providers;
-using xIdentityService.Interfaces;
 
 namespace xServices.Controllers
 {
-    public class XCategoryProviderController : XCategoryProviderControllerBase, IXCategoryProviderController
+    public class CategoryProviderController : XCategoryProviderControllerBase, IXCategoryProviderController
     {
-        public XCategoryProviderController(
+        public CategoryProviderController(
-            ILogger<XCategoryProviderController> logger,
+            ILogger<CategoryProviderController> logger,
             XAppConfiguration appConfiguration,
             IXIdentityProvider identityProvider,
             XValidationProvider validationProvider,

Controllers/ContentProviderController.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Linq;
+using xCommons.Providers;
+using xCommons.Configurations;
+using xContentService.Interfaces;
+using xContentService.Controllers;
+using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
+using xContentService.Models.Entities;
+using Microsoft.EntityFrameworkCore.Query;
+using xContentService.Interfaces.Controllers;
+
+namespace xServices.Controllers
+{
+    public class ContentProviderController : XContentProviderControllerBase, IXContentProviderController
+    {
+        public ContentProviderController(
+            ILogger<ContentProviderController> 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
+        )
+        { }
+    }
+}

Controllers/FileProviderController.cs

@@ -1,20 +1,20 @@
 using System;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.Extensions.Logging;
-using xCommons.Configurations;
 using xCommons.Providers;
-using xFileService.Controllers;
+using xCommons.Configurations;
 using xFileService.Interfaces;
-using xFileService.Models.Entities;
+using xFileService.Controllers;
 using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
+using xFileService.Models.Entities;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xServices.Controllers
 {
-    public class XFileProviderController : XFileProviderControllerBase, IXFileProviderController
+    public class FileProviderController : XFileProviderControllerBase, IXFileProviderController
     {
-        public XFileProviderController(
+        public FileProviderController(
-            ILogger<XFileProviderController> logger,
+            ILogger<FileProviderController> logger,
             XAppConfiguration appConfiguration,
             IXIdentityProvider identityProvider,
             XValidationProvider validationProvider,

Controllers/SubCategoryProviderController.cs

@@ -1,20 +1,20 @@
 using System;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Query;
+using xCommons.Providers;
+using xCommons.Configurations;
+using xCategoryService.Interfaces;
+using xIdentityService.Interfaces;
 using Microsoft.Extensions.Logging;
 using xCategoryService.Controllers;
-using xCategoryService.Interfaces;
 using xCategoryService.Models.Entities;
-using xCommons.Configurations;
+using Microsoft.EntityFrameworkCore.Query;
-using xCommons.Providers;
-using xIdentityService.Interfaces;
 
 namespace xServices.Controllers
 {
-    public class XSubCategoryProviderController : XSubCategoryProviderControllerBase, IXSubCategoryProviderController
+    public class SubCategoryProviderController : XSubCategoryProviderControllerBase, IXSubCategoryProviderController
     {
-        public XSubCategoryProviderController(
+        public SubCategoryProviderController(
-            ILogger<XSubCategoryProviderController> logger,
+            ILogger<SubCategoryProviderController> logger,
             XAppConfiguration appConfiguration,
             IXIdentityProvider identityProvider,
             XValidationProvider validationProvider,

Controllers/TagProviderController.cs

@@ -1,20 +1,20 @@
 using System;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.Extensions.Logging;
-using xCommons.Configurations;
 using xCommons.Providers;
-using xIdentityService.Interfaces;
-using xTagService.Controllers;
 using xTagService.Interfaces;
+using xCommons.Configurations;
+using xTagService.Controllers;
+using xIdentityService.Interfaces;
 using xTagService.Models.Entities;
+using Microsoft.Extensions.Logging;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xServices.Controllers
 {
-    public class XTagProviderController : XTagProviderControllerBase, IXTagProviderController
+    public class TagProviderController : XTagProviderControllerBase, IXTagProviderController
     {
-        public XTagProviderController(
+        public TagProviderController(
-            ILogger<XTagProviderController> logger,
+            ILogger<TagProviderController> logger,
             XAppConfiguration appConfiguration,
             IXIdentityProvider identityProvider,
             XValidationProvider validationProvider,

Controllers/TermsAndConditionsProviderController.cs

@@ -1,17 +1,16 @@
-using Microsoft.Extensions.Logging;
-using xCommons.Configurations;
 using xCommons.Providers;
+using xCommons.Configurations;
 using xIdentityService.Interfaces;
-using xTermsAndConditionsService.Controllers;
+using Microsoft.Extensions.Logging;
 using xTermsAndConditionsService.Interfaces;
-using xTermsAndConditionsService.Providers;
+using xTermsAndConditionsService.Controllers;
 
 namespace xServices.Controllers
 {
-    public class XTermsAndConditionsProviderController : XTermsAndConditionsControllerBase, IXTermsAndConditionsController
+    public class TermsAndConditionsProviderController : XTermsAndConditionsControllerBase, IXTermsAndConditionsController
     {
-        public XTermsAndConditionsProviderController(
+        public TermsAndConditionsProviderController(
-            ILogger<XTermsAndConditionsProviderController> logger,
+            ILogger<TermsAndConditionsProviderController> logger,
             XAppConfiguration appConfiguration,
             IXIdentityProvider identityProvider,
             XValidationProvider validationProvider,

Controllers/TestProviderController.cs

@@ -1,20 +1,20 @@
 using System;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.Extensions.Logging;
-using xCommons.Configurations;
-using xCommons.Providers;
-using xIdentityService.Interfaces;
 using xServices.Base;
+using xCommons.Providers;
 using xServices.Interfaces;
+using xCommons.Configurations;
 using xServices.Models.Entities;
+using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xServices.Controllers
 {
-    public class XTestProviderController : XTestProviderControllerBase, IXTestProviderController
+    public class TestProviderController : XTestProviderControllerBase, IXTestProviderController
     {
-        public XTestProviderController(
+        public TestProviderController(
-            ILogger<XTestProviderController> logger, 
+            ILogger<TestProviderController> logger, 
             XAppConfiguration appConfiguration, 
             IXIdentityProvider identityProvider, 
             XValidationProvider validationProvider, 

DI/XDIHelperExtension.cs

@@ -1,28 +1,28 @@
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Builder;
+using xTagService.DI;
-using Microsoft.Extensions.Configuration;
+using xDataService.DI;
-using Microsoft.Extensions.DependencyInjection;
+using xFileService.DI;
+using xPushService.DI;
+using xStringService.DI;
+using xContentService.DI;
+using xMessageService.DI;
+using xStorageService.DI;
+using xWebinarService.DI;
 using xCategoryService.DI;
 using xCommons.Extensions;
-using xContentService.DI;
-using xDataService.DI;
 using xDataService.Models;
-using xFileService.DI;
 using xIdentityService.DI;
-using xMessageService.DI;
-using xPushService.DI;
-using xPushService.Helpers;
-using xServices.Configurations;
 using xServices.Constants;
 using xServices.Databases;
-using xServices.Interfaces;
 using xServices.Providers;
-using xStorageService.DI;
+using xPushService.Helpers;
-using xStringService.DI;
+using xServices.Interfaces;
-using xTagService.DI;
+using xServices.Configurations;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Builder;
 using xTermsAndConditionsService.DI;
-using xWebinarService.DI;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace xServices.DI
 {

Databases/XApiDatabaseDescriptor.cs

@@ -1,12 +1,12 @@
 using System;
-using System.Collections.Generic;
 using GraphQL.Types;
-using xDataService.Interfaces;
 using xDataService.Models;
-using xServices.Interfaces;
-using xServices.Models.Entities;
-using xServices.Models.GraphQL;
 using xServices.Providers;
+using xServices.Interfaces;
+using xDataService.Interfaces;
+using xServices.Models.GraphQL;
+using xServices.Models.Entities;
+using System.Collections.Generic;
 
 namespace xServices.Databases
 {

Databases/XApiDbContext.cs

@@ -1,14 +1,14 @@
-using Microsoft.EntityFrameworkCore;
-using xCategoryService.Providers;
-using xContentService.Providers;
-using xDataService.Configuration;
 using xDataService.Db;
+using xTagService.Providers;
 using xDataService.Providers;
 using xFileService.Providers;
-using xServices.Models.Entities;
 using xStringService.Providers;
-using xTagService.Providers;
+using xContentService.Providers;
+using xServices.Models.Entities;
 using xWebinarService.Providers;
+using xCategoryService.Providers;
+using xDataService.Configuration;
+using Microsoft.EntityFrameworkCore;
 
 namespace xServices.Databases
 {

Interfaces/IXTestDtoHub.cs

@@ -1,6 +1,6 @@
 using System;
-using xPushService.Interfaces;
 using xServices.Models.Dtos;
+using xPushService.Interfaces;
 using xServices.Models.Entities;
 
 namespace xServices.Interfaces

Interfaces/IXTestGraphQuery.cs

@@ -1,8 +1,8 @@
 using System;
 using GraphQL.Types;
 using xDataService.Interfaces;
-using xServices.Models.Entities;
 using xServices.Models.GraphQL;
+using xServices.Models.Entities;
 
 namespace xServices.Interfaces
 {

Interfaces/IXTestProvider.cs

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

Interfaces/IXTestProviderController.cs

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

Interfaces/IXTestRepositoryProvider.cs

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

Interfaces/IXTestRepositoryService.cs

@@ -1,6 +1,6 @@
 using System;
-using xDataService.Interfaces;
 using xServices.Models.Dtos;
+using xDataService.Interfaces;
 using xServices.Models.Entities;
 
 namespace xServices.Interfaces

Interfaces/IXTestServiceProvider.cs

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

Models/XGroupedData.cs

@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Generic;
 using xModels.Base;
+using System.Collections.Generic;
 
 namespace xServices.Models
 {

Providers/XTestDtoHub.cs

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

Providers/XTestEFRepository.cs

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

Providers/XTestEntityHub.cs

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

Providers/XTestGraphQLTypeHelper.cs

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

Providers/XTestGraphQuery.cs

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

Providers/XTestInMemoryRepository.cs

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

Providers/XTestKeyGenerator.cs

@@ -1,5 +1,5 @@
-using xDataService.Providers;
 using xServices.Interfaces;
+using xDataService.Providers;
 using xServices.Models.Entities;
 
 namespace xServices.Providers

Providers/XTestMongoRepository.cs

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

Providers/XTestProvider.cs

@@ -1,9 +1,9 @@
 using System;
 using xCommons.Extensions;
-using xIdentityModels.Models;
-using xPushService.Providers;
 using xServices.Interfaces;
 using xServices.Models.Dtos;
+using xIdentityModels.Models;
+using xPushService.Providers;
 using xServices.Models.Entities;
 
 namespace xServices.Providers

Providers/XTestRepositoryEvents.cs

@@ -1,5 +1,5 @@
-using xDataService.Providers;
 using xServices.Interfaces;
+using xDataService.Providers;
 using xServices.Models.Entities;
 
 namespace xServices.Providers

Providers/XTestRepositoryProvider.cs

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

Providers/XTestRepositoryService.cs

@@ -1,10 +1,10 @@
 using System;
-using System.Collections.Generic;
 using AutoMapper;
-using xDataService.Providers;
 using xServices.Interfaces;
 using xServices.Models.Dtos;
+using xDataService.Providers;
 using xServices.Models.Entities;
+using System.Collections.Generic;
 
 namespace xServices.Providers
 {

Providers/XTestSeeder.cs

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

Providers/XTestServiceProvider.cs

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