refactor(app): implement year filtering for accounts and enhance dashboard PDF generation
This commit is contained in:
@@ -13,16 +13,60 @@ public class AccountService : IAccountService
|
||||
|
||||
public AccountService(IDbContextFactory<FinanceDbContext> dbFactory) => _dbFactory = dbFactory;
|
||||
|
||||
public async Task<List<AccountSummaryDto>> GetAllAccountsAsync()
|
||||
public Task<List<AccountSummaryDto>> GetAllAccountsAsync()
|
||||
{
|
||||
return GetAllAccountsAsync(null);
|
||||
}
|
||||
|
||||
public async Task<List<AccountSummaryDto>> GetAllAccountsAsync(int? year)
|
||||
{
|
||||
await using var db = await _dbFactory.CreateDbContextAsync();
|
||||
|
||||
var accounts = await db.Accounts
|
||||
.Include(a => a.Entries)
|
||||
.OrderBy(a => a.Name)
|
||||
.ToListAsync();
|
||||
|
||||
return accounts.Select(MapToSummary).ToList();
|
||||
var entries = db.Entries.Where(e => !e.IsDeleted);
|
||||
|
||||
if (year.HasValue)
|
||||
{
|
||||
var movementBeforeYearByAccountId = await entries
|
||||
.Where(e => e.Date.Year < year.Value)
|
||||
.GroupBy(e => e.AccountId)
|
||||
.ToDictionaryAsync(
|
||||
g => g.Key,
|
||||
g => g.Sum(e => e.Type == EntryType.Income ? e.Amount : -e.Amount));
|
||||
|
||||
var movementInYearByAccountId = await entries
|
||||
.Where(e => e.Date.Year == year.Value)
|
||||
.GroupBy(e => e.AccountId)
|
||||
.ToDictionaryAsync(
|
||||
g => g.Key,
|
||||
g => g.Sum(e => e.Type == EntryType.Income ? e.Amount : -e.Amount));
|
||||
|
||||
return accounts
|
||||
.Select(account =>
|
||||
{
|
||||
var carryoverForYear = account.CarryoverBalance + movementBeforeYearByAccountId.GetValueOrDefault(account.Id);
|
||||
var totalBalance = carryoverForYear + movementInYearByAccountId.GetValueOrDefault(account.Id);
|
||||
return new AccountSummaryDto(account.Id, account.Name, carryoverForYear, totalBalance, account.CreatedUtc);
|
||||
})
|
||||
.ToList();
|
||||
}
|
||||
|
||||
var movementAllByAccountId = await entries
|
||||
.GroupBy(e => e.AccountId)
|
||||
.ToDictionaryAsync(
|
||||
g => g.Key,
|
||||
g => g.Sum(e => e.Type == EntryType.Income ? e.Amount : -e.Amount));
|
||||
|
||||
return accounts
|
||||
.Select(account =>
|
||||
{
|
||||
var totalBalance = account.CarryoverBalance + movementAllByAccountId.GetValueOrDefault(account.Id);
|
||||
return new AccountSummaryDto(account.Id, account.Name, account.CarryoverBalance, totalBalance, account.CreatedUtc);
|
||||
})
|
||||
.ToList();
|
||||
}
|
||||
|
||||
public async Task<AccountSummaryDto> GetAccountAsync(int accountId)
|
||||
@@ -34,7 +78,11 @@ public class AccountService : IAccountService
|
||||
.FirstOrDefaultAsync(a => a.Id == accountId)
|
||||
?? throw new InvalidOperationException($"Account {accountId} not found.");
|
||||
|
||||
return MapToSummary(account);
|
||||
var totalIncome = account.Entries.Where(e => !e.IsDeleted && e.Type == EntryType.Income).Sum(e => e.Amount);
|
||||
var totalExpense = account.Entries.Where(e => !e.IsDeleted && e.Type == EntryType.Expense).Sum(e => e.Amount);
|
||||
var totalBalance = account.CarryoverBalance + totalIncome - totalExpense;
|
||||
|
||||
return new AccountSummaryDto(account.Id, account.Name, account.CarryoverBalance, totalBalance, account.CreatedUtc);
|
||||
}
|
||||
|
||||
public async Task<AccountSummaryDto> CreateAccountAsync(string name)
|
||||
@@ -115,12 +163,4 @@ public class AccountService : IAccountService
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
private static AccountSummaryDto MapToSummary(Account account)
|
||||
{
|
||||
var totalIncome = account.Entries.Where(e => e.Type == EntryType.Income).Sum(e => e.Amount);
|
||||
var totalExpense = account.Entries.Where(e => e.Type == EntryType.Expense).Sum(e => e.Amount);
|
||||
var totalBalance = account.CarryoverBalance + totalIncome - totalExpense;
|
||||
|
||||
return new AccountSummaryDto(account.Id, account.Name, account.CarryoverBalance, totalBalance, account.CreatedUtc);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user