Merge branch '12-use-correct-room-model' into 'master'

Resolve "Use correct Room model"

Closes #12

See merge request !24

aleksis/apps/stoelindeling/migrations/0001_initial.py

@@ -15,6 +15,10 @@ class Migration(migrations.Migration):
         ('chronos', '0010_remove_subject_unique_name_per_site'),
     ]
 
+    run_before = [
+        ('core', '0047_add_room_model'),
+    ]
+
     operations = [
         migrations.CreateModel(
             name='SeatingPlan',

aleksis/apps/stoelindeling/migrations/0005_alter_seatingplan_room.py

+# Generated by Django 4.1.5 on 2023-02-26 15:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0047_add_room_model"),
+        ("stoelindeling", "0004_alter_seatingplan_subject"),
+    ]
+
+    run_before = [
+        ("chronos", "0013_move_room_to_core"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="seatingplan",
+            name="room",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to="core.room",
+                verbose_name="Room",
+            ),
+        ),
+    ]

aleksis/apps/stoelindeling/model_extensions.py

@@ -2,9 +2,9 @@ from typing import Union
 
 from django.apps import apps
 
-from aleksis.apps.chronos.models import Room, Subject
+from aleksis.apps.chronos.models import Subject
 from aleksis.apps.stoelindeling.models import SeatingPlan
-from aleksis.core.models import Group
+from aleksis.core.models import Group, Room
 
 
 @Group.method

aleksis/apps/stoelindeling/models.py

 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from aleksis.apps.chronos.models import Room, Subject
+from aleksis.apps.chronos.models import Subject
 from aleksis.apps.stoelindeling.managers import SeatManager, SeatQuerySet
 from aleksis.core.mixins import ExtensibleModel
-from aleksis.core.models import Group, Person
+from aleksis.core.models import Group, Person, Room
 
 
 class SeatingPlan(ExtensibleModel):