get transactions by filtered date range

gwalus · Jun 2, 2024 · 31add5c · 31add5c
1 parent aa8911a
commit 31add5c
Show file tree

Hide file tree

Showing 16 changed files with 77 additions and 71 deletions.
diff --git a/src/Dollet.Core/Abstractions/Repositories/IExpensesRepository.cs b/src/Dollet.Core/Abstractions/Repositories/IExpensesRepository.cs
@@ -4,7 +4,7 @@ namespace Dollet.Core.Abstractions.Repositories
 {
     public interface IExpensesRepository
     {
-        Task<IEnumerable<Expense>> GetAllAsync(DateOnly? from = null, DateOnly? to = null, int? categoryId = null);
+        Task<IEnumerable<Expense>> GetAllAsync(DateTime? from = null, DateTime? to = null, int? categoryId = null);
         Task<Expense?> GetAsync(int id);
         void Add(Expense expense);
         void Update(Expense expense);

diff --git a/src/Dollet.Core/Abstractions/Repositories/IIncomesRepository.cs b/src/Dollet.Core/Abstractions/Repositories/IIncomesRepository.cs
@@ -4,7 +4,7 @@ namespace Dollet.Core.Abstractions.Repositories
 {
     public interface IIncomesRepository
     {
-        Task<IEnumerable<Income>> GetAllAsync(DateOnly? from = null, DateOnly? to = null, int? categoryId = null);
+        Task<IEnumerable<Income>> GetAllAsync(DateTime? from = null, DateTime? to = null, int? categoryId = null);
         Task<Income?> GetAsync(int id);
         void Add(Income income);
         void Update(Income income);

diff --git a/src/Dollet.Core/Abstractions/Services/IDateOnlyRangeService.cs b/src/Dollet.Core/Abstractions/Services/IDateOnlyRangeService.cs
diff --git a/src/Dollet.Core/Abstractions/Services/IDateTimeRangeService.cs b/src/Dollet.Core/Abstractions/Services/IDateTimeRangeService.cs
@@ -0,0 +1,9 @@
+namespace Dollet.Core.Abstractions.Services
+{
+    public interface IDateTimeRangeService
+    {
+        DateTime GetToday();
+        (DateTime, DateTime) GetWeekly();
+        (DateTime, DateTime) GetMonthly();
+    }
+}
diff --git a/src/Dollet.Core/Helpers/PeriodsHelper.cs b/src/Dollet.Core/Helpers/PeriodsHelper.cs
@@ -2,11 +2,11 @@
 using Dollet.Core.Enums;
 namespace Dollet.Core.Helpers
 {
-    public class PeriodsHelper(IDateOnlyRangeService dateOnlyRangeService)
+    public class PeriodsHelper(IDateTimeRangeService dateTimeRangeService)
     {
-        private readonly IDateOnlyRangeService _dateOnlyRangeService = dateOnlyRangeService;
+        private readonly IDateTimeRangeService _dateOnlyRangeService = dateTimeRangeService;
 
-        public (DateOnly, DateOnly) GetDateRangeBasedOnSelectedPeriod(string selectedPeriod)
+        public (DateTime, DateTime) GetDateRangeBasedOnSelectedPeriod(string selectedPeriod)
         {
             switch (selectedPeriod)
             {
@@ -25,7 +25,7 @@ public class PeriodsHelper(IDateOnlyRangeService dateOnlyRangeService)
             }
         }
 
-        public string GetStringPeriod((DateOnly, DateOnly) dateRange)
+        public static string GetStringPeriod((DateTime, DateTime) dateRange)
         {
             if (dateRange.Item1 == dateRange.Item2)
             {

diff --git a/src/Dollet.Infrastructure/DAL/Repositories/ExpensesRepository.cs b/src/Dollet.Infrastructure/DAL/Repositories/ExpensesRepository.cs
@@ -27,7 +27,7 @@ public async Task DeleteAllAsync(int accountId)
             _dbContext.Expenses.RemoveRange(toDelete);
         }
 
-        public async Task<IEnumerable<Expense>> GetAllAsync(DateOnly? from = null, DateOnly? to = null, int? categoryId = null)
+        public async Task<IEnumerable<Expense>> GetAllAsync(DateTime? from = null, DateTime? to = null, int? categoryId = null)
         {
             var query = _dbContext.Expenses
                 .Include(x => x.Category)
@@ -36,8 +36,9 @@ public async Task<IEnumerable<Expense>> GetAllAsync(DateOnly? from = null, DateO
 
             if (from.HasValue && to.HasValue)
             {
-                query = query.Where(x => DateOnly.FromDateTime(x.Date) >= from.Value &&
-                    DateOnly.FromDateTime(x.Date) <= to.Value);
+                query = query.Where(x => 
+                    x.Date >= from.Value &&
+                    x.Date <= to.Value);
             }
 
             if (categoryId.HasValue)

diff --git a/src/Dollet.Infrastructure/DAL/Repositories/IncomesRepository.cs b/src/Dollet.Infrastructure/DAL/Repositories/IncomesRepository.cs
@@ -27,7 +27,7 @@ public async Task DeleteAllAsync(int accountId)
             _dbContext.Incomes.RemoveRange(toDelete);
         }
 
-        public async Task<IEnumerable<Income>> GetAllAsync(DateOnly? from = null, DateOnly? to = null, int? categoryId = null)
+        public async Task<IEnumerable<Income>> GetAllAsync(DateTime? from = null, DateTime? to = null, int? categoryId = null)
         {
             var query = _dbContext.Incomes
                 .Include(x => x.Category)
@@ -36,8 +36,9 @@ public async Task<IEnumerable<Income>> GetAllAsync(DateOnly? from = null, DateOn
 
             if (from.HasValue && to.HasValue)
             {
-                query = query.Where(x => DateOnly.FromDateTime(x.Date) >= from.Value &&
-                    DateOnly.FromDateTime(x.Date) <= to.Value);
+                query = query.Where(x => 
+                    x.Date >= from.Value &&
+                    x.Date <= to.Value);
             }
 
             if (categoryId.HasValue)

diff --git a/...tructure/Services/DateOnlyRangeService.cs → ...tructure/Services/DateTimeRangeService.cs b/...tructure/Services/DateOnlyRangeService.cs → ...tructure/Services/DateTimeRangeService.cs
@@ -2,14 +2,14 @@
 
 namespace Dollet.Infrastructure.Services
 {
-    internal class DateOnlyRangeService : IDateOnlyRangeService
+    internal class DateTimeRangeService : IDateTimeRangeService
     {
-        public DateOnly GetToday()
+        public DateTime GetToday()
         {
-            return DateOnly.FromDateTime(DateTime.Today);
+            return DateTime.Today;
         }
 
-        public (DateOnly, DateOnly) GetWeekly()
+        public (DateTime, DateTime) GetWeekly()
         {
             var today = DateTime.Today;
 
@@ -22,14 +22,14 @@ public DateOnly GetToday()
             }
 
             var sunday = monday.AddDays(6);
-            return (DateOnly.FromDateTime(monday), DateOnly.FromDateTime(sunday));
+            return (monday, sunday);
         }
 
-        public (DateOnly, DateOnly) GetMonthly()
+        public (DateTime, DateTime) GetMonthly()
         {
             var today = DateTime.Today;
-            var firstDayOfMonth = new DateOnly(today.Year, today.Month, 1);
-            var lastDayOfMonth = new DateOnly(today.Year, today.Month, DateTime.DaysInMonth(today.Year, today.Month));
+            var firstDayOfMonth = new DateTime(today.Year, today.Month, 1);
+            var lastDayOfMonth = new DateTime(today.Year, today.Month, DateTime.DaysInMonth(today.Year, today.Month));
 
             return (firstDayOfMonth, lastDayOfMonth);
         }

diff --git a/src/Dollet.Infrastructure/Services/Extensions.cs b/src/Dollet.Infrastructure/Services/Extensions.cs
@@ -8,13 +8,9 @@ internal static class Extensions
     {
         public static IServiceCollection AddServices(this IServiceCollection services, IConfiguration configuration)
         {
-            //var config = configuration
-            //    .GetRequiredSection("FreeCurrency")
-            //    .Get<FreeCurrencyOptions>();
-
             services.AddTransient(sp => new Freecurrencyapi("fca_live_g1Fta4EqDbFeAPwR3yETQE7SacgvlyfM9qZFGD1p"));
 
-            services.AddSingleton<IDateOnlyRangeService, DateOnlyRangeService>();
+            services.AddSingleton<IDateTimeRangeService, DateTimeRangeService>();
             services.AddTransient<IDataSeedService, DataSeedService>();
             services.AddTransient<IFreeCurrencyService, FreeCurrencyService>();
 

diff --git a/src/Dollet.Presentation/Maui/Helpers/QueryParameterHelper.cs b/src/Dollet.Presentation/Maui/Helpers/QueryParameterHelper.cs
@@ -2,7 +2,7 @@
 {
     internal static class QueryParameterHelper
     {
-        public static (DateOnly, DateOnly, int) ExpensesDetails;
-        public static (DateOnly, DateOnly, int) IncomesDetails;
+        public static (DateTime, DateTime, int) ExpensesDetails;
+        public static (DateTime, DateTime, int) IncomesDetails;
     }
 }
diff --git a/src/Dollet.Presentation/Maui/Pages/Transactions/Expenses/ExpensesPage.xaml b/src/Dollet.Presentation/Maui/Pages/Transactions/Expenses/ExpensesPage.xaml
@@ -36,10 +36,10 @@
                 <CollectionView.ItemTemplate>
                     <DataTemplate x:DataType="x:String">
                         <HorizontalStackLayout>
-                            <Label 
+                            <Label
                                 Text="{Binding}"
                                 FontSize="18" 
-                                Padding="5, 15"
+                                Padding="5, 15, 5, 10"
                                 FontAttributes="Bold"
                                 BackgroundColor="Transparent"/>
 
@@ -79,9 +79,19 @@
                     <RoundRectangle CornerRadius="10" BackgroundColor="Black"/>
                 </Border.StrokeShape>
 
-                <micro:ChartView 
-                    Chart="{Binding DonutChart}" 
-                    BackgroundColor="{AppThemeBinding Light={DynamicResource White}, Dark={DynamicResource Gray900}}"/>
+                <VerticalStackLayout>
+                    <Label 
+                        Text="{Binding Period}"
+                        HorizontalOptions="Center"
+                        Padding="5"
+                        FontSize="20"
+                        FontAttributes="Italic"/>
+
+                    <micro:ChartView 
+                        MinimumHeightRequest="150"
+                        Chart="{Binding DonutChart}" 
+                        BackgroundColor="{AppThemeBinding Light={DynamicResource White}, Dark={DynamicResource Gray900}}"/>
+                </VerticalStackLayout>
             </Border>
 
             <CollectionView 

diff --git a/...Dollet.Presentation/Maui/ViewModels/Transactions/Expenses/ExpensesDetailsPageViewModel.cs b/...Dollet.Presentation/Maui/ViewModels/Transactions/Expenses/ExpensesDetailsPageViewModel.cs
@@ -15,24 +15,15 @@ public partial class ExpensesDetailsPageViewModel(IUnitOfWork unitOfWork) : Obse
 
         public void ApplyQueryAttributes(IDictionary<string, object> query)
         {
-            DateFrom = (DateOnly)query["DateFrom"];
-            DateTo = (DateOnly)query["DateTo"];
+            DateFrom = (DateTime)query["DateFrom"];
+            DateTo = (DateTime)query["DateTo"];
             _categoryId = (int)query["CategoryId"];
         }
 
         private int _categoryId;
 
-        private DateOnly dateFrom, dateTo;
-        public DateOnly DateFrom 
-        {
-            get => dateFrom; 
-            private set { SetProperty(ref dateFrom, value); }
-        }
-        public DateOnly DateTo 
-        {
-            get => dateTo; 
-            private set { SetProperty(ref dateTo, value); }
-        }
+        [ObservableProperty]
+        private DateTime _dateFrom, _dateTo;
 
         public ObservableRangeCollection<ExpensesDetailsGroupDto> Expenses { get; private set; } = [];
 

diff --git a/src/Dollet.Presentation/Maui/ViewModels/Transactions/Expenses/ExpensesPageViewModel.cs b/src/Dollet.Presentation/Maui/ViewModels/Transactions/Expenses/ExpensesPageViewModel.cs
@@ -40,7 +40,7 @@ public partial class ExpensesPageViewModel(IUnitOfWork unitOfWork, IPopupService
 
         public string SelectedPeriod { get; set; } = TransactionsPeriod.Daily.ToString();
 
-        private (DateOnly, DateOnly) dateRange;
+        private (DateTime, DateTime) dateRange;
 
         [ObservableProperty]
         private string _period;
@@ -81,14 +81,13 @@ private async Task CalculateExpensesAsync()
             {
                 dateRange = _periodsHelper.GetDateRangeBasedOnSelectedPeriod(SelectedPeriod);
 
-                DateFrom = dateRange.Item1.ToDateTime(TimeOnly.Parse("00:00 AM"));
-                DateTo = dateRange.Item2.ToDateTime(TimeOnly.Parse("00:00 AM"));
+                DateFrom = dateRange.Item1;
+                DateTo = dateRange.Item2;
             }
 
-            Period = _periodsHelper.GetStringPeriod(dateRange);
+            Period = PeriodsHelper.GetStringPeriod(dateRange);
 
-            // to fix
-            var expenses = await _expensesRepository.GetAllAsync(dateRange.Item1, dateRange.Item2);
+            var expenses = await _expensesRepository.GetAllAsync(DateFrom, DateTo);
 
             if (expenses.Any())
             {

diff --git a/src/Dollet.Presentation/Maui/ViewModels/Transactions/Incomes/IncomesDetailsPageViewModel.cs b/src/Dollet.Presentation/Maui/ViewModels/Transactions/Incomes/IncomesDetailsPageViewModel.cs
@@ -15,16 +15,15 @@ public partial class IncomesDetailsPageViewModel(IUnitOfWork unitOfWork) : Obser
 
         private int _categoryId;
 
-        private DateOnly dateFrom, dateTo;
-        public DateOnly DateFrom { get => dateFrom; private set { SetProperty(ref dateFrom, value); } }
-        public DateOnly DateTo { get => dateTo; private set { SetProperty(ref dateTo, value); } }
-
+        [ObservableProperty]
+        private DateTime _dateFrom, _dateTo;
+
         public ObservableRangeCollection<IncomesDetailsGroupDto> Incomes { get; private set; } = [];
 
         public void ApplyQueryAttributes(IDictionary<string, object> query)
         {
-            DateFrom = (DateOnly)query["DateFrom"];
-            DateTo = (DateOnly)query["DateTo"];
+            DateFrom = (DateTime)query["DateFrom"];
+            DateTo = (DateTime)query["DateTo"];
             _categoryId = (int)query["CategoryId"];
         }
 

diff --git a/src/Dollet.Presentation/Maui/ViewModels/Transactions/Incomes/IncomesPageViewModel.cs b/src/Dollet.Presentation/Maui/ViewModels/Transactions/Incomes/IncomesPageViewModel.cs
@@ -30,7 +30,10 @@ public partial class IncomesPageViewModel(IUnitOfWork unitOfWork, PeriodsHelper
 
         public string SelectedPeriod { get; set; } = TransactionsPeriod.Daily.ToString();
 
-        private (DateOnly, DateOnly) dateRange;
+        private (DateTime, DateTime) dateRange;
+
+        [ObservableProperty]
+        private DateTime _dateFrom = DateTime.Today, _dateTo = DateTime.Today;
 
         [ObservableProperty]
         string _period;
@@ -54,11 +57,17 @@ private async Task CalculateIncomesAsync()
             var groupedIncomes = new List<IncomesGroupDto>();
             var entries = new List<ChartEntry>();
 
-            dateRange = _periodsHelper.GetDateRangeBasedOnSelectedPeriod(SelectedPeriod);
+            if (SelectedPeriod != TransactionsPeriod.Custom.ToString())
+            {
+                dateRange = _periodsHelper.GetDateRangeBasedOnSelectedPeriod(SelectedPeriod);
+
+                DateFrom = dateRange.Item1;
+                DateTo = dateRange.Item2;
+            }
 
-            Period = _periodsHelper.GetStringPeriod(dateRange);
+            Period = PeriodsHelper.GetStringPeriod(dateRange);
 
-            var incomes = await _incomesRepository.GetAllAsync(dateRange.Item1, dateRange.Item2);
+            var incomes = await _incomesRepository.GetAllAsync(DateFrom, DateTo);
 
             if (incomes.Any())
             {

diff --git a/src/Dollet.Presentation/Maui/Views/TransactionGroupItemView.xaml b/src/Dollet.Presentation/Maui/Views/TransactionGroupItemView.xaml
@@ -5,7 +5,7 @@
              x:Class="Dollet.Views.TransactionGroupItemView">
 
     <Border
-        Padding="5, 3, 15, 3"
+        Padding="5, 5, 10, 5"
         Margin="10, 5, 10, 0">
 
         <Border.StrokeShape>