feat(*.xaml, *.cs): Integrate account statistics chart and refactor account model

Added LiveCharts-based statistics chart to AccountView, including a new BrushToLvcPaintConverter helper. Refactored AccountModel to use BaseCurrencyType and made balance nullable. Removed Balance from AccountCreateDto and AccountUpdateDto. Enhanced AccountViewModel to support chart data, currency/account type selection, and improved transaction history loading. Updated AccountType enum with descriptions and added ScottPlot.WPF package.

Author: EnesEfeTokta

FinTrack/App.xaml.cs

@@ -4,7 +4,6 @@
 using FinTrackForWindows.Services.Api;
 using FinTrackForWindows.ViewModels;
 using FinTrackForWindows.Views;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;

FinTrack/Dtos/AccountDtos/AccountCreateDto.cs

@@ -7,7 +7,6 @@ public class AccountCreateDto
         public string Name { get; set; } = null!;
         public AccountType Type { get; set; }
         public bool IsActive { get; set; }
-        public decimal Balance { get; set; }
         public BaseCurrencyType Currency { get; set; }
     }
 }

FinTrack/Dtos/AccountDtos/AccountUpdateDto.cs

@@ -7,7 +7,6 @@ public class AccountUpdateDto
         public string Name { get; set; } = null!;
         public AccountType Type { get; set; }
         public bool IsActive { get; set; }
-        public decimal Balance { get; set; }
         public BaseCurrencyType Currency { get; set; }
     }
 }

FinTrack/Enums/AccountType.cs

@@ -1,13 +1,28 @@
-namespace FinTrackForWindows.Enums
+using System.ComponentModel;
+
+namespace FinTrackForWindows.Enums
 {
     public enum AccountType
     {
+        [Description("Checking")]
         Checking,
+
+        [Description("Savings")]
         Savings,
+
+        [Description("Credit Card")]
         CreditCard,
+
+        [Description("Cash")]
         Cash,
+
+        [Description("Investment")]
         Investment,
+
+        [Description("Loan")]
         Loan,
+
+        [Description("Other")]
         Other,
     } // Kontrol, Tasarruf, Kredi Kartı, Nakit, Yatırım, Kredi, Diğer
 }

FinTrack/FinTrackForWindows.csproj

@@ -55,6 +55,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.6.25358.103" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Npgsql" Version="9.0.3" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.55" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.1-dev-02307" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.1-dev-02317" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />

FinTrack/Helpers/BrushToLvcPaintConverter.cs

@@ -0,0 +1,25 @@
+using LiveChartsCore.SkiaSharpView.Painting;
+using SkiaSharp;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace FinTrackForWindows.Helpers
+{
+    public class BrushToLvcPaintConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is SolidColorBrush brush)
+            {
+                return new SolidColorPaint(new SKColor(brush.Color.R, brush.Color.G, brush.Color.B, brush.Color.A));
+            }
+            return new SolidColorPaint(SKColors.Black);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

FinTrack/Models/Account/AccountModel.cs

@@ -16,14 +16,13 @@ public partial class AccountModel : ObservableObject
         private AccountType type;
 
         [ObservableProperty]
-        private decimal balance;
-
-        [ObservableProperty]
-        private string currency = "USD";
+        private BaseCurrencyType currency;
 
         [ObservableProperty]
         private List<AccountBalanceHistoryPoint> history = new();
 
+        public decimal? balance {  get; set; }
+
         public string IconPath => Type switch
         {
             AccountType.Checking => "/Assets/Images/Icons/bank.png",
@@ -44,7 +43,7 @@ public string BalanceText
         {
             get
             {
-                var balance = Balance.ToString("C", System.Globalization.CultureInfo.CurrentCulture);
+                var balanceString = balance.ToString();
                 return Type switch
                 {
                     AccountType.Checking => $"Bakiye: {balance}",

FinTrack/ViewModels/AccountViewModel.cs

@@ -1,24 +1,37 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using FinTrackForWindows.Dtos.AccountDtos;
+using FinTrackForWindows.Dtos.TransactionDtos;
 using FinTrackForWindows.Enums;
 using FinTrackForWindows.Models.Account;
 using FinTrackForWindows.Services.Api;
+using LiveChartsCore;
+using LiveChartsCore.Defaults;
+using LiveChartsCore.SkiaSharpView;
+using LiveChartsCore.SkiaSharpView.Painting;
+using LiveChartsCore.SkiaSharpView.VisualElements;
 using Microsoft.Extensions.Logging;
+using SkiaSharp;
 using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace FinTrackForWindows.ViewModels
 {
     public partial class AccountViewModel : ObservableObject
     {
         [ObservableProperty]
-        private ObservableCollection<AccountModel> accounts;
+        private ObservableCollection<AccountModel> accounts = new();
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(FormTitle))]
         [NotifyPropertyChangedFor(nameof(SaveButtonText))]
         private AccountModel? selectedAccount;
 
+        public ObservableCollection<BaseCurrencyType> CurrencyTypes { get; }
+
+        public ObservableCollection<AccountType> AccountTypes { get; }
+
         private readonly ILogger<AccountViewModel> _logger;
 
         public string FormTitle => IsEditing ? "Hesabı Düzenle" : "Yeni Hesap Ekle";
@@ -28,22 +41,78 @@ public partial class AccountViewModel : ObservableObject
 
         private readonly IApiService _apiService;
 
+        [ObservableProperty]
+        private ISeries[] series = new ISeries[0];
+
+        [ObservableProperty]
+        private Axis[] xAxes = new Axis[0];
+
+        [ObservableProperty]
+        private Axis[] yAxes = new Axis[0];
+
+        [ObservableProperty]
+        private LabelVisual title = new LabelVisual { /* Başlık için yer tutucu */ };
+
         public AccountViewModel(ILogger<AccountViewModel> logger, IApiService apiService)
         {
             _logger = logger;
             _apiService = apiService;
+
+            InitializeEmptyChart();
             _ = LoadData();
+            _ = InitializeViewModel();
             PrepareForNewAccount();
+
+            CurrencyTypes = new ObservableCollection<BaseCurrencyType>();
+            AccountTypes = new ObservableCollection<AccountType>();
+
+            CurrencyTypes.Clear();
+            foreach (BaseCurrencyType currencyType in Enum.GetValues(typeof(BaseCurrencyType)))
+            {
+                CurrencyTypes.Add(currencyType);
+            }
+        }
+
+        private void InitializeEmptyChart()
+        {
+            Series = new ISeries[0];
+            Title = new LabelVisual
+            {
+                Text = "Verileri görmek için bir hesap seçin.",
+                TextSize = 18,
+                Paint = new SolidColorPaint(SKColors.Gray),
+                Padding = new LiveChartsCore.Drawing.Padding(15)
+            };
+        }
+
+        private async Task InitializeViewModel()
+        {
+            await LoadData();
+            if (Accounts.Any())
+            {
+                var firstAccount = Accounts.First();
+                if (firstAccount.Id.HasValue)
+                {
+                    SelectedAccount = firstAccount;
+                }
+            }
         }
 
         partial void OnSelectedAccountChanged(AccountModel? value)
         {
             _logger.LogInformation("Seçilen hesap değişti: {AccountName}", value?.Name ?? "Hiçbiri");
-
             IsEditing = value != null && value.Id != null;
-
             OnPropertyChanged(nameof(FormTitle));
             OnPropertyChanged(nameof(SaveButtonText));
+
+            if (value != null && value.Id.HasValue)
+            {
+                _ = LoadTransactionHistory(value.Id.Value, value.Name);
+            }
+            else
+            {
+                InitializeEmptyChart();
+            }
         }
 
         private async Task LoadData()
@@ -59,44 +128,126 @@ private async Task LoadData()
                         Id = item.Id,
                         Name = item.Name,
                         Type = item.Type,
-                        Balance = item.Balance,
-                        Currency = item.Currency.ToString(),
+                        balance = item.Balance,
+                        Currency = item.Currency,
                     });
                 }
             }
         }
 
-        [RelayCommand]
-        private async Task SaveAccount()
+        private async Task LoadTransactionHistory(int accountId, string accountName)
         {
-            if (SelectedAccount == null || string.IsNullOrWhiteSpace(SelectedAccount.Name)) return;
+            var transactions = await _apiService.GetAsync<List<TransactionDto>>($"Transactions/account-id/{accountId}");
 
-            if (Enum.TryParse(SelectedAccount.Currency, out BaseCurrencyType currency))
+            if (transactions == null || !transactions.Any())
             {
-                _logger.LogInformation("Seçilen para birimi: {Currency}", currency);
-            }
-            else
-            {
-                _logger.LogWarning("Geçersiz para birimi: {Currency}", SelectedAccount.Currency);
+                Series = new ISeries[0];
+                Title = new LabelVisual
+                {
+                    Text = "Veri yok.",
+                    TextSize = 18,
+                    Paint = new SolidColorPaint(SKColors.Gray),
+                    Padding = new LiveChartsCore.Drawing.Padding(15)
+                };
                 return;
             }
 
+            var incomePoints = transactions
+                .Where(t => t.Category.Type == TransactionType.Income)
+                .Select(t => new DateTimePoint(t.TransactionDateUtc, (double)t.Amount))
+                .ToList();
+
+            var expensePoints = transactions
+                .Where(t => t.Category.Type == TransactionType.Expense)
+                .Select(t => new DateTimePoint(t.TransactionDateUtc, (double)t.Amount))
+                .ToList();
+
+            Series = new ISeries[]
+            {
+                new LineSeries<DateTimePoint>
+                {
+                    Name = "Gelir",
+                    Values = incomePoints,
+                    Stroke = new SolidColorPaint(SKColors.MediumSpringGreen) { StrokeThickness = 2 },
+                    GeometryStroke = new SolidColorPaint(SKColors.MediumSpringGreen) { StrokeThickness = 4 },
+                    Fill = new LinearGradientPaint(SKColors.MediumSpringGreen.WithAlpha(90), SKColors.MediumSpringGreen.WithAlpha(10), new SKPoint(0.5f, 0), new SKPoint(0.5f, 1))
+                },
+                new LineSeries<DateTimePoint>
+                {
+                    Name = "Gider",
+                    Values = expensePoints,
+                    Stroke = new SolidColorPaint(SKColors.IndianRed) { StrokeThickness = 2 },
+                    GeometryStroke = new SolidColorPaint(SKColors.IndianRed) { StrokeThickness = 4 },
+                    Fill = new LinearGradientPaint(SKColors.IndianRed.WithAlpha(90), SKColors.IndianRed.WithAlpha(10), new SKPoint(0.5f, 0), new SKPoint(0.5f, 1))
+                }
+            };
+
+            Title = new LabelVisual
+            {
+                Text = $"{accountName} - Hareketler",
+                TextSize = 16,
+                Paint = new SolidColorPaint(SKColors.WhiteSmoke),
+                Padding = new LiveChartsCore.Drawing.Padding(15)
+            };
+
+            XAxes = new Axis[]
+            {
+                new Axis
+                {
+                    Labeler = value =>
+                    {
+                        try
+                        {
+                            var ticks = (long)value;
+                            if (ticks >= DateTime.MinValue.Ticks && ticks <= DateTime.MaxValue.Ticks)
+                            {
+                                return new DateTime(ticks).ToString("dd MMM");
+                            }
+                            return string.Empty;
+                        }
+                        catch
+                        {
+                            return string.Empty;
+                        }
+                    }
+,
+                    LabelsPaint = new SolidColorPaint(SKColors.LightGray),
+                    UnitWidth = TimeSpan.FromDays(1).Ticks,
+                    MinStep = TimeSpan.FromDays(1).Ticks
+
+                }
+            };
+
+            YAxes = new Axis[]
+            {
+                new Axis
+                {
+                    Labeler = value => value.ToString("C0"),
+                    LabelsPaint = new SolidColorPaint(SKColors.LightGray),
+                    SeparatorsPaint = new SolidColorPaint(SKColors.Gray) { StrokeThickness = 0.5f }
+                }
+            };
+        }
+
+        [RelayCommand]
+        private async Task SaveAccount()
+        {
+            if (SelectedAccount == null || string.IsNullOrWhiteSpace(SelectedAccount.Name)) return;
+
             if (IsEditing)
             {
                 var existingAccount = Accounts.FirstOrDefault(a => a.Id == SelectedAccount.Id);
                 if (existingAccount != null)
                 {
                     existingAccount.Name = SelectedAccount.Name;
                     existingAccount.Type = SelectedAccount.Type;
-                    existingAccount.Balance = SelectedAccount.Balance;
                     existingAccount.Currency = SelectedAccount.Currency;
 
                     await _apiService.PutAsync<object>($"Account/{SelectedAccount.Id}", new AccountUpdateDto
                     {
                         Name = SelectedAccount.Name,
                         Type = SelectedAccount.Type,
-                        Balance = SelectedAccount.Balance,
-                        Currency = currency
+                        Currency = SelectedAccount.Currency
                     });
                 }
             }
@@ -107,8 +258,7 @@ private async Task SaveAccount()
                     Name = SelectedAccount.Name,
                     Type = SelectedAccount.Type,
                     IsActive = true,
-                    Balance = SelectedAccount.Balance,
-                    Currency = currency,
+                    Currency = SelectedAccount.Currency,
                 });
 
                 SelectedAccount.Id = newAccount.Id;