refactoring unit of work towards open closed, linting, slight cleanup

Author: piotr-mamenas

Core/Core.csproj

@@ -120,7 +120,6 @@
     <Compile Include="Enums\Language.cs" />
     <Compile Include="Enums\Periodicity.cs" />
     <Compile Include="Exceptions\NoCalculationResultException.cs" />
-    <Compile Include="Interfaces\IComplete.cs" />
     <Compile Include="Interfaces\IEntityRoot.cs" />
     <Compile Include="Interfaces\IUnitOfWork.cs" />
     <Compile Include="Interfaces\Repositories\Business\IAccountRepository.cs" />

Core/Interfaces/IComplete.cs

@@ -8,22 +8,6 @@ namespace Core.Interfaces
 {
     public interface IUnitOfWork : IDisposable
     {
-        IAccountRepository Accounts { get; }
-        IContactRepository Contacts { get; }
-        IAssetRepository Assets { get; }
-        IBondRepository Bonds { get; }
-        IPartnerRepository Partners { get; }
-        IInstitutionRepository Institutions { get; }
-        IInstitutionRepository Banks { get; }
-        ICurrencyRepository Currencies { get; }
-        ICountryRepository Countries { get; }
-        IMessageRepository Messages { get; }
-        IPortfolioRepository Portfolios { get; }
-        IReportRepository Reports { get; }
-        IExchangeRateRepository ExchangeRates { get; }
-        IReturnRepository Returns { get; }
-        IReturnRepository HoldingPeriodReturns { get; }
-        ITileWidgetRepository TileWidgets { get; }
         Task<int> CompleteAsync();
     }
 }

Core/Interfaces/IUnitOfWork.cs

@@ -16,10 +16,10 @@ public class AssetService : IAssetService
         private readonly IAssetRepository _assetRepository;
         private readonly IBondRepository _bondRepository;
 
-        public AssetService(IUnitOfWork unitOfWork)
+        public AssetService(IAssetRepository assetRepository, IBondRepository bondRepository)
         {
-            _assetRepository = unitOfWork.Assets;
-            _bondRepository = unitOfWork.Bonds;
+            _assetRepository = assetRepository;
+            _bondRepository = bondRepository;
         }
 
         public decimal? GetPortfolioAssetReturnsForPeriod(List<Tuple<DateTime,DateTime>> calculationPeriods, Portfolio portfolio, Asset asset)

Core/Services/AssetService.cs

@@ -229,8 +229,10 @@
     <Compile Include="Repositories\Business\InstitutionRepository.cs" />
     <Compile Include="Repositories\Business\PortfolioRepository.cs" />
     <Compile Include="Repositories\Repository.cs" />
+    <Compile Include="Serialization\JsonContractResolvers\AccountContractResolver.cs" />
+    <Compile Include="Serialization\JsonContractResolvers\AssetContractResolver.cs" />
+    <Compile Include="Serialization\JsonContractResolvers\ContactContractResolver.cs" />
     <Compile Include="Services\SessionService.cs" />
-    <Compile Include="Services\LocalizationService.cs" />
     <Compile Include="UnitOfWork.cs" />
   </ItemGroup>
   <ItemGroup>

Infrastructure/Infrastructure.csproj

@@ -0,0 +1,20 @@
+using System.Reflection;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace Infrastructure.Serialization.JsonContractResolvers
+{
+    public class AccountContractResolver : DefaultContractResolver
+    {
+        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+        {
+            var property = base.CreateProperty(member, memberSerialization);
+
+            if (property.PropertyName == "Accounts" || property.PropertyName == "Contacts")
+            {
+                property.ShouldSerialize = i => false;
+            }
+            return property;
+        }
+    }
+}

Infrastructure/Serialization/JsonContractResolvers/AccountContractResolver.cs

@@ -0,0 +1,20 @@
+using System.Reflection;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace Infrastructure.Serialization.JsonContractResolvers
+{
+    public class AssetContractResolver : DefaultContractResolver
+    {
+        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+        {
+            var property = base.CreateProperty(member, memberSerialization);
+
+            if (property.PropertyName == "Assets")
+            {
+                property.ShouldSerialize = i => false;
+            }
+            return property;
+        }
+    }
+}

Infrastructure/Serialization/JsonContractResolvers/AssetContractResolver.cs

@@ -0,0 +1,20 @@
+using System.Reflection;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace Infrastructure.Serialization.JsonContractResolvers
+{
+    public class ContactContractResolver : DefaultContractResolver
+    {
+        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+        {
+            var property = base.CreateProperty(member, memberSerialization);
+
+            if (property.PropertyName == "Contacts")
+            {
+                property.ShouldSerialize = i => false;
+            }
+            return property;
+        }
+    }
+}

Infrastructure/Serialization/JsonContractResolvers/ContactContractResolver.cs

@@ -1,57 +1,17 @@
 using System.Threading.Tasks;
 using Core.Interfaces;
-using Core.Interfaces.Repositories.BaseData;
-using Core.Interfaces.Repositories.Business;
-using Core.Interfaces.Repositories.System;
-using Infrastructure.Repositories.BaseData;
-using Infrastructure.Repositories.Business;
-using Infrastructure.Repositories.System;
 
 namespace Infrastructure
 {
-    public class UnitOfWork : IUnitOfWork, IComplete
+    public class UnitOfWork : IUnitOfWork
     {
         private readonly ApplicationDbContext _context;
 
         public UnitOfWork(ApplicationDbContext context)
         {
             _context = context;
-
-            Accounts = new AccountRepository(_context);
-            Assets = new AssetRepository(_context);
-            Bonds = new BondRepository(_context);
-            Contacts = new ContactRepository(_context);
-            Partners = new PartnerRepository(_context);
-            Institutions = new InstitutionRepository(_context);
-            Banks = new InstitutionRepository(_context);
-            Currencies = new CurrencyRepository(_context);
-            Countries = new CountryRepository(_context);
-            Messages = new MessageRepository(_context);
-            Portfolios = new PortfolioRepository(_context);
-            Reports = new ReportRepository(_context);
-            ExchangeRates = new ExchangeRateRepository(_context);
-            Returns = new ReturnRepository(_context);
-            HoldingPeriodReturns = new ReturnRepository(_context);
-            TileWidgets = new TileWidgetRepository(_context);
         }
 
-        public IAccountRepository Accounts { get; }
-        public IAssetRepository Assets { get; }
-        public IBondRepository Bonds { get; }
-        public IPartnerRepository Partners { get; }
-        public IInstitutionRepository Institutions { get; }
-        public IInstitutionRepository Banks { get; }
-        public IContactRepository Contacts { get; }
-        public ICurrencyRepository Currencies { get; }
-        public ICountryRepository Countries { get; }
-        public IMessageRepository Messages { get; }
-        public IPortfolioRepository Portfolios { get; }
-        public IReportRepository Reports { get; }
-        public IExchangeRateRepository ExchangeRates { get; }
-        public IReturnRepository Returns { get; }
-        public IReturnRepository HoldingPeriodReturns { get; }
-        public ITileWidgetRepository TileWidgets { get; }
-
         public async Task<int> CompleteAsync()
         {
             return await _context.SaveChangesAsync();