Skip to content

Related to issue #1451: Send snapshot created_at instead of at_date to front for display consistency #1464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Didayolo merged 2 commits into from
Jun 6, 2024
Merged

Related to issue #1451: Send snapshot created_at instead of at_date to front for display consistency #1464

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c479b12
Related to issue #1451: Send snapshot created_at instead of at_date t…
OhMaley May 30, 2024
5a5a41b
Merge pull request #1461 from OhMaley/bugfix/storage/monitoring-tool/…
Didayolo May 31, 2024
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
10 changes: 5 additions & 5 deletions src/apps/api/views/analytics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def storage_usage_history(request):
raise PermissionDenied(detail="Admin only")

storage_usage_history = {}
last_storage_usage_history_snapshot = StorageUsageHistory.objects.order_by("at_date").last()
last_storage_usage_history_snapshot = StorageUsageHistory.objects.order_by("-at_date").first()
if last_storage_usage_history_snapshot:
start_date = request.query_params.get("start_date", (datetime.datetime.today() - datetime.timedelta(weeks=4)).strftime("%Y-%m-%d"))
end_date = request.query_params.get("end_date", datetime.datetime.today().strftime("%Y-%m-%d"))
Expand Down Expand Up @@ -209,7 +209,7 @@ def competitions_usage(request):
raise PermissionDenied(detail="Admin only")

competitions_usage = {}
last_competition_storage_snapshot = CompetitionStorageDataPoint.objects.order_by("at_date").last()
last_competition_storage_snapshot = CompetitionStorageDataPoint.objects.order_by("-at_date").first()
if last_competition_storage_snapshot:
start_date = request.query_params.get("start_date", (datetime.datetime.today() - datetime.timedelta(weeks=4)).strftime("%Y-%m-%d"))
end_date = request.query_params.get("end_date", datetime.datetime.today().strftime("%Y-%m-%d"))
Expand Down Expand Up @@ -237,7 +237,7 @@ def competitions_usage(request):
}

response = {
"last_storage_calculation_date": last_competition_storage_snapshot.at_date.isoformat() if last_competition_storage_snapshot else None,
"last_storage_calculation_date": last_competition_storage_snapshot.created_at.isoformat() if last_competition_storage_snapshot else None,
"competitions_usage": competitions_usage
}

Expand All @@ -253,7 +253,7 @@ def users_usage(request):
raise PermissionDenied(detail="Admin only")

users_usage = {}
last_user_storage_snapshot = UserStorageDataPoint.objects.order_by("at_date").last()
last_user_storage_snapshot = UserStorageDataPoint.objects.order_by("-at_date").first()
if last_user_storage_snapshot:
start_date = request.query_params.get("start_date", (datetime.datetime.today() - datetime.timedelta(weeks=4)).strftime("%Y-%m-%d"))
end_date = request.query_params.get("end_date", datetime.datetime.today().strftime("%Y-%m-%d"))
Expand Down Expand Up @@ -281,7 +281,7 @@ def users_usage(request):
}

response = {
"last_storage_calculation_date": last_user_storage_snapshot.at_date.isoformat() if last_user_storage_snapshot else None,
"last_storage_calculation_date": last_user_storage_snapshot.created_at.isoformat() if last_user_storage_snapshot else None,
"users_usage": users_usage
}

Expand Down