From b6b794f0b4898b96c6351274e7315eb8bb85ebdb Mon Sep 17 00:00:00 2001 From: Ross Miller Date: Fri, 6 Mar 2026 11:05:01 +0000 Subject: [PATCH] Refactor. Add data layer --- .../ApplicationDbContext.cs | 9 +- BudgetApp.Data/BudgetApp.Data.csproj | 22 + .../Entities}/Account.cs | 2 +- .../Entities}/ApplicationUser.cs | 2 +- .../Entities}/Category.cs | 2 +- BudgetApp.Data/Entities/RecurrenceType.cs | 10 + .../Entities}/Salary.cs | 2 +- .../Entities}/Transaction.cs | 17 +- BudgetApp.Data/Entities/TransactionType.cs | 7 + .../Interfaces/IAccountRepository.cs | 14 + .../Interfaces/ICategoryRepository.cs | 12 + .../Interfaces/ISalaryRepository.cs | 12 + .../Interfaces/ITransactionRepository.cs | 20 + ...AddCurrencyCodeAndCategoryIcon.Designer.cs | 4 +- .../AddCurrencyCodeAndCategoryIcon.cs | 41 ++ .../AddIsDefaultToCategory.Designer.cs | 4 +- .../Migrations/AddIsDefaultToCategory.cs | 28 ++ .../AddIsPaidToTransaction.Designer.cs | 4 +- .../Migrations/AddIsPaidToTransaction.cs | 28 ++ .../AddRecurringTransactions.Designer.cs | 4 +- .../Migrations/AddRecurringTransactions.cs | 69 +++ .../Migrations/AddSalary.Designer.cs | 4 +- BudgetApp.Data/Migrations/AddSalary.cs | 102 ++++ .../ApplicationDbContextModelSnapshot.cs | 4 +- .../Migrations/InitialCreate.Designer.cs | 4 +- BudgetApp.Data/Migrations/InitialCreate.cs | 321 ++++++++++++ .../Repositories/AccountRepository.cs | 35 +- .../Repositories/CategoryRepository.cs | 33 +- .../Repositories/SalaryRepository.cs | 37 +- .../Repositories/TransactionRepository.cs | 84 ++-- BudgetApp.Tests/BudgetApp.Tests.csproj | 1 + .../Helpers/TestDbContextFactory.cs | 1 + BudgetApp.Tests/Models/AccountModelTests.cs | 2 +- .../Services/AccountServiceTests.cs | 26 +- .../Services/CategoryServiceTests.cs | 32 +- .../Services/DashboardServiceTests.cs | 22 +- .../Services/TransactionServiceTests.cs | 59 +-- BudgetApp.slnx | 1 + BudgetApp/BudgetApp.csproj | 10 +- BudgetApp/Components/Layout/NavMenu.razor | 48 +- BudgetApp/Components/Layout/NavMenu.razor.cs | 43 ++ BudgetApp/Components/Pages/About.razor | 36 +- BudgetApp/Components/Pages/About.razor.cs | 38 ++ BudgetApp/Components/Pages/Accounts.razor | 162 +----- BudgetApp/Components/Pages/Accounts.razor.cs | 136 +++++ BudgetApp/Components/Pages/Categories.razor | 133 +---- .../Components/Pages/Categories.razor.cs | 118 +++++ BudgetApp/Components/Pages/Home.razor | 471 +++--------------- BudgetApp/Components/Pages/Home.razor.cs | 371 ++++++++++++++ BudgetApp/Components/Pages/Login.razor | 80 +-- BudgetApp/Components/Pages/Login.razor.cs | 74 +++ BudgetApp/Components/Pages/Logout.razor | 1 + BudgetApp/Components/Pages/Register.razor | 47 +- BudgetApp/Components/Pages/Register.razor.cs | 44 ++ BudgetApp/Components/Pages/Reports.razor | 262 ++-------- BudgetApp/Components/Pages/Reports.razor.cs | 218 ++++++++ BudgetApp/Components/Pages/Salary.razor | 140 +----- BudgetApp/Components/Pages/Salary.razor.cs | 113 +++++ BudgetApp/Components/Pages/Settings.razor | 198 +------- BudgetApp/Components/Pages/Settings.razor.cs | 159 ++++++ BudgetApp/Components/Pages/Transactions.razor | 466 +++-------------- .../Components/Pages/Transactions.razor.cs | 352 +++++++++++++ BudgetApp/Components/Pages/Weather.razor | 64 --- BudgetApp/Components/ToastContainer.razor | 42 +- BudgetApp/Components/ToastContainer.razor.cs | 40 ++ BudgetApp/Components/ToastValidator.razor | 46 +- BudgetApp/Components/ToastValidator.razor.cs | 48 ++ BudgetApp/Components/_Imports.razor | 2 + .../20260301152724_InitialCreate.cs | 323 ------------ ...20260301155815_AddRecurringTransactions.cs | 71 --- ...01160737_AddCurrencyCodeAndCategoryIcon.cs | 42 -- .../20260305164332_AddIsPaidToTransaction.cs | 29 -- .../Migrations/20260305175841_AddSalary.cs | 104 ---- .../20260305181148_AddIsDefaultToCategory.cs | 29 -- BudgetApp/Program.cs | 17 +- BudgetApp/Services/DashboardService.cs | 52 +- BudgetApp/Services/Models/ChartData.cs | 8 + BudgetApp/Services/Models/ChartDataset.cs | 9 + BudgetApp/Services/Models/DashboardData.cs | 14 + BudgetApp/budgetapp.db | Bin 167936 -> 167936 bytes BudgetApp/budgetapp.db-shm | Bin 32768 -> 32768 bytes BudgetApp/budgetapp.db-wal | Bin 449112 -> 41232 bytes 82 files changed, 2930 insertions(+), 2811 deletions(-) rename {BudgetApp/Data => BudgetApp.Data}/ApplicationDbContext.cs (92%) create mode 100644 BudgetApp.Data/BudgetApp.Data.csproj rename {BudgetApp/Data => BudgetApp.Data/Entities}/Account.cs (97%) rename {BudgetApp/Data => BudgetApp.Data/Entities}/ApplicationUser.cs (71%) rename {BudgetApp/Data => BudgetApp.Data/Entities}/Category.cs (93%) create mode 100644 BudgetApp.Data/Entities/RecurrenceType.cs rename {BudgetApp/Data => BudgetApp.Data/Entities}/Salary.cs (97%) rename {BudgetApp/Data => BudgetApp.Data/Entities}/Transaction.cs (84%) create mode 100644 BudgetApp.Data/Entities/TransactionType.cs create mode 100644 BudgetApp.Data/Interfaces/IAccountRepository.cs create mode 100644 BudgetApp.Data/Interfaces/ICategoryRepository.cs create mode 100644 BudgetApp.Data/Interfaces/ISalaryRepository.cs create mode 100644 BudgetApp.Data/Interfaces/ITransactionRepository.cs rename BudgetApp/Migrations/20260301160737_AddCurrencyCodeAndCategoryIcon.Designer.cs => BudgetApp.Data/Migrations/AddCurrencyCodeAndCategoryIcon.Designer.cs (99%) create mode 100644 BudgetApp.Data/Migrations/AddCurrencyCodeAndCategoryIcon.cs rename BudgetApp/Migrations/20260305181148_AddIsDefaultToCategory.Designer.cs => BudgetApp.Data/Migrations/AddIsDefaultToCategory.Designer.cs (99%) create mode 100644 BudgetApp.Data/Migrations/AddIsDefaultToCategory.cs rename BudgetApp/Migrations/20260305164332_AddIsPaidToTransaction.Designer.cs => BudgetApp.Data/Migrations/AddIsPaidToTransaction.Designer.cs (99%) create mode 100644 BudgetApp.Data/Migrations/AddIsPaidToTransaction.cs rename BudgetApp/Migrations/20260301155815_AddRecurringTransactions.Designer.cs => BudgetApp.Data/Migrations/AddRecurringTransactions.Designer.cs (99%) create mode 100644 BudgetApp.Data/Migrations/AddRecurringTransactions.cs rename BudgetApp/Migrations/20260305175841_AddSalary.Designer.cs => BudgetApp.Data/Migrations/AddSalary.Designer.cs (99%) create mode 100644 BudgetApp.Data/Migrations/AddSalary.cs rename {BudgetApp => BudgetApp.Data}/Migrations/ApplicationDbContextModelSnapshot.cs (99%) rename BudgetApp/Migrations/20260301152724_InitialCreate.Designer.cs => BudgetApp.Data/Migrations/InitialCreate.Designer.cs (99%) create mode 100644 BudgetApp.Data/Migrations/InitialCreate.cs rename BudgetApp/Services/AccountService.cs => BudgetApp.Data/Repositories/AccountRepository.cs (67%) rename BudgetApp/Services/CategoryService.cs => BudgetApp.Data/Repositories/CategoryRepository.cs (79%) rename BudgetApp/Services/SalaryService.cs => BudgetApp.Data/Repositories/SalaryRepository.cs (79%) rename BudgetApp/Services/TransactionService.cs => BudgetApp.Data/Repositories/TransactionRepository.cs (78%) create mode 100644 BudgetApp/Components/Layout/NavMenu.razor.cs create mode 100644 BudgetApp/Components/Pages/About.razor.cs create mode 100644 BudgetApp/Components/Pages/Categories.razor.cs create mode 100644 BudgetApp/Components/Pages/Home.razor.cs create mode 100644 BudgetApp/Components/Pages/Register.razor.cs create mode 100644 BudgetApp/Components/Pages/Reports.razor.cs create mode 100644 BudgetApp/Components/Pages/Salary.razor.cs create mode 100644 BudgetApp/Components/Pages/Settings.razor.cs delete mode 100644 BudgetApp/Components/Pages/Weather.razor create mode 100644 BudgetApp/Components/ToastContainer.razor.cs create mode 100644 BudgetApp/Components/ToastValidator.razor.cs delete mode 100644 BudgetApp/Migrations/20260301152724_InitialCreate.cs delete mode 100644 BudgetApp/Migrations/20260301155815_AddRecurringTransactions.cs delete mode 100644 BudgetApp/Migrations/20260301160737_AddCurrencyCodeAndCategoryIcon.cs delete mode 100644 BudgetApp/Migrations/20260305164332_AddIsPaidToTransaction.cs delete mode 100644 BudgetApp/Migrations/20260305175841_AddSalary.cs delete mode 100644 BudgetApp/Migrations/20260305181148_AddIsDefaultToCategory.cs create mode 100644 BudgetApp/Services/Models/ChartData.cs create mode 100644 BudgetApp/Services/Models/ChartDataset.cs create mode 100644 BudgetApp/Services/Models/DashboardData.cs diff --git a/BudgetApp/Data/ApplicationDbContext.cs b/BudgetApp.Data/ApplicationDbContext.cs similarity index 92% rename from BudgetApp/Data/ApplicationDbContext.cs rename to BudgetApp.Data/ApplicationDbContext.cs index 9edeb55..883a974 100644 --- a/BudgetApp/Data/ApplicationDbContext.cs +++ b/BudgetApp.Data/ApplicationDbContext.cs @@ -1,15 +1,12 @@ +using BudgetApp.Data.Entities; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; namespace BudgetApp.Data; -public class ApplicationDbContext : IdentityDbContext +public class ApplicationDbContext(DbContextOptions options) + : IdentityDbContext(options) { - public ApplicationDbContext(DbContextOptions options) - : base(options) - { - } - public DbSet Accounts => Set(); public DbSet Transactions => Set(); public DbSet Categories => Set(); diff --git a/BudgetApp.Data/BudgetApp.Data.csproj b/BudgetApp.Data/BudgetApp.Data.csproj new file mode 100644 index 0000000..becae22 --- /dev/null +++ b/BudgetApp.Data/BudgetApp.Data.csproj @@ -0,0 +1,22 @@ + + + + net10.0 + enable + enable + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + diff --git a/BudgetApp/Data/Account.cs b/BudgetApp.Data/Entities/Account.cs similarity index 97% rename from BudgetApp/Data/Account.cs rename to BudgetApp.Data/Entities/Account.cs index db0354a..44ac8a6 100644 --- a/BudgetApp/Data/Account.cs +++ b/BudgetApp.Data/Entities/Account.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BudgetApp.Data; +namespace BudgetApp.Data.Entities; public class Account { diff --git a/BudgetApp/Data/ApplicationUser.cs b/BudgetApp.Data/Entities/ApplicationUser.cs similarity index 71% rename from BudgetApp/Data/ApplicationUser.cs rename to BudgetApp.Data/Entities/ApplicationUser.cs index 3e0c153..a64a86f 100644 --- a/BudgetApp/Data/ApplicationUser.cs +++ b/BudgetApp.Data/Entities/ApplicationUser.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Identity; -namespace BudgetApp.Data; +namespace BudgetApp.Data.Entities; public class ApplicationUser : IdentityUser { diff --git a/BudgetApp/Data/Category.cs b/BudgetApp.Data/Entities/Category.cs similarity index 93% rename from BudgetApp/Data/Category.cs rename to BudgetApp.Data/Entities/Category.cs index 85037e6..935bc1d 100644 --- a/BudgetApp/Data/Category.cs +++ b/BudgetApp.Data/Entities/Category.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BudgetApp.Data; +namespace BudgetApp.Data.Entities; public class Category { diff --git a/BudgetApp.Data/Entities/RecurrenceType.cs b/BudgetApp.Data/Entities/RecurrenceType.cs new file mode 100644 index 0000000..45a7990 --- /dev/null +++ b/BudgetApp.Data/Entities/RecurrenceType.cs @@ -0,0 +1,10 @@ +namespace BudgetApp.Data.Entities; + +public enum RecurrenceType +{ + None, + Daily, + Weekly, + Monthly, + Yearly +} \ No newline at end of file diff --git a/BudgetApp/Data/Salary.cs b/BudgetApp.Data/Entities/Salary.cs similarity index 97% rename from BudgetApp/Data/Salary.cs rename to BudgetApp.Data/Entities/Salary.cs index c26fc6a..bb8fca9 100644 --- a/BudgetApp/Data/Salary.cs +++ b/BudgetApp.Data/Entities/Salary.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BudgetApp.Data; +namespace BudgetApp.Data.Entities; public class Salary { diff --git a/BudgetApp/Data/Transaction.cs b/BudgetApp.Data/Entities/Transaction.cs similarity index 84% rename from BudgetApp/Data/Transaction.cs rename to BudgetApp.Data/Entities/Transaction.cs index 8cfaf05..b4ff280 100644 --- a/BudgetApp/Data/Transaction.cs +++ b/BudgetApp.Data/Entities/Transaction.cs @@ -1,21 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BudgetApp.Data; - -public enum TransactionType -{ - Income, - Expense -} - -public enum RecurrenceType -{ - None, - Daily, - Weekly, - Monthly, - Yearly -} +namespace BudgetApp.Data.Entities; public class Transaction { diff --git a/BudgetApp.Data/Entities/TransactionType.cs b/BudgetApp.Data/Entities/TransactionType.cs new file mode 100644 index 0000000..147f97c --- /dev/null +++ b/BudgetApp.Data/Entities/TransactionType.cs @@ -0,0 +1,7 @@ +namespace BudgetApp.Data.Entities; + +public enum TransactionType +{ + Income, + Expense +} \ No newline at end of file diff --git a/BudgetApp.Data/Interfaces/IAccountRepository.cs b/BudgetApp.Data/Interfaces/IAccountRepository.cs new file mode 100644 index 0000000..79fbad2 --- /dev/null +++ b/BudgetApp.Data/Interfaces/IAccountRepository.cs @@ -0,0 +1,14 @@ +using BudgetApp.Data.Entities; + +namespace BudgetApp.Data.Interfaces; + +public interface IAccountRepository +{ + Task> GetAccountsAsync(string userId); + Task GetAccountAsync(int id, string userId); + Task CreateAccountAsync(Account account); + Task UpdateAccountAsync(Account account); + Task UpdateBalanceAsync(int id, string userId, decimal newBalance); + Task UpdateAccountDetailsAsync(int id, string userId, string name, string color, string currencyCode); + Task DeleteAccountAsync(int id, string userId); +} diff --git a/BudgetApp.Data/Interfaces/ICategoryRepository.cs b/BudgetApp.Data/Interfaces/ICategoryRepository.cs new file mode 100644 index 0000000..8a1fba0 --- /dev/null +++ b/BudgetApp.Data/Interfaces/ICategoryRepository.cs @@ -0,0 +1,12 @@ +using BudgetApp.Data.Entities; + +namespace BudgetApp.Data.Interfaces; + +public interface ICategoryRepository +{ + Task> GetCategoriesAsync(string userId); + Task EnsureDefaultCategoriesAsync(string userId); + Task CreateCategoryAsync(Category category); + Task UpdateCategoryAsync(int id, string userId, string name, string icon); + Task DeleteCategoryAsync(int id, string userId); +} diff --git a/BudgetApp.Data/Interfaces/ISalaryRepository.cs b/BudgetApp.Data/Interfaces/ISalaryRepository.cs new file mode 100644 index 0000000..0fe2096 --- /dev/null +++ b/BudgetApp.Data/Interfaces/ISalaryRepository.cs @@ -0,0 +1,12 @@ +using BudgetApp.Data.Entities; + +namespace BudgetApp.Data.Interfaces; + +public interface ISalaryRepository +{ + Task> GetSalariesAsync(string userId); + Task CreateSalaryAsync(Salary salary, DateTime windowEnd); + Task DeleteSalaryAsync(int id, string userId); + Task MaterializeSalaryTransactionsAsync(string userId, DateTime windowEnd); + Task GetNextPaydateAsync(int salaryId); +} diff --git a/BudgetApp.Data/Interfaces/ITransactionRepository.cs b/BudgetApp.Data/Interfaces/ITransactionRepository.cs new file mode 100644 index 0000000..3c129c2 --- /dev/null +++ b/BudgetApp.Data/Interfaces/ITransactionRepository.cs @@ -0,0 +1,20 @@ +using BudgetApp.Data.Entities; + +namespace BudgetApp.Data.Interfaces; + +public interface ITransactionRepository +{ + Task> GetTransactionsAsync(string userId); + Task> GetRecentTransactionsAsync(string userId, int count = 5); + Task> GetUpcomingTransactionsAsync(string userId, int count = 5); + Task> GetTransactionsInRangeAsync(string userId, DateTime from, DateTime to); + Task> GetTransactionsByAccountAsync(int accountId, string userId); + Task CreateTransactionAsync(Transaction transaction); + Task UpdateTransactionAsync(int id, string userId, string description, decimal amount, DateTime date, + TransactionType type, int accountId, int? categoryId, + RecurrenceType recurrenceType = RecurrenceType.None, DateTime? recurrenceEndDate = null); + Task DeleteTransactionAsync(int id, string userId); + Task DeleteTransactionSeriesAsync(int id, string userId); + Task MarkAsPaidAsync(int id, string userId, bool isPaid = true); + Task MaterializeRecurringTransactionsAsync(string userId, DateTime? windowEnd = null); +} diff --git a/BudgetApp/Migrations/20260301160737_AddCurrencyCodeAndCategoryIcon.Designer.cs b/BudgetApp.Data/Migrations/AddCurrencyCodeAndCategoryIcon.Designer.cs similarity index 99% rename from BudgetApp/Migrations/20260301160737_AddCurrencyCodeAndCategoryIcon.Designer.cs rename to BudgetApp.Data/Migrations/AddCurrencyCodeAndCategoryIcon.Designer.cs index 9cab8eb..e03aa83 100644 --- a/BudgetApp/Migrations/20260301160737_AddCurrencyCodeAndCategoryIcon.Designer.cs +++ b/BudgetApp.Data/Migrations/AddCurrencyCodeAndCategoryIcon.Designer.cs @@ -1,4 +1,4 @@ -// +// using System; using BudgetApp.Data; using Microsoft.EntityFrameworkCore; @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace BudgetApp.Migrations +namespace BudgetApp.Data.Migrations { [DbContext(typeof(ApplicationDbContext))] [Migration("20260301160737_AddCurrencyCodeAndCategoryIcon")] diff --git a/BudgetApp.Data/Migrations/AddCurrencyCodeAndCategoryIcon.cs b/BudgetApp.Data/Migrations/AddCurrencyCodeAndCategoryIcon.cs new file mode 100644 index 0000000..ddb6c24 --- /dev/null +++ b/BudgetApp.Data/Migrations/AddCurrencyCodeAndCategoryIcon.cs @@ -0,0 +1,41 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BudgetApp.Data.Migrations; + +/// +public partial class AddCurrencyCodeAndCategoryIcon : Migration +{ + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Icon", + table: "Categories", + type: "TEXT", + maxLength: 10, + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "CurrencyCode", + table: "Accounts", + type: "TEXT", + maxLength: 3, + nullable: false, + defaultValue: ""); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Icon", + table: "Categories"); + + migrationBuilder.DropColumn( + name: "CurrencyCode", + table: "Accounts"); + } +} \ No newline at end of file diff --git a/BudgetApp/Migrations/20260305181148_AddIsDefaultToCategory.Designer.cs b/BudgetApp.Data/Migrations/AddIsDefaultToCategory.Designer.cs similarity index 99% rename from BudgetApp/Migrations/20260305181148_AddIsDefaultToCategory.Designer.cs rename to BudgetApp.Data/Migrations/AddIsDefaultToCategory.Designer.cs index a622392..838e735 100644 --- a/BudgetApp/Migrations/20260305181148_AddIsDefaultToCategory.Designer.cs +++ b/BudgetApp.Data/Migrations/AddIsDefaultToCategory.Designer.cs @@ -1,4 +1,4 @@ -// +// using System; using BudgetApp.Data; using Microsoft.EntityFrameworkCore; @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace BudgetApp.Migrations +namespace BudgetApp.Data.Migrations { [DbContext(typeof(ApplicationDbContext))] [Migration("20260305181148_AddIsDefaultToCategory")] diff --git a/BudgetApp.Data/Migrations/AddIsDefaultToCategory.cs b/BudgetApp.Data/Migrations/AddIsDefaultToCategory.cs new file mode 100644 index 0000000..e893ea9 --- /dev/null +++ b/BudgetApp.Data/Migrations/AddIsDefaultToCategory.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BudgetApp.Data.Migrations; + +/// +public partial class AddIsDefaultToCategory : Migration +{ + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "IsDefault", + table: "Categories", + type: "INTEGER", + nullable: false, + defaultValue: false); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "IsDefault", + table: "Categories"); + } +} \ No newline at end of file diff --git a/BudgetApp/Migrations/20260305164332_AddIsPaidToTransaction.Designer.cs b/BudgetApp.Data/Migrations/AddIsPaidToTransaction.Designer.cs similarity index 99% rename from BudgetApp/Migrations/20260305164332_AddIsPaidToTransaction.Designer.cs rename to BudgetApp.Data/Migrations/AddIsPaidToTransaction.Designer.cs index 877119d..cf0442a 100644 --- a/BudgetApp/Migrations/20260305164332_AddIsPaidToTransaction.Designer.cs +++ b/BudgetApp.Data/Migrations/AddIsPaidToTransaction.Designer.cs @@ -1,4 +1,4 @@ -// +// using System; using BudgetApp.Data; using Microsoft.EntityFrameworkCore; @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace BudgetApp.Migrations +namespace BudgetApp.Data.Migrations { [DbContext(typeof(ApplicationDbContext))] [Migration("20260305164332_AddIsPaidToTransaction")] diff --git a/BudgetApp.Data/Migrations/AddIsPaidToTransaction.cs b/BudgetApp.Data/Migrations/AddIsPaidToTransaction.cs new file mode 100644 index 0000000..63eb825 --- /dev/null +++ b/BudgetApp.Data/Migrations/AddIsPaidToTransaction.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BudgetApp.Data.Migrations; + +/// +public partial class AddIsPaidToTransaction : Migration +{ + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "IsPaid", + table: "Transactions", + type: "INTEGER", + nullable: false, + defaultValue: false); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "IsPaid", + table: "Transactions"); + } +} \ No newline at end of file diff --git a/BudgetApp/Migrations/20260301155815_AddRecurringTransactions.Designer.cs b/BudgetApp.Data/Migrations/AddRecurringTransactions.Designer.cs similarity index 99% rename from BudgetApp/Migrations/20260301155815_AddRecurringTransactions.Designer.cs rename to BudgetApp.Data/Migrations/AddRecurringTransactions.Designer.cs index 5e7016e..e0d2210 100644 --- a/BudgetApp/Migrations/20260301155815_AddRecurringTransactions.Designer.cs +++ b/BudgetApp.Data/Migrations/AddRecurringTransactions.Designer.cs @@ -1,4 +1,4 @@ -// +// using System; using BudgetApp.Data; using Microsoft.EntityFrameworkCore; @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace BudgetApp.Migrations +namespace BudgetApp.Data.Migrations { [DbContext(typeof(ApplicationDbContext))] [Migration("20260301155815_AddRecurringTransactions")] diff --git a/BudgetApp.Data/Migrations/AddRecurringTransactions.cs b/BudgetApp.Data/Migrations/AddRecurringTransactions.cs new file mode 100644 index 0000000..3d11cda --- /dev/null +++ b/BudgetApp.Data/Migrations/AddRecurringTransactions.cs @@ -0,0 +1,69 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BudgetApp.Data.Migrations; + +/// +public partial class AddRecurringTransactions : Migration +{ + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "ParentTransactionId", + table: "Transactions", + type: "INTEGER", + nullable: true); + + migrationBuilder.AddColumn( + name: "RecurrenceEndDate", + table: "Transactions", + type: "TEXT", + nullable: true); + + migrationBuilder.AddColumn( + name: "RecurrenceType", + table: "Transactions", + type: "INTEGER", + nullable: false, + defaultValue: 0); + + migrationBuilder.CreateIndex( + name: "IX_Transactions_ParentTransactionId", + table: "Transactions", + column: "ParentTransactionId"); + + migrationBuilder.AddForeignKey( + name: "FK_Transactions_Transactions_ParentTransactionId", + table: "Transactions", + column: "ParentTransactionId", + principalTable: "Transactions", + principalColumn: "Id", + onDelete: ReferentialAction.SetNull); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_Transactions_Transactions_ParentTransactionId", + table: "Transactions"); + + migrationBuilder.DropIndex( + name: "IX_Transactions_ParentTransactionId", + table: "Transactions"); + + migrationBuilder.DropColumn( + name: "ParentTransactionId", + table: "Transactions"); + + migrationBuilder.DropColumn( + name: "RecurrenceEndDate", + table: "Transactions"); + + migrationBuilder.DropColumn( + name: "RecurrenceType", + table: "Transactions"); + } +} \ No newline at end of file diff --git a/BudgetApp/Migrations/20260305175841_AddSalary.Designer.cs b/BudgetApp.Data/Migrations/AddSalary.Designer.cs similarity index 99% rename from BudgetApp/Migrations/20260305175841_AddSalary.Designer.cs rename to BudgetApp.Data/Migrations/AddSalary.Designer.cs index 951ae4a..d868977 100644 --- a/BudgetApp/Migrations/20260305175841_AddSalary.Designer.cs +++ b/BudgetApp.Data/Migrations/AddSalary.Designer.cs @@ -1,4 +1,4 @@ -// +// using System; using BudgetApp.Data; using Microsoft.EntityFrameworkCore; @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace BudgetApp.Migrations +namespace BudgetApp.Data.Migrations { [DbContext(typeof(ApplicationDbContext))] [Migration("20260305175841_AddSalary")] diff --git a/BudgetApp.Data/Migrations/AddSalary.cs b/BudgetApp.Data/Migrations/AddSalary.cs new file mode 100644 index 0000000..3bfcb30 --- /dev/null +++ b/BudgetApp.Data/Migrations/AddSalary.cs @@ -0,0 +1,102 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BudgetApp.Data.Migrations; + +/// +public partial class AddSalary : Migration +{ + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "SalaryId", + table: "Transactions", + type: "INTEGER", + nullable: true); + + migrationBuilder.CreateTable( + name: "Salaries", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Name = table.Column(type: "TEXT", maxLength: 200, nullable: false), + Amount = table.Column(type: "decimal(18,2)", nullable: false), + RecurrenceType = table.Column(type: "INTEGER", nullable: false), + StartDate = table.Column(type: "TEXT", nullable: false), + AccountId = table.Column(type: "INTEGER", nullable: false), + CategoryId = table.Column(type: "INTEGER", nullable: true), + UserId = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Salaries", x => x.Id); + table.ForeignKey( + name: "FK_Salaries_Accounts_AccountId", + column: x => x.AccountId, + principalTable: "Accounts", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Salaries_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Salaries_Categories_CategoryId", + column: x => x.CategoryId, + principalTable: "Categories", + principalColumn: "Id"); + }); + + migrationBuilder.CreateIndex( + name: "IX_Transactions_SalaryId", + table: "Transactions", + column: "SalaryId"); + + migrationBuilder.CreateIndex( + name: "IX_Salaries_AccountId", + table: "Salaries", + column: "AccountId"); + + migrationBuilder.CreateIndex( + name: "IX_Salaries_CategoryId", + table: "Salaries", + column: "CategoryId"); + + migrationBuilder.CreateIndex( + name: "IX_Salaries_UserId", + table: "Salaries", + column: "UserId"); + + migrationBuilder.AddForeignKey( + name: "FK_Transactions_Salaries_SalaryId", + table: "Transactions", + column: "SalaryId", + principalTable: "Salaries", + principalColumn: "Id", + onDelete: ReferentialAction.SetNull); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_Transactions_Salaries_SalaryId", + table: "Transactions"); + + migrationBuilder.DropTable( + name: "Salaries"); + + migrationBuilder.DropIndex( + name: "IX_Transactions_SalaryId", + table: "Transactions"); + + migrationBuilder.DropColumn( + name: "SalaryId", + table: "Transactions"); + } +} \ No newline at end of file diff --git a/BudgetApp/Migrations/ApplicationDbContextModelSnapshot.cs b/BudgetApp.Data/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 99% rename from BudgetApp/Migrations/ApplicationDbContextModelSnapshot.cs rename to BudgetApp.Data/Migrations/ApplicationDbContextModelSnapshot.cs index 92d0001..0163219 100644 --- a/BudgetApp/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/BudgetApp.Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -1,4 +1,4 @@ -// +// using System; using BudgetApp.Data; using Microsoft.EntityFrameworkCore; @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace BudgetApp.Migrations +namespace BudgetApp.Data.Migrations { [DbContext(typeof(ApplicationDbContext))] partial class ApplicationDbContextModelSnapshot : ModelSnapshot diff --git a/BudgetApp/Migrations/20260301152724_InitialCreate.Designer.cs b/BudgetApp.Data/Migrations/InitialCreate.Designer.cs similarity index 99% rename from BudgetApp/Migrations/20260301152724_InitialCreate.Designer.cs rename to BudgetApp.Data/Migrations/InitialCreate.Designer.cs index 833968f..de2bdc1 100644 --- a/BudgetApp/Migrations/20260301152724_InitialCreate.Designer.cs +++ b/BudgetApp.Data/Migrations/InitialCreate.Designer.cs @@ -1,4 +1,4 @@ -// +// using System; using BudgetApp.Data; using Microsoft.EntityFrameworkCore; @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace BudgetApp.Migrations +namespace BudgetApp.Data.Migrations { [DbContext(typeof(ApplicationDbContext))] [Migration("20260301152724_InitialCreate")] diff --git a/BudgetApp.Data/Migrations/InitialCreate.cs b/BudgetApp.Data/Migrations/InitialCreate.cs new file mode 100644 index 0000000..ee00287 --- /dev/null +++ b/BudgetApp.Data/Migrations/InitialCreate.cs @@ -0,0 +1,321 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BudgetApp.Data.Migrations; + +/// +public partial class InitialCreate : Migration +{ + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "AspNetRoles", + columns: table => new + { + Id = table.Column(type: "TEXT", nullable: false), + Name = table.Column(type: "TEXT", maxLength: 256, nullable: true), + NormalizedName = table.Column(type: "TEXT", maxLength: 256, nullable: true), + ConcurrencyStamp = table.Column(type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoles", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AspNetUsers", + columns: table => new + { + Id = table.Column(type: "TEXT", nullable: false), + UserName = table.Column(type: "TEXT", maxLength: 256, nullable: true), + NormalizedUserName = table.Column(type: "TEXT", maxLength: 256, nullable: true), + Email = table.Column(type: "TEXT", maxLength: 256, nullable: true), + NormalizedEmail = table.Column(type: "TEXT", maxLength: 256, nullable: true), + EmailConfirmed = table.Column(type: "INTEGER", nullable: false), + PasswordHash = table.Column(type: "TEXT", nullable: true), + SecurityStamp = table.Column(type: "TEXT", nullable: true), + ConcurrencyStamp = table.Column(type: "TEXT", nullable: true), + PhoneNumber = table.Column(type: "TEXT", nullable: true), + PhoneNumberConfirmed = table.Column(type: "INTEGER", nullable: false), + TwoFactorEnabled = table.Column(type: "INTEGER", nullable: false), + LockoutEnd = table.Column(type: "TEXT", nullable: true), + LockoutEnabled = table.Column(type: "INTEGER", nullable: false), + AccessFailedCount = table.Column(type: "INTEGER", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUsers", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AspNetRoleClaims", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + RoleId = table.Column(type: "TEXT", nullable: false), + ClaimType = table.Column(type: "TEXT", nullable: true), + ClaimValue = table.Column(type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetRoleClaims_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Accounts", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Name = table.Column(type: "TEXT", maxLength: 100, nullable: false), + CurrentBalance = table.Column(type: "decimal(18,2)", nullable: false), + Color = table.Column(type: "TEXT", maxLength: 7, nullable: false), + UserId = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Accounts", x => x.Id); + table.ForeignKey( + name: "FK_Accounts_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserClaims", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + UserId = table.Column(type: "TEXT", nullable: false), + ClaimType = table.Column(type: "TEXT", nullable: true), + ClaimValue = table.Column(type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetUserClaims_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserLogins", + columns: table => new + { + LoginProvider = table.Column(type: "TEXT", nullable: false), + ProviderKey = table.Column(type: "TEXT", nullable: false), + ProviderDisplayName = table.Column(type: "TEXT", nullable: true), + UserId = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey }); + table.ForeignKey( + name: "FK_AspNetUserLogins_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserRoles", + columns: table => new + { + UserId = table.Column(type: "TEXT", nullable: false), + RoleId = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId }); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserTokens", + columns: table => new + { + UserId = table.Column(type: "TEXT", nullable: false), + LoginProvider = table.Column(type: "TEXT", nullable: false), + Name = table.Column(type: "TEXT", nullable: false), + Value = table.Column(type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); + table.ForeignKey( + name: "FK_AspNetUserTokens_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Categories", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Name = table.Column(type: "TEXT", maxLength: 100, nullable: false), + UserId = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Categories", x => x.Id); + table.ForeignKey( + name: "FK_Categories_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Transactions", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Description = table.Column(type: "TEXT", maxLength: 200, nullable: false), + Amount = table.Column(type: "decimal(18,2)", nullable: false), + Date = table.Column(type: "TEXT", nullable: false), + Type = table.Column(type: "INTEGER", nullable: false), + AccountId = table.Column(type: "INTEGER", nullable: false), + CategoryId = table.Column(type: "INTEGER", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Transactions", x => x.Id); + table.ForeignKey( + name: "FK_Transactions_Accounts_AccountId", + column: x => x.AccountId, + principalTable: "Accounts", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Transactions_Categories_CategoryId", + column: x => x.CategoryId, + principalTable: "Categories", + principalColumn: "Id", + onDelete: ReferentialAction.SetNull); + }); + + migrationBuilder.CreateIndex( + name: "IX_Accounts_UserId", + table: "Accounts", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetRoleClaims_RoleId", + table: "AspNetRoleClaims", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "RoleNameIndex", + table: "AspNetRoles", + column: "NormalizedName", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserClaims_UserId", + table: "AspNetUserClaims", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserLogins_UserId", + table: "AspNetUserLogins", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserRoles_RoleId", + table: "AspNetUserRoles", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "EmailIndex", + table: "AspNetUsers", + column: "NormalizedEmail"); + + migrationBuilder.CreateIndex( + name: "UserNameIndex", + table: "AspNetUsers", + column: "NormalizedUserName", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Categories_UserId", + table: "Categories", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_Transactions_AccountId", + table: "Transactions", + column: "AccountId"); + + migrationBuilder.CreateIndex( + name: "IX_Transactions_CategoryId", + table: "Transactions", + column: "CategoryId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "AspNetRoleClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserLogins"); + + migrationBuilder.DropTable( + name: "AspNetUserRoles"); + + migrationBuilder.DropTable( + name: "AspNetUserTokens"); + + migrationBuilder.DropTable( + name: "Transactions"); + + migrationBuilder.DropTable( + name: "AspNetRoles"); + + migrationBuilder.DropTable( + name: "Accounts"); + + migrationBuilder.DropTable( + name: "Categories"); + + migrationBuilder.DropTable( + name: "AspNetUsers"); + } +} \ No newline at end of file diff --git a/BudgetApp/Services/AccountService.cs b/BudgetApp.Data/Repositories/AccountRepository.cs similarity index 67% rename from BudgetApp/Services/AccountService.cs rename to BudgetApp.Data/Repositories/AccountRepository.cs index 45dd303..4be0fb9 100644 --- a/BudgetApp/Services/AccountService.cs +++ b/BudgetApp.Data/Repositories/AccountRepository.cs @@ -1,15 +1,14 @@ +using BudgetApp.Data.Entities; +using BudgetApp.Data.Interfaces; using Microsoft.EntityFrameworkCore; -using BudgetApp.Data; -namespace BudgetApp.Services; +namespace BudgetApp.Data.Repositories; -public class AccountService(ApplicationDbContext db) +public class AccountRepository(ApplicationDbContext db) : IAccountRepository { - private readonly ApplicationDbContext _db = db; - public async Task> GetAccountsAsync(string userId) { - return await _db.Accounts + return await db.Accounts .Where(a => a.UserId == userId) .OrderBy(a => a.Name) .ToListAsync(); @@ -17,54 +16,54 @@ public class AccountService(ApplicationDbContext db) public async Task GetAccountAsync(int id, string userId) { - return await _db.Accounts + return await db.Accounts .FirstOrDefaultAsync(a => a.Id == id && a.UserId == userId); } public async Task CreateAccountAsync(Account account) { - _db.Accounts.Add(account); - await _db.SaveChangesAsync(); + db.Accounts.Add(account); + await db.SaveChangesAsync(); } public async Task UpdateAccountAsync(Account account) { - _db.Accounts.Update(account); - await _db.SaveChangesAsync(); + db.Accounts.Update(account); + await db.SaveChangesAsync(); } public async Task UpdateBalanceAsync(int id, string userId, decimal newBalance) { - var account = await _db.Accounts + var account = await db.Accounts .FirstOrDefaultAsync(a => a.Id == id && a.UserId == userId); if (account is not null) { account.CurrentBalance = newBalance; - await _db.SaveChangesAsync(); + await db.SaveChangesAsync(); } } public async Task UpdateAccountDetailsAsync(int id, string userId, string name, string color, string currencyCode) { - var account = await _db.Accounts + var account = await db.Accounts .FirstOrDefaultAsync(a => a.Id == id && a.UserId == userId); if (account is not null) { account.Name = name; account.Color = color; account.CurrencyCode = currencyCode; - await _db.SaveChangesAsync(); + await db.SaveChangesAsync(); } } public async Task DeleteAccountAsync(int id, string userId) { - var account = await _db.Accounts + var account = await db.Accounts .FirstOrDefaultAsync(a => a.Id == id && a.UserId == userId); if (account is not null) { - _db.Accounts.Remove(account); - await _db.SaveChangesAsync(); + db.Accounts.Remove(account); + await db.SaveChangesAsync(); } } } diff --git a/BudgetApp/Services/CategoryService.cs b/BudgetApp.Data/Repositories/CategoryRepository.cs similarity index 79% rename from BudgetApp/Services/CategoryService.cs rename to BudgetApp.Data/Repositories/CategoryRepository.cs index e7cc5af..9f04ef8 100644 --- a/BudgetApp/Services/CategoryService.cs +++ b/BudgetApp.Data/Repositories/CategoryRepository.cs @@ -1,12 +1,11 @@ +using BudgetApp.Data.Entities; +using BudgetApp.Data.Interfaces; using Microsoft.EntityFrameworkCore; -using BudgetApp.Data; -namespace BudgetApp.Services; +namespace BudgetApp.Data.Repositories; -public class CategoryService(ApplicationDbContext db) +public class CategoryRepository(ApplicationDbContext db) : ICategoryRepository { - private readonly ApplicationDbContext _db = db; - private static readonly (string Name, string Icon)[] DefaultCategories = [ ("Groceries", "🛒"), @@ -31,7 +30,7 @@ public class CategoryService(ApplicationDbContext db) public async Task> GetCategoriesAsync(string userId) { - return await _db.Categories + return await db.Categories .Where(c => c.UserId == userId) .OrderBy(c => c.Name) .ToListAsync(); @@ -39,7 +38,7 @@ public class CategoryService(ApplicationDbContext db) public async Task EnsureDefaultCategoriesAsync(string userId) { - var existing = await _db.Categories + var existing = await db.Categories .Where(c => c.UserId == userId) .ToListAsync(); @@ -53,8 +52,8 @@ public class CategoryService(ApplicationDbContext db) UserId = userId }); - _db.Categories.AddRange(defaults); - await _db.SaveChangesAsync(); + db.Categories.AddRange(defaults); + await db.SaveChangesAsync(); return; } @@ -78,38 +77,38 @@ public class CategoryService(ApplicationDbContext db) if (updated) { - await _db.SaveChangesAsync(); + await db.SaveChangesAsync(); } } public async Task CreateCategoryAsync(Category category) { - _db.Categories.Add(category); - await _db.SaveChangesAsync(); + db.Categories.Add(category); + await db.SaveChangesAsync(); } public async Task UpdateCategoryAsync(int id, string userId, string name, string icon) { - var category = await _db.Categories + var category = await db.Categories .FirstOrDefaultAsync(c => c.Id == id && c.UserId == userId); if (category is not null) { if (category.IsDefault) return; category.Name = name; category.Icon = icon; - await _db.SaveChangesAsync(); + await db.SaveChangesAsync(); } } public async Task DeleteCategoryAsync(int id, string userId) { - var category = await _db.Categories + var category = await db.Categories .FirstOrDefaultAsync(c => c.Id == id && c.UserId == userId); if (category is not null) { if (category.IsDefault) return; - _db.Categories.Remove(category); - await _db.SaveChangesAsync(); + db.Categories.Remove(category); + await db.SaveChangesAsync(); } } } diff --git a/BudgetApp/Services/SalaryService.cs b/BudgetApp.Data/Repositories/SalaryRepository.cs similarity index 79% rename from BudgetApp/Services/SalaryService.cs rename to BudgetApp.Data/Repositories/SalaryRepository.cs index 1e1bc37..f8d6825 100644 --- a/BudgetApp/Services/SalaryService.cs +++ b/BudgetApp.Data/Repositories/SalaryRepository.cs @@ -1,15 +1,14 @@ +using BudgetApp.Data.Entities; +using BudgetApp.Data.Interfaces; using Microsoft.EntityFrameworkCore; -using BudgetApp.Data; -namespace BudgetApp.Services; +namespace BudgetApp.Data.Repositories; -public class SalaryService(ApplicationDbContext db) +public class SalaryRepository(ApplicationDbContext db) : ISalaryRepository { - private readonly ApplicationDbContext _db = db; - public async Task> GetSalariesAsync(string userId) { - return await _db.Salaries + return await db.Salaries .Include(s => s.Account) .Include(s => s.Category) .Where(s => s.UserId == userId) @@ -19,35 +18,35 @@ public class SalaryService(ApplicationDbContext db) public async Task CreateSalaryAsync(Salary salary, DateTime windowEnd) { - var salaryCategoryId = await _db.Categories + var salaryCategoryId = await db.Categories .Where(c => c.UserId == salary.UserId && c.Name == "Salary") .Select(c => (int?)c.Id) .FirstOrDefaultAsync(); salary.CategoryId = salaryCategoryId; - _db.Salaries.Add(salary); - await _db.SaveChangesAsync(); + db.Salaries.Add(salary); + await db.SaveChangesAsync(); await MaterializeSalaryTransactionsAsync(salary.UserId, windowEnd); } public async Task DeleteSalaryAsync(int id, string userId) { - var exists = await _db.Salaries.AnyAsync(s => s.Id == id && s.UserId == userId); + var exists = await db.Salaries.AnyAsync(s => s.Id == id && s.UserId == userId); if (!exists) return; - await using var transaction = await _db.Database.BeginTransactionAsync(); + await using var transaction = await db.Database.BeginTransactionAsync(); // Delete future unpaid transactions generated by this salary - await _db.Transactions + await db.Transactions .Where(t => t.SalaryId == id && t.Date.Date > DateTime.Today && !t.IsPaid) .ExecuteDeleteAsync(); // Unlink past / paid transactions so they stay in history without the salary reference - await _db.Transactions + await db.Transactions .Where(t => t.SalaryId == id) .ExecuteUpdateAsync(s => s.SetProperty(t => t.SalaryId, (int?)null)); - await _db.Salaries + await db.Salaries .Where(s => s.Id == id && s.UserId == userId) .ExecuteDeleteAsync(); @@ -56,7 +55,7 @@ public class SalaryService(ApplicationDbContext db) public async Task MaterializeSalaryTransactionsAsync(string userId, DateTime windowEnd) { - var salaries = await _db.Salaries + var salaries = await db.Salaries .Where(s => s.UserId == userId) .ToListAsync(); @@ -64,7 +63,7 @@ public class SalaryService(ApplicationDbContext db) foreach (var salary in salaries) { - var latestDate = await _db.Transactions + var latestDate = await db.Transactions .Where(t => t.SalaryId == salary.Id) .OrderByDescending(t => t.Date) .Select(t => (DateTime?)t.Date) @@ -93,14 +92,14 @@ public class SalaryService(ApplicationDbContext db) if (newTransactions.Count > 0) { - _db.Transactions.AddRange(newTransactions); - await _db.SaveChangesAsync(); + db.Transactions.AddRange(newTransactions); + await db.SaveChangesAsync(); } } public async Task GetNextPaydateAsync(int salaryId) { - return await _db.Transactions + return await db.Transactions .Where(t => t.SalaryId == salaryId && t.Date.Date >= DateTime.Today) .OrderBy(t => t.Date) .Select(t => (DateTime?)t.Date) diff --git a/BudgetApp/Services/TransactionService.cs b/BudgetApp.Data/Repositories/TransactionRepository.cs similarity index 78% rename from BudgetApp/Services/TransactionService.cs rename to BudgetApp.Data/Repositories/TransactionRepository.cs index 6bb0eb0..01677dc 100644 --- a/BudgetApp/Services/TransactionService.cs +++ b/BudgetApp.Data/Repositories/TransactionRepository.cs @@ -1,15 +1,14 @@ +using BudgetApp.Data.Entities; +using BudgetApp.Data.Interfaces; using Microsoft.EntityFrameworkCore; -using BudgetApp.Data; -namespace BudgetApp.Services; +namespace BudgetApp.Data.Repositories; -public class TransactionService(ApplicationDbContext db) +public class TransactionRepository(ApplicationDbContext db) : ITransactionRepository { - private readonly ApplicationDbContext _db = db; - public async Task> GetTransactionsAsync(string userId) { - return await _db.Transactions + return await db.Transactions .Include(t => t.Account) .Include(t => t.Category) .Include(t => t.ParentTransaction) @@ -20,7 +19,7 @@ public class TransactionService(ApplicationDbContext db) public async Task> GetRecentTransactionsAsync(string userId, int count = 5) { - return await _db.Transactions + return await db.Transactions .Include(t => t.Account) .Include(t => t.Category) .Include(t => t.ParentTransaction) @@ -32,7 +31,7 @@ public class TransactionService(ApplicationDbContext db) public async Task> GetUpcomingTransactionsAsync(string userId, int count = 5) { - return await _db.Transactions + return await db.Transactions .Include(t => t.Account) .Include(t => t.Category) .Include(t => t.ParentTransaction) @@ -44,7 +43,7 @@ public class TransactionService(ApplicationDbContext db) public async Task> GetTransactionsInRangeAsync(string userId, DateTime from, DateTime to) { - return await _db.Transactions + return await db.Transactions .Include(t => t.Account) .Include(t => t.Category) .Include(t => t.ParentTransaction) @@ -55,7 +54,7 @@ public class TransactionService(ApplicationDbContext db) public async Task> GetTransactionsByAccountAsync(int accountId, string userId) { - return await _db.Transactions + return await db.Transactions .Include(t => t.Category) .Where(t => t.AccountId == accountId && t.Account.UserId == userId) .OrderByDescending(t => t.Date) @@ -74,8 +73,8 @@ public class TransactionService(ApplicationDbContext db) } } - _db.Transactions.Add(transaction); - await _db.SaveChangesAsync(); + db.Transactions.Add(transaction); + await db.SaveChangesAsync(); // Immediately materialize child occurrences for recurring transactions if (transaction.RecurrenceType != RecurrenceType.None) @@ -102,15 +101,17 @@ public class TransactionService(ApplicationDbContext db) if (newTransactions.Count > 0) { - _db.Transactions.AddRange(newTransactions); - await _db.SaveChangesAsync(); + db.Transactions.AddRange(newTransactions); + await db.SaveChangesAsync(); } } } - public async Task UpdateTransactionAsync(int id, string userId, string description, decimal amount, DateTime date, TransactionType type, int accountId, int? categoryId, RecurrenceType recurrenceType = RecurrenceType.None, DateTime? recurrenceEndDate = null) + public async Task UpdateTransactionAsync(int id, string userId, string description, decimal amount, + DateTime date, TransactionType type, int accountId, int? categoryId, + RecurrenceType recurrenceType = RecurrenceType.None, DateTime? recurrenceEndDate = null) { - var transaction = await _db.Transactions + var transaction = await db.Transactions .Include(t => t.Account) .FirstOrDefaultAsync(t => t.Id == id && t.Account.UserId == userId); @@ -128,11 +129,10 @@ public class TransactionService(ApplicationDbContext db) if (isPartOfSeries) { - // Cascade edits to all future occurrences in the series var parentId = transaction.ParentTransactionId ?? transaction.Id; var cutoffDate = transaction.Date.Date; - var futureSiblings = await _db.Transactions + var futureSiblings = await db.Transactions .Where(t => (t.Id == parentId || t.ParentTransactionId == parentId) && t.Id != id && t.Date.Date >= cutoffDate) @@ -149,92 +149,84 @@ public class TransactionService(ApplicationDbContext db) } else { - // Standalone transaction — preserve existing recurrence state (None) transaction.RecurrenceType = recurrenceType; transaction.RecurrenceEndDate = recurrenceEndDate; } - await _db.SaveChangesAsync(); + await db.SaveChangesAsync(); } public async Task DeleteTransactionAsync(int id, string userId) { - var transaction = await _db.Transactions + var transaction = await db.Transactions .FirstOrDefaultAsync(t => t.Id == id && t.Account.UserId == userId); if (transaction is not null) { - _db.Transactions.Remove(transaction); - await _db.SaveChangesAsync(); + db.Transactions.Remove(transaction); + await db.SaveChangesAsync(); } } public async Task DeleteTransactionSeriesAsync(int id, string userId) { - var transaction = await _db.Transactions + var transaction = await db.Transactions .Include(t => t.Account) .FirstOrDefaultAsync(t => t.Id == id && t.Account.UserId == userId); if (transaction is null) return; - // Resolve the parent id: if this is a child, use its ParentTransactionId; otherwise use its own Id var parentId = transaction.ParentTransactionId ?? transaction.Id; - - // Use the clicked transaction's date as the cutoff — delete this one and everything after it var cutoffDate = transaction.Date.Date; - var allChildren = await _db.Transactions + var allChildren = await db.Transactions .Where(t => t.ParentTransactionId == parentId) .ToListAsync(); var toDelete = allChildren.Where(c => c.Date.Date >= cutoffDate).ToList(); var toKeep = allChildren.Where(c => c.Date.Date < cutoffDate).ToList(); - _db.Transactions.RemoveRange(toDelete); + db.Transactions.RemoveRange(toDelete); - // Handle the parent var parent = parentId == transaction.Id ? transaction - : await _db.Transactions + : await db.Transactions .FirstOrDefaultAsync(t => t.Id == parentId && t.Account.UserId == userId); if (parent is not null) { if (parent.Date.Date >= cutoffDate) { - // Parent is also at/after the cutoff — detach earlier children so - // the DB-level ON DELETE SET NULL doesn't clear their link, then delete foreach (var child in toKeep) { child.ParentTransactionId = null; } - _db.Transactions.Remove(parent); + db.Transactions.Remove(parent); } else { - // Parent is before the cutoff — cap recurrence so materialization stops parent.RecurrenceEndDate = cutoffDate.AddDays(-1); } } - await _db.SaveChangesAsync(); + await db.SaveChangesAsync(); } public async Task MarkAsPaidAsync(int id, string userId, bool isPaid = true) { - var transaction = await _db.Transactions + var transaction = await db.Transactions .Include(t => t.Account) .FirstOrDefaultAsync(t => t.Id == id && t.Account.UserId == userId); if (transaction is null) return; transaction.IsPaid = isPaid; - await _db.SaveChangesAsync(); + await db.SaveChangesAsync(); } public async Task MaterializeRecurringTransactionsAsync(string userId, DateTime? windowEnd = null) { - var recurringParents = await _db.Transactions + var recurringParents = await db.Transactions .Include(t => t.Account) .Where(t => t.Account.UserId == userId && t.RecurrenceType != RecurrenceType.None @@ -251,7 +243,7 @@ public class TransactionService(ApplicationDbContext db) ? parent.RecurrenceEndDate.Value : horizon; - var latestChildDate = await _db.Transactions + var latestChildDate = await db.Transactions .Where(t => t.ParentTransactionId == parent.Id) .OrderByDescending(t => t.Date) .Select(t => (DateTime?)t.Date) @@ -279,17 +271,17 @@ public class TransactionService(ApplicationDbContext db) if (newTransactions.Count > 0) { - _db.Transactions.AddRange(newTransactions); - await _db.SaveChangesAsync(); + db.Transactions.AddRange(newTransactions); + await db.SaveChangesAsync(); } } internal static DateTime GetNextOccurrence(DateTime current, RecurrenceType recurrence) => recurrence switch { - RecurrenceType.Daily => current.AddDays(1), - RecurrenceType.Weekly => current.AddDays(7), + RecurrenceType.Daily => current.AddDays(1), + RecurrenceType.Weekly => current.AddDays(7), RecurrenceType.Monthly => current.AddMonths(1), - RecurrenceType.Yearly => current.AddYears(1), - _ => DateTime.MaxValue + RecurrenceType.Yearly => current.AddYears(1), + _ => DateTime.MaxValue }; } diff --git a/BudgetApp.Tests/BudgetApp.Tests.csproj b/BudgetApp.Tests/BudgetApp.Tests.csproj index 3ae0926..53ac245 100644 --- a/BudgetApp.Tests/BudgetApp.Tests.csproj +++ b/BudgetApp.Tests/BudgetApp.Tests.csproj @@ -23,6 +23,7 @@ + diff --git a/BudgetApp.Tests/Helpers/TestDbContextFactory.cs b/BudgetApp.Tests/Helpers/TestDbContextFactory.cs index 6418c0c..3377907 100644 --- a/BudgetApp.Tests/Helpers/TestDbContextFactory.cs +++ b/BudgetApp.Tests/Helpers/TestDbContextFactory.cs @@ -1,6 +1,7 @@ using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using BudgetApp.Data; +using BudgetApp.Data.Entities; namespace BudgetApp.Tests.Helpers; diff --git a/BudgetApp.Tests/Models/AccountModelTests.cs b/BudgetApp.Tests/Models/AccountModelTests.cs index e256c0c..d743bc0 100644 --- a/BudgetApp.Tests/Models/AccountModelTests.cs +++ b/BudgetApp.Tests/Models/AccountModelTests.cs @@ -1,4 +1,4 @@ -using BudgetApp.Data; +using BudgetApp.Data.Entities; using Xunit; namespace BudgetApp.Tests.Models; diff --git a/BudgetApp.Tests/Services/AccountServiceTests.cs b/BudgetApp.Tests/Services/AccountServiceTests.cs index 2556b01..ed29e0c 100644 --- a/BudgetApp.Tests/Services/AccountServiceTests.cs +++ b/BudgetApp.Tests/Services/AccountServiceTests.cs @@ -1,5 +1,5 @@ -using BudgetApp.Data; -using BudgetApp.Services; +using BudgetApp.Data.Entities; +using BudgetApp.Data.Repositories; using BudgetApp.Tests.Helpers; using Xunit; @@ -20,7 +20,7 @@ public class AccountServiceTests } using var context = factory.CreateContext(); - var service = new AccountService(context); + var service = new AccountRepository(context); var result = await service.GetAccountsAsync(TestDbContextFactory.TestUserId); @@ -41,7 +41,7 @@ public class AccountServiceTests } using var context = factory.CreateContext(); - var service = new AccountService(context); + var service = new AccountRepository(context); var result = await service.GetAccountsAsync(TestDbContextFactory.TestUserId); @@ -63,7 +63,7 @@ public class AccountServiceTests } using var context = factory.CreateContext(); - var service = new AccountService(context); + var service = new AccountRepository(context); var result = await service.GetAccountAsync(accountId, TestDbContextFactory.TestUserId); @@ -85,7 +85,7 @@ public class AccountServiceTests } using var context = factory.CreateContext(); - var service = new AccountService(context); + var service = new AccountRepository(context); var result = await service.GetAccountAsync(accountId, TestDbContextFactory.OtherUserId); @@ -97,7 +97,7 @@ public class AccountServiceTests { using var factory = new TestDbContextFactory(); using var context = factory.CreateContext(); - var service = new AccountService(context); + var service = new AccountRepository(context); var account = new Account { Name = "New", UserId = TestDbContextFactory.TestUserId, CurrencyCode = "GBP" }; await service.CreateAccountAsync(account); @@ -120,7 +120,7 @@ public class AccountServiceTests } using var context = factory.CreateContext(); - var service = new AccountService(context); + var service = new AccountRepository(context); await service.UpdateBalanceAsync(accountId, TestDbContextFactory.TestUserId, 250m); using var verifyCtx = factory.CreateContext(); @@ -142,7 +142,7 @@ public class AccountServiceTests } using var context = factory.CreateContext(); - var service = new AccountService(context); + var service = new AccountRepository(context); await service.UpdateBalanceAsync(accountId, TestDbContextFactory.OtherUserId, 999m); using var verifyCtx = factory.CreateContext(); @@ -163,7 +163,7 @@ public class AccountServiceTests } using var context = factory.CreateContext(); - var service = new AccountService(context); + var service = new AccountRepository(context); await service.UpdateAccountDetailsAsync(accountId, TestDbContextFactory.TestUserId, "New", "#fff", "USD"); using var verifyCtx = factory.CreateContext(); @@ -187,7 +187,7 @@ public class AccountServiceTests } using var context = factory.CreateContext(); - var service = new AccountService(context); + var service = new AccountRepository(context); await service.UpdateAccountDetailsAsync(accountId, TestDbContextFactory.OtherUserId, "Hacked", "#fff", "USD"); using var verifyCtx = factory.CreateContext(); @@ -208,7 +208,7 @@ public class AccountServiceTests } using var context = factory.CreateContext(); - var service = new AccountService(context); + var service = new AccountRepository(context); await service.DeleteAccountAsync(accountId, TestDbContextFactory.TestUserId); using var verifyCtx = factory.CreateContext(); @@ -229,7 +229,7 @@ public class AccountServiceTests } using var context = factory.CreateContext(); - var service = new AccountService(context); + var service = new AccountRepository(context); await service.DeleteAccountAsync(accountId, TestDbContextFactory.OtherUserId); using var verifyCtx = factory.CreateContext(); diff --git a/BudgetApp.Tests/Services/CategoryServiceTests.cs b/BudgetApp.Tests/Services/CategoryServiceTests.cs index 1536f63..c417cf4 100644 --- a/BudgetApp.Tests/Services/CategoryServiceTests.cs +++ b/BudgetApp.Tests/Services/CategoryServiceTests.cs @@ -1,5 +1,5 @@ -using BudgetApp.Data; -using BudgetApp.Services; +using BudgetApp.Data.Entities; +using BudgetApp.Data.Repositories; using BudgetApp.Tests.Helpers; using Microsoft.EntityFrameworkCore; using Xunit; @@ -21,7 +21,7 @@ public class CategoryServiceTests } using var context = factory.CreateContext(); - var service = new CategoryService(context); + var service = new CategoryRepository(context); var result = await service.GetCategoriesAsync(TestDbContextFactory.TestUserId); @@ -42,7 +42,7 @@ public class CategoryServiceTests } using var context = factory.CreateContext(); - var service = new CategoryService(context); + var service = new CategoryRepository(context); var result = await service.GetCategoriesAsync(TestDbContextFactory.TestUserId); @@ -55,7 +55,7 @@ public class CategoryServiceTests { using var factory = new TestDbContextFactory(); using var context = factory.CreateContext(); - var service = new CategoryService(context); + var service = new CategoryRepository(context); await service.EnsureDefaultCategoriesAsync(TestDbContextFactory.TestUserId); @@ -77,13 +77,13 @@ public class CategoryServiceTests using (var ctx = factory.CreateContext()) { - var service = new CategoryService(ctx); + var service = new CategoryRepository(ctx); await service.EnsureDefaultCategoriesAsync(TestDbContextFactory.TestUserId); } using (var ctx = factory.CreateContext()) { - var service = new CategoryService(ctx); + var service = new CategoryRepository(ctx); await service.EnsureDefaultCategoriesAsync(TestDbContextFactory.TestUserId); } @@ -111,7 +111,7 @@ public class CategoryServiceTests } using var context = factory.CreateContext(); - var service = new CategoryService(context); + var service = new CategoryRepository(context); await service.EnsureDefaultCategoriesAsync(TestDbContextFactory.TestUserId); using var verifyCtx = factory.CreateContext(); @@ -137,7 +137,7 @@ public class CategoryServiceTests } using var context = factory.CreateContext(); - var service = new CategoryService(context); + var service = new CategoryRepository(context); await service.EnsureDefaultCategoriesAsync(TestDbContextFactory.TestUserId); using var verifyCtx = factory.CreateContext(); @@ -154,13 +154,13 @@ public class CategoryServiceTests using (var ctx = factory.CreateContext()) { - var service = new CategoryService(ctx); + var service = new CategoryRepository(ctx); await service.EnsureDefaultCategoriesAsync(TestDbContextFactory.TestUserId); } using (var ctx = factory.CreateContext()) { - var service = new CategoryService(ctx); + var service = new CategoryRepository(ctx); await service.EnsureDefaultCategoriesAsync(TestDbContextFactory.OtherUserId); } @@ -174,7 +174,7 @@ public class CategoryServiceTests { using var factory = new TestDbContextFactory(); using var context = factory.CreateContext(); - var service = new CategoryService(context); + var service = new CategoryRepository(context); await service.CreateCategoryAsync(new Category { @@ -201,7 +201,7 @@ public class CategoryServiceTests } using var context = factory.CreateContext(); - var service = new CategoryService(context); + var service = new CategoryRepository(context); await service.UpdateCategoryAsync(categoryId, TestDbContextFactory.TestUserId, "New", "🎯"); using var verifyCtx = factory.CreateContext(); @@ -224,7 +224,7 @@ public class CategoryServiceTests } using var context = factory.CreateContext(); - var service = new CategoryService(context); + var service = new CategoryRepository(context); await service.UpdateCategoryAsync(categoryId, TestDbContextFactory.OtherUserId, "Hacked", "💀"); using var verifyCtx = factory.CreateContext(); @@ -245,7 +245,7 @@ public class CategoryServiceTests } using var context = factory.CreateContext(); - var service = new CategoryService(context); + var service = new CategoryRepository(context); await service.DeleteCategoryAsync(categoryId, TestDbContextFactory.TestUserId); using var verifyCtx = factory.CreateContext(); @@ -266,7 +266,7 @@ public class CategoryServiceTests } using var context = factory.CreateContext(); - var service = new CategoryService(context); + var service = new CategoryRepository(context); await service.DeleteCategoryAsync(categoryId, TestDbContextFactory.OtherUserId); using var verifyCtx = factory.CreateContext(); diff --git a/BudgetApp.Tests/Services/DashboardServiceTests.cs b/BudgetApp.Tests/Services/DashboardServiceTests.cs index 4cadb1e..863cf55 100644 --- a/BudgetApp.Tests/Services/DashboardServiceTests.cs +++ b/BudgetApp.Tests/Services/DashboardServiceTests.cs @@ -1,7 +1,7 @@ -using BudgetApp.Data; +using BudgetApp.Data.Entities; +using BudgetApp.Data.Repositories; using BudgetApp.Services; using BudgetApp.Tests.Helpers; -using Microsoft.EntityFrameworkCore; using Xunit; namespace BudgetApp.Tests.Services; @@ -181,9 +181,9 @@ public class DashboardServiceTests } using var context = factory.CreateContext(); - var transactionService = new TransactionService(context); - var accountService = new AccountService(context); - var categoryService = new CategoryService(context); + var transactionService = new TransactionRepository(context); + var accountService = new AccountRepository(context); + var categoryService = new CategoryRepository(context); var dashboardService = new DashboardService(transactionService, accountService, categoryService); var result = await dashboardService.GetDashboardDataAsync(TestDbContextFactory.TestUserId); @@ -214,9 +214,9 @@ public class DashboardServiceTests } using var context = factory.CreateContext(); - var transactionService = new TransactionService(context); - var accountService = new AccountService(context); - var categoryService = new CategoryService(context); + var transactionService = new TransactionRepository(context); + var accountService = new AccountRepository(context); + var categoryService = new CategoryRepository(context); var dashboardService = new DashboardService(transactionService, accountService, categoryService); var result = await dashboardService.GetDashboardDataAsync(TestDbContextFactory.TestUserId); @@ -243,9 +243,9 @@ public class DashboardServiceTests } using var context = factory.CreateContext(); - var transactionService = new TransactionService(context); - var accountService = new AccountService(context); - var categoryService = new CategoryService(context); + var transactionService = new TransactionRepository(context); + var accountService = new AccountRepository(context); + var categoryService = new CategoryRepository(context); var dashboardService = new DashboardService(transactionService, accountService, categoryService); var from = DateTime.Today.AddDays(-10); diff --git a/BudgetApp.Tests/Services/TransactionServiceTests.cs b/BudgetApp.Tests/Services/TransactionServiceTests.cs index 987936e..b1b4156 100644 --- a/BudgetApp.Tests/Services/TransactionServiceTests.cs +++ b/BudgetApp.Tests/Services/TransactionServiceTests.cs @@ -1,5 +1,6 @@ using BudgetApp.Data; -using BudgetApp.Services; +using BudgetApp.Data.Entities; +using BudgetApp.Data.Repositories; using BudgetApp.Tests.Helpers; using Microsoft.EntityFrameworkCore; using Xunit; @@ -32,7 +33,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); var result = await service.GetTransactionsAsync(TestDbContextFactory.TestUserId); Assert.Equal(2, result.Count); @@ -55,7 +56,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); var result = await service.GetTransactionsAsync(TestDbContextFactory.TestUserId); Assert.Single(result); @@ -85,7 +86,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); var result = await service.GetTransactionsAsync(TestDbContextFactory.TestUserId); Assert.Single(result); @@ -113,7 +114,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); var result = await service.GetRecentTransactionsAsync(TestDbContextFactory.TestUserId, 10); Assert.Equal(2, result.Count); @@ -141,7 +142,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); var result = await service.GetRecentTransactionsAsync(TestDbContextFactory.TestUserId, 3); Assert.Equal(3, result.Count); @@ -166,7 +167,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); var result = await service.GetUpcomingTransactionsAsync(TestDbContextFactory.TestUserId, 10); Assert.Single(result); @@ -197,7 +198,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); var result = await service.GetTransactionsInRangeAsync(TestDbContextFactory.TestUserId, from, to); Assert.Equal(3, result.Count); @@ -229,7 +230,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); var result = await service.GetTransactionsByAccountAsync(accountId, TestDbContextFactory.TestUserId); Assert.Single(result); @@ -250,7 +251,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); var result = await service.GetTransactionsByAccountAsync(accountId, TestDbContextFactory.OtherUserId); Assert.Empty(result); @@ -271,7 +272,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.CreateTransactionAsync(new Transaction { Description = "Groceries", @@ -296,7 +297,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.CreateTransactionAsync(new Transaction { Description = "One-off", @@ -323,7 +324,7 @@ public class TransactionServiceTests var startDate = new DateTime(2025, 1, 1); using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.CreateTransactionAsync(new Transaction { Description = "Recurring", @@ -353,7 +354,7 @@ public class TransactionServiceTests var startDate = new DateTime(2025, 1, 1); using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.CreateTransactionAsync(new Transaction { Description = "Recurring", @@ -383,7 +384,7 @@ public class TransactionServiceTests var startDate = new DateTime(2025, 1, 1); using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.CreateTransactionAsync(new Transaction { Description = "Weekly", @@ -421,7 +422,7 @@ public class TransactionServiceTests var startDate = new DateTime(2025, 1, 15); using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.CreateTransactionAsync(new Transaction { Description = "Monthly", @@ -481,7 +482,7 @@ public class TransactionServiceTests var newDate = DateTime.Today.AddDays(5); using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.UpdateTransactionAsync( transactionId, TestDbContextFactory.TestUserId, "Updated", 99m, newDate, TransactionType.Income, @@ -520,7 +521,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.UpdateTransactionAsync( transactionId, TestDbContextFactory.OtherUserId, "Hacked", 999m, DateTime.Today, TransactionType.Income, 1, null); @@ -548,7 +549,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.DeleteTransactionAsync(transactionId, TestDbContextFactory.TestUserId); using var verifyCtx = factory.CreateContext(); @@ -570,7 +571,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.DeleteTransactionAsync(transactionId, TestDbContextFactory.OtherUserId); using var verifyCtx = factory.CreateContext(); @@ -623,7 +624,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.DeleteTransactionSeriesAsync(childId, TestDbContextFactory.TestUserId); using var verifyCtx = factory.CreateContext(); @@ -672,7 +673,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.DeleteTransactionSeriesAsync(childId, TestDbContextFactory.TestUserId); using var verifyCtx = factory.CreateContext(); @@ -709,7 +710,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.DeleteTransactionSeriesAsync(parentId, TestDbContextFactory.TestUserId); using var verifyCtx = factory.CreateContext(); @@ -731,7 +732,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.DeleteTransactionSeriesAsync(transactionId, TestDbContextFactory.OtherUserId); using var verifyCtx = factory.CreateContext(); @@ -772,7 +773,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.MaterializeRecurringTransactionsAsync(TestDbContextFactory.TestUserId, startDate.AddDays(100)); using var verifyCtx = factory.CreateContext(); @@ -808,7 +809,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.MaterializeRecurringTransactionsAsync(TestDbContextFactory.TestUserId, startDate.AddDays(365)); using var verifyCtx = factory.CreateContext(); @@ -839,7 +840,7 @@ public class TransactionServiceTests } using var context = factory.CreateContext(); - var service = new TransactionService(context); + var service = new TransactionRepository(context); await service.MaterializeRecurringTransactionsAsync(TestDbContextFactory.TestUserId); using var verifyCtx = factory.CreateContext(); @@ -860,7 +861,7 @@ public class TransactionServiceTests var current = new DateTime(2025, 6, 15); var expected = current.AddDays(expectedDays).AddMonths(expectedMonths).AddYears(expectedYears); - var result = TransactionService.GetNextOccurrence(current, type); + var result = TransactionRepository.GetNextOccurrence(current, type); Assert.Equal(expected, result); } @@ -868,7 +869,7 @@ public class TransactionServiceTests [Fact] public void GetNextOccurrence_None_ReturnsMaxValue() { - var result = TransactionService.GetNextOccurrence(DateTime.Today, RecurrenceType.None); + var result = TransactionRepository.GetNextOccurrence(DateTime.Today, RecurrenceType.None); Assert.Equal(DateTime.MaxValue, result); } diff --git a/BudgetApp.slnx b/BudgetApp.slnx index b4a26d2..828cb22 100644 --- a/BudgetApp.slnx +++ b/BudgetApp.slnx @@ -1,4 +1,5 @@ + diff --git a/BudgetApp/BudgetApp.csproj b/BudgetApp/BudgetApp.csproj index 3cba5e6..c3894b4 100644 --- a/BudgetApp/BudgetApp.csproj +++ b/BudgetApp/BudgetApp.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -12,15 +12,15 @@ + + + + - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - diff --git a/BudgetApp/Components/Layout/NavMenu.razor b/BudgetApp/Components/Layout/NavMenu.razor index a8a16b8..3161194 100644 --- a/BudgetApp/Components/Layout/NavMenu.razor +++ b/BudgetApp/Components/Layout/NavMenu.razor @@ -1,4 +1,4 @@ -@inject AccountService AccountService +@inject IAccountRepository AccountService @inject AuthenticationStateProvider AuthStateProvider @inject AppState AppState @inject NavigationManager Navigation @@ -70,11 +70,11 @@ - @if (accounts is not null && accounts.Count > 0) + @if (_accounts is not null && _accounts.Count > 0) {
Balances
- @foreach (var account in accounts) + @foreach (var account in _accounts) {
@@ -88,44 +88,4 @@ }
} -
- -@code { - private List? accounts; - - protected override async Task OnInitializedAsync() - { - AppState.OnAccountsChanged += HandleAccountsChanged; - - var authState = await AuthStateProvider.GetAuthenticationStateAsync(); - var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; - - if (userId is not null) - { - accounts = await AccountService.GetAccountsAsync(userId); - } - } - - private async void HandleAccountsChanged() - { - var authState = await AuthStateProvider.GetAuthenticationStateAsync(); - var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; - - if (userId is not null) - { - accounts = await AccountService.GetAccountsAsync(userId); - await InvokeAsync(StateHasChanged); - } - } - - public void Dispose() - { - AppState.OnAccountsChanged -= HandleAccountsChanged; - } - - private void NavigateToAccounts() - { - Navigation.NavigateTo("accounts"); - } -} - + \ No newline at end of file diff --git a/BudgetApp/Components/Layout/NavMenu.razor.cs b/BudgetApp/Components/Layout/NavMenu.razor.cs new file mode 100644 index 0000000..6cbb597 --- /dev/null +++ b/BudgetApp/Components/Layout/NavMenu.razor.cs @@ -0,0 +1,43 @@ +using BudgetApp.Data.Entities; + +namespace BudgetApp.Components.Layout; + +public partial class NavMenu +{ + private List? _accounts; + + protected override async Task OnInitializedAsync() + { + AppState.OnAccountsChanged += HandleAccountsChanged; + + var authState = await AuthStateProvider.GetAuthenticationStateAsync(); + var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; + + if (userId is not null) + { + _accounts = await AccountService.GetAccountsAsync(userId); + } + } + + private async void HandleAccountsChanged() + { + var authState = await AuthStateProvider.GetAuthenticationStateAsync(); + var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; + + if (userId is not null) + { + _accounts = await AccountService.GetAccountsAsync(userId); + await InvokeAsync(StateHasChanged); + } + } + + public void Dispose() + { + AppState.OnAccountsChanged -= HandleAccountsChanged; + } + + private void NavigateToAccounts() + { + Navigation.NavigateTo("accounts"); + } +} \ No newline at end of file diff --git a/BudgetApp/Components/Pages/About.razor b/BudgetApp/Components/Pages/About.razor index 2f4bc8e..08e91bd 100644 --- a/BudgetApp/Components/Pages/About.razor +++ b/BudgetApp/Components/Pages/About.razor @@ -10,10 +10,10 @@ A personal finance dashboard built with Blazor Server.

-@if (links.Count > 0) +@if (_links.Count > 0) {
- @foreach (var link in links) + @foreach (var link in _links) { @((MarkupString)link.Icon) @link.Label @@ -24,34 +24,4 @@

Sign in or Register -

- -@code { - private record ContactLink(string Label, string Url, string Icon); - private List links = []; - - protected override void OnInitialized() - { - var about = Configuration.GetSection("About"); - - var email = about["Email"]; - if (!string.IsNullOrWhiteSpace(email)) - links.Add(new("Email", $"mailto:{email}", "")); - - var discord = about["Discord"]; - if (!string.IsNullOrWhiteSpace(discord)) - links.Add(new("Discord", discord, "")); - - var github = about["GitHub"]; - if (!string.IsNullOrWhiteSpace(github)) - links.Add(new("GitHub", github, "")); - - var twitter = about["Twitter"]; - if (!string.IsNullOrWhiteSpace(twitter)) - links.Add(new("Twitter", twitter, "")); - - var mastodon = about["Mastodon"]; - if (!string.IsNullOrWhiteSpace(mastodon)) - links.Add(new("Mastodon", mastodon, "")); - } -} +

\ No newline at end of file diff --git a/BudgetApp/Components/Pages/About.razor.cs b/BudgetApp/Components/Pages/About.razor.cs new file mode 100644 index 0000000..58db54f --- /dev/null +++ b/BudgetApp/Components/Pages/About.razor.cs @@ -0,0 +1,38 @@ +namespace BudgetApp.Components.Pages; + +public partial class About +{ + private record ContactLink(string Label, string Url, string Icon); + + private readonly List _links = []; + + protected override void OnInitialized() + { + var about = Configuration.GetSection("About"); + + var email = about["Email"]; + if (!string.IsNullOrWhiteSpace(email)) + _links.Add(new("Email", $"mailto:{email}", + "")); + + var discord = about["Discord"]; + if (!string.IsNullOrWhiteSpace(discord)) + _links.Add(new("Discord", discord, + "")); + + var github = about["GitHub"]; + if (!string.IsNullOrWhiteSpace(github)) + _links.Add(new("GitHub", github, + "")); + + var twitter = about["Twitter"]; + if (!string.IsNullOrWhiteSpace(twitter)) + _links.Add(new("Twitter", twitter, + "")); + + var mastodon = about["Mastodon"]; + if (!string.IsNullOrWhiteSpace(mastodon)) + _links.Add(new("Mastodon", mastodon, + "")); + } +} \ No newline at end of file diff --git a/BudgetApp/Components/Pages/Accounts.razor b/BudgetApp/Components/Pages/Accounts.razor index 05d37c1..ebbc3c6 100644 --- a/BudgetApp/Components/Pages/Accounts.razor +++ b/BudgetApp/Components/Pages/Accounts.razor @@ -1,6 +1,7 @@ @page "/accounts" +@using BudgetApp.Data.Entities @attribute [Authorize] -@inject AccountService AccountService +@inject IAccountRepository AccountService @inject AuthenticationStateProvider AuthStateProvider @inject AppState AppState @rendermode InteractiveServer @@ -15,20 +16,20 @@
Add Account
- +
- +
- +
- + @foreach (var kvp in Account.CurrencySymbols) { @@ -37,7 +38,7 @@
- +
@@ -47,31 +48,31 @@
-@if (accounts is null) +@if (_accounts is null) {

Loading...

} -else if (accounts.Count == 0) +else if (_accounts.Count == 0) {
No accounts yet. Add one above to get started.
} else {
- @foreach (var account in accounts) + @foreach (var account in _accounts) {
- @if (editingAccountId == account.Id) + @if (_editingAccountId == account.Id) {
- +
- @foreach (var kvp in Account.CurrencySymbols) { @@ -80,7 +81,7 @@ else
- +
@@ -100,13 +101,13 @@ else
- @if (editingBalanceAccountId == account.Id) + @if (_editingBalanceAccountId == account.Id) {
@account.GetSymbol() + @bind="_editingBalanceValue" />
@@ -131,7 +132,7 @@ else
} -@if (showDeleteModal && pendingDeleteAccount is not null) +@if (_showDeleteModal && _pendingDeleteAccount is not null) {
@@ -141,7 +142,7 @@ else
-

Are you sure you want to delete @pendingDeleteAccount.Name?

+

Are you sure you want to delete @_pendingDeleteAccount.Name?

This will permanently remove the account and all its transactions.

@@ -154,138 +155,11 @@ else } @code { - private List? accounts; - private AccountForm formModel = new(); - private string? userId; // Balance editing state - private int? editingBalanceAccountId; - private decimal editingBalanceValue; // Account details editing state - private int? editingAccountId; - private string editName = string.Empty; - private string editColor = "#1b6ec2"; - private string editCurrencyCode = "GBP"; // Delete confirmation state - private bool showDeleteModal; - private Account? pendingDeleteAccount; - protected override async Task OnInitializedAsync() - { - var authState = await AuthStateProvider.GetAuthenticationStateAsync(); - userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; - await LoadAccounts(); - } - - private async Task LoadAccounts() - { - if (userId is not null) - { - accounts = await AccountService.GetAccountsAsync(userId); - } - } - - private async Task AddAccount() - { - if (userId is null) return; - - var account = new Account - { - Name = formModel.Name, - CurrentBalance = formModel.CurrentBalance, - Color = formModel.Color, - CurrencyCode = formModel.CurrencyCode, - UserId = userId - }; - await AccountService.CreateAccountAsync(account); - formModel = new AccountForm(); - await LoadAccounts(); - AppState.NotifyAccountsChanged(); - } - - private void ConfirmDeleteAccount(Account account) - { - pendingDeleteAccount = account; - showDeleteModal = true; - } - - private async Task DeleteAccountConfirmed() - { - if (userId is null || pendingDeleteAccount is null) return; - - showDeleteModal = false; - await AccountService.DeleteAccountAsync(pendingDeleteAccount.Id, userId); - pendingDeleteAccount = null; - await LoadAccounts(); - AppState.NotifyAccountsChanged(); - } - - private void CancelDeleteAccount() - { - showDeleteModal = false; - pendingDeleteAccount = null; - } - - private void StartBalanceEdit(Account account) - { - editingBalanceAccountId = account.Id; - editingBalanceValue = account.CurrentBalance; - } - - private void CancelBalanceEdit() - { - editingBalanceAccountId = null; - } - - private async Task SaveBalance(int accountId) - { - if (userId is null) return; - - await AccountService.UpdateBalanceAsync(accountId, userId, editingBalanceValue); - editingBalanceAccountId = null; - await LoadAccounts(); - AppState.NotifyAccountsChanged(); - } - - private void StartAccountEdit(Account account) - { - editingAccountId = account.Id; - editName = account.Name; - editColor = account.Color; - editCurrencyCode = account.CurrencyCode; - } - - private void CancelAccountEdit() - { - editingAccountId = null; - } - - private async Task SaveAccountDetails(int accountId) - { - if (userId is null) return; - - await AccountService.UpdateAccountDetailsAsync(accountId, userId, editName, editColor, editCurrencyCode); - editingAccountId = null; - await LoadAccounts(); - AppState.NotifyAccountsChanged(); - } - - private sealed class AccountForm - { - [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Account name is required")] - [System.ComponentModel.DataAnnotations.MaxLength(100)] - public string Name { get; set; } = string.Empty; - - public decimal CurrentBalance { get; set; } - - [System.ComponentModel.DataAnnotations.Required] - [System.ComponentModel.DataAnnotations.MaxLength(7)] - public string Color { get; set; } = "#1b6ec2"; - - [System.ComponentModel.DataAnnotations.Required] - [System.ComponentModel.DataAnnotations.MaxLength(3)] - public string CurrencyCode { get; set; } = "GBP"; - } } diff --git a/BudgetApp/Components/Pages/Accounts.razor.cs b/BudgetApp/Components/Pages/Accounts.razor.cs index e69de29..749179a 100644 --- a/BudgetApp/Components/Pages/Accounts.razor.cs +++ b/BudgetApp/Components/Pages/Accounts.razor.cs @@ -0,0 +1,136 @@ + +using BudgetApp.Data.Entities; + +namespace BudgetApp.Components.Pages; + +public partial class Accounts +{ + private List? _accounts; + private AccountForm _formModel = new(); + private string? _userId; + private int? _editingBalanceAccountId; + private decimal _editingBalanceValue; + private int? _editingAccountId; + private string _editName = string.Empty; + private string _editColor = "#1b6ec2"; + private string _editCurrencyCode = "GBP"; + private bool _showDeleteModal; + private Account? _pendingDeleteAccount; + + protected override async Task OnInitializedAsync() + { + var authState = await AuthStateProvider.GetAuthenticationStateAsync(); + _userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; + await LoadAccounts(); + } + + private async Task LoadAccounts() + { + if (_userId is not null) + { + _accounts = await AccountService.GetAccountsAsync(_userId); + } + } + + private async Task AddAccount() + { + if (_userId is null) return; + + var account = new Account + { + Name = _formModel.Name, + CurrentBalance = _formModel.CurrentBalance, + Color = _formModel.Color, + CurrencyCode = _formModel.CurrencyCode, + UserId = _userId + }; + await AccountService.CreateAccountAsync(account); + _formModel = new AccountForm(); + await LoadAccounts(); + AppState.NotifyAccountsChanged(); + } + + private void ConfirmDeleteAccount(Account account) + { + _pendingDeleteAccount = account; + _showDeleteModal = true; + } + + private async Task DeleteAccountConfirmed() + { + if (_userId is null || _pendingDeleteAccount is null) return; + + _showDeleteModal = false; + await AccountService.DeleteAccountAsync(_pendingDeleteAccount.Id, _userId); + _pendingDeleteAccount = null; + await LoadAccounts(); + AppState.NotifyAccountsChanged(); + } + + private void CancelDeleteAccount() + { + _showDeleteModal = false; + _pendingDeleteAccount = null; + } + + private void StartBalanceEdit(Account account) + { + _editingBalanceAccountId = account.Id; + _editingBalanceValue = account.CurrentBalance; + } + + private void CancelBalanceEdit() + { + _editingBalanceAccountId = null; + } + + private async Task SaveBalance(int accountId) + { + if (_userId is null) return; + + await AccountService.UpdateBalanceAsync(accountId, _userId, _editingBalanceValue); + _editingBalanceAccountId = null; + await LoadAccounts(); + AppState.NotifyAccountsChanged(); + } + + private void StartAccountEdit(Account account) + { + _editingAccountId = account.Id; + _editName = account.Name; + _editColor = account.Color; + _editCurrencyCode = account.CurrencyCode; + } + + private void CancelAccountEdit() + { + _editingAccountId = null; + } + + private async Task SaveAccountDetails(int accountId) + { + if (_userId is null) return; + + await AccountService.UpdateAccountDetailsAsync(accountId, _userId, _editName, _editColor, _editCurrencyCode); + _editingAccountId = null; + await LoadAccounts(); + AppState.NotifyAccountsChanged(); + } + + private sealed class AccountForm + { + [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Account name is required")] + [System.ComponentModel.DataAnnotations.MaxLength(100)] + public string Name { get; set; } = string.Empty; + + public decimal CurrentBalance { get; set; } + + [System.ComponentModel.DataAnnotations.Required] + [System.ComponentModel.DataAnnotations.MaxLength(7)] + public string Color { get; set; } = "#1b6ec2"; + + [System.ComponentModel.DataAnnotations.Required] + [System.ComponentModel.DataAnnotations.MaxLength(3)] + public string CurrencyCode { get; set; } = "GBP"; + } +} \ No newline at end of file diff --git a/BudgetApp/Components/Pages/Categories.razor b/BudgetApp/Components/Pages/Categories.razor index c28de6e..f4e3289 100644 --- a/BudgetApp/Components/Pages/Categories.razor +++ b/BudgetApp/Components/Pages/Categories.razor @@ -1,6 +1,6 @@ @page "/categories" @attribute [Authorize] -@inject CategoryService CategoryService +@inject ICategoryRepository CategoryService @inject AuthenticationStateProvider AuthStateProvider @rendermode InteractiveServer @@ -14,17 +14,17 @@
Add Category
- +
- +
+ title="Click to choose an emoji icon" @onclick="OpenAddIconPicker">@(string.IsNullOrEmpty(_formModel.Icon) ? "📁" : _formModel.Icon)
@@ -34,29 +34,29 @@
-@if (categories is null) +@if (_categories is null) {

Loading...

} -else if (categories.Count == 0) +else if (_categories.Count == 0) {
No categories yet. Add one above to organise your transactions.
} else {
- @foreach (var category in categories) + @foreach (var category in _categories) {
- @if (editingCategoryId == category.Id) + @if (_editingCategoryId == category.Id) { + @onclick="OpenEditIconPicker">@(string.IsNullOrEmpty(_editIcon) ? "📁" : _editIcon)
+ style="font-size: 1rem; font-weight: 500;" @bind="_editCategoryName" />
} else @@ -73,7 +73,7 @@ else { Default } - else if (editingCategoryId == category.Id) + else if (_editingCategoryId == category.Id) { @@ -91,7 +91,7 @@ else
} -@if (showIconModal) +@if (_showIconModal) {
@@ -115,118 +115,9 @@ else } @code { - private List? categories; - private CategoryForm formModel = new(); - private string? userId; // Edit state - private int? editingCategoryId; - private string editCategoryName = string.Empty; - private string editIcon = string.Empty; // Icon modal state - private bool showIconModal; - private string iconPickerTarget = "add"; // "add" or "edit" - private static readonly string[] AvailableIcons = - [ - "🛒", "🏠", "💡", "🚗", "🍽️", "🎬", "🏥", "🛡️", "💰", "🏦", - "📱", "🛍️", "📚", "✈️", "🎁", "🏋️", "🎮", "🎵", "🐾", "☕", - "🍕", "👶", "💼", "🔧", "📦", "💊", "🎨", "🌿", "🏢", "📰", - "💳", "🧾", "📋", "🔌", "🚌", "🚀", "🎂", "🧹", "📸", "💎" - ]; - - protected override async Task OnInitializedAsync() - { - var authState = await AuthStateProvider.GetAuthenticationStateAsync(); - userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; - await LoadCategories(); - } - - private async Task LoadCategories() - { - if (userId is not null) - { - await CategoryService.EnsureDefaultCategoriesAsync(userId); - categories = await CategoryService.GetCategoriesAsync(userId); - } - } - - private async Task AddCategory() - { - if (userId is null) return; - - var category = new Category - { - Name = formModel.Name, - Icon = formModel.Icon, - UserId = userId - }; - await CategoryService.CreateCategoryAsync(category); - formModel = new CategoryForm(); - await LoadCategories(); - } - - private void StartCategoryEdit(Category category) - { - editingCategoryId = category.Id; - editCategoryName = category.Name; - editIcon = category.Icon; - } - - private void CancelCategoryEdit() - { - editingCategoryId = null; - } - - private async Task SaveCategoryEdit(int id) - { - if (userId is null) return; - - await CategoryService.UpdateCategoryAsync(id, userId, editCategoryName, editIcon); - editingCategoryId = null; - await LoadCategories(); - } - - private async Task DeleteCategory(int id) - { - if (userId is null) return; - - await CategoryService.DeleteCategoryAsync(id, userId); - await LoadCategories(); - } - - private void OpenAddIconPicker() - { - iconPickerTarget = "add"; - showIconModal = true; - } - - private void OpenEditIconPicker() - { - iconPickerTarget = "edit"; - showIconModal = true; - } - - private void CloseIconModal() => showIconModal = false; - - private void SelectIcon(string emoji) - { - if (iconPickerTarget == "add") - formModel.Icon = emoji; - else - editIcon = emoji; - - showIconModal = false; - } - - private sealed class CategoryForm - { - [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Category name is required")] - [System.ComponentModel.DataAnnotations.MaxLength(100)] - public string Name { get; set; } = string.Empty; - - [System.ComponentModel.DataAnnotations.MaxLength(10)] - public string Icon { get; set; } = "📁"; - } } diff --git a/BudgetApp/Components/Pages/Categories.razor.cs b/BudgetApp/Components/Pages/Categories.razor.cs new file mode 100644 index 0000000..6a9ea0d --- /dev/null +++ b/BudgetApp/Components/Pages/Categories.razor.cs @@ -0,0 +1,118 @@ + +using BudgetApp.Data.Entities; + +namespace BudgetApp.Components.Pages; + +public partial class Categories +{ + private List? _categories; + private CategoryForm _formModel = new(); + private string? _userId; + private int? _editingCategoryId; + private string _editCategoryName = string.Empty; + private string _editIcon = string.Empty; + private bool _showIconModal; + private string _iconPickerTarget = "add"; // "add" or "edit" + + private static readonly string[] AvailableIcons = + [ + "??", "??", "??", "??", "???", "??", "??", "???", "??", "??", + "??", "???", "??", "??", "??", "???", "??", "??", "??", "?", + "??", "??", "??", "??", "??", "??", "??", "??", "??", "??", + "??", "??", "??", "??", "??", "??", "??", "??", "??", "??" + ]; + + protected override async Task OnInitializedAsync() + { + var authState = await AuthStateProvider.GetAuthenticationStateAsync(); + _userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; + await LoadCategories(); + } + + private async Task LoadCategories() + { + if (_userId is not null) + { + await CategoryService.EnsureDefaultCategoriesAsync(_userId); + _categories = await CategoryService.GetCategoriesAsync(_userId); + } + } + + private async Task AddCategory() + { + if (_userId is null) return; + + var category = new Category + { + Name = _formModel.Name, + Icon = _formModel.Icon, + UserId = _userId + }; + await CategoryService.CreateCategoryAsync(category); + _formModel = new CategoryForm(); + await LoadCategories(); + } + + private void StartCategoryEdit(Category category) + { + _editingCategoryId = category.Id; + _editCategoryName = category.Name; + _editIcon = category.Icon; + } + + private void CancelCategoryEdit() + { + _editingCategoryId = null; + } + + private async Task SaveCategoryEdit(int id) + { + if (_userId is null) return; + + await CategoryService.UpdateCategoryAsync(id, _userId, _editCategoryName, _editIcon); + _editingCategoryId = null; + await LoadCategories(); + } + + private async Task DeleteCategory(int id) + { + if (_userId is null) return; + + await CategoryService.DeleteCategoryAsync(id, _userId); + await LoadCategories(); + } + + private void OpenAddIconPicker() + { + _iconPickerTarget = "add"; + _showIconModal = true; + } + + private void OpenEditIconPicker() + { + _iconPickerTarget = "edit"; + _showIconModal = true; + } + + private void CloseIconModal() => _showIconModal = false; + + private void SelectIcon(string emoji) + { + if (_iconPickerTarget == "add") + _formModel.Icon = emoji; + else + _editIcon = emoji; + + _showIconModal = false; + } + + private sealed class CategoryForm + { + [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Category name is required")] + [System.ComponentModel.DataAnnotations.MaxLength(100)] + public string Name { get; set; } = string.Empty; + + [System.ComponentModel.DataAnnotations.MaxLength(10)] + public string Icon { get; set; } = "??"; + } +} \ No newline at end of file diff --git a/BudgetApp/Components/Pages/Home.razor b/BudgetApp/Components/Pages/Home.razor index 38a6f3d..5610017 100644 --- a/BudgetApp/Components/Pages/Home.razor +++ b/BudgetApp/Components/Pages/Home.razor @@ -1,10 +1,11 @@ @page "/" @attribute [Authorize] @inject DashboardService DashboardService -@inject TransactionService TransactionService -@inject SalaryService SalaryService +@inject ITransactionRepository TransactionService +@inject ISalaryRepository SalaryService @inject AuthenticationStateProvider AuthStateProvider -@inject IJSRuntime JS +@inject IJSRuntime Js +@using BudgetApp.Data.Entities @implements IAsyncDisposable @rendermode InteractiveServer @@ -13,11 +14,11 @@

Dashboard

An overview of your balances, recent and upcoming transactions.

-@if (data is null) +@if (_data is null) {

Loading...

} -else if (data.Accounts.Count == 0) +else if (_data.Accounts.Count == 0) {
Welcome!
@@ -31,16 +32,16 @@ else
Balance Trend
- - - - + + + +
+ title="Custom start date" @bind="_windowStart" @bind:after="OnWindowDateChanged" /> to + title="Custom end date" @bind="_windowEnd" @bind:after="OnWindowDateChanged" />
@@ -51,41 +52,41 @@ else
@* ── Edit / Add Modal ── *@ - @if (showModal) + @if (_showModal) {
-
@(editingTransactionId is null ? "Add Transaction" : "Edit Transaction")
+
@(_editingTransactionId is null ? "Add Transaction" : "Edit Transaction")
- +
- +
- +
- +
- +
- - @foreach (var a in data.Accounts) + + @foreach (var a in _data.Accounts) { } @@ -93,19 +94,19 @@ else
- + - @foreach (var c in data.Categories) + @foreach (var c in _data.Categories) { }
- @if (editingTransactionId is null) + @if (_editingTransactionId is null) {
- + @@ -113,15 +114,15 @@ else
- @if (modalForm.RecurrenceType != RecurrenceType.None) + @if (_modalForm.RecurrenceType != RecurrenceType.None) {
- +
} } - else if (editIsPartOfSeries) + else if (_editIsPartOfSeries) {
Changes will apply to this and all future occurrences in the series. @@ -142,31 +143,31 @@ else
  • -
  • -
+ title="Filter by description, account, category or amount" placeholder="Search..." @bind="_dashboardSearchQuery" @bind:event="oninput" @bind:after="OnDashboardSearchChanged" />
- @if (data.Accounts.Count > 1) + @if (_data.Accounts.Count > 1) {
Filter: - @foreach (var a in data.Accounts) + @foreach (var a in _data.Accounts) { - @@ -174,18 +175,18 @@ else
}
- @if (activeTab == "recent") + @if (_activeTab == "recent") { - @if (filteredRecent.Count == 0) + @if (FilteredRecent.Count == 0) {

No recent transactions.

} else {
- @foreach (var t in filteredRecent.Skip((recentPage - 1) * PageSize).Take(PageSize)) + @foreach (var t in FilteredRecent.Skip((_recentPage - 1) * PageSize).Take(PageSize)) { -
@@ -217,7 +218,7 @@ else @(t.Type == TransactionType.Income ? "Income" : "Expense")
- @if (selectedTransactionId == t.Id) + @if (_selectedTransactionId == t.Id) {
@if (t.IsPaid) @@ -240,25 +241,25 @@ else @if (RecentTotalPages > 1) {
- - Page @recentPage of @RecentTotalPages - + + Page @_recentPage of @RecentTotalPages +
} } } else { - @if (filteredUpcoming.Count == 0) + @if (FilteredUpcoming.Count == 0) {

No upcoming transactions.

} else {
- @foreach (var t in filteredUpcoming.Skip((upcomingPage - 1) * PageSize).Take(PageSize)) + @foreach (var t in FilteredUpcoming.Skip((_upcomingPage - 1) * PageSize).Take(PageSize)) { -
@@ -283,7 +284,7 @@ else
@(t.Type == TransactionType.Income ? "+" : "−")@t.Account.FormatAmount(t.Amount)
- @if (projectedBalances.TryGetValue(t.Id, out var projected)) + @if (_projectedBalances.TryGetValue(t.Id, out var projected)) { Projected: @t.Account.FormatAmount(projected) @@ -295,7 +296,7 @@ else }
- @if (selectedTransactionId == t.Id) + @if (_selectedTransactionId == t.Id) {
@@ -311,9 +312,9 @@ else @if (UpcomingTotalPages > 1) {
- - Page @upcomingPage of @UpcomingTotalPages - + + Page @_upcomingPage of @UpcomingTotalPages +
} } @@ -321,18 +322,18 @@ else
- @if (showDeleteModal && pendingDeleteTransaction is not null) + @if (_showDeleteModal && _pendingDeleteTransaction is not null) {
-
@(pendingDeleteIsRecurring ? "Delete Recurring Transaction" : "Delete Transaction")
+
@(_pendingDeleteIsRecurring ? "Delete Recurring Transaction" : "Delete Transaction")
-

Are you sure you want to delete @pendingDeleteTransaction.Description?

- @if (pendingDeleteIsRecurring) +

Are you sure you want to delete @_pendingDeleteTransaction.Description?

+ @if (_pendingDeleteIsRecurring) {

This transaction is part of a recurring series. Would you like to delete just this one, or all future transactions in the series?

} @@ -343,7 +344,7 @@ else
- @if (pendingDeleteIsRecurring) + @if (_pendingDeleteIsRecurring) { @@ -360,371 +361,17 @@ else } @code { - private DashboardData? data; - private string? userId; - private int? selectedTransactionId; - private string activeTab = "recent"; - private Dictionary projectedBalances = new(); // Modal state - private bool showModal; - private int? editingTransactionId; - private bool editIsPartOfSeries; - private ModalTransactionForm modalForm = new(); // Chart redraw tracking - private int chartDataVersion; - private int lastRenderedChartVersion; // Time window - private DateTime windowStart = DateTime.Today; - private DateTime windowEnd = DateTime.Today.AddDays(30); - private string windowPreset = "30d"; // Account filter - private HashSet hiddenAccountIds = []; - private string dashboardSearchQuery = string.Empty; - - private List filteredRecent => data is null ? [] - : data.RecentTransactions - .Where(t => !hiddenAccountIds.Contains(t.AccountId)) - .Where(t => MatchesSearch(t)) - .ToList(); - - private List filteredUpcoming => data is null ? [] - : data.UpcomingTransactions - .Where(t => !hiddenAccountIds.Contains(t.AccountId)) - .Where(t => MatchesSearch(t)) - .ToList(); - - private bool MatchesSearch(Transaction t) - { - if (string.IsNullOrWhiteSpace(dashboardSearchQuery)) return true; - var q = dashboardSearchQuery.Trim(); - return t.Description.Contains(q, StringComparison.OrdinalIgnoreCase) - || t.Account.Name.Contains(q, StringComparison.OrdinalIgnoreCase) - || (t.Category?.Name?.Contains(q, StringComparison.OrdinalIgnoreCase) ?? false) - || t.Amount.ToString("F2").Contains(q, StringComparison.OrdinalIgnoreCase); - } - - private void ToggleAccountFilter(int accountId) - { - if (!hiddenAccountIds.Remove(accountId)) - hiddenAccountIds.Add(accountId); - recentPage = 1; - upcomingPage = 1; - } - - private void OnDashboardSearchChanged() - { - recentPage = 1; - upcomingPage = 1; - } // Pagination - private int recentPage = 1; - private int upcomingPage = 1; - private const int PageSize = 10; - private int RecentTotalPages => (int)Math.Ceiling(filteredRecent.Count / (double)PageSize); - private int UpcomingTotalPages => (int)Math.Ceiling(filteredUpcoming.Count / (double)PageSize); - - protected override async Task OnInitializedAsync() - { - var authState = await AuthStateProvider.GetAuthenticationStateAsync(); - userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; - - if (userId is not null) - { - await RefreshData(); - } - } - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (data?.ChartData.Datasets.Count > 0 && chartDataVersion != lastRenderedChartVersion) - { - lastRenderedChartVersion = chartDataVersion; - - var datasets = data.ChartData.Datasets.Select(ds => new - { - label = ds.Label, - color = ds.Color, - data = ds.Data.Select(d => (double)d).ToArray(), - currencySymbol = ds.CurrencySymbol - }).ToArray(); - - var dayLabels = data.ChartData.DayTransactionLabels - .Select(d => d.ToArray()).ToArray(); - - int highlightIndex = GetHighlightIndex(); - - await JS.InvokeVoidAsync("chartInterop.createOrUpdateChart", - "balanceChart", - data.ChartData.Labels.ToArray(), - datasets, - dayLabels, - highlightIndex, - GetSalaryDayIndices(), - data.CurrencySymbol); - } - } - - private int GetHighlightIndex() - { - if (selectedTransactionId is null || data is null) return -1; - - var txn = data.RecentTransactions.FirstOrDefault(t => t.Id == selectedTransactionId) - ?? data.UpcomingTransactions.FirstOrDefault(t => t.Id == selectedTransactionId); - if (txn is null) return -1; - - var label = txn.Date.ToString("MMM dd"); - return data.ChartData.Labels.IndexOf(label); - } - - private int[] GetSalaryDayIndices() - { - if (data is null) return []; - - var salaryDates = data.RecentTransactions - .Concat(data.UpcomingTransactions) - .Where(t => t.SalaryId is not null) - .Select(t => t.Date.ToString("MMM dd")) - .ToHashSet(); - - return data.ChartData.Labels - .Select((label, index) => (label, index)) - .Where(x => salaryDates.Contains(x.label)) - .Select(x => x.index) - .ToArray(); - } - - private async Task SelectTransaction(int id) - { - selectedTransactionId = selectedTransactionId == id ? null : id; - - if (data?.ChartData.Datasets.Count > 0) - { - int highlightIndex = GetHighlightIndex(); - await JS.InvokeVoidAsync("chartInterop.highlightDate", "balanceChart", highlightIndex); - } - } - - private void OpenAddModal() - { - editingTransactionId = null; - modalForm = new ModalTransactionForm - { - AccountId = data?.Accounts.FirstOrDefault()?.Id ?? 0 - }; - showModal = true; - } - - private void OpenEditModal(Transaction t) - { - editingTransactionId = t.Id; - editIsPartOfSeries = t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null; - modalForm = new ModalTransactionForm - { - Description = t.Description, - Amount = t.Amount, - Date = t.Date, - Type = t.Type, - AccountId = t.AccountId, - CategoryId = t.CategoryId, - RecurrenceType = t.RecurrenceType, - RecurrenceEndDate = t.RecurrenceEndDate - }; - showModal = true; - } - - private void CloseModal() => showModal = false; - - private async Task SaveModal() - { - if (userId is null) return; - - if (editingTransactionId is null) - { - var transaction = new Transaction - { - Description = modalForm.Description, - Amount = modalForm.Amount, - Date = modalForm.Date, - Type = modalForm.Type, - AccountId = modalForm.AccountId, - CategoryId = modalForm.CategoryId, - RecurrenceType = modalForm.RecurrenceType, - RecurrenceEndDate = modalForm.RecurrenceEndDate - }; - await TransactionService.CreateTransactionAsync(transaction); - await RefreshData(); - - // Keep modal open and reset form for the next entry - var previousAccountId = modalForm.AccountId; - var previousCategoryId = modalForm.CategoryId; - var previousType = modalForm.Type; - modalForm = new ModalTransactionForm - { - AccountId = previousAccountId, - CategoryId = previousCategoryId, - Type = previousType - }; - } - else - { - await TransactionService.UpdateTransactionAsync( - editingTransactionId.Value, userId, - modalForm.Description, modalForm.Amount, modalForm.Date, - modalForm.Type, modalForm.AccountId, modalForm.CategoryId, - modalForm.RecurrenceType, modalForm.RecurrenceEndDate); - - showModal = false; - await RefreshData(); - } - } // Delete confirmation state - private bool showDeleteModal; - private Transaction? pendingDeleteTransaction; - private bool pendingDeleteIsRecurring; - private void ConfirmDelete(Transaction t) - { - pendingDeleteTransaction = t; - pendingDeleteIsRecurring = t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null; - showDeleteModal = true; - } - - private async Task DeleteSingle() - { - if (userId is null || pendingDeleteTransaction is null) return; - showDeleteModal = false; - await TransactionService.DeleteTransactionAsync(pendingDeleteTransaction.Id, userId); - pendingDeleteTransaction = null; - await RefreshData(); - } - - private async Task DeleteSeries() - { - if (userId is null || pendingDeleteTransaction is null) return; - showDeleteModal = false; - await TransactionService.DeleteTransactionSeriesAsync(pendingDeleteTransaction.Id, userId); - pendingDeleteTransaction = null; - await RefreshData(); - } - - private void CancelDelete() - { - showDeleteModal = false; - pendingDeleteTransaction = null; - } - - private async Task MarkAsPaid(int id, bool isPaid) - { - if (userId is null) return; - await TransactionService.MarkAsPaidAsync(id, userId, isPaid); - selectedTransactionId = null; - await RefreshData(); - } - - private static string GetRecurrenceLabel(Transaction t) - { - if (t.RecurrenceType != RecurrenceType.None) - return t.RecurrenceType.ToString(); - return t.ParentTransaction?.RecurrenceType.ToString() ?? "Recurring"; - } - - private void ComputeProjectedBalances() - { - projectedBalances.Clear(); - if (data is null) return; - - var accountBalances = data.Accounts.ToDictionary(a => a.Id, a => a.CurrentBalance); - - foreach (var t in data.UpcomingTransactions) - { - if (!accountBalances.ContainsKey(t.AccountId)) continue; - - accountBalances[t.AccountId] += t.Type == TransactionType.Income ? t.Amount : -t.Amount; - projectedBalances[t.Id] = accountBalances[t.AccountId]; - } - } - - private async Task RefreshData() - { - if (userId is null) return; - await SalaryService.MaterializeSalaryTransactionsAsync(userId, windowEnd); - data = await DashboardService.GetDashboardDataAsync(userId, windowStart, windowEnd); - chartDataVersion++; - ComputeProjectedBalances(); - recentPage = 1; - upcomingPage = 1; - } - - private async Task SetWindow(int days) - { - windowPreset = days switch { 7 => "7d", 30 => "30d", 90 => "90d", 365 => "1y", _ => "custom" }; - windowStart = DateTime.Today; - windowEnd = DateTime.Today.AddDays(days); - await RefreshData(); - } - - private async Task OnWindowDateChanged() - { - windowPreset = "custom"; - await RefreshData(); - } - - public async ValueTask DisposeAsync() - { - try - { - await JS.InvokeVoidAsync("chartInterop.destroyChart", "balanceChart"); - } - catch (JSDisconnectedException) - { - } - } - - private sealed class ModalTransactionForm : System.ComponentModel.DataAnnotations.IValidatableObject - { - [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Description is required")] - [System.ComponentModel.DataAnnotations.MaxLength(200)] - public string Description { get; set; } = string.Empty; - - [System.ComponentModel.DataAnnotations.Range(0.01, (double)decimal.MaxValue, ErrorMessage = "Amount must be greater than zero")] - public decimal Amount { get; set; } - - public DateTime Date { get; set; } = DateTime.Today; - - public TransactionType Type { get; set; } = TransactionType.Expense; - - public int AccountId { get; set; } - - public int? CategoryId { get; set; } - - public RecurrenceType RecurrenceType { get; set; } = RecurrenceType.None; - - public DateTime? RecurrenceEndDate { get; set; } - - public IEnumerable Validate(System.ComponentModel.DataAnnotations.ValidationContext validationContext) - { - if (RecurrenceType != RecurrenceType.None && RecurrenceEndDate.HasValue) - { - var maxEnd = Date.AddYears(1); - if (RecurrenceEndDate.Value > maxEnd) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult( - "Recurrence end date cannot be more than 1 year from the transaction date.", - [nameof(RecurrenceEndDate)]); - } - if (RecurrenceEndDate.Value <= Date) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult( - "Recurrence end date must be after the transaction date.", - [nameof(RecurrenceEndDate)]); - } - } - } - } } diff --git a/BudgetApp/Components/Pages/Home.razor.cs b/BudgetApp/Components/Pages/Home.razor.cs new file mode 100644 index 0000000..c1a3a14 --- /dev/null +++ b/BudgetApp/Components/Pages/Home.razor.cs @@ -0,0 +1,371 @@ +using BudgetApp.Data.Entities; +using BudgetApp.Services.Models; +using Microsoft.JSInterop; + +namespace BudgetApp.Components.Pages; + +public partial class Home +{ + private DashboardData? _data; + private string? _userId; + private int? _selectedTransactionId; + private string _activeTab = "recent"; + private readonly Dictionary _projectedBalances = new(); + private bool _showModal; + private int? _editingTransactionId; + private bool _editIsPartOfSeries; + private ModalTransactionForm _modalForm = new(); + private int _chartDataVersion; + private int _lastRenderedChartVersion; + private DateTime _windowStart = DateTime.Today; + private DateTime _windowEnd = DateTime.Today.AddDays(30); + private string _windowPreset = "30d"; + private readonly HashSet _hiddenAccountIds = []; + private string _dashboardSearchQuery = string.Empty; + + private List FilteredRecent => _data is null + ? [] + : _data.RecentTransactions + .Where(t => !_hiddenAccountIds.Contains(t.AccountId)) + .Where(MatchesSearch) + .ToList(); + + private List FilteredUpcoming => _data is null + ? [] + : _data.UpcomingTransactions + .Where(t => !_hiddenAccountIds.Contains(t.AccountId)) + .Where(MatchesSearch) + .ToList(); + + private bool MatchesSearch(Transaction t) + { + if (string.IsNullOrWhiteSpace(_dashboardSearchQuery)) return true; + var q = _dashboardSearchQuery.Trim(); + return t.Description.Contains(q, StringComparison.OrdinalIgnoreCase) + || t.Account.Name.Contains(q, StringComparison.OrdinalIgnoreCase) + || (t.Category?.Name?.Contains(q, StringComparison.OrdinalIgnoreCase) ?? false) + || t.Amount.ToString("F2").Contains(q, StringComparison.OrdinalIgnoreCase); + } + + private void ToggleAccountFilter(int accountId) + { + if (!_hiddenAccountIds.Remove(accountId)) + _hiddenAccountIds.Add(accountId); + _recentPage = 1; + _upcomingPage = 1; + } + + private void OnDashboardSearchChanged() + { + _recentPage = 1; + _upcomingPage = 1; + } + + private int _recentPage = 1; + private int _upcomingPage = 1; + private const int PageSize = 10; + private int RecentTotalPages => (int)Math.Ceiling(FilteredRecent.Count / (double)PageSize); + private int UpcomingTotalPages => (int)Math.Ceiling(FilteredUpcoming.Count / (double)PageSize); + + protected override async Task OnInitializedAsync() + { + var authState = await AuthStateProvider.GetAuthenticationStateAsync(); + _userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; + + if (_userId is not null) + { + await RefreshData(); + } + } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (_data?.ChartData.Datasets.Count > 0 && _chartDataVersion != _lastRenderedChartVersion) + { + _lastRenderedChartVersion = _chartDataVersion; + + var datasets = _data.ChartData.Datasets.Select(ds => new + { + label = ds.Label, + color = ds.Color, + data = ds.Data.Select(d => (double)d).ToArray(), + currencySymbol = ds.CurrencySymbol + }).ToArray(); + + var dayLabels = _data.ChartData.DayTransactionLabels + .Select(d => d.ToArray()).ToArray(); + + int highlightIndex = GetHighlightIndex(); + + await Js.InvokeVoidAsync("chartInterop.createOrUpdateChart", + "balanceChart", + _data.ChartData.Labels.ToArray(), + datasets, + dayLabels, + highlightIndex, + GetSalaryDayIndices(), + _data.CurrencySymbol); + } + } + + private int GetHighlightIndex() + { + if (_selectedTransactionId is null || _data is null) return -1; + + var txn = _data.RecentTransactions.FirstOrDefault(t => t.Id == _selectedTransactionId) + ?? _data.UpcomingTransactions.FirstOrDefault(t => t.Id == _selectedTransactionId); + if (txn is null) return -1; + + var label = txn.Date.ToString("MMM dd"); + return _data.ChartData.Labels.IndexOf(label); + } + + private int[] GetSalaryDayIndices() + { + if (_data is null) return []; + + var salaryDates = _data.RecentTransactions + .Concat(_data.UpcomingTransactions) + .Where(t => t.SalaryId is not null) + .Select(t => t.Date.ToString("MMM dd")) + .ToHashSet(); + + return _data.ChartData.Labels + .Select((label, index) => (label, index)) + .Where(x => salaryDates.Contains(x.label)) + .Select(x => x.index) + .ToArray(); + } + + private async Task SelectTransaction(int id) + { + _selectedTransactionId = _selectedTransactionId == id ? null : id; + + if (_data?.ChartData.Datasets.Count > 0) + { + int highlightIndex = GetHighlightIndex(); + await Js.InvokeVoidAsync("chartInterop.highlightDate", "balanceChart", highlightIndex); + } + } + + private void OpenAddModal() + { + _editingTransactionId = null; + _modalForm = new ModalTransactionForm + { + AccountId = _data?.Accounts.FirstOrDefault()?.Id ?? 0 + }; + _showModal = true; + } + + private void OpenEditModal(Transaction t) + { + _editingTransactionId = t.Id; + _editIsPartOfSeries = t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null; + _modalForm = new ModalTransactionForm + { + Description = t.Description, + Amount = t.Amount, + Date = t.Date, + Type = t.Type, + AccountId = t.AccountId, + CategoryId = t.CategoryId, + RecurrenceType = t.RecurrenceType, + RecurrenceEndDate = t.RecurrenceEndDate + }; + _showModal = true; + } + + private void CloseModal() => _showModal = false; + + private async Task SaveModal() + { + if (_userId is null) return; + + if (_editingTransactionId is null) + { + var transaction = new Transaction + { + Description = _modalForm.Description, + Amount = _modalForm.Amount, + Date = _modalForm.Date, + Type = _modalForm.Type, + AccountId = _modalForm.AccountId, + CategoryId = _modalForm.CategoryId, + RecurrenceType = _modalForm.RecurrenceType, + RecurrenceEndDate = _modalForm.RecurrenceEndDate + }; + await TransactionService.CreateTransactionAsync(transaction); + await RefreshData(); + + // Keep modal open and reset form for the next entry + var previousAccountId = _modalForm.AccountId; + var previousCategoryId = _modalForm.CategoryId; + var previousType = _modalForm.Type; + _modalForm = new ModalTransactionForm + { + AccountId = previousAccountId, + CategoryId = previousCategoryId, + Type = previousType + }; + } + else + { + await TransactionService.UpdateTransactionAsync( + _editingTransactionId.Value, _userId, + _modalForm.Description, _modalForm.Amount, _modalForm.Date, + _modalForm.Type, _modalForm.AccountId, _modalForm.CategoryId, + _modalForm.RecurrenceType, _modalForm.RecurrenceEndDate); + + _showModal = false; + await RefreshData(); + } + } + + private bool _showDeleteModal; + private Transaction? _pendingDeleteTransaction; + private bool _pendingDeleteIsRecurring; + + private void ConfirmDelete(Transaction t) + { + _pendingDeleteTransaction = t; + _pendingDeleteIsRecurring = t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null; + _showDeleteModal = true; + } + + private async Task DeleteSingle() + { + if (_userId is null || _pendingDeleteTransaction is null) return; + _showDeleteModal = false; + await TransactionService.DeleteTransactionAsync(_pendingDeleteTransaction.Id, _userId); + _pendingDeleteTransaction = null; + await RefreshData(); + } + + private async Task DeleteSeries() + { + if (_userId is null || _pendingDeleteTransaction is null) return; + _showDeleteModal = false; + await TransactionService.DeleteTransactionSeriesAsync(_pendingDeleteTransaction.Id, _userId); + _pendingDeleteTransaction = null; + await RefreshData(); + } + + private void CancelDelete() + { + _showDeleteModal = false; + _pendingDeleteTransaction = null; + } + + private async Task MarkAsPaid(int id, bool isPaid) + { + if (_userId is null) return; + await TransactionService.MarkAsPaidAsync(id, _userId, isPaid); + _selectedTransactionId = null; + await RefreshData(); + } + + private static string GetRecurrenceLabel(Transaction t) + { + if (t.RecurrenceType != RecurrenceType.None) + return t.RecurrenceType.ToString(); + return t.ParentTransaction?.RecurrenceType.ToString() ?? "Recurring"; + } + + private void ComputeProjectedBalances() + { + _projectedBalances.Clear(); + if (_data is null) return; + + var accountBalances = _data.Accounts.ToDictionary(a => a.Id, a => a.CurrentBalance); + + foreach (var t in _data.UpcomingTransactions) + { + if (!accountBalances.ContainsKey(t.AccountId)) continue; + + accountBalances[t.AccountId] += t.Type == TransactionType.Income ? t.Amount : -t.Amount; + _projectedBalances[t.Id] = accountBalances[t.AccountId]; + } + } + + private async Task RefreshData() + { + if (_userId is null) return; + await SalaryService.MaterializeSalaryTransactionsAsync(_userId, _windowEnd); + _data = await DashboardService.GetDashboardDataAsync(_userId, _windowStart, _windowEnd); + _chartDataVersion++; + ComputeProjectedBalances(); + _recentPage = 1; + _upcomingPage = 1; + } + + private async Task SetWindow(int days) + { + _windowPreset = days switch { 7 => "7d", 30 => "30d", 90 => "90d", 365 => "1y", _ => "custom" }; + _windowStart = DateTime.Today; + _windowEnd = DateTime.Today.AddDays(days); + await RefreshData(); + } + + private async Task OnWindowDateChanged() + { + _windowPreset = "custom"; + await RefreshData(); + } + + public async ValueTask DisposeAsync() + { + try + { + await Js.InvokeVoidAsync("chartInterop.destroyChart", "balanceChart"); + } + catch (JSDisconnectedException) + { + } + } + + private sealed class ModalTransactionForm : System.ComponentModel.DataAnnotations.IValidatableObject + { + [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Description is required")] + [System.ComponentModel.DataAnnotations.MaxLength(200)] + public string Description { get; set; } = string.Empty; + + [System.ComponentModel.DataAnnotations.Range(0.01, (double)decimal.MaxValue, + ErrorMessage = "Amount must be greater than zero")] + public decimal Amount { get; set; } + + public DateTime Date { get; set; } = DateTime.Today; + + public TransactionType Type { get; set; } = TransactionType.Expense; + + public int AccountId { get; set; } + + public int? CategoryId { get; set; } + + public RecurrenceType RecurrenceType { get; set; } = RecurrenceType.None; + + public DateTime? RecurrenceEndDate { get; set; } + + public IEnumerable Validate( + System.ComponentModel.DataAnnotations.ValidationContext validationContext) + { + if (RecurrenceType != RecurrenceType.None && RecurrenceEndDate.HasValue) + { + var maxEnd = Date.AddYears(1); + if (RecurrenceEndDate.Value > maxEnd) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult( + "Recurrence end date cannot be more than 1 year from the transaction date.", + [nameof(RecurrenceEndDate)]); + } + + if (RecurrenceEndDate.Value <= Date) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult( + "Recurrence end date must be after the transaction date.", + [nameof(RecurrenceEndDate)]); + } + } + } + } +} \ No newline at end of file diff --git a/BudgetApp/Components/Pages/Login.razor b/BudgetApp/Components/Pages/Login.razor index 321a7f1..fff100c 100644 --- a/BudgetApp/Components/Pages/Login.razor +++ b/BudgetApp/Components/Pages/Login.razor @@ -1,5 +1,6 @@ @page "/login" @layout AuthLayout +@using BudgetApp.Data.Entities @using Microsoft.AspNetCore.Authentication @using Microsoft.AspNetCore.Identity @inject SignInManager SignInManager @@ -17,9 +18,9 @@ - @if (!string.IsNullOrEmpty(errorMessage)) + @if (!string.IsNullOrEmpty(_errorMessage)) { -
@errorMessage
+
@_errorMessage
}
@@ -37,17 +38,17 @@ -@if (externalProviders.Count > 0) +@if (_externalProviders.Count > 0) {

Or sign in with

- @foreach (var provider in externalProviders) + @foreach (var provider in _externalProviders) {
- + - - - + + + +
+ title="Start date" @bind="_dateFrom" @bind:after="OnDateChanged" /> to + title="End date" @bind="_dateTo" @bind:after="OnDateChanged" />
- @foreach (var account in accounts) + @foreach (var account in _accounts) { - @@ -67,11 +68,11 @@
-@if (salaries is null) +@if (_salaries is null) {

Loading...

} -else if (salaries.Count == 0) +else if (_salaries.Count == 0) {
No income sources yet. Add one above to start tracking your salary.
} @@ -94,7 +95,7 @@ else - @foreach (var s in salaries) + @foreach (var s in _salaries) { 💰 @s.Name @@ -108,7 +109,7 @@ else 🔁 @s.GetPaydaySummary() - @if (nextPaydates.TryGetValue(s.Id, out var next) && next.HasValue) + @if (_nextPaydates.TryGetValue(s.Id, out var next) && next.HasValue) { @next.Value.ToString("MMM dd, yyyy") } @@ -126,12 +127,12 @@ else
- @salaries.Count income source@(salaries.Count == 1 ? "" : "s") · Transactions are generated automatically and appear on the Transactions page. + @_salaries.Count income source@(_salaries.Count == 1 ? "" : "s") · Transactions are generated automatically and appear on the Transactions page.
} -@if (showDeleteModal && pendingDeleteSalary is not null) +@if (_showDeleteModal && _pendingDeleteSalary is not null) {
@@ -141,7 +142,7 @@ else
-

Are you sure you want to delete @pendingDeleteSalary.Name?

+

Are you sure you want to delete @_pendingDeleteSalary.Name?

All future unpaid salary transactions will be removed. Past transactions remain in your history.

This action cannot be undone.

@@ -155,110 +156,7 @@ else } @code { - private List? salaries; - private List? accountsList; - private Dictionary nextPaydates = []; - private string? userId; - - private SalaryForm formModel = new(); - - protected override async Task OnInitializedAsync() - { - var authState = await AuthStateProvider.GetAuthenticationStateAsync(); - userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; - await LoadData(); - } - - private async Task LoadData() - { - if (userId is null) return; - - var windowEnd = DateTime.Today.AddDays(90); - await SalaryService.MaterializeSalaryTransactionsAsync(userId, windowEnd); - - salaries = await SalaryService.GetSalariesAsync(userId); - accountsList = await AccountService.GetAccountsAsync(userId); - - nextPaydates.Clear(); - foreach (var sal in salaries) - { - nextPaydates[sal.Id] = await SalaryService.GetNextPaydateAsync(sal.Id); - } - - if (accountsList.Count > 0 && formModel.AccountId == 0) - { - formModel.AccountId = accountsList[0].Id; - } - } - - private async Task AddSalary() - { - if (userId is null) return; - - var entry = new BudgetApp.Data.Salary - { - Name = formModel.Name, - Amount = formModel.Amount, - AccountId = formModel.AccountId, - RecurrenceType = formModel.RecurrenceType, - StartDate = formModel.StartDate, - UserId = userId - }; - - await SalaryService.CreateSalaryAsync(entry, DateTime.Today.AddDays(90)); - - formModel = new SalaryForm - { - AccountId = accountsList?.FirstOrDefault()?.Id ?? 0 - }; - - await LoadData(); - } // Delete state - private bool showDeleteModal; - private BudgetApp.Data.Salary? pendingDeleteSalary; - private void ConfirmDelete(BudgetApp.Data.Salary s) - { - pendingDeleteSalary = s; - showDeleteModal = true; - } - - private void CancelDelete() - { - showDeleteModal = false; - pendingDeleteSalary = null; - } - - private async Task ExecuteDelete() - { - if (userId is null || pendingDeleteSalary is null) return; - showDeleteModal = false; - await SalaryService.DeleteSalaryAsync(pendingDeleteSalary.Id, userId); - pendingDeleteSalary = null; - await LoadData(); - } - - private sealed class SalaryForm : System.ComponentModel.DataAnnotations.IValidatableObject - { - [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Name is required")] - [System.ComponentModel.DataAnnotations.MaxLength(200)] - public string Name { get; set; } = string.Empty; - - [System.ComponentModel.DataAnnotations.Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than zero")] - public decimal Amount { get; set; } - - public int AccountId { get; set; } - - public RecurrenceType RecurrenceType { get; set; } = RecurrenceType.Monthly; - - public DateTime StartDate { get; set; } = DateTime.Today; - - public IEnumerable Validate( - System.ComponentModel.DataAnnotations.ValidationContext validationContext) - { - yield break; - } - } } diff --git a/BudgetApp/Components/Pages/Salary.razor.cs b/BudgetApp/Components/Pages/Salary.razor.cs new file mode 100644 index 0000000..8db5bc1 --- /dev/null +++ b/BudgetApp/Components/Pages/Salary.razor.cs @@ -0,0 +1,113 @@ + +using BudgetApp.Data.Entities; + +namespace BudgetApp.Components.Pages; + +public partial class Salary +{ + private List? _salaries; + private List? _accountsList; + private readonly Dictionary _nextPaydates = []; + private string? _userId; + private SalaryForm _formModel = new(); + + protected override async Task OnInitializedAsync() + { + var authState = await AuthStateProvider.GetAuthenticationStateAsync(); + _userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; + await LoadData(); + } + + private async Task LoadData() + { + if (_userId is null) return; + + var windowEnd = DateTime.Today.AddDays(90); + await SalaryService.MaterializeSalaryTransactionsAsync(_userId, windowEnd); + + _salaries = await SalaryService.GetSalariesAsync(_userId); + _accountsList = await AccountService.GetAccountsAsync(_userId); + + _nextPaydates.Clear(); + foreach (var sal in _salaries) + { + _nextPaydates[sal.Id] = await SalaryService.GetNextPaydateAsync(sal.Id); + } + + if (_accountsList.Count > 0 && _formModel.AccountId == 0) + { + _formModel.AccountId = _accountsList[0].Id; + } + } + + private async Task AddSalary() + { + if (_userId is null) return; + + var entry = new Data.Entities.Salary + { + Name = _formModel.Name, + Amount = _formModel.Amount, + AccountId = _formModel.AccountId, + RecurrenceType = _formModel.RecurrenceType, + StartDate = _formModel.StartDate, + UserId = _userId + }; + + await SalaryService.CreateSalaryAsync(entry, DateTime.Today.AddDays(90)); + + _formModel = new SalaryForm + { + AccountId = _accountsList?.FirstOrDefault()?.Id ?? 0 + }; + + await LoadData(); + } + + private bool _showDeleteModal; + private Data.Entities.Salary? _pendingDeleteSalary; + + private void ConfirmDelete(Data.Entities.Salary s) + { + _pendingDeleteSalary = s; + _showDeleteModal = true; + } + + private void CancelDelete() + { + _showDeleteModal = false; + _pendingDeleteSalary = null; + } + + private async Task ExecuteDelete() + { + if (_userId is null || _pendingDeleteSalary is null) return; + _showDeleteModal = false; + await SalaryService.DeleteSalaryAsync(_pendingDeleteSalary.Id, _userId); + _pendingDeleteSalary = null; + await LoadData(); + } + + private sealed class SalaryForm : System.ComponentModel.DataAnnotations.IValidatableObject + { + [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Name is required")] + [System.ComponentModel.DataAnnotations.MaxLength(200)] + public string Name { get; set; } = string.Empty; + + [System.ComponentModel.DataAnnotations.Range(0.01, double.MaxValue, + ErrorMessage = "Amount must be greater than zero")] + public decimal Amount { get; set; } + + public int AccountId { get; set; } + + public RecurrenceType RecurrenceType { get; set; } = RecurrenceType.Monthly; + + public DateTime StartDate { get; set; } = DateTime.Today; + + public IEnumerable Validate( + System.ComponentModel.DataAnnotations.ValidationContext validationContext) + { + yield break; + } + } +} \ No newline at end of file diff --git a/BudgetApp/Components/Pages/Settings.razor b/BudgetApp/Components/Pages/Settings.razor index e67832d..c954bc4 100644 --- a/BudgetApp/Components/Pages/Settings.razor +++ b/BudgetApp/Components/Pages/Settings.razor @@ -1,7 +1,7 @@ @page "/settings" @attribute [Authorize] +@using BudgetApp.Data.Entities @using Microsoft.AspNetCore.Identity -@using Microsoft.EntityFrameworkCore @inject UserManager UserManager @inject SignInManager SignInManager @inject AuthenticationStateProvider AuthStateProvider @@ -24,30 +24,30 @@
Change Password
- @if (passwordSuccess) + @if (_passwordSuccess) {
Password changed successfully.
} - @if (!string.IsNullOrEmpty(passwordError)) + @if (!string.IsNullOrEmpty(_passwordError)) { -
@passwordError
+
@_passwordError
} - +
- +
- +
- +
@@ -67,19 +67,19 @@ This will permanently delete all your accounts, transactions and categories, giving you a clean slate. Your user account and password will be kept.

- @if (resetSuccess) + @if (_resetSuccess) {
All data has been reset successfully.
} - @if (!string.IsNullOrEmpty(resetError)) + @if (!string.IsNullOrEmpty(_resetError)) { -
@resetError
+
@_resetError
} - @if (!confirmingReset) + @if (!_confirmingReset) { - } @@ -89,8 +89,8 @@ Are you sure? This cannot be undone. Type I UNDERSTAND and enter your password to confirm.
- - + +
@@ -110,14 +110,14 @@ This will permanently delete your account and all associated data (accounts, transactions, and categories). This action cannot be undone.

- @if (!string.IsNullOrEmpty(deleteError)) + @if (!string.IsNullOrEmpty(_deleteError)) { -
@deleteError
+
@_deleteError
} - @if (!confirmingDelete) + @if (!_confirmingDelete) { - } @@ -127,166 +127,10 @@ Are you sure? Type your password to confirm.
- +
}
-
- -@code { - private static readonly string appVersion = - typeof(Program).Assembly.GetName().Version?.ToString(3) ?? "0.0.0"; - - private ChangePasswordForm passwordForm = new(); - private bool passwordSuccess; - private string? passwordError; - - private bool confirmingDelete; - private string deletePassword = string.Empty; - private string? deleteError; - - private bool confirmingReset; - private string resetConfirmation = string.Empty; - private string resetPassword = string.Empty; - private string? resetError; - private bool resetSuccess; - - private async Task ChangePassword() - { - passwordSuccess = false; - passwordError = null; - - var authState = await AuthStateProvider.GetAuthenticationStateAsync(); - var userIdClaim = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; - if (userIdClaim is null) return; - - var user = await UserManager.FindByIdAsync(userIdClaim); - if (user is null) return; - - var result = await UserManager.ChangePasswordAsync(user, passwordForm.CurrentPassword, passwordForm.NewPassword); - - if (result.Succeeded) - { - passwordSuccess = true; - passwordForm = new ChangePasswordForm(); - } - else - { - passwordError = string.Join(" ", result.Errors.Select(e => e.Description)); - } - } - - private async Task DeleteAccount() - { - deleteError = null; - - var authState = await AuthStateProvider.GetAuthenticationStateAsync(); - var userIdClaim = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; - if (userIdClaim is null) return; - - var user = await UserManager.FindByIdAsync(userIdClaim); - if (user is null) return; - - var passwordValid = await UserManager.CheckPasswordAsync(user, deletePassword); - if (!passwordValid) - { - deleteError = "Incorrect password."; - return; - } - - // Delete all user data explicitly in correct dependency order - await DbContext.Transactions - .Where(t => t.Account.UserId == userIdClaim) - .ExecuteDeleteAsync(); - - await DbContext.Accounts - .Where(a => a.UserId == userIdClaim) - .ExecuteDeleteAsync(); - - await DbContext.Categories - .Where(c => c.UserId == userIdClaim) - .ExecuteDeleteAsync(); - - // Delete identity user - await UserManager.DeleteAsync(user); - await SignInManager.SignOutAsync(); - - Navigation.NavigateTo("/login", forceLoad: true); - } - - private void CancelDelete() - { - confirmingDelete = false; - deletePassword = string.Empty; - deleteError = null; - } - - private async Task ResetData() - { - resetError = null; - resetSuccess = false; - - var authState = await AuthStateProvider.GetAuthenticationStateAsync(); - var userIdClaim = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; - if (userIdClaim is null) return; - - var user = await UserManager.FindByIdAsync(userIdClaim); - if (user is null) return; - - if (!string.Equals(resetConfirmation?.Trim(), "I UNDERSTAND", StringComparison.Ordinal)) - { - resetError = "Please type 'I UNDERSTAND' exactly to confirm."; - return; - } - - var passwordValid = await UserManager.CheckPasswordAsync(user, resetPassword); - if (!passwordValid) - { - resetError = "Incorrect password."; - return; - } - - await DbContext.Transactions - .Where(t => t.Account.UserId == userIdClaim) - .ExecuteDeleteAsync(); - - await DbContext.Accounts - .Where(a => a.UserId == userIdClaim) - .ExecuteDeleteAsync(); - - await DbContext.Categories - .Where(c => c.UserId == userIdClaim) - .ExecuteDeleteAsync(); - - confirmingReset = false; - resetConfirmation = string.Empty; - resetPassword = string.Empty; - resetSuccess = true; - - AppState.NotifyAccountsChanged(); - } - - private void CancelReset() - { - confirmingReset = false; - resetConfirmation = string.Empty; - resetPassword = string.Empty; - resetError = null; - } - - private sealed class ChangePasswordForm - { - [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Current password is required")] - public string CurrentPassword { get; set; } = string.Empty; - - [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "New password is required")] - [System.ComponentModel.DataAnnotations.MinLength(8, ErrorMessage = "Password must be at least 8 characters")] - public string NewPassword { get; set; } = string.Empty; - - [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Please confirm your new password")] - [System.ComponentModel.DataAnnotations.Compare(nameof(NewPassword), ErrorMessage = "Passwords do not match")] - public string ConfirmNewPassword { get; set; } = string.Empty; - } -} +
\ No newline at end of file diff --git a/BudgetApp/Components/Pages/Settings.razor.cs b/BudgetApp/Components/Pages/Settings.razor.cs new file mode 100644 index 0000000..d6f82cb --- /dev/null +++ b/BudgetApp/Components/Pages/Settings.razor.cs @@ -0,0 +1,159 @@ +using Microsoft.EntityFrameworkCore; + +namespace BudgetApp.Components.Pages; + +public partial class Settings +{ + private static readonly string AppVersion = + typeof(Program).Assembly.GetName().Version?.ToString(3) ?? "0.0.0"; + + private ChangePasswordForm _passwordForm = new(); + private bool _passwordSuccess; + private string? _passwordError; + private bool _confirmingDelete; + private string _deletePassword = string.Empty; + private string? _deleteError; + private bool _confirmingReset; + private string _resetConfirmation = string.Empty; + private string _resetPassword = string.Empty; + private string? _resetError; + private bool _resetSuccess; + + private async Task ChangePassword() + { + _passwordSuccess = false; + _passwordError = null; + + var authState = await AuthStateProvider.GetAuthenticationStateAsync(); + var userIdClaim = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; + if (userIdClaim is null) return; + + var user = await UserManager.FindByIdAsync(userIdClaim); + if (user is null) return; + + var result = + await UserManager.ChangePasswordAsync(user, _passwordForm.CurrentPassword, _passwordForm.NewPassword); + + if (result.Succeeded) + { + _passwordSuccess = true; + _passwordForm = new ChangePasswordForm(); + } + else + { + _passwordError = string.Join(" ", result.Errors.Select(e => e.Description)); + } + } + + private async Task DeleteAccount() + { + _deleteError = null; + + var authState = await AuthStateProvider.GetAuthenticationStateAsync(); + var userIdClaim = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; + if (userIdClaim is null) return; + + var user = await UserManager.FindByIdAsync(userIdClaim); + if (user is null) return; + + var passwordValid = await UserManager.CheckPasswordAsync(user, _deletePassword); + if (!passwordValid) + { + _deleteError = "Incorrect password."; + return; + } + + // Delete all user data explicitly in correct dependency order + await DbContext.Transactions + .Where(t => t.Account.UserId == userIdClaim) + .ExecuteDeleteAsync(); + + await DbContext.Accounts + .Where(a => a.UserId == userIdClaim) + .ExecuteDeleteAsync(); + + await DbContext.Categories + .Where(c => c.UserId == userIdClaim) + .ExecuteDeleteAsync(); + + // Delete identity user + await UserManager.DeleteAsync(user); + await SignInManager.SignOutAsync(); + + Navigation.NavigateTo("/login", forceLoad: true); + } + + private void CancelDelete() + { + _confirmingDelete = false; + _deletePassword = string.Empty; + _deleteError = null; + } + + private async Task ResetData() + { + _resetError = null; + _resetSuccess = false; + + var authState = await AuthStateProvider.GetAuthenticationStateAsync(); + var userIdClaim = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; + if (userIdClaim is null) return; + + var user = await UserManager.FindByIdAsync(userIdClaim); + if (user is null) return; + + if (!string.Equals(_resetConfirmation?.Trim(), "I UNDERSTAND", StringComparison.Ordinal)) + { + _resetError = "Please type 'I UNDERSTAND' exactly to confirm."; + return; + } + + var passwordValid = await UserManager.CheckPasswordAsync(user, _resetPassword); + if (!passwordValid) + { + _resetError = "Incorrect password."; + return; + } + + await DbContext.Transactions + .Where(t => t.Account.UserId == userIdClaim) + .ExecuteDeleteAsync(); + + await DbContext.Accounts + .Where(a => a.UserId == userIdClaim) + .ExecuteDeleteAsync(); + + await DbContext.Categories + .Where(c => c.UserId == userIdClaim) + .ExecuteDeleteAsync(); + + _confirmingReset = false; + _resetConfirmation = string.Empty; + _resetPassword = string.Empty; + _resetSuccess = true; + + AppState.NotifyAccountsChanged(); + } + + private void CancelReset() + { + _confirmingReset = false; + _resetConfirmation = string.Empty; + _resetPassword = string.Empty; + _resetError = null; + } + + private sealed class ChangePasswordForm + { + [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Current password is required")] + public string CurrentPassword { get; set; } = string.Empty; + + [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "New password is required")] + [System.ComponentModel.DataAnnotations.MinLength(8, ErrorMessage = "Password must be at least 8 characters")] + public string NewPassword { get; set; } = string.Empty; + + [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Please confirm your new password")] + [System.ComponentModel.DataAnnotations.Compare(nameof(NewPassword), ErrorMessage = "Passwords do not match")] + public string ConfirmNewPassword { get; set; } = string.Empty; + } +} \ No newline at end of file diff --git a/BudgetApp/Components/Pages/Transactions.razor b/BudgetApp/Components/Pages/Transactions.razor index 72b1c4e..3e907bd 100644 --- a/BudgetApp/Components/Pages/Transactions.razor +++ b/BudgetApp/Components/Pages/Transactions.razor @@ -1,9 +1,10 @@ @page "/transactions" +@using BudgetApp.Data.Entities @attribute [Authorize] -@inject TransactionService TransactionService -@inject AccountService AccountService -@inject CategoryService CategoryService -@inject SalaryService SalaryService +@inject ITransactionRepository TransactionService +@inject IAccountRepository AccountService +@inject ICategoryRepository CategoryService +@inject ISalaryRepository SalaryService @inject AuthenticationStateProvider AuthStateProvider @rendermode InteractiveServer @@ -17,7 +18,7 @@
Add Transaction
- @if (accountsList is not null && accountsList.Count == 0) + @if (_accountsList is not null && _accountsList.Count == 0) {
You need to create an account before adding transactions. @@ -25,34 +26,34 @@ } else { - +
- +
- +
- +
- +
- - @if (accountsList is not null) + + @if (_accountsList is not null) { - @foreach (var account in accountsList) + @foreach (var account in _accountsList) { } @@ -61,11 +62,11 @@
- + - @if (categoriesList is not null) + @if (_categoriesList is not null) { - @foreach (var category in categoriesList) + @foreach (var category in _categoriesList) { } @@ -74,7 +75,7 @@
- + @@ -82,11 +83,11 @@
- @if (formModel.RecurrenceType != RecurrenceType.None) + @if (_formModel.RecurrenceType != RecurrenceType.None) {
- +
}
@@ -98,11 +99,11 @@
-@if (transactions is null) +@if (_transactions is null) {

Loading...

} -else if (transactions.Count == 0) +else if (_transactions.Count == 0) {
No transactions yet.
} @@ -113,16 +114,16 @@ else
Filters
- - - - + + + +
+ title="Custom start date" @bind="_windowStart" @bind:after="OnWindowDateChanged" /> to + title="Custom end date" @bind="_windowEnd" @bind:after="OnWindowDateChanged" />
@@ -130,25 +131,25 @@ else
+ title="Search by description, account, category or amount" placeholder="Search..." @bind="_searchQuery" @bind:event="oninput" @bind:after="OnSearchChanged" />
@@ -174,13 +175,13 @@ else - @foreach (var t in pagedTransactions) + @foreach (var t in PagedTransactions) { @if (t.SalaryId is null) { - + } else { @@ -255,55 +256,55 @@ else
- @if (totalPages > 1) + @if (TotalPages > 1) {
- +
- @if (selectedIds.Count > 0) + @if (_selectedIds.Count > 0) { } - Page @currentPage of @totalPages (@filteredTransactions.Count transactions) + Page @_currentPage of @TotalPages (@FilteredTransactions.Count transactions)
- +
} else {
- @filteredTransactions.Count transactions - @if (selectedIds.Count > 0) + @FilteredTransactions.Count transactions + @if (_selectedIds.Count > 0) { }
}
- @if (showDeleteModal) + @if (_showDeleteModal) {
-
@deleteModalTitle
+
@_deleteModalTitle
- @if (bulkDeleteCount > 0) + @if (_bulkDeleteCount > 0) { -

Are you sure you want to delete @bulkDeleteCount selected transactions?

+

Are you sure you want to delete @_bulkDeleteCount selected transactions?

This action cannot be undone.

} - else if (pendingDeleteTransaction is not null) + else if (_pendingDeleteTransaction is not null) { -

Are you sure you want to delete @pendingDeleteTransaction.Description?

- @if (pendingDeleteIsRecurring) +

Are you sure you want to delete @_pendingDeleteTransaction.Description?

+ @if (_pendingDeleteIsRecurring) {

This transaction is part of a recurring series. Would you like to delete just this one, or all future transactions in the series?

} @@ -315,11 +316,11 @@ else
- @if (bulkDeleteCount > 0) + @if (_bulkDeleteCount > 0) { } - else if (pendingDeleteIsRecurring) + else if (_pendingDeleteIsRecurring) { @@ -334,7 +335,7 @@ else
} - @if (showEditModal) + @if (_showEditModal) {
@@ -343,34 +344,34 @@ else
Edit Transaction
- +
- +
- +
- +
- +
- - @if (accountsList is not null) + + @if (_accountsList is not null) { - @foreach (var account in accountsList) + @foreach (var account in _accountsList) { } @@ -379,18 +380,18 @@ else
- + - @if (categoriesList is not null) + @if (_categoriesList is not null) { - @foreach (var category in categoriesList) + @foreach (var category in _categoriesList) { } }
- @if (editIsPartOfSeries) + @if (_editIsPartOfSeries) {
Changes will apply to this and all future occurrences in the series. @@ -409,350 +410,17 @@ else } @code { - private List? transactions; - private List? accountsList; - private List? categoriesList; - private TransactionForm formModel = new(); - private string? userId; - private int? filterAccountId; - private string searchQuery = string.Empty; // Time window state - private DateTime windowStart = DateTime.Today; - private DateTime windowEnd = DateTime.Today.AddDays(30); - private string? windowPreset = "30d"; // Pagination state - private int currentPage = 1; - private int pageSize = 25; - private static readonly int[] pageSizeOptions = [10, 25, 50, 100]; - private int totalPages => (int)Math.Ceiling(filteredTransactions.Count / (double)pageSize); - private List pagedTransactions => filteredTransactions - .Skip((currentPage - 1) * pageSize) - .Take(pageSize) - .ToList(); // Sort state - private string sortColumn = "date"; - private bool sortAscending = true; - - private List filteredTransactions - { - get - { - var list = (transactions ?? []).Where(t => t.Date.Date >= windowStart.Date && t.Date.Date <= windowEnd.Date); - if (filterAccountId is not null) - list = list.Where(t => t.AccountId == filterAccountId); - - if (!string.IsNullOrWhiteSpace(searchQuery)) - { - var q = searchQuery.Trim(); - list = list.Where(t => - t.Description.Contains(q, StringComparison.OrdinalIgnoreCase) - || t.Account.Name.Contains(q, StringComparison.OrdinalIgnoreCase) - || (t.Category?.Name?.Contains(q, StringComparison.OrdinalIgnoreCase) ?? false) - || t.Amount.ToString("F2").Contains(q, StringComparison.OrdinalIgnoreCase)); - } - - list = sortColumn switch - { - "description" => sortAscending - ? list.OrderBy(t => t.Description, StringComparer.OrdinalIgnoreCase) - : list.OrderByDescending(t => t.Description, StringComparer.OrdinalIgnoreCase), - "amount" => sortAscending - ? list.OrderBy(t => t.Amount) - : list.OrderByDescending(t => t.Amount), - _ => sortAscending - ? list.OrderBy(t => t.Date) - : list.OrderByDescending(t => t.Date), - }; - - return list.ToList(); - } - } - - private void OnAccountFilterChanged(ChangeEventArgs e) - { - filterAccountId = int.TryParse(e.Value?.ToString(), out var id) ? id : null; - currentPage = 1; - } - - private void OnSearchChanged() => currentPage = 1; - - private async Task SetWindow(int days) - { - windowPreset = days switch { 7 => "7d", 30 => "30d", 90 => "90d", 365 => "1y", _ => null }; - windowStart = DateTime.Today; - windowEnd = DateTime.Today.AddDays(days); - currentPage = 1; - await LoadData(); - } - - private async Task OnWindowDateChanged() - { - windowPreset = null; - currentPage = 1; - await LoadData(); - } - - private void OnPageSizeChanged(ChangeEventArgs e) - { - if (int.TryParse(e.Value?.ToString(), out var size)) - { - pageSize = size; - currentPage = 1; - } - } - - private void SetSort(string column) - { - if (sortColumn == column) - sortAscending = !sortAscending; - else - { - sortColumn = column; - sortAscending = true; - } - currentPage = 1; - } - - private MarkupString SortIndicator(string column) - { - if (sortColumn != column) - return new MarkupString("⇅"); - return new MarkupString(sortAscending ? "▲" : "▼"); - } - - protected override async Task OnInitializedAsync() - { - var authState = await AuthStateProvider.GetAuthenticationStateAsync(); - userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; - await LoadData(); - } - - private async Task LoadData() - { - if (userId is null) return; - - await SalaryService.MaterializeSalaryTransactionsAsync(userId, windowEnd); - transactions = await TransactionService.GetTransactionsAsync(userId); - accountsList = await AccountService.GetAccountsAsync(userId); - categoriesList = await CategoryService.GetCategoriesAsync(userId); - - if (accountsList.Count > 0 && formModel.AccountId == 0) - { - formModel.AccountId = accountsList[0].Id; - } - } - - private async Task AddTransaction() - { - if (userId is null) return; - - var transaction = new Transaction - { - Description = formModel.Description, - Amount = formModel.Amount, - Date = formModel.Date, - Type = formModel.Type, - AccountId = formModel.AccountId, - CategoryId = formModel.CategoryId, - RecurrenceType = formModel.RecurrenceType, - RecurrenceEndDate = formModel.RecurrenceEndDate - }; - await TransactionService.CreateTransactionAsync(transaction); - formModel = new TransactionForm - { - AccountId = accountsList?.FirstOrDefault()?.Id ?? 0 - }; - await LoadData(); - } // Selection state - private HashSet selectedIds = []; - - private void ToggleSelect(int id) - { - var t = transactions?.FirstOrDefault(x => x.Id == id); - if (t?.SalaryId is not null) return; - if (!selectedIds.Remove(id)) - selectedIds.Add(id); - } - - private bool IsAllPageSelected() - { - var selectable = pagedTransactions.Where(t => t.SalaryId is null).ToList(); - return selectable.Count > 0 && selectable.All(t => selectedIds.Contains(t.Id)); - } - - private void ToggleSelectAll(ChangeEventArgs e) - { - var selectable = pagedTransactions.Where(t => t.SalaryId is null).ToList(); - if (e.Value is true) - { - foreach (var t in selectable) - selectedIds.Add(t.Id); - } - else - { - foreach (var t in selectable) - selectedIds.Remove(t.Id); - } - } // Delete confirmation state - private bool showDeleteModal; - private Transaction? pendingDeleteTransaction; - private bool pendingDeleteIsRecurring; - private int bulkDeleteCount; - private string deleteModalTitle = "Delete Transaction"; // Edit modal state - private bool showEditModal; - private int? editingTransactionId; - private bool editIsPartOfSeries; - private TransactionForm editModel = new(); - private void OpenEditModal(Transaction t) - { - editingTransactionId = t.Id; - editIsPartOfSeries = t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null; - editModel = new TransactionForm - { - Description = t.Description, - Amount = t.Amount, - Date = t.Date, - Type = t.Type, - AccountId = t.AccountId, - CategoryId = t.CategoryId, - RecurrenceType = t.RecurrenceType, - RecurrenceEndDate = t.RecurrenceEndDate - }; - showEditModal = true; - } - - private void CloseEditModal() => showEditModal = false; - - private async Task SaveEdit() - { - if (userId is null || editingTransactionId is null) return; - - await TransactionService.UpdateTransactionAsync( - editingTransactionId.Value, userId, - editModel.Description, editModel.Amount, editModel.Date, - editModel.Type, editModel.AccountId, editModel.CategoryId, - editModel.RecurrenceType, editModel.RecurrenceEndDate); - - showEditModal = false; - editingTransactionId = null; - await LoadData(); - } - - private void ConfirmDelete(Transaction t) - { - pendingDeleteTransaction = t; - pendingDeleteIsRecurring = t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null; - bulkDeleteCount = 0; - deleteModalTitle = pendingDeleteIsRecurring ? "Delete Recurring Transaction" : "Delete Transaction"; - showDeleteModal = true; - } - - private void ConfirmBulkDelete() - { - pendingDeleteTransaction = null; - pendingDeleteIsRecurring = false; - bulkDeleteCount = selectedIds.Count; - deleteModalTitle = $"Delete {bulkDeleteCount} Transactions"; - showDeleteModal = true; - } - - private async Task DeleteSingle() - { - if (userId is null || pendingDeleteTransaction is null) return; - showDeleteModal = false; - await TransactionService.DeleteTransactionAsync(pendingDeleteTransaction.Id, userId); - selectedIds.Remove(pendingDeleteTransaction.Id); - pendingDeleteTransaction = null; - await LoadData(); - } - - private async Task DeleteSeries() - { - if (userId is null || pendingDeleteTransaction is null) return; - showDeleteModal = false; - await TransactionService.DeleteTransactionSeriesAsync(pendingDeleteTransaction.Id, userId); - selectedIds.Remove(pendingDeleteTransaction.Id); - pendingDeleteTransaction = null; - await LoadData(); - } - - private async Task ExecuteBulkDelete() - { - if (userId is null) return; - showDeleteModal = false; - foreach (var id in selectedIds.ToList()) - { - var t = transactions?.FirstOrDefault(x => x.Id == id); - if (t?.SalaryId is not null) continue; - await TransactionService.DeleteTransactionAsync(id, userId); - } - selectedIds.Clear(); - await LoadData(); - } - - private void CancelDelete() - { - showDeleteModal = false; - pendingDeleteTransaction = null; - bulkDeleteCount = 0; - } - - private async Task TogglePaid(Transaction t) - { - if (userId is null) return; - await TransactionService.MarkAsPaidAsync(t.Id, userId, !t.IsPaid); - await LoadData(); - } - - private sealed class TransactionForm : System.ComponentModel.DataAnnotations.IValidatableObject - { - [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Description is required")] - [System.ComponentModel.DataAnnotations.MaxLength(200)] - public string Description { get; set; } = string.Empty; - - [System.ComponentModel.DataAnnotations.Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than zero")] - public decimal Amount { get; set; } - - public DateTime Date { get; set; } = DateTime.Today; - - public TransactionType Type { get; set; } = TransactionType.Expense; - - public int AccountId { get; set; } - - public int? CategoryId { get; set; } - - public RecurrenceType RecurrenceType { get; set; } = RecurrenceType.None; - - public DateTime? RecurrenceEndDate { get; set; } - - public IEnumerable Validate(System.ComponentModel.DataAnnotations.ValidationContext validationContext) - { - if (RecurrenceType != RecurrenceType.None && RecurrenceEndDate.HasValue) - { - var maxEnd = Date.AddYears(1); - if (RecurrenceEndDate.Value > maxEnd) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult( - "Recurrence end date cannot be more than 1 year from the transaction date.", - [nameof(RecurrenceEndDate)]); - } - if (RecurrenceEndDate.Value <= Date) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult( - "Recurrence end date must be after the transaction date.", - [nameof(RecurrenceEndDate)]); - } - } - } - } } diff --git a/BudgetApp/Components/Pages/Transactions.razor.cs b/BudgetApp/Components/Pages/Transactions.razor.cs index e69de29..2613b8a 100644 --- a/BudgetApp/Components/Pages/Transactions.razor.cs +++ b/BudgetApp/Components/Pages/Transactions.razor.cs @@ -0,0 +1,352 @@ +using BudgetApp.Data.Entities; +using Microsoft.AspNetCore.Components; + +namespace BudgetApp.Components.Pages; + +public partial class Transactions +{ + private List? _transactions; + private List? _accountsList; + private List? _categoriesList; + private TransactionForm _formModel = new(); + private string? _userId; + private int? _filterAccountId; + private string _searchQuery = string.Empty; + private DateTime _windowStart = DateTime.Today; + private DateTime _windowEnd = DateTime.Today.AddDays(30); + private string? _windowPreset = "30d"; + private int _currentPage = 1; + private int _pageSize = 25; + private static readonly int[] PageSizeOptions = [10, 25, 50, 100]; + private int TotalPages => (int)Math.Ceiling(FilteredTransactions.Count / (double)_pageSize); + + private List PagedTransactions => FilteredTransactions + .Skip((_currentPage - 1) * _pageSize) + .Take(_pageSize) + .ToList(); + + private string _sortColumn = "date"; + private bool _sortAscending = true; + + private List FilteredTransactions + { + get + { + var list = (_transactions ?? []).Where(t => + t.Date.Date >= _windowStart.Date && t.Date.Date <= _windowEnd.Date); + if (_filterAccountId is not null) + list = list.Where(t => t.AccountId == _filterAccountId); + + if (!string.IsNullOrWhiteSpace(_searchQuery)) + { + var q = _searchQuery.Trim(); + list = list.Where(t => + t.Description.Contains(q, StringComparison.OrdinalIgnoreCase) + || t.Account.Name.Contains(q, StringComparison.OrdinalIgnoreCase) + || (t.Category?.Name?.Contains(q, StringComparison.OrdinalIgnoreCase) ?? false) + || t.Amount.ToString("F2").Contains(q, StringComparison.OrdinalIgnoreCase)); + } + + list = _sortColumn switch + { + "description" => _sortAscending + ? list.OrderBy(t => t.Description, StringComparer.OrdinalIgnoreCase) + : list.OrderByDescending(t => t.Description, StringComparer.OrdinalIgnoreCase), + "amount" => _sortAscending + ? list.OrderBy(t => t.Amount) + : list.OrderByDescending(t => t.Amount), + _ => _sortAscending + ? list.OrderBy(t => t.Date) + : list.OrderByDescending(t => t.Date), + }; + + return list.ToList(); + } + } + + private void OnAccountFilterChanged(ChangeEventArgs e) + { + _filterAccountId = int.TryParse(e.Value?.ToString(), out var id) ? id : null; + _currentPage = 1; + } + + private void OnSearchChanged() => _currentPage = 1; + + private async Task SetWindow(int days) + { + _windowPreset = days switch { 7 => "7d", 30 => "30d", 90 => "90d", 365 => "1y", _ => null }; + _windowStart = DateTime.Today; + _windowEnd = DateTime.Today.AddDays(days); + _currentPage = 1; + await LoadData(); + } + + private async Task OnWindowDateChanged() + { + _windowPreset = null; + _currentPage = 1; + await LoadData(); + } + + private void OnPageSizeChanged(ChangeEventArgs e) + { + if (int.TryParse(e.Value?.ToString(), out var size)) + { + _pageSize = size; + _currentPage = 1; + } + } + + private void SetSort(string column) + { + if (_sortColumn == column) + _sortAscending = !_sortAscending; + else + { + _sortColumn = column; + _sortAscending = true; + } + + _currentPage = 1; + } + + private MarkupString SortIndicator(string column) + { + if (_sortColumn != column) + return new MarkupString("⇅"); + return new MarkupString(_sortAscending ? "▲" : "▼"); + } + + protected override async Task OnInitializedAsync() + { + var authState = await AuthStateProvider.GetAuthenticationStateAsync(); + _userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value; + await LoadData(); + } + + private async Task LoadData() + { + if (_userId is null) return; + + await SalaryService.MaterializeSalaryTransactionsAsync(_userId, _windowEnd); + _transactions = await TransactionService.GetTransactionsAsync(_userId); + _accountsList = await AccountService.GetAccountsAsync(_userId); + _categoriesList = await CategoryService.GetCategoriesAsync(_userId); + + if (_accountsList.Count > 0 && _formModel.AccountId == 0) + { + _formModel.AccountId = _accountsList[0].Id; + } + } + + private async Task AddTransaction() + { + if (_userId is null) return; + + var transaction = new Transaction + { + Description = _formModel.Description, + Amount = _formModel.Amount, + Date = _formModel.Date, + Type = _formModel.Type, + AccountId = _formModel.AccountId, + CategoryId = _formModel.CategoryId, + RecurrenceType = _formModel.RecurrenceType, + RecurrenceEndDate = _formModel.RecurrenceEndDate + }; + await TransactionService.CreateTransactionAsync(transaction); + _formModel = new TransactionForm + { + AccountId = _accountsList?.FirstOrDefault()?.Id ?? 0 + }; + await LoadData(); + } + + private readonly HashSet _selectedIds = []; + + private void ToggleSelect(int id) + { + var t = _transactions?.FirstOrDefault(x => x.Id == id); + if (t?.SalaryId is not null) return; + if (!_selectedIds.Remove(id)) + _selectedIds.Add(id); + } + + private bool IsAllPageSelected() + { + var selectable = PagedTransactions.Where(t => t.SalaryId is null).ToList(); + return selectable.Count > 0 && selectable.All(t => _selectedIds.Contains(t.Id)); + } + + private void ToggleSelectAll(ChangeEventArgs e) + { + var selectable = PagedTransactions.Where(t => t.SalaryId is null).ToList(); + if (e.Value is true) + { + foreach (var t in selectable) + _selectedIds.Add(t.Id); + } + else + { + foreach (var t in selectable) + _selectedIds.Remove(t.Id); + } + } + + private bool _showDeleteModal; + private Transaction? _pendingDeleteTransaction; + private bool _pendingDeleteIsRecurring; + private int _bulkDeleteCount; + private string _deleteModalTitle = "Delete Transaction"; + private bool _showEditModal; + private int? _editingTransactionId; + private bool _editIsPartOfSeries; + private TransactionForm _editModel = new(); + + private void OpenEditModal(Transaction t) + { + _editingTransactionId = t.Id; + _editIsPartOfSeries = t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null; + _editModel = new TransactionForm + { + Description = t.Description, + Amount = t.Amount, + Date = t.Date, + Type = t.Type, + AccountId = t.AccountId, + CategoryId = t.CategoryId, + RecurrenceType = t.RecurrenceType, + RecurrenceEndDate = t.RecurrenceEndDate + }; + _showEditModal = true; + } + + private void CloseEditModal() => _showEditModal = false; + + private async Task SaveEdit() + { + if (_userId is null || _editingTransactionId is null) return; + + await TransactionService.UpdateTransactionAsync( + _editingTransactionId.Value, _userId, + _editModel.Description, _editModel.Amount, _editModel.Date, + _editModel.Type, _editModel.AccountId, _editModel.CategoryId, + _editModel.RecurrenceType, _editModel.RecurrenceEndDate); + + _showEditModal = false; + _editingTransactionId = null; + await LoadData(); + } + + private void ConfirmDelete(Transaction t) + { + _pendingDeleteTransaction = t; + _pendingDeleteIsRecurring = t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null; + _bulkDeleteCount = 0; + _deleteModalTitle = _pendingDeleteIsRecurring ? "Delete Recurring Transaction" : "Delete Transaction"; + _showDeleteModal = true; + } + + private void ConfirmBulkDelete() + { + _pendingDeleteTransaction = null; + _pendingDeleteIsRecurring = false; + _bulkDeleteCount = _selectedIds.Count; + _deleteModalTitle = $"Delete {_bulkDeleteCount} Transactions"; + _showDeleteModal = true; + } + + private async Task DeleteSingle() + { + if (_userId is null || _pendingDeleteTransaction is null) return; + _showDeleteModal = false; + await TransactionService.DeleteTransactionAsync(_pendingDeleteTransaction.Id, _userId); + _selectedIds.Remove(_pendingDeleteTransaction.Id); + _pendingDeleteTransaction = null; + await LoadData(); + } + + private async Task DeleteSeries() + { + if (_userId is null || _pendingDeleteTransaction is null) return; + _showDeleteModal = false; + await TransactionService.DeleteTransactionSeriesAsync(_pendingDeleteTransaction.Id, _userId); + _selectedIds.Remove(_pendingDeleteTransaction.Id); + _pendingDeleteTransaction = null; + await LoadData(); + } + + private async Task ExecuteBulkDelete() + { + if (_userId is null) return; + _showDeleteModal = false; + foreach (var id in _selectedIds.ToList()) + { + var t = _transactions?.FirstOrDefault(x => x.Id == id); + if (t?.SalaryId is not null) continue; + await TransactionService.DeleteTransactionAsync(id, _userId); + } + + _selectedIds.Clear(); + await LoadData(); + } + + private void CancelDelete() + { + _showDeleteModal = false; + _pendingDeleteTransaction = null; + _bulkDeleteCount = 0; + } + + private async Task TogglePaid(Transaction t) + { + if (_userId is null) return; + await TransactionService.MarkAsPaidAsync(t.Id, _userId, !t.IsPaid); + await LoadData(); + } + + private sealed class TransactionForm : System.ComponentModel.DataAnnotations.IValidatableObject + { + [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Description is required")] + [System.ComponentModel.DataAnnotations.MaxLength(200)] + public string Description { get; set; } = string.Empty; + + [System.ComponentModel.DataAnnotations.Range(0.01, double.MaxValue, + ErrorMessage = "Amount must be greater than zero")] + public decimal Amount { get; set; } + + public DateTime Date { get; set; } = DateTime.Today; + + public TransactionType Type { get; set; } = TransactionType.Expense; + + public int AccountId { get; set; } + + public int? CategoryId { get; set; } + + public RecurrenceType RecurrenceType { get; set; } = RecurrenceType.None; + + public DateTime? RecurrenceEndDate { get; set; } + + public IEnumerable Validate( + System.ComponentModel.DataAnnotations.ValidationContext validationContext) + { + if (RecurrenceType != RecurrenceType.None && RecurrenceEndDate.HasValue) + { + var maxEnd = Date.AddYears(1); + if (RecurrenceEndDate.Value > maxEnd) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult( + "Recurrence end date cannot be more than 1 year from the transaction date.", + [nameof(RecurrenceEndDate)]); + } + + if (RecurrenceEndDate.Value <= Date) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult( + "Recurrence end date must be after the transaction date.", + [nameof(RecurrenceEndDate)]); + } + } + } + } +} \ No newline at end of file diff --git a/BudgetApp/Components/Pages/Weather.razor b/BudgetApp/Components/Pages/Weather.razor deleted file mode 100644 index f437e5e..0000000 --- a/BudgetApp/Components/Pages/Weather.razor +++ /dev/null @@ -1,64 +0,0 @@ -@page "/weather" -@attribute [StreamRendering] - -Weather - -

Weather

- -

This component demonstrates showing data.

- -@if (forecasts == null) -{ -

Loading...

-} -else -{ - - - - - - - - - - - @foreach (var forecast in forecasts) - { - - - - - - - } - -
DateTemp. (C)Temp. (F)Summary
@forecast.Date.ToShortDateString()@forecast.TemperatureC@forecast.TemperatureF@forecast.Summary
-} - -@code { - private WeatherForecast[]? forecasts; - - protected override async Task OnInitializedAsync() - { - // Simulate asynchronous loading to demonstrate streaming rendering - await Task.Delay(500); - - var startDate = DateOnly.FromDateTime(DateTime.Now); - var summaries = new[] { "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" }; - forecasts = Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = startDate.AddDays(index), - TemperatureC = Random.Shared.Next(-20, 55), - Summary = summaries[Random.Shared.Next(summaries.Length)] - }).ToArray(); - } - - private class WeatherForecast - { - public DateOnly Date { get; set; } - public int TemperatureC { get; set; } - public string? Summary { get; set; } - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - } -} diff --git a/BudgetApp/Components/ToastContainer.razor b/BudgetApp/Components/ToastContainer.razor index 7bdd182..7b4c5b2 100644 --- a/BudgetApp/Components/ToastContainer.razor +++ b/BudgetApp/Components/ToastContainer.razor @@ -3,49 +3,11 @@ @rendermode InteractiveServer
- @foreach (var toast in toasts) + @foreach (var toast in _toasts) {
⚠ @toast.Message
} -
- -@code { - private readonly List toasts = []; - - protected override void OnInitialized() - { - ToastService.OnShow += ShowToast; - } - - private async void ShowToast(string message) - { - var toast = new ToastItem { Message = message }; - toasts.Add(toast); - await InvokeAsync(StateHasChanged); - _ = DismissAfterDelay(toast); - } - - private async Task DismissAfterDelay(ToastItem toast) - { - await Task.Delay(3500); - toast.Dismissing = true; - await InvokeAsync(StateHasChanged); - await Task.Delay(300); - toasts.Remove(toast); - await InvokeAsync(StateHasChanged); - } - - public void Dispose() - { - ToastService.OnShow -= ShowToast; - } - - private sealed class ToastItem - { - public string Message { get; set; } = ""; - public bool Dismissing { get; set; } - } -} +
\ No newline at end of file diff --git a/BudgetApp/Components/ToastContainer.razor.cs b/BudgetApp/Components/ToastContainer.razor.cs new file mode 100644 index 0000000..4a44c04 --- /dev/null +++ b/BudgetApp/Components/ToastContainer.razor.cs @@ -0,0 +1,40 @@ +namespace BudgetApp.Components; + +public partial class ToastContainer +{ + private readonly List _toasts = []; + + protected override void OnInitialized() + { + ToastService.OnShow += ShowToast; + } + + private async void ShowToast(string message) + { + var toast = new ToastItem { Message = message }; + _toasts.Add(toast); + await InvokeAsync(StateHasChanged); + _ = DismissAfterDelay(toast); + } + + private async Task DismissAfterDelay(ToastItem toast) + { + await Task.Delay(3500); + toast.Dismissing = true; + await InvokeAsync(StateHasChanged); + await Task.Delay(300); + _toasts.Remove(toast); + await InvokeAsync(StateHasChanged); + } + + public void Dispose() + { + ToastService.OnShow -= ShowToast; + } + + private sealed class ToastItem + { + public string Message { get; set; } = ""; + public bool Dismissing { get; set; } + } +} \ No newline at end of file diff --git a/BudgetApp/Components/ToastValidator.razor b/BudgetApp/Components/ToastValidator.razor index 3a7ebe3..36e9ba5 100644 --- a/BudgetApp/Components/ToastValidator.razor +++ b/BudgetApp/Components/ToastValidator.razor @@ -1,47 +1,3 @@ @implements IDisposable - - -@code { - [CascadingParameter] - private EditContext? CurrentEditContext { get; set; } - - [Inject] - private ToastService ToastService { get; set; } = default!; - - private bool validationRequested; - - protected override void OnInitialized() - { - if (CurrentEditContext is not null) - { - CurrentEditContext.OnValidationRequested += OnValidationRequested; - CurrentEditContext.OnValidationStateChanged += OnValidationStateChanged; - } - } - - private void OnValidationRequested(object? sender, ValidationRequestedEventArgs e) - { - validationRequested = true; - } - - private void OnValidationStateChanged(object? sender, ValidationStateChangedEventArgs e) - { - if (!validationRequested || CurrentEditContext is null) return; - validationRequested = false; - - foreach (var message in CurrentEditContext.GetValidationMessages()) - { - ToastService.Show(message); - } - } - - public void Dispose() - { - if (CurrentEditContext is not null) - { - CurrentEditContext.OnValidationRequested -= OnValidationRequested; - CurrentEditContext.OnValidationStateChanged -= OnValidationStateChanged; - } - } -} + \ No newline at end of file diff --git a/BudgetApp/Components/ToastValidator.razor.cs b/BudgetApp/Components/ToastValidator.razor.cs new file mode 100644 index 0000000..0978716 --- /dev/null +++ b/BudgetApp/Components/ToastValidator.razor.cs @@ -0,0 +1,48 @@ +using BudgetApp.Services; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Forms; + +namespace BudgetApp.Components; + +public partial class ToastValidator +{ + [CascadingParameter] private EditContext? CurrentEditContext { get; set; } + + [Inject] private ToastService ToastService { get; set; } = default!; + + private bool _validationRequested; + + protected override void OnInitialized() + { + if (CurrentEditContext is not null) + { + CurrentEditContext.OnValidationRequested += OnValidationRequested; + CurrentEditContext.OnValidationStateChanged += OnValidationStateChanged; + } + } + + private void OnValidationRequested(object? sender, ValidationRequestedEventArgs e) + { + _validationRequested = true; + } + + private void OnValidationStateChanged(object? sender, ValidationStateChangedEventArgs e) + { + if (!_validationRequested || CurrentEditContext is null) return; + _validationRequested = false; + + foreach (var message in CurrentEditContext.GetValidationMessages()) + { + ToastService.Show(message); + } + } + + public void Dispose() + { + if (CurrentEditContext is not null) + { + CurrentEditContext.OnValidationRequested -= OnValidationRequested; + CurrentEditContext.OnValidationStateChanged -= OnValidationStateChanged; + } + } +} \ No newline at end of file diff --git a/BudgetApp/Components/_Imports.razor b/BudgetApp/Components/_Imports.razor index 98e2e8b..b0f56fc 100644 --- a/BudgetApp/Components/_Imports.razor +++ b/BudgetApp/Components/_Imports.razor @@ -12,4 +12,6 @@ @using BudgetApp.Components @using BudgetApp.Components.Layout @using BudgetApp.Data +@using BudgetApp.Data.Interfaces +@using BudgetApp.Data.Repositories @using BudgetApp.Services diff --git a/BudgetApp/Migrations/20260301152724_InitialCreate.cs b/BudgetApp/Migrations/20260301152724_InitialCreate.cs deleted file mode 100644 index d528d9a..0000000 --- a/BudgetApp/Migrations/20260301152724_InitialCreate.cs +++ /dev/null @@ -1,323 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace BudgetApp.Migrations -{ - /// - public partial class InitialCreate : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "AspNetRoles", - columns: table => new - { - Id = table.Column(type: "TEXT", nullable: false), - Name = table.Column(type: "TEXT", maxLength: 256, nullable: true), - NormalizedName = table.Column(type: "TEXT", maxLength: 256, nullable: true), - ConcurrencyStamp = table.Column(type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetRoles", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "AspNetUsers", - columns: table => new - { - Id = table.Column(type: "TEXT", nullable: false), - UserName = table.Column(type: "TEXT", maxLength: 256, nullable: true), - NormalizedUserName = table.Column(type: "TEXT", maxLength: 256, nullable: true), - Email = table.Column(type: "TEXT", maxLength: 256, nullable: true), - NormalizedEmail = table.Column(type: "TEXT", maxLength: 256, nullable: true), - EmailConfirmed = table.Column(type: "INTEGER", nullable: false), - PasswordHash = table.Column(type: "TEXT", nullable: true), - SecurityStamp = table.Column(type: "TEXT", nullable: true), - ConcurrencyStamp = table.Column(type: "TEXT", nullable: true), - PhoneNumber = table.Column(type: "TEXT", nullable: true), - PhoneNumberConfirmed = table.Column(type: "INTEGER", nullable: false), - TwoFactorEnabled = table.Column(type: "INTEGER", nullable: false), - LockoutEnd = table.Column(type: "TEXT", nullable: true), - LockoutEnabled = table.Column(type: "INTEGER", nullable: false), - AccessFailedCount = table.Column(type: "INTEGER", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUsers", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "AspNetRoleClaims", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - RoleId = table.Column(type: "TEXT", nullable: false), - ClaimType = table.Column(type: "TEXT", nullable: true), - ClaimValue = table.Column(type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id); - table.ForeignKey( - name: "FK_AspNetRoleClaims_AspNetRoles_RoleId", - column: x => x.RoleId, - principalTable: "AspNetRoles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "Accounts", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - Name = table.Column(type: "TEXT", maxLength: 100, nullable: false), - CurrentBalance = table.Column(type: "decimal(18,2)", nullable: false), - Color = table.Column(type: "TEXT", maxLength: 7, nullable: false), - UserId = table.Column(type: "TEXT", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Accounts", x => x.Id); - table.ForeignKey( - name: "FK_Accounts_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserClaims", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - UserId = table.Column(type: "TEXT", nullable: false), - ClaimType = table.Column(type: "TEXT", nullable: true), - ClaimValue = table.Column(type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserClaims", x => x.Id); - table.ForeignKey( - name: "FK_AspNetUserClaims_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserLogins", - columns: table => new - { - LoginProvider = table.Column(type: "TEXT", nullable: false), - ProviderKey = table.Column(type: "TEXT", nullable: false), - ProviderDisplayName = table.Column(type: "TEXT", nullable: true), - UserId = table.Column(type: "TEXT", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey }); - table.ForeignKey( - name: "FK_AspNetUserLogins_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserRoles", - columns: table => new - { - UserId = table.Column(type: "TEXT", nullable: false), - RoleId = table.Column(type: "TEXT", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId }); - table.ForeignKey( - name: "FK_AspNetUserRoles_AspNetRoles_RoleId", - column: x => x.RoleId, - principalTable: "AspNetRoles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_AspNetUserRoles_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserTokens", - columns: table => new - { - UserId = table.Column(type: "TEXT", nullable: false), - LoginProvider = table.Column(type: "TEXT", nullable: false), - Name = table.Column(type: "TEXT", nullable: false), - Value = table.Column(type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); - table.ForeignKey( - name: "FK_AspNetUserTokens_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "Categories", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - Name = table.Column(type: "TEXT", maxLength: 100, nullable: false), - UserId = table.Column(type: "TEXT", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Categories", x => x.Id); - table.ForeignKey( - name: "FK_Categories_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "Transactions", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - Description = table.Column(type: "TEXT", maxLength: 200, nullable: false), - Amount = table.Column(type: "decimal(18,2)", nullable: false), - Date = table.Column(type: "TEXT", nullable: false), - Type = table.Column(type: "INTEGER", nullable: false), - AccountId = table.Column(type: "INTEGER", nullable: false), - CategoryId = table.Column(type: "INTEGER", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Transactions", x => x.Id); - table.ForeignKey( - name: "FK_Transactions_Accounts_AccountId", - column: x => x.AccountId, - principalTable: "Accounts", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_Transactions_Categories_CategoryId", - column: x => x.CategoryId, - principalTable: "Categories", - principalColumn: "Id", - onDelete: ReferentialAction.SetNull); - }); - - migrationBuilder.CreateIndex( - name: "IX_Accounts_UserId", - table: "Accounts", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetRoleClaims_RoleId", - table: "AspNetRoleClaims", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "RoleNameIndex", - table: "AspNetRoles", - column: "NormalizedName", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserClaims_UserId", - table: "AspNetUserClaims", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserLogins_UserId", - table: "AspNetUserLogins", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserRoles_RoleId", - table: "AspNetUserRoles", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "EmailIndex", - table: "AspNetUsers", - column: "NormalizedEmail"); - - migrationBuilder.CreateIndex( - name: "UserNameIndex", - table: "AspNetUsers", - column: "NormalizedUserName", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_Categories_UserId", - table: "Categories", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_Transactions_AccountId", - table: "Transactions", - column: "AccountId"); - - migrationBuilder.CreateIndex( - name: "IX_Transactions_CategoryId", - table: "Transactions", - column: "CategoryId"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "AspNetRoleClaims"); - - migrationBuilder.DropTable( - name: "AspNetUserClaims"); - - migrationBuilder.DropTable( - name: "AspNetUserLogins"); - - migrationBuilder.DropTable( - name: "AspNetUserRoles"); - - migrationBuilder.DropTable( - name: "AspNetUserTokens"); - - migrationBuilder.DropTable( - name: "Transactions"); - - migrationBuilder.DropTable( - name: "AspNetRoles"); - - migrationBuilder.DropTable( - name: "Accounts"); - - migrationBuilder.DropTable( - name: "Categories"); - - migrationBuilder.DropTable( - name: "AspNetUsers"); - } - } -} diff --git a/BudgetApp/Migrations/20260301155815_AddRecurringTransactions.cs b/BudgetApp/Migrations/20260301155815_AddRecurringTransactions.cs deleted file mode 100644 index 53726e1..0000000 --- a/BudgetApp/Migrations/20260301155815_AddRecurringTransactions.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace BudgetApp.Migrations -{ - /// - public partial class AddRecurringTransactions : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "ParentTransactionId", - table: "Transactions", - type: "INTEGER", - nullable: true); - - migrationBuilder.AddColumn( - name: "RecurrenceEndDate", - table: "Transactions", - type: "TEXT", - nullable: true); - - migrationBuilder.AddColumn( - name: "RecurrenceType", - table: "Transactions", - type: "INTEGER", - nullable: false, - defaultValue: 0); - - migrationBuilder.CreateIndex( - name: "IX_Transactions_ParentTransactionId", - table: "Transactions", - column: "ParentTransactionId"); - - migrationBuilder.AddForeignKey( - name: "FK_Transactions_Transactions_ParentTransactionId", - table: "Transactions", - column: "ParentTransactionId", - principalTable: "Transactions", - principalColumn: "Id", - onDelete: ReferentialAction.SetNull); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_Transactions_Transactions_ParentTransactionId", - table: "Transactions"); - - migrationBuilder.DropIndex( - name: "IX_Transactions_ParentTransactionId", - table: "Transactions"); - - migrationBuilder.DropColumn( - name: "ParentTransactionId", - table: "Transactions"); - - migrationBuilder.DropColumn( - name: "RecurrenceEndDate", - table: "Transactions"); - - migrationBuilder.DropColumn( - name: "RecurrenceType", - table: "Transactions"); - } - } -} diff --git a/BudgetApp/Migrations/20260301160737_AddCurrencyCodeAndCategoryIcon.cs b/BudgetApp/Migrations/20260301160737_AddCurrencyCodeAndCategoryIcon.cs deleted file mode 100644 index 8313adf..0000000 --- a/BudgetApp/Migrations/20260301160737_AddCurrencyCodeAndCategoryIcon.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace BudgetApp.Migrations -{ - /// - public partial class AddCurrencyCodeAndCategoryIcon : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "Icon", - table: "Categories", - type: "TEXT", - maxLength: 10, - nullable: false, - defaultValue: ""); - - migrationBuilder.AddColumn( - name: "CurrencyCode", - table: "Accounts", - type: "TEXT", - maxLength: 3, - nullable: false, - defaultValue: ""); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "Icon", - table: "Categories"); - - migrationBuilder.DropColumn( - name: "CurrencyCode", - table: "Accounts"); - } - } -} diff --git a/BudgetApp/Migrations/20260305164332_AddIsPaidToTransaction.cs b/BudgetApp/Migrations/20260305164332_AddIsPaidToTransaction.cs deleted file mode 100644 index 9c016c4..0000000 --- a/BudgetApp/Migrations/20260305164332_AddIsPaidToTransaction.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace BudgetApp.Migrations -{ - /// - public partial class AddIsPaidToTransaction : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "IsPaid", - table: "Transactions", - type: "INTEGER", - nullable: false, - defaultValue: false); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "IsPaid", - table: "Transactions"); - } - } -} diff --git a/BudgetApp/Migrations/20260305175841_AddSalary.cs b/BudgetApp/Migrations/20260305175841_AddSalary.cs deleted file mode 100644 index 358e263..0000000 --- a/BudgetApp/Migrations/20260305175841_AddSalary.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace BudgetApp.Migrations -{ - /// - public partial class AddSalary : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "SalaryId", - table: "Transactions", - type: "INTEGER", - nullable: true); - - migrationBuilder.CreateTable( - name: "Salaries", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - Name = table.Column(type: "TEXT", maxLength: 200, nullable: false), - Amount = table.Column(type: "decimal(18,2)", nullable: false), - RecurrenceType = table.Column(type: "INTEGER", nullable: false), - StartDate = table.Column(type: "TEXT", nullable: false), - AccountId = table.Column(type: "INTEGER", nullable: false), - CategoryId = table.Column(type: "INTEGER", nullable: true), - UserId = table.Column(type: "TEXT", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Salaries", x => x.Id); - table.ForeignKey( - name: "FK_Salaries_Accounts_AccountId", - column: x => x.AccountId, - principalTable: "Accounts", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_Salaries_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_Salaries_Categories_CategoryId", - column: x => x.CategoryId, - principalTable: "Categories", - principalColumn: "Id"); - }); - - migrationBuilder.CreateIndex( - name: "IX_Transactions_SalaryId", - table: "Transactions", - column: "SalaryId"); - - migrationBuilder.CreateIndex( - name: "IX_Salaries_AccountId", - table: "Salaries", - column: "AccountId"); - - migrationBuilder.CreateIndex( - name: "IX_Salaries_CategoryId", - table: "Salaries", - column: "CategoryId"); - - migrationBuilder.CreateIndex( - name: "IX_Salaries_UserId", - table: "Salaries", - column: "UserId"); - - migrationBuilder.AddForeignKey( - name: "FK_Transactions_Salaries_SalaryId", - table: "Transactions", - column: "SalaryId", - principalTable: "Salaries", - principalColumn: "Id", - onDelete: ReferentialAction.SetNull); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_Transactions_Salaries_SalaryId", - table: "Transactions"); - - migrationBuilder.DropTable( - name: "Salaries"); - - migrationBuilder.DropIndex( - name: "IX_Transactions_SalaryId", - table: "Transactions"); - - migrationBuilder.DropColumn( - name: "SalaryId", - table: "Transactions"); - } - } -} diff --git a/BudgetApp/Migrations/20260305181148_AddIsDefaultToCategory.cs b/BudgetApp/Migrations/20260305181148_AddIsDefaultToCategory.cs deleted file mode 100644 index 1e96a91..0000000 --- a/BudgetApp/Migrations/20260305181148_AddIsDefaultToCategory.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace BudgetApp.Migrations -{ - /// - public partial class AddIsDefaultToCategory : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "IsDefault", - table: "Categories", - type: "INTEGER", - nullable: false, - defaultValue: false); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "IsDefault", - table: "Categories"); - } - } -} diff --git a/BudgetApp/Program.cs b/BudgetApp/Program.cs index 4dfe9cb..c19212c 100644 --- a/BudgetApp/Program.cs +++ b/BudgetApp/Program.cs @@ -1,16 +1,19 @@ -using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; using BudgetApp.Components; using BudgetApp.Data; +using BudgetApp.Data.Entities; +using BudgetApp.Data.Repositories; using BudgetApp.Services; +using BudgetApp.Data.Interfaces; var builder = WebApplication.CreateBuilder(args); // Database builder.Services.AddDbContext(options => - options.UseSqlite(builder.Configuration.GetConnectionString("DefaultConnection") - ?? "Data Source=budgetapp.db")); + options.UseSqlite( + builder.Configuration.GetConnectionString("DefaultConnection") ?? "Data Source=budgetapp.db", + o => o.MigrationsAssembly("BudgetApp.Data"))); // Identity builder.Services.AddIdentity(options => @@ -69,11 +72,11 @@ if (!string.IsNullOrEmpty(facebookSection["ClientId"]) && !string.IsNullOrEmpty( } // Application services -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(); -builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/BudgetApp/Services/DashboardService.cs b/BudgetApp/Services/DashboardService.cs index 836c9b3..8ade703 100644 --- a/BudgetApp/Services/DashboardService.cs +++ b/BudgetApp/Services/DashboardService.cs @@ -1,27 +1,25 @@ -using BudgetApp.Data; +using BudgetApp.Data.Entities; +using BudgetApp.Data.Interfaces; +using BudgetApp.Services.Models; namespace BudgetApp.Services; -public class DashboardService(TransactionService transactionService, AccountService accountService, CategoryService categoryService) +public class DashboardService(ITransactionRepository transactionRepository, IAccountRepository accountRepository, ICategoryRepository categoryRepository) { - private readonly TransactionService _transactionService = transactionService; - private readonly AccountService _accountService = accountService; - private readonly CategoryService _categoryService = categoryService; - public async Task GetDashboardDataAsync(string userId, DateTime? from = null, DateTime? to = null) { - await _categoryService.EnsureDefaultCategoriesAsync(userId); + await categoryRepository.EnsureDefaultCategoriesAsync(userId); var windowEnd = to ?? DateTime.Today.AddDays(30); - await _transactionService.MaterializeRecurringTransactionsAsync(userId, windowEnd); + await transactionRepository.MaterializeRecurringTransactionsAsync(userId, windowEnd); - var accounts = await _accountService.GetAccountsAsync(userId); - var categories = await _categoryService.GetCategoriesAsync(userId); + var accounts = await accountRepository.GetAccountsAsync(userId); + var categories = await categoryRepository.GetCategoriesAsync(userId); var windowStart = from ?? DateTime.Today.AddDays(-30); var fetchStart = windowStart < DateTime.Today ? windowStart : DateTime.Today; var fetchEnd = windowEnd > DateTime.Today ? windowEnd : DateTime.Today; - var allTransactions = await _transactionService.GetTransactionsInRangeAsync(userId, fetchStart, fetchEnd); + var allTransactions = await transactionRepository.GetTransactionsInRangeAsync(userId, fetchStart, fetchEnd); var recent = allTransactions .Where(t => (t.Date.Date >= windowStart.Date && t.Date.Date <= DateTime.Today) @@ -99,10 +97,7 @@ public class DashboardService(TransactionService transactionService, AccountServ for (var d = startDate; d <= endDate; d = d.AddDays(1)) { var dayTxns = accountTransactions.Where(t => t.Date.Date == d.Date && !(t.IsPaid && t.Date.Date > today)); - foreach (var t in dayTxns) - { - runningBalance += t.Type == TransactionType.Income ? t.Amount : -t.Amount; - } + runningBalance += dayTxns.Sum(t => t.Type == TransactionType.Income ? t.Amount : -t.Amount); dataPoints.Add(runningBalance); } @@ -122,29 +117,4 @@ public class DashboardService(TransactionService transactionService, AccountServ DayTransactionLabels = dayTransactionLabels }; } -} - -public class DashboardData -{ - public List Accounts { get; set; } = []; - public List Categories { get; set; } = []; - public List RecentTransactions { get; set; } = []; - public List UpcomingTransactions { get; set; } = []; - public ChartData ChartData { get; set; } = new(); - public string CurrencySymbol { get; set; } = "$"; -} - -public class ChartData -{ - public List Labels { get; set; } = []; - public List Datasets { get; set; } = []; - public List> DayTransactionLabels { get; set; } = []; -} - -public class ChartDataset -{ - public string Label { get; set; } = string.Empty; - public string Color { get; set; } = "#1b6ec2"; - public List Data { get; set; } = []; - public string CurrencySymbol { get; set; } = "$"; -} +} \ No newline at end of file diff --git a/BudgetApp/Services/Models/ChartData.cs b/BudgetApp/Services/Models/ChartData.cs new file mode 100644 index 0000000..bc88857 --- /dev/null +++ b/BudgetApp/Services/Models/ChartData.cs @@ -0,0 +1,8 @@ +namespace BudgetApp.Services.Models; + +public class ChartData +{ + public List Labels { get; set; } = []; + public List Datasets { get; set; } = []; + public List> DayTransactionLabels { get; set; } = []; +} \ No newline at end of file diff --git a/BudgetApp/Services/Models/ChartDataset.cs b/BudgetApp/Services/Models/ChartDataset.cs new file mode 100644 index 0000000..3ca11c5 --- /dev/null +++ b/BudgetApp/Services/Models/ChartDataset.cs @@ -0,0 +1,9 @@ +namespace BudgetApp.Services.Models; + +public class ChartDataset +{ + public string Label { get; set; } = string.Empty; + public string Color { get; set; } = "#1b6ec2"; + public List Data { get; set; } = []; + public string CurrencySymbol { get; set; } = "$"; +} \ No newline at end of file diff --git a/BudgetApp/Services/Models/DashboardData.cs b/BudgetApp/Services/Models/DashboardData.cs new file mode 100644 index 0000000..a29f381 --- /dev/null +++ b/BudgetApp/Services/Models/DashboardData.cs @@ -0,0 +1,14 @@ + +using BudgetApp.Data.Entities; + +namespace BudgetApp.Services.Models; + +public class DashboardData +{ + public List Accounts { get; set; } = []; + public List Categories { get; set; } = []; + public List RecentTransactions { get; set; } = []; + public List UpcomingTransactions { get; set; } = []; + public ChartData ChartData { get; set; } = new(); + public string CurrencySymbol { get; set; } = "$"; +} \ No newline at end of file diff --git a/BudgetApp/budgetapp.db b/BudgetApp/budgetapp.db index 61a2e29d5390569ac5cf39d060f0a60afa46c04c..d71fe29e179f8b3e842e3ef5a94ae6bd0324eb51 100644 GIT binary patch delta 3608 zcmbW34QyLi702&+etwBl``yGLV)gsK z2jsrTCK^6-%nPoYU|nZt|4?6c(2#!@y4S#!_Cz`{kV+2frsfL5`b0L_-LLAX5W?q~ z)BCUj`I3+?$(?xScDZlo)9XKG6p3=JvZFlSeyi(zb!1aZvNLM0y8uh4uRdM$Xq|u2 zWg%adyJefa!Ti0s-|RA%`!4y8`$l}X`@G&ay%XLo-teN!c;Jae#j&U%syZq>_PrY* zQr;RdL^W3H2a=mpS!;b_U^AUuIy>>L>1fyx6}Y*fKhZb0y7zEXqai+yt9PWjvUZ{k zYD*uvzh#9X0v!QQd?2wsnI^4ycK_~+&+UyhIJdLzgh*-Y&4#$Cqtesf)1S$t`npM3 zIXm&aJt$pMZ-`nvxP55TVCO(8lTG#a(G5!W{jhntAu4gte(g?ZG*^by?NF({)L}Zr zix2$F>N<6^N{`*T5muTjYgzT_WFnpInN#hZTCegF{TVxqmmxv@(D(sG08ZN_Gd~C2a`}CW?V@)esQd2lEyi#6eXpH)59%OlpSggDFv5&R#tKFQ<7P%ZV>u(l zsAJSJmN9A=OBvOSC4{?zCHQ?%e9k!mDu@q82ru*E^;{ptC&2LuaC`zBp8&_l;`mq` z9}6fx7EpXFp!iro@v(s7V*$m-0*a3X6dwyHJ{C}XETH%Vpxely)qaeT5J&u!qDeoc z=(~PUDca`;m7*~}s1!Zm2bH4x{Gd{_!w)J&89%5LrTjoC@8hiS6`D=Vr zKQEt?&zduIy=MM@*R?YANM*@6r1In} zQkn7&Qn~UrQrU7EseJhZQW^6*q;lphq_XBsr1Its=z&~TUJ_ZH3?c`R1IP?=8?q0X zL8g)Y$X;Y0vIn^p*@a9aHzT(oHz9kGcOz5CuRu3+%PZpZ&;?z{jgX{|tL}NLx})3G zj-UP*Egq%u2#tqnJVfIZjR$Fbg2p_JlQbTnae~Hi{zE$b>zm9L|JIb-;MNc5N(aXx-lDeBVWNo3@tLruTLxet!Xe zCFChozbffHeV4Ax_W7O?@(p=VZkHS6VsqAf(fl_4Becpa@tyWPWxRX+7aF$PD6bzi zeF88{7C(%o!zB{ zbQE{mle@G};>{-+3S=iR9RtGNfVyQKb?s;n)c{Qus_TTuxTj|B#T{AF`r(^9o*c~9k6Hx>+gBgd X0$;`_tSZ=AutQP3cmef19jgBaVY5*v delta 3302 zcmbW3ZERCj7{||ZyW88Yz4z(5b?h?7?i697n{CIsxgd%}@r4a>))>baW$dM}bz|!a zEQ3ydg{=#3f>jPglAvIK}9eEFgzCSal=eh?#S3}|GD8WUd-&ppqX1MK`@ZnNKc zZvTCH?)m@E>9!v%+>L-0f3#9%Gvc8o z$?o*9(|WFFNBu07nQ_zpVkv|Ju?iu+cg;v=BApyaIhr}%eJ?lOpt6d1x!v3hby`!o z%I5Np&oo25F@L7Y%HyHdL?)T)5k2R4pF3Pg*Ct z{jVIFIQd-N4AP}qpjK-trM|DXK)u!!Qdt%M#`8`QE1_qYwG1MGSg|PL>11Cr&6k$u z`23*-L6zOgzjN<0XwYIs^ocXep#F(!;{wCq@F)BMzr}NS7SHf?`~csB}L$8PMv$8kA6h>LLn)?+QsMGH*~q7Ms<%f_$9gmJ<6)VcV2j~H3E3ltT` zxT%H;yE!x!cG1loVFzJ5L4IHxRa*&L2%8C;2&06JgbjoYVT6!&XT{eKQ#nLfPZ%T& z5K@GGLLXrrVJ#s^=q2zhfxu(pNM;gDLK$HO zp_C9Jln{yuL4l5^c z$xjo6pC$-DO%Q&XApA5z_-R6$^MN3w2_l9;5HSpbh+z;!41>U9n02Hghd~fI41&mE z5JV1xAaWQ4k;5SLk|n1Y{*J%kCF2x+hhOpye43w}@8WShf`|F`eG#9N8GSW+{tM! zMS&66A-P>LE4fW_tK=5R&61lWMlItZ0B?lx^lKql>lItYb zN+t!{phvP>vP*Ieu@ySyjn$F~$yJgak}DJ2`!+!h1K9? zrUG>U@kM=ogNae!Nmn!+jn#zfYNB;kINT&&s_C5JvtP87f|6* zU+%l;JK=lM*XpY(oG9F1*j`xSJ?Gu;ZTD7q&UyBG+C3H8Ic>i-=)UM&{87f-*?BvC zIs?8;riU?)*Q5GQnzTywSFaMSAfL|@`Ni||ifi(VuUdb9I83eQ?NoF-{j_pR!JRun zw+}t7EZ`%i+vmk7m(}g6XPkSvZMvPH(N?ab(H5?w(PpmOC3Ks(jz*(gN285gN23i~ zw_E5kT<46It+U~2xmK2!sZ3G{^X-FU%8c?wxn44{ z(!=V2c~!L}D5LHOLRnrkT$g*-ZMmLF=N0B*9uoq|n)aR3$n$m2^4YJRMjy^Un?!zj_>TPYRny2Dh1~AnqiETw zrRlg%t;#LekiR)U2xx~&pC;w8{POnv@@)8;9X&Oh75VkyYxeY{d|{5Cvhuv(QRAtZ ToXu6cIvghXHF47DymkEz;q{t1 diff --git a/BudgetApp/budgetapp.db-shm b/BudgetApp/budgetapp.db-shm index a92c42380ad4a8939b016adef5a64b4e8b880482..8b03f4d7d294b26dd19eaea4b68a597459c4a185 100644 GIT binary patch delta 204 zcmZo@U}|V!s+V}A%K!pQK+MR%AixErHGz1+;{5yB2ZElMFo*ouKhe{pJ9sJ*>ivKxZ;DurRPPuraU$ Ob#gLrZFXe(XbAu&V>RRe literal 32768 zcmeI*M{X2R5P;#|#v~iC3ATqEO*R<}m~4^>Cg+^yh&5US*j(2h05b<0CiCaZS+~(HgNTVr|5_i1iWaSy#l0h?NnmBT}8^ z80}qKyzh?qGgsPUc|^)td0+nifA-I+Z?w9~y_T6pB#=`U-a zl*grj0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36A zpnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>*#fQ1Wg|Q2;|Ql2;tG#>nfukrq9iBsN}#p&s5;?(r*oZ>updBlsxgQ%m9+nC2DcCweF403_1JmFOx z^_O2OU8Oky`Q zn+5c;oBa%MmP_2=8E+<6iB_Y40tzUgfC38SBruJIG1KoR_jAf;8U<=cU^+$P%iQ5PZ%H$zT?#1B R=mJw%QkwAI=nntx|2Ji)Oq~D# diff --git a/BudgetApp/budgetapp.db-wal b/BudgetApp/budgetapp.db-wal index 864c4c00f8f9b9d1d1194f55700768854c922056..18074c8f301204344e54b98ef87c1e15f881dbee 100644 GIT binary patch literal 41232 zcmeI*KWGzS90uU4g-(hcEC?HlI`F*F3UIl^8CK(Be4$K^RGFV=3j20=UnkA$AwYlt0RjXF5FkK+ z009C7S|_l7YC2iWLRNG_-U-FtP}RLq=UH0Bs@Jcwg%Iixny>X&E^u%2<@S|t_g99w zz%WXX3$$+W1|~p&009C72oNAZfB*pkjlg8Nz}%hd&j-)GzttCTi3kuNK!5-N0t5&U zAV7dXn+5*O1!7Ych;^?>tGu6;c^usrczpWA&ku*sE$R!jdG}@~K!5-N0t5&UAV7cs z0Rofd0`q$|KJ7ZT^hjU84I)5*009C72oNAZfB*pkZ59}j3-t0j#xxXJw~S+cU*J&u z`sUS_k8}D0ZQi}v2@oJafB*pk1PBlyK!CtxxxmTI`tIl1wd48%ZV&+i1PBlyK!5-N z0t5&UXtThmT%cQrm=;A*R{b%3frZ-_&ff@YNA(5TynC|~AV7cs0RjXF5FkK+0D;MJ zft#oD^{tB!p6Uy@K?Dd8AV7cs0RjXF5FkLH%>tuxfnFWEX&%ddm5up7f_KZSx3-ox e&gu)adG}@~K!5-N0t5&UAV7cs0RsP*3;YJztE!;@ literal 449112 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