Lots of the repo interfaces moved

This commit is contained in:
Shannon
2019-11-12 14:16:50 +11:00
parent 545a427d11
commit f3aca158fb
15 changed files with 2 additions and 17 deletions
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using Umbraco.Core.Models;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
using Umbraco.Core.Persistence.Querying;
namespace Umbraco.Core.Persistence.Repositories
@@ -28,14 +28,13 @@ namespace Umbraco.Core.Services.Implement
private readonly IAuditRepository _auditRepository;
private readonly IMemberGroupService _memberGroupService;
private readonly IMediaFileSystem _mediaFileSystem;
//only for unit tests!
internal MembershipProviderBase MembershipProvider { get; set; }
#region Constructor
public MemberService(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IMemberGroupService memberGroupService, IMediaFileSystem mediaFileSystem,
public MemberService(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IMemberGroupService memberGroupService,
IMemberRepository memberRepository, IMemberTypeRepository memberTypeRepository, IMemberGroupRepository memberGroupRepository, IAuditRepository auditRepository)
: base(provider, logger, eventMessagesFactory)
{
@@ -44,7 +43,6 @@ namespace Umbraco.Core.Services.Implement
_memberGroupRepository = memberGroupRepository;
_auditRepository = auditRepository;
_memberGroupService = memberGroupService ?? throw new ArgumentNullException(nameof(memberGroupService));
_mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
}
#endregion
-12
View File
@@ -737,7 +737,6 @@
<Compile Include="Persistence\FaultHandling\Strategies\NetworkConnectivityErrorDetectionStrategy.cs" />
<Compile Include="Persistence\FaultHandling\Strategies\SqlAzureTransientErrorDetectionStrategy.cs" />
<Compile Include="Persistence\FaultHandling\ThrottlingCondition.cs" />
<Compile Include="Persistence\IReadWriteQueryRepository.cs" />
<Compile Include="Persistence\ISqlContext.cs" />
<Compile Include="Persistence\IUmbracoDatabase.cs" />
<Compile Include="Persistence\IUmbracoDatabaseFactory.cs" />
@@ -891,7 +890,6 @@
<Compile Include="Persistence\PocoDataDataReader.cs" />
<Compile Include="Persistence\Querying\CachedExpression.cs" />
<Compile Include="Persistence\Querying\ExpressionVisitorBase.cs" />
<Compile Include="Persistence\Querying\IQuery.cs" />
<Compile Include="Persistence\Querying\ModelToSqlExpressionVisitor.cs" />
<Compile Include="Persistence\Querying\PocoToSqlExpressionVisitor.cs" />
<Compile Include="Persistence\Querying\Query.cs" />
@@ -916,7 +914,6 @@
<Compile Include="Persistence\Repositories\Implement\EntityRepository.cs" />
<Compile Include="Persistence\Repositories\Implement\ExternalLoginRepository.cs" />
<Compile Include="Persistence\Repositories\Implement\FileRepository.cs" />
<Compile Include="Persistence\Repositories\IAuditRepository.cs" />
<Compile Include="Persistence\Repositories\IDocumentBlueprintRepository.cs" />
<Compile Include="Persistence\Repositories\IDocumentRepository.cs" />
<Compile Include="Persistence\Repositories\IContentTypeRepository.cs" />
@@ -938,24 +935,15 @@
<Compile Include="Persistence\Repositories\IMemberRepository.cs" />
<Compile Include="Persistence\Repositories\IMemberTypeRepository.cs" />
<Compile Include="Persistence\Repositories\INotificationsRepository.cs" />
<Compile Include="Persistence\Repositories\IPartialViewMacroRepository.cs" />
<Compile Include="Persistence\Repositories\IPartialViewRepository.cs" />
<Compile Include="Persistence\Repositories\IPublicAccessRepository.cs" />
<Compile Include="Persistence\IQueryRepository.cs" />
<Compile Include="Persistence\IReadRepository.cs" />
<Compile Include="Persistence\Repositories\IRedirectUrlRepository.cs" />
<Compile Include="Persistence\Repositories\IRelationRepository.cs" />
<Compile Include="Persistence\Repositories\IRelationTypeRepository.cs" />
<Compile Include="Persistence\IRepository.cs" />
<Compile Include="Persistence\Repositories\IContentRepository.cs" />
<Compile Include="Persistence\Repositories\IScriptRepository.cs" />
<Compile Include="Persistence\Repositories\IServerRegistrationRepository.cs" />
<Compile Include="Persistence\Repositories\IStylesheetRepository.cs" />
<Compile Include="Persistence\Repositories\ITagRepository.cs" />
<Compile Include="Persistence\Repositories\ITemplateRepository.cs" />
<Compile Include="Persistence\Repositories\IUserGroupRepository.cs" />
<Compile Include="Persistence\Repositories\IUserRepository.cs" />
<Compile Include="Persistence\IWriteRepository.cs" />
<Compile Include="Persistence\Repositories\Implement\LanguageRepository.cs" />
<Compile Include="Persistence\Repositories\Implement\MacroRepository.cs" />
<Compile Include="Persistence\Repositories\Implement\MediaRepository.cs" />
+1 -1
View File
@@ -157,7 +157,7 @@ namespace Umbraco.Tests.TestHelpers
var notificationService = GetLazyService<INotificationService>(factory, c => new NotificationService(scopeProvider, userService.Value, contentService.Value, localizationService.Value, logger, GetRepo<INotificationsRepository>(c), globalSettings, umbracoSettings.Content));
var serverRegistrationService = GetLazyService<IServerRegistrationService>(factory, c => new ServerRegistrationService(scopeProvider, logger, eventMessagesFactory, GetRepo<IServerRegistrationRepository>(c)));
var memberGroupService = GetLazyService<IMemberGroupService>(factory, c => new MemberGroupService(scopeProvider, logger, eventMessagesFactory, GetRepo<IMemberGroupRepository>(c)));
var memberService = GetLazyService<IMemberService>(factory, c => new MemberService(scopeProvider, logger, eventMessagesFactory, memberGroupService.Value, mediaFileSystem, GetRepo<IMemberRepository>(c), GetRepo<IMemberTypeRepository>(c), GetRepo<IMemberGroupRepository>(c), GetRepo<IAuditRepository>(c)));
var memberService = GetLazyService<IMemberService>(factory, c => new MemberService(scopeProvider, logger, eventMessagesFactory, memberGroupService.Value, GetRepo<IMemberRepository>(c), GetRepo<IMemberTypeRepository>(c), GetRepo<IMemberGroupRepository>(c), GetRepo<IAuditRepository>(c)));
var mediaService = GetLazyService<IMediaService>(factory, c => new MediaService(scopeProvider, mediaFileSystem, logger, eventMessagesFactory, GetRepo<IMediaRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<IMediaTypeRepository>(c), GetRepo<IEntityRepository>(c)));
var contentTypeService = GetLazyService<IContentTypeService>(factory, c => new ContentTypeService(scopeProvider, logger, eventMessagesFactory, contentService.Value, GetRepo<IContentTypeRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<IDocumentTypeContainerRepository>(c), GetRepo<IEntityRepository>(c)));
var mediaTypeService = GetLazyService<IMediaTypeService>(factory, c => new MediaTypeService(scopeProvider, logger, eventMessagesFactory, mediaService.Value, GetRepo<IMediaTypeRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<IMediaTypeContainerRepository>(c), GetRepo<IEntityRepository>(c)));