Move merged services to Provider

src/api/common/FinancialHub.Common/Interfaces/Repositories/IBaseRepository.cs

@@ -6,8 +6,7 @@ namespace FinancialHub.Common.Interfaces.Repositories
     /// Base repository with basic CRUD methods
     /// </summary>
     /// <typeparam name="T">Any Entity that inherits <see cref="BaseEntity"/> </typeparam>
-    public interface IBaseRepository<T>
-        where T : BaseEntity
+    public interface IBaseRepository<T> where T : BaseEntity
     {
         /// <summary>
         /// Adds an entity to the database 
@@ -37,5 +36,10 @@ public interface IBaseRepository<T>
         /// </summary>
         /// <param name="id">Id of the choosen entity</param>
         Task<T?> GetByIdAsync(Guid id);
+        /// <summary>
+        /// Commit All changes to the database
+        /// </summary>
+        /// <returns>Number of affected entities</returns>
+        Task<int> CommitAsync();
     }
 }

src/api/core/FinancialHub.Core.Application/Extensions/Configurations/IServiceCollectionExtensions.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using FinancialHub.Core.Application.Mappers;
 using FinancialHub.Core.Application.Services;
 using FinancialHub.Core.Application.Validators;
 using FluentValidation;
@@ -10,7 +9,6 @@ public static class IServiceCollectionExtensions
     {
         public static IServiceCollection AddCoreServices(this IServiceCollection services)
         {
-            services.AddMapper();
             services.AddServices();
             services.AddValidators();
 
@@ -24,16 +22,6 @@ private static IServiceCollection AddServices(this IServiceCollection services)
             services.AddScoped<ITransactionsService, TransactionsService>();
             services.AddScoped<IBalancesService, BalancesService>();
 
-            services.AddScoped<IAccountBalanceService, AccountBalanceService>();
-            services.AddScoped<ITransactionBalanceService, TransactionBalanceService>();
-
-            return services;
-        }
-
-        private static IServiceCollection AddMapper(this IServiceCollection services)
-        {
-            services.AddScoped<IMapperWrapper, FinancialHubMapperWrapper>();
-
             return services;
         }
 

src/api/core/FinancialHub.Core.Application/Services/BalancesService.cs

@@ -5,8 +5,8 @@ namespace FinancialHub.Core.Application.Services
     public class BalancesService : IBalancesService
     {
         private readonly IAccountsProvider accountsProvider;
-        private readonly IErrorMessageProvider errorMessageProvider;
         private readonly IBalancesProvider balancesProvider;
+        private readonly IErrorMessageProvider errorMessageProvider;
 
         public BalancesService(
             IBalancesProvider balancesProvider,

src/api/core/FinancialHub.Core.Application/Services/TransactionBalanceService.cs

@@ -2,6 +2,7 @@
 
 namespace FinancialHub.Core.Application.Services
 {
+    [Obsolete("This Service will be removed and the logic will be moved to Balance and Transaction models")]
     public class TransactionBalanceService : ITransactionBalanceService
     {
         private readonly ITransactionsService transactionsService;
@@ -120,34 +121,6 @@ public async Task UpdateAmountAsync(TransactionModel oldTransaction, Transaction
             }
         }
 
-        public async Task<ServiceResult<TransactionModel>> CreateTransactionAsync(TransactionModel transaction)
-        {
-            var transactionResult = await transactionsService.CreateAsync(transaction);
-
-            if(transactionResult.HasError) { 
-                return transactionResult;
-            }
-
-            if(transactionResult.Data!.IsPaid)
-            {
-                var balanceResult = await balancesService.GetByIdAsync(transaction.BalanceId);
-                if(balanceResult.HasError) { 
-                    return balanceResult.Error;
-                }
-
-                if (transaction.Type == TransactionType.Earn)
-                {
-                    await balancesService.UpdateAmountAsync(transaction.BalanceId, balanceResult.Data!.Amount + transaction.Amount);
-                }
-                else
-                {
-                    await balancesService.UpdateAmountAsync(transaction.BalanceId, balanceResult.Data!.Amount - transaction.Amount);
-                }
-            }
-
-            return transactionResult;
-        }
-
         public async Task<ServiceResult<TransactionModel>> UpdateTransactionAsync(Guid id, TransactionModel transaction)
         {
             var oldTransactionResult = await transactionsService.GetByIdAsync(id);
@@ -178,17 +151,5 @@ public async Task<ServiceResult<TransactionModel>> UpdateTransactionAsync(Guid i
 
             return transactionResult;
         }
-
-        public async Task<ServiceResult<bool>> DeleteTransactionAsync(Guid id)
-        {            
-            var deleted = await this.transactionsService.DeleteAsync(id);
-
-            if (deleted.HasError)
-                return deleted.Error;
-            if (deleted.Data == 0)
-                return false;
-
-            return true;
-        }
     }
 }

src/api/core/FinancialHub.Core.Application/Services/TransactionsService.cs

@@ -1,5 +1,4 @@
 using FinancialHub.Core.Domain.Filters;
-using FinancialHub.Core.Domain.Enums;
 using FinancialHub.Core.Domain.Interfaces.Resources;
 
 namespace FinancialHub.Core.Application.Services
@@ -64,13 +63,6 @@ public async Task<ServiceResult<int>> DeleteAsync(Guid id)
                 return transactionResult.Error;
             }
 
-            var transaction = transactionResult.Data!;
-
-            if (transaction.Status == TransactionStatus.Committed && transaction.IsActive)
-            {
-                await this.balancesProvider.DecreaseAmountAsync(transaction.BalanceId, transaction.Amount, transaction.Type);
-            }
-
             return await this.transactionsProvider.DeleteAsync(id);
         }
 

src/api/core/FinancialHub.Core.Domain/Interfaces/Services/ITransactionBalanceService.cs

@@ -5,9 +5,7 @@ namespace FinancialHub.Core.Domain.Interfaces.Services
 {
     public interface ITransactionBalanceService
     {
-        Task<ServiceResult<TransactionModel>> CreateTransactionAsync(TransactionModel transaction);
         Task<ServiceResult<TransactionModel>> UpdateTransactionAsync(Guid id,TransactionModel transaction);
         Task UpdateAmountAsync(TransactionModel oldTransaction, TransactionModel newTransaction);
-        Task<ServiceResult<bool>> DeleteTransactionAsync(Guid id);
     }
 }

src/api/core/FinancialHub.Core.Infra.Data/Repositories/BaseRepository.cs

@@ -5,8 +5,7 @@
 
 namespace FinancialHub.Core.Infra.Data.Repositories
 {
-    public class BaseRepository<T> : IBaseRepository<T>
-        where T : BaseEntity
+    public class BaseRepository<T> : IBaseRepository<T> where T : BaseEntity
     {
         protected readonly FinancialHubContext context;
         public BaseRepository(FinancialHubContext context)
@@ -21,7 +20,6 @@ public virtual async Task<T> CreateAsync(T obj)
             obj.UpdateTime = DateTimeOffset.Now;
 
             var res = await context.Set<T>().AddAsync(obj);
-            await context.SaveChangesAsync();
             return res.Entity;
         }
 
@@ -32,7 +30,7 @@ public virtual async Task<int> DeleteAsync(Guid id)
             if(entity != null)
             {
                 context.Set<T>().Remove(entity);
-                return await context.SaveChangesAsync();
+                return 1;
             }
             else
             {
@@ -68,5 +66,10 @@ public virtual async Task<ICollection<T>> GetAsync(Func<T, bool> predicate)
         {
             return await context.Set<T>().AsNoTracking().FirstOrDefaultAsync(x => x.Id == id);
         }
+
+        public async Task<int> CommitAsync()
+        {
+            return await context.SaveChangesAsync();
+        }
     }
 }

src/api/core/FinancialHub.Core.Infra/Providers/AccountsProvider.cs

@@ -4,25 +4,38 @@ public class AccountsProvider : IAccountsProvider
     {
         private readonly IMapper mapper;
         private readonly IAccountsRepository repository;
+        private readonly IBalancesRepository balanceRepository;
 
-        public AccountsProvider(IMapper mapper, IAccountsRepository repository)
+        public AccountsProvider(IMapper mapper, IAccountsRepository repository, IBalancesRepository balanceRepository)
         {
             this.mapper = mapper;
             this.repository = repository;
+            this.balanceRepository = balanceRepository;
         }
 
         public async Task<AccountModel> CreateAsync(AccountModel account)
         {
             var accountEntity = mapper.Map<AccountEntity>(account);
-
             var createdAccount = await this.repository.CreateAsync(accountEntity);
 
+            var balance = new BalanceModel()
+            {
+                Name = $"{createdAccount!.Name} Default Balance",
+                AccountId = createdAccount.Id.GetValueOrDefault(),
+                IsActive = createdAccount.IsActive
+            };
+            var balanceEntity = mapper.Map<BalanceEntity>(balance);
+            await this.balanceRepository.CreateAsync(balanceEntity);
+
+            await this.repository.CommitAsync();
+
             return mapper.Map<AccountModel>(createdAccount);
         }
 
         public async Task<int> DeleteAsync(Guid id)
         {
-            return await repository.DeleteAsync(id);
+            await repository.DeleteAsync(id);
+            return await this.repository.CommitAsync();
         }
 
         public async Task<ICollection<AccountModel>> GetAllAsync()
@@ -48,6 +61,8 @@ public async Task<AccountModel> UpdateAsync(Guid id, AccountModel account)
             accountEntity.Id = id;
 
             var updatedAccount = await this.repository.UpdateAsync(accountEntity);
+            await this.repository.CommitAsync();
+
             return mapper.Map<AccountModel>(updatedAccount);
         }
     }