Skip to content

Commit fc33d95

Browse files
dashboard: last 7 days should be 7 days (#11702)
* dashboard: last 7 days should be 7 days * unit test update * unit test update * unit test update
1 parent db71641 commit fc33d95

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

dojo/home/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def dashboard(request: HttpRequest) -> HttpResponse:
3030

3131
today = timezone.now().date()
3232

33-
date_range = [today - timedelta(days=6), today] # 7 days (6 days plus today)
33+
date_range = [today - timedelta(days=7), today] # 7 days plus today, identical to last 7 days filter in other places
3434
finding_count = findings\
3535
.filter(date__range=date_range)\
3636
.count()

unittests/test_dashboard.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ def test_counters_as_staff(self):
117117
response = self._request("admin")
118118

119119
self.assertEqual(3, response.context["engagement_count"])
120-
self.assertEqual(4, response.context["finding_count"])
121-
self.assertEqual(2, response.context["mitigated_count"])
122-
self.assertEqual(2, response.context["accepted_count"])
120+
self.assertEqual(11, response.context["finding_count"])
121+
self.assertEqual(3, response.context["mitigated_count"])
122+
self.assertEqual(3, response.context["accepted_count"])
123123

124124
def test_counters_as_user(self):
125125
self._setup_test_counters_findings(product_id=2)
@@ -128,9 +128,9 @@ def test_counters_as_user(self):
128128
response = self._request("user1")
129129

130130
self.assertEqual(3, response.context["engagement_count"])
131-
self.assertEqual(4, response.context["finding_count"])
132-
self.assertEqual(2, response.context["mitigated_count"])
133-
self.assertEqual(2, response.context["accepted_count"])
131+
self.assertEqual(11, response.context["finding_count"])
132+
self.assertEqual(3, response.context["mitigated_count"])
133+
self.assertEqual(3, response.context["accepted_count"])
134134

135135
def _setup_test_charts_findings(self, product_id: int):
136136
when = self.year_ago

0 commit comments

Comments
 (0)