diff --git a/Base/XTestProviderControllerBase.cs b/Base/XTestProviderControllerBase.cs index a070317..3e4d2f2 100644 --- a/Base/XTestProviderControllerBase.cs +++ b/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 xPushService.Controllers; +using xServices.Providers; 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 { diff --git a/Configurations/XTestTypeConfiguration.cs b/Configurations/XTestTypeConfiguration.cs index 6c12af7..f8e6993 100644 --- a/Configurations/XTestTypeConfiguration.cs +++ b/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 { diff --git a/Controllers/XCategoryProviderController.cs b/Controllers/CategoryProviderController.cs similarity index 82% rename from Controllers/XCategoryProviderController.cs rename to Controllers/CategoryProviderController.cs index d41acda..1a2b439 100644 --- a/Controllers/XCategoryProviderController.cs +++ b/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 xCommons.Providers; -using xIdentityService.Interfaces; +using Microsoft.EntityFrameworkCore.Query; namespace xServices.Controllers { - public class XCategoryProviderController : XCategoryProviderControllerBase, IXCategoryProviderController + public class CategoryProviderController : XCategoryProviderControllerBase, IXCategoryProviderController { - public XCategoryProviderController( - ILogger logger, + public CategoryProviderController( + ILogger logger, XAppConfiguration appConfiguration, IXIdentityProvider identityProvider, XValidationProvider validationProvider, diff --git a/Controllers/ContentProviderController.cs b/Controllers/ContentProviderController.cs new file mode 100644 index 0000000..dc41171 --- /dev/null +++ b/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 logger, + XAppConfiguration appConfiguration, + IXIdentityProvider identityProvider, + XValidationProvider validationProvider, + IXContentProvider provider, + IXContentTagProvided tagProvided, + Func, IOrderedQueryable> defaultOrderBuilder = null, + Func, IIncludableQueryable> defaultIncludeBuilder = null + ) : base( + logger, + appConfiguration, + identityProvider, + validationProvider, + provider, + tagProvided, + defaultOrderBuilder, + defaultIncludeBuilder + ) + { } + } +} \ No newline at end of file diff --git a/Controllers/XFileProviderController.cs b/Controllers/FileProviderController.cs similarity index 84% rename from Controllers/XFileProviderController.cs rename to Controllers/FileProviderController.cs index 7269d3f..ee14f6b 100644 --- a/Controllers/XFileProviderController.cs +++ b/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( - ILogger logger, + public FileProviderController( + ILogger logger, XAppConfiguration appConfiguration, IXIdentityProvider identityProvider, XValidationProvider validationProvider, diff --git a/Controllers/XSubCategoryProviderController.cs b/Controllers/SubCategoryProviderController.cs similarity index 81% rename from Controllers/XSubCategoryProviderController.cs rename to Controllers/SubCategoryProviderController.cs index 9857c24..a8346d3 100644 --- a/Controllers/XSubCategoryProviderController.cs +++ b/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 xCommons.Providers; -using xIdentityService.Interfaces; +using Microsoft.EntityFrameworkCore.Query; namespace xServices.Controllers { - public class XSubCategoryProviderController : XSubCategoryProviderControllerBase, IXSubCategoryProviderController + public class SubCategoryProviderController : XSubCategoryProviderControllerBase, IXSubCategoryProviderController { - public XSubCategoryProviderController( - ILogger logger, + public SubCategoryProviderController( + ILogger logger, XAppConfiguration appConfiguration, IXIdentityProvider identityProvider, XValidationProvider validationProvider, diff --git a/Controllers/XTagProviderController.cs b/Controllers/TagProviderController.cs similarity index 83% rename from Controllers/XTagProviderController.cs rename to Controllers/TagProviderController.cs index 76c7797..22a85b3 100644 --- a/Controllers/XTagProviderController.cs +++ b/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( - ILogger logger, + public TagProviderController( + ILogger logger, XAppConfiguration appConfiguration, IXIdentityProvider identityProvider, XValidationProvider validationProvider, diff --git a/Controllers/XTermsAndConditionsProviderController.cs b/Controllers/TermsAndConditionsProviderController.cs similarity index 68% rename from Controllers/XTermsAndConditionsProviderController.cs rename to Controllers/TermsAndConditionsProviderController.cs index f403ebf..5580889 100644 --- a/Controllers/XTermsAndConditionsProviderController.cs +++ b/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( - ILogger logger, + public TermsAndConditionsProviderController( + ILogger logger, XAppConfiguration appConfiguration, IXIdentityProvider identityProvider, XValidationProvider validationProvider, diff --git a/Controllers/XTestProviderController.cs b/Controllers/TestProviderController.cs similarity index 83% rename from Controllers/XTestProviderController.cs rename to Controllers/TestProviderController.cs index e39d532..13b252d 100644 --- a/Controllers/XTestProviderController.cs +++ b/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( - ILogger logger, + public TestProviderController( + ILogger logger, XAppConfiguration appConfiguration, IXIdentityProvider identityProvider, XValidationProvider validationProvider, diff --git a/DI/XDIHelperExtension.cs b/DI/XDIHelperExtension.cs index 99234b6..5f57b99 100644 --- a/DI/XDIHelperExtension.cs +++ b/DI/XDIHelperExtension.cs @@ -1,28 +1,28 @@ -using System.Collections.Generic; using System.Linq; -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; +using xTagService.DI; +using xDataService.DI; +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 xStringService.DI; -using xTagService.DI; +using xPushService.Helpers; +using xServices.Interfaces; +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 { diff --git a/Databases/XApiDatabaseDescriptor.cs b/Databases/XApiDatabaseDescriptor.cs index 9af9280..3bd9b3a 100644 --- a/Databases/XApiDatabaseDescriptor.cs +++ b/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 { diff --git a/Databases/XApiDbContext.cs b/Databases/XApiDbContext.cs index 21d5c83..e28926f 100644 --- a/Databases/XApiDbContext.cs +++ b/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 { diff --git a/Interfaces/IXTestDtoHub.cs b/Interfaces/IXTestDtoHub.cs index 8be7af9..5c8ef9b 100644 --- a/Interfaces/IXTestDtoHub.cs +++ b/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 diff --git a/Interfaces/IXTestGraphQuery.cs b/Interfaces/IXTestGraphQuery.cs index 528f26e..f017ba4 100644 --- a/Interfaces/IXTestGraphQuery.cs +++ b/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 { diff --git a/Interfaces/IXTestProvider.cs b/Interfaces/IXTestProvider.cs index e7dee63..b5adb54 100644 --- a/Interfaces/IXTestProvider.cs +++ b/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 { diff --git a/Interfaces/IXTestProviderController.cs b/Interfaces/IXTestProviderController.cs index 4564056..e831c77 100644 --- a/Interfaces/IXTestProviderController.cs +++ b/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 { diff --git a/Interfaces/IXTestRepositoryProvider.cs b/Interfaces/IXTestRepositoryProvider.cs index 10e05c3..8eace2c 100644 --- a/Interfaces/IXTestRepositoryProvider.cs +++ b/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 { diff --git a/Interfaces/IXTestRepositoryService.cs b/Interfaces/IXTestRepositoryService.cs index 887c6b1..db1f340 100644 --- a/Interfaces/IXTestRepositoryService.cs +++ b/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 diff --git a/Interfaces/IXTestServiceProvider.cs b/Interfaces/IXTestServiceProvider.cs index 0b54023..0f6552f 100644 --- a/Interfaces/IXTestServiceProvider.cs +++ b/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 { diff --git a/Models/XGroupedData.cs b/Models/XGroupedData.cs index fda9f6c..15c81c1 100644 --- a/Models/XGroupedData.cs +++ b/Models/XGroupedData.cs @@ -1,6 +1,6 @@ using System; -using System.Collections.Generic; using xModels.Base; +using System.Collections.Generic; namespace xServices.Models { diff --git a/Providers/XTestDtoHub.cs b/Providers/XTestDtoHub.cs index acf78fc..2ed143c 100644 --- a/Providers/XTestDtoHub.cs +++ b/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 { diff --git a/Providers/XTestEFRepository.cs b/Providers/XTestEFRepository.cs index 476bdaf..cf03dae 100644 --- a/Providers/XTestEFRepository.cs +++ b/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 { diff --git a/Providers/XTestEntityHub.cs b/Providers/XTestEntityHub.cs index 1fc1226..be30ef0 100644 --- a/Providers/XTestEntityHub.cs +++ b/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 { diff --git a/Providers/XTestGraphQLTypeHelper.cs b/Providers/XTestGraphQLTypeHelper.cs index 2c2fa50..be22642 100644 --- a/Providers/XTestGraphQLTypeHelper.cs +++ b/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 { diff --git a/Providers/XTestGraphQuery.cs b/Providers/XTestGraphQuery.cs index d31e2f9..abcbabb 100644 --- a/Providers/XTestGraphQuery.cs +++ b/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 { diff --git a/Providers/XTestInMemoryRepository.cs b/Providers/XTestInMemoryRepository.cs index 92531bb..9597f69 100644 --- a/Providers/XTestInMemoryRepository.cs +++ b/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 { diff --git a/Providers/XTestKeyGenerator.cs b/Providers/XTestKeyGenerator.cs index a4e98a5..8c05a5f 100644 --- a/Providers/XTestKeyGenerator.cs +++ b/Providers/XTestKeyGenerator.cs @@ -1,5 +1,5 @@ -using xDataService.Providers; using xServices.Interfaces; +using xDataService.Providers; using xServices.Models.Entities; namespace xServices.Providers diff --git a/Providers/XTestMongoRepository.cs b/Providers/XTestMongoRepository.cs index f757dca..e91c449 100644 --- a/Providers/XTestMongoRepository.cs +++ b/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 { diff --git a/Providers/XTestProvider.cs b/Providers/XTestProvider.cs index a9c845d..6c8b549 100644 --- a/Providers/XTestProvider.cs +++ b/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 diff --git a/Providers/XTestRepositoryEvents.cs b/Providers/XTestRepositoryEvents.cs index 30aa3a4..3d7dec7 100644 --- a/Providers/XTestRepositoryEvents.cs +++ b/Providers/XTestRepositoryEvents.cs @@ -1,5 +1,5 @@ -using xDataService.Providers; using xServices.Interfaces; +using xDataService.Providers; using xServices.Models.Entities; namespace xServices.Providers diff --git a/Providers/XTestRepositoryProvider.cs b/Providers/XTestRepositoryProvider.cs index fbda2d8..a145639 100644 --- a/Providers/XTestRepositoryProvider.cs +++ b/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 { diff --git a/Providers/XTestRepositoryService.cs b/Providers/XTestRepositoryService.cs index 2e5d8b1..4f5c265 100644 --- a/Providers/XTestRepositoryService.cs +++ b/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 { diff --git a/Providers/XTestSeeder.cs b/Providers/XTestSeeder.cs index 8363161..c130eb8 100644 --- a/Providers/XTestSeeder.cs +++ b/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 { diff --git a/Providers/XTestServiceProvider.cs b/Providers/XTestServiceProvider.cs index 9f56f70..cbf7975 100644 --- a/Providers/XTestServiceProvider.cs +++ b/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 {