Skip to content
Snippets Groups Projects

Add tests on json export

1 file
+ 14
11
Compare changes
  • Side-by-side
  • Inline
+ 14
11
@@ -653,7 +653,7 @@ class JSONExportTest(TestCase):
# fixed slot
if slot.fixed and slot.room is not None:
requirements.append(f"availability-room-{slot.room.pk}")
requirements.append(f"fixed-room-{slot.room.pk}")
self.assertEqual(
set(ak["room_constraints"]),
@@ -672,14 +672,13 @@ class JSONExportTest(TestCase):
)
time_constraints |= category_constraints
# fixed slot
if slot.fixed and slot.start is not None:
time_constraints.add(f"availability-ak-{slot.ak.pk}")
# restricted AK availability
if not Availability.is_event_covered(
# fixed slot
time_constraints.add(f"fixed-akslot-{slot.pk}")
elif not Availability.is_event_covered(
slot.event, slot.ak.availabilities.all()
):
# restricted AK availability
time_constraints.add(f"availability-ak-{slot.ak.pk}")
for owner in slot.ak.owners.all():
@@ -737,7 +736,7 @@ class JSONExportTest(TestCase):
):
fulfilled_room_constraints.add("no-proxy")
fulfilled_room_constraints.add(f"availability-room-{room.pk}")
fulfilled_room_constraints.add(f"fixed-room-{room.pk}")
export_room = self.export_rooms[str(room.pk)]
self.assertEqual(
@@ -898,12 +897,16 @@ class JSONExportTest(TestCase):
# add ak constraints
fulfilled_time_constraints |= {
f"availability-ak-{slot.ak.id}"
for slot in self.ak_slots
f"availability-ak-{ak.id}"
for ak in self.aks
if self._is_restricted_and_contained_slot(
timeslot_avail, Availability.union(slot.ak.availabilities.all())
timeslot_avail, Availability.union(ak.availabilities.all())
)
or self._is_ak_fixed_in_slot(slot, timeslot_avail)
}
fulfilled_time_constraints |= {
f"fixed-akslot-{slot.id}"
for slot in self.ak_slots
if self._is_ak_fixed_in_slot(slot, timeslot_avail)
}
self.assertEqual(
Loading