{% if not field.field.widget.attrs.fixed_paws %}
{{ field }}
@@ -35,7 +38,9 @@
{% else %}
{% if field.field.required %}
-
{% translate "This field is required" %}
+
+ {{ field.label_tag }} {% translate "(Required)" %}
+
{% endif %}
{{ field }}
diff --git a/rocky/rocky/views/scheduler.py b/rocky/rocky/views/scheduler.py
index 1527d0864c4..cdb47b5ae51 100644
--- a/rocky/rocky/views/scheduler.py
+++ b/rocky/rocky/views/scheduler.py
@@ -97,13 +97,13 @@ def get_report_schedule_form_start_date_choice(self):
return self.report_schedule_form_start_date_choice(self.request.POST)
def get_report_schedule_form_start_date(self):
- return self.report_schedule_form_start_date(self.request.POST)
+ return self.report_schedule_form_start_date()
def get_report_schedule_form_recurrence_choice(self):
return self.report_schedule_form_recurrence_choice(self.request.POST)
def get_report_schedule_form_recurrence(self):
- return self.report_schedule_form_recurrence(self.request.POST)
+ return self.report_schedule_form_recurrence()
def get_report_parent_name_form(self):
return self.report_parent_name_form()
@@ -120,14 +120,17 @@ def get_task_details(self, task_id: str) -> Task | None:
return task
- def create_report_schedule(self, report_recipe: ReportRecipe) -> ScheduleResponse | None:
+ def create_report_schedule(self, report_recipe: ReportRecipe, deadline_at: str) -> ScheduleResponse | None:
try:
report_task = ReportTask(
organisation_id=self.organization.code, report_recipe_id=str(report_recipe.recipe_id)
).model_dump()
schedule_request = ScheduleRequest(
- scheduler_id=self.scheduler_id, data=report_task, schedule=report_recipe.cron_expression
+ scheduler_id=self.scheduler_id,
+ data=report_task,
+ schedule=report_recipe.cron_expression,
+ deadline_at=deadline_at,
)
submit_schedule = self.scheduler_client.post_schedule(schedule=schedule_request)
diff --git a/rocky/tests/reports/test_aggregate_report_flow.py b/rocky/tests/reports/test_aggregate_report_flow.py
index 7fc3ad095a4..e415dfb8047 100644
--- a/rocky/tests/reports/test_aggregate_report_flow.py
+++ b/rocky/tests/reports/test_aggregate_report_flow.py
@@ -200,7 +200,7 @@ def test_save_aggregate_report_view(
mock_bytes_client,
):
"""
- Will send data through post to aggregate report.
+ Will send data through post to aggregate report and immediately creates a report (not scheduled).
"""
katalogus_mocker = mocker.patch("reports.views.base.get_katalogus")()
@@ -235,6 +235,55 @@ def test_save_aggregate_report_view(
assert "report_id=Report" in response.url
+def test_save_aggregate_report_view_scheduled(
+ rf,
+ client_member,
+ valid_time,
+ mock_organization_view_octopoes,
+ listed_hostnames,
+ rocky_health,
+ mocker,
+ boefje_dns_records,
+ mock_bytes_client,
+):
+ """
+ Will send data through post to aggregate report and creates a scheduled aggregate report.
+ """
+
+ katalogus_mocker = mocker.patch("reports.views.base.get_katalogus")()
+ katalogus_mocker.get_plugins.return_value = [boefje_dns_records]
+
+ rocky_health_mocker = mocker.patch("reports.report_types.aggregate_organisation_report.report.get_rocky_health")()
+ rocky_health_mocker.return_value = rocky_health
+
+ mock_bytes_client().upload_raw.return_value = "Report|1730b72f-b115-412e-ad44-dae6ab3edff9"
+
+ mock_organization_view_octopoes().list_objects.return_value = Paginated[OOIType](
+ count=len(listed_hostnames), items=listed_hostnames
+ )
+
+ request = setup_request(
+ rf.post(
+ "aggregate_report_save",
+ {
+ "observed_at": valid_time.strftime("%Y-%m-%d"),
+ "ooi": listed_hostnames,
+ "report_type": ["systems-report", "vulnerability-report"],
+ "choose_recurrence": "repeat",
+ "start_date": "2024-01-01",
+ "recurrence": "weekly",
+ "parent_report_name": ["Scheduled Aggregate Report %x"],
+ },
+ ),
+ client_member.user,
+ )
+
+ response = SaveAggregateReportView.as_view()(request, organization_code=client_member.organization.code)
+
+ assert response.status_code == 302 # after post follows redirect, this to first create report ID
+ assert response.url == f"/en/{client_member.organization.code}/reports/scheduled-reports/"
+
+
def test_json_download_aggregate_report(
rf,
client_member,
diff --git a/rocky/tests/reports/test_generate_report_flow.py b/rocky/tests/reports/test_generate_report_flow.py
index 50dca3bbd55..ff3dc8d346d 100644
--- a/rocky/tests/reports/test_generate_report_flow.py
+++ b/rocky/tests/reports/test_generate_report_flow.py
@@ -224,3 +224,48 @@ def test_save_generate_report_view(
assert response.status_code == 302 # after post follows redirect, this to first create report ID
assert "report_id=Report" in response.url
+
+
+def test_save_generate_report_view_scheduled(
+ rf,
+ client_member,
+ valid_time,
+ mock_organization_view_octopoes,
+ listed_hostnames,
+ mocker,
+ boefje_dns_records,
+ mock_bytes_client,
+):
+ """
+ Will send data through post to generate report with schedule.
+ """
+
+ katalogus_mocker = mocker.patch("reports.views.base.get_katalogus")()
+ katalogus_mocker.get_plugins.return_value = [boefje_dns_records]
+
+ mock_bytes_client().upload_raw.return_value = "Report|e821aaeb-a6bd-427f-b064-e46837911a5d"
+
+ mock_organization_view_octopoes().list_objects.return_value = Paginated[OOIType](
+ count=len(listed_hostnames), items=listed_hostnames
+ )
+
+ request = setup_request(
+ rf.post(
+ "generate_report_view",
+ {
+ "observed_at": valid_time.strftime("%Y-%m-%d"),
+ "ooi": listed_hostnames,
+ "report_type": "dns-report",
+ "choose_recurrence": "repeat",
+ "start_date": "2024-01-01",
+ "recurrence": "daily",
+ "parent_report_name": [f"DNS report for {len(listed_hostnames)} objects"],
+ },
+ ),
+ client_member.user,
+ )
+
+ response = SaveGenerateReportView.as_view()(request, organization_code=client_member.organization.code)
+
+ assert response.status_code == 302 # after post follows redirect, this to first create report ID
+ assert response.url == f"/en/{client_member.organization.code}/reports/scheduled-reports/"
diff --git a/rocky/tests/test_upload_raw.py b/rocky/tests/test_upload_raw.py
index 1d29f2c9421..83d6d352e1d 100644
--- a/rocky/tests/test_upload_raw.py
+++ b/rocky/tests/test_upload_raw.py
@@ -36,7 +36,7 @@ def test_upload_empty(rf, redteam_member, mock_organization_view_octopoes, mock_
assert response.status_code == 200
mock_bytes_client().upload_raw.assert_not_called()
- assertContains(response, "This field is required")
+ assertContains(response, "(Required)")
def test_upload_raw(rf, redteam_member, mock_organization_view_octopoes, mock_bytes_client, network):