Merge branch 'feature/vuejs' of edugit.org:AlekSIS/official/AlekSIS-Core into feature/vuejs

CHANGELOG.rst

@@ -9,17 +9,9 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
-Deprecated
-~~~~~~~~~~
-
-* Numeric object IDs (primary keys) will be removed and replaced by UUIDs in
-  AlekSIS-Core 4.0. All apps must update their URLs, foriegn keys and the
-  like.
-
 Added
 ~~~~~
 
-* Introduce a UUID for every object
 * Introduce GraphQL API
 
 `2.10`_ - 2022-06-25

aleksis/core/migrations/0042_add_uuid_field.py

-# Generated by Django 3.2.14 on 2022-07-16 12:49
-
-import uuid
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0041_update_gender_choices'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='activity',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='additionalfield',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='announcement',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='announcementrecipient',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='custommenu',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='custommenuitem',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='dashboardwidgetorder',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='datacheckresult',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='group',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='grouptype',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='notification',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='pdffile',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='persongroupthrough',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='schoolterm',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-        migrations.AddField(
-            model_name='taskuserassignment',
-            name='uuid',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
-        ),
-    ]

aleksis/core/mixins.py

 # flake8: noqa: DJ12
 
 import os
-import uuid
 from datetime import datetime
 from typing import Any, Callable, List, Optional, Union
 
@@ -127,8 +126,6 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
         - Dominik George <dominik.george@teckids.org>
     """
 
-    uuid = models.UUIDField(unique=True, default=uuid.uuid4, editable=False)
-
     # Defines a material design icon associated with this type of model
     icon_ = "radio_button_unchecked"
 

aleksis/core/schema.py

@@ -3,7 +3,7 @@ from graphene_django import DjangoObjectType
 from graphene_django.forms.mutation import DjangoModelFormMutation
 
 from .forms import PersonForm
-from .models import Notification, Person
+from .models import Group, Notification, Person
 from .util.core_helpers import get_app_module, get_app_packages, has_person
 
 
@@ -17,6 +17,11 @@ class PersonType(DjangoObjectType):
         model = Person
 
 
+class GroupType(DjangoObjectType):
+    class Meta:
+        model = Group
+
+
 class PersonMutation(DjangoModelFormMutation):
     person = graphene.Field(PersonType)