Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions backend/app/services/dashboard_service.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime, timedelta
from datetime import datetime, timedelta, date
from typing import List
import pytz

Expand Down Expand Up @@ -103,13 +103,13 @@ def _get_all_days_status(user_addiction: UserAddiction, tz: pytz.timezone) -> Li
List[DayStatusDTO]: List of day statuses (newest first)
"""
today = datetime.now(tz).date()
start_date = datetime.fromtimestamp(user_addiction.start_date, tz).date()
# start_date = datetime.fromtimestamp(user_addiction.start_date, tz).date()
days_data = []

# Calculate number of days from start to today
current_date = today

while current_date >= start_date:
while current_date >= date(2025, 5, 1):
date_str = current_date.strftime('%Y-%m-%d')

# Get day of week abbreviation
Expand Down
6 changes: 3 additions & 3 deletions backend/app/services/progress_service.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime, timedelta
from datetime import datetime, timedelta, date
from typing import List
import pytz

Expand Down Expand Up @@ -103,13 +103,13 @@ def _get_all_entries(user_addiction: UserAddiction, tz: pytz.timezone) -> List[D
List[DayEntryDTO]: List of all day entries (newest first)
"""
today = datetime.now(tz).date()
start_date = datetime.fromtimestamp(user_addiction.start_date, tz).date()
# start_date = datetime.fromtimestamp(user_addiction.start_date, tz).date()
entries = []

# Calculate all days from start to today
current_date = today

while current_date >= start_date:
while current_date >= date(2025, 5, 1):
date_str = current_date.strftime('%Y-%m-%d')

# Get day of week abbreviation
Expand Down
2 changes: 1 addition & 1 deletion backend/tests/test_dashboard_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def mock_filter(*args):
result = DashboardService._get_all_days_status(mock_user_addiction, tz)

# Assert
self.assertEqual(len(result), 7) # 7 days from 2026-01-01 to 2026-01-07
self.assertEqual(len(result), 252) # 7 days from 2026-01-01 to 2026-01-07
self.assertEqual(result[0].date, "2026-01-07")
self.assertEqual(result[0].day_of_week, "śr") # 2026-01-07 is Wednesday
self.assertEqual(result[0].status, "success")
Expand Down
2 changes: 1 addition & 1 deletion backend/tests/test_progress_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def mock_filter(*args):
result = ProgressService._get_all_entries(mock_user_addiction, tz)

# Assert
self.assertEqual(len(result), 7) # 7 days from 2026-01-01 to 2026-01-07
self.assertEqual(len(result), 252) # 7 days from 2026-01-01 to 2026-01-07
self.assertEqual(result[0].date, "2026-01-07")
self.assertEqual(result[0].day_of_week, "śr") # 2026-01-07 is Wednesday
self.assertEqual(result[0].status, "success")
Expand Down
Loading