Skip to content
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

dashboard: last 7 days should be 7 days #11702

Open
wants to merge 4 commits into
base: bugfix
Choose a base branch
from
Open

dashboard: last 7 days should be 7 days #11702

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c01d11b
dashboard: last 7 days should be 7 days
valentijnscholten Jan 31, 2025
9ebf184
unit test update
valentijnscholten Jan 31, 2025
d29bb74
unit test update
valentijnscholten Jan 31, 2025
5b13ed4
unit test update
valentijnscholten Jan 31, 2025
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
2 changes: 1 addition & 1 deletion dojo/home/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def dashboard(request: HttpRequest) -> HttpResponse:

today = timezone.now().date()

date_range = [today - timedelta(days=6), today] # 7 days (6 days plus today)
date_range = [today - timedelta(days=7), today] # 7 days plus today, identical to last 7 days filter in other places
finding_count = findings\
.filter(date__range=date_range)\
.count()
Expand Down
20 changes: 14 additions & 6 deletions unittests/test_dashboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,21 +116,29 @@ def test_counters_as_staff(self):

response = self._request("admin")

# temp code to update unit tests
print(response.context["mitigated_count"]) # noqa: T201
print(response.context["accepted_count"]) # noqa: T201

self.assertEqual(3, response.context["engagement_count"])
self.assertEqual(4, response.context["finding_count"])
self.assertEqual(2, response.context["mitigated_count"])
self.assertEqual(2, response.context["accepted_count"])
self.assertEqual(11, response.context["finding_count"])
self.assertEqual(3, response.context["mitigated_count"])
self.assertEqual(3, response.context["accepted_count"])

def test_counters_as_user(self):
self._setup_test_counters_findings(product_id=2)
self._setup_test_counters_findings(product_id=3)

response = self._request("user1")

# temp code to update unit tests
print(response.context["mitigated_count"]) # noqa: T201
print(response.context["accepted_count"]) # noqa: T201

self.assertEqual(3, response.context["engagement_count"])
self.assertEqual(4, response.context["finding_count"])
self.assertEqual(2, response.context["mitigated_count"])
self.assertEqual(2, response.context["accepted_count"])
self.assertEqual(11, response.context["finding_count"])
self.assertEqual(3, response.context["mitigated_count"])
self.assertEqual(3, response.context["accepted_count"])

def _setup_test_charts_findings(self, product_id: int):
when = self.year_ago
Expand Down