From d1c4d63179acd6d958bf1bde13f43e9c11ff3255 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Tue, 13 Sep 2022 11:22:46 +0200 Subject: [PATCH] Replace category string in instrument type with proper model --- .../migrations/0020_auto_20220908_1517.py | 31 +++++++++++++++++++ .../0021_remove_instrumenttype_category.py | 17 ++++++++++ ...me_new_category_instrumenttype_category.py | 18 +++++++++++ .../0023_alter_instrumenttype_category.py | 20 ++++++++++++ server/basicknowledge/models.py | 22 +++++++------ server/basicknowledge/queries.py | 9 +++++- .../tests/test_instrument_types_query.py | 7 ++++- server/basicknowledge/wagtail_hooks.py | 2 +- server/books/factories.py | 9 +++--- server/schema.graphql | 8 +---- 10 files changed, 119 insertions(+), 24 deletions(-) create mode 100644 server/basicknowledge/migrations/0020_auto_20220908_1517.py create mode 100644 server/basicknowledge/migrations/0021_remove_instrumenttype_category.py create mode 100644 server/basicknowledge/migrations/0022_rename_new_category_instrumenttype_category.py create mode 100644 server/basicknowledge/migrations/0023_alter_instrumenttype_category.py diff --git a/server/basicknowledge/migrations/0020_auto_20220908_1517.py b/server/basicknowledge/migrations/0020_auto_20220908_1517.py new file mode 100644 index 00000000..17a113fc --- /dev/null +++ b/server/basicknowledge/migrations/0020_auto_20220908_1517.py @@ -0,0 +1,31 @@ +# Generated by Django 3.2.13 on 2022-09-08 15:17 + +from django.db import migrations + +LANGUAGE_COMMUNICATION = 'language_communication' +SOCIETY = 'society' +INTERDISCIPLINARY = 'interdisciplinary' + +CATEGORY_CHOICES = ( + (LANGUAGE_COMMUNICATION, '#DAA009', '#FFF5D9', 'Sprache & Kommunikation'), + (SOCIETY, '#0F7CAC', '#DBEEF6', 'Gesellschaft'), + (INTERDISCIPLINARY, '#99B53E', '#F3F9E3', 'Überfachliches Instrument'), +) + +def create_categories(apps, schema_editor): + InstrumentCategory = apps.get_model('basicknowledge', 'InstrumentCategory') + InstrumentType = apps.get_model('basicknowledge', 'InstrumentType') + for code, foreground, background, category in CATEGORY_CHOICES: + instrument_category = InstrumentCategory.objects.create(name=category, background=background, foreground=foreground) + InstrumentType.objects.filter(category=code).update(new_category=instrument_category) + + +class Migration(migrations.Migration): + + dependencies = [ + ('basicknowledge', '0019_auto_20220913_0820'), + ] + + operations = [ + migrations.RunPython(create_categories, migrations.RunPython.noop) + ] diff --git a/server/basicknowledge/migrations/0021_remove_instrumenttype_category.py b/server/basicknowledge/migrations/0021_remove_instrumenttype_category.py new file mode 100644 index 00000000..0d74e617 --- /dev/null +++ b/server/basicknowledge/migrations/0021_remove_instrumenttype_category.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.13 on 2022-09-13 08:52 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('basicknowledge', '0020_auto_20220908_1517'), + ] + + operations = [ + migrations.RemoveField( + model_name='instrumenttype', + name='category', + ), + ] diff --git a/server/basicknowledge/migrations/0022_rename_new_category_instrumenttype_category.py b/server/basicknowledge/migrations/0022_rename_new_category_instrumenttype_category.py new file mode 100644 index 00000000..6c32e621 --- /dev/null +++ b/server/basicknowledge/migrations/0022_rename_new_category_instrumenttype_category.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.13 on 2022-09-13 08:52 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('basicknowledge', '0021_remove_instrumenttype_category'), + ] + + operations = [ + migrations.RenameField( + model_name='instrumenttype', + old_name='new_category', + new_name='category', + ), + ] diff --git a/server/basicknowledge/migrations/0023_alter_instrumenttype_category.py b/server/basicknowledge/migrations/0023_alter_instrumenttype_category.py new file mode 100644 index 00000000..a2c5dd6b --- /dev/null +++ b/server/basicknowledge/migrations/0023_alter_instrumenttype_category.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.13 on 2022-09-13 09:01 + +import basicknowledge.models +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('basicknowledge', '0022_rename_new_category_instrumenttype_category'), + ] + + operations = [ + migrations.AlterField( + model_name='instrumenttype', + name='category', + field=models.ForeignKey(default=basicknowledge.models.default_category, on_delete=django.db.models.deletion.PROTECT, to='basicknowledge.instrumentcategory'), + ), + ] diff --git a/server/basicknowledge/models.py b/server/basicknowledge/models.py index 43ba6604..94ca1684 100644 --- a/server/basicknowledge/models.py +++ b/server/basicknowledge/models.py @@ -13,6 +13,9 @@ from core.wagtail_utils import StrictHierarchyPage LANGUAGE_COMMUNICATION = 'language_communication' SOCIETY = 'society' INTERDISCIPLINARY = 'interdisciplinary' +LANGUAGE_COMMUNICATION_LABEL = 'Sprache & Kommunikation' +SOCIETY_LABEL = 'Gesellschaft' +INTERDISCIPLINARY_LABEL = 'Überfachliche Instrumente' class InstrumentCategory(models.Model): @@ -27,23 +30,22 @@ class InstrumentCategory(models.Model): verbose_name_plural = 'instrument categories' +def default_category(): + return InstrumentCategory.objects.first().pk + class InstrumentType(models.Model): CATEGORY_CHOICES = ( - (LANGUAGE_COMMUNICATION, 'Sprache & Kommunikation'), - (SOCIETY, 'Gesellschaft'), - (INTERDISCIPLINARY, 'Überfachliches Instrument'), + (LANGUAGE_COMMUNICATION, LANGUAGE_COMMUNICATION_LABEL), + (SOCIETY, SOCIETY_LABEL), + (INTERDISCIPLINARY, INTERDISCIPLINARY_LABEL), ) name = models.CharField(max_length=255, unique=True) - category = models.CharField( - max_length=100, - choices=CATEGORY_CHOICES - ) - new_category = models.ForeignKey( + category = models.ForeignKey( InstrumentCategory, on_delete=models.PROTECT, - null=True, - default=None + null=False, + default=default_category ) @property diff --git a/server/basicknowledge/queries.py b/server/basicknowledge/queries.py index 2a3e4f6f..7efe2e59 100644 --- a/server/basicknowledge/queries.py +++ b/server/basicknowledge/queries.py @@ -6,11 +6,18 @@ from api.graphene_wagtail import GenericStreamFieldType from api.utils import get_object from notes.models import InstrumentBookmark from notes.schema import InstrumentBookmarkNode -from .models import BasicKnowledge, InstrumentType +from .models import BasicKnowledge, InstrumentCategory, InstrumentType +class InstrumentCategoryNode(DjangoObjectType): + class Meta: + model = InstrumentCategory + only_fields = [ + 'name', 'foreground', 'background', 'id' + ] class InstrumentTypeNode(DjangoObjectType): type = graphene.String(required=True) + category = graphene.Field(InstrumentCategoryNode) class Meta: model = InstrumentType diff --git a/server/basicknowledge/tests/test_instrument_types_query.py b/server/basicknowledge/tests/test_instrument_types_query.py index 25e28b44..4435e08e 100644 --- a/server/basicknowledge/tests/test_instrument_types_query.py +++ b/server/basicknowledge/tests/test_instrument_types_query.py @@ -6,7 +6,12 @@ query InstrumentTypesQuery { instrumentTypes { name type - category + category { + id + name + foreground + background + } } } """ diff --git a/server/basicknowledge/wagtail_hooks.py b/server/basicknowledge/wagtail_hooks.py index 6c963a3b..3065391a 100644 --- a/server/basicknowledge/wagtail_hooks.py +++ b/server/basicknowledge/wagtail_hooks.py @@ -1,5 +1,5 @@ from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register -from .models import BasicKnowledge +from .models import BasicKnowledge, InstrumentCategory, InstrumentType class InstrumentAdmin(ModelAdmin): diff --git a/server/books/factories.py b/server/books/factories.py index b18211ea..53626e89 100644 --- a/server/books/factories.py +++ b/server/books/factories.py @@ -9,8 +9,9 @@ from wagtail.core.models import Page, Site from wagtail.core.rich_text import RichText from assignments.models import Assignment -from basicknowledge.models import BasicKnowledge, INTERDISCIPLINARY, InstrumentCategory, InstrumentType, \ - LANGUAGE_COMMUNICATION, SOCIETY +from basicknowledge.models import BasicKnowledge, INTERDISCIPLINARY, INTERDISCIPLINARY_LABEL, InstrumentCategory, \ + InstrumentType, \ + LANGUAGE_COMMUNICATION, LANGUAGE_COMMUNICATION_LABEL, SOCIETY, SOCIETY_LABEL from books.blocks import AssignmentBlock, BasicKnowledgeBlock, ImageUrlBlock, LinkBlock, VideoBlock from books.models import Book, Chapter, ContentBlock, Module, TextBlock, Topic from core.factories import BasePageFactory, DummyImageFactory, fake, fake_paragraph, fake_title @@ -76,7 +77,7 @@ class InstrumentCategoryFactory(factory.DjangoModelFactory): model = InstrumentCategory django_get_or_create = ('name',) - name = factory.Iterator([LANGUAGE_COMMUNICATION, SOCIETY, INTERDISCIPLINARY]) + name = factory.Iterator([LANGUAGE_COMMUNICATION_LABEL, SOCIETY_LABEL, INTERDISCIPLINARY_LABEL]) foreground = factory.Iterator(['FF0000', 'FFFFFF', '000000']) background = factory.Iterator(['FF0000', 'FFFFFF', '000000']) @@ -84,7 +85,7 @@ class InstrumentTypeFactory(factory.DjangoModelFactory): class Meta: model = InstrumentType - category = factory.Iterator([LANGUAGE_COMMUNICATION, SOCIETY, INTERDISCIPLINARY]) + category = factory.SubFactory(InstrumentCategoryFactory) name = factory.LazyAttribute(lambda x: fake.text(max_nb_chars=20)) diff --git a/server/schema.graphql b/server/schema.graphql index ab80e33d..46a1ba41 100644 --- a/server/schema.graphql +++ b/server/schema.graphql @@ -538,16 +538,10 @@ type InstrumentNodeEdge { cursor: String! } -enum InstrumentTypeCategory { - LANGUAGE_COMMUNICATION - SOCIETY - INTERDISCIPLINARY -} - type InstrumentTypeNode { id: ID! name: String! - category: InstrumentTypeCategory! + category: InstrumentCategoryNode type: String! }