Merge branch 'main' into feature/report_creations_are_scheduled

docs/source/introduction/intro.rst

@@ -53,7 +53,7 @@ OpenKAT scans for vulnerabilities. If you find any, it is valid that you deal wi
 
 Many organizations have their contact information in ``security.txt`` in the root of their domain, so you get straight to the right people. Not every organization handles it equally professionally, but that's no reason not to want to use that standard yourself.
 
-If you find any vulnerabilities in the software of OpenKAT itself you can report them per e-mail to: security @ rdobeheer.nl (remove the spaces).
+If you find any vulnerabilities in the software of OpenKAT itself you can report them per e-mail to: security @ irealisatie.nl (remove the spaces).
 
 What are the plans for the future?
 ==================================

mula/scheduler/server/handlers/schedules.py

@@ -108,6 +108,9 @@ def list(
         return utils.paginate(request, results, count, offset, limit)
 
     def create(self, schedule: serializers.ScheduleCreate) -> Any:
+        if not (schedule.deadline_at or schedule.schedule):
+            raise BadRequestError("Either deadline_at or schedule must be provided")
+
         try:
             new_schedule = models.Schedule(**schedule.model_dump())
         except ValueError:

mula/scheduler/server/serializers/schedule.py

@@ -10,7 +10,7 @@ class ScheduleCreate(BaseModel):
 
     data: dict
 
-    schedule: str
+    schedule: str | None = None
 
     deadline_at: datetime | None = None
 

mula/tests/integration/test_api.py

@@ -901,6 +901,31 @@ def test_post_schedule(self):
             datetime.fromisoformat(response.json().get("deadline_at")[:-1]).astimezone(timezone.utc),
         )
 
+    def test_post_schedule_explicit_deadline_at(self):
+        """When a schedule is created, the deadline_at should be set if it is provided."""
+        item = functions.create_item(self.scheduler.scheduler_id, 1)
+        now = datetime.now(timezone.utc)
+        response = self.client.post(
+            "/schedules", json={"scheduler_id": item.scheduler_id, "data": item.data, "deadline_at": now.isoformat()}
+        )
+        self.assertEqual(201, response.status_code)
+        self.assertIsNone(response.json().get("schedule"))
+        self.assertEqual(
+            # NOTE: Remove Z from the end of the string. Until 3.11
+            # datetime.fromisoformat does not accept Z at the end of the string
+            datetime.fromisoformat(response.json().get("deadline_at")[:-1]).astimezone(timezone.utc),
+            now,
+        )
+
+    def test_post_schedule_schedule_and_deadline_at_none(self):
+        """When a schedule is created, both schedule and deadline_at should not be None."""
+        item = functions.create_item(self.scheduler.scheduler_id, 1)
+        response = self.client.post("/schedules", json={"scheduler_id": item.scheduler_id, "data": item.data})
+        self.assertEqual(400, response.status_code)
+        self.assertEqual(
+            {"detail": "Bad request error occurred: Either deadline_at or schedule must be provided"}, response.json()
+        )
+
     def test_post_schedule_invalid_schedule(self):
         item = functions.create_item(self.scheduler.scheduler_id, 1)
         response = self.client.post(

mula/tests/integration/test_schedule_store.py

@@ -52,12 +52,6 @@ def test_create_schedule_deadline_at_takes_precedence(self):
 
         self.assertEqual(schedule.deadline_at, now)
 
-    def test_create_schedule_not_provided_schedule(self):
-        """When a schedule is created, the deadline_at should be None if schedule is not provided."""
-        schedule = models.Schedule(scheduler_id="test_scheduler_id", data={})
-
-        self.assertIsNone(schedule.deadline_at)
-
     def test_create_schedule(self):
         # Arrange
         scheduler_id = "test_scheduler_id"