From 756d25098ed492677b137c6cf86aa630af901289 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 7 Oct 2023 10:21:15 +0200 Subject: [PATCH 01/57] Update version --- CHANGELOG.md | 2 ++ OpenBudgeteer.Blazor/Shared/NavMenu.razor | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e65049b..7a9a6d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### 1.8 (202x-xx-xx) + ### 1.7 (2023-10-03) * [Add] PostgreSQL support [#81](https://github.com/TheAxelander/OpenBudgeteer/issues/81) Thanks [csillaggyujto](https://github.com/csillaggyujto) diff --git a/OpenBudgeteer.Blazor/Shared/NavMenu.razor b/OpenBudgeteer.Blazor/Shared/NavMenu.razor index ab79411..c3f8e2d 100644 --- a/OpenBudgeteer.Blazor/Shared/NavMenu.razor +++ b/OpenBudgeteer.Blazor/Shared/NavMenu.razor @@ -61,7 +61,7 @@
- Version: 1.7 (Change Log) + Version: 1.8 (Change Log)
From a574e0f04abf86b96e65b440f8177d0ebc3cf98c Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 7 Oct 2023 10:50:06 +0200 Subject: [PATCH 02/57] Add Data Consistency check: Negative Transaction assigned to Income #177 --- CHANGELOG.md | 1 + .../ViewModels/DataConsistencyViewModel.cs | 67 ++++++++++++++++++- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a9a6d8..4aaab93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### 1.8 (202x-xx-xx) +* [Add] Data Consistency Check: Negative Transaction assigned to Income [#177](https://github.com/TheAxelander/OpenBudgeteer/issues/177) ### 1.7 (2023-10-03) diff --git a/OpenBudgeteer.Core/ViewModels/DataConsistencyViewModel.cs b/OpenBudgeteer.Core/ViewModels/DataConsistencyViewModel.cs index 9328561..6f753d4 100644 --- a/OpenBudgeteer.Core/ViewModels/DataConsistencyViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/DataConsistencyViewModel.cs @@ -45,7 +45,8 @@ public async Task RunAllChecksAsync() CheckTransferReconciliationAsync(), CheckBucketBalanceAsync(), CheckBankTransactionWithoutBucketAssignmentAsync(), - CheckBudgetedTransactionOutsideOfValidityDateAsync() + CheckBudgetedTransactionOutsideOfValidityDateAsync(), + CheckNegativeBankTransactionAssignedToIncomeAsync() }; foreach (var result in await Task.WhenAll(checkTasks)) @@ -226,7 +227,9 @@ public async Task CheckBudgetedTransactionOutsideOfV ? new(DataConsistencyCheckResult.StatusCode.Alert, bucket.Name, invalidTransactions.Select(i => i.Transaction).ToList()) - : new(DataConsistencyCheckResult.StatusCode.Ok, bucket.Name, new List())); + : new(DataConsistencyCheckResult.StatusCode.Ok, + bucket.Name, + new List())); })); } @@ -246,7 +249,8 @@ public async Task CheckBudgetedTransactionOutsideOfV new string[4] { "Bucket", "Transaction Date", "Memo", "Amount" } }; - foreach (var result in results.Where(i => i.Item1 != DataConsistencyCheckResult.StatusCode.Ok)) + foreach (var result in results + .Where(i => i.Item1 != DataConsistencyCheckResult.StatusCode.Ok)) { foreach (var transaction in result.Item3) { @@ -266,4 +270,61 @@ public async Task CheckBudgetedTransactionOutsideOfV detailsBuilder); }); } + + /// + /// Checks if any negative has been assigned to Income + /// + /// Result of Data Consistency Check + public async Task CheckNegativeBankTransactionAssignedToIncomeAsync() + { + return await Task.Run(() => + { + var checkName = "Negative Bank Transaction assigned to Income"; + using var dbContext = new DatabaseContext(_dbOptions); + + var bankTransactions = dbContext.BudgetedTransaction + .Include(i => i.Transaction) + .Where(i => + i.BucketId == new Guid("00000000-0000-0000-0000-000000000001") && + i.Amount < 0) + .Select(i => i.Transaction) + .ToList(); + + var results = bankTransactions + .Select(bankTransaction => + new Tuple( + DataConsistencyCheckResult.StatusCode.Warning, + checkName, + bankTransaction)) + .ToList(); + + if (results.Count == 0) + { + return Task.FromResult(new DataConsistencyCheckResult( + checkName, + DataConsistencyCheckResult.StatusCode.Ok, + "All Transactions assigned to Income are positive", + new List())); + } + + var detailsBuilder = new List() + { + new string[3] { "Transaction Date", "Memo", "Amount" } + }; + + detailsBuilder.AddRange(results + .Select(i => new[] + { + i.Item3.TransactionDate.ToShortDateString(), + i.Item3.Memo, + i.Item3.Amount.ToString(CultureInfo.CurrentCulture) + })); + + return Task.FromResult(new DataConsistencyCheckResult( + checkName, + DataConsistencyCheckResult.StatusCode.Warning, + "Some Transactions assigned to Income are negative", + detailsBuilder)); + }); + } } \ No newline at end of file From 4cd9bd30da33c9bd621a252d1bf00172d8f915e6 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 7 Oct 2023 11:12:09 +0200 Subject: [PATCH 03/57] Amounts displayed in consistent currency and number format #188 --- CHANGELOG.md | 1 + OpenBudgeteer.Blazor/Pages/Bucket.razor | 16 ++++++++-------- OpenBudgeteer.Blazor/Pages/Transaction.razor | 5 +++-- .../Shared/BucketDetailsDialog.razor | 3 ++- .../Shared/BucketSelectDialog.razor | 13 +++++++------ .../Shared/RecurringTransactionDialog.razor | 3 ++- .../Shared/TransactionDialog.razor | 3 ++- .../ViewModels/DataConsistencyViewModel.cs | 13 +++++++++---- 8 files changed, 34 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aaab93..14b2f0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ### 1.8 (202x-xx-xx) * [Add] Data Consistency Check: Negative Transaction assigned to Income [#177](https://github.com/TheAxelander/OpenBudgeteer/issues/177) +* [Changed] Amounts displayed in consistent currency and number format [#188](https://github.com/TheAxelander/OpenBudgeteer/issues/188) ### 1.7 (2023-10-03) diff --git a/OpenBudgeteer.Blazor/Pages/Bucket.razor b/OpenBudgeteer.Blazor/Pages/Bucket.razor index f740141..a2d1a23 100644 --- a/OpenBudgeteer.Blazor/Pages/Bucket.razor +++ b/OpenBudgeteer.Blazor/Pages/Bucket.razor @@ -181,11 +181,11 @@ @bucketGroup.BucketGroup.Name - @bucketGroup.TotalBalance.ToString("N2") + @bucketGroup.TotalBalance.ToString("C", CultureInfo.CurrentCulture) - @(bucketGroup.TotalWant == 0 ? string.Empty : bucketGroup.TotalWant.ToString("N2")) - @(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("N2")) - @(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("N2")) + @(bucketGroup.TotalWant == 0 ? string.Empty : bucketGroup.TotalWant.ToString("C", CultureInfo.CurrentCulture)) + @(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("C", CultureInfo.CurrentCulture)) + @(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("C", CultureInfo.CurrentCulture)) @if (bucketGroup.IsHovered) { @@ -219,7 +219,7 @@
@bucket.Bucket.Name
} - @bucket.Balance.ToString("N2") + @bucket.Balance.ToString("C", CultureInfo.CurrentCulture) @if (bucket.Bucket.IsInactive) { @@ -232,9 +232,9 @@ @onkeyup="@(args => InOut_Changed(bucket, args))"/> } - @(bucket.Want == 0 ? string.Empty : bucket.Want.ToString("N2")) - @(bucket.In == 0 ? string.Empty : bucket.In.ToString("N2")) - @(bucket.Activity == 0 ? string.Empty : bucket.Activity.ToString("N2")) + @(bucket.Want == 0 ? string.Empty : bucket.Want.ToString("C", CultureInfo.CurrentCulture)) + @(bucket.In == 0 ? string.Empty : bucket.In.ToString("C", CultureInfo.CurrentCulture)) + @(bucket.Activity == 0 ? string.Empty : bucket.Activity.ToString("C", CultureInfo.CurrentCulture)) @if (bucket.IsProgressbarVisible) { diff --git a/OpenBudgeteer.Blazor/Pages/Transaction.razor b/OpenBudgeteer.Blazor/Pages/Transaction.razor index 62f10ba..b229d5d 100644 --- a/OpenBudgeteer.Blazor/Pages/Transaction.razor +++ b/OpenBudgeteer.Blazor/Pages/Transaction.razor @@ -3,6 +3,7 @@ @using OpenBudgeteer.Core.ViewModels @using Microsoft.EntityFrameworkCore @using System.Drawing +@using System.Globalization @using OpenBudgeteer.Core.Common @using OpenBudgeteer.Core.Common.Extensions @using OpenBudgeteer.Core.ViewModels.ItemViewModels @@ -188,13 +189,13 @@ @transaction.SelectedAccount.Name @transaction.Transaction.Payee @transaction.Transaction.Memo - @transaction.Transaction.Amount + @transaction.Transaction.Amount.ToString("C", CultureInfo.CurrentCulture) @foreach (var bucket in transaction.Buckets) {
@bucket.SelectedBucket.Name
-
@bucket.Amount
+
@bucket.Amount.ToString("C", CultureInfo.CurrentCulture)
} diff --git a/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor b/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor index 9cf2a06..d642d89 100644 --- a/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor @@ -3,6 +3,7 @@ @using ChartJs.Blazor.Charts @using OpenBudgeteer.Blazor.ViewModels @using OpenBudgeteer.Contracts.Models +@using System.Globalization @if (IsDialogVisible) { @@ -50,7 +51,7 @@ @transaction.SelectedAccount.Name @transaction.Transaction.Payee @transaction.Transaction.Memo - @transaction.Transaction.Amount + @transaction.Transaction.Amount.ToString("C", CultureInfo.CurrentCulture) } diff --git a/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor b/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor index f9a56cc..811da88 100644 --- a/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor @@ -1,5 +1,6 @@ @using OpenBudgeteer.Core.ViewModels @using System.Drawing +@using System.Globalization @using Microsoft.EntityFrameworkCore @using OpenBudgeteer.Contracts.Models @using OpenBudgeteer.Data @@ -47,9 +48,9 @@ @bucketGroup.BucketGroup.Name - @bucketGroup.TotalBalance.ToString("N2") - @(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("N2")) - @(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("N2")) + @bucketGroup.TotalBalance.ToString("C", CultureInfo.CurrentCulture) + @(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("C", CultureInfo.CurrentCulture)) + @(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("C", CultureInfo.CurrentCulture)) @@ -73,9 +74,9 @@ } - @bucket.Balance.ToString("N2") - @(bucket.In == 0 ? string.Empty : bucket.In.ToString("N2")) - @(bucket.Activity == 0 ? string.Empty : bucket.Activity.ToString("N2")) + @bucket.Balance.ToString("C", CultureInfo.CurrentCulture) + @(bucket.In == 0 ? string.Empty : bucket.In.ToString("C", CultureInfo.CurrentCulture)) + @(bucket.Activity == 0 ? string.Empty : bucket.Activity.ToString("C", CultureInfo.CurrentCulture)) @if (bucket.IsProgressbarVisible) { diff --git a/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor b/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor index 151fb2e..7e98106 100644 --- a/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor @@ -1,6 +1,7 @@ @using OpenBudgeteer.Core.Common @using OpenBudgeteer.Core.ViewModels @using System.Drawing +@using System.Globalization @using OpenBudgeteer.Core.ViewModels.ItemViewModels @if (IsDialogVisible) { @@ -87,7 +88,7 @@ @transaction.SelectedAccount.Name @transaction.Transaction.Payee @transaction.Transaction.Memo - @transaction.Transaction.Amount + @transaction.Transaction.Amount.ToString("C", CultureInfo.CurrentCulture) @if (transaction.IsHovered) { diff --git a/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor b/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor index 6535470..98ceaa1 100644 --- a/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor @@ -1,5 +1,6 @@ @using OpenBudgeteer.Core.ViewModels @using OpenBudgeteer.Contracts.Models +@using System.Globalization @if (IsDialogVisible) { @@ -35,7 +36,7 @@ @transaction.SelectedAccount.Name @transaction.Transaction.Payee @transaction.Transaction.Memo - @transaction.Transaction.Amount + @transaction.Transaction.Amount.ToString("C", CultureInfo.CurrentCulture) } diff --git a/OpenBudgeteer.Core/ViewModels/DataConsistencyViewModel.cs b/OpenBudgeteer.Core/ViewModels/DataConsistencyViewModel.cs index 6f753d4..8b63dd0 100644 --- a/OpenBudgeteer.Core/ViewModels/DataConsistencyViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/DataConsistencyViewModel.cs @@ -106,7 +106,12 @@ public async Task CheckBucketBalanceAsync() .Where(i => i.BucketId == bucket.BucketId) .Sum(i => i.Amount); results.Add(bucketBalance < 0 - ? new(DataConsistencyCheckResult.StatusCode.Warning, new string[2] { bucket.Name, bucketBalance.ToString(CultureInfo.CurrentCulture) }) + ? new(DataConsistencyCheckResult.StatusCode.Warning, + new string[2] + { + bucket.Name, + bucketBalance.ToString("C", CultureInfo.CurrentCulture) + }) : new(DataConsistencyCheckResult.StatusCode.Ok, Array.Empty())); })); } @@ -165,7 +170,7 @@ public async Task CheckBankTransactionWithoutBucketA { bankTransaction.TransactionDate.ToShortDateString(), bankTransaction.Memo, - bankTransaction.Amount.ToString(CultureInfo.CurrentCulture) + bankTransaction.Amount.ToString("C", CultureInfo.CurrentCulture) })); } })); @@ -258,7 +263,7 @@ public async Task CheckBudgetedTransactionOutsideOfV result.Item2, transaction.TransactionDate.ToShortDateString(), transaction.Memo, - transaction.Amount.ToString(CultureInfo.CurrentCulture) + transaction.Amount.ToString("C", CultureInfo.CurrentCulture) }); } } @@ -317,7 +322,7 @@ public async Task CheckNegativeBankTransactionAssign { i.Item3.TransactionDate.ToShortDateString(), i.Item3.Memo, - i.Item3.Amount.ToString(CultureInfo.CurrentCulture) + i.Item3.Amount.ToString("C", CultureInfo.CurrentCulture) })); return Task.FromResult(new DataConsistencyCheckResult( From 478d6ed6489b95cd596905f63948dff3ee1bb3b0 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 7 Oct 2023 11:28:39 +0200 Subject: [PATCH 04/57] Fixed UI alignment for large numbers #189 --- CHANGELOG.md | 1 + OpenBudgeteer.Blazor/Pages/Transaction.razor | 4 ++-- OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor | 2 +- OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor | 2 +- OpenBudgeteer.Blazor/Shared/TransactionDialog.razor | 2 +- OpenBudgeteer.Blazor/wwwroot/css/custom.css | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14b2f0a..95c2459 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ### 1.8 (202x-xx-xx) * [Add] Data Consistency Check: Negative Transaction assigned to Income [#177](https://github.com/TheAxelander/OpenBudgeteer/issues/177) * [Changed] Amounts displayed in consistent currency and number format [#188](https://github.com/TheAxelander/OpenBudgeteer/issues/188) +* [Fixed] UI alignment for large numbers [#189](https://github.com/TheAxelander/OpenBudgeteer/issues/189) ### 1.7 (2023-10-03) diff --git a/OpenBudgeteer.Blazor/Pages/Transaction.razor b/OpenBudgeteer.Blazor/Pages/Transaction.razor index b229d5d..c5a11ae 100644 --- a/OpenBudgeteer.Blazor/Pages/Transaction.razor +++ b/OpenBudgeteer.Blazor/Pages/Transaction.razor @@ -56,7 +56,7 @@ Account Payee Memo - Amount + Amount Buckets @@ -122,7 +122,7 @@ Account Payee Memo - Amount + Amount Buckets diff --git a/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor b/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor index d642d89..2cba57b 100644 --- a/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor @@ -40,7 +40,7 @@ Account Payee Memo - Amount + Amount diff --git a/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor b/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor index 7e98106..f4a14ae 100644 --- a/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor @@ -36,7 +36,7 @@ Account Payee Memo - Amount + Amount diff --git a/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor b/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor index 98ceaa1..89298a6 100644 --- a/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor @@ -25,7 +25,7 @@ Account Payee Memo - Amount + Amount diff --git a/OpenBudgeteer.Blazor/wwwroot/css/custom.css b/OpenBudgeteer.Blazor/wwwroot/css/custom.css index 488b0ad..9ff746f 100644 --- a/OpenBudgeteer.Blazor/wwwroot/css/custom.css +++ b/OpenBudgeteer.Blazor/wwwroot/css/custom.css @@ -31,7 +31,7 @@ table .header-row td, table .header-row th { text-align: right; } .col-bucket-numbers { - width: 90px; + width: 120px; } .col-buttons { text-align: right; From 8770d33ceea09b8751cc737aecbc594873eca520 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 7 Oct 2023 11:37:13 +0200 Subject: [PATCH 05/57] Update appsettings.json --- .gitignore | 1 + OpenBudgeteer.Blazor/appsettings.Development.json | 10 ---------- OpenBudgeteer.Blazor/appsettings.json | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 OpenBudgeteer.Blazor/appsettings.Development.json diff --git a/.gitignore b/.gitignore index 8b3aafa..d3adfe1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.db-shm *.db-wal *.DS_Store +OpenBudgeteer.Blazor/appsettings.Development.json # User-specific files *.rsuser diff --git a/OpenBudgeteer.Blazor/appsettings.Development.json b/OpenBudgeteer.Blazor/appsettings.Development.json deleted file mode 100644 index 5173757..0000000 --- a/OpenBudgeteer.Blazor/appsettings.Development.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "DetailedErrors": true, - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - } -} diff --git a/OpenBudgeteer.Blazor/appsettings.json b/OpenBudgeteer.Blazor/appsettings.json index 5c88127..46f1b30 100644 --- a/OpenBudgeteer.Blazor/appsettings.json +++ b/OpenBudgeteer.Blazor/appsettings.json @@ -1,5 +1,5 @@ { - "CONNECTION_PROVIDER": "postgres", + "CONNECTION_PROVIDER": "TEMPDB", "APPSETTINGS_CULTURE": "en-US", "APPSETTINGS_THEME": "default", From 0c15959df49e6f0550ef2444f42e3cf9aeadcf21 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 7 Oct 2023 11:53:57 +0200 Subject: [PATCH 06/57] Disable button display via hovering #155 --- CHANGELOG.md | 1 + OpenBudgeteer.Blazor/Pages/Bucket.razor | 36 ++++++++----------- OpenBudgeteer.Blazor/Pages/Rules.razor | 9 ++--- OpenBudgeteer.Blazor/Pages/Transaction.razor | 9 ++--- .../Shared/RecurringTransactionDialog.razor | 9 ++--- 5 files changed, 25 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95c2459..dfc0421 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ### 1.8 (202x-xx-xx) * [Add] Data Consistency Check: Negative Transaction assigned to Income [#177](https://github.com/TheAxelander/OpenBudgeteer/issues/177) * [Changed] Amounts displayed in consistent currency and number format [#188](https://github.com/TheAxelander/OpenBudgeteer/issues/188) +* [Changed] Buttons that appeared in the past only via hovering are now always displayed (was not working well, maybe additional rework in future) [#155](https://github.com/TheAxelander/OpenBudgeteer/issues/155) * [Fixed] UI alignment for large numbers [#189](https://github.com/TheAxelander/OpenBudgeteer/issues/189) ### 1.7 (2023-10-03) diff --git a/OpenBudgeteer.Blazor/Pages/Bucket.razor b/OpenBudgeteer.Blazor/Pages/Bucket.razor index a2d1a23..4ca8ad6 100644 --- a/OpenBudgeteer.Blazor/Pages/Bucket.razor +++ b/OpenBudgeteer.Blazor/Pages/Bucket.razor @@ -157,7 +157,7 @@ { - + @if (bucketGroup.InModification) { } @@ -206,7 +203,7 @@ @foreach (var bucket in bucketGroup.Buckets) { - + diff --git a/OpenBudgeteer.Blazor/Pages/Rules.razor b/OpenBudgeteer.Blazor/Pages/Rules.razor index f2c02ed..096f0bc 100644 --- a/OpenBudgeteer.Blazor/Pages/Rules.razor +++ b/OpenBudgeteer.Blazor/Pages/Rules.razor @@ -159,7 +159,7 @@ } else { - + @@ -172,11 +172,8 @@ } diff --git a/OpenBudgeteer.Blazor/Pages/Transaction.razor b/OpenBudgeteer.Blazor/Pages/Transaction.razor index c5a11ae..0ae12bb 100644 --- a/OpenBudgeteer.Blazor/Pages/Transaction.razor +++ b/OpenBudgeteer.Blazor/Pages/Transaction.razor @@ -184,7 +184,7 @@ } else { - + @@ -200,11 +200,8 @@ } } diff --git a/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor b/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor index f4a14ae..e8f04d8 100644 --- a/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor @@ -81,7 +81,7 @@ } else { - + @@ -90,11 +90,8 @@ } From 4058ac15ff411a2036236fb03b812e60b3f7f4a2 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 7 Oct 2023 12:13:52 +0200 Subject: [PATCH 07/57] Create Transaction keeps last input date #187 --- CHANGELOG.md | 1 + OpenBudgeteer.Core/ViewModels/TransactionViewModel.cs | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfc0421..0e238b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ### 1.8 (202x-xx-xx) * [Add] Data Consistency Check: Negative Transaction assigned to Income [#177](https://github.com/TheAxelander/OpenBudgeteer/issues/177) +* [Add] Create Transaction keeps last input date [#187](https://github.com/TheAxelander/OpenBudgeteer/issues/187) * [Changed] Amounts displayed in consistent currency and number format [#188](https://github.com/TheAxelander/OpenBudgeteer/issues/188) * [Changed] Buttons that appeared in the past only via hovering are now always displayed (was not working well, maybe additional rework in future) [#155](https://github.com/TheAxelander/OpenBudgeteer/issues/155) * [Fixed] UI alignment for large numbers [#189](https://github.com/TheAxelander/OpenBudgeteer/issues/189) diff --git a/OpenBudgeteer.Core/ViewModels/TransactionViewModel.cs b/OpenBudgeteer.Core/ViewModels/TransactionViewModel.cs index ee54446..f8538a5 100644 --- a/OpenBudgeteer.Core/ViewModels/TransactionViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/TransactionViewModel.cs @@ -132,8 +132,8 @@ public TransactionViewModel(DbContextOptions dbOptions, YearMon { _dbOptions = dbOptions; _yearMonthViewModel = yearMonthViewModel; - ResetNewTransaction(); _transactions = new ObservableCollection(); + ResetNewTransaction(); //_yearMonthViewModel.SelectedYearMonthChanged += (sender) => { LoadData(); }; } @@ -281,7 +281,11 @@ public ViewModelOperationResult CreateItem() /// public void ResetNewTransaction() { + var lastEnteredDate = NewTransaction == null ? + _yearMonthViewModel.CurrentMonth : + NewTransaction.Transaction.TransactionDate; NewTransaction = new TransactionViewModelItem(_dbOptions, _yearMonthViewModel, true); + NewTransaction.Transaction.TransactionDate = lastEnteredDate; } /// From b1ce601d5b2a177420c072a426bc2ce0df7c4760 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 15 Oct 2023 11:03:59 +0200 Subject: [PATCH 08/57] More responsive navigation bar #175 --- CHANGELOG.md | 1 + OpenBudgeteer.Blazor/Shared/MainLayout.razor | 39 +++++- OpenBudgeteer.Blazor/Shared/NavMenu.razor | 138 +++++++++---------- OpenBudgeteer.Blazor/wwwroot/css/custom.css | 8 ++ 4 files changed, 110 insertions(+), 76 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e238b3..309849d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * [Add] Create Transaction keeps last input date [#187](https://github.com/TheAxelander/OpenBudgeteer/issues/187) * [Changed] Amounts displayed in consistent currency and number format [#188](https://github.com/TheAxelander/OpenBudgeteer/issues/188) * [Changed] Buttons that appeared in the past only via hovering are now always displayed (was not working well, maybe additional rework in future) [#155](https://github.com/TheAxelander/OpenBudgeteer/issues/155) +* [Changed] More responsive navigation bar [#175](https://github.com/TheAxelander/OpenBudgeteer/issues/175) * [Fixed] UI alignment for large numbers [#189](https://github.com/TheAxelander/OpenBudgeteer/issues/189) ### 1.7 (2023-10-03) diff --git a/OpenBudgeteer.Blazor/Shared/MainLayout.razor b/OpenBudgeteer.Blazor/Shared/MainLayout.razor index ab3dedd..d5791f9 100644 --- a/OpenBudgeteer.Blazor/Shared/MainLayout.razor +++ b/OpenBudgeteer.Blazor/Shared/MainLayout.razor @@ -1,10 +1,45 @@ @inherits LayoutComponentBase +@using Microsoft.EntityFrameworkCore +@using OpenBudgeteer.Data +@inject DbContextOptions DbContextOptions
- +
@Body
-
\ No newline at end of file + + +@code { + + public string CurrentDatabase => new DatabaseContext(DbContextOptions).Database.GetDbConnection().Database; + +} \ No newline at end of file diff --git a/OpenBudgeteer.Blazor/Shared/NavMenu.razor b/OpenBudgeteer.Blazor/Shared/NavMenu.razor index c3f8e2d..8e6290d 100644 --- a/OpenBudgeteer.Blazor/Shared/NavMenu.razor +++ b/OpenBudgeteer.Blazor/Shared/NavMenu.razor @@ -1,75 +1,65 @@ -@using Microsoft.EntityFrameworkCore -@using OpenBudgeteer.Data -@inject DbContextOptions DbContextOptions - - - -@code { - - public string CurrentDatabase => new DatabaseContext(DbContextOptions).Database.GetDbConnection().Database; - -} + + + + + + diff --git a/OpenBudgeteer.Blazor/wwwroot/css/custom.css b/OpenBudgeteer.Blazor/wwwroot/css/custom.css index 9ff746f..7215eb6 100644 --- a/OpenBudgeteer.Blazor/wwwroot/css/custom.css +++ b/OpenBudgeteer.Blazor/wwwroot/css/custom.css @@ -92,6 +92,14 @@ button.btn-bucket { display: inline-block; /* restore setting from bootstrap 4 */ } +.nav-link { + white-space: nowrap; +} + +.navbar-toggler { + font-size: var(--bs-body-font-size); +} + .dropdown-item-sm { font-size: .875rem; /* Additional class to match font size of DropDownItem with SplitButton (btn-sm)*/ } From 837a365495173e13f5c27ff8bddd1859f8ec1f76 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Mon, 16 Oct 2023 16:10:06 +0200 Subject: [PATCH 09/57] Add demo data load for new databases #192 --- CHANGELOG.md | 1 + .../HostedDatabaseMigrator.cs | 5 + .../Initialization/DemoDataGenerator.cs | 455 ++++++++++++++++++ 3 files changed, 461 insertions(+) create mode 100644 OpenBudgeteer.Data/Initialization/DemoDataGenerator.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index fbbcc4e..71dcda8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ### 1.8 (202x-xx-xx) * [Add] Data Consistency Check: Negative Transaction assigned to Income [#177](https://github.com/TheAxelander/OpenBudgeteer/issues/177) * [Add] Create Transaction keeps last input date [#187](https://github.com/TheAxelander/OpenBudgeteer/issues/187) +* [Add] An empty database can now be loaded with some demo data using `APPSETTINGS_DEMO_DATA: true` [#192](https://github.com/TheAxelander/OpenBudgeteer/issues/192) * [Changed] Amounts displayed in consistent currency and number format [#188](https://github.com/TheAxelander/OpenBudgeteer/issues/188) * [Changed] Buttons that appeared in the past only via hovering are now always displayed (was not working well, maybe additional rework in future) [#155](https://github.com/TheAxelander/OpenBudgeteer/issues/155) * [Changed] More responsive navigation bar [#175](https://github.com/TheAxelander/OpenBudgeteer/issues/175) diff --git a/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs b/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs index 246fec4..5250b17 100644 --- a/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs +++ b/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs @@ -16,6 +16,8 @@ public class HostedDatabaseMigrator : IHostedService private readonly IConfiguration _configuration; private readonly IDatabaseInitializer _databaseInitializer; private readonly IDatabaseOnlineChecker _onlineChecker; + + private const string APPSETTINGS_DEMO_DATA = "APPSETTINGS_DEMO_DATA"; public HostedDatabaseMigrator( DbContextOptions dbContextOptions, @@ -43,6 +45,9 @@ public async Task StartAsync(CancellationToken cancellationToken) await using var context = new DatabaseContext(_dbContextOptions); await context.Database.MigrateAsync(cancellationToken: cancellationToken); + + var initializeWithDemoData = _configuration.GetValue(APPSETTINGS_DEMO_DATA); + if (initializeWithDemoData) new DemoDataGenerator(_dbContextOptions).GenerateDemoData(); } public Task StopAsync(CancellationToken cancellationToken) diff --git a/OpenBudgeteer.Data/Initialization/DemoDataGenerator.cs b/OpenBudgeteer.Data/Initialization/DemoDataGenerator.cs new file mode 100644 index 0000000..a4403b7 --- /dev/null +++ b/OpenBudgeteer.Data/Initialization/DemoDataGenerator.cs @@ -0,0 +1,455 @@ +using System; +using System.Linq; +using Microsoft.EntityFrameworkCore; +using OpenBudgeteer.Contracts.Models; + +namespace OpenBudgeteer.Data.Initialization; + +public class DemoDataGenerator +{ + private readonly DbContextOptions _dbContextOptions; + + public DemoDataGenerator(DbContextOptions dbContextOptions) + { + _dbContextOptions = dbContextOptions; + } + + public void GenerateDemoData() + { + if (!IsDatabaseEmpty()) return; + + using var dbContext = new DatabaseContext(_dbContextOptions); + + // Create Accounts + var accountChecking = new Account() + { + AccountId = Guid.Empty, + Name = "Checking account", + IsActive = 1 + }; + var accountSavings = new Account() + { + AccountId = Guid.Empty, + Name = "Savings account", + IsActive = 1 + }; + dbContext.Account.AddRange(new []{ accountChecking, accountSavings }); + dbContext.SaveChanges(); + + // Create Buckets Groups + var bucketGroupRegularExpenses = new BucketGroup() + { + BucketGroupId = Guid.Empty, + Name = "Regular Expenses", + Position = 1 + }; + var bucketGroupSavings = new BucketGroup() + { + BucketGroupId = Guid.Empty, + Name = "Long Term Savings", + Position = 2 + }; + dbContext.BucketGroup.AddRange(new []{ bucketGroupRegularExpenses, bucketGroupSavings }); + dbContext.SaveChanges(); + + // Create Buckets + var firstOfThisMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1); + var firstOfPreviousMonth = firstOfThisMonth.AddMonths(-1); + var bucketRent = new Bucket() + { + BucketId = Guid.Empty, + BucketGroupId = bucketGroupRegularExpenses.BucketGroupId, + Name = "Rent", + ValidFrom = firstOfPreviousMonth, + ColorCode = "IndianRed" + }; + var bucketHealthInsurance = new Bucket() + { + BucketId = Guid.Empty, + BucketGroupId = bucketGroupRegularExpenses.BucketGroupId, + Name = "Health Insurance", + ValidFrom = firstOfPreviousMonth, + ColorCode = "IndianRed" + }; + var bucketGroceries = new Bucket() + { + BucketId = Guid.Empty, + BucketGroupId = bucketGroupRegularExpenses.BucketGroupId, + Name = "Groceries", + ValidFrom = firstOfPreviousMonth, + ColorCode = "DarkOliveGreen" + }; + var bucketCarFuel = new Bucket() + { + BucketId = Guid.Empty, + BucketGroupId = bucketGroupRegularExpenses.BucketGroupId, + Name = "Car Fuel", + ValidFrom = firstOfPreviousMonth, + ColorCode = "DarkOliveGreen" + }; + var bucketVacationTrip = new Bucket() + { + BucketId = Guid.Empty, + BucketGroupId = bucketGroupSavings.BucketGroupId, + Name = "Vacation Trip", + ValidFrom = firstOfThisMonth, + ColorCode = "Goldenrod" + }; + var bucketReserves = new Bucket() + { + BucketId = Guid.Empty, + BucketGroupId = bucketGroupSavings.BucketGroupId, + Name = "Reserves", + ValidFrom = firstOfPreviousMonth, + ColorCode = "Orange" + }; + dbContext.Bucket.AddRange(new [] + { + bucketRent, bucketHealthInsurance, bucketGroceries, bucketCarFuel, + bucketVacationTrip, bucketReserves + }); + dbContext.SaveChanges(); + + // Create Bucket Versions + var bucketVersionRent = new BucketVersion() + { + BucketVersionId = Guid.Empty, + BucketId = bucketRent.BucketId, + BucketType = 2, + BucketTypeXParam = 1, + BucketTypeYParam = 400, + BucketTypeZParam = DateTime.MinValue, + ValidFrom = bucketRent.ValidFrom, + Version = 1 + }; + var bucketVersionHealthInsurance = new BucketVersion() + { + BucketVersionId = Guid.Empty, + BucketId = bucketHealthInsurance.BucketId, + BucketType = 3, + BucketTypeXParam = 3, + BucketTypeYParam = 150, + BucketTypeZParam = bucketHealthInsurance.ValidFrom.AddMonths(2), + ValidFrom = bucketHealthInsurance.ValidFrom, + Version = 1 + }; + var bucketVersionGroceries = new BucketVersion() + { + BucketVersionId = Guid.Empty, + BucketId = bucketGroceries.BucketId, + BucketType = 2, + BucketTypeXParam = 1, + BucketTypeYParam = 300, + BucketTypeZParam = DateTime.MinValue, + ValidFrom = bucketGroceries.ValidFrom, + Version = 1 + }; + var bucketVersionCarFuel = new BucketVersion() + { + BucketVersionId = Guid.Empty, + BucketId = bucketCarFuel.BucketId, + BucketType = 2, + BucketTypeXParam = 1, + BucketTypeYParam = 100, + BucketTypeZParam = DateTime.MinValue, + ValidFrom = bucketCarFuel.ValidFrom, + Version = 1 + }; + var bucketVersionVacationTrip = new BucketVersion() + { + BucketVersionId = Guid.Empty, + BucketId = bucketVacationTrip.BucketId, + BucketType = 4, + BucketTypeXParam = 0, + BucketTypeYParam = 600, + BucketTypeZParam = bucketVacationTrip.ValidFrom.AddMonths(5), + ValidFrom = bucketVacationTrip.ValidFrom, + Version = 1 + }; + var bucketVersionReserves = new BucketVersion() + { + BucketVersionId = Guid.Empty, + BucketId = bucketReserves.BucketId, + BucketType = 1, + BucketTypeXParam = 0, + BucketTypeYParam = 0, + BucketTypeZParam = DateTime.MinValue, + ValidFrom = bucketReserves.ValidFrom, + Version = 1 + }; + dbContext.BucketVersion.AddRange(new [] + { + bucketVersionRent, bucketVersionHealthInsurance, bucketVersionGroceries, bucketVersionCarFuel, + bucketVersionVacationTrip, bucketVersionReserves + }); + dbContext.SaveChanges(); + + // Create Bank Transactions + var transactionOpeningCheckingAccount = new BankTransaction() + { + TransactionId = Guid.Empty, + TransactionDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).AddMonths(-1), + AccountId = accountChecking.AccountId, + Memo = "Opening Transaction", + Amount = new decimal(1500.35) + }; + var transactionSalary = new BankTransaction() + { + TransactionId = Guid.Empty, + TransactionDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 28).AddMonths(-1), + AccountId = accountChecking.AccountId, + Memo = "Salary", + Amount = new decimal(2300.57) + }; + var transactionRent1 = new BankTransaction() + { + TransactionId = Guid.Empty, + TransactionDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 10).AddMonths(-1), + AccountId = accountChecking.AccountId, + Memo = "Rent", + Amount = -400 + }; + var transactionRent2 = new BankTransaction() + { + TransactionId = Guid.Empty, + TransactionDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 10), + AccountId = accountChecking.AccountId, + Memo = "Rent", + Amount = -400 + }; + var transactionGroceries1 = new BankTransaction() + { + TransactionId = Guid.Empty, + TransactionDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 4).AddMonths(-1), + AccountId = accountChecking.AccountId, + Memo = "Supermarket", + Amount = new decimal(-23.87) + }; + var transactionGroceries2 = new BankTransaction() + { + TransactionId = Guid.Empty, + TransactionDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 11).AddMonths(-1), + AccountId = accountChecking.AccountId, + Memo = "Supermarket", + Amount = new decimal(-40.34) + }; + var transactionGroceries3 = new BankTransaction() + { + TransactionId = Guid.Empty, + TransactionDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 2), + AccountId = accountChecking.AccountId, + Memo = "Supermarket", + Amount = new decimal(-10.50) + }; + var transactionSplit = new BankTransaction() + { + TransactionId = Guid.Empty, + TransactionDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 25).AddMonths(-1), + AccountId = accountChecking.AccountId, + Memo = "Weekend shopping", + Amount = new decimal(-170.51) + }; + var transactionTransfer1 = new BankTransaction() + { + TransactionId = Guid.Empty, + TransactionDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 29).AddMonths(-1), + AccountId = accountChecking.AccountId, + Memo = "Bank Transfer", + Amount = -1500 + }; + var transactionTransfer2 = new BankTransaction() + { + TransactionId = Guid.Empty, + TransactionDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 29).AddMonths(-1), + AccountId = accountSavings.AccountId, + Memo = "Bank Transfer", + Amount = 1500 + }; + dbContext.BankTransaction.AddRange(new [] + { + transactionOpeningCheckingAccount, transactionSalary, + transactionRent1, transactionRent2, + transactionGroceries1, transactionGroceries2, transactionGroceries3, + transactionSplit, transactionTransfer1, transactionTransfer2 + }); + dbContext.SaveChanges(); + + // Create BucketMovements + var movementRent1 = new BucketMovement() + { + BucketMovementId = Guid.Empty, + MovementDate = firstOfPreviousMonth, + BucketId = bucketRent.BucketId, + Amount = 400 + }; + var movementRent2 = new BucketMovement() + { + BucketMovementId = Guid.Empty, + MovementDate = firstOfThisMonth, + BucketId = bucketRent.BucketId, + Amount = 400 + }; + var movementInsurance1 = new BucketMovement() + { + BucketMovementId = Guid.Empty, + MovementDate = firstOfPreviousMonth, + BucketId = bucketHealthInsurance.BucketId, + Amount = 50 + }; + var movementInsurance2 = new BucketMovement() + { + BucketMovementId = Guid.Empty, + MovementDate = firstOfThisMonth, + BucketId = bucketHealthInsurance.BucketId, + Amount = 50 + }; + var movementGroceries1 = new BucketMovement() + { + BucketMovementId = Guid.Empty, + MovementDate = firstOfPreviousMonth, + BucketId = bucketGroceries.BucketId, + Amount = 300 + }; + var movementGroceries2 = new BucketMovement() + { + BucketMovementId = Guid.Empty, + MovementDate = firstOfThisMonth, + BucketId = bucketGroceries.BucketId, + Amount = 300 + }; + var movementCarFuel1 = new BucketMovement() + { + BucketMovementId = Guid.Empty, + MovementDate = firstOfPreviousMonth, + BucketId = bucketCarFuel.BucketId, + Amount = 100 + }; + var movementCarFuel2 = new BucketMovement() + { + BucketMovementId = Guid.Empty, + MovementDate = firstOfThisMonth, + BucketId = bucketCarFuel.BucketId, + Amount = 100 + }; + var movementVacationTrip = new BucketMovement() + { + BucketMovementId = Guid.Empty, + MovementDate = firstOfThisMonth, + BucketId = bucketVacationTrip.BucketId, + Amount = 100 + }; + var movementReserves = new BucketMovement() + { + BucketMovementId = Guid.Empty, + MovementDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 28).AddMonths(-1), + BucketId = bucketReserves.BucketId, + Amount = 1000 + }; + dbContext.BucketMovement.AddRange(new [] + { + movementRent1, movementInsurance1, movementGroceries1, movementCarFuel1, movementVacationTrip, movementReserves, + movementRent2, movementInsurance2, movementGroceries2, movementCarFuel2 + }); + dbContext.SaveChanges(); + + // Create BudgetedTransactions + + var budgetedTransactionOpeningCheckingAccount = new BudgetedTransaction() + { + BudgetedTransactionId = Guid.Empty, + TransactionId = transactionOpeningCheckingAccount.TransactionId, + BucketId = new Guid("00000000-0000-0000-0000-000000000001"), + Amount = transactionOpeningCheckingAccount.Amount + }; + var budgetedTransactionSalary = new BudgetedTransaction() + { + BudgetedTransactionId = Guid.Empty, + TransactionId = transactionSalary.TransactionId, + BucketId = new Guid("00000000-0000-0000-0000-000000000001"), + Amount = transactionSalary.Amount + }; + var budgetedTransactionRent1 = new BudgetedTransaction() + { + BudgetedTransactionId = Guid.Empty, + TransactionId = transactionRent1.TransactionId, + BucketId = bucketRent.BucketId, + Amount = transactionRent1.Amount + }; + var budgetedTransactionRent2 = new BudgetedTransaction() + { + BudgetedTransactionId = Guid.Empty, + TransactionId = transactionRent2.TransactionId, + BucketId = bucketRent.BucketId, + Amount = transactionRent2.Amount + }; + var budgetedTransactionGroceries1 = new BudgetedTransaction() + { + BudgetedTransactionId = Guid.Empty, + TransactionId = transactionGroceries1.TransactionId, + BucketId = bucketGroceries.BucketId, + Amount = transactionGroceries1.Amount + }; + var budgetedTransactionGroceries2 = new BudgetedTransaction() + { + BudgetedTransactionId = Guid.Empty, + TransactionId = transactionGroceries2.TransactionId, + BucketId = bucketGroceries.BucketId, + Amount = transactionGroceries2.Amount + }; + var budgetedTransactionGroceries3 = new BudgetedTransaction() + { + BudgetedTransactionId = Guid.Empty, + TransactionId = transactionGroceries3.TransactionId, + BucketId = bucketGroceries.BucketId, + Amount = transactionGroceries3.Amount + }; + var budgetedTransactionSplit1 = new BudgetedTransaction() + { + BudgetedTransactionId = Guid.Empty, + TransactionId = transactionSplit.TransactionId, + BucketId = bucketCarFuel.BucketId, + Amount = new decimal(-90.86) + }; + var budgetedTransactionSplit2 = new BudgetedTransaction() + { + BudgetedTransactionId = Guid.Empty, + TransactionId = transactionSplit.TransactionId, + BucketId = bucketGroceries.BucketId, + Amount = transactionSplit.Amount - budgetedTransactionSplit1.Amount + }; + var budgetedTransactionTransfer1 = new BudgetedTransaction() + { + BudgetedTransactionId = Guid.Empty, + TransactionId = transactionTransfer1.TransactionId, + BucketId = new Guid("00000000-0000-0000-0000-000000000002"), + Amount = transactionTransfer1.Amount + }; + var budgetedTransactionTransfer2 = new BudgetedTransaction() + { + BudgetedTransactionId = Guid.Empty, + TransactionId = transactionTransfer2.TransactionId, + BucketId = new Guid("00000000-0000-0000-0000-000000000002"), + Amount = transactionTransfer2.Amount + }; + dbContext.BudgetedTransaction.AddRange(new [] + { + budgetedTransactionOpeningCheckingAccount, budgetedTransactionSalary, budgetedTransactionRent1, + budgetedTransactionRent2, budgetedTransactionGroceries1, budgetedTransactionGroceries2, + budgetedTransactionGroceries3, budgetedTransactionSplit1, budgetedTransactionSplit2, + budgetedTransactionTransfer1, budgetedTransactionTransfer2 + }); + dbContext.SaveChanges(); + } + + private bool IsDatabaseEmpty() + { + using var dbContext = new DatabaseContext(_dbContextOptions); + if (dbContext.Account.Any()) return false; + if (dbContext.Bucket.Any(i => i.BucketGroupId != new Guid("00000000-0000-0000-0000-000000000001"))) return false; + if (dbContext.BankTransaction.Any()) return false; + if (dbContext.BucketMovement.Any()) return false; + if (dbContext.BudgetedTransaction.Any()) return false; + + return true; + } +} \ No newline at end of file From e6e49bc1b1576fd17a81feea104f04450153f5f2 Mon Sep 17 00:00:00 2001 From: Luca Berneking Date: Wed, 1 Nov 2023 16:51:37 +0100 Subject: [PATCH 10/57] Fix Mapping Rules with Account Name Allows to create mapping rules based on the account name of the transaction --- .../ViewModels/ItemViewModels/TransactionViewModelItem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenBudgeteer.Core/ViewModels/ItemViewModels/TransactionViewModelItem.cs b/OpenBudgeteer.Core/ViewModels/ItemViewModels/TransactionViewModelItem.cs index 63e196e..fb6a8e1 100644 --- a/OpenBudgeteer.Core/ViewModels/ItemViewModels/TransactionViewModelItem.cs +++ b/OpenBudgeteer.Core/ViewModels/ItemViewModels/TransactionViewModelItem.cs @@ -579,7 +579,7 @@ string GetFieldValue(int comparisionField) { return (comparisionField switch { - 1 => Transaction.AccountId.ToString(), + 1 => SelectedAccount?.Name ?? "", 2 => Transaction.Payee, 3 => Transaction.Memo, 4 => Transaction.Amount.ToString(CultureInfo.CurrentCulture), From bca6733091b0d644958bbd5a80bca681da521a58 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Thu, 2 Nov 2023 10:21:08 +0100 Subject: [PATCH 11/57] Add #199 to CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71dcda8..106a0a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * [Changed] Buttons that appeared in the past only via hovering are now always displayed (was not working well, maybe additional rework in future) [#155](https://github.com/TheAxelander/OpenBudgeteer/issues/155) * [Changed] More responsive navigation bar [#175](https://github.com/TheAxelander/OpenBudgeteer/issues/175) * [Fixed] UI alignment for large numbers [#189](https://github.com/TheAxelander/OpenBudgeteer/issues/189) +* [Fixed] Mapping Rules using the Account Name instead of Account Id [#199](https://github.com/TheAxelander/OpenBudgeteer/pull/199) Thanks [Lucaber](https://github.com/Lucaber) ### 1.7.1 (2023-10-16) From fbdaa77b83c4064641d441f398cdccd82ff404b4 Mon Sep 17 00:00:00 2001 From: Luca Berneking Date: Thu, 2 Nov 2023 22:09:28 +0100 Subject: [PATCH 12/57] Fix adding a mapping rule to an existing RuleSet Adding a new mapping rule to an existing rule set failed due to the missing `BucketRuleSetId` in the new mapping rule. ``` info: 11/2/2023 21:57:07.541 RelationalEventId.CommandExecuted[20101] (Microsoft.EntityFrameworkCore.Database.Command) Executed DbCommand (0ms) [Parameters=[@p0='5218bcea-c96c-4278-8ab1-153b3bc26ec0', @p1='37f1851c-2100-4350-8785-2f3e736a2fc3', @p2='1', @p3='1', @p4='foo' (Nullable = false) (Size = 3)], CommandType='Text', CommandTimeout='30'] INSERT INTO "MappingRule" ("MappingRuleId", "BucketRuleSetId", "ComparisionField", "ComparisionType", "ComparisionValue") VALUES (@p0, @p1, @p2, @p3, @p4); fail: 11/2/2023 21:57:07.542 RelationalEventId.CommandError[20102] (Microsoft.EntityFrameworkCore.Database.Command) Failed executing DbCommand (0ms) [Parameters=[@p0='a54fa405-376d-4c79-acd4-4851e1d68100', @p1='00000000-0000-0000-0000-000000000000', @p2='2', @p3='1', @p4='asd' (Nullable = false) (Size = 3)], CommandType='Text', CommandTimeout='30'] INSERT INTO "MappingRule" ("MappingRuleId", "BucketRuleSetId", "ComparisionField", "ComparisionType", "ComparisionValue") VALUES (@p0, @p1, @p2, @p3, @p4); fail: 11/2/2023 21:57:07.542 CoreEventId.SaveChangesFailed[10000] (Microsoft.EntityFrameworkCore.Update) An exception occurred in the database while saving changes for context type 'OpenBudgeteer.Data.DatabaseContext'. Microsoft.EntityFrameworkCore.DbUpdateException: An error occurred while saving the entity changes. See the inner exception for details. ---> Microsoft.Data.Sqlite.SqliteException (0x80004005): SQLite Error 19: 'FOREIGN KEY constraint failed'. ``` --- .../ViewModels/ItemViewModels/RuleSetViewModelItem.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/OpenBudgeteer.Core/ViewModels/ItemViewModels/RuleSetViewModelItem.cs b/OpenBudgeteer.Core/ViewModels/ItemViewModels/RuleSetViewModelItem.cs index e60dff4..133ef03 100644 --- a/OpenBudgeteer.Core/ViewModels/ItemViewModels/RuleSetViewModelItem.cs +++ b/OpenBudgeteer.Core/ViewModels/ItemViewModels/RuleSetViewModelItem.cs @@ -168,10 +168,6 @@ public ViewModelOperationResult CreateUpdateRuleSetItem() // CREATE if (dbContext.CreateBucketRuleSet(RuleSet) == 0) throw new Exception("Rule could not be created in database."); - foreach (var mappingRule in MappingRules) - { - mappingRule.MappingRule.BucketRuleSetId = RuleSet.BucketRuleSetId; - } } else { @@ -180,15 +176,13 @@ public ViewModelOperationResult CreateUpdateRuleSetItem() i.BucketRuleSetId == RuleSet.BucketRuleSetId)); dbContext.UpdateBucketRuleSet(RuleSet); - foreach (var mappingRule in MappingRules) - { - mappingRule.GenerateRuleOutput(); - } } foreach (var mappingRuleViewModelItem in MappingRules) { mappingRuleViewModelItem.MappingRule.MappingRuleId = Guid.Empty; + mappingRuleViewModelItem.MappingRule.BucketRuleSetId = RuleSet.BucketRuleSetId; + mappingRuleViewModelItem.GenerateRuleOutput(); } dbContext.CreateMappingRules(MappingRules .Select(i => i.MappingRule) From d20c9f89c43e973ceeb5940e8ebbb5f06ef263bb Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Fri, 10 Nov 2023 22:58:24 +0100 Subject: [PATCH 13/57] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 106a0a2..30d2def 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * [Changed] More responsive navigation bar [#175](https://github.com/TheAxelander/OpenBudgeteer/issues/175) * [Fixed] UI alignment for large numbers [#189](https://github.com/TheAxelander/OpenBudgeteer/issues/189) * [Fixed] Mapping Rules using the Account Name instead of Account Id [#199](https://github.com/TheAxelander/OpenBudgeteer/pull/199) Thanks [Lucaber](https://github.com/Lucaber) +* [Fixed] Adding a Mapping Rule to an existing Rule Set failed [#200](https://github.com/TheAxelander/OpenBudgeteer/pull/200) Thanks [Lucaber](https://github.com/Lucaber) ### 1.7.1 (2023-10-16) From 34c99f9208ff7735cddc73c9b523603985b5bfcd Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Fri, 10 Nov 2023 23:02:03 +0100 Subject: [PATCH 14/57] Implemented Repository pattern #139 and first ViewModel refactoring #195 --- .../HostedDatabaseMigrator.cs | 6 +- .../OpenBudgeteer.Blazor.csproj | 7 +- OpenBudgeteer.Blazor/Pages/Account.razor | 91 +-- OpenBudgeteer.Blazor/Pages/Account.razor.cs | 90 ++ OpenBudgeteer.Blazor/Pages/Bucket.razor | 194 +---- OpenBudgeteer.Blazor/Pages/Bucket.razor.cs | 173 ++++ .../Pages/DataConsistency.razor | 23 +- .../Pages/DataConsistency.razor.cs | 24 + OpenBudgeteer.Blazor/Pages/Import.razor | 307 +------ OpenBudgeteer.Blazor/Pages/Import.razor.cs | 313 +++++++ OpenBudgeteer.Blazor/Pages/Index.razor | 35 +- OpenBudgeteer.Blazor/Pages/Index.razor.cs | 35 + OpenBudgeteer.Blazor/Pages/Report.razor | 24 - OpenBudgeteer.Blazor/Pages/Report.razor.cs | 32 + OpenBudgeteer.Blazor/Pages/Rules.razor | 121 +-- OpenBudgeteer.Blazor/Pages/Rules.razor.cs | 118 +++ OpenBudgeteer.Blazor/Pages/Transaction.razor | 186 +---- .../Pages/Transaction.razor.cs | 184 +++++ OpenBudgeteer.Blazor/Pages/_Host.cshtml | 1 - OpenBudgeteer.Blazor/Pages/_Layout.cshtml | 1 - OpenBudgeteer.Blazor/Program.cs | 4 - .../Shared/BucketDetailsDialog.razor | 10 +- .../Shared/BucketSelectDialog.razor | 11 +- .../Shared/DeleteConfirmationDialog.razor | 7 +- .../Shared/EditAccountDialog.razor | 6 +- .../Shared/EditBucketDialog.razor | 45 +- .../Shared/ErrorMessageDialog.razor | 5 +- OpenBudgeteer.Blazor/Shared/InfoDialog.razor | 4 +- OpenBudgeteer.Blazor/Shared/MainLayout.razor | 2 +- .../Shared/NewBucketGroupDialog.razor | 7 +- .../Shared/RecurringTransactionDialog.razor | 37 +- .../Shared/TransactionDialog.razor | 12 +- .../Shared/YearMonthSelector.razor | 5 +- OpenBudgeteer.Blazor/Startup.cs | 15 +- .../BlazorBucketStatisticsViewModel.cs | 33 +- ...wModel.cs => BlazorReportPageViewModel.cs} | 167 ++-- OpenBudgeteer.Contracts/Models/Account.cs | 27 - .../Models/BankTransaction.cs | 61 -- OpenBudgeteer.Contracts/Models/BaseObject.cs | 26 - OpenBudgeteer.Contracts/Models/Bucket.cs | 70 -- OpenBudgeteer.Contracts/Models/BucketGroup.cs | 29 - .../Models/BucketMovement.cs | 54 -- .../Models/BucketRuleSet.cs | 44 - .../Models/BucketVersion.cs | 139 ---- .../Models/BudgetedTransaction.cs | 53 -- .../Models/ImportProfile.cs | 173 ---- .../OpenBudgeteer.Core.Data.Contracts.csproj | 13 + .../Repositories/IAccountRepository.cs | 8 + .../IBankTransactionRepository.cs | 8 + .../Repositories/IBaseRepository.cs | 17 + .../Repositories/IBucketGroupRepository.cs | 8 + .../Repositories/IBucketMovementRepository.cs | 8 + .../Repositories/IBucketRepository.cs | 8 + .../Repositories/IBucketRuleSetRepository.cs | 8 + .../Repositories/IBucketVersionRepository.cs | 8 + .../IBudgetedTransactionRepository.cs | 8 + .../Repositories/IImportProfileRepository.cs | 8 + .../Repositories/IMappingRuleRepository.cs | 8 + .../IRecurringBankTransactionRepository.cs | 8 + .../Repositories/IRepositoryManager.cs | 16 + .../Services/IAccountService.cs | 9 + .../Services/IBankTransactionService.cs | 13 + .../Services/IBaseService.cs | 14 + .../Services/IBucketGroupService.cs | 11 + .../Services/IBucketMovementService.cs | 10 + .../Services/IBucketRuleSetService.cs | 10 + .../Services/IBucketService.cs | 17 + .../Services/IBudgetedTransactionService.cs | 18 + .../Services/IImportProfileService.cs | 8 + .../IRecurringBankTransactionService.cs | 9 + .../Services/IServiceManager.cs | 14 + .../DatabaseContext.cs | 22 + .../Models/Account.cs | 15 + .../Models/BankTransaction.cs | 25 + .../Models/Bucket.cs | 30 + .../Models/BucketGroup.cs | 16 + .../Models/BucketMovement.cs | 21 + .../Models/BucketRuleSet.cs | 21 + .../Models/BucketVersion.cs | 34 + .../Models/BudgetedTransaction.cs | 24 + .../Models/IEntity.cs | 6 + .../Models/ImportProfile.cs | 47 ++ .../Models/MappingRule.cs | 56 +- .../Models/RecurringBankTransaction.cs | 93 +-- .../OpenBudgeteer.Core.Data.Entities.csproj | 13 + .../20200605093534_InitialCreate.Designer.cs | 6 +- .../20200605093534_InitialCreate.cs | 2 +- ...0200608152707_DecimalPrecision.Designer.cs | 6 +- .../20200608152707_DecimalPrecision.cs | 2 +- ...00612082229_FixedBucketVersion.Designer.cs | 6 +- .../20200612082229_FixedBucketVersion.cs | 2 +- ...04_DefaultIncomeTransferBucket.Designer.cs | 6 +- ...00622121904_DefaultIncomeTransferBucket.cs | 2 +- .../20200701071320_BucketColor.Designer.cs | 6 +- .../20200701071320_BucketColor.cs | 2 +- ...0200701133458_DateTimeDataType.Designer.cs | 6 +- .../20200701133458_DateTimeDataType.cs | 2 +- ...4081215_ImportProfileDelimiter.Designer.cs | 6 +- .../20200704081215_ImportProfileDelimiter.cs | 2 +- ..._ImportProfileDateNumberFormat.Designer.cs | 6 +- ...707141613_ImportProfileDateNumberFormat.cs | 2 +- .../20200723111131_BucketNotes.Designer.cs | 6 +- .../20200723111131_BucketNotes.cs | 2 +- ...2402_AutomaticBucketAssignment.Designer.cs | 6 +- ...0200822152402_AutomaticBucketAssignment.cs | 2 +- ...20213195537_ImportCreditColumn.Designer.cs | 3 +- .../20220213195537_ImportCreditColumn.cs | 2 +- ...03950_RecurringBankTransaction.Designer.cs | 10 +- ...20220625103950_RecurringBankTransaction.cs | 8 +- ...ImportProfileAdditionalSetting.Designer.cs | 10 +- ...25200805_ImportProfileAdditionalSetting.cs | 6 +- .../20230211161733_GuidKeys.Designer.cs | 10 +- .../20230211161733_GuidKeys.cs | 8 +- ...48_CleanupGuidMigrationColumns.Designer.cs | 10 +- ...30211165848_CleanupGuidMigrationColumns.cs | 8 +- .../20230215072945_AddForeignKey.Designer.cs | 10 +- .../20230215072945_AddForeignKey.cs | 6 +- .../DatabaseServiceModelSnapshot.cs | 3 +- ...udgeteer.Core.Data.MySql.Migrations.csproj | 4 +- .../20230509101553_InitialCreate.Designer.cs | 63 +- .../20230509101553_InitialCreate.cs | 2 +- .../20230509110446_InitialData.Designer.cs | 63 +- .../20230509110446_InitialData.cs | 2 +- .../DatabaseContextModelSnapshot.cs | 63 +- ...eteer.Core.Data.Postgres.Migrations.csproj | 4 +- .../AccountRepository.cs | 12 + .../BankTransactionRepository.cs | 31 + .../BaseRepository.cs | 61 ++ .../BucketGroupRepository.cs | 27 + .../BucketMovementRepository.cs | 12 + .../BucketRepository.cs | 30 + .../BucketRuleSetRepository.cs | 31 + .../BucketVersionRepository.cs | 12 + .../BudgetedTransactionRepository.cs | 31 + .../ImportProfileRepository.cs | 31 + .../MappingRuleRepository.cs | 12 + .../OpenBudgeteer.Core.Data.Repository.csproj | 13 + .../RecurringBankTransactionRepository.cs | 31 + .../AccountService.cs | 83 ++ .../BankTransactionService.cs | 183 +++++ .../BaseService.cs | 125 +++ .../BucketGroupService.cs | 215 +++++ .../BucketMovementService.cs | 60 ++ .../BucketRuleSetService.cs | 156 ++++ .../BucketService.cs | 404 +++++++++ .../BudgetedTransactionService.cs | 167 ++++ .../ImportProfileService.cs | 16 + .../OpenBudgeteer.Core.Data.Services.csproj | 15 + .../RecurringBankTransactionService.cs | 99 +++ .../ServiceManager.cs | 42 + .../20200925091603_InitialCreate.Designer.cs | 3 +- .../20200925091603_InitialCreate.cs | 2 +- ...200925091907_AddInitialRecords.Designer.cs | 3 +- .../20200925091907_AddInitialRecords.cs | 2 +- ...20213195523_ImportCreditColumn.Designer.cs | 3 +- .../20220213195523_ImportCreditColumn.cs | 2 +- ...04034_RecurringBankTransaction.Designer.cs | 3 +- ...20220625104034_RecurringBankTransaction.cs | 2 +- ...ImportProfileAdditionalSetting.Designer.cs | 3 +- ...25200835_ImportProfileAdditionalSetting.cs | 2 +- .../20230211163815_GuidKeysStep1.Designer.cs | 3 +- .../20230211163815_GuidKeysStep1.cs | 2 +- .../20230211163906_GuidKeysStep2.Designer.cs | 3 +- .../20230211163906_GuidKeysStep2.cs | 2 +- .../20230211164007_GuidKeysStep3.Designer.cs | 3 +- .../20230211164007_GuidKeysStep3.cs | 2 +- .../20230211165645_GuidKeysStep4.Designer.cs | 3 +- .../20230211165645_GuidKeysStep4.cs | 2 +- .../20230215072958_AddForeignKey.Designer.cs | 3 +- .../20230215072958_AddForeignKey.cs | 2 +- ...dgeteer.Core.Data.Sqlite.Migrations.csproj | 4 +- .../SqliteDatabaseContextModelSnapshot.cs | 3 +- .../ConfigurationKeyConstants.cs | 2 +- .../DatabaseInitializationExtensions.cs | 7 +- .../DbContextOptionsFactory.cs | 13 +- .../DesignTimeDbContext.cs | 3 +- .../Initialization/DemoDataGenerator.cs | 203 ++--- .../Initialization/IDatabaseInitializer.cs | 2 +- .../MariaDbDatabaseInitializer.cs | 2 +- .../Initialization/NoOpDatabaseInitializer.cs | 2 +- .../PostgresDatabaseInitializer.cs | 2 +- .../OnlineChecker/IDatabaseOnlineChecker.cs | 2 +- .../OnlineChecker/NoopOnlineChecker.cs | 2 +- .../OnlineChecker/PingPortOnlineChecker.cs | 2 +- .../OnlineChecker/PostgresOnlineChecker.cs | 2 +- .../OpenBudgeteer.Core.Data.csproj | 10 +- OpenBudgeteer.Core.Test/DbConnector.cs | 44 - .../Extension/DeleteAllExtension.cs | 19 + .../OpenBudgeteer.Core.Test.csproj | 9 +- OpenBudgeteer.Core.Test/TestServiceManager.cs | 116 +++ .../AccountViewModelIsolatedTest.cs | 36 +- .../ViewModelTest/AccountViewModelTest.cs | 57 +- .../ViewModelTest/BaseTest.cs | 20 + .../BucketViewModelIsolatedTest.cs | 104 +-- .../ViewModelTest/BucketViewModelTest.cs | 770 +++++++++--------- .../ViewModelTest/ImportDataViewModelTest.cs | 581 +++++++------ .../ViewModelTest/TransactionViewModelTest.cs | 170 ++-- .../YearMonthSelectorViewModelTest.cs | 14 +- .../Common/CsvBankTransactionMapping.cs | 126 +++ .../Common}/DataConsistencyCheckResult.cs | 2 +- .../Common/EventClasses/AmountChangedArgs.cs | 8 +- .../DeleteAssignmentRequestArgs.cs | 8 +- .../Extensions/DuplicateMatchComparer.cs | 25 + .../Common/Extensions/StringValueAttribute.cs | 2 +- .../Common/Extensions/TransactionFilter.cs | 18 + .../Common/ParsedBankTransaction.cs | 23 + OpenBudgeteer.Core/OpenBudgeteer.Core.csproj | 5 +- .../ViewModels/AccountViewModel.cs | 96 --- .../ViewModels/BucketViewModel.cs | 447 ---------- .../EntityViewModels/AccountViewModel.cs | 122 +++ .../BucketGroupViewModel.cs} | 93 +-- .../EntityViewModels/BucketViewModel.cs | 507 ++++++++++++ .../EntityViewModels/MappingRuleViewModel.cs | 30 + .../PartialBucketViewModel.cs | 131 +++ .../RecurringTransactionViewModel.cs | 317 +++++++ .../EntityViewModels/RuleSetViewModel.cs | 218 +++++ .../EntityViewModels/TransactionViewModel.cs | 561 +++++++++++++ .../{ => Helper}/BucketDetailsViewModel.cs | 106 +-- .../Helper/BucketListingViewModel.cs | 105 +++ .../RecurringTransactionHandlerViewModel.cs} | 49 +- .../Helper/TransactionListingViewModel.cs | 139 ++++ .../YearMonthSelectorViewModel.cs | 24 +- .../ItemViewModels/AccountViewModelItem.cs | 102 --- .../ItemViewModels/BucketViewModelItem.cs | 746 ----------------- .../MappingRuleViewModelItem.cs | 61 -- ...onthlyBucketExpensesReportViewModelItem.cs | 38 - .../PartialBucketViewModelItem.cs | 135 --- .../RecurringTransactionViewModelItem.cs | 317 ------- .../ItemViewModels/RuleSetViewModelItem.cs | 214 ----- .../TransactionViewModelItem.cs | 590 -------------- .../PageViewModels/AccountPageViewModel.cs | 62 ++ .../PageViewModels/BucketPageViewModel.cs | 333 ++++++++ .../DataConsistencyPageViewModel.cs} | 176 ++-- .../ImportPageViewModel.cs} | 277 ++----- .../PageViewModels/ReportPageViewModel.cs | 262 ++++++ .../RulesPageViewModel.cs} | 101 ++- .../TransactionPageViewModel.cs | 252 ++++++ .../ViewModels/ReportViewModel.cs | 266 ------ .../ViewModels/TransactionViewModel.cs | 423 ---------- .../ViewModels/ViewModelBase.cs | 14 +- OpenBudgeteer.Data/DatabaseContext.cs | 387 --------- OpenBudgeteer.sln | 36 +- 242 files changed, 8571 insertions(+), 7609 deletions(-) create mode 100644 OpenBudgeteer.Blazor/Pages/Account.razor.cs create mode 100644 OpenBudgeteer.Blazor/Pages/Bucket.razor.cs create mode 100644 OpenBudgeteer.Blazor/Pages/DataConsistency.razor.cs create mode 100644 OpenBudgeteer.Blazor/Pages/Import.razor.cs create mode 100644 OpenBudgeteer.Blazor/Pages/Index.razor.cs create mode 100644 OpenBudgeteer.Blazor/Pages/Report.razor.cs create mode 100644 OpenBudgeteer.Blazor/Pages/Rules.razor.cs create mode 100644 OpenBudgeteer.Blazor/Pages/Transaction.razor.cs rename OpenBudgeteer.Blazor/ViewModels/{BlazorReportViewModel.cs => BlazorReportPageViewModel.cs} (71%) delete mode 100644 OpenBudgeteer.Contracts/Models/Account.cs delete mode 100644 OpenBudgeteer.Contracts/Models/BankTransaction.cs delete mode 100644 OpenBudgeteer.Contracts/Models/BaseObject.cs delete mode 100644 OpenBudgeteer.Contracts/Models/Bucket.cs delete mode 100644 OpenBudgeteer.Contracts/Models/BucketGroup.cs delete mode 100644 OpenBudgeteer.Contracts/Models/BucketMovement.cs delete mode 100644 OpenBudgeteer.Contracts/Models/BucketRuleSet.cs delete mode 100644 OpenBudgeteer.Contracts/Models/BucketVersion.cs delete mode 100644 OpenBudgeteer.Contracts/Models/BudgetedTransaction.cs delete mode 100644 OpenBudgeteer.Contracts/Models/ImportProfile.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/OpenBudgeteer.Core.Data.Contracts.csproj create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IAccountRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IBankTransactionRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IBaseRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IBucketGroupRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IBucketMovementRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IBucketRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IBucketRuleSetRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IBucketVersionRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IBudgetedTransactionRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IImportProfileRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IMappingRuleRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IRecurringBankTransactionRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Repositories/IRepositoryManager.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Services/IAccountService.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Services/IBankTransactionService.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Services/IBaseService.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Services/IBucketGroupService.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Services/IBucketMovementService.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Services/IBucketRuleSetService.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Services/IBucketService.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Services/IBudgetedTransactionService.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Services/IImportProfileService.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Services/IRecurringBankTransactionService.cs create mode 100644 OpenBudgeteer.Core.Data.Contracts/Services/IServiceManager.cs create mode 100644 OpenBudgeteer.Core.Data.Entities/DatabaseContext.cs create mode 100644 OpenBudgeteer.Core.Data.Entities/Models/Account.cs create mode 100644 OpenBudgeteer.Core.Data.Entities/Models/BankTransaction.cs create mode 100644 OpenBudgeteer.Core.Data.Entities/Models/Bucket.cs create mode 100644 OpenBudgeteer.Core.Data.Entities/Models/BucketGroup.cs create mode 100644 OpenBudgeteer.Core.Data.Entities/Models/BucketMovement.cs create mode 100644 OpenBudgeteer.Core.Data.Entities/Models/BucketRuleSet.cs create mode 100644 OpenBudgeteer.Core.Data.Entities/Models/BucketVersion.cs create mode 100644 OpenBudgeteer.Core.Data.Entities/Models/BudgetedTransaction.cs create mode 100644 OpenBudgeteer.Core.Data.Entities/Models/IEntity.cs create mode 100644 OpenBudgeteer.Core.Data.Entities/Models/ImportProfile.cs rename {OpenBudgeteer.Contracts => OpenBudgeteer.Core.Data.Entities}/Models/MappingRule.cs (59%) rename {OpenBudgeteer.Contracts => OpenBudgeteer.Core.Data.Entities}/Models/RecurringBankTransaction.cs (51%) create mode 100644 OpenBudgeteer.Core.Data.Entities/OpenBudgeteer.Core.Data.Entities.csproj rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200605093534_InitialCreate.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200605093534_InitialCreate.cs (99%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200608152707_DecimalPrecision.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200608152707_DecimalPrecision.cs (97%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200612082229_FixedBucketVersion.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200612082229_FixedBucketVersion.cs (90%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200622121904_DefaultIncomeTransferBucket.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200622121904_DefaultIncomeTransferBucket.cs (95%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200701071320_BucketColor.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200701071320_BucketColor.cs (90%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200701133458_DateTimeDataType.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200701133458_DateTimeDataType.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200704081215_ImportProfileDelimiter.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200704081215_ImportProfileDelimiter.cs (94%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200707141613_ImportProfileDateNumberFormat.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200707141613_ImportProfileDateNumberFormat.cs (93%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200723111131_BucketNotes.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200723111131_BucketNotes.cs (90%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200822152402_AutomaticBucketAssignment.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20200822152402_AutomaticBucketAssignment.cs (97%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20220213195537_ImportCreditColumn.Designer.cs (99%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20220213195537_ImportCreditColumn.cs (99%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20220625103950_RecurringBankTransaction.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20220625103950_RecurringBankTransaction.cs (95%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20221125200805_ImportProfileAdditionalSetting.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20221125200805_ImportProfileAdditionalSetting.cs (94%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20230211161733_GuidKeys.Designer.cs (99%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20230211161733_GuidKeys.cs (99%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20230211165848_CleanupGuidMigrationColumns.Designer.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20230211165848_CleanupGuidMigrationColumns.cs (99%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20230215072945_AddForeignKey.Designer.cs (99%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/20230215072945_AddForeignKey.cs (98%) rename {OpenBudgeteer.Data.MySql.Migrations => OpenBudgeteer.Core.Data.MySql.Migrations}/DatabaseServiceModelSnapshot.cs (99%) rename OpenBudgeteer.Data.MySql.Migrations/OpenBudgeteer.Data.MySql.Migrations.csproj => OpenBudgeteer.Core.Data.MySql.Migrations/OpenBudgeteer.Core.Data.MySql.Migrations.csproj (85%) rename {OpenBudgeteer.Data.Postgres.Migrations => OpenBudgeteer.Core.Data.Postgres.Migrations}/20230509101553_InitialCreate.Designer.cs (87%) rename {OpenBudgeteer.Data.Postgres.Migrations => OpenBudgeteer.Core.Data.Postgres.Migrations}/20230509101553_InitialCreate.cs (99%) rename {OpenBudgeteer.Data.Postgres.Migrations => OpenBudgeteer.Core.Data.Postgres.Migrations}/20230509110446_InitialData.Designer.cs (87%) rename {OpenBudgeteer.Data.Postgres.Migrations => OpenBudgeteer.Core.Data.Postgres.Migrations}/20230509110446_InitialData.cs (97%) rename {OpenBudgeteer.Data.Postgres.Migrations => OpenBudgeteer.Core.Data.Postgres.Migrations}/DatabaseContextModelSnapshot.cs (87%) rename OpenBudgeteer.Data.Postgres.Migrations/OpenBudgeteer.Data.Postgres.Migrations.csproj => OpenBudgeteer.Core.Data.Postgres.Migrations/OpenBudgeteer.Core.Data.Postgres.Migrations.csproj (85%) create mode 100644 OpenBudgeteer.Core.Data.Repository/AccountRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Repository/BankTransactionRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Repository/BaseRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Repository/BucketMovementRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Repository/BucketRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Repository/BucketRuleSetRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Repository/BucketVersionRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Repository/BudgetedTransactionRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Repository/ImportProfileRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Repository/MappingRuleRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Repository/OpenBudgeteer.Core.Data.Repository.csproj create mode 100644 OpenBudgeteer.Core.Data.Repository/RecurringBankTransactionRepository.cs create mode 100644 OpenBudgeteer.Core.Data.Services/AccountService.cs create mode 100644 OpenBudgeteer.Core.Data.Services/BankTransactionService.cs create mode 100644 OpenBudgeteer.Core.Data.Services/BaseService.cs create mode 100644 OpenBudgeteer.Core.Data.Services/BucketGroupService.cs create mode 100644 OpenBudgeteer.Core.Data.Services/BucketMovementService.cs create mode 100644 OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs create mode 100644 OpenBudgeteer.Core.Data.Services/BucketService.cs create mode 100644 OpenBudgeteer.Core.Data.Services/BudgetedTransactionService.cs create mode 100644 OpenBudgeteer.Core.Data.Services/ImportProfileService.cs create mode 100644 OpenBudgeteer.Core.Data.Services/OpenBudgeteer.Core.Data.Services.csproj create mode 100644 OpenBudgeteer.Core.Data.Services/RecurringBankTransactionService.cs create mode 100644 OpenBudgeteer.Core.Data.Services/ServiceManager.cs rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20200925091603_InitialCreate.Designer.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20200925091603_InitialCreate.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20200925091907_AddInitialRecords.Designer.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20200925091907_AddInitialRecords.cs (95%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20220213195523_ImportCreditColumn.Designer.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20220213195523_ImportCreditColumn.cs (91%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20220625104034_RecurringBankTransaction.Designer.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20220625104034_RecurringBankTransaction.cs (96%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20221125200835_ImportProfileAdditionalSetting.Designer.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20221125200835_ImportProfileAdditionalSetting.cs (97%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20230211163815_GuidKeysStep1.Designer.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20230211163815_GuidKeysStep1.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20230211163906_GuidKeysStep2.Designer.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20230211163906_GuidKeysStep2.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20230211164007_GuidKeysStep3.Designer.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20230211164007_GuidKeysStep3.cs (96%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20230211165645_GuidKeysStep4.Designer.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20230211165645_GuidKeysStep4.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20230215072958_AddForeignKey.Designer.cs (99%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/20230215072958_AddForeignKey.cs (99%) rename OpenBudgeteer.Data.Sqlite.Migrations/OpenBudgeteer.Data.Sqlite.Migrations.csproj => OpenBudgeteer.Core.Data.Sqlite.Migrations/OpenBudgeteer.Core.Data.Sqlite.Migrations.csproj (83%) rename {OpenBudgeteer.Data.Sqlite.Migrations => OpenBudgeteer.Core.Data.Sqlite.Migrations}/SqliteDatabaseContextModelSnapshot.cs (99%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/ConfigurationKeyConstants.cs (96%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/DatabaseInitializationExtensions.cs (93%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/DbContextOptionsFactory.cs (93%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/DesignTimeDbContext.cs (92%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/Initialization/DemoDataGenerator.cs (72%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/Initialization/IDatabaseInitializer.cs (79%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/Initialization/MariaDbDatabaseInitializer.cs (98%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/Initialization/NoOpDatabaseInitializer.cs (86%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/Initialization/PostgresDatabaseInitializer.cs (98%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/OnlineChecker/IDatabaseOnlineChecker.cs (83%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/OnlineChecker/NoopOnlineChecker.cs (83%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/OnlineChecker/PingPortOnlineChecker.cs (95%) rename {OpenBudgeteer.Data => OpenBudgeteer.Core.Data}/OnlineChecker/PostgresOnlineChecker.cs (98%) rename OpenBudgeteer.Data/OpenBudgeteer.Data.csproj => OpenBudgeteer.Core.Data/OpenBudgeteer.Core.Data.csproj (92%) delete mode 100644 OpenBudgeteer.Core.Test/DbConnector.cs create mode 100644 OpenBudgeteer.Core.Test/Extension/DeleteAllExtension.cs create mode 100644 OpenBudgeteer.Core.Test/TestServiceManager.cs create mode 100644 OpenBudgeteer.Core.Test/ViewModelTest/BaseTest.cs create mode 100644 OpenBudgeteer.Core/Common/CsvBankTransactionMapping.cs rename {OpenBudgeteer.Contracts/Models => OpenBudgeteer.Core/Common}/DataConsistencyCheckResult.cs (92%) create mode 100644 OpenBudgeteer.Core/Common/Extensions/DuplicateMatchComparer.cs create mode 100644 OpenBudgeteer.Core/Common/Extensions/TransactionFilter.cs create mode 100644 OpenBudgeteer.Core/Common/ParsedBankTransaction.cs delete mode 100644 OpenBudgeteer.Core/ViewModels/AccountViewModel.cs delete mode 100644 OpenBudgeteer.Core/ViewModels/BucketViewModel.cs create mode 100644 OpenBudgeteer.Core/ViewModels/EntityViewModels/AccountViewModel.cs rename OpenBudgeteer.Core/ViewModels/{ItemViewModels/BucketGroupViewModelItem.cs => EntityViewModels/BucketGroupViewModel.cs} (60%) create mode 100644 OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs create mode 100644 OpenBudgeteer.Core/ViewModels/EntityViewModels/MappingRuleViewModel.cs create mode 100644 OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs create mode 100644 OpenBudgeteer.Core/ViewModels/EntityViewModels/RecurringTransactionViewModel.cs create mode 100644 OpenBudgeteer.Core/ViewModels/EntityViewModels/RuleSetViewModel.cs create mode 100644 OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs rename OpenBudgeteer.Core/ViewModels/{ => Helper}/BucketDetailsViewModel.cs (74%) create mode 100644 OpenBudgeteer.Core/ViewModels/Helper/BucketListingViewModel.cs rename OpenBudgeteer.Core/ViewModels/{RecurringTransactionViewModel.cs => Helper/RecurringTransactionHandlerViewModel.cs} (62%) create mode 100644 OpenBudgeteer.Core/ViewModels/Helper/TransactionListingViewModel.cs rename OpenBudgeteer.Core/ViewModels/{ => Helper}/YearMonthSelectorViewModel.cs (81%) delete mode 100644 OpenBudgeteer.Core/ViewModels/ItemViewModels/AccountViewModelItem.cs delete mode 100644 OpenBudgeteer.Core/ViewModels/ItemViewModels/BucketViewModelItem.cs delete mode 100644 OpenBudgeteer.Core/ViewModels/ItemViewModels/MappingRuleViewModelItem.cs delete mode 100644 OpenBudgeteer.Core/ViewModels/ItemViewModels/MonthlyBucketExpensesReportViewModelItem.cs delete mode 100644 OpenBudgeteer.Core/ViewModels/ItemViewModels/PartialBucketViewModelItem.cs delete mode 100644 OpenBudgeteer.Core/ViewModels/ItemViewModels/RecurringTransactionViewModelItem.cs delete mode 100644 OpenBudgeteer.Core/ViewModels/ItemViewModels/RuleSetViewModelItem.cs delete mode 100644 OpenBudgeteer.Core/ViewModels/ItemViewModels/TransactionViewModelItem.cs create mode 100644 OpenBudgeteer.Core/ViewModels/PageViewModels/AccountPageViewModel.cs create mode 100644 OpenBudgeteer.Core/ViewModels/PageViewModels/BucketPageViewModel.cs rename OpenBudgeteer.Core/ViewModels/{DataConsistencyViewModel.cs => PageViewModels/DataConsistencyPageViewModel.cs} (62%) rename OpenBudgeteer.Core/ViewModels/{ImportDataViewModel.cs => PageViewModels/ImportPageViewModel.cs} (63%) create mode 100644 OpenBudgeteer.Core/ViewModels/PageViewModels/ReportPageViewModel.cs rename OpenBudgeteer.Core/ViewModels/{RulesViewModel.cs => PageViewModels/RulesPageViewModel.cs} (60%) create mode 100644 OpenBudgeteer.Core/ViewModels/PageViewModels/TransactionPageViewModel.cs delete mode 100644 OpenBudgeteer.Core/ViewModels/ReportViewModel.cs delete mode 100644 OpenBudgeteer.Core/ViewModels/TransactionViewModel.cs delete mode 100644 OpenBudgeteer.Data/DatabaseContext.cs diff --git a/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs b/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs index 5250b17..45bc337 100644 --- a/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs +++ b/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs @@ -4,9 +4,9 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; -using OpenBudgeteer.Data; -using OpenBudgeteer.Data.Initialization; -using OpenBudgeteer.Data.OnlineChecker; +using OpenBudgeteer.Core.Data.Entities; +using OpenBudgeteer.Core.Data.Initialization; +using OpenBudgeteer.Core.Data.OnlineChecker; namespace OpenBudgeteer.Blazor; diff --git a/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj b/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj index e5a2716..15e1ba4 100644 --- a/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj +++ b/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj @@ -6,6 +6,7 @@ false Linux OpenBudgeteer + enable @@ -22,9 +23,9 @@ - - - + + + diff --git a/OpenBudgeteer.Blazor/Pages/Account.razor b/OpenBudgeteer.Blazor/Pages/Account.razor index 4972068..a1aaeca 100644 --- a/OpenBudgeteer.Blazor/Pages/Account.razor +++ b/OpenBudgeteer.Blazor/Pages/Account.razor @@ -1,12 +1,6 @@ @page "/account" -@using OpenBudgeteer.Core.ViewModels -@using Microsoft.EntityFrameworkCore -@using OpenBudgeteer.Core.ViewModels.ItemViewModels @using System.Globalization -@using OpenBudgeteer.Core.Common -@using OpenBudgeteer.Data -@inject DbContextOptions DbContextOptions
@@ -35,8 +29,8 @@ Title="@_editAccountDialogTitle" DataContext="@_editAccountDialogDataContext" IsDialogVisible="@_isEditAccountModalDialogVisible" - OnSaveClickCallback="@(() => SaveChanges(_editAccountDialogDataContext))" - OnCancelClickCallback="@(() => CancelChanges())"/> + OnSaveClickCallback="@(() => SaveChanges(_editAccountDialogDataContext!))" + OnCancelClickCallback="@(CancelChanges)"/> - -@code { - AccountViewModel _dataContext; - TransactionViewModel _transactionModalDialogDataContext; - - bool _isEditAccountModalDialogVisible; - string _editAccountDialogTitle; - AccountViewModelItem _editAccountDialogDataContext; - - - bool _isTransactionModalDialogVisible; - bool _isTransactionModalDialogDataContextLoading; - - bool _isErrorModalDialogVisible; - string _errorModalDialogMessage; - - protected override void OnInitialized() - { - _dataContext = new AccountViewModel(DbContextOptions); - HandleResult(_dataContext.LoadData()); - } - - private void CreateNewAccount() - { - _editAccountDialogTitle = "New Account"; - _editAccountDialogDataContext = _dataContext.PrepareNewAccount(); - _isEditAccountModalDialogVisible = true; - } - - private void EditAccount(AccountViewModelItem account) - { - _editAccountDialogTitle = "Edit Account"; - _editAccountDialogDataContext = account; - _isEditAccountModalDialogVisible = true; - } - - - private void SaveChanges(AccountViewModelItem account) - { - _isEditAccountModalDialogVisible = false; - HandleResult(account.CreateUpdateAccount()); - } - - private void CancelChanges() - { - _isEditAccountModalDialogVisible = false; - HandleResult(_dataContext.LoadData()); - } - - private void CloseAccount(AccountViewModelItem account) - { - HandleResult(account.CloseAccount()); - } - - void HandleResult(ViewModelOperationResult result) - { - if (!result.IsSuccessful) - { - _errorModalDialogMessage = result.Message; - _isErrorModalDialogVisible = true; - } - if (result.ViewModelReloadRequired) - { - _dataContext.LoadData(); - StateHasChanged(); - } - } - - async void DisplayAccountTransactions(AccountViewModelItem account) - { - _isTransactionModalDialogVisible = true; - _isTransactionModalDialogDataContextLoading = true; - - _transactionModalDialogDataContext = new TransactionViewModel(DbContextOptions, new YearMonthSelectorViewModel()); - HandleResult(await _transactionModalDialogDataContext.LoadDataAsync(account.Account)); - - _isTransactionModalDialogDataContextLoading = false; - StateHasChanged(); - } -} + \ No newline at end of file diff --git a/OpenBudgeteer.Blazor/Pages/Account.razor.cs b/OpenBudgeteer.Blazor/Pages/Account.razor.cs new file mode 100644 index 0000000..95817ba --- /dev/null +++ b/OpenBudgeteer.Blazor/Pages/Account.razor.cs @@ -0,0 +1,90 @@ +using Microsoft.AspNetCore.Components; +using OpenBudgeteer.Core.Common; +using OpenBudgeteer.Core.Data.Contracts.Services; +using OpenBudgeteer.Core.ViewModels.EntityViewModels; +using OpenBudgeteer.Core.ViewModels.Helper; +using OpenBudgeteer.Core.ViewModels.PageViewModels; + +namespace OpenBudgeteer.Blazor.Pages; + +public partial class Account : ComponentBase +{ + [Inject] private IServiceManager ServiceManager { get; set; } = null!; + + private AccountPageViewModel _dataContext = null!; + private TransactionListingViewModel? _transactionModalDialogDataContext; + + private bool _isEditAccountModalDialogVisible; + private string _editAccountDialogTitle = string.Empty; + private AccountViewModel? _editAccountDialogDataContext; + + private bool _isTransactionModalDialogVisible; + private bool _isTransactionModalDialogDataContextLoading; + + private bool _isErrorModalDialogVisible; + private string _errorModalDialogMessage = string.Empty; + + protected override void OnInitialized() + { + _dataContext = new AccountPageViewModel(ServiceManager); + HandleResult(_dataContext.LoadData()); + } + + private void CreateNewAccount() + { + _editAccountDialogTitle = "New Account"; + _editAccountDialogDataContext = AccountViewModel.CreateEmpty(ServiceManager); + _isEditAccountModalDialogVisible = true; + } + + private void EditAccount(AccountViewModel account) + { + _editAccountDialogTitle = "Edit Account"; + _editAccountDialogDataContext = account; + _isEditAccountModalDialogVisible = true; + } + + + private void SaveChanges(AccountViewModel account) + { + _isEditAccountModalDialogVisible = false; + HandleResult(account.CreateUpdateAccount()); + } + + private void CancelChanges() + { + _isEditAccountModalDialogVisible = false; + HandleResult(_dataContext.LoadData()); + } + + private void CloseAccount(AccountViewModel account) + { + HandleResult(account.CloseAccount()); + } + + private void HandleResult(ViewModelOperationResult result) + { + if (!result.IsSuccessful) + { + _errorModalDialogMessage = result.Message; + _isErrorModalDialogVisible = true; + } + if (result.ViewModelReloadRequired) + { + _dataContext.LoadData(); + StateHasChanged(); + } + } + + private async void DisplayAccountTransactions(AccountViewModel account) + { + _isTransactionModalDialogVisible = true; + _isTransactionModalDialogDataContextLoading = true; + + _transactionModalDialogDataContext = new TransactionListingViewModel(ServiceManager); + HandleResult(await _transactionModalDialogDataContext.LoadDataAsync(account.Account)); + + _isTransactionModalDialogDataContextLoading = false; + StateHasChanged(); + } +} \ No newline at end of file diff --git a/OpenBudgeteer.Blazor/Pages/Bucket.razor b/OpenBudgeteer.Blazor/Pages/Bucket.razor index 4ca8ad6..a7d04a7 100644 --- a/OpenBudgeteer.Blazor/Pages/Bucket.razor +++ b/OpenBudgeteer.Blazor/Pages/Bucket.razor @@ -1,15 +1,6 @@ @page "/bucket" -@using OpenBudgeteer.Blazor.ViewModels -@using OpenBudgeteer.Core.ViewModels -@using OpenBudgeteer.Core.ViewModels.ItemViewModels -@using Microsoft.EntityFrameworkCore @using System.Drawing @using System.Globalization -@using OpenBudgeteer.Contracts.Models -@using OpenBudgeteer.Core.Common -@using OpenBudgeteer.Data -@inject DbContextOptions DbContextOptions -@inject YearMonthSelectorViewModel YearMonthDataContext + + + + + +
+ @if (Env.IsDevelopment()) + { + + An unhandled exception has occurred. See browser dev tools for details. + + } + else + { + + An error has occurred. This app may no longer respond until reloaded. + + } + Reload + 🗙 +
+ +
+
+ + App Icons by Icons8 + +
+
+ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj b/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj index 15e1ba4..0bbbba2 100644 --- a/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj +++ b/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 c146cdfd-f78c-4fb3-8be0-4e15e589371a false Linux @@ -11,14 +11,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/OpenBudgeteer.Blazor/Pages/_Host.cshtml b/OpenBudgeteer.Blazor/Pages/_Host.cshtml deleted file mode 100644 index 6ab39d7..0000000 --- a/OpenBudgeteer.Blazor/Pages/_Host.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@page "/" -@namespace OpenBudgeteer.Blazor.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@{ - Layout = "_Layout"; -} - - diff --git a/OpenBudgeteer.Blazor/Pages/_Layout.cshtml b/OpenBudgeteer.Blazor/Pages/_Layout.cshtml deleted file mode 100644 index 2345379..0000000 --- a/OpenBudgeteer.Blazor/Pages/_Layout.cshtml +++ /dev/null @@ -1,73 +0,0 @@ -@using Microsoft.AspNetCore.Components.Web -@using OpenBudgeteer.Core.Common; -@namespace OpenBudgeteer.Blazor.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - - - - - - - OpenBudgeteer - - - - - - - - - - - - @RenderBody() - -
- - An error has occurred. This application may no longer respond until reloaded. - - - An unhandled exception has occurred. See browser dev tools for details. - - Reload - 🗙 -
- -
-
- - App Icons by Icons8 - -
-
- - - - - - - - - - - - - - - - - - diff --git a/OpenBudgeteer.Blazor/Program.cs b/OpenBudgeteer.Blazor/Program.cs index 939bf0c..d11d58b 100644 --- a/OpenBudgeteer.Blazor/Program.cs +++ b/OpenBudgeteer.Blazor/Program.cs @@ -1,28 +1,60 @@ using System; -using Microsoft.AspNetCore.Hosting; +using System.Text; +using Microsoft.AspNetCore.Builder; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using OpenBudgeteer.Blazor; +using OpenBudgeteer.Core.Common; +using OpenBudgeteer.Core.Data; +using OpenBudgeteer.Core.Data.Contracts.Services; +using OpenBudgeteer.Core.Data.Entities; +using OpenBudgeteer.Core.Data.Services; +using OpenBudgeteer.Core.ViewModels.Helper; +using Tewr.Blazor.FileReader; -namespace OpenBudgeteer.Blazor; +const string APPSETTINGS_CULTURE = "APPSETTINGS_CULTURE"; +const string APPSETTINGS_THEME = "APPSETTINGS_THEME"; -public class Program +AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); +var builder = WebApplication.CreateBuilder(args); + +builder.Services.AddLocalization(); +builder.Services.AddRazorPages(); +builder.Services.AddRazorComponents() + .AddInteractiveServerComponents(); +builder.Services.AddFileReaderService(); +builder.Services.AddHostedService(); +builder.Services.AddDatabase(builder.Configuration); +builder.Services.AddScoped(x => new ServiceManager(x.GetRequiredService>())); +builder.Services.AddScoped(x => new YearMonthSelectorViewModel(x.GetRequiredService())); + +Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); // Required to read ANSI Text files + +var app = builder.Build(); + +if (!app.Environment.IsDevelopment()) { - public static void Main(string[] args) - { - AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); - CreateHostBuilder(args).Build().Run(); - } - - private static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureServices(service => - { - service.AddHostedService(); - }) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); - - + app.UseExceptionHandler("/Error"); + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); } + +app.UseHttpsRedirection(); +app.UseStaticFiles(); + +app.UseRequestLocalization(builder.Configuration.GetValue(APPSETTINGS_CULTURE, "en-US") ?? "en-US"); +AppSettings.Theme = builder.Configuration.GetValue(APPSETTINGS_THEME, "Default") ?? "Default"; + +//app.UseRouting(); +app.UseAntiforgery(); +/*app.UseEndpoints(endpoints => +{ + endpoints.MapRazorComponents().AddInteractiveServerRenderMode(); +});*/ +app.MapRazorComponents() + .AddInteractiveServerRenderMode(); + +app.Run(); + diff --git a/OpenBudgeteer.Blazor/Routes.razor b/OpenBudgeteer.Blazor/Routes.razor new file mode 100644 index 0000000..f2a6457 --- /dev/null +++ b/OpenBudgeteer.Blazor/Routes.razor @@ -0,0 +1,10 @@ + + + + + + +

Sorry, there's nothing at this address.

+ + + \ No newline at end of file diff --git a/OpenBudgeteer.Blazor/Startup.cs b/OpenBudgeteer.Blazor/Startup.cs deleted file mode 100644 index 9e52d36..0000000 --- a/OpenBudgeteer.Blazor/Startup.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System.Text; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using OpenBudgeteer.Core.Common; -using OpenBudgeteer.Core.Data; -using OpenBudgeteer.Core.Data.Contracts.Services; -using OpenBudgeteer.Core.Data.Entities; -using OpenBudgeteer.Core.Data.Services; -using OpenBudgeteer.Core.ViewModels.Helper; -using Tewr.Blazor.FileReader; - -namespace OpenBudgeteer.Blazor; - -public class Startup -{ - private const string APPSETTINGS_CULTURE = "APPSETTINGS_CULTURE"; - private const string APPSETTINGS_THEME = "APPSETTINGS_THEME"; - - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 - public void ConfigureServices(IServiceCollection services) - { - services.AddLocalization(); - services.AddRazorPages(); - services.AddServerSideBlazor(); - services.AddFileReaderService(); - services.AddDatabase(Configuration); - services.AddScoped(x => new ServiceManager(x.GetRequiredService>())); - services.AddScoped(x => new YearMonthSelectorViewModel(x.GetRequiredService())); - - Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); // Required to read ANSI Text files - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else - { - app.UseExceptionHandler("/Error"); - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. - app.UseHsts(); - } - - app.UseHttpsRedirection(); - app.UseStaticFiles(); - - app.UseRequestLocalization(Configuration.GetValue(APPSETTINGS_CULTURE, "en-US") ?? "en-US"); - AppSettings.Theme = Configuration.GetValue(APPSETTINGS_THEME, "Default") ?? "Default"; - - app.UseRouting(); - - app.UseEndpoints(endpoints => - { - endpoints.MapBlazorHub(); - endpoints.MapFallbackToPage("/_Host"); - }); - } -} diff --git a/OpenBudgeteer.Blazor/_Imports.razor b/OpenBudgeteer.Blazor/_Imports.razor index b901302..b32aa31 100644 --- a/OpenBudgeteer.Blazor/_Imports.razor +++ b/OpenBudgeteer.Blazor/_Imports.razor @@ -7,3 +7,4 @@ @using Microsoft.JSInterop @using OpenBudgeteer.Blazor @using OpenBudgeteer.Blazor.Shared +@using static Microsoft.AspNetCore.Components.Web.RenderMode diff --git a/OpenBudgeteer.Core.Data.Contracts/OpenBudgeteer.Core.Data.Contracts.csproj b/OpenBudgeteer.Core.Data.Contracts/OpenBudgeteer.Core.Data.Contracts.csproj index 006070f..f94b5e7 100644 --- a/OpenBudgeteer.Core.Data.Contracts/OpenBudgeteer.Core.Data.Contracts.csproj +++ b/OpenBudgeteer.Core.Data.Contracts/OpenBudgeteer.Core.Data.Contracts.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/OpenBudgeteer.Core.Data.Entities/OpenBudgeteer.Core.Data.Entities.csproj b/OpenBudgeteer.Core.Data.Entities/OpenBudgeteer.Core.Data.Entities.csproj index b8c1ecc..27b5a23 100644 --- a/OpenBudgeteer.Core.Data.Entities/OpenBudgeteer.Core.Data.Entities.csproj +++ b/OpenBudgeteer.Core.Data.Entities/OpenBudgeteer.Core.Data.Entities.csproj @@ -1,13 +1,13 @@ - net7.0 + net8.0 enable enable - + diff --git a/OpenBudgeteer.Core.Data.MySql.Migrations/OpenBudgeteer.Core.Data.MySql.Migrations.csproj b/OpenBudgeteer.Core.Data.MySql.Migrations/OpenBudgeteer.Core.Data.MySql.Migrations.csproj index bd5ac22..899b3af 100644 --- a/OpenBudgeteer.Core.Data.MySql.Migrations/OpenBudgeteer.Core.Data.MySql.Migrations.csproj +++ b/OpenBudgeteer.Core.Data.MySql.Migrations/OpenBudgeteer.Core.Data.MySql.Migrations.csproj @@ -1,19 +1,19 @@ - net7.0 + net8.0 disable enable ..\OpenBudgeteer.Data\bin\ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/OpenBudgeteer.Core.Data.Postgres.Migrations/OpenBudgeteer.Core.Data.Postgres.Migrations.csproj b/OpenBudgeteer.Core.Data.Postgres.Migrations/OpenBudgeteer.Core.Data.Postgres.Migrations.csproj index c6013ab..20cce74 100644 --- a/OpenBudgeteer.Core.Data.Postgres.Migrations/OpenBudgeteer.Core.Data.Postgres.Migrations.csproj +++ b/OpenBudgeteer.Core.Data.Postgres.Migrations/OpenBudgeteer.Core.Data.Postgres.Migrations.csproj @@ -1,19 +1,19 @@ - net7.0 + net8.0 disable enable ..\OpenBudgeteer.Data\bin\ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/OpenBudgeteer.Core.Data.Repository/OpenBudgeteer.Core.Data.Repository.csproj b/OpenBudgeteer.Core.Data.Repository/OpenBudgeteer.Core.Data.Repository.csproj index f43c5f4..e97872a 100644 --- a/OpenBudgeteer.Core.Data.Repository/OpenBudgeteer.Core.Data.Repository.csproj +++ b/OpenBudgeteer.Core.Data.Repository/OpenBudgeteer.Core.Data.Repository.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/OpenBudgeteer.Core.Data.Services/OpenBudgeteer.Core.Data.Services.csproj b/OpenBudgeteer.Core.Data.Services/OpenBudgeteer.Core.Data.Services.csproj index 0b53576..2e8129c 100644 --- a/OpenBudgeteer.Core.Data.Services/OpenBudgeteer.Core.Data.Services.csproj +++ b/OpenBudgeteer.Core.Data.Services/OpenBudgeteer.Core.Data.Services.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/OpenBudgeteer.Core.Data.Sqlite.Migrations/OpenBudgeteer.Core.Data.Sqlite.Migrations.csproj b/OpenBudgeteer.Core.Data.Sqlite.Migrations/OpenBudgeteer.Core.Data.Sqlite.Migrations.csproj index e4f4754..cdfb333 100644 --- a/OpenBudgeteer.Core.Data.Sqlite.Migrations/OpenBudgeteer.Core.Data.Sqlite.Migrations.csproj +++ b/OpenBudgeteer.Core.Data.Sqlite.Migrations/OpenBudgeteer.Core.Data.Sqlite.Migrations.csproj @@ -1,18 +1,18 @@ - net7.0 + net8.0 disable enable ..\OpenBudgeteer.Data\bin\ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/OpenBudgeteer.Core.Data/OpenBudgeteer.Core.Data.csproj b/OpenBudgeteer.Core.Data/OpenBudgeteer.Core.Data.csproj index 45a9b1a..72a4363 100644 --- a/OpenBudgeteer.Core.Data/OpenBudgeteer.Core.Data.csproj +++ b/OpenBudgeteer.Core.Data/OpenBudgeteer.Core.Data.csproj @@ -1,25 +1,25 @@ - net7.0 + net8.0 disable enable - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + + + + + + diff --git a/OpenBudgeteer.Core.Test/OpenBudgeteer.Core.Test.csproj b/OpenBudgeteer.Core.Test/OpenBudgeteer.Core.Test.csproj index f0345e9..7b4c800 100644 --- a/OpenBudgeteer.Core.Test/OpenBudgeteer.Core.Test.csproj +++ b/OpenBudgeteer.Core.Test/OpenBudgeteer.Core.Test.csproj @@ -6,7 +6,7 @@ 10 - net7.0 + net8.0 enable @@ -34,15 +34,15 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/OpenBudgeteer.Core.Test/ViewModelTest/BucketViewModelTest.cs b/OpenBudgeteer.Core.Test/ViewModelTest/BucketViewModelTest.cs index d569dd1..0ae4a1b 100644 --- a/OpenBudgeteer.Core.Test/ViewModelTest/BucketViewModelTest.cs +++ b/OpenBudgeteer.Core.Test/ViewModelTest/BucketViewModelTest.cs @@ -44,7 +44,7 @@ public async Task LoadDataAsync_CheckBucketGroupAssignedBuckets(List buc Name = bucketName, ColorCode = "Red", ValidFrom = new DateTime(2010, 1, 1), - CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } + BucketVersions = new List { new() { BucketType = 1, Version = 1 } } }; ServiceManager.BucketService.Create(newBucket); } @@ -90,7 +90,7 @@ public async Task LoadDataAsync_CheckBucketSorting(List bucketNamesUnsor Name = bucketName, ColorCode = "Red", ValidFrom = new DateTime(2010, 1, 1), - CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } + BucketVersions = new List { new() { BucketType = 1, Version = 1 } } }; ServiceManager.BucketService.Create(newBucket); } @@ -160,11 +160,14 @@ bool expectedBucketAvailable ValidFrom = bucketActiveSince, IsInactive = bucketIsInactive, IsInactiveFrom = bucketIsInActiveFrom, - CurrentVersion = new BucketVersion() + BucketVersions = new List { - Version = 1, - BucketType = 1, - ValidFrom = bucketActiveSince + new() + { + Version = 1, + BucketType = 1, + ValidFrom = bucketActiveSince + } } }; @@ -200,21 +203,21 @@ public async Task LoadDataAsync_CheckValidFromHandling() BucketGroupId = testBucketGroup.Id, Name = "Bucket Active Current Month", ValidFrom = new DateTime(2010, 1, 1), - CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } + BucketVersions = new List { new() { Version = 1, BucketType = 1 } } }; var testBucket2 = new Bucket { BucketGroupId = testBucketGroup.Id, Name = "Bucket Active Past", ValidFrom = new DateTime(2009, 1, 1), - CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } + BucketVersions = new List { new() { Version = 1, BucketType = 1 } } }; var testBucket3 = new Bucket { BucketGroupId = testBucketGroup.Id, Name = "Bucket Active Future", ValidFrom = new DateTime(2010, 2, 1), - CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } + BucketVersions = new List { new() { Version = 1, BucketType = 1 } } }; ServiceManager.BucketService.Create(testBucket1); @@ -259,14 +262,14 @@ public async Task LoadDataAsync_CheckCalculatedValues() BucketGroupId = testBucketGroup.Id, Name = "Bucket 1", ValidFrom = new DateTime(2010, 1, 1), - CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } + BucketVersions = new List { new() { Version = 1, BucketType = 1 } } }; var testBucket2 = new Bucket { BucketGroupId = testBucketGroup.Id, Name = "Bucket 2", ValidFrom = new DateTime(2010, 1, 1), - CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } + BucketVersions = new List { new() { Version = 1, BucketType = 1 } } }; ServiceManager.BucketService.Create(testBucket1); @@ -349,7 +352,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket with pending Want", ValidFrom = new DateTime(2010,1,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } + BucketVersions = new List + { + new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, + } }, new List(), new List(), @@ -360,7 +366,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket with fulfilled Want", ValidFrom = new DateTime(2010,1,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } + BucketVersions = new List + { + new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, + } }, new List(), new List @@ -374,7 +383,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket pending Want including expense", ValidFrom = new DateTime(2010,1,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } + BucketVersions = new List + { + new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, + } }, new List { @@ -388,7 +400,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket fulfilled Want including expense", ValidFrom = new DateTime(2010,1,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } + BucketVersions = new List + { + new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, + } }, new List { @@ -405,7 +420,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket with partial fulfilled Want", ValidFrom = new DateTime(2010,1,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } + BucketVersions = new List + { + new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, + } }, new List(), new List @@ -419,7 +437,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket with over fulfilled Want", ValidFrom = new DateTime(2010,1,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } + BucketVersions = new List + { + new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, + } }, new List(), new List @@ -470,7 +491,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, with Want", ValidFrom = new DateTime(2010,1,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) }, + } }, new List(), new List(), @@ -481,7 +505,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, without Want", ValidFrom = new DateTime(2010,1,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) }, + } }, new List(), new List @@ -495,7 +522,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, with Want", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, + } }, new List(), new List @@ -514,7 +544,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, without Want", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, + } }, new List(), new List @@ -534,7 +567,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, fulfilled target", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, + } }, new List(), new List @@ -553,7 +589,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, over-fulfilled target", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, + } }, new List(), new List @@ -572,7 +611,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, no input", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, + } }, new List(), new List(), @@ -583,7 +625,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, input not in sync", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, + } }, new List(), new List @@ -599,7 +644,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "100 every 3 months, with Want", ValidFrom = new DateTime(2010,1,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,3,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,3,1) }, + } }, new List(), new List(), @@ -610,7 +658,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "100 every 3 months, last month, with Want", ValidFrom = new DateTime(2009,11,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,1,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,1,1) }, + } }, new List(), new List @@ -625,7 +676,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "100 every 3 months, last month, input not in sync", ValidFrom = new DateTime(2009,11,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,1,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,1,1) }, + } }, new List(), new List @@ -640,7 +694,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, with expenses", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, + } }, new List { @@ -663,7 +720,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, 2nd year, last 6 months, with Want", ValidFrom = new DateTime(2008,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2009,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2009,6,1) }, + } }, new List { @@ -707,7 +767,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-12, no input", ValidFrom = new DateTime(2010,1,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) }, + } }, new List(), new List(), @@ -718,7 +781,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-12, input in current Month", ValidFrom = new DateTime(2010,1,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) }, + } }, new List(), new List @@ -732,7 +798,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-06, input in sync", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, + } }, new List(), new List @@ -751,7 +820,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-06, fulfilled target", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, + } }, new List(), new List @@ -770,7 +842,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-06, over-fulfilled target", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, + } }, new List(), new List @@ -789,7 +864,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-06, input not in sync", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, + } }, new List(), new List @@ -805,7 +883,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2009-12, target not reached", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2009,12,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2009,12,1) }, + } }, new List(), new List @@ -821,7 +902,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "30 until 2010-01, target reached, with expense in target month", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) }, + } }, new List { @@ -840,7 +924,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "30 until 2010-01, target reached, with lower expense in target month", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) }, + } }, new List { @@ -859,7 +946,10 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "30 until 2010-01, target reached, with higher expense in target month", ValidFrom = new DateTime(2009,7,1), - CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) } + BucketVersions = new List + { + new() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) }, + } }, new List { diff --git a/OpenBudgeteer.Core/OpenBudgeteer.Core.csproj b/OpenBudgeteer.Core/OpenBudgeteer.Core.csproj index 450f6f6..50f78df 100644 --- a/OpenBudgeteer.Core/OpenBudgeteer.Core.csproj +++ b/OpenBudgeteer.Core/OpenBudgeteer.Core.csproj @@ -1,17 +1,17 @@ - net7.0 + net8.0 enable - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/docker-compose.yml b/docker-compose.yml index 0c0f25d..cb4026d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,10 @@ version: "3" services: openbudgeteer: - image: openbudgeteer:alpha + image: openbudgeteer:pre-release container_name: openbudgeteer ports: - - 8081:80 + - 8081:8080 environment: - CONNECTION_PROVIDER=tempdb - APPSETTINGS_CULTURE=en-US From 9b5bab1971fe6b38871c76ff0c8189ba9d454024 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 26 Nov 2023 11:54:52 +0100 Subject: [PATCH 25/57] Fix Unit Tests --- .../ViewModelTest/BucketViewModelTest.cs | 170 +++++------------- 1 file changed, 40 insertions(+), 130 deletions(-) diff --git a/OpenBudgeteer.Core.Test/ViewModelTest/BucketViewModelTest.cs b/OpenBudgeteer.Core.Test/ViewModelTest/BucketViewModelTest.cs index 0ae4a1b..d569dd1 100644 --- a/OpenBudgeteer.Core.Test/ViewModelTest/BucketViewModelTest.cs +++ b/OpenBudgeteer.Core.Test/ViewModelTest/BucketViewModelTest.cs @@ -44,7 +44,7 @@ public async Task LoadDataAsync_CheckBucketGroupAssignedBuckets(List buc Name = bucketName, ColorCode = "Red", ValidFrom = new DateTime(2010, 1, 1), - BucketVersions = new List { new() { BucketType = 1, Version = 1 } } + CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } }; ServiceManager.BucketService.Create(newBucket); } @@ -90,7 +90,7 @@ public async Task LoadDataAsync_CheckBucketSorting(List bucketNamesUnsor Name = bucketName, ColorCode = "Red", ValidFrom = new DateTime(2010, 1, 1), - BucketVersions = new List { new() { BucketType = 1, Version = 1 } } + CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } }; ServiceManager.BucketService.Create(newBucket); } @@ -160,14 +160,11 @@ bool expectedBucketAvailable ValidFrom = bucketActiveSince, IsInactive = bucketIsInactive, IsInactiveFrom = bucketIsInActiveFrom, - BucketVersions = new List + CurrentVersion = new BucketVersion() { - new() - { - Version = 1, - BucketType = 1, - ValidFrom = bucketActiveSince - } + Version = 1, + BucketType = 1, + ValidFrom = bucketActiveSince } }; @@ -203,21 +200,21 @@ public async Task LoadDataAsync_CheckValidFromHandling() BucketGroupId = testBucketGroup.Id, Name = "Bucket Active Current Month", ValidFrom = new DateTime(2010, 1, 1), - BucketVersions = new List { new() { Version = 1, BucketType = 1 } } + CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } }; var testBucket2 = new Bucket { BucketGroupId = testBucketGroup.Id, Name = "Bucket Active Past", ValidFrom = new DateTime(2009, 1, 1), - BucketVersions = new List { new() { Version = 1, BucketType = 1 } } + CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } }; var testBucket3 = new Bucket { BucketGroupId = testBucketGroup.Id, Name = "Bucket Active Future", ValidFrom = new DateTime(2010, 2, 1), - BucketVersions = new List { new() { Version = 1, BucketType = 1 } } + CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } }; ServiceManager.BucketService.Create(testBucket1); @@ -262,14 +259,14 @@ public async Task LoadDataAsync_CheckCalculatedValues() BucketGroupId = testBucketGroup.Id, Name = "Bucket 1", ValidFrom = new DateTime(2010, 1, 1), - BucketVersions = new List { new() { Version = 1, BucketType = 1 } } + CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } }; var testBucket2 = new Bucket { BucketGroupId = testBucketGroup.Id, Name = "Bucket 2", ValidFrom = new DateTime(2010, 1, 1), - BucketVersions = new List { new() { Version = 1, BucketType = 1 } } + CurrentVersion = new BucketVersion { Version = 1, BucketType = 1 } }; ServiceManager.BucketService.Create(testBucket1); @@ -352,10 +349,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket with pending Want", ValidFrom = new DateTime(2010,1,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } }, new List(), new List(), @@ -366,10 +360,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket with fulfilled Want", ValidFrom = new DateTime(2010,1,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } }, new List(), new List @@ -383,10 +374,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket pending Want including expense", ValidFrom = new DateTime(2010,1,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } }, new List { @@ -400,10 +388,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket fulfilled Want including expense", ValidFrom = new DateTime(2010,1,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } }, new List { @@ -420,10 +405,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket with partial fulfilled Want", ValidFrom = new DateTime(2010,1,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } }, new List(), new List @@ -437,10 +419,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Month new Bucket { Name = "Bucket with over fulfilled Want", ValidFrom = new DateTime(2010,1,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 2, BucketTypeYParam = 10 }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 2, BucketTypeYParam = 10 } }, new List(), new List @@ -491,10 +470,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, with Want", ValidFrom = new DateTime(2010,1,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) } }, new List(), new List(), @@ -505,10 +481,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, without Want", ValidFrom = new DateTime(2010,1,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) } }, new List(), new List @@ -522,10 +495,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, with Want", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } }, new List(), new List @@ -544,10 +514,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, without Want", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } }, new List(), new List @@ -567,10 +534,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, fulfilled target", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } }, new List(), new List @@ -589,10 +553,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, over-fulfilled target", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } }, new List(), new List @@ -611,10 +572,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, no input", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } }, new List(), new List(), @@ -625,10 +583,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, input not in sync", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } }, new List(), new List @@ -644,10 +599,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "100 every 3 months, with Want", ValidFrom = new DateTime(2010,1,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,3,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,3,1) } }, new List(), new List(), @@ -658,10 +610,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "100 every 3 months, last month, with Want", ValidFrom = new DateTime(2009,11,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,1,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,1,1) } }, new List(), new List @@ -676,10 +625,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "100 every 3 months, last month, input not in sync", ValidFrom = new DateTime(2009,11,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,1,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 3, BucketTypeYParam = 100, BucketTypeZParam = new DateTime(2010,1,1) } }, new List(), new List @@ -694,10 +640,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, last 6 months, with expenses", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } }, new List { @@ -720,10 +663,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_Expen new Bucket { Name = "120 every 12 months, 2nd year, last 6 months, with Want", ValidFrom = new DateTime(2008,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2009,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 3, BucketTypeXParam = 12, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2009,6,1) } }, new List { @@ -767,10 +707,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-12, no input", ValidFrom = new DateTime(2010,1,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) } }, new List(), new List(), @@ -781,10 +718,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-12, input in current Month", ValidFrom = new DateTime(2010,1,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,12,1) } }, new List(), new List @@ -798,10 +732,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-06, input in sync", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } }, new List(), new List @@ -820,10 +751,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-06, fulfilled target", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } }, new List(), new List @@ -842,10 +770,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-06, over-fulfilled target", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } }, new List(), new List @@ -864,10 +789,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2010-06, input not in sync", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2010,6,1) } }, new List(), new List @@ -883,10 +805,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "120 until 2009-12, target not reached", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2009,12,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 120, BucketTypeZParam = new DateTime(2009,12,1) } }, new List(), new List @@ -902,10 +821,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "30 until 2010-01, target reached, with expense in target month", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) } }, new List { @@ -924,10 +840,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "30 until 2010-01, target reached, with lower expense in target month", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) } }, new List { @@ -946,10 +859,7 @@ public static IEnumerable TestData_CheckWantAndDetailCalculation_SaveX new Bucket { Name = "30 until 2010-01, target reached, with higher expense in target month", ValidFrom = new DateTime(2009,7,1), - BucketVersions = new List - { - new() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) }, - } + CurrentVersion = new BucketVersion() { Version = 1, BucketType = 4, BucketTypeYParam = 30, BucketTypeZParam = new DateTime(2010,1,1) } }, new List { From 9e406668834d76885440bf1d711c32957fa1b0ef Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 26 Nov 2023 11:59:15 +0100 Subject: [PATCH 26/57] Add multi-platform tag in Dockerfile --- Dockerfile | 9 ++++----- OpenBudgeteer.API/Dockerfile | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0de8f37..1c3f1c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,3 @@ -#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. - FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base WORKDIR /app ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -7,13 +5,14 @@ ENV DOTNET_RUNNING_IN_CONTAINER=true ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false RUN apk add --no-cache icu-libs icu-data-full -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build +ARG TARGETARCH ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 WORKDIR /src COPY . . -RUN dotnet restore +RUN dotnet restore -a $TARGETARCH WORKDIR "/src/OpenBudgeteer.Blazor" -RUN dotnet publish "OpenBudgeteer.Blazor.csproj" --no-self-contained -c Release -o /app/publish +RUN dotnet publish "OpenBudgeteer.Blazor.csproj" --no-self-contained -c Release -a $TARGETARCH -o /app/publish FROM base AS final WORKDIR /app diff --git a/OpenBudgeteer.API/Dockerfile b/OpenBudgeteer.API/Dockerfile index a147c8c..46f4171 100644 --- a/OpenBudgeteer.API/Dockerfile +++ b/OpenBudgeteer.API/Dockerfile @@ -3,17 +3,17 @@ WORKDIR /api ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 ENV DOTNET_RUNNING_IN_CONTAINER=true ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false -EXPOSE 80 -EXPOSE 443 RUN apk add --no-cache icu-libs icu-data-full -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build +ARG TARGETARCH +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 WORKDIR /src COPY ["OpenBudgeteer.API/OpenBudgeteer.API.csproj", "OpenBudgeteer.API/"] -RUN dotnet restore "OpenBudgeteer.API/OpenBudgeteer.API.csproj" +RUN dotnet restore "OpenBudgeteer.API/OpenBudgeteer.API.csproj" -a $TARGETARCH COPY . . WORKDIR "/src/OpenBudgeteer.API" -RUN dotnet publish "OpenBudgeteer.API.csproj" -r linux-musl-x64 --no-self-contained -c Release -o /api/publish +RUN dotnet publish "OpenBudgeteer.API.csproj" --no-self-contained -c Release -a $TARGETARCH -o /api/publish FROM base AS final WORKDIR /api From d656080f10cd589b6487ff535bcd549dd40c568d Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 26 Nov 2023 12:07:43 +0100 Subject: [PATCH 27/57] Update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 693717d..911fb66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * [Add] Create Transaction keeps last input date [#187](https://github.com/TheAxelander/OpenBudgeteer/issues/187) * [Add] An empty database can be loaded now with some demo data using `APPSETTINGS_DEMO_DATA: true` [#192](https://github.com/TheAxelander/OpenBudgeteer/issues/192) * [Add] First version of Web API in a separate Docker Image [#127](https://github.com/TheAxelander/OpenBudgeteer/issues/127) +* [Changed] Migrated to .Net 8 [#198](https://github.com/TheAxelander/OpenBudgeteer/issues/198) * [Changed] Amounts displayed in consistent currency and number format [#188](https://github.com/TheAxelander/OpenBudgeteer/issues/188) * [Changed] Buttons that appeared in the past only via hovering are now always displayed (was not working well, maybe additional rework in future) [#155](https://github.com/TheAxelander/OpenBudgeteer/issues/155) * [Changed] More responsive navigation bar [#175](https://github.com/TheAxelander/OpenBudgeteer/issues/175) @@ -10,6 +11,7 @@ * [Fixed] UI alignment for large numbers [#189](https://github.com/TheAxelander/OpenBudgeteer/issues/189) * [Fixed] Mapping Rules using the Account Name instead of Account Id [#199](https://github.com/TheAxelander/OpenBudgeteer/pull/199) Thanks [Lucaber](https://github.com/Lucaber) * [Fixed] Adding a Mapping Rule to an existing Rule Set failed [#200](https://github.com/TheAxelander/OpenBudgeteer/pull/200) Thanks [Lucaber](https://github.com/Lucaber) +* [Fixed] Builds for ARM64 are available again [#131](https://github.com/TheAxelander/OpenBudgeteer/issues/131) ### 1.7.1 (2023-10-16) From 0b92eeb235eb00bce425b607e4d7618f0ab681f1 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 26 Nov 2023 12:15:02 +0100 Subject: [PATCH 28/57] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 911fb66..3988868 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * [Add] Create Transaction keeps last input date [#187](https://github.com/TheAxelander/OpenBudgeteer/issues/187) * [Add] An empty database can be loaded now with some demo data using `APPSETTINGS_DEMO_DATA: true` [#192](https://github.com/TheAxelander/OpenBudgeteer/issues/192) * [Add] First version of Web API in a separate Docker Image [#127](https://github.com/TheAxelander/OpenBudgeteer/issues/127) +* [Breaking Change] Docker Image now listens on port 8080 (new .Net 8 default) * [Changed] Migrated to .Net 8 [#198](https://github.com/TheAxelander/OpenBudgeteer/issues/198) * [Changed] Amounts displayed in consistent currency and number format [#188](https://github.com/TheAxelander/OpenBudgeteer/issues/188) * [Changed] Buttons that appeared in the past only via hovering are now always displayed (was not working well, maybe additional rework in future) [#155](https://github.com/TheAxelander/OpenBudgeteer/issues/155) From f774d726576cd057ac1cb3de2cd5948cfb8641b5 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 26 Nov 2023 12:16:35 +0100 Subject: [PATCH 29/57] Update README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 0d14723..80b2505 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ For a quick ramp-up up of OpenBudgeteer using Docker and Sqlite use below comman docker run -d --name='openbudgeteer' \ -e 'CONNECTION_PROVIDER'='SQLITE' \ -e 'CONNECTION_DATABASE'='/srv/openbudgeteer.db' \ + -p 8080:8080 -v 'data:/srv' \ 'axelander/openbudgeteer:pre-release' ``` @@ -51,6 +52,8 @@ services: openbudgeteer: image: axelander/openbudgeteer:pre-release container_name: openbudgeteer + ports: + - 8080:8080 environment: - CONNECTION_PROVIDER=SQLITE - CONNECTION_DATABASE=/srv/openbudgeteer.db From abad9df4352c25a6a87edd641e54d2023988ecde Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sun, 26 Nov 2023 12:17:03 +0100 Subject: [PATCH 30/57] Fix README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 80b2505..cd2a4cc 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ For a quick ramp-up up of OpenBudgeteer using Docker and Sqlite use below comman docker run -d --name='openbudgeteer' \ -e 'CONNECTION_PROVIDER'='SQLITE' \ -e 'CONNECTION_DATABASE'='/srv/openbudgeteer.db' \ - -p 8080:8080 + -p 8080:8080 \ -v 'data:/srv' \ 'axelander/openbudgeteer:pre-release' ``` From c2e67be7e95db5e76b7130e409cc8e63891fcaa2 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Wed, 6 Dec 2023 07:52:27 +0100 Subject: [PATCH 31/57] Fix missing UI refresh on Transaction Page for deleting a BankTransaction #206 --- .../ViewModels/EntityViewModels/TransactionViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs index f142bad..bb2b37f 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs @@ -576,7 +576,7 @@ public ViewModelOperationResult DeleteTransaction() try { ServiceManager.BankTransactionService.Delete(TransactionId); - return new ViewModelOperationResult(true); + return new ViewModelOperationResult(true, true); } catch (Exception e) { From 875a41b1cb541741548a5149c043c974ee3f2e86 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Wed, 6 Dec 2023 17:28:19 +0100 Subject: [PATCH 32/57] Update Bootstrap, Redesign of Navigation Menu and Footer --- CHANGELOG.md | 1 + OpenBudgeteer.Blazor/App.razor | 16 +- OpenBudgeteer.Blazor/Pages/Import.razor | 3 +- OpenBudgeteer.Blazor/Shared/MainLayout.razor | 65 +- OpenBudgeteer.Blazor/Shared/NavMenu.razor | 73 +- .../wwwroot/css/StickyFooter.css | 18 - .../wwwroot/css/bootstrap/bootstrap-icons.css | 150 +- .../css/bootstrap/bootstrap-icons.json | 142 +- .../css/bootstrap/cerulean/bootstrap.css | 7204 ++++----- .../css/bootstrap/cerulean/bootstrap.min.css | 16 +- .../wwwroot/css/bootstrap/cosmo/bootstrap.css | 6834 +++++---- .../css/bootstrap/cosmo/bootstrap.min.css | 16 +- .../css/bootstrap/cyborg/bootstrap.css | 7168 ++++----- .../css/bootstrap/cyborg/bootstrap.min.css | 16 +- .../css/bootstrap/darkly/bootstrap.css | 7182 ++++----- .../css/bootstrap/darkly/bootstrap.min.css | 16 +- .../css/bootstrap/default/bootstrap.css | 12068 ++++++++++++++++ .../css/bootstrap/default/bootstrap.min.css | 7 +- .../bootstrap/default/bootstrap.min.css.map | 1 - .../css/bootstrap/flatly/bootstrap.css | 7184 ++++----- .../css/bootstrap/flatly/bootstrap.min.css | 16 +- .../css/bootstrap/fonts/bootstrap-icons.woff | Bin 164352 -> 176088 bytes .../css/bootstrap/fonts/bootstrap-icons.woff2 | Bin 121296 -> 130648 bytes .../css/bootstrap/journal/bootstrap.css | 7209 ++++----- .../css/bootstrap/journal/bootstrap.min.css | 16 +- .../css/bootstrap/litera/bootstrap.css | 7222 ++++----- .../css/bootstrap/litera/bootstrap.min.css | 16 +- .../wwwroot/css/bootstrap/lumen/bootstrap.css | 7167 ++++----- .../css/bootstrap/lumen/bootstrap.min.css | 16 +- .../wwwroot/css/bootstrap/lux/bootstrap.css | 6726 +++++---- .../css/bootstrap/lux/bootstrap.min.css | 16 +- .../css/bootstrap/materia/bootstrap.css | 7798 +++++----- .../css/bootstrap/materia/bootstrap.min.css | 16 +- .../wwwroot/css/bootstrap/minty/bootstrap.css | 7233 ++++----- .../css/bootstrap/minty/bootstrap.min.css | 16 +- .../wwwroot/css/bootstrap/morph/bootstrap.css | 7310 +++++----- .../css/bootstrap/morph/bootstrap.min.css | 16 +- .../wwwroot/css/bootstrap/pulse/bootstrap.css | 6915 +++++---- .../css/bootstrap/pulse/bootstrap.min.css | 16 +- .../css/bootstrap/quartz/bootstrap.css | 7156 ++++----- .../css/bootstrap/quartz/bootstrap.min.css | 16 +- .../css/bootstrap/sandstone/bootstrap.css | 6995 +++++---- .../css/bootstrap/sandstone/bootstrap.min.css | 16 +- .../css/bootstrap/simplex/bootstrap.css | 7208 ++++----- .../css/bootstrap/simplex/bootstrap.min.css | 16 +- .../css/bootstrap/sketchy/bootstrap.css | 7301 +++++----- .../css/bootstrap/sketchy/bootstrap.min.css | 16 +- .../wwwroot/css/bootstrap/slate/bootstrap.css | 7351 +++++----- .../css/bootstrap/slate/bootstrap.min.css | 16 +- .../wwwroot/css/bootstrap/solar/bootstrap.css | 7183 ++++----- .../css/bootstrap/solar/bootstrap.min.css | 16 +- .../css/bootstrap/spacelab/bootstrap.css | 7234 ++++----- .../css/bootstrap/spacelab/bootstrap.min.css | 16 +- .../css/bootstrap/superhero/bootstrap.css | 7192 ++++----- .../css/bootstrap/superhero/bootstrap.min.css | 16 +- .../css/bootstrap/united/bootstrap.css | 7154 ++++----- .../css/bootstrap/united/bootstrap.min.css | 16 +- .../wwwroot/css/bootstrap/vapor/bootstrap.css | 7173 ++++----- .../css/bootstrap/vapor/bootstrap.min.css | 16 +- .../wwwroot/css/bootstrap/yeti/bootstrap.css | 7188 ++++----- .../css/bootstrap/yeti/bootstrap.min.css | 16 +- .../css/bootstrap/zephyr/bootstrap.css | 7066 +++++---- .../css/bootstrap/zephyr/bootstrap.min.css | 16 +- OpenBudgeteer.Blazor/wwwroot/css/custom.css | 105 - OpenBudgeteer.Blazor/wwwroot/css/site.css | 166 +- .../js/bootstrap/bootstrap.bundle.min.js | 6 +- .../js/bootstrap/bootstrap.bundle.min.js.map | 2 +- 67 files changed, 110374 insertions(+), 82202 deletions(-) delete mode 100644 OpenBudgeteer.Blazor/wwwroot/css/StickyFooter.css create mode 100644 OpenBudgeteer.Blazor/wwwroot/css/bootstrap/default/bootstrap.css delete mode 100644 OpenBudgeteer.Blazor/wwwroot/css/bootstrap/default/bootstrap.min.css.map delete mode 100644 OpenBudgeteer.Blazor/wwwroot/css/custom.css mode change 100755 => 100644 OpenBudgeteer.Blazor/wwwroot/js/bootstrap/bootstrap.bundle.min.js mode change 100755 => 100644 OpenBudgeteer.Blazor/wwwroot/js/bootstrap/bootstrap.bundle.min.js.map diff --git a/CHANGELOG.md b/CHANGELOG.md index 3988868..a55db7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * [Changed] Buttons that appeared in the past only via hovering are now always displayed (was not working well, maybe additional rework in future) [#155](https://github.com/TheAxelander/OpenBudgeteer/issues/155) * [Changed] More responsive navigation bar [#175](https://github.com/TheAxelander/OpenBudgeteer/issues/175) * [Changed] Enable editing of imported file [#196](https://github.com/TheAxelander/OpenBudgeteer/issues/196) +* [Changed] Redesign of Navigation Menu and Footer * [Fixed] UI alignment for large numbers [#189](https://github.com/TheAxelander/OpenBudgeteer/issues/189) * [Fixed] Mapping Rules using the Account Name instead of Account Id [#199](https://github.com/TheAxelander/OpenBudgeteer/pull/199) Thanks [Lucaber](https://github.com/Lucaber) * [Fixed] Adding a Mapping Rule to an existing Rule Set failed [#200](https://github.com/TheAxelander/OpenBudgeteer/pull/200) Thanks [Lucaber](https://github.com/Lucaber) diff --git a/OpenBudgeteer.Blazor/App.razor b/OpenBudgeteer.Blazor/App.razor index 02a095e..08feb91 100644 --- a/OpenBudgeteer.Blazor/App.razor +++ b/OpenBudgeteer.Blazor/App.razor @@ -10,11 +10,9 @@ OpenBudgeteer - + - - -
-
-
-
- -
-
- Income -
- @_dataContext.Income.ToString("C", CultureInfo.CurrentCulture) -
-
+
+
+
-
-
-
- -
-
- Expenses -
- @_dataContext.Expenses.ToString("C", CultureInfo.CurrentCulture) -
-
+
+
-
-
-
- -
-
- Month Balance -
- @_dataContext.MonthBalance.ToString("C", CultureInfo.CurrentCulture) -
-
+
+
-
-
-
- -
-
- Bank Balance -
- @_dataContext.BankBalance.ToString("C", CultureInfo.CurrentCulture) -
-
+
+
-
-
-
-
-
-
- -
-
- Budget -
- @_dataContext.Budget.ToString("C", CultureInfo.CurrentCulture) -
-
+
+
+
+
+
+
+
-
-
-
- -
-
- Pending Want -
- @_dataContext.PendingWant.ToString("C", CultureInfo.CurrentCulture) -
-
+
+
-
-
-
- -
-
- Remaining Budget -
- @_dataContext.RemainingBudget.ToString("C", CultureInfo.CurrentCulture) -
-
+
+
-
-
-
- -
-
- Negative Bucket Balance -
- @_dataContext.NegativeBucketBalance.ToString("C", CultureInfo.CurrentCulture) -
-
+
+
-
-
- - - - -
- +
+ + + + +
@@ -187,14 +187,11 @@ @(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("C", CultureInfo.CurrentCulture)) @(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("C", CultureInfo.CurrentCulture)) - @if (bucketGroup.IsHovered) - { - - - - - - } + + + + +
@if (bucket.Bucket.IsInactive) { @@ -255,18 +252,15 @@ } - @if (bucket.IsHovered) + @if (bucket.Bucket.IsInactive) + { + + } + else { - if (bucket.Bucket.IsInactive) - { - - } - else - { - - - - } + + + }
@ruleSet.RuleSet.Priority @ruleSet.RuleSet.Name
@ruleSet.TargetBucket.Name
 - @if (ruleSet.IsHovered) - { - - - } + +
@transaction.Transaction.TransactionDate.ToShortDateString() @transaction.SelectedAccount.Name @transaction.Transaction.Payee - @if (transaction.IsHovered) - { - - - } + +
@transaction.Transaction.FirstOccurrenceDate.ToShortDateString() Every @transaction.Transaction.RecurrenceAmount @transaction.SelectedRecurrenceType.Value@transaction.Transaction.Memo @transaction.Transaction.Amount.ToString("C", CultureInfo.CurrentCulture) - @if (transaction.IsHovered) - { - - - } + +
@@ -134,131 +79,130 @@ - - - - - + + + + + - -
Bucket Balance InOutWantInActivityDetailsWantInActivityDetails
- -@foreach (var bucketGroup in _dataContext.BucketGroups) -{ - - - + + @foreach (var bucketGroup in _dataContext.BucketGroups) + { + @if (bucketGroup.InModification) { - } else { - - - - - - + + + + + + } - - -
+
- +
- +
- + 		+
- @bucketGroup.Name
- - 		@bucketGroup.TotalBalance.ToString("C", CultureInfo.CurrentCulture)@(bucketGroup.TotalWant == 0 ? string.Empty : bucketGroup.TotalWant.ToString("C", CultureInfo.CurrentCulture))@(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("C", CultureInfo.CurrentCulture))@(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("C", CultureInfo.CurrentCulture)) + + @bucketGroup.TotalBalance.ToString("C", CultureInfo.CurrentCulture)@(bucketGroup.TotalWant == 0 ? string.Empty : bucketGroup.TotalWant.ToString("C", CultureInfo.CurrentCulture))@(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("C", CultureInfo.CurrentCulture))@(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("C", CultureInfo.CurrentCulture)) - +
- - - - @foreach (var bucket in bucketGroup.Buckets) - { - - + +
- @if (bucket.IsInactive) - { -
- @($"{bucket.Name} (Inactive from: {bucket.IsInactiveFrom.ToShortDateString()})") -
- } - else +
+ + + @foreach (var bucket in bucketGroup.Buckets) { -
@bucket.Name
- } - - - - - - - + - + + + + + + + + } - - - } - -
@bucket.Balance.ToString("C", CultureInfo.CurrentCulture) - @if (bucket.IsInactive) - { - - } - else - { - - } - @(bucket.Want == 0 ? string.Empty : bucket.Want.ToString("C", CultureInfo.CurrentCulture))@(bucket.In == 0 ? string.Empty : bucket.In.ToString("C", CultureInfo.CurrentCulture))@(bucket.Activity == 0 ? string.Empty : bucket.Activity.ToString("C", CultureInfo.CurrentCulture)) - @if (bucket.IsProgressbarVisible) - { -
-
-
-
- @bucket.Progress% +
+ @if (bucket.IsInactive) + { +
+ @($"{bucket.Name} (Inactive from: {bucket.IsInactiveFrom.ToShortDateString()})")
- - - -
-
- @bucket.Details -
-
- } - 		- @if (bucket.IsInactive) - { - - } - else - { - - - + } + else + { +
@bucket.Name
+ } + 		@bucket.Balance.ToString("C", CultureInfo.CurrentCulture) + @if (bucket.IsInactive) + { + + } + else + { + + } + @(bucket.Want == 0 ? string.Empty : bucket.Want.ToString("C", CultureInfo.CurrentCulture))@(bucket.In == 0 ? string.Empty : bucket.In.ToString("C", CultureInfo.CurrentCulture))@(bucket.Activity == 0 ? string.Empty : bucket.Activity.ToString("C", CultureInfo.CurrentCulture)) + @if (bucket.IsProgressbarVisible) + { +
+
+
+
+ @bucket.Progress% +
+
+
+
+
+
+ @bucket.Details +
+
+ } + 		+ @if (bucket.IsInactive) + { + + } + else + { + + + + } +
-} +
+ + + } + +
-
+
@if (_step4Enabled) { - + } @if (_dataContext.SelectedImportProfile.ImportProfileId != Guid.Empty) { - - + + }
-
-
+
+
-
+
-
- - -
-
+

e.g. yyyy-MM-dd, dd.MM.yyyy, MM/dd/yyyy

-
+
+
+
+ + +
+

Use BCP 47 language tag like en-US or de-DE

-
+
@@ -128,8 +130,8 @@
-
-
+
+
-
+
-
Additional Mapping Settings:
-
-
-
- - -
-
- - -
-
- - -
-
+
Additional Mapping Settings:
+
+ + +
+
+ + +
+
+ + +
+
@switch (_dataContext.SelectedImportProfile.AdditionalSettingCreditValue) { case ImportProfileViewModel.AdditionalSettingsForCreditValues.CreditInSeparateColumns: -
+
-
+
@@ -237,7 +237,7 @@
-
+
@@ -245,7 +245,7 @@
@if (_dataContext.SelectedImportProfile.AdditionalSettingAmountCleanup) { -
+
@@ -269,34 +269,36 @@
- @if (!_isValidationRunning) - { - - } - else - { - - } - - @if (_dataContext.ValidRecords > 0 && !_isValidationRunning) - { - @if (!_isImportRunning) +
+ @if (!_isValidationRunning) { - - + } else { - + Validating... + } - } -
+ + @if (_dataContext.ValidRecords > 0 && !_isValidationRunning) + { + @if (!_isImportRunning) + { + + + } + else + { + + } + } +
+
Total Records: @_dataContext.TotalRecords
Valid Records: @_dataContext.ValidRecords
Records with errors: @_dataContext.RecordsWithErrors
@@ -309,14 +311,14 @@ @if (_dataContext.ParsedRecords.Any(i => i.IsValid)) { -
+
Preview (Valid Records)
- - + + @@ -326,20 +328,20 @@ { - - + + }
DateAccountPayeeAccountPayee Memo Amount
@transaction.Result.TransactionDate.ToShortDateString()@_dataContext.SelectedImportProfile.Account.Name@transaction.Result.Payee@_dataContext.SelectedImportProfile.Account.Name@transaction.Result.Payee @transaction.Result.Memo @transaction.Result.Amount
-
+
} - + @if (_dataContext.ParsedRecords.Any(i => !i.IsValid)) { -
+
Records with error:
@@ -359,46 +361,46 @@ }
-
+
} - + @if (_dataContext.Duplicates.Any()) {
Potential Duplicates:
- - - - - - - - + + + + + + + + - @foreach (var duplicate in _dataContext.Duplicates) + @foreach (var duplicate in _dataContext.Duplicates) + { + + + + + + + + + foreach (var bankTransaction in duplicate.Item2) { - - - - - - - + + + + + + - foreach (var bankTransaction in duplicate.Item2) - { - - - - - - - - } } + }
DateAccountPayeeMemoAmount
DateAccountPayeeMemoAmount
@duplicate.Item1.Result.TransactionDate.ToShortDateString()@_dataContext.SelectedImportProfile.Account.Name@duplicate.Item1.Result.Payee@duplicate.Item1.Result.Memo@duplicate.Item1.Result.Amount
@duplicate.Item1.Result.TransactionDate.ToShortDateString()@_dataContext.SelectedImportProfile.Account.Name@duplicate.Item1.Result.Payee@duplicate.Item1.Result.Memo@duplicate.Item1.Result.Amount
@bankTransaction.TransactionDate.ToShortDateString()@_dataContext.SelectedImportProfile.Account.Name@bankTransaction.Payee@bankTransaction.Memo@bankTransaction.Amount
@bankTransaction.TransactionDate.ToShortDateString()@_dataContext.SelectedImportProfile.Account.Name@bankTransaction.Payee@bankTransaction.Memo@bankTransaction.Amount
diff --git a/OpenBudgeteer.Blazor/Pages/Index.razor b/OpenBudgeteer.Blazor/Pages/Index.razor index a83fd27..a8981f2 100644 --- a/OpenBudgeteer.Blazor/Pages/Index.razor +++ b/OpenBudgeteer.Blazor/Pages/Index.razor @@ -16,13 +16,13 @@ -
-
-
-
- +
+
+
+
+ ...
-
+
OpenBudgeteer Repository

Access source code hosted on Github

@@ -30,12 +30,12 @@
-
-
-
- +
+
+
+ ...
-
+
Create Issue

Found a bug or missing a feature? Create an issue on Github

@@ -43,12 +43,12 @@
-
-
-
- +
+
+
+ ...
-
+
Display Change Log

See latest updates and changes.

diff --git a/OpenBudgeteer.Blazor/Pages/Report.razor b/OpenBudgeteer.Blazor/Pages/Report.razor index cb13edd..a721882 100644 --- a/OpenBudgeteer.Blazor/Pages/Report.razor +++ b/OpenBudgeteer.Blazor/Pages/Report.razor @@ -2,44 +2,56 @@ @using ChartJs.Blazor.Charts
-
-

Month Balances

- +
+
+

Month Balances

+ +
-
-

Bank Balances

- +
+
+

Bank Balances

+ +
-
-

Income & Expenses per Month

- +
+
+

Income & Expenses per Month

+ +
-
-

Income & Expenses per Year

- +
+
+

Income & Expenses per Year

+ +
-
-

Bucket Monthly Expenses

- @foreach (var config in _monthBucketExpensesConfigsLeft) - { -
@config.Item1
-
- -
- } +
+
+

Bucket Monthly Expenses

+ @foreach (var config in _monthBucketExpensesConfigsLeft) + { +
@config.Item1
+
+ +
+ } +
-
-

Bucket Monthly Expenses

- @foreach (var config in _monthBucketExpensesConfigsRight) - { -
@config.Item1
-
- -
- } +
+
+

Bucket Monthly Expenses

+ @foreach (var config in _monthBucketExpensesConfigsRight) + { +
@config.Item1
+
+ +
+ } +
diff --git a/OpenBudgeteer.Blazor/Pages/Transaction.razor b/OpenBudgeteer.Blazor/Pages/Transaction.razor index 470cc49..84d9d1e 100644 --- a/OpenBudgeteer.Blazor/Pages/Transaction.razor +++ b/OpenBudgeteer.Blazor/Pages/Transaction.razor @@ -3,40 +3,36 @@ @using System.Globalization @using OpenBudgeteer.Core.Common.Extensions -
-
- @if (_massEditEnabled) - { - - - } - else - { - - - -
- - + + } + else + { + + + +
+ + - -
+ + +
+ } + - @foreach (var filter in Enum.GetValues()) - { - - } - -
- + +
@if (_newTransactionEnabled) @@ -44,21 +40,21 @@ - - - - - - - + + + + + + - - - - - - + + +
DateAccountPayeeMemoAmountBuckets + DateAccountPayeeMemoAmountBuckets
+ + + @foreach (var bucket in _dataContext.NewTransaction.Buckets) @@ -97,7 +93,7 @@ } -
+ @@ -109,14 +105,14 @@ - - - - - - - - + + + + + + + @@ -125,10 +121,10 @@ @if (transaction.InModification) { - - - - - - + + +
DateAccountPayeeMemoAmountBuckets +
DateAccountPayeeMemoAmountBuckets
+ + + @foreach (var bucket in transaction.Buckets) @@ -167,7 +163,7 @@ } - - - - - - - + + + + + - diff --git a/OpenBudgeteer.Blazor/Shared/BucketStatsElement.razor b/OpenBudgeteer.Blazor/Shared/BucketStatsElement.razor new file mode 100644 index 0000000..cfb3b5d --- /dev/null +++ b/OpenBudgeteer.Blazor/Shared/BucketStatsElement.razor @@ -0,0 +1,21 @@ +
+
+ +
+
+ @Title +
+ @Amount +
+
+ +@code { + [Parameter] + public string? ImageUrl { get; set; } + + [Parameter] + public string? Title { get; set; } + + [Parameter] + public string? Amount { get; set; } +} \ No newline at end of file diff --git a/OpenBudgeteer.Blazor/Shared/MainLayout.razor b/OpenBudgeteer.Blazor/Shared/MainLayout.razor index 0241007..56a39b1 100644 --- a/OpenBudgeteer.Blazor/Shared/MainLayout.razor +++ b/OpenBudgeteer.Blazor/Shared/MainLayout.razor @@ -15,8 +15,8 @@
OpenBudgeteer - Database: @CurrentDatabase - Version: 1.8 (Change Log) + Database: @CurrentDatabase + Version: 1.8 (Change Log)
diff --git a/OpenBudgeteer.Blazor/Shared/YearMonthSelector.razor b/OpenBudgeteer.Blazor/Shared/YearMonthSelector.razor index e0b6333..c412501 100644 --- a/OpenBudgeteer.Blazor/Shared/YearMonthSelector.razor +++ b/OpenBudgeteer.Blazor/Shared/YearMonthSelector.razor @@ -9,7 +9,7 @@ } -
+
- - + + @@ -118,8 +118,8 @@ - - + - -
+ @@ -177,12 +173,12 @@ else {
@transaction.TransactionDate.ToShortDateString()@transaction.AccountName@transaction.Payee@transaction.Memo@transaction.Amount.ToString("C", CultureInfo.CurrentCulture) + @transaction.TransactionDate.ToShortDateString()@transaction.AccountName@transaction.Payee@transaction.Memo@transaction.Amount.ToString("C", CultureInfo.CurrentCulture) @foreach (var bucket in transaction.Buckets) {
@@ -191,7 +187,7 @@
} 		+ Want In ActivityDetailsDetails
@(bucketGroup.TotalWant == 0 ? string.Empty : bucketGroup.TotalWant.ToString("C", CultureInfo.CurrentCulture)) @(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("C", CultureInfo.CurrentCulture)) @(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("C", CultureInfo.CurrentCulture)) + @@ -163,7 +163,7 @@ @(bucket.Want == 0 ? string.Empty : bucket.Want.ToString("C", CultureInfo.CurrentCulture)) @(bucket.In == 0 ? string.Empty : bucket.In.ToString("C", CultureInfo.CurrentCulture)) @(bucket.Activity == 0 ? string.Empty : bucket.Activity.ToString("C", CultureInfo.CurrentCulture)) + @if (bucket.IsProgressbarVisible) {
@@ -182,7 +182,7 @@
} 		+ @if (bucket.IsInactive) { diff --git a/OpenBudgeteer.Blazor/Pages/DataConsistency.razor b/OpenBudgeteer.Blazor/Pages/DataConsistency.razor index 2f411e2..2fd147c 100644 --- a/OpenBudgeteer.Blazor/Pages/DataConsistency.razor +++ b/OpenBudgeteer.Blazor/Pages/DataConsistency.razor @@ -69,18 +69,8 @@ } -@if (_isLoadingDialogVisible) -{ -
-
-
-
-

Check Data Consistency

-
-
Execute several checks on your data...
-
-
-
-
-
-} + diff --git a/OpenBudgeteer.Blazor/Pages/Rules.razor b/OpenBudgeteer.Blazor/Pages/Rules.razor index 96cce16..c6a57e3 100644 --- a/OpenBudgeteer.Blazor/Pages/Rules.razor +++ b/OpenBudgeteer.Blazor/Pages/Rules.razor @@ -5,42 +5,41 @@ @using OpenBudgeteer.Core.Common.Extensions @using OpenBudgeteer.Core.ViewModels.EntityViewModels -
-
- @if (_massEditEnabled) - { - - - } - else - { - - - } -
+
+ @if (_massEditEnabled) + { + + + } + else + { + + + }
@if (_newMappingRuleSetIsEnabled) { - +
- - - - + + + + + - - - + + - - @@ -90,10 +89,11 @@
PriorityRule NameTarget BucketMapping RulesPriorityRule NameTarget BucketMapping Rules
+ + @foreach (var mappingRule in _dataContext.NewRuleSet.MappingRules) @@ -78,7 +77,7 @@
+
- - - - + + + + + @@ -102,14 +102,14 @@ @if (ruleSet.InModification) { - - - + + - - @@ -156,10 +156,10 @@ else { - - - - + + + - diff --git a/OpenBudgeteer.Blazor/Pages/Transaction.razor b/OpenBudgeteer.Blazor/Pages/Transaction.razor index 84d9d1e..ee4a3c1 100644 --- a/OpenBudgeteer.Blazor/Pages/Transaction.razor +++ b/OpenBudgeteer.Blazor/Pages/Transaction.razor @@ -46,7 +46,7 @@ - @@ -93,7 +93,7 @@ } - - @@ -163,7 +163,7 @@ } - - diff --git a/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor b/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor index cc6aa3a..247fe02 100644 --- a/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor @@ -36,9 +36,9 @@ - - - + + + @@ -47,8 +47,8 @@ { - - + + @@ -58,19 +58,25 @@
-
-

Month Balances

- +
+
+

Month Balances

+ +
-
-

Input & Output

- +
+
+

Input & Output

+ +
-
-

Balance Progression

- +
+
+

Balance Progression

+ +
diff --git a/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor b/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor index 2b4cae1..9dbe4fa 100644 --- a/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor @@ -28,9 +28,9 @@
- - - + + + @@ -49,9 +49,9 @@ - - - + + + @@ -75,9 +75,9 @@ - - - + +
PriorityRule NameTarget BucketMapping RulesPriorityRule NameTarget BucketMapping Rules
+ + @foreach (var mappingRule in ruleSet.MappingRules) @@ -147,7 +147,7 @@
+
@ruleSet.Priority@ruleSet.Name
@ruleSet.TargetBucketName
 + @ruleSet.Priority@ruleSet.Name
@ruleSet.TargetBucketName
    @foreach (var mappingRule in ruleSet.MappingRules) { @@ -167,7 +167,7 @@ }
+ Memo Amount Buckets +
+ @@ -112,7 +112,7 @@ Memo Amount Buckets +
+ @@ -187,7 +187,7 @@ } +
DateAccountPayeeMemoAccountPayeeMemo Amount
@transaction.TransactionDate.ToShortDateString()@transaction.AccountName@transaction.Payee@transaction.AccountName@transaction.Payee @transaction.Memo @transaction.Amount.ToString("C", CultureInfo.CurrentCulture)
Bucket BalanceInActivityDetailsInActivityDetails
@bucketGroup.TotalBalance.ToString("C", CultureInfo.CurrentCulture)@(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("C", CultureInfo.CurrentCulture))@(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("C", CultureInfo.CurrentCulture))@(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("C", CultureInfo.CurrentCulture))@(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("C", CultureInfo.CurrentCulture))
@bucket.Balance.ToString("C", CultureInfo.CurrentCulture)@(bucket.In == 0 ? string.Empty : bucket.In.ToString("C", CultureInfo.CurrentCulture))@(bucket.Activity == 0 ? string.Empty : bucket.Activity.ToString("C", CultureInfo.CurrentCulture)) + @(bucket.In == 0 ? string.Empty : bucket.In.ToString("C", CultureInfo.CurrentCulture))@(bucket.Activity == 0 ? string.Empty : bucket.Activity.ToString("C", CultureInfo.CurrentCulture)) @if (bucket.IsProgressbarVisible) {
diff --git a/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor b/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor index e05ef1a..01b273e 100644 --- a/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor @@ -11,12 +11,12 @@
-
+
-
-
+
+
-
-
-
+
@if (_isNumberOfMonthsEnabled) { @@ -51,7 +49,7 @@ }
-
+
@if (_isAmountEnabled) { @@ -62,9 +60,7 @@ }
-
-
-
+
@if (_isTargetDataEnabled) { @@ -75,7 +71,7 @@ }
-
+
@@ -38,7 +36,7 @@ - @@ -74,7 +72,7 @@ - @@ -90,7 +88,7 @@ - diff --git a/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor b/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor index 03bd468..ee1d166 100644 --- a/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor @@ -6,7 +6,7 @@ @if (IsDialogVisible) {
-
+

@Title

@@ -23,8 +23,8 @@
- - + + @@ -34,8 +34,8 @@ { - - + + From 7d88537acac8faeee3d148ca92d5ea212660b66f Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Thu, 21 Dec 2023 17:24:37 +0100 Subject: [PATCH 39/57] Fix missing string conversion for Amount decimal values on Import Page --- OpenBudgeteer.Blazor/Pages/Import.razor | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OpenBudgeteer.Blazor/Pages/Import.razor b/OpenBudgeteer.Blazor/Pages/Import.razor index 145dd56..70a0105 100644 --- a/OpenBudgeteer.Blazor/Pages/Import.razor +++ b/OpenBudgeteer.Blazor/Pages/Import.razor @@ -1,6 +1,7 @@ @page "/import" @using Tewr.Blazor.FileReader @using OpenBudgeteer.Core.ViewModels.EntityViewModels +@using System.Globalization @inject IFileReaderService FileReaderService @inject IJSRuntime JSRuntime @inject NavigationManager NavManager @@ -331,7 +332,7 @@ - + } @@ -387,7 +388,7 @@ - + foreach (var bankTransaction in duplicate.Item2) @@ -397,7 +398,7 @@ - + } } From dbb2a88b477c07f791a165630a464cd41bde0799 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Thu, 21 Dec 2023 17:30:52 +0100 Subject: [PATCH 40/57] Add Text Color option for Bucket #207 --- CHANGELOG.md | 1 + OpenBudgeteer.Blazor/Pages/Bucket.razor | 4 +- OpenBudgeteer.Blazor/Pages/Rules.razor | 6 +- OpenBudgeteer.Blazor/Pages/Transaction.razor | 6 +- .../Shared/BucketSelectDialog.razor | 2 +- .../Shared/EditBucketDialog.razor | 45 +- .../Models/Bucket.cs | 2 + ...31221153127_AddBucketTextColor.Designer.cs | 496 +++++++++++++++++ .../20231221153127_AddBucketTextColor.cs | 29 + .../DatabaseServiceModelSnapshot.cs | 41 +- ...31221153511_AddBucketTextColor.Designer.cs | 497 ++++++++++++++++++ .../20231221153511_AddBucketTextColor.cs | 28 + .../DatabaseContextModelSnapshot.cs | 41 +- .../BucketGroupRepository.cs | 4 +- .../BucketRepository.cs | 8 +- .../BankTransactionService.cs | 2 +- .../BucketRuleSetService.cs | 2 +- .../BucketService.cs | 2 +- .../RecurringBankTransactionService.cs | 2 +- ...31221153309_AddBucketTextColor.Designer.cs | 492 +++++++++++++++++ .../20231221153309_AddBucketTextColor.cs | 28 + .../SqliteDatabaseContextModelSnapshot.cs | 41 +- .../Initialization/DemoDataGenerator.cs | 18 +- .../EntityViewModels/BucketViewModel.cs | 22 +- .../PartialBucketViewModel.cs | 24 +- .../EntityViewModels/RuleSetViewModel.cs | 24 +- 26 files changed, 1796 insertions(+), 71 deletions(-) create mode 100644 OpenBudgeteer.Core.Data.MySql.Migrations/20231221153127_AddBucketTextColor.Designer.cs create mode 100644 OpenBudgeteer.Core.Data.MySql.Migrations/20231221153127_AddBucketTextColor.cs create mode 100644 OpenBudgeteer.Core.Data.Postgres.Migrations/20231221153511_AddBucketTextColor.Designer.cs create mode 100644 OpenBudgeteer.Core.Data.Postgres.Migrations/20231221153511_AddBucketTextColor.cs create mode 100644 OpenBudgeteer.Core.Data.Sqlite.Migrations/20231221153309_AddBucketTextColor.Designer.cs create mode 100644 OpenBudgeteer.Core.Data.Sqlite.Migrations/20231221153309_AddBucketTextColor.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index dc14e8f..2a05ea2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * [Add] First version of Web API in a separate Docker Image [#127](https://github.com/TheAxelander/OpenBudgeteer/issues/127) * [Add] Loading screen while opening/uploading a file [#209](https://github.com/TheAxelander/OpenBudgeteer/issues/209) * [Add] Confirmation Dialog for deleting a Bucket Group [#208](https://github.com/TheAxelander/OpenBudgeteer/issues/208) +* [Add] Text Color option for Bucket [#207](https://github.com/TheAxelander/OpenBudgeteer/issues/207) * [Breaking Change] Docker Image now listens on port 8080 (new .Net 8 default) * [Changed] Migrated to .Net 8 [#198](https://github.com/TheAxelander/OpenBudgeteer/issues/198) * [Changed] Amounts displayed in consistent currency and number format [#188](https://github.com/TheAxelander/OpenBudgeteer/issues/188) diff --git a/OpenBudgeteer.Blazor/Pages/Bucket.razor b/OpenBudgeteer.Blazor/Pages/Bucket.razor index 7685fcb..cd27d96 100644 --- a/OpenBudgeteer.Blazor/Pages/Bucket.razor +++ b/OpenBudgeteer.Blazor/Pages/Bucket.razor @@ -138,13 +138,13 @@ diff --git a/OpenBudgeteer.Blazor/Pages/Rules.razor b/OpenBudgeteer.Blazor/Pages/Rules.razor index c6a57e3..35467fa 100644 --- a/OpenBudgeteer.Blazor/Pages/Rules.razor +++ b/OpenBudgeteer.Blazor/Pages/Rules.razor @@ -35,7 +35,7 @@ @@ -105,7 +105,7 @@ @@ -158,7 +158,7 @@ - + @@ -144,7 +144,7 @@ { @@ -181,7 +181,7 @@ - + diff --git a/OpenBudgeteer.Blazor/Pages/Transaction.razor.cs b/OpenBudgeteer.Blazor/Pages/Transaction.razor.cs index 32e66c8..428f5b9 100644 --- a/OpenBudgeteer.Blazor/Pages/Transaction.razor.cs +++ b/OpenBudgeteer.Blazor/Pages/Transaction.razor.cs @@ -69,7 +69,7 @@ private void EditAllTransaction() private void NewTransactionAccount_SelectionChanged(string? value) { if (string.IsNullOrEmpty(value)) return; - _dataContext.NewTransaction!.UpdateSelectedAccount(Guid.Parse(value)); + _dataContext.NewTransaction!.SelectedAccount = _dataContext.NewTransaction!.AvailableAccounts.First(i => i.AccountId == Guid.Parse(value)); } private async Task ProposeBucketsAsync() @@ -84,7 +84,7 @@ private async Task ProposeBucketsAsync() private void TransactionAccount_SelectionChanged(string? value, TransactionViewModel transactionViewModel) { if (string.IsNullOrEmpty(value)) return; - transactionViewModel.UpdateSelectedAccount(Guid.Parse(value)); + transactionViewModel.SelectedAccount = transactionViewModel.AvailableAccounts.First(i => i.AccountId == Guid.Parse(value)); } private void SplitTransaction(TransactionViewModel transaction) => diff --git a/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor b/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor index 247fe02..dce5878 100644 --- a/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/BucketDetailsDialog.razor @@ -47,7 +47,7 @@ { - + diff --git a/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor b/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor index fe4ee1b..f4768e6 100644 --- a/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/RecurringTransactionDialog.razor @@ -2,6 +2,7 @@ @using OpenBudgeteer.Core.ViewModels @using System.Drawing @using System.Globalization +@using OpenBudgeteer.Core.Common.Extensions @using OpenBudgeteer.Core.ViewModels.EntityViewModels @using OpenBudgeteer.Core.ViewModels.Helper @if (IsDialogVisible) @@ -53,9 +54,9 @@ @@ -83,7 +84,7 @@ - + @@ -172,7 +173,9 @@ void TransactionRecurrenceType_SelectionChanged(string? value, RecurringTransactionViewModel transaction) { if (string.IsNullOrEmpty(value)) return; - transaction.RecurrenceType = (RecurringTransactionViewModel.RecurringTransactionRecurrenceType)Convert.ToInt32(value); + transaction.RecurrenceType = Enum.TryParse(typeof(RecurringTransactionRecurrenceType), value, out var result) + ? (RecurringTransactionRecurrenceType)result + : RecurringTransactionRecurrenceType.Weeks; } void TransactionAccount_SelectionChanged(string? value, RecurringTransactionViewModel transaction) diff --git a/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor b/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor index ee1d166..407dddc 100644 --- a/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/TransactionDialog.razor @@ -34,7 +34,7 @@ { - + diff --git a/OpenBudgeteer.Core.Data.Contracts/Services/IRecurringBankTransactionService.cs b/OpenBudgeteer.Core.Data.Contracts/Services/IRecurringBankTransactionService.cs index 367c17b..e095ef2 100644 --- a/OpenBudgeteer.Core.Data.Contracts/Services/IRecurringBankTransactionService.cs +++ b/OpenBudgeteer.Core.Data.Contracts/Services/IRecurringBankTransactionService.cs @@ -4,6 +4,8 @@ namespace OpenBudgeteer.Core.Data.Contracts.Services; public interface IRecurringBankTransactionService : IBaseService { + public RecurringBankTransaction GetWithEntities(Guid id); + public IEnumerable GetAllWithEntities(); public Task> GetPendingBankTransactionAsync(DateTime yearMonth); public Task> CreatePendingBankTransactionAsync(DateTime yearMonth); } \ No newline at end of file diff --git a/OpenBudgeteer.Core.Data.Services/RecurringBankTransactionService.cs b/OpenBudgeteer.Core.Data.Services/RecurringBankTransactionService.cs index 8a3d26e..73c9202 100644 --- a/OpenBudgeteer.Core.Data.Services/RecurringBankTransactionService.cs +++ b/OpenBudgeteer.Core.Data.Services/RecurringBankTransactionService.cs @@ -12,6 +12,42 @@ internal RecurringBankTransactionService(DbContextOptions dbCon : base(dbContextOptions, new RecurringBankTransactionRepository(new DatabaseContext(dbContextOptions))) { } + + public RecurringBankTransaction GetWithEntities(Guid id) + { + try + { + using var dbContext = new DatabaseContext(DbContextOptions); + var repository = new RecurringBankTransactionRepository(dbContext); + + var result = repository.ByIdWithIncludedEntities(id); + if (result == null) throw new Exception($"{typeof(RecurringBankTransaction)} not found in database"); + return result; + } + catch (Exception e) + { + Console.WriteLine(e); + throw new Exception($"Error on querying database: {e.Message}"); + } + } + + public IEnumerable GetAllWithEntities() + { + try + { + using var dbContext = new DatabaseContext(DbContextOptions); + var repository = new RecurringBankTransactionRepository(dbContext); + + return repository + .AllWithIncludedEntities() + .ToList(); + } + catch (Exception e) + { + Console.WriteLine(e); + throw new Exception($"Error on querying database: {e.Message}"); + } + } public async Task> GetPendingBankTransactionAsync(DateTime yearMonth) { diff --git a/OpenBudgeteer.Core/Common/Extensions/RecurringTransactionRecurrenceType.cs b/OpenBudgeteer.Core/Common/Extensions/RecurringTransactionRecurrenceType.cs new file mode 100644 index 0000000..d96b27e --- /dev/null +++ b/OpenBudgeteer.Core/Common/Extensions/RecurringTransactionRecurrenceType.cs @@ -0,0 +1,18 @@ +using OpenBudgeteer.Core.ViewModels.EntityViewModels; + +namespace OpenBudgeteer.Core.Common.Extensions; + +/// +/// Identifier which kind of recurrence can be selected for a RecurringTransaction in +/// +public enum RecurringTransactionRecurrenceType +{ + [StringValue("Weeks")] + Weeks = 1, + [StringValue("Months")] + Months = 2, + [StringValue("Quarters")] + Quarters = 3, + [StringValue("Years")] + Years = 4, +} \ No newline at end of file diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/AccountViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/AccountViewModel.cs index 7394031..f71f29d 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/AccountViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/AccountViewModel.cs @@ -86,6 +86,7 @@ protected AccountViewModel(IServiceManager serviceManager, Account? account) : b AccountId = account.Id; _name = account.Name ?? string.Empty; _isActive = account.IsActive != 0; + if (!IsActive) _name += " (Inactive)"; } } @@ -118,6 +119,15 @@ public static AccountViewModel CreateFromAccount(IServiceManager serviceManager, { return new AccountViewModel(serviceManager, account); } + + /// + /// Initialize a copy of the passed ViewModel + /// + /// Current ViewModel instance + public static AccountViewModel CreateAsCopy(AccountViewModel accountViewModel) + { + return new AccountViewModel(accountViewModel); + } #endregion diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/RecurringTransactionViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/RecurringTransactionViewModel.cs index 8125efe..1766fa2 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/RecurringTransactionViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/RecurringTransactionViewModel.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using OpenBudgeteer.Core.Common; +using OpenBudgeteer.Core.Common.Extensions; using OpenBudgeteer.Core.Data.Contracts.Services; using OpenBudgeteer.Core.Data.Entities.Models; @@ -13,29 +14,21 @@ public class RecurringTransactionViewModel : BaseEntityViewModel /// Database Id of the RecurringBankTransaction /// public readonly Guid RecurringTransactionId; - private Guid _accountId; + private AccountViewModel _selectedAccount; /// - /// Database Id of the Account assigned to this RecurringBankTransaction + /// ViewModel instance of the selected Account /// - public Guid AccountId - { - get => _accountId; - set => Set(ref _accountId, value); + public AccountViewModel SelectedAccount + { + get => _selectedAccount; + set => Set(ref _selectedAccount, value); } - + private RecurringTransactionRecurrenceType _recurrenceType; /// /// Recurrence Type that is selected for the Transaction @@ -46,24 +39,6 @@ public RecurringTransactionRecurrenceType RecurrenceType set => Set(ref _recurrenceType, value); } - /// - /// Output of used for display purposes - /// - public string RecurrenceTypeOutput - { - get - { - return RecurrenceType switch - { - RecurringTransactionRecurrenceType.Days => nameof(RecurringTransactionRecurrenceType.Days), - RecurringTransactionRecurrenceType.Months => nameof(RecurringTransactionRecurrenceType.Months), - RecurringTransactionRecurrenceType.Quarter => nameof(RecurringTransactionRecurrenceType.Quarter), - RecurringTransactionRecurrenceType.Years => nameof(RecurringTransactionRecurrenceType.Years), - _ => throw new ArgumentOutOfRangeException() - }; - } - } - private int _recurrenceAmount; /// /// How often the Transaction repeats in combination with @@ -114,16 +89,6 @@ public decimal Amount set => Set(ref _amount, value); } - private AccountViewModel _selectedAccount; - /// - /// Account where the Transaction is assigned to - /// - public AccountViewModel SelectedAccount - { - get => _selectedAccount; - set => Set(ref _selectedAccount, value); - } - private bool _inModification; /// /// Helper property to check if the Transaction is currently modified @@ -149,17 +114,6 @@ public bool IsHovered /// public readonly ObservableCollection AvailableAccounts; - /// - /// Helper collection to list all existing Recurrence Types - /// - public List> AvailableRecurrenceTypes => new() - { - new KeyValuePair(1, "Weeks"), - new KeyValuePair(2, "Months"), - new KeyValuePair(3, "Quarters"), - new KeyValuePair(4, "Years") - }; - private RecurringTransactionViewModel? _oldRecurringTransactionViewModelItem; #endregion @@ -192,18 +146,21 @@ protected RecurringTransactionViewModel(IServiceManager serviceManager, IEnumera IsActive = 1, Name = "No Account" }; - _selectedAccount = AccountViewModel.CreateFromAccount(serviceManager, noAccount); - AvailableAccounts.Add(_selectedAccount); - - _firstOccurrenceDate = DateTime.Today; - _recurrenceType = RecurringTransactionRecurrenceType.Days; + RecurringTransactionId = Guid.Empty; + _amount = 0; _payee = string.Empty; _memo = string.Empty; + _firstOccurrenceDate = DateTime.Today; + _recurrenceType = RecurringTransactionRecurrenceType.Weeks; + _recurrenceAmount = 0; + + // Add the "No Account" for pre-selection + _selectedAccount = AccountViewModel.CreateFromAccount(serviceManager, noAccount); + AvailableAccounts.Add(_selectedAccount); } else { RecurringTransactionId = transaction.Id; - _accountId = transaction.AccountId; _amount = transaction.Amount; _memo = transaction.Memo ?? string.Empty; _payee = transaction.Payee ?? string.Empty; @@ -211,9 +168,13 @@ protected RecurringTransactionViewModel(IServiceManager serviceManager, IEnumera _recurrenceType = (RecurringTransactionRecurrenceType)transaction.RecurrenceType; _recurrenceAmount = transaction.RecurrenceAmount; - // Make inactive Account available in Selection, will later fail during saving + // Handle Accounts _selectedAccount = AccountViewModel.CreateFromAccount(serviceManager, transaction.Account); - if (SelectedAccount.IsActive) AvailableAccounts.Add(_selectedAccount); + if (!SelectedAccount.IsActive) + { + // Make inactive Account available in selection, will later fail during saving + AvailableAccounts.Add(SelectedAccount); + } } } @@ -232,14 +193,13 @@ protected RecurringTransactionViewModel(RecurringTransactionViewModel viewModel) // Handle Transaction RecurringTransactionId = viewModel.RecurringTransactionId; - _accountId = viewModel.AccountId; + _selectedAccount = AccountViewModel.CreateAsCopy(viewModel.SelectedAccount); _recurrenceType = viewModel.RecurrenceType; _recurrenceAmount = viewModel.RecurrenceAmount; _firstOccurrenceDate = viewModel.FirstOccurrenceDate; _payee = viewModel.Payee; _memo = viewModel.Memo; _amount = viewModel.Amount; - _selectedAccount = viewModel.SelectedAccount; } /// @@ -318,7 +278,7 @@ internal override RecurringBankTransaction ConvertToDto() return new RecurringBankTransaction() { Id = RecurringTransactionId, - AccountId = AccountId, + AccountId = SelectedAccount.AccountId, RecurrenceType = (int)RecurrenceType, RecurrenceAmount = RecurrenceAmount, Payee = Payee, @@ -404,14 +364,13 @@ public void CancelModification() { if (_oldRecurringTransactionViewModelItem != null) { - AccountId = _oldRecurringTransactionViewModelItem.AccountId; + SelectedAccount = _oldRecurringTransactionViewModelItem.SelectedAccount; RecurrenceType = _oldRecurringTransactionViewModelItem.RecurrenceType; RecurrenceAmount = _oldRecurringTransactionViewModelItem.RecurrenceAmount; Payee = _oldRecurringTransactionViewModelItem.Payee; Memo = _oldRecurringTransactionViewModelItem.Memo; Amount = _oldRecurringTransactionViewModelItem.Amount; FirstOccurrenceDate = _oldRecurringTransactionViewModelItem.FirstOccurrenceDate; - SelectedAccount = _oldRecurringTransactionViewModelItem.SelectedAccount; } InModification = false; _oldRecurringTransactionViewModelItem = null; diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs index bb2b37f..e2ba8ba 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs @@ -20,24 +20,14 @@ public class TransactionViewModel : BaseEntityViewModel /// public readonly Guid TransactionId; - private Guid _accountId; + private AccountViewModel _selectedAccount; /// - /// Database Id of the selected Account + /// ViewModel instance of the selected Account /// - public Guid AccountId - { - get => _accountId; - set => Set(ref _accountId, value); - } - - private string _accountName; - /// - /// Name of the selected Account - /// - public string AccountName - { - get => _accountName; - set => Set(ref _accountName, value); + public AccountViewModel SelectedAccount + { + get => _selectedAccount; + set => Set(ref _selectedAccount, value); } private DateTime _transactionDate; @@ -165,8 +155,10 @@ protected TransactionViewModel(IServiceManager serviceManager, IEnumerable i.AccountId == accountId).Name; - } - #endregion #region Misc @@ -653,7 +643,7 @@ string GetFieldValue(int comparisionField) { var fieldValue = comparisionField switch { - 1 => AccountName, + 1 => SelectedAccount.Name, 2 => Payee ?? "", 3 => Memo ?? "", 4 => Amount.ToString(CultureInfo.CurrentCulture), diff --git a/OpenBudgeteer.Core/ViewModels/Helper/RecurringTransactionHandlerViewModel.cs b/OpenBudgeteer.Core/ViewModels/Helper/RecurringTransactionHandlerViewModel.cs index b7ac5b1..323ba44 100644 --- a/OpenBudgeteer.Core/ViewModels/Helper/RecurringTransactionHandlerViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/Helper/RecurringTransactionHandlerViewModel.cs @@ -45,7 +45,7 @@ public async Task LoadDataAsync() .ToList(); var transactionTasks = ServiceManager.RecurringBankTransactionService - .GetAll() + .GetAllWithEntities() .Select(transaction => RecurringTransactionViewModel .CreateFromRecurringTransactionAsync(ServiceManager, availableAccounts, transaction)) .ToList(); From 0bb68e5cc296250d390d9606c0e6f34886127c7a Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Tue, 12 Mar 2024 17:05:59 +0100 Subject: [PATCH 45/57] Another fix for #221 --- CHANGELOG.md | 2 +- .../AccountRepository.cs | 8 +++---- .../BankTransactionRepository.cs | 8 +++---- .../BucketGroupRepository.cs | 8 +++---- .../BucketMovementRepository.cs | 8 +++---- .../BucketRepository.cs | 16 ++++++------- .../BucketRuleSetRepository.cs | 8 +++---- .../BucketVersionRepository.cs | 8 +++---- .../BudgetedTransactionRepository.cs | 10 ++++---- .../ImportProfileRepository.cs | 8 +++---- .../MappingRuleRepository.cs | 8 +++---- .../RecurringBankTransactionRepository.cs | 8 +++---- .../AccountService.cs | 2 +- .../BankTransactionService.cs | 4 ++-- .../BucketGroupService.cs | 4 ++-- .../BucketMovementService.cs | 2 +- .../BucketRuleSetService.cs | 8 +++---- .../BucketService.cs | 12 +++++----- .../BudgetedTransactionService.cs | 10 ++++---- .../20230211163906_GuidKeysStep2.cs | 24 +++++++++---------- 20 files changed, 83 insertions(+), 83 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86f8825..bbd32fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ * Mapping Rules using the Account Name instead of Account Id [#199](https://github.com/TheAxelander/OpenBudgeteer/pull/199) Thanks [Lucaber](https://github.com/Lucaber) * Adding a Mapping Rule to an existing Rule Set no longer fails [#200](https://github.com/TheAxelander/OpenBudgeteer/pull/200) Thanks [Lucaber](https://github.com/Lucaber) * Exception after canceling creation of a new Recurring Transactions [#210](https://github.com/TheAxelander/OpenBudgeteer/issues/210) -* Guid issues using Sqlite database [#221](https://github.com/TheAxelander/OpenBudgeteer/issues/221) +* Sqlite database migration issue (Guid generation) since `1.7` [#221](https://github.com/TheAxelander/OpenBudgeteer/issues/221) * Fix `Expand All` button typo on Bucket Page [#224](https://github.com/TheAxelander/OpenBudgeteer/issues/224) ### :hammer: Maintenance diff --git a/OpenBudgeteer.Core.Data.Repository/AccountRepository.cs b/OpenBudgeteer.Core.Data.Repository/AccountRepository.cs index 68eb3f1..ead1826 100644 --- a/OpenBudgeteer.Core.Data.Repository/AccountRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/AccountRepository.cs @@ -21,10 +21,10 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Account .AsNoTracking(); public Account? ById(Guid id) => DatabaseContext.Account - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public Account? ByIdWithIncludedEntities(Guid id) => DatabaseContext.Account - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public int Create(Account entity) { @@ -52,7 +52,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.Account.FirstOrDefault(i => i.Id.ToString() == id.ToString()); + var entity = DatabaseContext.Account.FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"Account with id {id} not found."); DatabaseContext.Account.Remove(entity); @@ -61,7 +61,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.Account.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); + var entities = DatabaseContext.Account.Where(i => ids.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No Account found with passed IDs."); DatabaseContext.Account.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/BankTransactionRepository.cs b/OpenBudgeteer.Core.Data.Repository/BankTransactionRepository.cs index d392ed3..fcda13d 100644 --- a/OpenBudgeteer.Core.Data.Repository/BankTransactionRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BankTransactionRepository.cs @@ -23,12 +23,12 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext. .AsNoTracking(); public BankTransaction? ById(Guid id) => DatabaseContext.BankTransaction - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public BankTransaction? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BankTransaction .Include(i => i.Account) .Include(i => i.BudgetedTransactions) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public int Create(BankTransaction entity) { @@ -58,7 +58,7 @@ public int Delete(Guid id) { var entity = DatabaseContext.BankTransaction .Include(i => i.BudgetedTransactions) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"BankTransaction with id {id} not found."); DatabaseContext.BankTransaction.Remove(entity); @@ -69,7 +69,7 @@ public int DeleteRange(IEnumerable ids) { var entities = DatabaseContext.BankTransaction .Include(i => i.BudgetedTransactions) - .Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); + .Where(i => ids.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No BankTransactions found with passed IDs."); DatabaseContext.BankTransaction.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs index 8e6f1aa..5453bc7 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs @@ -22,11 +22,11 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Buck .AsNoTracking(); public BucketGroup? ById(Guid id) => DatabaseContext.BucketGroup - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public BucketGroup? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BucketGroup .Include(i => i.Buckets) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public int Create(BucketGroup entity) { @@ -58,7 +58,7 @@ public int Delete(Guid id) var entity = DatabaseContext.BucketGroup .Include(i => i.Buckets) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"BucketGroup with id {id} not found."); if (entity.Buckets.Count != 0) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); @@ -73,7 +73,7 @@ public int DeleteRange(IEnumerable ids) .ToList(); var entities = DatabaseContext.BucketGroup .Include(i => i.Buckets) - .Where(i => cleansedEntities.Select(j => j.ToString()).Contains(i.Id.ToString())); + .Where(i => cleansedEntities.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No BucketGroup found with passed IDs."); if (entities.Any(i => i.Buckets.Count != 0)) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketMovementRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketMovementRepository.cs index 270e737..c59e1f6 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketMovementRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketMovementRepository.cs @@ -22,11 +22,11 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.B .AsNoTracking(); public BucketMovement? ById(Guid id) => DatabaseContext.BucketMovement - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public BucketMovement? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BucketMovement .Include(i => i.Bucket) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public int Create(BucketMovement entity) { @@ -54,7 +54,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.BucketMovement.FirstOrDefault(i => i.Id.ToString() == id.ToString()); + var entity = DatabaseContext.BucketMovement.FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"BucketMovement with id {id} not found."); DatabaseContext.BucketMovement.Remove(entity); @@ -63,7 +63,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.BucketMovement.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); + var entities = DatabaseContext.BucketMovement.Where(i => ids.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No BucketMovement found with passed IDs."); DatabaseContext.BucketMovement.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs index 3b2f91c..32d70c5 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs @@ -34,31 +34,31 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Bucket .AsNoTracking(); public Bucket? ById(Guid id) => DatabaseContext.Bucket - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public Bucket? ByIdWithVersions(Guid id) => DatabaseContext.Bucket .Include(i => i.BucketVersions) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public Bucket? ByIdWithMovements(Guid id) => DatabaseContext.Bucket .Include(i => i.BucketMovements) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public Bucket? ByIdWithTransactions(Guid id) => DatabaseContext.Bucket .Include(i => i.BudgetedTransactions).ThenInclude(i => i.Transaction) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); /*public Bucket? ByIdWithActivities(Guid id) => DatabaseContext.Bucket .Include(i => i.BucketMovements) .Include(i => i.BudgetedTransactions).ThenInclude(i => i.Transaction) - .FirstOrDefault(i => i.Id.ToString() == id.ToString());*/ + .FirstOrDefault(i => i.Id == id);*/ public Bucket? ByIdWithIncludedEntities(Guid id) => DatabaseContext.Bucket .Include(i => i.BucketGroup) .Include(i => i.BucketMovements) .Include(i => i.BucketVersions) .Include(i => i.BudgetedTransactions) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public int Create(Bucket entity) { @@ -93,7 +93,7 @@ public int Delete(Guid id) .Include(i => i.BucketMovements) .Include(i => i.BucketVersions) .Include(i => i.BudgetedTransactions) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"Bucket with id {id} not found."); if (entity.BucketMovements.Count != 0) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); if (entity.BudgetedTransactions.Count != 0) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); @@ -114,7 +114,7 @@ public int DeleteRange(IEnumerable ids) .Include(i => i.BucketMovements) .Include(i => i.BucketVersions) .Include(i => i.BudgetedTransactions) - .Where(i => cleansedEntities.Select(j => j.ToString()).Contains(i.Id.ToString())); + .Where(i => cleansedEntities.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No Buckets found with passed IDs."); if (entities.Any(i => i.BucketMovements.Count != 0)) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); if (entities.Any(i => i.BudgetedTransactions.Count != 0)) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketRuleSetRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketRuleSetRepository.cs index a505e2a..044c579 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketRuleSetRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketRuleSetRepository.cs @@ -24,12 +24,12 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Bu .AsNoTracking(); public BucketRuleSet? ById(Guid id) => DatabaseContext.BucketRuleSet - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public BucketRuleSet? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BucketRuleSet .Include(i => i.TargetBucket) .Include(i => i.MappingRules) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public int Create(BucketRuleSet entity) { @@ -59,7 +59,7 @@ public int Delete(Guid id) { var entity = DatabaseContext.BucketRuleSet .Include(i => i.MappingRules) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"BucketRuleSet with id {id} not found."); DatabaseContext.BucketRuleSet.Remove(entity); @@ -70,7 +70,7 @@ public int DeleteRange(IEnumerable ids) { var entities = DatabaseContext.BucketRuleSet .Include(i => i.MappingRules) - .Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); + .Where(i => ids.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No BucketRuleSets found with passed IDs."); DatabaseContext.BucketRuleSet.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketVersionRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketVersionRepository.cs index a760a86..a407b35 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketVersionRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketVersionRepository.cs @@ -22,11 +22,11 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Bu .AsNoTracking(); public BucketVersion? ById(Guid id) => DatabaseContext.BucketVersion - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public BucketVersion? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BucketVersion .Include(i => i.Bucket) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public int Create(BucketVersion entity) { @@ -54,7 +54,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.BucketVersion.FirstOrDefault(i => i.Id.ToString() == id.ToString()); + var entity = DatabaseContext.BucketVersion.FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"BucketVersion with id {id} not found."); DatabaseContext.BucketVersion.Remove(entity); @@ -63,7 +63,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.BucketVersion.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); + var entities = DatabaseContext.BucketVersion.Where(i => ids.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No BucketVersions found with passed IDs."); DatabaseContext.BucketVersion.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/BudgetedTransactionRepository.cs b/OpenBudgeteer.Core.Data.Repository/BudgetedTransactionRepository.cs index 4e8a4a6..35b77e3 100644 --- a/OpenBudgeteer.Core.Data.Repository/BudgetedTransactionRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BudgetedTransactionRepository.cs @@ -29,17 +29,17 @@ public IQueryable AllWithTransactions() => DatabaseContext. .AsNoTracking(); public BudgetedTransaction? ById(Guid id) => DatabaseContext.BudgetedTransaction - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public BudgetedTransaction? ByIdWithTransaction(Guid id) => DatabaseContext.BudgetedTransaction .Include(i => i.Transaction) .Include(i => i.Transaction.Account) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public BudgetedTransaction? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BudgetedTransaction .Include(i => i.Bucket) .Include(i => i.Transaction) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public int Create(BudgetedTransaction entity) { @@ -67,7 +67,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.BudgetedTransaction.FirstOrDefault(i => i.Id.ToString() == id.ToString()); + var entity = DatabaseContext.BudgetedTransaction.FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"BudgetedTransaction with id {id} not found."); DatabaseContext.BudgetedTransaction.Remove(entity); @@ -76,7 +76,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.BudgetedTransaction.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); + var entities = DatabaseContext.BudgetedTransaction.Where(i => ids.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No BudgetedTransactions found with passed IDs."); DatabaseContext.BudgetedTransaction.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/ImportProfileRepository.cs b/OpenBudgeteer.Core.Data.Repository/ImportProfileRepository.cs index fff20b1..24e32d9 100644 --- a/OpenBudgeteer.Core.Data.Repository/ImportProfileRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/ImportProfileRepository.cs @@ -23,11 +23,11 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Im .AsNoTracking(); public ImportProfile? ById(Guid id) => DatabaseContext.ImportProfile - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public ImportProfile? ByIdWithIncludedEntities(Guid id) => DatabaseContext.ImportProfile .Include(i => i.Account) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public int Create(ImportProfile entity) { @@ -55,7 +55,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.ImportProfile.FirstOrDefault(i => i.Id.ToString() == id.ToString()); + var entity = DatabaseContext.ImportProfile.FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"ImportProfile with id {id} not found."); DatabaseContext.ImportProfile.Remove(entity); @@ -64,7 +64,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.ImportProfile.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); + var entities = DatabaseContext.ImportProfile.Where(i => ids.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No ImportProfiles found with passed IDs."); DatabaseContext.ImportProfile.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/MappingRuleRepository.cs b/OpenBudgeteer.Core.Data.Repository/MappingRuleRepository.cs index 0a40460..17a3fde 100644 --- a/OpenBudgeteer.Core.Data.Repository/MappingRuleRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/MappingRuleRepository.cs @@ -22,11 +22,11 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Mapp .AsNoTracking(); public MappingRule? ById(Guid id) => DatabaseContext.MappingRule - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public MappingRule? ByIdWithIncludedEntities(Guid id) => DatabaseContext.MappingRule .Include(i => i.BucketRuleSet) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public int Create(MappingRule entity) { @@ -54,7 +54,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.MappingRule.FirstOrDefault(i => i.Id.ToString() == id.ToString()); + var entity = DatabaseContext.MappingRule.FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"MappingRule with id {id} not found."); DatabaseContext.MappingRule.Remove(entity); @@ -63,7 +63,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.MappingRule.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); + var entities = DatabaseContext.MappingRule.Where(i => ids.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No MappingRules found with passed IDs."); DatabaseContext.MappingRule.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/RecurringBankTransactionRepository.cs b/OpenBudgeteer.Core.Data.Repository/RecurringBankTransactionRepository.cs index f271f75..b69a7ec 100644 --- a/OpenBudgeteer.Core.Data.Repository/RecurringBankTransactionRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/RecurringBankTransactionRepository.cs @@ -23,11 +23,11 @@ public IQueryable AllWithIncludedEntities() => Databas .AsNoTracking(); public RecurringBankTransaction? ById(Guid id) => DatabaseContext.RecurringBankTransaction - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public RecurringBankTransaction? ByIdWithIncludedEntities(Guid id) => DatabaseContext.RecurringBankTransaction .Include(i => i.Account) - .FirstOrDefault(i => i.Id.ToString() == id.ToString()); + .FirstOrDefault(i => i.Id == id); public int Create(RecurringBankTransaction entity) { @@ -55,7 +55,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.RecurringBankTransaction.FirstOrDefault(i => i.Id.ToString() == id.ToString()); + var entity = DatabaseContext.RecurringBankTransaction.FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"RecurringBankTransaction with id {id} not found."); DatabaseContext.RecurringBankTransaction.Remove(entity); @@ -64,7 +64,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.RecurringBankTransaction.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); + var entities = DatabaseContext.RecurringBankTransaction.Where(i => ids.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No RecurringBankTransactions found with passed IDs."); DatabaseContext.RecurringBankTransaction.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Services/AccountService.cs b/OpenBudgeteer.Core.Data.Services/AccountService.cs index 3fe5814..f75ae9f 100644 --- a/OpenBudgeteer.Core.Data.Services/AccountService.cs +++ b/OpenBudgeteer.Core.Data.Services/AccountService.cs @@ -58,7 +58,7 @@ public Account CloseAccount(Guid id) using var dbContext = new DatabaseContext(DbContextOptions); var repository = new BankTransactionRepository(dbContext); var balance = repository.All() - .Where(i => i.AccountId.ToString() == id.ToString()) + .Where(i => i.Id == id) .ToList() .Sum(i => i.Amount); if (balance != 0) throw new Exception("Balance must be 0 to close an Account"); diff --git a/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs b/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs index 993f39a..50e80a9 100644 --- a/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs +++ b/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs @@ -73,7 +73,7 @@ public IEnumerable GetFromAccount(Guid accountId, DateTime? per .Where(i => i.TransactionDate >= (periodStart ?? DateTime.MinValue) && i.TransactionDate <= (periodEnd ?? DateTime.MaxValue) && - i.AccountId.ToString() == accountId.ToString()) + i.AccountId == accountId) .OrderByDescending(i => i.TransactionDate) .ToList(); return limit > 0 @@ -121,7 +121,7 @@ public override BankTransaction Update(BankTransaction entity) // Delete all existing bucket assignments, as they will be replaced by passed assignments var deletedIds = budgetedTransactionRepository.All() - .Where(i => i.TransactionId.ToString() == entity.Id.ToString()) + .Where(i => i.TransactionId == entity.Id) .Select(i => i.Id) .ToList(); diff --git a/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs b/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs index 2aeff07..f906460 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs @@ -40,7 +40,7 @@ public override IEnumerable GetAll() var repository = new BucketGroupRepository(dbContext); return repository .AllWithIncludedEntities() - .Where(i => i.Id.ToString() != "00000000-0000-0000-0000-000000000001") + .Where(i => i.Id != Guid.Parse("00000000-0000-0000-0000-000000000001")) .OrderBy(i => i.Position) .ToList(); } @@ -76,7 +76,7 @@ public IEnumerable GetSystemBucketGroups() using var dbContext = new DatabaseContext(DbContextOptions); var repository = new BucketGroupRepository(dbContext); return repository.AllWithIncludedEntities() - .Where(i => i.Id.ToString() == "00000000-0000-0000-0000-000000000001") + .Where(i => i.Id == Guid.Parse("00000000-0000-0000-0000-000000000001")) .OrderBy(i => i.Position) //In case in future there are multiple groups .ToList(); } diff --git a/OpenBudgeteer.Core.Data.Services/BucketMovementService.cs b/OpenBudgeteer.Core.Data.Services/BucketMovementService.cs index 821d368..3ff63c8 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketMovementService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketMovementService.cs @@ -49,7 +49,7 @@ public IEnumerable GetAllFromBucket(Guid bucketId, DateTime peri .Where(i => i.MovementDate >= periodStart && i.MovementDate <= periodEnd && - i.BucketId.ToString() == bucketId.ToString()) + i.BucketId == bucketId) .ToList(); } catch (Exception e) diff --git a/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs b/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs index 208489c..4dfd27c 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs @@ -57,7 +57,7 @@ public IEnumerable GetMappingRules(Guid bucketRuleSetId) var repository = new MappingRuleRepository(dbContext); return repository .AllWithIncludedEntities() - .Where(i => i.BucketRuleSetId.ToString() == bucketRuleSetId.ToString()) + .Where(i => i.BucketRuleSetId == bucketRuleSetId) .ToList(); } catch (Exception e) @@ -80,11 +80,11 @@ public override BucketRuleSet Update(BucketRuleSet entity) var deletedIds = // Collect database entities mappingRuleRepository.All() - .Where(i => i.BucketRuleSetId.ToString() == entity.Id.ToString()) + .Where(i => i.BucketRuleSetId == entity.Id) .ToList() // Select which of the database IDs are no longer available in entity .Where(i => entity.MappingRules - .All(j => j.Id.ToString() != i.Id.ToString())) + .All(j => j.Id != i.Id)) .Select(i => i.Id) .ToList(); if (deletedIds.Count != 0) @@ -120,7 +120,7 @@ public override void Delete(Guid id) // Delete all existing Mapping Rules mappingRuleRepository.DeleteRange(mappingRuleRepository .All() - .Where(i => i.BucketRuleSetId.ToString() == id.ToString()) + .Where(i => i.BucketRuleSetId == id) .Select(i => i.Id) .ToList()); diff --git a/OpenBudgeteer.Core.Data.Services/BucketService.cs b/OpenBudgeteer.Core.Data.Services/BucketService.cs index 8be51b7..af69f02 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketService.cs @@ -44,8 +44,8 @@ public override IEnumerable GetAll() return repository .All() .Where(i => - i.Id.ToString() != "00000000-0000-0000-0000-000000000001" && - i.Id.ToString() != "00000000-0000-0000-0000-000000000002") + i.Id != Guid.Parse("00000000-0000-0000-0000-000000000001") && + i.Id != Guid.Parse("00000000-0000-0000-0000-000000000002")) .OrderBy(i => i.Name) .ToList(); } @@ -66,8 +66,8 @@ public IEnumerable GetSystemBuckets() return repository .All() .Where(i => - i.Id.ToString() == "00000000-0000-0000-0000-000000000001" || - i.Id.ToString() == "00000000-0000-0000-0000-000000000002") + i.Id == Guid.Parse("00000000-0000-0000-0000-000000000001") || + i.Id == Guid.Parse("00000000-0000-0000-0000-000000000002")) .ToList(); } catch (Exception e) @@ -121,7 +121,7 @@ public BucketVersion GetLatestVersion(Guid bucketId, DateTime yearMonth) var result = repository .All() - .Where(i => i.BucketId.ToString() == bucketId.ToString()) + .Where(i => i.BucketId == bucketId) .OrderByDescending(i => i.ValidFrom) .ToList() .FirstOrDefault(i => i!.ValidFrom <= yearMonth, null); @@ -413,7 +413,7 @@ public override void Delete(Guid id) // Delete all BucketRuleSet which refer to this Bucket var bucketRuleSetIds = bucketRuleSetRepository .All() - .Where(i => i.TargetBucketId.ToString() == id.ToString()) + .Where(i => i.TargetBucketId == id) .Select(i => i.Id) .ToList(); if (bucketRuleSetIds.Count != 0) bucketRuleSetRepository.DeleteRange(bucketRuleSetIds); diff --git a/OpenBudgeteer.Core.Data.Services/BudgetedTransactionService.cs b/OpenBudgeteer.Core.Data.Services/BudgetedTransactionService.cs index 2716893..434d346 100644 --- a/OpenBudgeteer.Core.Data.Services/BudgetedTransactionService.cs +++ b/OpenBudgeteer.Core.Data.Services/BudgetedTransactionService.cs @@ -51,7 +51,7 @@ public IEnumerable GetAllFromTransaction(Guid transactionId .Where(i => i.Transaction.TransactionDate >= periodStart && i.Transaction.TransactionDate <= periodEnd && - i.TransactionId.ToString() == transactionId.ToString()) + i.TransactionId == transactionId) .ToList(); } catch (Exception e) @@ -78,7 +78,7 @@ public IEnumerable GetAllFromBucket(Guid bucketId, DateTime .Where(i => i.Transaction.TransactionDate >= periodStart && i.Transaction.TransactionDate <= periodEnd && - i.BucketId.ToString() == bucketId.ToString()) + i.BucketId == bucketId) .OrderByDescending(i => i.Transaction.TransactionDate) .ToList(); } @@ -106,7 +106,7 @@ public IEnumerable GetAllNonTransfer(DateTime periodStart, .Where(i => i.Transaction.TransactionDate >= periodStart && i.Transaction.TransactionDate <= periodEnd && - i.BucketId.ToString() != "00000000-0000-0000-0000-000000000002") + i.BucketId != Guid.Parse("00000000-0000-0000-0000-000000000002")) .ToList(); } catch (Exception e) @@ -133,7 +133,7 @@ public IEnumerable GetAllTransfer(DateTime periodStart, Dat .Where(i => i.Transaction.TransactionDate >= periodStart && i.Transaction.TransactionDate <= periodEnd && - i.BucketId.ToString() == "00000000-0000-0000-0000-000000000002") + i.BucketId == Guid.Parse("00000000-0000-0000-0000-000000000002")) .ToList(); } catch (Exception e) @@ -160,7 +160,7 @@ public IEnumerable GetAllIncome(DateTime periodStart, DateT .Where(i => i.Transaction.TransactionDate >= periodStart && i.Transaction.TransactionDate <= periodEnd && - i.BucketId.ToString() == "00000000-0000-0000-0000-000000000001") + i.BucketId == Guid.Parse("00000000-0000-0000-0000-000000000001")) .ToList(); } catch (Exception e) diff --git a/OpenBudgeteer.Core.Data.Sqlite.Migrations/20230211163906_GuidKeysStep2.cs b/OpenBudgeteer.Core.Data.Sqlite.Migrations/20230211163906_GuidKeysStep2.cs index de6deec..bce0965 100644 --- a/OpenBudgeteer.Core.Data.Sqlite.Migrations/20230211163906_GuidKeysStep2.cs +++ b/OpenBudgeteer.Core.Data.Sqlite.Migrations/20230211163906_GuidKeysStep2.cs @@ -9,29 +9,29 @@ public partial class GuidKeysStep2 : Migration { protected override void Up(MigrationBuilder migrationBuilder) { - var generateGuid = @"lower(hex(randomblob(4)) || '-' || hex(randomblob(2)) || '-' || hex(randomblob(2)) || '-' || hex(randomblob(2)) || '-' || hex(randomblob(6)))"; + var generateGuid = "'11111111-0000-0000-0000-' || printf('%012d', "; - migrationBuilder.Sql($@"UPDATE Account SET AccountGuidId = {generateGuid}"); + migrationBuilder.Sql($@"UPDATE Account SET AccountGuidId = {generateGuid}AccountId)"); - migrationBuilder.Sql($@"UPDATE BankTransaction SET TransactionGuidId = {generateGuid}"); + migrationBuilder.Sql($@"UPDATE BankTransaction SET TransactionGuidId = {generateGuid}TransactionId)"); - migrationBuilder.Sql($@"UPDATE Bucket SET BucketGuidId = {generateGuid}"); + migrationBuilder.Sql($@"UPDATE Bucket SET BucketGuidId = {generateGuid}BucketId)"); - migrationBuilder.Sql($@"UPDATE BucketGroup SET BucketGroupGuidId = {generateGuid}"); + migrationBuilder.Sql($@"UPDATE BucketGroup SET BucketGroupGuidId = {generateGuid}BucketGroupId)"); - migrationBuilder.Sql($@"UPDATE BucketMovement SET BucketMovementGuidId = {generateGuid}"); + migrationBuilder.Sql($@"UPDATE BucketMovement SET BucketMovementGuidId = {generateGuid}BucketMovementId)"); - migrationBuilder.Sql($@"UPDATE BucketRuleSet SET BucketRuleSetGuidId = {generateGuid}"); + migrationBuilder.Sql($@"UPDATE BucketRuleSet SET BucketRuleSetGuidId = {generateGuid}BucketRuleSetId)"); - migrationBuilder.Sql($@"UPDATE BucketVersion SET BucketVersionGuidId = {generateGuid}"); + migrationBuilder.Sql($@"UPDATE BucketVersion SET BucketVersionGuidId = {generateGuid}BucketVersionId)"); - migrationBuilder.Sql($@"UPDATE BudgetedTransaction SET BudgetedTransactionGuidId = {generateGuid}"); + migrationBuilder.Sql($@"UPDATE BudgetedTransaction SET BudgetedTransactionGuidId = {generateGuid}BudgetedTransactionId)"); - migrationBuilder.Sql($@"UPDATE ImportProfile SET ImportProfileGuidId = {generateGuid}"); + migrationBuilder.Sql($@"UPDATE ImportProfile SET ImportProfileGuidId = {generateGuid}ImportProfileId)"); - migrationBuilder.Sql($@"UPDATE MappingRule SET MappingRuleGuidId = {generateGuid}"); + migrationBuilder.Sql($@"UPDATE MappingRule SET MappingRuleGuidId = {generateGuid}MappingRuleId)"); - migrationBuilder.Sql($@"UPDATE RecurringBankTransaction SET TransactionGuidId = {generateGuid}"); + migrationBuilder.Sql($@"UPDATE RecurringBankTransaction SET TransactionGuidId = {generateGuid}TransactionId)"); migrationBuilder.Sql(@"INSERT INTO BucketGroup (BucketGroupId, Name, Position, BucketGroupGuidId) VALUES (0, 'System', 0, '00000000-0000-0000-0000-000000000001')"); From 67bbd09504eeebbccd9adbaaf5fdb7d75900afae Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Thu, 14 Mar 2024 07:58:16 +0100 Subject: [PATCH 46/57] Fix #228 and implement ICloneable for all EntityViewModel --- OpenBudgeteer.Blazor/Pages/Rules.razor | 37 +++--- OpenBudgeteer.Blazor/Pages/Rules.razor.cs | 18 +++ .../Shared/EditBucketDialog.razor | 4 +- .../Extensions/MappingRuleComparisonField.cs | 13 ++ .../Extensions/MappingRuleComparisonType.cs | 13 ++ .../EntityViewModels/AccountViewModel.cs | 12 +- .../EntityViewModels/BaseEntityViewModel.cs | 3 +- .../EntityViewModels/BucketGroupViewModel.cs | 8 ++ .../BucketVersionViewModel.cs | 25 ++-- .../EntityViewModels/BucketViewModel.cs | 88 ++++++++++-- .../ImportProfileViewModel.cs | 8 ++ .../EntityViewModels/MappingRuleViewModel.cs | 125 ++++++------------ .../PartialBucketViewModel.cs | 26 +++- .../RecurringTransactionViewModel.cs | 28 ++-- .../EntityViewModels/RuleSetViewModel.cs | 34 +++-- .../EntityViewModels/TransactionViewModel.cs | 48 ++++--- 16 files changed, 310 insertions(+), 180 deletions(-) create mode 100644 OpenBudgeteer.Core/Common/Extensions/MappingRuleComparisonField.cs create mode 100644 OpenBudgeteer.Core/Common/Extensions/MappingRuleComparisonType.cs diff --git a/OpenBudgeteer.Blazor/Pages/Rules.razor b/OpenBudgeteer.Blazor/Pages/Rules.razor index 35467fa..4d09cbd 100644 --- a/OpenBudgeteer.Blazor/Pages/Rules.razor +++ b/OpenBudgeteer.Blazor/Pages/Rules.razor @@ -1,6 +1,5 @@ @page "/rules" -@using System @using System.Drawing @using OpenBudgeteer.Core.Common.Extensions @using OpenBudgeteer.Core.ViewModels.EntityViewModels @@ -47,26 +46,26 @@
Payee Memo Amount +
+ @transaction.Payee @transaction.Memo @transaction.Amount.ToString("C", CultureInfo.CurrentCulture) +
DateAccountPayeeAccountPayee Memo Amount
@transaction.TransactionDate.ToShortDateString()@transaction.AccountName@transaction.Payee@transaction.AccountName@transaction.Payee @transaction.Memo @transaction.Amount.ToString("C", CultureInfo.CurrentCulture)
@_dataContext.SelectedImportProfile.Account.Name @transaction.Result.Payee @transaction.Result.Memo@transaction.Result.Amount@transaction.Result.Amount.ToString("C", CultureInfo.CurrentCulture)
@_dataContext.SelectedImportProfile.Account.Name @duplicate.Item1.Result.Payee @duplicate.Item1.Result.Memo@duplicate.Item1.Result.Amount@duplicate.Item1.Result.Amount.ToString("C", CultureInfo.CurrentCulture)
@_dataContext.SelectedImportProfile.Account.Name @bankTransaction.Payee @bankTransaction.Memo@bankTransaction.Amount@bankTransaction.Amount.ToString("C", CultureInfo.CurrentCulture)
@if (bucket.IsInactive) { -
+
@($"{bucket.Name} (Inactive from: {bucket.IsInactiveFrom.ToShortDateString()})")
} else { -
@bucket.Name
+
@bucket.Name
}
@bucket.Balance.ToString("C", CultureInfo.CurrentCulture) - -
@ruleSet.Priority @ruleSet.Name
@ruleSet.TargetBucketName
@ruleSet.TargetBucketName
    @foreach (var mappingRule in ruleSet.MappingRules) diff --git a/OpenBudgeteer.Blazor/Pages/Transaction.razor b/OpenBudgeteer.Blazor/Pages/Transaction.razor index ee4a3c1..bc65945 100644 --- a/OpenBudgeteer.Blazor/Pages/Transaction.razor +++ b/OpenBudgeteer.Blazor/Pages/Transaction.razor @@ -74,7 +74,7 @@ {
-
- @foreach (var bucket in transaction.Buckets) { -
+
@bucket.SelectedBucketName
@bucket.Amount.ToString("C", CultureInfo.CurrentCulture)
diff --git a/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor b/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor index 9dbe4fa..69d1519 100644 --- a/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/BucketSelectDialog.razor @@ -63,7 +63,7 @@ {
-
-
- - -
- - + +
@@ -38,6 +27,17 @@ }
+
+ + +
@if (_isNumberOfMonthsEnabled) @@ -72,13 +72,24 @@ }
- - + @bind:set="(value) => { DataContext.ColorCode = Convert.ToString(value); }"> + @foreach (var color in DataContext.AvailableColors!) + { + + } + +
+
+ +
diff --git a/OpenBudgeteer.Core.Data.Entities/Models/Bucket.cs b/OpenBudgeteer.Core.Data.Entities/Models/Bucket.cs index ecf4360..35f8e3b 100644 --- a/OpenBudgeteer.Core.Data.Entities/Models/Bucket.cs +++ b/OpenBudgeteer.Core.Data.Entities/Models/Bucket.cs @@ -20,6 +20,8 @@ public class Bucket : IEntity public string? ColorCode { get; set; } + public string? TextColorCode { get; set; } + [Required] public DateTime ValidFrom { get; set; } diff --git a/OpenBudgeteer.Core.Data.MySql.Migrations/20231221153127_AddBucketTextColor.Designer.cs b/OpenBudgeteer.Core.Data.MySql.Migrations/20231221153127_AddBucketTextColor.Designer.cs new file mode 100644 index 0000000..2f99387 --- /dev/null +++ b/OpenBudgeteer.Core.Data.MySql.Migrations/20231221153127_AddBucketTextColor.Designer.cs @@ -0,0 +1,496 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using OpenBudgeteer.Core.Data.Entities; + +#nullable disable + +namespace OpenBudgeteer.Core.Data.MySql.Migrations +{ + [DbContext(typeof(DatabaseContext))] + [Migration("20231221153127_AddBucketTextColor")] + partial class AddBucketTextColor + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "8.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Account", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)") + .HasColumnName("AccountId"); + + b.Property("IsActive") + .HasColumnType("int"); + + b.Property("Name") + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)") + .HasColumnName("TransactionId"); + + b.Property("AccountId") + .HasColumnType("char(36)"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("Memo") + .HasColumnType("longtext"); + + b.Property("Payee") + .HasColumnType("longtext"); + + b.Property("TransactionDate") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.HasIndex("AccountId"); + + b.ToTable("BankTransaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)") + .HasColumnName("BucketId"); + + b.Property("BucketGroupId") + .HasColumnType("char(36)"); + + b.Property("ColorCode") + .HasColumnType("longtext"); + + b.Property("IsInactive") + .HasColumnType("tinyint(1)"); + + b.Property("IsInactiveFrom") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .HasColumnType("longtext"); + + b.Property("TextColorCode") + .HasColumnType("longtext"); + + b.Property("ValidFrom") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.HasIndex("BucketGroupId"); + + b.ToTable("Bucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)") + .HasColumnName("BucketGroupId"); + + b.Property("Name") + .HasColumnType("longtext"); + + b.Property("Position") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("BucketGroup"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketMovement", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)") + .HasColumnName("BucketMovementId"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("BucketId") + .HasColumnType("char(36)"); + + b.Property("MovementDate") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.HasIndex("BucketId"); + + b.ToTable("BucketMovement"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)") + .HasColumnName("BucketRuleSetId"); + + b.Property("Name") + .HasColumnType("longtext"); + + b.Property("Priority") + .HasColumnType("int"); + + b.Property("TargetBucketId") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("TargetBucketId"); + + b.ToTable("BucketRuleSet"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketVersion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)") + .HasColumnName("BucketVersionId"); + + b.Property("BucketId") + .HasColumnType("char(36)"); + + b.Property("BucketType") + .HasColumnType("int"); + + b.Property("BucketTypeXParam") + .HasColumnType("int"); + + b.Property("BucketTypeYParam") + .HasColumnType("decimal(65, 2)"); + + b.Property("BucketTypeZParam") + .HasColumnType("datetime(6)"); + + b.Property("Notes") + .HasColumnType("longtext"); + + b.Property("ValidFrom") + .HasColumnType("datetime(6)"); + + b.Property("Version") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BucketId"); + + b.ToTable("BucketVersion"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BudgetedTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)") + .HasColumnName("BudgetedTransactionId"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("BucketId") + .HasColumnType("char(36)"); + + b.Property("TransactionId") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("BucketId"); + + b.HasIndex("TransactionId"); + + b.ToTable("BudgetedTransaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.ImportProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)") + .HasColumnName("ImportProfileId"); + + b.Property("AccountId") + .HasColumnType("char(36)"); + + b.Property("AdditionalSettingAmountCleanup") + .HasColumnType("tinyint(1)"); + + b.Property("AdditionalSettingAmountCleanupValue") + .HasColumnType("longtext"); + + b.Property("AdditionalSettingCreditValue") + .HasColumnType("int"); + + b.Property("AmountColumnName") + .HasColumnType("longtext"); + + b.Property("CreditColumnIdentifierColumnName") + .HasColumnType("longtext"); + + b.Property("CreditColumnIdentifierValue") + .HasColumnType("longtext"); + + b.Property("CreditColumnName") + .HasColumnType("longtext"); + + b.Property("DateFormat") + .HasColumnType("longtext"); + + b.Property("Delimiter") + .IsRequired() + .HasColumnType("varchar(1)"); + + b.Property("HeaderRow") + .HasColumnType("int"); + + b.Property("MemoColumnName") + .HasColumnType("longtext"); + + b.Property("NumberFormat") + .HasColumnType("longtext"); + + b.Property("PayeeColumnName") + .HasColumnType("longtext"); + + b.Property("ProfileName") + .HasColumnType("longtext"); + + b.Property("TextQualifier") + .IsRequired() + .HasColumnType("varchar(1)"); + + b.Property("TransactionDateColumnName") + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("AccountId"); + + b.ToTable("ImportProfile"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.MappingRule", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)") + .HasColumnName("MappingRuleId"); + + b.Property("BucketRuleSetId") + .HasColumnType("char(36)"); + + b.Property("ComparisionField") + .HasColumnType("int"); + + b.Property("ComparisionType") + .HasColumnType("int"); + + b.Property("ComparisionValue") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("BucketRuleSetId"); + + b.ToTable("MappingRule"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.RecurringBankTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)") + .HasColumnName("TransactionId"); + + b.Property("AccountId") + .HasColumnType("char(36)"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("FirstOccurrenceDate") + .HasColumnType("datetime(6)"); + + b.Property("Memo") + .HasColumnType("longtext"); + + b.Property("Payee") + .HasColumnType("longtext"); + + b.Property("RecurrenceAmount") + .HasColumnType("int"); + + b.Property("RecurrenceType") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("AccountId"); + + b.ToTable("RecurringBankTransaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Account", "Account") + .WithMany() + .HasForeignKey("AccountId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", "BucketGroup") + .WithMany("Buckets") + .HasForeignKey("BucketGroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BucketGroup"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketMovement", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") + .WithMany("BucketMovements") + .HasForeignKey("BucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Bucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "TargetBucket") + .WithMany() + .HasForeignKey("TargetBucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("TargetBucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketVersion", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") + .WithMany("BucketVersions") + .HasForeignKey("BucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Bucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BudgetedTransaction", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") + .WithMany("BudgetedTransactions") + .HasForeignKey("BucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", "Transaction") + .WithMany("BudgetedTransactions") + .HasForeignKey("TransactionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Bucket"); + + b.Navigation("Transaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.ImportProfile", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Account", "Account") + .WithMany() + .HasForeignKey("AccountId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.MappingRule", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", "BucketRuleSet") + .WithMany("MappingRules") + .HasForeignKey("BucketRuleSetId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BucketRuleSet"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.RecurringBankTransaction", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Account", "Account") + .WithMany() + .HasForeignKey("AccountId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.Navigation("BucketMovements"); + + b.Navigation("BucketVersions"); + + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", b => + { + b.Navigation("Buckets"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.Navigation("MappingRules"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/OpenBudgeteer.Core.Data.MySql.Migrations/20231221153127_AddBucketTextColor.cs b/OpenBudgeteer.Core.Data.MySql.Migrations/20231221153127_AddBucketTextColor.cs new file mode 100644 index 0000000..46c159b --- /dev/null +++ b/OpenBudgeteer.Core.Data.MySql.Migrations/20231221153127_AddBucketTextColor.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace OpenBudgeteer.Core.Data.MySql.Migrations +{ + /// + public partial class AddBucketTextColor : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "TextColorCode", + table: "Bucket", + type: "longtext", + nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "TextColorCode", + table: "Bucket"); + } + } +} diff --git a/OpenBudgeteer.Core.Data.MySql.Migrations/DatabaseServiceModelSnapshot.cs b/OpenBudgeteer.Core.Data.MySql.Migrations/DatabaseServiceModelSnapshot.cs index e2b3ec2..c1b9df5 100644 --- a/OpenBudgeteer.Core.Data.MySql.Migrations/DatabaseServiceModelSnapshot.cs +++ b/OpenBudgeteer.Core.Data.MySql.Migrations/DatabaseServiceModelSnapshot.cs @@ -16,7 +16,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "7.0.5") + .HasAnnotation("ProductVersion", "8.0.0") .HasAnnotation("Relational:MaxIdentifierLength", 64); modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Account", b => @@ -88,6 +88,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("Name") .HasColumnType("longtext"); + b.Property("TextColorCode") + .HasColumnType("longtext"); + b.Property("ValidFrom") .HasColumnType("datetime(6)"); @@ -368,7 +371,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", "BucketGroup") - .WithMany() + .WithMany("Buckets") .HasForeignKey("BucketGroupId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -379,7 +382,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketMovement", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") - .WithMany() + .WithMany("BucketMovements") .HasForeignKey("BucketId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -401,7 +404,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketVersion", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") - .WithMany() + .WithMany("BucketVersions") .HasForeignKey("BucketId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -412,13 +415,13 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BudgetedTransaction", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") - .WithMany() + .WithMany("BudgetedTransactions") .HasForeignKey("BucketId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", "Transaction") - .WithMany() + .WithMany("BudgetedTransactions") .HasForeignKey("TransactionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -442,7 +445,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.MappingRule", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", "BucketRuleSet") - .WithMany() + .WithMany("MappingRules") .HasForeignKey("BucketRuleSetId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -460,6 +463,30 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Account"); }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.Navigation("BucketMovements"); + + b.Navigation("BucketVersions"); + + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", b => + { + b.Navigation("Buckets"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.Navigation("MappingRules"); + }); #pragma warning restore 612, 618 } } diff --git a/OpenBudgeteer.Core.Data.Postgres.Migrations/20231221153511_AddBucketTextColor.Designer.cs b/OpenBudgeteer.Core.Data.Postgres.Migrations/20231221153511_AddBucketTextColor.Designer.cs new file mode 100644 index 0000000..bb7e199 --- /dev/null +++ b/OpenBudgeteer.Core.Data.Postgres.Migrations/20231221153511_AddBucketTextColor.Designer.cs @@ -0,0 +1,497 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using OpenBudgeteer.Core.Data.Entities; + +#nullable disable + +namespace OpenBudgeteer.Core.Data.Postgres.Migrations +{ + [DbContext(typeof(DatabaseContext))] + [Migration("20231221153511_AddBucketTextColor")] + partial class AddBucketTextColor + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "8.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Account", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("AccountId"); + + b.Property("IsActive") + .HasColumnType("integer"); + + b.Property("Name") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("TransactionId"); + + b.Property("AccountId") + .HasColumnType("uuid"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("Memo") + .HasColumnType("text"); + + b.Property("Payee") + .HasColumnType("text"); + + b.Property("TransactionDate") + .HasColumnType("timestamp without time zone"); + + b.HasKey("Id"); + + b.HasIndex("AccountId"); + + b.ToTable("BankTransaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("BucketId"); + + b.Property("BucketGroupId") + .HasColumnType("uuid"); + + b.Property("ColorCode") + .HasColumnType("text"); + + b.Property("IsInactive") + .HasColumnType("boolean"); + + b.Property("IsInactiveFrom") + .HasColumnType("timestamp without time zone"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("TextColorCode") + .HasColumnType("text"); + + b.Property("ValidFrom") + .HasColumnType("timestamp without time zone"); + + b.HasKey("Id"); + + b.HasIndex("BucketGroupId"); + + b.ToTable("Bucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("BucketGroupId"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Position") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.ToTable("BucketGroup"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketMovement", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("BucketMovementId"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("BucketId") + .HasColumnType("uuid"); + + b.Property("MovementDate") + .HasColumnType("timestamp without time zone"); + + b.HasKey("Id"); + + b.HasIndex("BucketId"); + + b.ToTable("BucketMovement"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("BucketRuleSetId"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Priority") + .HasColumnType("integer"); + + b.Property("TargetBucketId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("TargetBucketId"); + + b.ToTable("BucketRuleSet"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketVersion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("BucketVersionId"); + + b.Property("BucketId") + .HasColumnType("uuid"); + + b.Property("BucketType") + .HasColumnType("integer"); + + b.Property("BucketTypeXParam") + .HasColumnType("integer"); + + b.Property("BucketTypeYParam") + .HasColumnType("decimal(65, 2)"); + + b.Property("BucketTypeZParam") + .HasColumnType("timestamp without time zone"); + + b.Property("Notes") + .HasColumnType("text"); + + b.Property("ValidFrom") + .HasColumnType("timestamp without time zone"); + + b.Property("Version") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("BucketId"); + + b.ToTable("BucketVersion"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BudgetedTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("BudgetedTransactionId"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("BucketId") + .HasColumnType("uuid"); + + b.Property("TransactionId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("BucketId"); + + b.HasIndex("TransactionId"); + + b.ToTable("BudgetedTransaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.ImportProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("ImportProfileId"); + + b.Property("AccountId") + .HasColumnType("uuid"); + + b.Property("AdditionalSettingAmountCleanup") + .HasColumnType("boolean"); + + b.Property("AdditionalSettingAmountCleanupValue") + .HasColumnType("text"); + + b.Property("AdditionalSettingCreditValue") + .HasColumnType("integer"); + + b.Property("AmountColumnName") + .HasColumnType("text"); + + b.Property("CreditColumnIdentifierColumnName") + .HasColumnType("text"); + + b.Property("CreditColumnIdentifierValue") + .HasColumnType("text"); + + b.Property("CreditColumnName") + .HasColumnType("text"); + + b.Property("DateFormat") + .HasColumnType("text"); + + b.Property("Delimiter") + .HasColumnType("character(1)"); + + b.Property("HeaderRow") + .HasColumnType("integer"); + + b.Property("MemoColumnName") + .HasColumnType("text"); + + b.Property("NumberFormat") + .HasColumnType("text"); + + b.Property("PayeeColumnName") + .HasColumnType("text"); + + b.Property("ProfileName") + .HasColumnType("text"); + + b.Property("TextQualifier") + .HasColumnType("character(1)"); + + b.Property("TransactionDateColumnName") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("AccountId"); + + b.ToTable("ImportProfile"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.MappingRule", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("MappingRuleId"); + + b.Property("BucketRuleSetId") + .HasColumnType("uuid"); + + b.Property("ComparisionField") + .HasColumnType("integer"); + + b.Property("ComparisionType") + .HasColumnType("integer"); + + b.Property("ComparisionValue") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("BucketRuleSetId"); + + b.ToTable("MappingRule"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.RecurringBankTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("TransactionId"); + + b.Property("AccountId") + .HasColumnType("uuid"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("FirstOccurrenceDate") + .HasColumnType("timestamp without time zone"); + + b.Property("Memo") + .HasColumnType("text"); + + b.Property("Payee") + .HasColumnType("text"); + + b.Property("RecurrenceAmount") + .HasColumnType("integer"); + + b.Property("RecurrenceType") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("AccountId"); + + b.ToTable("RecurringBankTransaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Account", "Account") + .WithMany() + .HasForeignKey("AccountId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", "BucketGroup") + .WithMany("Buckets") + .HasForeignKey("BucketGroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BucketGroup"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketMovement", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") + .WithMany("BucketMovements") + .HasForeignKey("BucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Bucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "TargetBucket") + .WithMany() + .HasForeignKey("TargetBucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("TargetBucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketVersion", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") + .WithMany("BucketVersions") + .HasForeignKey("BucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Bucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BudgetedTransaction", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") + .WithMany("BudgetedTransactions") + .HasForeignKey("BucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", "Transaction") + .WithMany("BudgetedTransactions") + .HasForeignKey("TransactionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Bucket"); + + b.Navigation("Transaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.ImportProfile", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Account", "Account") + .WithMany() + .HasForeignKey("AccountId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.MappingRule", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", "BucketRuleSet") + .WithMany("MappingRules") + .HasForeignKey("BucketRuleSetId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BucketRuleSet"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.RecurringBankTransaction", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Account", "Account") + .WithMany() + .HasForeignKey("AccountId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.Navigation("BucketMovements"); + + b.Navigation("BucketVersions"); + + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", b => + { + b.Navigation("Buckets"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.Navigation("MappingRules"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/OpenBudgeteer.Core.Data.Postgres.Migrations/20231221153511_AddBucketTextColor.cs b/OpenBudgeteer.Core.Data.Postgres.Migrations/20231221153511_AddBucketTextColor.cs new file mode 100644 index 0000000..2475df7 --- /dev/null +++ b/OpenBudgeteer.Core.Data.Postgres.Migrations/20231221153511_AddBucketTextColor.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace OpenBudgeteer.Core.Data.Postgres.Migrations +{ + /// + public partial class AddBucketTextColor : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "TextColorCode", + table: "Bucket", + type: "text", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "TextColorCode", + table: "Bucket"); + } + } +} diff --git a/OpenBudgeteer.Core.Data.Postgres.Migrations/DatabaseContextModelSnapshot.cs b/OpenBudgeteer.Core.Data.Postgres.Migrations/DatabaseContextModelSnapshot.cs index 8a60502..6def40d 100644 --- a/OpenBudgeteer.Core.Data.Postgres.Migrations/DatabaseContextModelSnapshot.cs +++ b/OpenBudgeteer.Core.Data.Postgres.Migrations/DatabaseContextModelSnapshot.cs @@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "7.0.5") + .HasAnnotation("ProductVersion", "8.0.0") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); @@ -91,6 +91,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("Name") .HasColumnType("text"); + b.Property("TextColorCode") + .HasColumnType("text"); + b.Property("ValidFrom") .HasColumnType("timestamp without time zone"); @@ -369,7 +372,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", "BucketGroup") - .WithMany() + .WithMany("Buckets") .HasForeignKey("BucketGroupId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -380,7 +383,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketMovement", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") - .WithMany() + .WithMany("BucketMovements") .HasForeignKey("BucketId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -402,7 +405,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketVersion", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") - .WithMany() + .WithMany("BucketVersions") .HasForeignKey("BucketId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -413,13 +416,13 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BudgetedTransaction", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") - .WithMany() + .WithMany("BudgetedTransactions") .HasForeignKey("BucketId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", "Transaction") - .WithMany() + .WithMany("BudgetedTransactions") .HasForeignKey("TransactionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -443,7 +446,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.MappingRule", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", "BucketRuleSet") - .WithMany() + .WithMany("MappingRules") .HasForeignKey("BucketRuleSetId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -461,6 +464,30 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Account"); }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.Navigation("BucketMovements"); + + b.Navigation("BucketVersions"); + + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", b => + { + b.Navigation("Buckets"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.Navigation("MappingRules"); + }); #pragma warning restore 612, 618 } } diff --git a/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs index 39b789c..5453bc7 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs @@ -60,7 +60,7 @@ public int Delete(Guid id) .Include(i => i.Buckets) .FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"BucketGroup with id {id} not found."); - if (entity.Buckets.Any()) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); + if (entity.Buckets.Count != 0) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); DatabaseContext.BucketGroup.Remove(entity); return DatabaseContext.SaveChanges(); @@ -75,7 +75,7 @@ public int DeleteRange(IEnumerable ids) .Include(i => i.Buckets) .Where(i => cleansedEntities.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No BucketGroup found with passed IDs."); - if (entities.Any(i => i.Buckets.Any())) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); + if (entities.Any(i => i.Buckets.Count != 0)) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); DatabaseContext.BucketGroup.RemoveRange(entities); return DatabaseContext.SaveChanges(); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs index ad5eac1..32d70c5 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs @@ -95,8 +95,8 @@ public int Delete(Guid id) .Include(i => i.BudgetedTransactions) .FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"Bucket with id {id} not found."); - if (entity.BucketMovements.Any()) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); - if (entity.BudgetedTransactions.Any()) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); + if (entity.BucketMovements.Count != 0) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); + if (entity.BudgetedTransactions.Count != 0) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); DatabaseContext.Bucket.Remove(entity); return DatabaseContext.SaveChanges(); @@ -116,8 +116,8 @@ public int DeleteRange(IEnumerable ids) .Include(i => i.BudgetedTransactions) .Where(i => cleansedEntities.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No Buckets found with passed IDs."); - if (entities.Any(i => i.BucketMovements.Any())) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); - if (entities.Any(i => i.BudgetedTransactions.Any())) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); + if (entities.Any(i => i.BucketMovements.Count != 0)) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); + if (entities.Any(i => i.BudgetedTransactions.Count != 0)) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); DatabaseContext.Bucket.RemoveRange(entities); return DatabaseContext.SaveChanges(); diff --git a/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs b/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs index 600a791..50e80a9 100644 --- a/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs +++ b/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs @@ -125,7 +125,7 @@ public override BankTransaction Update(BankTransaction entity) .Select(i => i.Id) .ToList(); - if (deletedIds.Any()) + if (deletedIds.Count != 0) { var result = budgetedTransactionRepository.DeleteRange(deletedIds); if (result != deletedIds.Count) diff --git a/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs b/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs index 45cc40f..4dfd27c 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs @@ -87,7 +87,7 @@ public override BucketRuleSet Update(BucketRuleSet entity) .All(j => j.Id != i.Id)) .Select(i => i.Id) .ToList(); - if (deletedIds.Any()) + if (deletedIds.Count != 0) { var result = mappingRuleRepository.DeleteRange(deletedIds); if (result != deletedIds.Count) diff --git a/OpenBudgeteer.Core.Data.Services/BucketService.cs b/OpenBudgeteer.Core.Data.Services/BucketService.cs index be03604..af69f02 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketService.cs @@ -416,7 +416,7 @@ public override void Delete(Guid id) .Where(i => i.TargetBucketId == id) .Select(i => i.Id) .ToList(); - if (bucketRuleSetIds.Any()) bucketRuleSetRepository.DeleteRange(bucketRuleSetIds); + if (bucketRuleSetIds.Count != 0) bucketRuleSetRepository.DeleteRange(bucketRuleSetIds); transaction.Commit(); } diff --git a/OpenBudgeteer.Core.Data.Services/RecurringBankTransactionService.cs b/OpenBudgeteer.Core.Data.Services/RecurringBankTransactionService.cs index 4f58507..8a3d26e 100644 --- a/OpenBudgeteer.Core.Data.Services/RecurringBankTransactionService.cs +++ b/OpenBudgeteer.Core.Data.Services/RecurringBankTransactionService.cs @@ -52,7 +52,7 @@ public async Task> GetPendingBankTransactionAsync(D })); } - List result = new(); + List result = []; foreach (var taskResult in await Task.WhenAll(recurringBankTransactionTasks)) { result.AddRange(taskResult); diff --git a/OpenBudgeteer.Core.Data.Sqlite.Migrations/20231221153309_AddBucketTextColor.Designer.cs b/OpenBudgeteer.Core.Data.Sqlite.Migrations/20231221153309_AddBucketTextColor.Designer.cs new file mode 100644 index 0000000..c209ae5 --- /dev/null +++ b/OpenBudgeteer.Core.Data.Sqlite.Migrations/20231221153309_AddBucketTextColor.Designer.cs @@ -0,0 +1,492 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using OpenBudgeteer.Core.Data.Entities; + +#nullable disable + +namespace OpenBudgeteer.Core.Data.Sqlite.Migrations +{ + [DbContext(typeof(DatabaseContext))] + [Migration("20231221153309_AddBucketTextColor")] + partial class AddBucketTextColor + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "8.0.0"); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Account", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("AccountId"); + + b.Property("IsActive") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("TransactionId"); + + b.Property("AccountId") + .HasColumnType("TEXT"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("Memo") + .HasColumnType("TEXT"); + + b.Property("Payee") + .HasColumnType("TEXT"); + + b.Property("TransactionDate") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AccountId"); + + b.ToTable("BankTransaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("BucketId"); + + b.Property("BucketGroupId") + .HasColumnType("TEXT"); + + b.Property("ColorCode") + .HasColumnType("TEXT"); + + b.Property("IsInactive") + .HasColumnType("INTEGER"); + + b.Property("IsInactiveFrom") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("TextColorCode") + .HasColumnType("TEXT"); + + b.Property("ValidFrom") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("BucketGroupId"); + + b.ToTable("Bucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("BucketGroupId"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Position") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("BucketGroup"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketMovement", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("BucketMovementId"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("BucketId") + .HasColumnType("TEXT"); + + b.Property("MovementDate") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("BucketId"); + + b.ToTable("BucketMovement"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("BucketRuleSetId"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Priority") + .HasColumnType("INTEGER"); + + b.Property("TargetBucketId") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("TargetBucketId"); + + b.ToTable("BucketRuleSet"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketVersion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("BucketVersionId"); + + b.Property("BucketId") + .HasColumnType("TEXT"); + + b.Property("BucketType") + .HasColumnType("INTEGER"); + + b.Property("BucketTypeXParam") + .HasColumnType("INTEGER"); + + b.Property("BucketTypeYParam") + .HasColumnType("decimal(65, 2)"); + + b.Property("BucketTypeZParam") + .HasColumnType("TEXT"); + + b.Property("Notes") + .HasColumnType("TEXT"); + + b.Property("ValidFrom") + .HasColumnType("TEXT"); + + b.Property("Version") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("BucketId"); + + b.ToTable("BucketVersion"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BudgetedTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("BudgetedTransactionId"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("BucketId") + .HasColumnType("TEXT"); + + b.Property("TransactionId") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("BucketId"); + + b.HasIndex("TransactionId"); + + b.ToTable("BudgetedTransaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.ImportProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("ImportProfileId"); + + b.Property("AccountId") + .HasColumnType("TEXT"); + + b.Property("AdditionalSettingAmountCleanup") + .HasColumnType("INTEGER"); + + b.Property("AdditionalSettingAmountCleanupValue") + .HasColumnType("TEXT"); + + b.Property("AdditionalSettingCreditValue") + .HasColumnType("INTEGER"); + + b.Property("AmountColumnName") + .HasColumnType("TEXT"); + + b.Property("CreditColumnIdentifierColumnName") + .HasColumnType("TEXT"); + + b.Property("CreditColumnIdentifierValue") + .HasColumnType("TEXT"); + + b.Property("CreditColumnName") + .HasColumnType("TEXT"); + + b.Property("DateFormat") + .HasColumnType("TEXT"); + + b.Property("Delimiter") + .HasColumnType("TEXT"); + + b.Property("HeaderRow") + .HasColumnType("INTEGER"); + + b.Property("MemoColumnName") + .HasColumnType("TEXT"); + + b.Property("NumberFormat") + .HasColumnType("TEXT"); + + b.Property("PayeeColumnName") + .HasColumnType("TEXT"); + + b.Property("ProfileName") + .HasColumnType("TEXT"); + + b.Property("TextQualifier") + .HasColumnType("TEXT"); + + b.Property("TransactionDateColumnName") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AccountId"); + + b.ToTable("ImportProfile"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.MappingRule", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("MappingRuleId"); + + b.Property("BucketRuleSetId") + .HasColumnType("TEXT"); + + b.Property("ComparisionField") + .HasColumnType("INTEGER"); + + b.Property("ComparisionType") + .HasColumnType("INTEGER"); + + b.Property("ComparisionValue") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("BucketRuleSetId"); + + b.ToTable("MappingRule"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.RecurringBankTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("TransactionId"); + + b.Property("AccountId") + .HasColumnType("TEXT"); + + b.Property("Amount") + .HasColumnType("decimal(65, 2)"); + + b.Property("FirstOccurrenceDate") + .HasColumnType("TEXT"); + + b.Property("Memo") + .HasColumnType("TEXT"); + + b.Property("Payee") + .HasColumnType("TEXT"); + + b.Property("RecurrenceAmount") + .HasColumnType("INTEGER"); + + b.Property("RecurrenceType") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AccountId"); + + b.ToTable("RecurringBankTransaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Account", "Account") + .WithMany() + .HasForeignKey("AccountId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", "BucketGroup") + .WithMany("Buckets") + .HasForeignKey("BucketGroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BucketGroup"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketMovement", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") + .WithMany("BucketMovements") + .HasForeignKey("BucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Bucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "TargetBucket") + .WithMany() + .HasForeignKey("TargetBucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("TargetBucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketVersion", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") + .WithMany("BucketVersions") + .HasForeignKey("BucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Bucket"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BudgetedTransaction", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") + .WithMany("BudgetedTransactions") + .HasForeignKey("BucketId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", "Transaction") + .WithMany("BudgetedTransactions") + .HasForeignKey("TransactionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Bucket"); + + b.Navigation("Transaction"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.ImportProfile", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Account", "Account") + .WithMany() + .HasForeignKey("AccountId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.MappingRule", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", "BucketRuleSet") + .WithMany("MappingRules") + .HasForeignKey("BucketRuleSetId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BucketRuleSet"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.RecurringBankTransaction", b => + { + b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Account", "Account") + .WithMany() + .HasForeignKey("AccountId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Account"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.Navigation("BucketMovements"); + + b.Navigation("BucketVersions"); + + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", b => + { + b.Navigation("Buckets"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.Navigation("MappingRules"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/OpenBudgeteer.Core.Data.Sqlite.Migrations/20231221153309_AddBucketTextColor.cs b/OpenBudgeteer.Core.Data.Sqlite.Migrations/20231221153309_AddBucketTextColor.cs new file mode 100644 index 0000000..cd7b6b4 --- /dev/null +++ b/OpenBudgeteer.Core.Data.Sqlite.Migrations/20231221153309_AddBucketTextColor.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace OpenBudgeteer.Core.Data.Sqlite.Migrations +{ + /// + public partial class AddBucketTextColor : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "TextColorCode", + table: "Bucket", + type: "TEXT", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "TextColorCode", + table: "Bucket"); + } + } +} diff --git a/OpenBudgeteer.Core.Data.Sqlite.Migrations/SqliteDatabaseContextModelSnapshot.cs b/OpenBudgeteer.Core.Data.Sqlite.Migrations/SqliteDatabaseContextModelSnapshot.cs index da81338..36fcf8f 100644 --- a/OpenBudgeteer.Core.Data.Sqlite.Migrations/SqliteDatabaseContextModelSnapshot.cs +++ b/OpenBudgeteer.Core.Data.Sqlite.Migrations/SqliteDatabaseContextModelSnapshot.cs @@ -15,7 +15,7 @@ partial class SqliteDatabaseContextModelSnapshot : ModelSnapshot protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "7.0.5"); + modelBuilder.HasAnnotation("ProductVersion", "8.0.0"); modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Account", b => { @@ -86,6 +86,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("Name") .HasColumnType("TEXT"); + b.Property("TextColorCode") + .HasColumnType("TEXT"); + b.Property("ValidFrom") .HasColumnType("TEXT"); @@ -364,7 +367,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", "BucketGroup") - .WithMany() + .WithMany("Buckets") .HasForeignKey("BucketGroupId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -375,7 +378,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketMovement", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") - .WithMany() + .WithMany("BucketMovements") .HasForeignKey("BucketId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -397,7 +400,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketVersion", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") - .WithMany() + .WithMany("BucketVersions") .HasForeignKey("BucketId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -408,13 +411,13 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BudgetedTransaction", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.Bucket", "Bucket") - .WithMany() + .WithMany("BudgetedTransactions") .HasForeignKey("BucketId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", "Transaction") - .WithMany() + .WithMany("BudgetedTransactions") .HasForeignKey("TransactionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -438,7 +441,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.MappingRule", b => { b.HasOne("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", "BucketRuleSet") - .WithMany() + .WithMany("MappingRules") .HasForeignKey("BucketRuleSetId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -456,6 +459,30 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Account"); }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BankTransaction", b => + { + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.Bucket", b => + { + b.Navigation("BucketMovements"); + + b.Navigation("BucketVersions"); + + b.Navigation("BudgetedTransactions"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketGroup", b => + { + b.Navigation("Buckets"); + }); + + modelBuilder.Entity("OpenBudgeteer.Core.Data.Entities.Models.BucketRuleSet", b => + { + b.Navigation("MappingRules"); + }); #pragma warning restore 612, 618 } } diff --git a/OpenBudgeteer.Core.Data/Initialization/DemoDataGenerator.cs b/OpenBudgeteer.Core.Data/Initialization/DemoDataGenerator.cs index 7c88b14..42ed6e4 100644 --- a/OpenBudgeteer.Core.Data/Initialization/DemoDataGenerator.cs +++ b/OpenBudgeteer.Core.Data/Initialization/DemoDataGenerator.cs @@ -62,7 +62,8 @@ public void GenerateDemoData() BucketGroupId = bucketGroupRegularExpenses.Id, Name = "Rent", ValidFrom = firstOfPreviousMonth, - ColorCode = "IndianRed" + ColorCode = "IndianRed", + TextColorCode = "White" }; var bucketHealthInsurance = new Bucket() { @@ -70,7 +71,8 @@ public void GenerateDemoData() BucketGroupId = bucketGroupRegularExpenses.Id, Name = "Health Insurance", ValidFrom = firstOfPreviousMonth, - ColorCode = "IndianRed" + ColorCode = "IndianRed", + TextColorCode = "White" }; var bucketGroceries = new Bucket() { @@ -78,7 +80,8 @@ public void GenerateDemoData() BucketGroupId = bucketGroupRegularExpenses.Id, Name = "Groceries", ValidFrom = firstOfPreviousMonth, - ColorCode = "DarkOliveGreen" + ColorCode = "DarkOliveGreen", + TextColorCode = "White" }; var bucketCarFuel = new Bucket() { @@ -86,7 +89,8 @@ public void GenerateDemoData() BucketGroupId = bucketGroupRegularExpenses.Id, Name = "Car Fuel", ValidFrom = firstOfPreviousMonth, - ColorCode = "DarkOliveGreen" + ColorCode = "DarkOliveGreen", + TextColorCode = "White" }; var bucketVacationTrip = new Bucket() { @@ -94,7 +98,8 @@ public void GenerateDemoData() BucketGroupId = bucketGroupSavings.Id, Name = "Vacation Trip", ValidFrom = firstOfThisMonth, - ColorCode = "Goldenrod" + ColorCode = "Goldenrod", + TextColorCode = "Black" }; var bucketReserves = new Bucket() { @@ -102,7 +107,8 @@ public void GenerateDemoData() BucketGroupId = bucketGroupSavings.Id, Name = "Reserves", ValidFrom = firstOfPreviousMonth, - ColorCode = "Orange" + ColorCode = "Orange", + TextColorCode = "Black" }; dbContext.Bucket.AddRange(new [] { diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs index 1937623..b656aaa 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs @@ -52,7 +52,7 @@ public Guid BucketGroupId private string _colorCode; /// - /// Name of the color based from + /// Name of the color based from for the Bucket Background /// public string ColorCode { @@ -61,10 +61,25 @@ public string ColorCode } /// - /// of the Bucket + /// Background of the Bucket /// public Color Color => string.IsNullOrEmpty(ColorCode) ? Color.LightGray : Color.FromName(ColorCode); + private string _textColorCode; + /// + /// Name of the text color based from + /// + public string TextColorCode + { + get => _textColorCode; + set => Set(ref _textColorCode, value); + } + + /// + /// Text of the Bucket + /// + public Color TextColor => string.IsNullOrEmpty(TextColorCode) ? Color.Black : Color.FromName(TextColorCode); + private DateTime _validFrom; /// /// Date from which this Bucket is valid @@ -219,6 +234,7 @@ protected BucketViewModel(IServiceManager serviceManager, Bucket? bucket, DateTi //BucketGroupId = bucketGroupId; Will be set in CreateEmpty() _name = "New Bucket"; _colorCode = Color.Transparent.Name; + _textColorCode = Color.Black.Name; _validFrom = yearMonth; _isInactive = false; _isInactiveFrom = DateTime.MaxValue; @@ -231,6 +247,7 @@ protected BucketViewModel(IServiceManager serviceManager, Bucket? bucket, DateTi _name = bucket.Name ?? string.Empty; _bucketGroupId = bucket.BucketGroupId; _colorCode = bucket.ColorCode ?? string.Empty; + _textColorCode = bucket.TextColorCode ?? string.Empty; _validFrom = bucket.ValidFrom; _isInactive = bucket.IsInactive; _isInactiveFrom = bucket.IsInactiveFrom; @@ -471,6 +488,7 @@ internal override Bucket ConvertToDto() Name = Name, BucketGroupId = BucketGroupId, ColorCode = ColorCode, + TextColorCode = TextColorCode, ValidFrom = ValidFrom, IsInactive = IsInactive, IsInactiveFrom = IsInactiveFrom, diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs index 7f2e5e8..c5d54fe 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs @@ -34,7 +34,7 @@ public string SelectedBucketName private string _selectedBucketColorCode; /// - /// Name of the color based from + /// Name of the background color based from /// public string SelectedBucketColorCode { @@ -43,9 +43,24 @@ public string SelectedBucketColorCode } /// - /// of the selected Bucket + /// Background of the selected Bucket /// public Color SelectedBucketColor => string.IsNullOrEmpty(SelectedBucketColorCode) ? Color.LightGray : Color.FromName(SelectedBucketColorCode); + + private string _selectedBucketTextColorCode; + /// + /// Name of the text color based from + /// + public string SelectedBucketTextColorCode + { + get => _selectedBucketTextColorCode; + set => Set(ref _selectedBucketTextColorCode, value); + } + + /// + /// Text of the selected Bucket + /// + public Color SelectedBucketTextColor => string.IsNullOrEmpty(SelectedBucketTextColorCode) ? Color.Black : Color.FromName(SelectedBucketTextColorCode); private string _selectedBucketOutput; /// @@ -111,15 +126,15 @@ protected PartialBucketViewModel(IServiceManager serviceManager, Bucket? bucket, _selectedBucketId = noSelectionBucket.Id; _selectedBucketName = noSelectionBucket.Name ?? string.Empty; _selectedBucketColorCode = noSelectionBucket.ColorCode ?? string.Empty; + _selectedBucketTextColorCode = noSelectionBucket.TextColorCode ?? string.Empty; } else { _selectedBucketId = bucket.Id; _selectedBucketName = bucket.Name ?? string.Empty; _selectedBucketColorCode = bucket.ColorCode ?? string.Empty; + _selectedBucketTextColorCode = bucket.TextColorCode ?? string.Empty; } - - } /// @@ -164,6 +179,7 @@ public void UpdateSelectedBucket(BucketViewModel bucketViewModel) SelectedBucketId = bucketViewModel.BucketId; SelectedBucketName = bucketViewModel.Name; SelectedBucketColorCode = bucketViewModel.ColorCode; + SelectedBucketTextColorCode = bucketViewModel.TextColorCode; } #endregion diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/RuleSetViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/RuleSetViewModel.cs index 954fdd9..2bfebda 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/RuleSetViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/RuleSetViewModel.cs @@ -60,7 +60,7 @@ public string TargetBucketName private string _targetBucketColorCode; /// - /// Name of the color based from + /// Name of the background color based from /// public string TargetBucketColorCode { @@ -69,10 +69,25 @@ public string TargetBucketColorCode } /// - /// of the Bucket + /// Background of the Bucket /// public Color TargetBucketColor => string.IsNullOrEmpty(TargetBucketColorCode) ? Color.LightGray : Color.FromName(TargetBucketColorCode); + private string _targetBucketTextColorCode; + /// + /// Name of the text color based from + /// + public string TargetBucketTextColorCode + { + get => _targetBucketTextColorCode; + set => Set(ref _targetBucketTextColorCode, value); + } + + /// + /// Text of the Bucket + /// + public Color TargetBucketTextColor => string.IsNullOrEmpty(TargetBucketTextColorCode) ? Color.Black : Color.FromName(TargetBucketTextColorCode); + private bool _inModification; /// /// Helper property to check if the RuleSet is currently modified @@ -151,6 +166,7 @@ protected RuleSetViewModel(IServiceManager serviceManager, IEnumerable a _targetBucketId = noSelectBucket.Id; _targetBucketName = noSelectBucket.Name; _targetBucketColorCode = string.Empty; + _targetBucketTextColorCode = string.Empty; } else { @@ -160,6 +176,7 @@ protected RuleSetViewModel(IServiceManager serviceManager, IEnumerable a _targetBucketId = bucketRuleSet.TargetBucketId; _targetBucketName = bucketRuleSet.TargetBucket.Name ?? string.Empty; _targetBucketColorCode = bucketRuleSet.TargetBucket.ColorCode ?? string.Empty; + _targetBucketTextColorCode = bucketRuleSet.TargetBucket.TextColorCode ?? string.Empty; foreach (var mappingRule in bucketRuleSet.MappingRules) { @@ -195,6 +212,7 @@ protected RuleSetViewModel(RuleSetViewModel viewModel) : base(viewModel.ServiceM _targetBucketId = viewModel.TargetBucketId; _targetBucketName = viewModel.TargetBucketName; _targetBucketColorCode = viewModel.TargetBucketColorCode; + _targetBucketTextColorCode = viewModel.TargetBucketTextColorCode; } /// @@ -243,6 +261,7 @@ private BucketRuleSet ConvertToDtoFull() Id = TargetBucketId, Name = TargetBucketName, ColorCode = TargetBucketColorCode, + TextColorCode = TargetBucketTextColorCode }; result.MappingRules = new List(); foreach (var mappingRuleViewModel in MappingRules) @@ -273,6 +292,7 @@ public void UpdateSelectedBucket(BucketViewModel bucketViewModel) TargetBucketId = bucketViewModel.BucketId; TargetBucketName = bucketViewModel.Name; TargetBucketColorCode = bucketViewModel.ColorCode; + TargetBucketTextColorCode = bucketViewModel.TextColorCode; } /// From dac4fb9e74eff88ac4468383615dafd8a9668bae Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Thu, 21 Dec 2023 17:37:50 +0100 Subject: [PATCH 41/57] Small refactoring --- OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor b/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor index e2fb67b..cf047af 100644 --- a/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor @@ -75,7 +75,7 @@ + @bind:set="(value) => { DataContext.TextColorCode = value; }"> @foreach (var color in DataContext.AvailableColors!) { From 6dda3443dde538898858d7d5319a42e2a22dbb5a Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Thu, 21 Dec 2023 17:45:28 +0100 Subject: [PATCH 42/57] Fix layout on Bucket Page --- OpenBudgeteer.Blazor/wwwroot/css/site.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenBudgeteer.Blazor/wwwroot/css/site.css b/OpenBudgeteer.Blazor/wwwroot/css/site.css index ca369db..8f0a5e9 100644 --- a/OpenBudgeteer.Blazor/wwwroot/css/site.css +++ b/OpenBudgeteer.Blazor/wwwroot/css/site.css @@ -85,7 +85,7 @@ input.number-input { } .col-bucket-buttons { - width: 120px; + width: 180px; } .col-bucket-details { From 827ab3299fd34917d2765831ec2564b357ebfa90 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Tue, 5 Mar 2024 17:04:25 +0100 Subject: [PATCH 43/57] Fix Guid issues using Sqlite database #221 --- CHANGELOG.md | 123 ++++++++++-------- .../AccountRepository.cs | 8 +- .../BankTransactionRepository.cs | 8 +- .../BucketGroupRepository.cs | 8 +- .../BucketMovementRepository.cs | 8 +- .../BucketRepository.cs | 16 +-- .../BucketRuleSetRepository.cs | 8 +- .../BucketVersionRepository.cs | 8 +- .../BudgetedTransactionRepository.cs | 10 +- .../ImportProfileRepository.cs | 8 +- .../MappingRuleRepository.cs | 8 +- .../RecurringBankTransactionRepository.cs | 8 +- .../AccountService.cs | 2 +- .../BankTransactionService.cs | 4 +- .../BucketGroupService.cs | 4 +- .../BucketMovementService.cs | 2 +- .../BucketRuleSetService.cs | 8 +- .../BucketService.cs | 12 +- .../BudgetedTransactionService.cs | 10 +- 19 files changed, 138 insertions(+), 125 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a05ea2..44f1e06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,31 +1,44 @@ -### 1.8 (202x-xx-xx) -* [Add] Data Consistency Check: Negative Transaction assigned to Income [#177](https://github.com/TheAxelander/OpenBudgeteer/issues/177) -* [Add] Create Transaction keeps last input date [#187](https://github.com/TheAxelander/OpenBudgeteer/issues/187) -* [Add] An empty database can be loaded now with some demo data using `APPSETTINGS_DEMO_DATA: true` [#192](https://github.com/TheAxelander/OpenBudgeteer/issues/192) -* [Add] First version of Web API in a separate Docker Image [#127](https://github.com/TheAxelander/OpenBudgeteer/issues/127) -* [Add] Loading screen while opening/uploading a file [#209](https://github.com/TheAxelander/OpenBudgeteer/issues/209) -* [Add] Confirmation Dialog for deleting a Bucket Group [#208](https://github.com/TheAxelander/OpenBudgeteer/issues/208) -* [Add] Text Color option for Bucket [#207](https://github.com/TheAxelander/OpenBudgeteer/issues/207) -* [Breaking Change] Docker Image now listens on port 8080 (new .Net 8 default) -* [Changed] Migrated to .Net 8 [#198](https://github.com/TheAxelander/OpenBudgeteer/issues/198) -* [Changed] Amounts displayed in consistent currency and number format [#188](https://github.com/TheAxelander/OpenBudgeteer/issues/188) -* [Changed] Buttons that appeared in the past only via hovering are now always displayed (was not working well, maybe additional rework in future) [#155](https://github.com/TheAxelander/OpenBudgeteer/issues/155) -* [Changed] More responsive navigation bar [#175](https://github.com/TheAxelander/OpenBudgeteer/issues/175) -* [Changed] Enable editing of imported file [#196](https://github.com/TheAxelander/OpenBudgeteer/issues/196) -* [Changed] Redesign of Navigation Menu and Footer -* [Changed] Banner message on unwanted exceptions -* [Changed] Rework UI to make it more responsive for various small screen sizes [#211](https://github.com/TheAxelander/OpenBudgeteer/issues/211) -* [Fixed] UI alignment for large numbers [#189](https://github.com/TheAxelander/OpenBudgeteer/issues/189) -* [Fixed] Mapping Rules using the Account Name instead of Account Id [#199](https://github.com/TheAxelander/OpenBudgeteer/pull/199) Thanks [Lucaber](https://github.com/Lucaber) -* [Fixed] Adding a Mapping Rule to an existing Rule Set failed [#200](https://github.com/TheAxelander/OpenBudgeteer/pull/200) Thanks [Lucaber](https://github.com/Lucaber) -* [Fixed] Builds for ARM64 are available again [#131](https://github.com/TheAxelander/OpenBudgeteer/issues/131) -* [Fixed] Exception after canceling creation of a new Recurring Transactions [#210](https://github.com/TheAxelander/OpenBudgeteer/issues/210) - -### 1.7.1 (2023-10-16) +## 1.8 (2024-xx-xx) + +### :warning: Breaking Changes + +* Docker Image now listens on port 8080 (new .Net 8 default) + +### :gear: Features & Enhancements + +* First version of Web API in a separate Docker Image [#127](https://github.com/TheAxelander/OpenBudgeteer/issues/127) +* Buttons that appeared in the past only via hovering are now always displayed (was not working well, maybe additional rework in future) [#155](https://github.com/TheAxelander/OpenBudgeteer/issues/155) +* More responsive navigation bar [#175](https://github.com/TheAxelander/OpenBudgeteer/issues/175) +* New Data Consistency Check: Negative Transaction assigned to Income [#177](https://github.com/TheAxelander/OpenBudgeteer/issues/177) +* Create Transaction keeps last input date [#187](https://github.com/TheAxelander/OpenBudgeteer/issues/187) +* Consistent currency and number format for displayed Amounts [#188](https://github.com/TheAxelander/OpenBudgeteer/issues/188) +* An empty database can be loaded now with some demo data using `APPSETTINGS_DEMO_DATA: true` [#192](https://github.com/TheAxelander/OpenBudgeteer/issues/192) +* Enable editing of imported file [#196](https://github.com/TheAxelander/OpenBudgeteer/issues/196) +* Text Color option for Bucket [#207](https://github.com/TheAxelander/OpenBudgeteer/issues/207) +* Confirmation Dialog for deleting a Bucket Group [#208](https://github.com/TheAxelander/OpenBudgeteer/issues/208) +* Loading screen while opening/uploading a file [#209](https://github.com/TheAxelander/OpenBudgeteer/issues/209) +* Rework UI to make it more responsive for various small screen sizes [#211](https://github.com/TheAxelander/OpenBudgeteer/issues/211) +* Redesign of Navigation Menu and Footer +* Redesign Banner message on unwanted exceptions + +### :beetle: Bug Fixes + +* UI alignment for large numbers [#189](https://github.com/TheAxelander/OpenBudgeteer/issues/189) +* Mapping Rules using the Account Name instead of Account Id [#199](https://github.com/TheAxelander/OpenBudgeteer/pull/199) Thanks [Lucaber](https://github.com/Lucaber) +* Adding a Mapping Rule to an existing Rule Set no longer fails [#200](https://github.com/TheAxelander/OpenBudgeteer/pull/200) Thanks [Lucaber](https://github.com/Lucaber) +* Exception after canceling creation of a new Recurring Transactions [#210](https://github.com/TheAxelander/OpenBudgeteer/issues/210) +* Guid issues using Sqlite database [#221](https://github.com/TheAxelander/OpenBudgeteer/issues/221) + +### :hammer: Maintenance + +* Builds for ARM64 are available again [#131](https://github.com/TheAxelander/OpenBudgeteer/issues/131) +* Migrated to .Net 8 [#198](https://github.com/TheAxelander/OpenBudgeteer/issues/198) + +## 1.7.1 (2023-10-16) * [Fixed] Potentially fixed crashes on Rules page due to an unnecessary parallel initialization [#165](https://github.com/TheAxelander/OpenBudgeteer/issues/165) -### 1.7 (2023-10-03) +## 1.7 (2023-10-03) * [Add] PostgreSQL support [#81](https://github.com/TheAxelander/OpenBudgeteer/issues/81) Thanks [csillaggyujto](https://github.com/csillaggyujto) * [Add] Confirmation Dialog before setting a Bucket inactive [#119](https://github.com/TheAxelander/OpenBudgeteer/issues/119) @@ -53,22 +66,22 @@ * [Fixed] Fix navbar in portrait mode [#190](https://github.com/TheAxelander/OpenBudgeteer/pull/190) Thanks [Lucaber](https://github.com/Lucaber) * [Known issue] Update 1.7 doesn't compile currently for ARM64 -### 1.6.3 (2023-01-27) +## 1.6.3 (2023-01-27) * [Add] Several Confirmation Dialogs for Import Profile handling [#124](https://github.com/TheAxelander/OpenBudgeteer/issues/124) * [Fixed] Proper reset of values after deleting an Import Profile [#125](https://github.com/TheAxelander/OpenBudgeteer/issues/125) * [Fixed] Overall improved and fixed error handling on Import Page -### 1.6.2 (2023-01-11) +## 1.6.2 (2023-01-11) * [Fixed] Due to implemented fix for [#114](https://github.com/TheAxelander/OpenBudgeteer/issues/114) Column mapping on Import Page was not working properly [#121](https://github.com/TheAxelander/OpenBudgeteer/issues/121) [#122](https://github.com/TheAxelander/OpenBudgeteer/issues/122) -### 1.6.1 (2022-12-31) +## 1.6.1 (2022-12-31) * [Changed] Slight visual changes for Mapping Rule modification * [Fixed] Rendering of Drop-down selection element for Firefox browser [#114](https://github.com/TheAxelander/OpenBudgeteer/issues/114) -### 1.6 (2022-12-03) +## 1.6 (2022-12-03) * [Add] Enhanced Bucket assignment for Bank Transaction (display remaining amount, manual triggered split) Thanks [ambroser1971](https://github.com/ambroser1971) * [Add] Recurring Transactions [#74](https://github.com/TheAxelander/OpenBudgeteer/issues/74) @@ -91,16 +104,16 @@ * [Fixed] Correct number of months shown on Report Page (e.g. should show past 24 months but displays 25 months) * [Fixed] Buckets that have been marked as inactive no longer display Want [#108](https://github.com/TheAxelander/OpenBudgeteer/issues/108) -### 1.5.2 (2022-03-26) +## 1.5.2 (2022-03-26) * [Fixed] Sqlite database lock while saving multiple Bank Transaction [#90](https://github.com/TheAxelander/OpenBudgeteer/issues/90) -### 1.5.1 (2022-02-26) +## 1.5.1 (2022-02-26) * [Fixed] Amount conversion with currency characters. [#82](https://github.com/TheAxelander/OpenBudgeteer/issues/82) [#83](https://github.com/TheAxelander/OpenBudgeteer/pull/83) Thanks [Hazy87](https://github.com/Hazy87) * [Fixed] Amount conversion with 0 values. [#72](https://github.com/TheAxelander/OpenBudgeteer/issues/72) -### 1.5 (2022-02-19) +## 1.5 (2022-02-19) * [Add] Option to set Localization [#52](https://github.com/TheAxelander/OpenBudgeteer/issues/52) * [Add] Enable mapping of seperated columns for Debit and Credit Amount on Import Page [#53](https://github.com/TheAxelander/OpenBudgeteer/issues/53) @@ -109,13 +122,13 @@ * [Fixed] Crash on Rules Page in case a Bucket has been deleted with an existing RuleSet [#65](https://github.com/TheAxelander/OpenBudgeteer/issues/65) * [Fixed] Include Transactions which are in modification in all filters to prevent immediate disappearance [#67](https://github.com/TheAxelander/OpenBudgeteer/issues/67) -### 1.4.1 (2021-11-28) +## 1.4.1 (2021-11-28) * [Changed] Handling of Bucket Group creation (fixes also crashes during creation cancellation [#56](https://github.com/TheAxelander/OpenBudgeteer/issues/56)) * [Fixed] Unable to add multiple Buckets during Bank Transaction creation [#55](https://github.com/TheAxelander/OpenBudgeteer/issues/55) * [Fixed] Crash on Report Page using sqlite [#57](https://github.com/TheAxelander/OpenBudgeteer/issues/57) -### 1.4 (2021-11-14) +## 1.4 (2021-11-14) * [Add] Info Dialog during Bucket proposal and optimized proposal performance [#21](https://github.com/TheAxelander/OpenBudgeteer/issues/21) * [Add] Filter on Transaction Page [#25](https://github.com/TheAxelander/OpenBudgeteer/issues/25) @@ -136,16 +149,16 @@ * [Fixed] Trigger of `SelectedYearMonthChanged` passing `OpenBudgeteer.Core.Test.ViewModelTest.SelectedYearMonthChanged_CheckEventHasBeenInvoked` Test * [Fixed] Wrong text in confirmation message box for deleting a Rule [#44](https://github.com/TheAxelander/OpenBudgeteer/issues/44) -### 1.3 (2020-12-15) +## 1.3 (2020-12-15) * [Add] Support for Sqlite databases [#2](https://github.com/TheAxelander/OpenBudgeteer/issues/2) * [Add] Unit Tests (not full coverage yet) -### 1.2.1 (2020-12-14) +## 1.2.1 (2020-12-14) * [Fixed] Crash on Report Page due to wrong DateTime creation -### 1.2 (2020-10-26) +## 1.2 (2020-10-26) * [Add] Enable collapse of Bucket Groups * [Changed] Overall style changes with new font and colors @@ -153,13 +166,13 @@ * [Changed] Style for Bucket Group modification * [Fixed] Unable to move newly created Bucket Groups [#16](https://github.com/TheAxelander/OpenBudgeteer/issues/16) -### 1.1.1 (2020-09-07) +## 1.1.1 (2020-09-07) * [Fixed] Wrong creation of data for new Rules if the initial selection was used [#13](https://github.com/TheAxelander/OpenBudgeteer/issues/13) * [Fixed] Missing months for Monthly Bucket Expenses Reports in case of no data [#14](https://github.com/TheAxelander/OpenBudgeteer/issues/14) * [Fixed] Crashes on Report Page due to display split of Monthly Bucket Expenses Reports [#15](https://github.com/TheAxelander/OpenBudgeteer/issues/15) -### 1.1 (2020-09-05) +## 1.1 (2020-09-05) * [Add] Added Rule set for automatic Bucket assignments [#5](https://github.com/TheAxelander/OpenBudgeteer/issues/5) * [Add] Enabled movement of Buckets to other Bucket Groups @@ -168,12 +181,12 @@ * [Changed] Opening a new file resets previous Import selection and settings * [Changed] Optimized Y-Axis Ticks for Month Bucket Expenses on Report Page -### 1.0 (2020-08-10) +## 1.0 (2020-08-10) * First major release * Repository now Open Source -### 0.12 (2020-08-04) +## 0.12 (2020-08-04) * [Add] Current version number and database name to header * [Add] Bucket Notes @@ -183,7 +196,7 @@ * [Changed] Redesign Account Page * [Changed] Redesign Balance details on Bucket Page * [Changed] Removed Page Titles -* [Changed] Changed ConnectionString setup for Docker (Splitted full ConnectionString into several pieces for User, Password etc.) +* [Changed] Changed ConnectionString setup for Docker (Split full ConnectionString into several pieces for User, Password etc.) * [Changed] Removed Blazor in Assembly name (now `OpenBudgeteer.dll`) * [Changed] HTML Title from `OpenBudgeteer.Blazor` to `OpenBudgeteer` * [Fixed] Database update on Number and Date format for Import Profile @@ -192,11 +205,11 @@ * [Fixed] Database Issue during Bucket Deletion * [Fixed] IsInactiveFrom value for newly created Buckets -### 0.11.1 (2020-07-18) +## 0.11.1 (2020-07-18) * [Fixed] Broken responsive design for Monthly Bucket Expenses -### 0.11 (2020-07-18) +## 0.11 (2020-07-18) * [Add] Page with several Reports * [Add] Popup with Transactions assigned to an Account on Account Page @@ -213,7 +226,7 @@ * [Fixed] Wrong Error Dialog on Transaction Page * [Fixed] Re-enabled handling of inactive Accounts for existing Transactions -### 0.10 (2020-07-12) +## 0.10 (2020-07-12) * [Add] Preview of final records during data import * [Add] Options for Date and Number format for data import @@ -225,7 +238,7 @@ * [Fixed] Inconsistent number output format for 0 on Bucket Page * [Fixed] Multiple Budget distribution on Buckets -### 0.9 (2020-07-07) +## 0.9 (2020-07-07) * [Add] Added selection of Delimiter and Text qualifier during data import * [Add] Button to edit and save all Transaction @@ -236,35 +249,35 @@ * [Fixed] Missing Bucket colors for Crate new Transaction * [Fixed] Only active Buckets for current YearMonth are displayed for Bucket assignment on Transaction Page -### 0.8 (2020-07-01) +## 0.8 (2020-07-01) * [Add] Colors for Buckets * [Add] Button to distribute Budget on Buckets with Want * [Changed] Input fields for numbers and dates are now properly handled * [Fixed] Want calculation for Bucket Type "Monthly expense" -### 0.7 (2020-06-30) +## 0.7 (2020-06-30) * [Fixed] Pressing Enter for InOut updates UI again * [Fixed] Creating a new Bucket properly updates UI again * [Fixed] Fixed Want calculation due to DateTime issues in Data Model -### 0.6 (2020-06-29) +## 0.6 (2020-06-29) * [Add] Added base implementation for Global Balance details * [Changed] Optimized Performance for Bucket and Transaction Page * [Changed] Allow Update of imported Transactions with pending Bucket assignments * [Fixed] Fixed and optimized Bucket assignment check for Transactions -### 0.5 (2020-06-23) +## 0.5 (2020-06-23) * [Changed] Switch to Blazor -### 0.4 (2020-05-25) +## 0.4 (2020-05-25) * [Changed] Basis for generic database handling implemented -### 0.3 (2020-05-19) +## 0.3 (2020-05-19) * [Changed] Displayed Accounts now sorted by name * [Changed] Displayed Buckets now sorted by name @@ -274,10 +287,10 @@ * [Fixed] Transaction Update for Bucket assignments * [Fixed] Missing database table creation for BucketVersion -### 0.2 (2020-05-18) +## 0.2 (2020-05-18) -* [Add] Enbale creation/update/deletion of Import Profiles +* [Add] Enable creation/update/deletion of Import Profiles -### 0.1 (2020-04-20) +## 0.1 (2020-04-20) * Initial version diff --git a/OpenBudgeteer.Core.Data.Repository/AccountRepository.cs b/OpenBudgeteer.Core.Data.Repository/AccountRepository.cs index ead1826..68eb3f1 100644 --- a/OpenBudgeteer.Core.Data.Repository/AccountRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/AccountRepository.cs @@ -21,10 +21,10 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Account .AsNoTracking(); public Account? ById(Guid id) => DatabaseContext.Account - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public Account? ByIdWithIncludedEntities(Guid id) => DatabaseContext.Account - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public int Create(Account entity) { @@ -52,7 +52,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.Account.FirstOrDefault(i => i.Id == id); + var entity = DatabaseContext.Account.FirstOrDefault(i => i.Id.ToString() == id.ToString()); if (entity == null) throw new Exception($"Account with id {id} not found."); DatabaseContext.Account.Remove(entity); @@ -61,7 +61,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.Account.Where(i => ids.Contains(i.Id)); + var entities = DatabaseContext.Account.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); if (!entities.Any()) throw new Exception($"No Account found with passed IDs."); DatabaseContext.Account.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/BankTransactionRepository.cs b/OpenBudgeteer.Core.Data.Repository/BankTransactionRepository.cs index fcda13d..d392ed3 100644 --- a/OpenBudgeteer.Core.Data.Repository/BankTransactionRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BankTransactionRepository.cs @@ -23,12 +23,12 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext. .AsNoTracking(); public BankTransaction? ById(Guid id) => DatabaseContext.BankTransaction - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public BankTransaction? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BankTransaction .Include(i => i.Account) .Include(i => i.BudgetedTransactions) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public int Create(BankTransaction entity) { @@ -58,7 +58,7 @@ public int Delete(Guid id) { var entity = DatabaseContext.BankTransaction .Include(i => i.BudgetedTransactions) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); if (entity == null) throw new Exception($"BankTransaction with id {id} not found."); DatabaseContext.BankTransaction.Remove(entity); @@ -69,7 +69,7 @@ public int DeleteRange(IEnumerable ids) { var entities = DatabaseContext.BankTransaction .Include(i => i.BudgetedTransactions) - .Where(i => ids.Contains(i.Id)); + .Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); if (!entities.Any()) throw new Exception($"No BankTransactions found with passed IDs."); DatabaseContext.BankTransaction.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs index 5453bc7..8e6f1aa 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs @@ -22,11 +22,11 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Buck .AsNoTracking(); public BucketGroup? ById(Guid id) => DatabaseContext.BucketGroup - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public BucketGroup? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BucketGroup .Include(i => i.Buckets) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public int Create(BucketGroup entity) { @@ -58,7 +58,7 @@ public int Delete(Guid id) var entity = DatabaseContext.BucketGroup .Include(i => i.Buckets) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); if (entity == null) throw new Exception($"BucketGroup with id {id} not found."); if (entity.Buckets.Count != 0) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); @@ -73,7 +73,7 @@ public int DeleteRange(IEnumerable ids) .ToList(); var entities = DatabaseContext.BucketGroup .Include(i => i.Buckets) - .Where(i => cleansedEntities.Contains(i.Id)); + .Where(i => cleansedEntities.Select(j => j.ToString()).Contains(i.Id.ToString())); if (!entities.Any()) throw new Exception($"No BucketGroup found with passed IDs."); if (entities.Any(i => i.Buckets.Count != 0)) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketMovementRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketMovementRepository.cs index c59e1f6..270e737 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketMovementRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketMovementRepository.cs @@ -22,11 +22,11 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.B .AsNoTracking(); public BucketMovement? ById(Guid id) => DatabaseContext.BucketMovement - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public BucketMovement? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BucketMovement .Include(i => i.Bucket) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public int Create(BucketMovement entity) { @@ -54,7 +54,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.BucketMovement.FirstOrDefault(i => i.Id == id); + var entity = DatabaseContext.BucketMovement.FirstOrDefault(i => i.Id.ToString() == id.ToString()); if (entity == null) throw new Exception($"BucketMovement with id {id} not found."); DatabaseContext.BucketMovement.Remove(entity); @@ -63,7 +63,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.BucketMovement.Where(i => ids.Contains(i.Id)); + var entities = DatabaseContext.BucketMovement.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); if (!entities.Any()) throw new Exception($"No BucketMovement found with passed IDs."); DatabaseContext.BucketMovement.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs index 32d70c5..3b2f91c 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs @@ -34,31 +34,31 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Bucket .AsNoTracking(); public Bucket? ById(Guid id) => DatabaseContext.Bucket - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public Bucket? ByIdWithVersions(Guid id) => DatabaseContext.Bucket .Include(i => i.BucketVersions) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public Bucket? ByIdWithMovements(Guid id) => DatabaseContext.Bucket .Include(i => i.BucketMovements) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public Bucket? ByIdWithTransactions(Guid id) => DatabaseContext.Bucket .Include(i => i.BudgetedTransactions).ThenInclude(i => i.Transaction) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); /*public Bucket? ByIdWithActivities(Guid id) => DatabaseContext.Bucket .Include(i => i.BucketMovements) .Include(i => i.BudgetedTransactions).ThenInclude(i => i.Transaction) - .FirstOrDefault(i => i.Id == id);*/ + .FirstOrDefault(i => i.Id.ToString() == id.ToString());*/ public Bucket? ByIdWithIncludedEntities(Guid id) => DatabaseContext.Bucket .Include(i => i.BucketGroup) .Include(i => i.BucketMovements) .Include(i => i.BucketVersions) .Include(i => i.BudgetedTransactions) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public int Create(Bucket entity) { @@ -93,7 +93,7 @@ public int Delete(Guid id) .Include(i => i.BucketMovements) .Include(i => i.BucketVersions) .Include(i => i.BudgetedTransactions) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); if (entity == null) throw new Exception($"Bucket with id {id} not found."); if (entity.BucketMovements.Count != 0) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); if (entity.BudgetedTransactions.Count != 0) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); @@ -114,7 +114,7 @@ public int DeleteRange(IEnumerable ids) .Include(i => i.BucketMovements) .Include(i => i.BucketVersions) .Include(i => i.BudgetedTransactions) - .Where(i => cleansedEntities.Contains(i.Id)); + .Where(i => cleansedEntities.Select(j => j.ToString()).Contains(i.Id.ToString())); if (!entities.Any()) throw new Exception($"No Buckets found with passed IDs."); if (entities.Any(i => i.BucketMovements.Count != 0)) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); if (entities.Any(i => i.BudgetedTransactions.Count != 0)) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketRuleSetRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketRuleSetRepository.cs index 044c579..a505e2a 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketRuleSetRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketRuleSetRepository.cs @@ -24,12 +24,12 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Bu .AsNoTracking(); public BucketRuleSet? ById(Guid id) => DatabaseContext.BucketRuleSet - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public BucketRuleSet? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BucketRuleSet .Include(i => i.TargetBucket) .Include(i => i.MappingRules) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public int Create(BucketRuleSet entity) { @@ -59,7 +59,7 @@ public int Delete(Guid id) { var entity = DatabaseContext.BucketRuleSet .Include(i => i.MappingRules) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); if (entity == null) throw new Exception($"BucketRuleSet with id {id} not found."); DatabaseContext.BucketRuleSet.Remove(entity); @@ -70,7 +70,7 @@ public int DeleteRange(IEnumerable ids) { var entities = DatabaseContext.BucketRuleSet .Include(i => i.MappingRules) - .Where(i => ids.Contains(i.Id)); + .Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); if (!entities.Any()) throw new Exception($"No BucketRuleSets found with passed IDs."); DatabaseContext.BucketRuleSet.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketVersionRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketVersionRepository.cs index a407b35..a760a86 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketVersionRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketVersionRepository.cs @@ -22,11 +22,11 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Bu .AsNoTracking(); public BucketVersion? ById(Guid id) => DatabaseContext.BucketVersion - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public BucketVersion? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BucketVersion .Include(i => i.Bucket) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public int Create(BucketVersion entity) { @@ -54,7 +54,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.BucketVersion.FirstOrDefault(i => i.Id == id); + var entity = DatabaseContext.BucketVersion.FirstOrDefault(i => i.Id.ToString() == id.ToString()); if (entity == null) throw new Exception($"BucketVersion with id {id} not found."); DatabaseContext.BucketVersion.Remove(entity); @@ -63,7 +63,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.BucketVersion.Where(i => ids.Contains(i.Id)); + var entities = DatabaseContext.BucketVersion.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); if (!entities.Any()) throw new Exception($"No BucketVersions found with passed IDs."); DatabaseContext.BucketVersion.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/BudgetedTransactionRepository.cs b/OpenBudgeteer.Core.Data.Repository/BudgetedTransactionRepository.cs index 35b77e3..4e8a4a6 100644 --- a/OpenBudgeteer.Core.Data.Repository/BudgetedTransactionRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BudgetedTransactionRepository.cs @@ -29,17 +29,17 @@ public IQueryable AllWithTransactions() => DatabaseContext. .AsNoTracking(); public BudgetedTransaction? ById(Guid id) => DatabaseContext.BudgetedTransaction - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public BudgetedTransaction? ByIdWithTransaction(Guid id) => DatabaseContext.BudgetedTransaction .Include(i => i.Transaction) .Include(i => i.Transaction.Account) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public BudgetedTransaction? ByIdWithIncludedEntities(Guid id) => DatabaseContext.BudgetedTransaction .Include(i => i.Bucket) .Include(i => i.Transaction) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public int Create(BudgetedTransaction entity) { @@ -67,7 +67,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.BudgetedTransaction.FirstOrDefault(i => i.Id == id); + var entity = DatabaseContext.BudgetedTransaction.FirstOrDefault(i => i.Id.ToString() == id.ToString()); if (entity == null) throw new Exception($"BudgetedTransaction with id {id} not found."); DatabaseContext.BudgetedTransaction.Remove(entity); @@ -76,7 +76,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.BudgetedTransaction.Where(i => ids.Contains(i.Id)); + var entities = DatabaseContext.BudgetedTransaction.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); if (!entities.Any()) throw new Exception($"No BudgetedTransactions found with passed IDs."); DatabaseContext.BudgetedTransaction.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/ImportProfileRepository.cs b/OpenBudgeteer.Core.Data.Repository/ImportProfileRepository.cs index 24e32d9..fff20b1 100644 --- a/OpenBudgeteer.Core.Data.Repository/ImportProfileRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/ImportProfileRepository.cs @@ -23,11 +23,11 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Im .AsNoTracking(); public ImportProfile? ById(Guid id) => DatabaseContext.ImportProfile - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public ImportProfile? ByIdWithIncludedEntities(Guid id) => DatabaseContext.ImportProfile .Include(i => i.Account) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public int Create(ImportProfile entity) { @@ -55,7 +55,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.ImportProfile.FirstOrDefault(i => i.Id == id); + var entity = DatabaseContext.ImportProfile.FirstOrDefault(i => i.Id.ToString() == id.ToString()); if (entity == null) throw new Exception($"ImportProfile with id {id} not found."); DatabaseContext.ImportProfile.Remove(entity); @@ -64,7 +64,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.ImportProfile.Where(i => ids.Contains(i.Id)); + var entities = DatabaseContext.ImportProfile.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); if (!entities.Any()) throw new Exception($"No ImportProfiles found with passed IDs."); DatabaseContext.ImportProfile.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/MappingRuleRepository.cs b/OpenBudgeteer.Core.Data.Repository/MappingRuleRepository.cs index 17a3fde..0a40460 100644 --- a/OpenBudgeteer.Core.Data.Repository/MappingRuleRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/MappingRuleRepository.cs @@ -22,11 +22,11 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Mapp .AsNoTracking(); public MappingRule? ById(Guid id) => DatabaseContext.MappingRule - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public MappingRule? ByIdWithIncludedEntities(Guid id) => DatabaseContext.MappingRule .Include(i => i.BucketRuleSet) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public int Create(MappingRule entity) { @@ -54,7 +54,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.MappingRule.FirstOrDefault(i => i.Id == id); + var entity = DatabaseContext.MappingRule.FirstOrDefault(i => i.Id.ToString() == id.ToString()); if (entity == null) throw new Exception($"MappingRule with id {id} not found."); DatabaseContext.MappingRule.Remove(entity); @@ -63,7 +63,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.MappingRule.Where(i => ids.Contains(i.Id)); + var entities = DatabaseContext.MappingRule.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); if (!entities.Any()) throw new Exception($"No MappingRules found with passed IDs."); DatabaseContext.MappingRule.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Repository/RecurringBankTransactionRepository.cs b/OpenBudgeteer.Core.Data.Repository/RecurringBankTransactionRepository.cs index b69a7ec..f271f75 100644 --- a/OpenBudgeteer.Core.Data.Repository/RecurringBankTransactionRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/RecurringBankTransactionRepository.cs @@ -23,11 +23,11 @@ public IQueryable AllWithIncludedEntities() => Databas .AsNoTracking(); public RecurringBankTransaction? ById(Guid id) => DatabaseContext.RecurringBankTransaction - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public RecurringBankTransaction? ByIdWithIncludedEntities(Guid id) => DatabaseContext.RecurringBankTransaction .Include(i => i.Account) - .FirstOrDefault(i => i.Id == id); + .FirstOrDefault(i => i.Id.ToString() == id.ToString()); public int Create(RecurringBankTransaction entity) { @@ -55,7 +55,7 @@ public int UpdateRange(IEnumerable entities) public int Delete(Guid id) { - var entity = DatabaseContext.RecurringBankTransaction.FirstOrDefault(i => i.Id == id); + var entity = DatabaseContext.RecurringBankTransaction.FirstOrDefault(i => i.Id.ToString() == id.ToString()); if (entity == null) throw new Exception($"RecurringBankTransaction with id {id} not found."); DatabaseContext.RecurringBankTransaction.Remove(entity); @@ -64,7 +64,7 @@ public int Delete(Guid id) public int DeleteRange(IEnumerable ids) { - var entities = DatabaseContext.RecurringBankTransaction.Where(i => ids.Contains(i.Id)); + var entities = DatabaseContext.RecurringBankTransaction.Where(i => ids.Select(j => j.ToString()).Contains(i.Id.ToString())); if (!entities.Any()) throw new Exception($"No RecurringBankTransactions found with passed IDs."); DatabaseContext.RecurringBankTransaction.RemoveRange(entities); diff --git a/OpenBudgeteer.Core.Data.Services/AccountService.cs b/OpenBudgeteer.Core.Data.Services/AccountService.cs index ec9f715..3fe5814 100644 --- a/OpenBudgeteer.Core.Data.Services/AccountService.cs +++ b/OpenBudgeteer.Core.Data.Services/AccountService.cs @@ -58,7 +58,7 @@ public Account CloseAccount(Guid id) using var dbContext = new DatabaseContext(DbContextOptions); var repository = new BankTransactionRepository(dbContext); var balance = repository.All() - .Where(i => i.AccountId == id) + .Where(i => i.AccountId.ToString() == id.ToString()) .ToList() .Sum(i => i.Amount); if (balance != 0) throw new Exception("Balance must be 0 to close an Account"); diff --git a/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs b/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs index 50e80a9..993f39a 100644 --- a/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs +++ b/OpenBudgeteer.Core.Data.Services/BankTransactionService.cs @@ -73,7 +73,7 @@ public IEnumerable GetFromAccount(Guid accountId, DateTime? per .Where(i => i.TransactionDate >= (periodStart ?? DateTime.MinValue) && i.TransactionDate <= (periodEnd ?? DateTime.MaxValue) && - i.AccountId == accountId) + i.AccountId.ToString() == accountId.ToString()) .OrderByDescending(i => i.TransactionDate) .ToList(); return limit > 0 @@ -121,7 +121,7 @@ public override BankTransaction Update(BankTransaction entity) // Delete all existing bucket assignments, as they will be replaced by passed assignments var deletedIds = budgetedTransactionRepository.All() - .Where(i => i.TransactionId == entity.Id) + .Where(i => i.TransactionId.ToString() == entity.Id.ToString()) .Select(i => i.Id) .ToList(); diff --git a/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs b/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs index f906460..2aeff07 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs @@ -40,7 +40,7 @@ public override IEnumerable GetAll() var repository = new BucketGroupRepository(dbContext); return repository .AllWithIncludedEntities() - .Where(i => i.Id != Guid.Parse("00000000-0000-0000-0000-000000000001")) + .Where(i => i.Id.ToString() != "00000000-0000-0000-0000-000000000001") .OrderBy(i => i.Position) .ToList(); } @@ -76,7 +76,7 @@ public IEnumerable GetSystemBucketGroups() using var dbContext = new DatabaseContext(DbContextOptions); var repository = new BucketGroupRepository(dbContext); return repository.AllWithIncludedEntities() - .Where(i => i.Id == Guid.Parse("00000000-0000-0000-0000-000000000001")) + .Where(i => i.Id.ToString() == "00000000-0000-0000-0000-000000000001") .OrderBy(i => i.Position) //In case in future there are multiple groups .ToList(); } diff --git a/OpenBudgeteer.Core.Data.Services/BucketMovementService.cs b/OpenBudgeteer.Core.Data.Services/BucketMovementService.cs index 3ff63c8..821d368 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketMovementService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketMovementService.cs @@ -49,7 +49,7 @@ public IEnumerable GetAllFromBucket(Guid bucketId, DateTime peri .Where(i => i.MovementDate >= periodStart && i.MovementDate <= periodEnd && - i.BucketId == bucketId) + i.BucketId.ToString() == bucketId.ToString()) .ToList(); } catch (Exception e) diff --git a/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs b/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs index 4dfd27c..208489c 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs @@ -57,7 +57,7 @@ public IEnumerable GetMappingRules(Guid bucketRuleSetId) var repository = new MappingRuleRepository(dbContext); return repository .AllWithIncludedEntities() - .Where(i => i.BucketRuleSetId == bucketRuleSetId) + .Where(i => i.BucketRuleSetId.ToString() == bucketRuleSetId.ToString()) .ToList(); } catch (Exception e) @@ -80,11 +80,11 @@ public override BucketRuleSet Update(BucketRuleSet entity) var deletedIds = // Collect database entities mappingRuleRepository.All() - .Where(i => i.BucketRuleSetId == entity.Id) + .Where(i => i.BucketRuleSetId.ToString() == entity.Id.ToString()) .ToList() // Select which of the database IDs are no longer available in entity .Where(i => entity.MappingRules - .All(j => j.Id != i.Id)) + .All(j => j.Id.ToString() != i.Id.ToString())) .Select(i => i.Id) .ToList(); if (deletedIds.Count != 0) @@ -120,7 +120,7 @@ public override void Delete(Guid id) // Delete all existing Mapping Rules mappingRuleRepository.DeleteRange(mappingRuleRepository .All() - .Where(i => i.BucketRuleSetId == id) + .Where(i => i.BucketRuleSetId.ToString() == id.ToString()) .Select(i => i.Id) .ToList()); diff --git a/OpenBudgeteer.Core.Data.Services/BucketService.cs b/OpenBudgeteer.Core.Data.Services/BucketService.cs index af69f02..8be51b7 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketService.cs @@ -44,8 +44,8 @@ public override IEnumerable GetAll() return repository .All() .Where(i => - i.Id != Guid.Parse("00000000-0000-0000-0000-000000000001") && - i.Id != Guid.Parse("00000000-0000-0000-0000-000000000002")) + i.Id.ToString() != "00000000-0000-0000-0000-000000000001" && + i.Id.ToString() != "00000000-0000-0000-0000-000000000002") .OrderBy(i => i.Name) .ToList(); } @@ -66,8 +66,8 @@ public IEnumerable GetSystemBuckets() return repository .All() .Where(i => - i.Id == Guid.Parse("00000000-0000-0000-0000-000000000001") || - i.Id == Guid.Parse("00000000-0000-0000-0000-000000000002")) + i.Id.ToString() == "00000000-0000-0000-0000-000000000001" || + i.Id.ToString() == "00000000-0000-0000-0000-000000000002") .ToList(); } catch (Exception e) @@ -121,7 +121,7 @@ public BucketVersion GetLatestVersion(Guid bucketId, DateTime yearMonth) var result = repository .All() - .Where(i => i.BucketId == bucketId) + .Where(i => i.BucketId.ToString() == bucketId.ToString()) .OrderByDescending(i => i.ValidFrom) .ToList() .FirstOrDefault(i => i!.ValidFrom <= yearMonth, null); @@ -413,7 +413,7 @@ public override void Delete(Guid id) // Delete all BucketRuleSet which refer to this Bucket var bucketRuleSetIds = bucketRuleSetRepository .All() - .Where(i => i.TargetBucketId == id) + .Where(i => i.TargetBucketId.ToString() == id.ToString()) .Select(i => i.Id) .ToList(); if (bucketRuleSetIds.Count != 0) bucketRuleSetRepository.DeleteRange(bucketRuleSetIds); diff --git a/OpenBudgeteer.Core.Data.Services/BudgetedTransactionService.cs b/OpenBudgeteer.Core.Data.Services/BudgetedTransactionService.cs index 434d346..2716893 100644 --- a/OpenBudgeteer.Core.Data.Services/BudgetedTransactionService.cs +++ b/OpenBudgeteer.Core.Data.Services/BudgetedTransactionService.cs @@ -51,7 +51,7 @@ public IEnumerable GetAllFromTransaction(Guid transactionId .Where(i => i.Transaction.TransactionDate >= periodStart && i.Transaction.TransactionDate <= periodEnd && - i.TransactionId == transactionId) + i.TransactionId.ToString() == transactionId.ToString()) .ToList(); } catch (Exception e) @@ -78,7 +78,7 @@ public IEnumerable GetAllFromBucket(Guid bucketId, DateTime .Where(i => i.Transaction.TransactionDate >= periodStart && i.Transaction.TransactionDate <= periodEnd && - i.BucketId == bucketId) + i.BucketId.ToString() == bucketId.ToString()) .OrderByDescending(i => i.Transaction.TransactionDate) .ToList(); } @@ -106,7 +106,7 @@ public IEnumerable GetAllNonTransfer(DateTime periodStart, .Where(i => i.Transaction.TransactionDate >= periodStart && i.Transaction.TransactionDate <= periodEnd && - i.BucketId != Guid.Parse("00000000-0000-0000-0000-000000000002")) + i.BucketId.ToString() != "00000000-0000-0000-0000-000000000002") .ToList(); } catch (Exception e) @@ -133,7 +133,7 @@ public IEnumerable GetAllTransfer(DateTime periodStart, Dat .Where(i => i.Transaction.TransactionDate >= periodStart && i.Transaction.TransactionDate <= periodEnd && - i.BucketId == Guid.Parse("00000000-0000-0000-0000-000000000002")) + i.BucketId.ToString() == "00000000-0000-0000-0000-000000000002") .ToList(); } catch (Exception e) @@ -160,7 +160,7 @@ public IEnumerable GetAllIncome(DateTime periodStart, DateT .Where(i => i.Transaction.TransactionDate >= periodStart && i.Transaction.TransactionDate <= periodEnd && - i.BucketId == Guid.Parse("00000000-0000-0000-0000-000000000001")) + i.BucketId.ToString() == "00000000-0000-0000-0000-000000000001") .ToList(); } catch (Exception e) From 3367e2514d1d16a07a15c91e3da6e6caa8af3f25 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Tue, 5 Mar 2024 17:09:24 +0100 Subject: [PATCH 44/57] Fix #224 and #225 --- CHANGELOG.md | 1 + OpenBudgeteer.API/Program.cs | 8 +- OpenBudgeteer.Blazor/Pages/Bucket.razor | 2 +- OpenBudgeteer.Blazor/Pages/Transaction.razor | 6 +- .../Pages/Transaction.razor.cs | 4 +- .../Shared/BucketDetailsDialog.razor | 2 +- .../Shared/RecurringTransactionDialog.razor | 11 ++- .../Shared/TransactionDialog.razor | 2 +- .../IRecurringBankTransactionService.cs | 2 + .../RecurringBankTransactionService.cs | 36 +++++++ .../RecurringTransactionRecurrenceType.cs | 18 ++++ .../EntityViewModels/AccountViewModel.cs | 10 ++ .../RecurringTransactionViewModel.cs | 93 ++++++------------- .../EntityViewModels/TransactionViewModel.cs | 60 +++++------- .../RecurringTransactionHandlerViewModel.cs | 2 +- 15 files changed, 139 insertions(+), 118 deletions(-) create mode 100644 OpenBudgeteer.Core/Common/Extensions/RecurringTransactionRecurrenceType.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 44f1e06..86f8825 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ * Adding a Mapping Rule to an existing Rule Set no longer fails [#200](https://github.com/TheAxelander/OpenBudgeteer/pull/200) Thanks [Lucaber](https://github.com/Lucaber) * Exception after canceling creation of a new Recurring Transactions [#210](https://github.com/TheAxelander/OpenBudgeteer/issues/210) * Guid issues using Sqlite database [#221](https://github.com/TheAxelander/OpenBudgeteer/issues/221) +* Fix `Expand All` button typo on Bucket Page [#224](https://github.com/TheAxelander/OpenBudgeteer/issues/224) ### :hammer: Maintenance diff --git a/OpenBudgeteer.API/Program.cs b/OpenBudgeteer.API/Program.cs index 161b824..16520dd 100644 --- a/OpenBudgeteer.API/Program.cs +++ b/OpenBudgeteer.API/Program.cs @@ -37,7 +37,6 @@ var versionSet = app.NewApiVersionSet() .HasApiVersion(1, 0) - .HasApiVersion(2, 0) // reporting api versions will return the headers // "api-supported-versions" and "api-deprecated-versions" .ReportApiVersions() @@ -91,7 +90,7 @@ transaction.MapGet("/fromAccount/{id:guid}", (Guid id, DateTime? start, DateTime? end, int? limit) => bankTransactionService.GetFromAccount(id, start, end, limit ?? 0)) .MapToApiVersion(1,0); -transaction.MapGet( "/withBucket/{id:guid}", (Guid id) => +transaction.MapGet( "/withEntities/{id:guid}", (Guid id) => bankTransactionService.GetWithEntities(id)) .MapToApiVersion(1,0); @@ -128,7 +127,10 @@ // GET recurring.MapGet("{id:guid}", (Guid id) => recurringTransactionService.Get(id)) .MapToApiVersion(1,0); -recurring.MapGet("/", () => recurringTransactionService.GetAll()) +recurring.MapGet("/", () => recurringTransactionService.GetAllWithEntities()) + .MapToApiVersion(1,0); +recurring.MapGet( "/withEntities/{id:guid}", (Guid id) => + recurringTransactionService.GetWithEntities(id)) .MapToApiVersion(1,0); recurring.MapGet("/pendingTransactions", async (DateTime yearMonth) => await recurringTransactionService.GetPendingBankTransactionAsync(yearMonth)) diff --git a/OpenBudgeteer.Blazor/Pages/Bucket.razor b/OpenBudgeteer.Blazor/Pages/Bucket.razor index cd27d96..b35cfcb 100644 --- a/OpenBudgeteer.Blazor/Pages/Bucket.razor +++ b/OpenBudgeteer.Blazor/Pages/Bucket.razor @@ -69,7 +69,7 @@ - +
diff --git a/OpenBudgeteer.Blazor/Pages/Transaction.razor b/OpenBudgeteer.Blazor/Pages/Transaction.razor index bc65945..4b21f5c 100644 --- a/OpenBudgeteer.Blazor/Pages/Transaction.razor +++ b/OpenBudgeteer.Blazor/Pages/Transaction.razor @@ -56,7 +56,7 @@
@transaction.TransactionDate.ToShortDateString()@transaction.AccountName@transaction.SelectedAccount.Name @transaction.Payee @transaction.Memo @transaction.Amount.ToString("C", CultureInfo.CurrentCulture)
@transaction.TransactionDate.ToShortDateString()@transaction.AccountName@transaction.SelectedAccount.Name @transaction.Payee @transaction.Memo @transaction.Amount.ToString("C", CultureInfo.CurrentCulture)
@transaction.FirstOccurrenceDate.ToShortDateString() Every @transaction.RecurrenceAmount@transaction.RecurrenceTypeOutput@transaction.RecurrenceType.GetStringValue() @transaction.SelectedAccount.Name @transaction.Payee @transaction.Memo
@transaction.TransactionDate.ToShortDateString()@transaction.AccountName@transaction.SelectedAccount.Name @transaction.Payee @transaction.Memo @transaction.Amount.ToString("C", CultureInfo.CurrentCulture)
- + @@ -117,26 +116,26 @@
- + diff --git a/OpenBudgeteer.Blazor/Pages/Rules.razor.cs b/OpenBudgeteer.Blazor/Pages/Rules.razor.cs index 5860591..d7baff8 100644 --- a/OpenBudgeteer.Blazor/Pages/Rules.razor.cs +++ b/OpenBudgeteer.Blazor/Pages/Rules.razor.cs @@ -1,6 +1,8 @@ +using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using OpenBudgeteer.Core.Common; +using OpenBudgeteer.Core.Common.Extensions; using OpenBudgeteer.Core.Data.Contracts.Services; using OpenBudgeteer.Core.ViewModels.EntityViewModels; using OpenBudgeteer.Core.ViewModels.Helper; @@ -82,6 +84,22 @@ private void UpdateSelectedBucket(BucketViewModel selectedBucket) _ruleSetViewModelToBeUpdated!.UpdateSelectedBucket(selectedBucket); _isBucketSelectDialogVisible = false; } + + private void ComparisionField_SelectionChanged(string? value, MappingRuleViewModel mappingRule) + { + if (string.IsNullOrEmpty(value)) return; + mappingRule.ComparisonField = Enum.TryParse(typeof(MappingRuleComparisonField), value, out var result) + ? (MappingRuleComparisonField)result + : MappingRuleComparisonField.Account; + } + + private void ComparisionType_SelectionChanged(string? value, MappingRuleViewModel mappingRule) + { + if (string.IsNullOrEmpty(value)) return; + mappingRule.ComparisonType = Enum.TryParse(typeof(MappingRuleComparisonType), value, out var result) + ? (MappingRuleComparisonType)result + : MappingRuleComparisonType.Equal; + } private void HandleShowDeleteRuleSetDialog(RuleSetViewModel ruleSet) { diff --git a/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor b/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor index cf047af..91751ec 100644 --- a/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor +++ b/OpenBudgeteer.Blazor/Shared/EditBucketDialog.razor @@ -19,7 +19,7 @@
@foreach (var bucketGroup in DataContext.AvailableBucketGroups!) { @@ -75,7 +75,7 @@ + @bind:set="(value) => { DataContext.TextColorCode = value!; }"> @foreach (var color in DataContext.AvailableColors!) { @@ -177,6 +177,6 @@ void BucketGroup_SelectionChanged(string? value) { if (string.IsNullOrEmpty(value)) return; - DataContext.SelectedBucketGroup = DataContext.AvailableBucketGroups.First(i => i.Id == Guid.Parse(value)); + DataContext.SelectedBucketGroup = DataContext.AvailableBucketGroups!.First(i => i.Id == Guid.Parse(value)); } } diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs index e90ecc6..aa069bc 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs @@ -40,11 +40,11 @@ public BucketVersionViewModel BucketVersion set => Set(ref _bucketVersion, value); } - private BucketGroup _selectedBucketGroup; + private BucketGroup? _selectedBucketGroup; /// /// to which this Bucket is assigned to /// - public BucketGroup SelectedBucketGroup + public BucketGroup? SelectedBucketGroup { get => _selectedBucketGroup; set => Set(ref _selectedBucketGroup, value); @@ -319,18 +319,24 @@ protected BucketViewModel(BucketViewModel viewModel) : base(viewModel.ServiceMan _isProgressBarVisible = viewModel.IsProgressbarVisible; _isHovered = viewModel.IsHovered; - AvailableColors = new ObservableCollection(); - foreach (var availableColor in viewModel.AvailableColors) + if (viewModel.AvailableColors != null) { - AvailableColors.Add(availableColor); + AvailableColors = new ObservableCollection(); + foreach (var availableColor in viewModel.AvailableColors) + { + AvailableColors.Add(availableColor); + } } - - AvailableBucketGroups = new ObservableCollection(); - foreach (var item in viewModel.AvailableBucketGroups) + + if (viewModel.AvailableBucketGroups != null) { - AvailableBucketGroups.Add(item); + AvailableBucketGroups = new ObservableCollection(); + foreach (var item in viewModel.AvailableBucketGroups) + { + AvailableBucketGroups.Add(item); + } } - + _currentYearMonth = viewModel._currentYearMonth; } @@ -550,7 +556,7 @@ internal override Bucket ConvertToDto() { Id = BucketId, Name = Name, - BucketGroupId = SelectedBucketGroup.Id, + BucketGroupId = SelectedBucketGroup!.Id, ColorCode = ColorCode, TextColorCode = TextColorCode, ValidFrom = ValidFrom, diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs index dab689b..16374e0 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/PartialBucketViewModel.cs @@ -148,6 +148,7 @@ public PartialBucketViewModel(PartialBucketViewModel viewModel) : base(viewModel _selectedBucketName = viewModel.SelectedBucketName; _selectedBucketColorCode = viewModel.SelectedBucketColorCode; _selectedBucketTextColorCode = viewModel.SelectedBucketTextColorCode; + _selectedBucketOutput = viewModel.SelectedBucketOutput; _amount = viewModel.Amount; } diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs index 37470a0..9526bd7 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs @@ -593,6 +593,8 @@ public void StartModification() public void CancelModification() { + if (_oldTransactionViewModelItem == null) return; + SelectedAccount = _oldTransactionViewModelItem.SelectedAccount; TransactionDate = _oldTransactionViewModelItem.TransactionDate; Payee = _oldTransactionViewModelItem.Payee; From 1e7f07998c411bd446912a0fe34816901445d078 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Thu, 14 Mar 2024 08:47:37 +0100 Subject: [PATCH 49/57] Rework warnings --- .../Models/Bucket.cs | 6 ++--- .../Models/BucketGroup.cs | 2 +- .../Models/BucketRuleSet.cs | 2 +- .../BucketGroupRepository.cs | 4 ++-- .../BucketRepository.cs | 12 +++++----- .../BucketGroupService.cs | 2 +- .../BucketRuleSetService.cs | 2 +- .../BucketService.cs | 22 +++++++++---------- .../EntityViewModels/RuleSetViewModel.cs | 9 +++++--- .../Helper/BucketListingViewModel.cs | 2 +- .../PageViewModels/ReportPageViewModel.cs | 2 +- 11 files changed, 34 insertions(+), 31 deletions(-) diff --git a/OpenBudgeteer.Core.Data.Entities/Models/Bucket.cs b/OpenBudgeteer.Core.Data.Entities/Models/Bucket.cs index 35f8e3b..2615c5a 100644 --- a/OpenBudgeteer.Core.Data.Entities/Models/Bucket.cs +++ b/OpenBudgeteer.Core.Data.Entities/Models/Bucket.cs @@ -32,9 +32,9 @@ public class Bucket : IEntity [NotMapped] public BucketVersion? CurrentVersion { get; set; } - public ICollection BucketVersions { get; set; } + public ICollection? BucketVersions { get; set; } - public ICollection BudgetedTransactions { get; set; } + public ICollection? BudgetedTransactions { get; set; } - public ICollection BucketMovements { get; set; } + public ICollection? BucketMovements { get; set; } } diff --git a/OpenBudgeteer.Core.Data.Entities/Models/BucketGroup.cs b/OpenBudgeteer.Core.Data.Entities/Models/BucketGroup.cs index c4a353e..0807e69 100644 --- a/OpenBudgeteer.Core.Data.Entities/Models/BucketGroup.cs +++ b/OpenBudgeteer.Core.Data.Entities/Models/BucketGroup.cs @@ -14,5 +14,5 @@ public class BucketGroup : IEntity [Required] public int Position { get; set; } - public ICollection Buckets { get; set; } + public ICollection? Buckets { get; set; } } diff --git a/OpenBudgeteer.Core.Data.Entities/Models/BucketRuleSet.cs b/OpenBudgeteer.Core.Data.Entities/Models/BucketRuleSet.cs index fe70bf1..5e8e58a 100644 --- a/OpenBudgeteer.Core.Data.Entities/Models/BucketRuleSet.cs +++ b/OpenBudgeteer.Core.Data.Entities/Models/BucketRuleSet.cs @@ -19,5 +19,5 @@ public class BucketRuleSet : IEntity public Bucket TargetBucket { get; set; } = null!; - public ICollection MappingRules { get; set; } + public ICollection? MappingRules { get; set; } } diff --git a/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs index 5453bc7..7993c4c 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketGroupRepository.cs @@ -60,7 +60,7 @@ public int Delete(Guid id) .Include(i => i.Buckets) .FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"BucketGroup with id {id} not found."); - if (entity.Buckets.Count != 0) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); + if (entity.Buckets != null && entity.Buckets.Count != 0) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); DatabaseContext.BucketGroup.Remove(entity); return DatabaseContext.SaveChanges(); @@ -75,7 +75,7 @@ public int DeleteRange(IEnumerable ids) .Include(i => i.Buckets) .Where(i => cleansedEntities.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No BucketGroup found with passed IDs."); - if (entities.Any(i => i.Buckets.Count != 0)) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); + if (entities.Any(i => i.Buckets != null && i.Buckets.Count != 0)) throw new Exception($"Cannot delete a BucketGroup with Buckets assigned to it."); DatabaseContext.BucketGroup.RemoveRange(entities); return DatabaseContext.SaveChanges(); diff --git a/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs b/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs index 32d70c5..d4a273c 100644 --- a/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs +++ b/OpenBudgeteer.Core.Data.Repository/BucketRepository.cs @@ -23,7 +23,7 @@ public IQueryable AllWithVersions() => DatabaseContext.Bucket public IQueryable AllWithActivities() => DatabaseContext.Bucket .Include(i => i.BucketMovements) - .Include(i => i.BudgetedTransactions).ThenInclude(i => i.Transaction) + .Include(i => i.BudgetedTransactions)!.ThenInclude(i => i.Transaction) .AsNoTracking(); public IQueryable AllWithIncludedEntities() => DatabaseContext.Bucket @@ -45,7 +45,7 @@ public IQueryable AllWithIncludedEntities() => DatabaseContext.Bucket .FirstOrDefault(i => i.Id == id); public Bucket? ByIdWithTransactions(Guid id) => DatabaseContext.Bucket - .Include(i => i.BudgetedTransactions).ThenInclude(i => i.Transaction) + .Include(i => i.BudgetedTransactions)!.ThenInclude(i => i.Transaction) .FirstOrDefault(i => i.Id == id); /*public Bucket? ByIdWithActivities(Guid id) => DatabaseContext.Bucket @@ -95,8 +95,8 @@ public int Delete(Guid id) .Include(i => i.BudgetedTransactions) .FirstOrDefault(i => i.Id == id); if (entity == null) throw new Exception($"Bucket with id {id} not found."); - if (entity.BucketMovements.Count != 0) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); - if (entity.BudgetedTransactions.Count != 0) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); + if (entity.BucketMovements != null && entity.BucketMovements.Count != 0) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); + if (entity.BudgetedTransactions != null && entity.BudgetedTransactions.Count != 0) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); DatabaseContext.Bucket.Remove(entity); return DatabaseContext.SaveChanges(); @@ -116,8 +116,8 @@ public int DeleteRange(IEnumerable ids) .Include(i => i.BudgetedTransactions) .Where(i => cleansedEntities.Contains(i.Id)); if (!entities.Any()) throw new Exception($"No Buckets found with passed IDs."); - if (entities.Any(i => i.BucketMovements.Count != 0)) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); - if (entities.Any(i => i.BudgetedTransactions.Count != 0)) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); + if (entities.Any(i => i.BucketMovements != null && i.BucketMovements.Count != 0)) throw new Exception($"Cannot delete a Bucket with BucketMovements assigned to it."); + if (entities.Any(i => i.BudgetedTransactions != null && i.BudgetedTransactions.Count != 0)) throw new Exception($"Cannot delete a Bucket with BudgetedTransactions assigned to it."); DatabaseContext.Bucket.RemoveRange(entities); return DatabaseContext.SaveChanges(); diff --git a/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs b/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs index f906460..b63f527 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketGroupService.cs @@ -146,7 +146,7 @@ public override void Delete(Guid id) var entity = bucketGroupRepository.ByIdWithIncludedEntities(id); if (entity == null) throw new Exception("BucketGroup not found"); - if (entity.Buckets.Any()) throw new Exception("BucketGroup with Buckets cannot be deleted"); + if (entity.Buckets != null && entity.Buckets.Any()) throw new Exception("BucketGroup with Buckets cannot be deleted"); var oldPosition = entity.Position; bucketGroupRepository.Delete(id); diff --git a/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs b/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs index 4dfd27c..7f1a27c 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketRuleSetService.cs @@ -83,7 +83,7 @@ public override BucketRuleSet Update(BucketRuleSet entity) .Where(i => i.BucketRuleSetId == entity.Id) .ToList() // Select which of the database IDs are no longer available in entity - .Where(i => entity.MappingRules + .Where(i => entity.MappingRules != null && entity.MappingRules .All(j => j.Id != i.Id)) .Select(i => i.Id) .ToList(); diff --git a/OpenBudgeteer.Core.Data.Services/BucketService.cs b/OpenBudgeteer.Core.Data.Services/BucketService.cs index af69f02..0157c5c 100644 --- a/OpenBudgeteer.Core.Data.Services/BucketService.cs +++ b/OpenBudgeteer.Core.Data.Services/BucketService.cs @@ -23,7 +23,7 @@ public Bucket GetWithLatestVersion(Guid id) var result = repository.ByIdWithVersions(id); if (result == null) throw new Exception($"{typeof(Bucket)} not found in database"); result.CurrentVersion = GetLatestVersion(id, DateTime.Now); - result.BucketVersions = result.BucketVersions.OrderByDescending(i => i.Version).ToList(); + result.BucketVersions = result.BucketVersions!.OrderByDescending(i => i.Version).ToList(); return result; } @@ -97,10 +97,10 @@ public IEnumerable GetActiveBuckets(DateTime validFrom) .ToList(); foreach (var bucket in result) { - bucket.CurrentVersion = bucket.BucketVersions + bucket.CurrentVersion = bucket.BucketVersions! .OrderByDescending(i => i.ValidFrom) .ToList() - .First(i => i!.ValidFrom <= validFrom); + .First(i => i.ValidFrom <= validFrom); } return result; @@ -147,19 +147,19 @@ public BucketFigures GetFigures(Guid bucketId, DateTime yearMonth) decimal input = 0, output = 0; // Calculate Balance - var balance = bucketWithTransactions.BudgetedTransactions + var balance = bucketWithTransactions.BudgetedTransactions! .Where(i => i.Transaction.TransactionDate < yearMonth.AddMonths(1)) .ToList() .Sum(i => i.Amount); - balance += bucketWithMovements.BucketMovements + balance += bucketWithMovements.BucketMovements! .Where(i => i.MovementDate < yearMonth.AddMonths(1)) .ToList() .Sum(i => i.Amount); // Calculate In & Out - var bucketTransactionsCurrentMonth = bucketWithTransactions.BudgetedTransactions + var bucketTransactionsCurrentMonth = bucketWithTransactions.BudgetedTransactions! .Where(i => i.Transaction.TransactionDate.Year == yearMonth.Year && i.Transaction.TransactionDate.Month == yearMonth.Month) @@ -173,7 +173,7 @@ public BucketFigures GetFigures(Guid bucketId, DateTime yearMonth) input += bucketTransaction.Amount; } - var bucketMovementsCurrentMonth = bucketWithMovements.BucketMovements + var bucketMovementsCurrentMonth = bucketWithMovements.BucketMovements! .Where(i => i.MovementDate.Year == yearMonth.Year && i.MovementDate.Month == yearMonth.Month) @@ -205,12 +205,12 @@ public decimal GetBalance(Guid bucketId, DateTime yearMonth) var bucketWithTransactions = repository.ByIdWithTransactions(bucketId) ?? throw new Exception("Bucket not found."); var bucketWithMovements = repository.ByIdWithMovements(bucketId) ?? throw new Exception("Bucket not found."); - var result = bucketWithTransactions.BudgetedTransactions + var result = bucketWithTransactions.BudgetedTransactions! .Where(i => i.Transaction.TransactionDate < yearMonth.AddMonths(1)) .ToList() .Sum(i => i.Amount); - result += bucketWithMovements.BucketMovements + result += bucketWithMovements.BucketMovements! .Where(i => i.MovementDate < yearMonth.AddMonths(1)) .ToList() .Sum(i => i.Amount); @@ -235,7 +235,7 @@ public BucketFigures GetInAndOut(Guid bucketId, DateTime yearMonth) decimal input = 0, output = 0; - var bucketTransactionsCurrentMonth = bucketWithTransactions.BudgetedTransactions + var bucketTransactionsCurrentMonth = bucketWithTransactions.BudgetedTransactions! .Where(i => i.Transaction.TransactionDate.Year == yearMonth.Year && i.Transaction.TransactionDate.Month == yearMonth.Month) @@ -249,7 +249,7 @@ public BucketFigures GetInAndOut(Guid bucketId, DateTime yearMonth) input += bucketTransaction.Amount; } - var bucketMovementsCurrentMonth = bucketWithMovements.BucketMovements + var bucketMovementsCurrentMonth = bucketWithMovements.BucketMovements! .Where(i => i.MovementDate.Year == yearMonth.Year && i.MovementDate.Month == yearMonth.Month) diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/RuleSetViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/RuleSetViewModel.cs index 4be32b1..c673350 100644 --- a/OpenBudgeteer.Core/ViewModels/EntityViewModels/RuleSetViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/EntityViewModels/RuleSetViewModel.cs @@ -177,10 +177,13 @@ protected RuleSetViewModel(IServiceManager serviceManager, IEnumerable a _targetBucketName = bucketRuleSet.TargetBucket.Name ?? string.Empty; _targetBucketColorCode = bucketRuleSet.TargetBucket.ColorCode ?? string.Empty; _targetBucketTextColorCode = bucketRuleSet.TargetBucket.TextColorCode ?? string.Empty; - - foreach (var mappingRule in bucketRuleSet.MappingRules) + + if (bucketRuleSet.MappingRules != null) { - MappingRules.Add(new MappingRuleViewModel(serviceManager, mappingRule)); + foreach (var mappingRule in bucketRuleSet.MappingRules) + { + MappingRules.Add(new MappingRuleViewModel(serviceManager, mappingRule)); + } } } } diff --git a/OpenBudgeteer.Core/ViewModels/Helper/BucketListingViewModel.cs b/OpenBudgeteer.Core/ViewModels/Helper/BucketListingViewModel.cs index b25b258..db80ed0 100644 --- a/OpenBudgeteer.Core/ViewModels/Helper/BucketListingViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/Helper/BucketListingViewModel.cs @@ -60,7 +60,7 @@ public virtual async Task LoadDataAsync(bool excludeIn var bucketItemTasks = new List>(); - foreach (var bucket in bucketGroup.Buckets.OrderBy(i => i.Name)) + foreach (var bucket in bucketGroup.Buckets!.OrderBy(i => i.Name)) { if (excludeInactive && bucket.IsInactive) continue; // Skip as inactive Buckets should be excluded if (bucket.ValidFrom > YearMonthViewModel.CurrentMonth) continue; // Bucket not yet active for selected month diff --git a/OpenBudgeteer.Core/ViewModels/PageViewModels/ReportPageViewModel.cs b/OpenBudgeteer.Core/ViewModels/PageViewModels/ReportPageViewModel.cs index 57024cc..620ed13 100644 --- a/OpenBudgeteer.Core/ViewModels/PageViewModels/ReportPageViewModel.cs +++ b/OpenBudgeteer.Core/ViewModels/PageViewModels/ReportPageViewModel.cs @@ -214,7 +214,7 @@ protected async Task> LoadMonthExpensesB i.Id != Guid.Parse("00000000-0000-0000-0000-000000000002"))) { // Check on right Bucket Type - var latestVersion = bucket.BucketVersions + var latestVersion = bucket.BucketVersions! .OrderByDescending(i => i.Version) .First(); if (latestVersion.BucketType != 2) continue; From 801a204958f140ac6f79caa997c0abca86c43e09 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Thu, 14 Mar 2024 08:57:49 +0100 Subject: [PATCH 50/57] Add Github Actions for Version Tag Docker Build --- .../workflows/docker-image-version-tag.yml | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/docker-image-version-tag.yml diff --git a/.github/workflows/docker-image-version-tag.yml b/.github/workflows/docker-image-version-tag.yml new file mode 100644 index 0000000..f5fc7fc --- /dev/null +++ b/.github/workflows/docker-image-version-tag.yml @@ -0,0 +1,59 @@ +name: Docker Image (Version Tag) + +on: + push: + tags: + - "*" + +env: + DOTNET_VERSION: '8.0.100' # The .NET SDK version to use + +jobs: + test: + runs-on: ubuntu-latest + name: Run Test Cases + steps: + - name: Check out repo + uses: actions/checkout@v3 + + - name: Setup dotnet + uses: actions/setup-dotnet@v3 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + + - name: Install Blazor dependencies + run: dotnet restore OpenBudgeteer.Blazor + + - name: Build Blazor + run: dotnet build OpenBudgeteer.Blazor --configuration Release --no-restore + + - name: Run Core Test Cases + run: dotnet test OpenBudgeteer.Core.Test + deploy-docker: + runs-on: ubuntu-latest + name: Build and Push Docker Image + needs: test + if: success() + steps: + - name: Check out repo + uses: actions/checkout@v3 + + - name: Docker Login + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: . + push: true + tags: axelander/openbudgeteer:${{ github.ref_name }}" + platforms: linux/arm64,linux/amd64 From 3de5da397f9c0e9afcfd5b31f5b9656219f7ad46 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Thu, 14 Mar 2024 16:49:58 +0100 Subject: [PATCH 51/57] Fix Github Actions Docker Image (Version Tag) --- .github/workflows/docker-image-version-tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-version-tag.yml b/.github/workflows/docker-image-version-tag.yml index f5fc7fc..b69b700 100644 --- a/.github/workflows/docker-image-version-tag.yml +++ b/.github/workflows/docker-image-version-tag.yml @@ -55,5 +55,5 @@ jobs: with: context: . push: true - tags: axelander/openbudgeteer:${{ github.ref_name }}" + tags: axelander/openbudgeteer:${{ github.ref_name }} platforms: linux/arm64,linux/amd64 From 3d988ed252370dc1675b93a54e6039c18126a105 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 16 Mar 2024 09:13:56 +0100 Subject: [PATCH 52/57] Update README --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cd2a4cc..d150b40 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ docker run -d --name='openbudgeteer' \ -e 'CONNECTION_DATABASE'='/srv/openbudgeteer.db' \ -p 8080:8080 \ -v 'data:/srv' \ - 'axelander/openbudgeteer:pre-release' + 'axelander/openbudgeteer:latest' # alternatively use 'pre-release' or a specific version tag ``` ### docker compose @@ -50,7 +50,9 @@ version: "3" services: openbudgeteer: - image: axelander/openbudgeteer:pre-release + image: axelander/openbudgeteer:latest + #image: axelander/openbudgeteer:pre-release + #image: axelander/openbudgeteer:1.7 container_name: openbudgeteer ports: - 8080:8080 From cc8f4928f687b8510899d15b078978e1ab8c63ec Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 16 Mar 2024 09:17:40 +0100 Subject: [PATCH 53/57] Update SECURITY.md --- OpenBudgeteer.sln | 1 + SECURITY.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenBudgeteer.sln b/OpenBudgeteer.sln index 4934459..cc63ade 100644 --- a/OpenBudgeteer.sln +++ b/OpenBudgeteer.sln @@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution CHANGELOG.md = CHANGELOG.md LICENSE = LICENSE LICENSE-3RD-PARTY = LICENSE-3RD-PARTY + SECURITY.md = SECURITY.md EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenBudgeteer.Core.Data.Sqlite.Migrations", "OpenBudgeteer.Core.Data.Sqlite.Migrations\OpenBudgeteer.Core.Data.Sqlite.Migrations.csproj", "{7D6ED82D-BAE4-4BC4-AEA9-22801037C6C3}" diff --git a/SECURITY.md b/SECURITY.md index 6e2e8d5..cc56b30 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,9 +4,9 @@ | Version | Supported | |-------------| ------------------ | -| 1.7 | :white_check_mark: | +| 1.8 | :white_check_mark: | | pre-release | :white_check_mark: | -| < 1.7 | :x: | +| < 1.8 | :x: | ## Reporting a Vulnerability From 5c4f63bc31e99f467011d4f0d11c5030d48b772f Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 16 Mar 2024 09:19:08 +0100 Subject: [PATCH 54/57] Update CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbd32fa..cfe82f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.8 (2024-xx-xx) +## 1.8 (2024-03-16) ### :warning: Breaking Changes From 48eba39596b269d50477af3d8cc3ebac110286fb Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 16 Mar 2024 09:26:26 +0100 Subject: [PATCH 55/57] Upgrade Nuget Packages --- OpenBudgeteer.API/OpenBudgeteer.API.csproj | 6 +++--- OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj | 4 ++-- .../OpenBudgeteer.Core.Data.Entities.csproj | 2 +- .../OpenBudgeteer.Core.Data.MySql.Migrations.csproj | 6 +++--- ...penBudgeteer.Core.Data.Postgres.Migrations.csproj | 6 +++--- .../OpenBudgeteer.Core.Data.Sqlite.Migrations.csproj | 4 ++-- .../OpenBudgeteer.Core.Data.csproj | 12 ++++++------ .../OpenBudgeteer.Core.Test.csproj | 10 +++++----- OpenBudgeteer.Core/OpenBudgeteer.Core.csproj | 6 +++--- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/OpenBudgeteer.API/OpenBudgeteer.API.csproj b/OpenBudgeteer.API/OpenBudgeteer.API.csproj index a19dd35..bbeada1 100644 --- a/OpenBudgeteer.API/OpenBudgeteer.API.csproj +++ b/OpenBudgeteer.API/OpenBudgeteer.API.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj b/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj index 0bbbba2..8f6c401 100644 --- a/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj +++ b/OpenBudgeteer.Blazor/OpenBudgeteer.Blazor.csproj @@ -11,11 +11,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/OpenBudgeteer.Core.Data.Entities/OpenBudgeteer.Core.Data.Entities.csproj b/OpenBudgeteer.Core.Data.Entities/OpenBudgeteer.Core.Data.Entities.csproj index 27b5a23..bbcb05e 100644 --- a/OpenBudgeteer.Core.Data.Entities/OpenBudgeteer.Core.Data.Entities.csproj +++ b/OpenBudgeteer.Core.Data.Entities/OpenBudgeteer.Core.Data.Entities.csproj @@ -7,7 +7,7 @@ - + diff --git a/OpenBudgeteer.Core.Data.MySql.Migrations/OpenBudgeteer.Core.Data.MySql.Migrations.csproj b/OpenBudgeteer.Core.Data.MySql.Migrations/OpenBudgeteer.Core.Data.MySql.Migrations.csproj index 899b3af..084fe9c 100644 --- a/OpenBudgeteer.Core.Data.MySql.Migrations/OpenBudgeteer.Core.Data.MySql.Migrations.csproj +++ b/OpenBudgeteer.Core.Data.MySql.Migrations/OpenBudgeteer.Core.Data.MySql.Migrations.csproj @@ -8,12 +8,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/OpenBudgeteer.Core.Data.Postgres.Migrations/OpenBudgeteer.Core.Data.Postgres.Migrations.csproj b/OpenBudgeteer.Core.Data.Postgres.Migrations/OpenBudgeteer.Core.Data.Postgres.Migrations.csproj index 20cce74..92d5228 100644 --- a/OpenBudgeteer.Core.Data.Postgres.Migrations/OpenBudgeteer.Core.Data.Postgres.Migrations.csproj +++ b/OpenBudgeteer.Core.Data.Postgres.Migrations/OpenBudgeteer.Core.Data.Postgres.Migrations.csproj @@ -8,12 +8,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/OpenBudgeteer.Core.Data.Sqlite.Migrations/OpenBudgeteer.Core.Data.Sqlite.Migrations.csproj b/OpenBudgeteer.Core.Data.Sqlite.Migrations/OpenBudgeteer.Core.Data.Sqlite.Migrations.csproj index cdfb333..b07a2a4 100644 --- a/OpenBudgeteer.Core.Data.Sqlite.Migrations/OpenBudgeteer.Core.Data.Sqlite.Migrations.csproj +++ b/OpenBudgeteer.Core.Data.Sqlite.Migrations/OpenBudgeteer.Core.Data.Sqlite.Migrations.csproj @@ -8,11 +8,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/OpenBudgeteer.Core.Data/OpenBudgeteer.Core.Data.csproj b/OpenBudgeteer.Core.Data/OpenBudgeteer.Core.Data.csproj index 72a4363..249cf2c 100644 --- a/OpenBudgeteer.Core.Data/OpenBudgeteer.Core.Data.csproj +++ b/OpenBudgeteer.Core.Data/OpenBudgeteer.Core.Data.csproj @@ -7,19 +7,19 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - - + + diff --git a/OpenBudgeteer.Core.Test/OpenBudgeteer.Core.Test.csproj b/OpenBudgeteer.Core.Test/OpenBudgeteer.Core.Test.csproj index 7b4c800..f69313d 100644 --- a/OpenBudgeteer.Core.Test/OpenBudgeteer.Core.Test.csproj +++ b/OpenBudgeteer.Core.Test/OpenBudgeteer.Core.Test.csproj @@ -34,15 +34,15 @@ - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/OpenBudgeteer.Core/OpenBudgeteer.Core.csproj b/OpenBudgeteer.Core/OpenBudgeteer.Core.csproj index 50f78df..c05b776 100644 --- a/OpenBudgeteer.Core/OpenBudgeteer.Core.csproj +++ b/OpenBudgeteer.Core/OpenBudgeteer.Core.csproj @@ -6,12 +6,12 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + From 83ec36ecf57fa2817d09ab604de072d72f610aeb Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 16 Mar 2024 09:32:04 +0100 Subject: [PATCH 56/57] Update 3rd party Licenses --- LICENSE-3RD-PARTY | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LICENSE-3RD-PARTY b/LICENSE-3RD-PARTY index b6ffa28..727a6aa 100644 --- a/LICENSE-3RD-PARTY +++ b/LICENSE-3RD-PARTY @@ -1,10 +1,12 @@ ----------------------------------------------------------------------------- The MIT License (MIT) applies to: + - aspnet-api-versioning, Copyright (c) .NET Foundation and contributors - BlazorFileReader, Copyright (c) 2018 Tor - ChartJs.Blazor, Copyright (c) 2019 Marius Muntean - efcore, Copyright (c) .NET Foundation and Contributors - Pomelo.EntityFrameworkCore.MySql, Copyright (c) 2017 Pomelo Foundation + - Swashbuckle.AspNetCore, Copyright (c) 2016 Richard Morris - TinyCsvParser, Copyright (c) Philipp Wagner and Contributors - .NET runtime, Copyright (c) .NET Foundation and Contributors - Bootstrap, Copyright (c) 2011-2018 Twitter, Inc. From 4cbaf46a54fa574da531972165ee2dd90e2ee82d Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Sat, 16 Mar 2024 09:58:54 +0100 Subject: [PATCH 57/57] Update Deployment process for API project --- .../workflows/docker-image-pre-release.yml | 35 ++++++++++++++++--- .../Dockerfile => API.Dockerfile | 5 ++- OpenBudgeteer.API/OpenBudgeteer.API.csproj | 3 -- 3 files changed, 33 insertions(+), 10 deletions(-) rename OpenBudgeteer.API/Dockerfile => API.Dockerfile (76%) diff --git a/.github/workflows/docker-image-pre-release.yml b/.github/workflows/docker-image-pre-release.yml index ba7c92a..2e982fc 100644 --- a/.github/workflows/docker-image-pre-release.yml +++ b/.github/workflows/docker-image-pre-release.yml @@ -28,9 +28,9 @@ jobs: - name: Run Core Test Cases run: dotnet test OpenBudgeteer.Core.Test - deploy-docker: + deploy-docker-app: runs-on: ubuntu-latest - name: Build and Push Docker Image + name: Build and Push Docker Image (App) needs: test if: success() steps: @@ -55,6 +55,33 @@ jobs: context: . push: true tags: axelander/openbudgeteer:pre-release -# file: OpenBudgeteer.Blazor/Dockerfile platforms: linux/arm64,linux/amd64 -# platforms: linux/amd64 + deploy-docker-api: + runs-on: ubuntu-latest + name: Build and Push Docker Image (API) + needs: test + if: success() + steps: + - name: Check out repo + uses: actions/checkout@v3 + + - name: Docker Login + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: . + push: true + tags: axelander/openbudgeteer-api:pre-release + file: API.Dockerfile + platforms: linux/arm64,linux/amd64 \ No newline at end of file diff --git a/OpenBudgeteer.API/Dockerfile b/API.Dockerfile similarity index 76% rename from OpenBudgeteer.API/Dockerfile rename to API.Dockerfile index 46f4171..ae6eae5 100644 --- a/OpenBudgeteer.API/Dockerfile +++ b/API.Dockerfile @@ -7,11 +7,10 @@ RUN apk add --no-cache icu-libs icu-data-full FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build ARG TARGETARCH -ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 WORKDIR /src -COPY ["OpenBudgeteer.API/OpenBudgeteer.API.csproj", "OpenBudgeteer.API/"] -RUN dotnet restore "OpenBudgeteer.API/OpenBudgeteer.API.csproj" -a $TARGETARCH COPY . . +RUN dotnet restore -a $TARGETARCH WORKDIR "/src/OpenBudgeteer.API" RUN dotnet publish "OpenBudgeteer.API.csproj" --no-self-contained -c Release -a $TARGETARCH -o /api/publish diff --git a/OpenBudgeteer.API/OpenBudgeteer.API.csproj b/OpenBudgeteer.API/OpenBudgeteer.API.csproj index bbeada1..16d5dcf 100644 --- a/OpenBudgeteer.API/OpenBudgeteer.API.csproj +++ b/OpenBudgeteer.API/OpenBudgeteer.API.csproj @@ -8,9 +8,6 @@ - - .dockerignore - appsettings.json Always