Merge branch 'GREG-54_update_column_names' into 'master'

GREG-54: Update column names

See merge request !66

greg/api/serializers/person.py

@@ -15,8 +15,8 @@ class RoleSerializer(serializers.ModelSerializer):
             "id",
             "start_date",
             "end_date",
-            "registered_by",
-            "unit",
+            "sponsor_id",
+            "orgunit_id",
             "created",
             "updated",
             "type",

greg/api/views/sponsor.py

@@ -39,5 +39,5 @@ class SponsorGuestsViewSet(mixins.ListModelMixin, GenericViewSet):
         if not self.kwargs:
             return qs.none()
         sponsor_id = self.kwargs["sponsor_id"]
-        qs = qs.filter(roles__registered_by=sponsor_id).order_by("id")
+        qs = qs.filter(roles__sponsor_id=sponsor_id).order_by("id")
         return qs

greg/migrations/0006_column_names.py

+# Generated by Django 3.2.7 on 2021-09-23 08:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('greg', '0005_person_user'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='role',
+            name='person_role_type_unique',
+        ),
+        migrations.RenameField(
+            model_name='role',
+            old_name='unit',
+            new_name='orgunit_id',
+        ),
+        migrations.RenameField(
+            model_name='role',
+            old_name='registered_by',
+            new_name='sponsor_id',
+        ),
+        migrations.AddConstraint(
+            model_name='role',
+            constraint=models.UniqueConstraint(fields=('person_id', 'type_id', 'orgunit_id', 'start_date', 'end_date'), name='person_role_type_unique'),
+        ),
+    ]

greg/models.py

@@ -166,7 +166,7 @@ class Role(BaseModel):
     type = models.ForeignKey(
         "RoleType", on_delete=models.PROTECT, related_name="persons"
     )
-    unit = models.ForeignKey(
+    orgunit_id = models.ForeignKey(
         "OrganizationalUnit", on_delete=models.PROTECT, related_name="unit_person_role"
     )
     # The start date can be null for people that are already
@@ -176,14 +176,14 @@ class Role(BaseModel):
     contact_person_unit = models.TextField(blank=True)
     comments = models.TextField(blank=True)
     available_in_search = models.BooleanField(default=False)
-    registered_by = models.ForeignKey(
+    sponsor_id = models.ForeignKey(
         "Sponsor", on_delete=models.PROTECT, related_name="sponsor_role"
     )
 
     class Meta:
         constraints = [
             models.UniqueConstraint(
-                fields=["person_id", "type_id", "unit_id", "start_date", "end_date"],
+                fields=["person_id", "type_id", "orgunit_id", "start_date", "end_date"],
                 name="person_role_type_unique",
             )
         ]

greg/tests/api/test_person.py

@@ -50,8 +50,8 @@ def role_data_guest(
         "type": "Test Guest",
         "start_date": "2021-06-10",
         "end_date": "2021-08-10",
-        "registered_by": sponsor_bar.id,
-        "unit": unit_foo.id,
+        "sponsor_id": sponsor_bar.id,
+        "orgunit_id": unit_foo.id,
     }
 
 
@@ -126,8 +126,8 @@ def test_add_role(
         "type": "visiting_professor",
         "start_date": "2021-06-10",
         "end_date": "2021-08-10",
-        "registered_by": "1",
-        "unit": "1",
+        "sponsor_id": "1",
+        "orgunit_id": "1",
     }
     response = client.post(url, role_data)
 
@@ -420,8 +420,8 @@ def test_add_duplicate_role_fails(client, person_foo: Person, role_person_foo):
         "type": role_person_foo.type.identifier,
         "start_date": role_person_foo.start_date,
         "end_date": role_person_foo.end_date,
-        "registered_by": role_person_foo.registered_by.id,
-        "unit": role_person_foo.unit_id,
+        "sponsor_id": role_person_foo.sponsor_id.id,
+        "orgunit_id": role_person_foo.unit_id,
     }
     response = client.post(url, role_data)
     # If the role cannot be create the return code is 400
@@ -448,8 +448,8 @@ def test_filter_active_includes_person_with_active_role(
         person=person_foo,
         type=role_type_test_guest,
         end_date=date_today + datetime.timedelta(days=1),
-        registered_by=sponsor_guy,
-        unit=unit_foo,
+        sponsor_id=sponsor_guy,
+        orgunit_id=unit_foo,
     )
 
     url = reverse("v1:person-list")
@@ -486,8 +486,8 @@ def test_filter_active_value_false(
         person=person_foo,
         type=role_type_test_guest,
         end_date=date_today - datetime.timedelta(days=1),
-        registered_by=sponsor_guy,
-        unit=unit_foo,
+        sponsor_id=sponsor_guy,
+        orgunit_id=unit_foo,
     )
 
     url = reverse("v1:person-list")

greg/tests/conftest.py

@@ -123,8 +123,8 @@ def role_person_foo(
         type=role_type_test_guest,
         start_date="2021-08-02",
         end_date="2021-08-06",
-        registered_by=sponsor_guy,
-        unit=unit_foo,
+        sponsor_id=sponsor_guy,
+        orgunit_id=unit_foo,
     )
     return Role.objects.get(id=role.id)
 

greg/tests/models/test_person.py

@@ -94,14 +94,14 @@ def test_add_multiple_roles_to_person(
     role_with(
         person=person,
         type=role_type_foo,
-        unit=ou,
-        registered_by=Sponsor.objects.create(feide_id="foosponsor@uio.no"),
+        orgunit_id=ou,
+        sponsor_id=Sponsor.objects.create(feide_id="foosponsor@uio.no"),
     )
     role_with(
         person=person,
         type=role_type_bar,
-        unit=ou,
-        registered_by=Sponsor.objects.create(feide_id="barsponsor@uio.no"),
+        orgunit_id=ou,
+        sponsor_id=Sponsor.objects.create(feide_id="barsponsor@uio.no"),
     )
     assert person.roles.count() == 2
 

greg/tests/populate_database.py

@@ -154,7 +154,7 @@ class DatabasePopulation:
                     ),
                     contact_person_unit=self.faker.name(),
                     available_in_search=self.random.random() > 0.5,
-                    registered_by=random.choice(self.sponsors),
+                    sponsor_id=random.choice(self.sponsors),
                 )
                 person_role_count += 1
             except IntegrityError:

greg/tests/test_expire_role.py

@@ -33,12 +33,12 @@ def role(
     return Role.objects.create(
         person=person,
         type=role_type_bar,
-        unit=unit_foo,
+        orgunit_id=unit_foo,
         start_date="2020-03-05",
         end_date=datetime.today() + timedelta(days=30),
         contact_person_unit="Contact Person",
         available_in_search=True,
-        registered_by=sponsor_guy,
+        sponsor_id=sponsor_guy,
     )
 
 

greg/tests/test_notifications.py

@@ -73,8 +73,8 @@ def test_role_add_notification(
         type=role_type_foo,
         start_date="2021-05-06",
         end_date="2021-10-20",
-        unit=org_unit_bar,
-        registered_by=sponsor,
+        orgunit_id=org_unit_bar,
+        sponsor_id=sponsor,
     )
     notifications = Notification.objects.filter(object_type="Role")
     assert len(notifications) == 1
@@ -96,8 +96,8 @@ def test_role_update_notification(
         type=role_type_foo,
         start_date="2021-05-06",
         end_date="2021-10-20",
-        unit=org_unit_bar,
-        registered_by=sponsor,
+        orgunit_id=org_unit_bar,
+        sponsor_id=sponsor,
     )
     assert len(person.roles.all()) == 1
     person_role = person.roles.all()[0]
@@ -123,8 +123,8 @@ def test_role_delete_notification(
         type=role_type_foo,
         start_date="2021-05-06",
         end_date="2021-10-20",
-        unit=org_unit_bar,
-        registered_by=sponsor,
+        orgunit_id=org_unit_bar,
+        sponsor_id=sponsor,
     )
     assert len(person.roles.all()) == 1
     person_role = person.roles.all()[0]