Skip to content

Commit 925abb8

Browse files
authored
Merge pull request #14 from EnesEfeTokta/Develop
Develop
2 parents c66fffa + dc84d82 commit 925abb8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2379
-694
lines changed

FinTrack/App.xaml.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
using CommunityToolkit.Mvvm.Messaging;
22
using FinTrackForWindows.Core;
33
using FinTrackForWindows.Services;
4+
using FinTrackForWindows.Services.Accounts;
45
using FinTrackForWindows.Services.Api;
6+
using FinTrackForWindows.Services.Budgets;
7+
using FinTrackForWindows.Services.Currencies;
8+
using FinTrackForWindows.Services.Debts;
9+
using FinTrackForWindows.Services.Memberships;
10+
using FinTrackForWindows.Services.Transactions;
511
using FinTrackForWindows.ViewModels;
612
using FinTrackForWindows.Views;
713
using Microsoft.Extensions.DependencyInjection;
@@ -74,6 +80,13 @@ private void ConfigureServices(IServiceCollection services)
7480
services.AddSingleton<IAuthService, AuthService>();
7581
services.AddSingleton<ISecureTokenStorage, SecureTokenStorage>();
7682
services.AddSingleton<IApiService, ApiService>();
83+
84+
services.AddSingleton<IBudgetStore, BudgetStore>();
85+
services.AddSingleton<IAccountStore, AccountStore>();
86+
services.AddSingleton<ITransactionStore, TransactionStore>();
87+
services.AddSingleton<ICurrenciesStore, CurrenciesStore>();
88+
services.AddSingleton<IMembershipStore, MembershipStore>();
89+
services.AddSingleton<IDebtStore, DebtStore>();
7790
}
7891

7992
protected override async void OnStartup(StartupEventArgs e)

FinTrack/Data/AppDatabaseContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public AppDatabaseContext() { }
1111
public DbSet<UserModel> Users { get; set; }
1212
public DbSet<UserSettingsModel> UserSettings { get; set; }
1313
public DbSet<AccountModel> Accounts { get; set; }
14-
public DbSet<TransactionModel> Transactions { get; set; }
14+
public DbSet<TransactionModel_> Transactions { get; set; }
1515
public DbSet<CategoryModel> Categories { get; set; }
1616
public DbSet<BudgetModel> Budgets { get; set; }
1717
public DbSet<BudgetCategoryModel> BudgetCategories { get; set; }
@@ -85,7 +85,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
8585
entity.HasIndex(a => new { a.UserId, a.Name }).IsUnique();
8686
});
8787

88-
modelBuilder.Entity<TransactionModel>(entity =>
88+
modelBuilder.Entity<TransactionModel_>(entity =>
8989
{
9090
entity.ToTable("Transactions");
9191
entity.HasKey(t => t.Id);
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace FinTrackForWindows.Dtos.CurrencyDtos
2+
{
3+
public class ConvertResponseDto
4+
{
5+
public string From { get; set; } = string.Empty;
6+
public string To { get; set; } = string.Empty;
7+
public decimal Amount { get; set; }
8+
public decimal Result { get; set; }
9+
public decimal Rate { get; set; }
10+
public DateTime Timestamp { get; set; }
11+
}
12+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace FinTrackForWindows.Dtos.MembershipDtos
2+
{
3+
public class CheckoutResponseDto
4+
{
5+
public string CheckoutUrl { get; set; } = string.Empty;
6+
}
7+
}
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
using FinTrackForWindows.Enums;
2+
3+
namespace FinTrackForWindows.Dtos.MembershipDtos
4+
{
5+
public class PlanFeatureDto
6+
{
7+
public int Id { get; set; }
8+
public string Name { get; set; } = null!;
9+
public string Description { get; set; } = null!;
10+
public decimal Price { get; set; }
11+
public BaseCurrencyType? Currency { get; set; }
12+
public BillingCycleType? BillingCycle { get; set; }
13+
public int? DurationInDays { get; set; }
14+
public ReportingFeatures? Reporting { get; set; }
15+
public EmailingFeatures? Emailing { get; set; }
16+
public BudgetingFeatures? Budgeting { get; set; }
17+
public AccountFeatures? Accounts { get; set; }
18+
public bool IsActive { get; set; } = true;
19+
public DateTime CreatedAt { get; set; }
20+
public DateTime? UpdatedAt { get; set; }
21+
public bool PrioritySupport { get; set; } = false;
22+
}
23+
24+
public class ReportingFeatures
25+
{
26+
public string Level { get; set; } = "Basic";
27+
public bool CanExportPdf { get; set; } = false;
28+
public bool CanExportWord { get; set; } = false;
29+
public bool CanExportMarkdown { get; set; } = false;
30+
public bool CanExportXml { get; set; } = false;
31+
public bool CanExportText { get; set; } = false;
32+
public bool CanExportXlsx { get; set; } = false;
33+
}
34+
35+
public class EmailingFeatures
36+
{
37+
public bool CanEmailReports { get; set; } = false;
38+
public int MaxEmailsPerMonth { get; set; } = 0;
39+
}
40+
41+
public class BudgetingFeatures
42+
{
43+
public bool CanCreateBudgets { get; set; } = false;
44+
public int MaxBudgets { get; set; } = 0;
45+
}
46+
47+
public class AccountFeatures
48+
{
49+
public int MaxBankAccounts { get; set; } = 0;
50+
}
51+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace FinTrackForWindows.Dtos.MembershipDtos
2+
{
3+
public class SubscriptionRequestDto
4+
{
5+
public int PlanId { get; set; }
6+
public bool AutoRenew { get; set; }
7+
}
8+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
namespace FinTrackForWindows.Dtos.MembershipDtos
2+
{
3+
public class UserMembershipDto
4+
{
5+
public int Id { get; set; }
6+
public int PlanId { get; set; }
7+
public string PlanName { get; set; } = string.Empty;
8+
public DateTime StartDate { get; set; }
9+
public DateTime EndDate { get; set; }
10+
public string Status { get; set; } = string.Empty;
11+
public bool AutoRenew { get; set; }
12+
}
13+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using FinTrackForWindows.Enums;
2+
3+
namespace FinTrackForWindows.Dtos.TransactionDtos
4+
{
5+
public class TransactionCategoryCreateDto
6+
{
7+
public string Name { get; set; } = null!;
8+
public TransactionType Type { get; set; }
9+
}
10+
}

FinTrack/Dtos/TransactionDtos/TransactionCategoriesDto.cs renamed to FinTrack/Dtos/TransactionDtos/TransactionCategoryDto.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
using FinTrackForWindows.Enums;
2+
using System.Text.Json.Serialization;
23

34
namespace FinTrackForWindows.Dtos.TransactionDtos
45
{
5-
public class TransactionCategoriesDto
6+
public class TransactionCategoryDto
67
{
78
public int Id { get; set; }
89
public string Name { get; set; } = null!;
10+
public int UserId { get; set; }
11+
12+
[JsonConverter(typeof(JsonStringEnumConverter))]
913
public TransactionType Type { get; set; }
14+
1015
public DateTime CreatedAt { get; set; }
1116
public DateTime? UpdatedAt { get; set; }
1217
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using FinTrackForWindows.Enums;
2+
3+
namespace FinTrackForWindows.Dtos.TransactionDtos
4+
{
5+
public class TransactionCategoryUpdateDto
6+
{
7+
public string Name { get; set; } = null!;
8+
public TransactionType Type { get; set; }
9+
}
10+
}

0 commit comments

Comments
 (0)