refactor(*.xaml, *.cs): Refactor account model and view to use Balance property

EnesEfeTokta · EnesEfeTokta · commit 443738e3aad2 · 2025-07-24T17:13:30.000+03:00
Replaces CurrentBalance and TargetBalance with a single Balance property in AccountModel and updates related view models and views accordingly. Removes progress bar and target balance UI elements, simplifies balance display logic, and introduces AccountResponseDto for API responses. Also improves logging for currency parsing and centers header text in ApplicationRecognizeSlideView.
diff --git a/FinTrack/Dtos/AccountDtos/AccountResponseDto.cs b/FinTrack/Dtos/AccountDtos/AccountResponseDto.cs
@@ -0,0 +1,14 @@
+﻿namespace FinTrackForWindows.Dtos.AccountDtos
+{
+    public class AccountResponseDto
+    {
+        public int Id { get; set; }
+        public int UserId { get; set; }
+        public string Name { get; set; }
+        public string Type { get; set; }
+        public bool IsActive { get; set; }
+        public decimal Balance { get; set; }
+        public string Currency { get; set; }
+        public DateTime CreatedAtUtc { get; set; }
+    }
+}
diff --git a/FinTrack/Models/Account/AccountModel.cs b/FinTrack/Models/Account/AccountModel.cs
@@ -16,10 +16,7 @@ public partial class AccountModel : ObservableObject
         private AccountType type;
 
         [ObservableProperty]
-        private decimal currentBalance;
-
-        [ObservableProperty]
-        private decimal? targetBalance;
+        private decimal balance;
 
         [ObservableProperty]
         private string currency = "USD";
@@ -47,27 +44,14 @@ public string BalanceText
         {
             get
             {
-                if (Type == AccountType.CreditCard && TargetBalance.HasValue)
-                {
-                    return $"Kullanılan Limit: {CurrentBalance:C} / {TargetBalance.Value:C}";
-                }
-                if (TargetBalance.HasValue && TargetBalance > 0)
-                {
-                    return $"{CurrentBalance:C} / {TargetBalance.Value:C}";
-                }
-                return $"Değer: {CurrentBalance:C}";
-            }
-        }
-        public double ProgressValue
-        {
-            get
-            {
-                if (TargetBalance.HasValue && TargetBalance.Value > 0)
+                var balance = Balance.ToString("C", System.Globalization.CultureInfo.CurrentCulture);
+                return Type switch
                 {
-                    return (double)Math.Max(0, Math.Min(100, (CurrentBalance / TargetBalance.Value) * 100));
-                }
-
-                return Type == AccountType.Loan ? 100 : 0;
+                    AccountType.Checking => $"Bakiye: {balance}",
+                    AccountType.CreditCard => $"Borç: {balance}",
+                    AccountType.Loan => $"Kredi: {balance}",
+                    _ => $"Bakiye: {balance}"
+                };
             }
         }
     }
diff --git a/FinTrack/ViewModels/AccountViewModel.cs b/FinTrack/ViewModels/AccountViewModel.cs
@@ -59,8 +59,7 @@ private async Task LoadData()
                         Id = item.Id,
                         Name = item.Name,
                         Type = item.Type,
-                        CurrentBalance = item.Balance,
-                        TargetBalance = 100,
+                        Balance = item.Balance,
                         Currency = item.Currency.ToString(),
                     });
                 }
@@ -74,11 +73,12 @@ private async Task SaveAccount()
 
             if (Enum.TryParse(SelectedAccount.Currency, out BaseCurrencyType currency))
             {
-                _logger.LogInformation("");
+                _logger.LogInformation("Seçilen para birimi: {Currency}", currency);
             }
             else
             {
-                _logger.LogError("");
+                _logger.LogWarning("Geçersiz para birimi: {Currency}", SelectedAccount.Currency);
+                return;
             }
 
             if (IsEditing)
@@ -88,31 +88,30 @@ private async Task SaveAccount()
                 {
                     existingAccount.Name = SelectedAccount.Name;
                     existingAccount.Type = SelectedAccount.Type;
-                    existingAccount.CurrentBalance = SelectedAccount.CurrentBalance;
-                    existingAccount.TargetBalance = SelectedAccount.TargetBalance;
+                    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.CurrentBalance,
+                        Balance = SelectedAccount.Balance,
                         Currency = currency
                     });
                 }
             }
             else
             {
-                var newAccount = await _apiService.PostAsync<AccountCreateDto>("Account", new AccountCreateDto
+                var newAccount = await _apiService.PostAsync<AccountResponseDto>("Account", new AccountCreateDto
                 {
                     Name = SelectedAccount.Name,
                     Type = SelectedAccount.Type,
                     IsActive = true,
-                    Balance = SelectedAccount.CurrentBalance,
+                    Balance = SelectedAccount.Balance,
                     Currency = currency,
                 });
 
-                SelectedAccount.Id = 10; // TODO: Burası kesinlikle incele.
+                SelectedAccount.Id = newAccount.Id;
 
                 Accounts.Add(SelectedAccount);
             }
diff --git a/FinTrack/Views/AccountView.xaml b/FinTrack/Views/AccountView.xaml
@@ -41,9 +41,6 @@
                                             </Border>
                                             <StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="15,0">
                                                 <TextBlock Text="{Binding Name}" Foreground="White" FontSize="16" FontWeight="SemiBold"/>
-                                                <ProgressBar Value="{Binding ProgressValue, Mode=OneWay}" Height="8" Margin="0,8,0,8" 
-                                                             Background="{StaticResource ProgressBarBackgroundBrush}" 
-                                                             Foreground="{Binding IconBackground}"/>
                                                 <TextBlock Text="{Binding BalanceText}" Foreground="{StaticResource TopBarTextSecondaryBrush}" FontSize="12"/>
                                             </StackPanel>
                                             <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
@@ -92,10 +89,7 @@
                 <TextBox Style="{StaticResource ModernTextBoxStyle}" Text="{Binding SelectedAccount.Type, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,0,15"/>
 
                 <TextBlock Text="BALANCE / LIMIT" Style="{StaticResource LabelTextStyle}"/>
-                <TextBox Style="{StaticResource ModernTextBoxStyle}" Text="{Binding SelectedAccount.CurrentBalance, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,0,15"/>
-
-                <TextBlock Text="TARGET (Optional)" Style="{StaticResource LabelTextStyle}"/>
-                <TextBox Style="{StaticResource ModernTextBoxStyle}" Text="{Binding SelectedAccount.TargetBalance, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,0,15"/>
+                <TextBox Style="{StaticResource ModernTextBoxStyle}" Text="{Binding SelectedAccount.Balance, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,0,15"/>
 
                 <TextBlock Text="CURRENCY" Style="{StaticResource LabelTextStyle}"/>
                 <TextBox Style="{StaticResource ModernTextBoxStyle}" Text="{Binding SelectedAccount.Currency, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,0,25"/>
diff --git a/FinTrack/Views/ApplicationRecognizeSlideView.xaml b/FinTrack/Views/ApplicationRecognizeSlideView.xaml
@@ -42,7 +42,8 @@
                    Style="{StaticResource HeaderTextStyle}"
                    HorizontalAlignment="Center"
                    Margin="0,0,0,10"
-                   TextWrapping="Wrap"/>
+                   TextWrapping="Wrap"
+                   TextAlignment="Center"/>
 
         <TextBlock Grid.Row="2" 
                    Text="{Binding CurrentDescription_ApplicationRecognizeSlideView_TextBlock}"

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,7 @@ private async Task LoadData()`
`59`	`59`	`Id = item.Id,`
`60`	`60`	`Name = item.Name,`
`61`	`61`	`Type = item.Type,`
`62`		`- CurrentBalance = item.Balance,`
`63`		`- TargetBalance = 100,`
	`62`	`+ Balance = item.Balance,`
`64`	`63`	`Currency = item.Currency.ToString(),`
`65`	`64`	`});`
`66`	`65`	`}`
`@@ -74,11 +73,12 @@ private async Task SaveAccount()`
`74`	`73`
`75`	`74`	`if (Enum.TryParse(SelectedAccount.Currency, out BaseCurrencyType currency))`
`76`	`75`	`{`
`77`		`- _logger.LogInformation("");`
	`76`	`+ _logger.LogInformation("Seçilen para birimi: {Currency}", currency);`
`78`	`77`	`}`
`79`	`78`	`else`
`80`	`79`	`{`
`81`		`- _logger.LogError("");`
	`80`	`+ _logger.LogWarning("Geçersiz para birimi: {Currency}", SelectedAccount.Currency);`
	`81`	`+ return;`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`if (IsEditing)`
`@@ -88,31 +88,30 @@ private async Task SaveAccount()`
`88`	`88`	`{`
`89`	`89`	`existingAccount.Name = SelectedAccount.Name;`
`90`	`90`	`existingAccount.Type = SelectedAccount.Type;`
`91`		`- existingAccount.CurrentBalance = SelectedAccount.CurrentBalance;`
`92`		`- existingAccount.TargetBalance = SelectedAccount.TargetBalance;`
	`91`	`+ existingAccount.Balance = SelectedAccount.Balance;`
`93`	`92`	`existingAccount.Currency = SelectedAccount.Currency;`
`94`	`93`
`95`	`94`	`await _apiService.PutAsync<object>($"Account/{SelectedAccount.Id}", new AccountUpdateDto`
`96`	`95`	`{`
`97`	`96`	`Name = SelectedAccount.Name,`
`98`	`97`	`Type = SelectedAccount.Type,`
`99`		`- Balance = SelectedAccount.CurrentBalance,`
	`98`	`+ Balance = SelectedAccount.Balance,`
`100`	`99`	`Currency = currency`
`101`	`100`	`});`
`102`	`101`	`}`
`103`	`102`	`}`
`104`	`103`	`else`
`105`	`104`	`{`
`106`		`- var newAccount = await _apiService.PostAsync<AccountCreateDto>("Account", new AccountCreateDto`
	`105`	`+ var newAccount = await _apiService.PostAsync<AccountResponseDto>("Account", new AccountCreateDto`
`107`	`106`	`{`
`108`	`107`	`Name = SelectedAccount.Name,`
`109`	`108`	`Type = SelectedAccount.Type,`
`110`	`109`	`IsActive = true,`
`111`		`- Balance = SelectedAccount.CurrentBalance,`
	`110`	`+ Balance = SelectedAccount.Balance,`
`112`	`111`	`Currency = currency,`
`113`	`112`	`});`
`114`	`113`
`115`		`- SelectedAccount.Id = 10; // TODO: Burası kesinlikle incele.`
	`114`	`+ SelectedAccount.Id = newAccount.Id;`
`116`	`115`
`117`	`116`	`Accounts.Add(SelectedAccount);`
`118`	`117`	`}`