Merge pull request #24 from Kentico/streamlining-di

Streamlines DI by letting base classes implement appropriate interfaces. Also moves and renames CultureRepository to CultureService and ICultureService respectivelyDictionary
Kentico · Mar 21, 2019 · 1b332e0 · 1b332e0
2 parents 994dfd6 + a32b4ce
commit 1b332e0
Show file tree

Hide file tree

Showing 24 changed files with 44 additions and 35 deletions.
diff --git a/Business/Business.csproj b/Business/Business.csproj
@@ -552,8 +552,8 @@
     <Compile Include="Repository\Company\ICompanyServiceRepository.cs" />
     <Compile Include="Repository\Contact\ContactSectionRepository.cs" />
     <Compile Include="Repository\Contact\IContactSectionRepository.cs" />
-    <Compile Include="Repository\Culture\CultureRepository.cs" />
-    <Compile Include="Repository\Culture\ICultureRepository.cs" />
+    <Compile Include="Services\Culture\CultureService.cs" />
+    <Compile Include="Services\Culture\ICultureService.cs" />
     <Compile Include="Repository\Doctor\DoctorRepository.cs" />
     <Compile Include="Repository\Doctor\DoctorSectionRepository.cs" />
     <Compile Include="Repository\Doctor\IDoctorRepository.cs" />
@@ -567,6 +567,7 @@
     <Compile Include="Repository\Menu\MenuRepository.cs" />
     <Compile Include="Repository\Social\ISocialLinkRepository.cs" />
     <Compile Include="Repository\Social\SocialLinkRepository.cs" />
+    <Compile Include="Services\BaseService.cs" />
     <Compile Include="Services\Cache\CacheDependencyType.cs" />
     <Compile Include="Services\Cache\CacheService.cs" />
     <Compile Include="Services\Cache\ICacheService.cs" />

diff --git a/Business/DependencyInjection/BusinessDependencies.cs b/Business/DependencyInjection/BusinessDependencies.cs
@@ -1,33 +1,33 @@
 using Business.Repository.Company;
-using Business.Repository.Culture;
 using Business.Repository.Menu;
 using Business.Repository.Social;
 using Business.Services.Cache;
 using Business.Services.Context;
+using Business.Services.Culture;
 
 namespace Business.DependencyInjection
 {
     public class BusinessDependencies : IBusinessDependencies
     {
         public IMenuRepository MenuRepository { get; }
         public ICompanyRepository CompanyRepository { get; }
-        public ICultureRepository CultureRepository { get; }
+        public ICultureService CultureService { get; }
         public ISiteContextService SiteContextService { get; }
         public ISocialLinkRepository SocialLinkRepository { get; }
         public ICacheService CacheService { get; }
 
         public BusinessDependencies(
             IMenuRepository menuRepository,
             ICompanyRepository companyRepository,
-            ICultureRepository cultureRepository,
+            ICultureService cultureService,
             ISiteContextService siteContextService,
             ISocialLinkRepository socialLinkRepository,
             ICacheService cacheDependencyService
             )
         {
             MenuRepository = menuRepository;
             CompanyRepository = companyRepository;
-            CultureRepository = cultureRepository;
+            CultureService = cultureService;
             SiteContextService = siteContextService;
             SocialLinkRepository = socialLinkRepository;
             CacheService = cacheDependencyService;

diff --git a/Business/DependencyInjection/IBusinessDependencies.cs b/Business/DependencyInjection/IBusinessDependencies.cs
@@ -1,17 +1,17 @@
 using Business.Repository.Company;
-using Business.Repository.Culture;
 using Business.Repository.Menu;
 using Business.Repository.Social;
 using Business.Services.Cache;
 using Business.Services.Context;
+using Business.Services.Culture;
 
 namespace Business.DependencyInjection
 {
     public interface IBusinessDependencies
     {
         IMenuRepository MenuRepository { get; }
         ICompanyRepository CompanyRepository { get; }
-        ICultureRepository CultureRepository { get; }
+        ICultureService CultureService { get; }
         ISiteContextService SiteContextService { get; }
         ISocialLinkRepository SocialLinkRepository { get; }
         ICacheService CacheService { get; }

diff --git a/Business/Repository/BaseRepository.cs b/Business/Repository/BaseRepository.cs
@@ -2,7 +2,7 @@
 
 namespace Business.Repository
 {
-    public abstract class BaseRepository
+    public abstract class BaseRepository: IRepository
     {
         protected IDocumentQueryService DocumentQueryService { get; }
 

diff --git a/Business/Repository/Company/ICompanyRepository.cs b/Business/Repository/Company/ICompanyRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Business.Repository.Company
 {
-    public interface ICompanyRepository : IRepository
+    public interface ICompanyRepository
     {
         CompanyDto GetCompany();
     }

diff --git a/Business/Repository/Company/ICompanyServiceRepository.cs b/Business/Repository/Company/ICompanyServiceRepository.cs
@@ -3,7 +3,7 @@
 
 namespace Business.Repository.Company
 {
-    public interface ICompanyServiceRepository : IRepository
+    public interface ICompanyServiceRepository
     {
          IEnumerable<CompanyServiceDto> GetCompanyServices();
     }

diff --git a/Business/Repository/Contact/IContactSectionRepository.cs b/Business/Repository/Contact/IContactSectionRepository.cs
@@ -2,7 +2,7 @@
 
 namespace Business.Repository.Contact
 {
-    public interface IContactSectionRepository : IRepository
+    public interface IContactSectionRepository
     {
         ContactSectionDto GetContactSection();
     }

diff --git a/Business/Repository/Doctor/IDoctorRepository.cs b/Business/Repository/Doctor/IDoctorRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Business.Repository.Doctor
 {
-    public interface IDoctorRepository : IRepository
+    public interface IDoctorRepository
     {
         IEnumerable<DoctorDto> GetDoctors();
         DoctorDto GetDoctor(Guid nodeGuid);

diff --git a/Business/Repository/Doctor/IDoctorSectionRepository.cs b/Business/Repository/Doctor/IDoctorSectionRepository.cs
@@ -2,7 +2,7 @@
 
 namespace Business.Repository.Doctor
 {
-    public interface IDoctorSectionRepository : IRepository
+    public interface IDoctorSectionRepository
     {
         DoctorSectionDto GetDoctorSection();
     }

diff --git a/Business/Repository/Home/IHomeSectionRepository.cs b/Business/Repository/Home/IHomeSectionRepository.cs
@@ -2,7 +2,7 @@
 
 namespace Business.Repository.Home
 {
-    public interface IHomeSectionRepository : IRepository
+    public interface IHomeSectionRepository
     {
         HomeSectionDto GetHomeSection();
     }

diff --git a/Business/Repository/Map/IMapRepository.cs b/Business/Repository/Map/IMapRepository.cs
@@ -3,7 +3,7 @@
 
 namespace Business.Repository.Map
 {
-    public interface IMapRepository : IRepository
+    public interface IMapRepository 
     {
         IEnumerable<MapLocationDto> GetOfficeLocations();
     }

diff --git a/Business/Repository/Menu/IMenuRepository.cs b/Business/Repository/Menu/IMenuRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Business.Repository.Menu
 {
-    public interface IMenuRepository : IRepository
+    public interface IMenuRepository
     {
         IEnumerable<MenuItemDto> GetMenuItems();
     }

diff --git a/Business/Repository/Social/ISocialLinkRepository.cs b/Business/Repository/Social/ISocialLinkRepository.cs
@@ -3,7 +3,7 @@
 
 namespace Business.Repository.Social
 {
-    public interface ISocialLinkRepository : IRepository
+    public interface ISocialLinkRepository
     {
         IEnumerable<SocialLinkDto> GetSocialLinks();
     }

diff --git a/Business/Services/BaseService.cs b/Business/Services/BaseService.cs
@@ -0,0 +1,7 @@
+
+namespace Business.Services
+{
+    public abstract class BaseService : IService
+    {
+    }
+}
diff --git a/Business/Services/Cache/CacheService.cs b/Business/Services/Cache/CacheService.cs
@@ -5,7 +5,7 @@
 
 namespace Business.Services.Cache
 {
-    public class CacheService : ICacheService
+    public class CacheService : BaseService, ICacheService
     {
         public ISiteContextService SiteContextService { get; }
 

diff --git a/Business/Services/Cache/ICacheService.cs b/Business/Services/Cache/ICacheService.cs
@@ -2,7 +2,7 @@
 
 namespace Business.Services.Cache
 {
-    public interface ICacheService : IService
+    public interface ICacheService
     {
         /// <summary>
         /// Gets nodes cache dependency key for any given type and action

diff --git a/...s/Repository/Culture/CultureRepository.cs → Business/Services/Culture/CultureService.cs b/...s/Repository/Culture/CultureRepository.cs → Business/Services/Culture/CultureService.cs
@@ -1,16 +1,16 @@
 using System.Collections.Generic;
 using System.Linq;
-using CMS.SiteProvider;
 using Business.Dto.Culture;
 using Business.Services.Context;
+using CMS.SiteProvider;
 
-namespace Business.Repository.Culture
+namespace Business.Services.Culture
 {
-    public class CultureRepository : ICultureRepository
+    public class CultureService : BaseService, ICultureService
     {
         private ISiteContextService SiteContextService { get; }
 
-        public CultureRepository(ISiteContextService siteContextService)
+        public CultureService(ISiteContextService siteContextService)
         {
             SiteContextService = siteContextService;
         }

diff --git a/.../Repository/Culture/ICultureRepository.cs → Business/Services/Culture/ICultureService.cs b/.../Repository/Culture/ICultureRepository.cs → Business/Services/Culture/ICultureService.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using Business.Dto.Culture;
 
-namespace Business.Repository.Culture
+namespace Business.Services.Culture
 {
-    public interface ICultureRepository : IRepository
+    public interface ICultureService
     {
         IEnumerable<CultureDto> GetSiteCultures();
     }

diff --git a/Business/Services/MediaLibrary/IMediaLibraryService.cs b/Business/Services/MediaLibrary/IMediaLibraryService.cs
@@ -3,7 +3,7 @@
 
 namespace Business.Services.MediaLibrary
 {
-    public interface IMediaLibraryService : IService
+    public interface IMediaLibraryService
     {
         /// <summary>
         /// Wrapper around Kentico API for retrieving media stored in media libraries. 

diff --git a/Business/Services/MediaLibrary/MediaLibraryService.cs b/Business/Services/MediaLibrary/MediaLibraryService.cs
@@ -5,7 +5,7 @@
 
 namespace Business.Services.MediaLibrary
 {
-    public class MediaLibraryService : IMediaLibraryService
+    public class MediaLibraryService : BaseService, IMediaLibraryService
     {
         public IEnumerable<MediaLibraryFileDto> GetMediaLibraryFiles(string folder, string sitename, params string[] extensions)
         {

diff --git a/Business/Services/Query/DocumentQueryService.cs b/Business/Services/Query/DocumentQueryService.cs
@@ -5,13 +5,13 @@
 
 namespace Business.Services.Query
 {
-    public class DocumentQueryService : IDocumentQueryService
+    public class DocumentQueryService : BaseService, IDocumentQueryService
     {
         private ISiteContextService SiteContext { get; }
 
         private readonly string[] _coreColumns =
         {
-            //Defines initial columns returned for optimization. If not set, all columns are returned.
+            // Defines initial columns returned for optimization. If not set, all columns are returned.
             "NodeGUID", "DocumentID", "NodeID"
         };
 

diff --git a/Business/Services/Query/IDocumentQueryService.cs b/Business/Services/Query/IDocumentQueryService.cs
@@ -3,7 +3,7 @@
 
 namespace Business.Services.Query
 {
-    public interface IDocumentQueryService : IService
+    public interface IDocumentQueryService
     {
         /// <summary>
         /// Wrapper around Kentico's DocumentQuery. 

diff --git a/MedioClinic/Controllers/BaseController.cs b/MedioClinic/Controllers/BaseController.cs
@@ -24,7 +24,7 @@ public PageViewModel GetPageViewModel(string title)
                 MenuItems = Dependencies.MenuRepository.GetMenuItems() ?? new List<MenuItemDto>(),
                 Metadata = GetPageMetadata(title),
                 Company = GetCompany(),
-                Cultures = Dependencies.CultureRepository.GetSiteCultures(),
+                Cultures = Dependencies.CultureService.GetSiteCultures(),
                 SocialLinks = GetSocialLinks(),
             };
         }
@@ -36,7 +36,7 @@ public PageViewModel<TViewModel> GetPageViewModel<TViewModel>(TViewModel data, s
                 MenuItems = Dependencies.MenuRepository.GetMenuItems() ?? new List<MenuItemDto>(),
                 Metadata = GetPageMetadata(title),
                 Company = GetCompany(),
-                Cultures = Dependencies.CultureRepository.GetSiteCultures(),
+                Cultures = Dependencies.CultureService.GetSiteCultures(),
                 SocialLinks = GetSocialLinks(),
                 Data = data
             };

diff --git a/MedioClinic/Utils/SiteContextService.cs b/MedioClinic/Utils/SiteContextService.cs
@@ -1,10 +1,11 @@
-using Business.Services.Context;
+using Business.Services;
+using Business.Services.Context;
 using Kentico.Content.Web.Mvc;
 using Kentico.Web.Mvc;
 
 namespace MedioClinic.Utils
 {
-    public class SiteContextService : ISiteContextService
+    public class SiteContextService : BaseService, ISiteContextService
     {
         public string SiteName { get; }