correct duplicate generci repo anti pattern

piotr-mamenas · piotr-mamenas · commit 342296f1a106 · 2021-08-14T16:26:09.000+02:00
diff --git a/Core/Interfaces/Repositories/BaseData/ICountryRepository.cs b/Core/Interfaces/Repositories/BaseData/ICountryRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Core.Interfaces.Repositories.BaseData
 {
-    public interface ICountryRepository : IRepository<Country>
+    public interface ICountryRepository
     {
         Task<IEnumerable<Country>> GetAllCountriesAsync();
     }
diff --git a/Core/Interfaces/Repositories/BaseData/ICurrencyRepository.cs b/Core/Interfaces/Repositories/BaseData/ICurrencyRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Core.Interfaces.Repositories.BaseData
 {
-    public interface ICurrencyRepository : IRepository<Currency>
+    public interface ICurrencyRepository
     {
         Task<IEnumerable<Currency>> GetAllCurrenciesAsync();
     }
diff --git a/Core/Interfaces/Repositories/Business/IAccountRepository.cs b/Core/Interfaces/Repositories/Business/IAccountRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Core.Interfaces.Repositories.Business
 {
-    public interface IAccountRepository : IRepository<Account>
+    public interface IAccountRepository
     {
         Task<IEnumerable<Account>> GetAllWithPartnerAsync();
     }
diff --git a/Core/Interfaces/Repositories/Business/IAssetRepository.cs b/Core/Interfaces/Repositories/Business/IAssetRepository.cs
@@ -6,9 +6,8 @@
 
 namespace Core.Interfaces.Repositories.Business
 {
-    public interface IAssetRepository : IRepository<Asset>
+    public interface IAssetRepository
     {
-        Task<IEnumerable<AssetPrice>> GetPrices(Expression<Func<AssetPrice, bool>> predicate);
         Task<IEnumerable<Asset>> GetAllAssetsWithDetailsByPortfolioAsync(int portfolioId);
         Task<IEnumerable<Asset>> GetAllAssetsWithPricesAsync();
     }
diff --git a/Core/Interfaces/Repositories/Business/IBondRepository.cs b/Core/Interfaces/Repositories/Business/IBondRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Core.Interfaces.Repositories.Business
 {
-    public interface IBondRepository : IRepository<Bond>
+    public interface IBondRepository
     {
         Task<Bond> GetBondAssetWithCurrencyAsync(int bondId);
     }
diff --git a/Core/Interfaces/Repositories/Business/IContactRepository.cs b/Core/Interfaces/Repositories/Business/IContactRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Core.Interfaces.Repositories.Business
 {
-    public interface IContactRepository : IRepository<Contact>
+    public interface IContactRepository
     {
         Task<IEnumerable<Contact>> GetAllContactsWithPartnersAsync();
     }
diff --git a/Core/Interfaces/Repositories/Business/IExchangeRateRepository.cs b/Core/Interfaces/Repositories/Business/IExchangeRateRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Core.Interfaces.Repositories.Business
 {
-    public interface IExchangeRateRepository : IRepository<ExchangeRate>
+    public interface IExchangeRateRepository
     {
         Task<IEnumerable<ExchangeRate>> GetExchangeRatesWithCurrenciesAsync();
     }
diff --git a/Core/Interfaces/Repositories/Business/IInstitutionRepository.cs b/Core/Interfaces/Repositories/Business/IInstitutionRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Core.Interfaces.Repositories.Business
 {
-    public interface IInstitutionRepository : IRepository<Institution>
+    public interface IInstitutionRepository
     {
         Task<IEnumerable<Institution>> GetAllInstitutionsAsync();
     }
diff --git a/Core/Interfaces/Repositories/Business/IPartnerRepository.cs b/Core/Interfaces/Repositories/Business/IPartnerRepository.cs
@@ -5,9 +5,8 @@
 
 namespace Core.Interfaces.Repositories.Business
 {
-    public interface IPartnerRepository : IRepository<Partner>
+    public interface IPartnerRepository
     {
-        IQueryable<PartnerType> GetTypesAsQueryable();
         Task<IEnumerable<Partner>> GetAllPartnersAsync();
         Task<IEnumerable<Partner>> GetAllPartnersWithTypesAsync();
         Task<IEnumerable<Partner>> GetAccountPartnersAsync(int accountId);
diff --git a/Core/Interfaces/Repositories/Business/IPortfolioRepository.cs b/Core/Interfaces/Repositories/Business/IPortfolioRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Core.Interfaces.Repositories.Business
 {
-    public interface IPortfolioRepository : IRepository<Portfolio>
+    public interface IPortfolioRepository
     {
         Task<IEnumerable<Portfolio>> GetAllPortfoliosWithDetailsAsync();
     }
diff --git a/Core/Interfaces/Repositories/Business/IReportRepository.cs b/Core/Interfaces/Repositories/Business/IReportRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Core.Interfaces.Repositories.Business
 {
-    public interface IReportRepository : IRepository<Report>
+    public interface IReportRepository
     {
         Task<IEnumerable<Report>> GetAllReportsAsync();
     }
diff --git a/Core/Interfaces/Repositories/Business/IReturnRepository.cs b/Core/Interfaces/Repositories/Business/IReturnRepository.cs
@@ -2,7 +2,7 @@
 
 namespace Core.Interfaces.Repositories.Business
 {
-    public interface IReturnRepository : IRepository<Return>
+    public interface IReturnRepository
     {
         decimal GetLastHoldingPeriodReturnRate(int assetId);
     }
diff --git a/Core/Interfaces/Repositories/Business/ITileWidgetRepository.cs b/Core/Interfaces/Repositories/Business/ITileWidgetRepository.cs
@@ -4,7 +4,7 @@
 
 namespace Core.Interfaces.Repositories.Business
 {
-    public interface ITileWidgetRepository : IRepository<TileWidget>
+    public interface ITileWidgetRepository
     {
         Task<IEnumerable<TileWidget>> GetUserWidgetsByUserGuidAsync(string userGuid);
         Task<IEnumerable<WidgetBookmark>> GetUserBookmarksByUserGuidAsync(string userGuid);
diff --git a/Infrastructure/Infrastructure.csproj b/Infrastructure/Infrastructure.csproj
@@ -221,11 +221,9 @@
     <Compile Include="Repositories\Business\ReportRepository.cs" />
     <Compile Include="Repositories\Business\ReturnRepository.cs" />
     <Compile Include="Repositories\Business\TileWidgetRepository.cs" />
-    <Compile Include="Repositories\System\MessageRepository.cs" />
     <Compile Include="Repositories\Business\PartnerRepository.cs" />
     <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" />
diff --git a/Infrastructure/Repositories/BaseData/CountryRepository.cs b/Infrastructure/Repositories/BaseData/CountryRepository.cs
@@ -1,21 +1,24 @@
 ﻿using System.Collections.Generic;
 using System.Data.Entity;
+using System.Runtime.Remoting.Contexts;
 using System.Threading.Tasks;
 using Core.Domain.Countries;
 using Core.Interfaces.Repositories.BaseData;
 
 namespace Infrastructure.Repositories.BaseData
 {
-    public class CountryRepository : Repository<Country>, ICountryRepository
+    public class CountryRepository : ICountryRepository
     {
+        private readonly ApplicationDbContext _context;
+
         public CountryRepository(ApplicationDbContext context)
-            : base(context)
         {
+            _context = context;
         }
 
         public async Task<IEnumerable<Country>> GetAllCountriesAsync()
         {
-            return await Context.Countries.ToListAsync();
+            return await _context.Countries.ToListAsync();
         }
     }
 }
diff --git a/Infrastructure/Repositories/BaseData/CurrencyRepository.cs b/Infrastructure/Repositories/BaseData/CurrencyRepository.cs
@@ -7,16 +7,18 @@
 
 namespace Infrastructure.Repositories.BaseData
 {
-    public class CurrencyRepository : Repository<Currency>, ICurrencyRepository
+    public class CurrencyRepository : ICurrencyRepository
     {
+        private readonly ApplicationDbContext _context;
+
         public CurrencyRepository(ApplicationDbContext context)
-            : base(context)
         {
+            _context = context;
         }
 
         public async Task<IEnumerable<Currency>> GetAllCurrenciesAsync()
         {
-            return await Context.Currencies.ToListAsync();
+            return await _context.Currencies.ToListAsync();
         }
     }
 }
diff --git a/Infrastructure/Repositories/Business/AccountRepository.cs b/Infrastructure/Repositories/Business/AccountRepository.cs
@@ -5,16 +5,18 @@
 using Core.Interfaces.Repositories.Business;
 namespace Infrastructure.Repositories.Business
 {
-    public class AccountRepository : Repository<Account>, IAccountRepository
+    public class AccountRepository : IAccountRepository
     {
+        private readonly ApplicationDbContext _context;
+
         public AccountRepository(ApplicationDbContext context)
-            : base(context)
         {
+            _context = context;
         }
 
         public async Task<IEnumerable<Account>> GetAllWithPartnerAsync()
         {
-            return await Context.Accounts
+            return await _context.Accounts
                 .Include(a => a.Partner)
                 .ToListAsync();
         }
diff --git a/Infrastructure/Repositories/Business/AssetRepository.cs b/Infrastructure/Repositories/Business/AssetRepository.cs
@@ -1,40 +1,32 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
-using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Core.Domain.Assets;
 using Core.Interfaces.Repositories.Business;
 
 namespace Infrastructure.Repositories.Business
 {
-    public class AssetRepository : Repository<Asset>, IAssetRepository
+    public class AssetRepository : IAssetRepository
     {
-        public AssetRepository(ApplicationDbContext context)
-            : base(context)
-        {
-        }
+        private readonly ApplicationDbContext _context;
 
-        public async Task<IEnumerable<AssetPrice>> GetPrices(Expression<Func<AssetPrice,bool>> predicate)
+        public AssetRepository(ApplicationDbContext context)
         {
-            return await Context.Set<AssetPrice>()
-                .Where(predicate)
-                .Include(ap => ap.Asset)
-                .Include(ap => ap.Currency)
-                .ToListAsync();
+            _context = context;
         }
 
         public async Task<IEnumerable<Asset>> GetAllAssetsWithPricesAsync()
         {
-            return await Context.Assets
+            return await _context.Assets
                 .Include(a => a.Prices)
                 .Include(a => a.Class)
                 .ToListAsync();
         }
+
         public async Task<IEnumerable<Asset>> GetAllAssetsWithDetailsByPortfolioAsync(int portfolioId)
         {
-            return await Context.Assets.Where(a => a.Portfolios.Any(p => p.Id == portfolioId))
+            return await _context.Assets.Where(a => a.Portfolios.Any(p => p.Id == portfolioId))
                 .Include(a => a.Class)
                 .Include(a => a.Prices)
                 .Include(a => a.Prices.Select(p => p.Currency))
diff --git a/Infrastructure/Repositories/Business/BondRepository.cs b/Infrastructure/Repositories/Business/BondRepository.cs
@@ -7,16 +7,20 @@
 
 namespace Infrastructure.Repositories.Business
 {
-    public class BondRepository : Repository<Bond>, IBondRepository
+    public class BondRepository : IBondRepository
     {
+        private readonly ApplicationDbContext _context;
+        private readonly DbSet<Bond> _bonds;
+
         public BondRepository(ApplicationDbContext context)
-            : base(context)
         {
+            _context = context;
+            _bonds = context.Set<Bond>();
         }
 
         public async Task<Bond> GetBondAssetWithCurrencyAsync(int bondId)
         {
-            return await GetAll()
+            return await _bonds
                 .Where(b => b.Id == bondId)
                 .Include(b => b.Currency)
                 .SingleOrDefaultAsync();
diff --git a/Infrastructure/Repositories/Business/ContactRepository.cs b/Infrastructure/Repositories/Business/ContactRepository.cs
@@ -6,16 +6,18 @@
 
 namespace Infrastructure.Repositories.Business
 {
-    public class ContactRepository : Repository<Contact>, IContactRepository
+    public class ContactRepository : IContactRepository
     {
+        private readonly ApplicationDbContext _context;
+
         public ContactRepository(ApplicationDbContext context)
-            : base(context)
         {
+            _context = context;
         }
 
         public async Task<IEnumerable<Contact>> GetAllContactsWithPartnersAsync()
         {
-            return await Context.Contacts
+            return await _context.Contacts
                 .Include(p => p.Partner)
                 .ToListAsync();
         }
diff --git a/Infrastructure/Repositories/Business/ExchangeRateRepository.cs b/Infrastructure/Repositories/Business/ExchangeRateRepository.cs
@@ -6,16 +6,18 @@
 
 namespace Infrastructure.Repositories.Business
 {
-    public class ExchangeRateRepository : Repository<ExchangeRate>, IExchangeRateRepository
+    public class ExchangeRateRepository : IExchangeRateRepository
     {
+        private readonly ApplicationDbContext _context;
+
         public ExchangeRateRepository(ApplicationDbContext context)
-            : base(context)
         {
+            _context = context;
         }
 
         public async Task<IEnumerable<ExchangeRate>> GetExchangeRatesWithCurrenciesAsync()
         {
-            return await Context.ExchangeRates
+            return await _context.ExchangeRates
                 .Include(er => er.BaseCurrency)
                 .Include(er => er.TargetCurrency)
                 .ToListAsync();
diff --git a/Infrastructure/Repositories/Business/InstitutionRepository.cs b/Infrastructure/Repositories/Business/InstitutionRepository.cs
@@ -6,16 +6,18 @@
 
 namespace Infrastructure.Repositories.Business
 {
-    public class InstitutionRepository : Repository<Institution>, IInstitutionRepository
+    public class InstitutionRepository : IInstitutionRepository
     {
+        private readonly ApplicationDbContext _context;
+
         public InstitutionRepository(ApplicationDbContext context)
-            : base(context)
         {
+            _context = context;
         }
 
         public async Task<IEnumerable<Institution>> GetAllInstitutionsAsync()
         {
-            return await Context.Institutions.ToListAsync();
+            return await _context.Institutions.ToListAsync();
         }
     }
 }
diff --git a/Infrastructure/Repositories/Business/PartnerRepository.cs b/Infrastructure/Repositories/Business/PartnerRepository.cs
@@ -7,36 +7,33 @@
 
 namespace Infrastructure.Repositories.Business
 {
-    public class PartnerRepository : Repository<Partner>, IPartnerRepository
+    public class PartnerRepository : IPartnerRepository
     {
-        public PartnerRepository(ApplicationDbContext context)
-            : base(context)
-        {
-        }
+        private readonly ApplicationDbContext _context;
 
-        public IQueryable<PartnerType> GetTypesAsQueryable()
+        public PartnerRepository(ApplicationDbContext context)
         {
-            return Context.PartnerTypes.AsQueryable();
+            _context = context;
         }
 
         public async Task<IEnumerable<Partner>> GetAllPartnersAsync()
         {
-            return await Context.Partners.ToListAsync();
+            return await _context.Partners.ToListAsync();
         }
 
         public async Task<IEnumerable<Partner>> GetAllPartnersWithTypesAsync()
         {
-            return await Context.Partners.Include(p => p.Type).ToListAsync();
+            return await _context.Partners.Include(p => p.Type).ToListAsync();
         }
 
         public async Task<IEnumerable<Partner>> GetAccountPartnersAsync(int accountId)
         {
-            return await Context.Partners.Where(a => a.Accounts.Any(p => p.Id == accountId)).ToListAsync();
+            return await _context.Partners.Where(a => a.Accounts.Any(p => p.Id == accountId)).ToListAsync();
         }
 
         public async Task<Partner> GetByIdWithAccountsAndContactsAsync(int id)
         {
-            return await Context.Partners.Where(p => p.Id == id)
+            return await _context.Partners.Where(p => p.Id == id)
                 .Include(p => p.Accounts)
                 .Include(p => p.Contacts)
                 .SingleOrDefaultAsync();
diff --git a/Infrastructure/Repositories/Business/PortfolioRepository.cs b/Infrastructure/Repositories/Business/PortfolioRepository.cs
diff --git a/Infrastructure/Repositories/Business/ReportRepository.cs b/Infrastructure/Repositories/Business/ReportRepository.cs
diff --git a/Infrastructure/Repositories/Business/ReturnRepository.cs b/Infrastructure/Repositories/Business/ReturnRepository.cs
diff --git a/Infrastructure/Repositories/Business/TileWidgetRepository.cs b/Infrastructure/Repositories/Business/TileWidgetRepository.cs
diff --git a/Infrastructure/Repositories/Repository.cs b/Infrastructure/Repositories/Repository.cs
diff --git a/Infrastructure/Repositories/System/MessageRepository.cs b/Infrastructure/Repositories/System/MessageRepository.cs

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Core.Interfaces.Repositories.BaseData`
`6`	`6`	`{`
`7`		`- public interface ICountryRepository : IRepository<Country>`
	`7`	`+ public interface ICountryRepository`
`8`	`8`	`{`
`9`	`9`	`Task<IEnumerable<Country>> GetAllCountriesAsync();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Core.Interfaces.Repositories.BaseData`
`6`	`6`	`{`
`7`		`- public interface ICurrencyRepository : IRepository<Currency>`
	`7`	`+ public interface ICurrencyRepository`
`8`	`8`	`{`
`9`	`9`	`Task<IEnumerable<Currency>> GetAllCurrenciesAsync();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Core.Interfaces.Repositories.Business`
`6`	`6`	`{`
`7`		`- public interface IAccountRepository : IRepository<Account>`
	`7`	`+ public interface IAccountRepository`
`8`	`8`	`{`
`9`	`9`	`Task<IEnumerable<Account>> GetAllWithPartnerAsync();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,8 @@`
`6`	`6`
`7`	`7`	`namespace Core.Interfaces.Repositories.Business`
`8`	`8`	`{`
`9`		`- public interface IAssetRepository : IRepository<Asset>`
	`9`	`+ public interface IAssetRepository`
`10`	`10`	`{`
`11`		`- Task<IEnumerable<AssetPrice>> GetPrices(Expression<Func<AssetPrice, bool>> predicate);`
`12`	`11`	`Task<IEnumerable<Asset>> GetAllAssetsWithDetailsByPortfolioAsync(int portfolioId);`
`13`	`12`	`Task<IEnumerable<Asset>> GetAllAssetsWithPricesAsync();`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Core.Interfaces.Repositories.Business`
`6`	`6`	`{`
`7`		`- public interface IBondRepository : IRepository<Bond>`
	`7`	`+ public interface IBondRepository`
`8`	`8`	`{`
`9`	`9`	`Task<Bond> GetBondAssetWithCurrencyAsync(int bondId);`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Core.Interfaces.Repositories.Business`
`6`	`6`	`{`
`7`		`- public interface IContactRepository : IRepository<Contact>`
	`7`	`+ public interface IContactRepository`
`8`	`8`	`{`
`9`	`9`	`Task<IEnumerable<Contact>> GetAllContactsWithPartnersAsync();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Core.Interfaces.Repositories.Business`
`6`	`6`	`{`
`7`		`- public interface IExchangeRateRepository : IRepository<ExchangeRate>`
	`7`	`+ public interface IExchangeRateRepository`
`8`	`8`	`{`
`9`	`9`	`Task<IEnumerable<ExchangeRate>> GetExchangeRatesWithCurrenciesAsync();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Core.Interfaces.Repositories.Business`
`6`	`6`	`{`
`7`		`- public interface IInstitutionRepository : IRepository<Institution>`
	`7`	`+ public interface IInstitutionRepository`
`8`	`8`	`{`
`9`	`9`	`Task<IEnumerable<Institution>> GetAllInstitutionsAsync();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,8 @@`
`5`	`5`
`6`	`6`	`namespace Core.Interfaces.Repositories.Business`
`7`	`7`	`{`
`8`		`- public interface IPartnerRepository : IRepository<Partner>`
	`8`	`+ public interface IPartnerRepository`
`9`	`9`	`{`
`10`		`- IQueryable<PartnerType> GetTypesAsQueryable();`
`11`	`10`	`Task<IEnumerable<Partner>> GetAllPartnersAsync();`
`12`	`11`	`Task<IEnumerable<Partner>> GetAllPartnersWithTypesAsync();`
`13`	`12`	`Task<IEnumerable<Partner>> GetAccountPartnersAsync(int accountId);`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Core.Interfaces.Repositories.Business`
`6`	`6`	`{`
`7`		`- public interface IPortfolioRepository : IRepository<Portfolio>`
	`7`	`+ public interface IPortfolioRepository`
`8`	`8`	`{`
`9`	`9`	`Task<IEnumerable<Portfolio>> GetAllPortfoliosWithDetailsAsync();`
`10`	`10`	`}`