From d172e9a005e7eea59d4aa283d159d1c037cc04ea Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 13 Sep 2022 10:49:26 +0200
Subject: [PATCH 1/8] Add instrument category model

---
 .../migrations/0019_auto_20220913_0820.py     | 31 +++++++++++++++++++
 server/basicknowledge/models.py               | 19 +++++++++++-
 server/basicknowledge/wagtail_hooks.py        |  7 +++++
 server/books/factories.py                     | 12 ++++++-
 server/schema.graphql                         |  7 +++++
 5 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 server/basicknowledge/migrations/0019_auto_20220913_0820.py

diff --git a/server/basicknowledge/migrations/0019_auto_20220913_0820.py b/server/basicknowledge/migrations/0019_auto_20220913_0820.py
new file mode 100644
index 00000000..ddbe1094
--- /dev/null
+++ b/server/basicknowledge/migrations/0019_auto_20220913_0820.py
@@ -0,0 +1,31 @@
+# Generated by Django 3.2.13 on 2022-09-13 08:20
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('basicknowledge', '0018_alter_basicknowledge_contents'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='InstrumentCategory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, unique=True)),
+                ('background', models.CharField(max_length=7, verbose_name='background color')),
+                ('foreground', models.CharField(max_length=7, verbose_name='foreground color')),
+            ],
+            options={
+                'verbose_name_plural': 'instrument categories',
+            },
+        ),
+        migrations.AddField(
+            model_name='instrumenttype',
+            name='new_category',
+            field=models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='basicknowledge.instrumentcategory'),
+        ),
+    ]
diff --git a/server/basicknowledge/models.py b/server/basicknowledge/models.py
index b0386d29..43ba6604 100644
--- a/server/basicknowledge/models.py
+++ b/server/basicknowledge/models.py
@@ -15,6 +15,18 @@ SOCIETY = 'society'
 INTERDISCIPLINARY = 'interdisciplinary'
 
 
+class InstrumentCategory(models.Model):
+    name = models.CharField(max_length=255, unique=True)
+    background = models.CharField('background color', max_length=7)
+    foreground = models.CharField('foreground color', max_length=7)
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        verbose_name_plural = 'instrument categories'
+
+
 class InstrumentType(models.Model):
     CATEGORY_CHOICES = (
         (LANGUAGE_COMMUNICATION, 'Sprache & Kommunikation'),
@@ -27,6 +39,12 @@ class InstrumentType(models.Model):
         max_length=100,
         choices=CATEGORY_CHOICES
     )
+    new_category = models.ForeignKey(
+        InstrumentCategory,
+        on_delete=models.PROTECT,
+        null=True,
+        default=None
+    )
 
     @property
     def type(self):
@@ -36,7 +54,6 @@ class InstrumentType(models.Model):
         return self.type
 
 
-
 class BasicKnowledge(StrictHierarchyPage):
     parent_page_types = ['books.book']
 
diff --git a/server/basicknowledge/wagtail_hooks.py b/server/basicknowledge/wagtail_hooks.py
index d847d985..6c963a3b 100644
--- a/server/basicknowledge/wagtail_hooks.py
+++ b/server/basicknowledge/wagtail_hooks.py
@@ -8,5 +8,12 @@ class InstrumentAdmin(ModelAdmin):
     list_display = ('title', 'new_type', 'status_string')
     search_fields = ('title', 'new_type__name')
 
+class InstrumentCategoryAdmin(ModelAdmin):
+    model = InstrumentCategory
+
+class InstrumentTypeAdmin(ModelAdmin):
+    model = InstrumentType
 
 modeladmin_register(InstrumentAdmin)
+modeladmin_register(InstrumentCategoryAdmin)
+modeladmin_register(InstrumentTypeAdmin)
diff --git a/server/books/factories.py b/server/books/factories.py
index 4e90311c..b18211ea 100644
--- a/server/books/factories.py
+++ b/server/books/factories.py
@@ -9,7 +9,8 @@ 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, InstrumentType, LANGUAGE_COMMUNICATION, SOCIETY
+from basicknowledge.models import BasicKnowledge, INTERDISCIPLINARY, InstrumentCategory, InstrumentType, \
+    LANGUAGE_COMMUNICATION, SOCIETY
 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
@@ -70,6 +71,15 @@ class TextBlockFactory(wagtail_factories.StructBlockFactory):
         model = TextBlock
 
 
+class InstrumentCategoryFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = InstrumentCategory
+        django_get_or_create = ('name',)
+
+    name = factory.Iterator([LANGUAGE_COMMUNICATION, SOCIETY, INTERDISCIPLINARY])
+    foreground = factory.Iterator(['FF0000', 'FFFFFF', '000000'])
+    background = factory.Iterator(['FF0000', 'FFFFFF', '000000'])
+
 class InstrumentTypeFactory(factory.DjangoModelFactory):
     class Meta:
         model = InstrumentType
diff --git a/server/schema.graphql b/server/schema.graphql
index 98cd30bf..ab80e33d 100644
--- a/server/schema.graphql
+++ b/server/schema.graphql
@@ -511,6 +511,13 @@ type InstrumentBookmarkNode implements Node {
   instrument: InstrumentNode!
 }
 
+type InstrumentCategoryNode {
+  id: ID!
+  name: String!
+  background: String!
+  foreground: String!
+}
+
 type InstrumentNode implements Node {
   title: String!
   slug: String!

From d1c4d63179acd6d958bf1bde13f43e9c11ff3255 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 13 Sep 2022 11:22:46 +0200
Subject: [PATCH 2/8] 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!
 }
 

From 3810932cac0e6ea3728fbc68561011fa44e0aec6 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 13 Sep 2022 11:24:51 +0200
Subject: [PATCH 3/8] Replace old queries without subselection

---
 client/src/graphql/gql/fragments/instrumentParts.gql    | 7 ++++++-
 client/src/graphql/gql/queries/instrumentTypesQuery.gql | 7 ++++++-
 client/src/graphql/gql/queries/instrumentsQuery.gql     | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/client/src/graphql/gql/fragments/instrumentParts.gql b/client/src/graphql/gql/fragments/instrumentParts.gql
index 26d3f5c3..9d90b65a 100644
--- a/client/src/graphql/gql/fragments/instrumentParts.gql
+++ b/client/src/graphql/gql/fragments/instrumentParts.gql
@@ -13,7 +13,12 @@ fragment InstrumentParts on InstrumentNode {
   type {
     id
     name
-    category
+    category {
+      id
+      name
+      foreground
+      background
+    }
     type
   }
   contents
diff --git a/client/src/graphql/gql/queries/instrumentTypesQuery.gql b/client/src/graphql/gql/queries/instrumentTypesQuery.gql
index 78b8b0db..3637fed8 100644
--- a/client/src/graphql/gql/queries/instrumentTypesQuery.gql
+++ b/client/src/graphql/gql/queries/instrumentTypesQuery.gql
@@ -2,6 +2,11 @@ query InstrumentTypesQuery {
   instrumentTypes {
     name
     type
-    category
+    category {
+      id
+      name
+      foreground
+      background
+    }
   }
 }
diff --git a/client/src/graphql/gql/queries/instrumentsQuery.gql b/client/src/graphql/gql/queries/instrumentsQuery.gql
index 290846b4..6d042b07 100644
--- a/client/src/graphql/gql/queries/instrumentsQuery.gql
+++ b/client/src/graphql/gql/queries/instrumentsQuery.gql
@@ -7,7 +7,12 @@ query InstrumentsQuery {
     type {
       id
       type
-      category
+      category {
+        id
+        name
+        foreground
+        background
+      }
       name
     }
   }

From ac972c7196cc7368cdb2f4af81014a81d992dcfe Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 13 Sep 2022 16:22:35 +0200
Subject: [PATCH 4/8] Update instrument schema

---
 .../migrations/0020_auto_20220908_1517.py     |  2 +-
 .../migrations/0024_auto_20220913_1055.py     | 25 +++++++++++++++++++
 server/basicknowledge/models.py               |  4 ++-
 server/basicknowledge/queries.py              | 14 +++++++++++
 server/schema.graphql                         |  2 ++
 5 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 server/basicknowledge/migrations/0024_auto_20220913_1055.py

diff --git a/server/basicknowledge/migrations/0020_auto_20220908_1517.py b/server/basicknowledge/migrations/0020_auto_20220908_1517.py
index 17a113fc..f61d0ebc 100644
--- a/server/basicknowledge/migrations/0020_auto_20220908_1517.py
+++ b/server/basicknowledge/migrations/0020_auto_20220908_1517.py
@@ -9,7 +9,7 @@ INTERDISCIPLINARY = 'interdisciplinary'
 CATEGORY_CHOICES = (
     (LANGUAGE_COMMUNICATION, '#DAA009', '#FFF5D9', 'Sprache & Kommunikation'),
     (SOCIETY, '#0F7CAC', '#DBEEF6', 'Gesellschaft'),
-    (INTERDISCIPLINARY, '#99B53E', '#F3F9E3', 'Überfachliches Instrument'),
+    (INTERDISCIPLINARY, '#99B53E', '#F3F9E3', 'Überfachliche Instrumente'),
 )
 
 def create_categories(apps, schema_editor):
diff --git a/server/basicknowledge/migrations/0024_auto_20220913_1055.py b/server/basicknowledge/migrations/0024_auto_20220913_1055.py
new file mode 100644
index 00000000..fdb1b91e
--- /dev/null
+++ b/server/basicknowledge/migrations/0024_auto_20220913_1055.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.2.13 on 2022-09-13 10:55
+
+import basicknowledge.models
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('basicknowledge', '0023_alter_instrumenttype_category'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='basicknowledge',
+            name='old_type',
+            field=models.CharField(blank=True, choices=[('language_communication', 'Sprache & Kommunikation'), ('society', 'Gesellschaft'), ('interdisciplinary', 'Überfachliche Instrumente')], max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='instrumenttype',
+            name='category',
+            field=models.ForeignKey(default=basicknowledge.models.default_category, on_delete=django.db.models.deletion.PROTECT, related_name='instrument_types', to='basicknowledge.instrumentcategory'),
+        ),
+    ]
diff --git a/server/basicknowledge/models.py b/server/basicknowledge/models.py
index 94ca1684..04c6f973 100644
--- a/server/basicknowledge/models.py
+++ b/server/basicknowledge/models.py
@@ -33,6 +33,7 @@ class InstrumentCategory(models.Model):
 def default_category():
     return InstrumentCategory.objects.first().pk
 
+
 class InstrumentType(models.Model):
     CATEGORY_CHOICES = (
         (LANGUAGE_COMMUNICATION, LANGUAGE_COMMUNICATION_LABEL),
@@ -45,7 +46,8 @@ class InstrumentType(models.Model):
         InstrumentCategory,
         on_delete=models.PROTECT,
         null=False,
-        default=default_category
+        default=default_category,
+        related_name='instrument_types'
     )
 
     @property
diff --git a/server/basicknowledge/queries.py b/server/basicknowledge/queries.py
index 7efe2e59..1d592a6b 100644
--- a/server/basicknowledge/queries.py
+++ b/server/basicknowledge/queries.py
@@ -8,19 +8,29 @@ from notes.models import InstrumentBookmark
 from notes.schema import InstrumentBookmarkNode
 from .models import BasicKnowledge, InstrumentCategory, InstrumentType
 
+
 class InstrumentCategoryNode(DjangoObjectType):
+    types = graphene.List('basicknowledge.queries.InstrumentTypeNode')
+
     class Meta:
         model = InstrumentCategory
+        interfaces = (relay.Node,)
         only_fields = [
             'name', 'foreground', 'background', 'id'
         ]
 
+    @staticmethod
+    def resolve_types(root: InstrumentCategory, info, **kwargs):
+        return root.instrument_types.filter(instruments__isnull=False).order_by('name').distinct()
+
+
 class InstrumentTypeNode(DjangoObjectType):
     type = graphene.String(required=True)
     category = graphene.Field(InstrumentCategoryNode)
 
     class Meta:
         model = InstrumentType
+        interfaces = (relay.Node,)
         only_fields = [
             'name', 'category', 'type', 'id'
         ]
@@ -58,6 +68,7 @@ class InstrumentQuery(object):
     instrument = graphene.Field(InstrumentNode, slug=graphene.String(), id=graphene.ID())
     instruments = graphene.List(InstrumentNode)
     instrument_types = graphene.List(InstrumentTypeNode)
+    instrument_categories = graphene.List(InstrumentCategoryNode)
 
     def resolve_instrument(self, info, **kwargs):
         slug = kwargs.get('slug')
@@ -74,3 +85,6 @@ class InstrumentQuery(object):
 
     def resolve_instrument_types(self, info, **kwargs):
         return InstrumentType.objects.filter(instruments__isnull=False).order_by('name').distinct()
+
+    def resolve_instrument_categories(self, info, **kwargs):
+        return InstrumentCategory.objects.all()
diff --git a/server/schema.graphql b/server/schema.graphql
index 46a1ba41..cd8c68d8 100644
--- a/server/schema.graphql
+++ b/server/schema.graphql
@@ -516,6 +516,7 @@ type InstrumentCategoryNode {
   name: String!
   background: String!
   foreground: String!
+  types: [InstrumentTypeNode]
 }
 
 type InstrumentNode implements Node {
@@ -875,6 +876,7 @@ type Query {
   instrument(slug: String, id: ID): InstrumentNode
   instruments: [InstrumentNode]
   instrumentTypes: [InstrumentTypeNode]
+  instrumentCategories: [InstrumentCategoryNode]
   studentSubmission(id: ID!): StudentSubmissionNode
   assignment(id: ID!): AssignmentNode
   assignments: [AssignmentNode]

From 2b3f9c7ae038c0f4b3dbbd2eec6189e27e72f588 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 13 Sep 2022 16:28:56 +0200
Subject: [PATCH 5/8] Update filtering in client

---
 .../components/instruments/FilterEntry.vue    | 10 +---
 .../components/instruments/FilterGroup.vue    | 12 ++--
 .../instruments/InstrumentEntry.vue           | 10 +++-
 .../instruments/InstrumentFilter.vue          | 56 +++----------------
 .../gql/queries/instrumentCategoriesQuery.gql | 17 ++++++
 client/src/helpers/instrumentType.js          |  2 +-
 client/src/pages/instrumentOverview.vue       |  6 +-
 7 files changed, 49 insertions(+), 64 deletions(-)
 create mode 100644 client/src/graphql/gql/queries/instrumentCategoriesQuery.gql

diff --git a/client/src/components/instruments/FilterEntry.vue b/client/src/components/instruments/FilterEntry.vue
index 1226bb46..4d3ef067 100644
--- a/client/src/components/instruments/FilterEntry.vue
+++ b/client/src/components/instruments/FilterEntry.vue
@@ -12,7 +12,6 @@
 </template>
 
 <script>
-  import {INTERDISCIPLINARY, LANGUAGE_COMMUNICATION, SOCIETY} from '@/consts/instrument.consts';
   import INSTRUMENT_FILTER_QUERY from 'gql/local/instrumentFilter.gql';
   const ChevronRight = () => import(/* webpackChunkName: "icons" */'@/components/icons/ChevronRight');
 
@@ -22,7 +21,7 @@
         type: String,
         required: true,
       },
-      type: {
+      id: {
         type: String,
         default: '',
       },
@@ -31,8 +30,8 @@
         default: false,
       },
       category: {
-        type: String,
-        default: '',
+        type: Object,
+        default: () => {},
       },
     },
 
@@ -65,9 +64,6 @@
       },
       typeClass() {
         return {
-          'filter-entry--language-communication': this.category === LANGUAGE_COMMUNICATION,
-          'filter-entry--society': this.category === SOCIETY,
-          'filter-entry--interdisciplinary': this.category === INTERDISCIPLINARY,
           'filter-entry--active': this.isActive,
           'filter-entry--category': this.isCategory,
         };
diff --git a/client/src/components/instruments/FilterGroup.vue b/client/src/components/instruments/FilterGroup.vue
index c767aec8..413c5b83 100644
--- a/client/src/components/instruments/FilterGroup.vue
+++ b/client/src/components/instruments/FilterGroup.vue
@@ -3,20 +3,20 @@
     <filter-entry
       :text="title"
       v-bind="$attrs"
-      :type="category"
       :category="category"
       :is-category="true"
-      @click.native="setCategoryFilter(category)"
+      :id="category.id"
+      @click.native="setCategoryFilter(category.id)"
     />
     <div class="filter-group__children">
       <filter-entry
         :data-cy="`filter-${type.type}`"
         :category="type.category"
         :text="type.name"
-        :type="type.type"
         v-for="type in types"
+        :id="type.id"
         :key="type.id"
-        @click.native="setFilter(`type:${type.type}`)"
+        @click.native="setFilter(`type:${type.id}`)"
       />
     </div>
   </div>
@@ -39,8 +39,8 @@
         default: () => [],
       },
       category: {
-        type: String,
-        default: '',
+        type: Object,
+        default: () => ({}),
       },
     },
     components: {
diff --git a/client/src/components/instruments/InstrumentEntry.vue b/client/src/components/instruments/InstrumentEntry.vue
index 64ee5320..091881e1 100644
--- a/client/src/components/instruments/InstrumentEntry.vue
+++ b/client/src/components/instruments/InstrumentEntry.vue
@@ -1,15 +1,21 @@
 <template>
   <div
-    :class="typeClass"
+    :style="{
+      color: instrument.type.category.foreground,
+      backgroundColor: instrument.type.category.background
+    }"
     class="instrument-entry"
   >
     <h4
       class="instrument-entry__category"
+      :style="{color: instrument.type.category.foreground}"
       data-cy="instrument-subheader"
     >
       {{ categoryName }}
     </h4>
-    <h3 class="instrument-entry__title">
+    <h3
+      class="instrument-entry__title"
+    >
       {{ instrument.title }}
     </h3>
   </div>
diff --git a/client/src/components/instruments/InstrumentFilter.vue b/client/src/components/instruments/InstrumentFilter.vue
index c5d197eb..675e4c02 100644
--- a/client/src/components/instruments/InstrumentFilter.vue
+++ b/client/src/components/instruments/InstrumentFilter.vue
@@ -6,72 +6,34 @@
     />
 
     <filter-group
-      :types="languageCommunicationTypes"
-      :category="LANGUAGE_COMMUNICATION"
-      title="Sprache und Kommunikation"
-      data-cy="filter-language-communication"
-      class="instrument-filter__group--language"
-    />
-
-    <filter-group
-      :types="societyTypes"
-      :category="SOCIETY"
-      title="Gesellschaft"
-      data-cy="filter-society"
-    />
-
-    <filter-group
-      :category="INTERDISCIPLINARY"
-      title="Überfachliche Instrumente"
-      data-cy="filter-interdisciplinary"
+      :types="category.types"
+      :category="category"
+      :title="category.name"
+      v-for="category in instrumentCategories"
+      :key="category.id"
     />
   </div>
 </template>
 
 <script>
-  import {INTERDISCIPLINARY, LANGUAGE_COMMUNICATION, SOCIETY} from '@/consts/instrument.consts';
 
   import FilterGroup from '@/components/instruments/FilterGroup';
 
-  import INSTRUMENT_TYPES_QUERY from 'gql/queries/instrumentTypesQuery';
+  import INSTRUMENT_CATEGORIES_QUERY from 'gql/queries/instrumentCategoriesQuery.gql';
 
   export default {
-
     components: {
       FilterGroup,
     },
     data() {
       return {
-        filter: '',
-        LANGUAGE_COMMUNICATION,
-        SOCIETY,
-        INTERDISCIPLINARY,
-        instrumentTypes: [],
+        instrumentCategories: [],
       };
     },
 
-    computed: {
-      languageCommunicationTypes() {
-        return this.instrumentTypes.filter(t => t.category === 'LANGUAGE_COMMUNICATION');
-      },
-      societyTypes() {
-        return this.instrumentTypes.filter(t => t.category === 'SOCIETY');
-      },
-      interdisciplinaryTypes() {
-        return this.instrumentTypes.filter(t => t.category === 'INTERDISCIPLINARY');
-      },
-    },
-
-    methods: {
-      setFilter(filter) {
-        this.filter = filter;
-        this.$emit('filter', filter);
-      }
-    },
-
     apollo: {
-      instrumentTypes: {
-        query: INSTRUMENT_TYPES_QUERY,
+      instrumentCategories: {
+        query: INSTRUMENT_CATEGORIES_QUERY,
       },
     },
   };
diff --git a/client/src/graphql/gql/queries/instrumentCategoriesQuery.gql b/client/src/graphql/gql/queries/instrumentCategoriesQuery.gql
new file mode 100644
index 00000000..99a1225f
--- /dev/null
+++ b/client/src/graphql/gql/queries/instrumentCategoriesQuery.gql
@@ -0,0 +1,17 @@
+query InstrumentTypesQuery {
+  instrumentCategories {
+    name
+    id
+    types {
+      name
+      id
+      type
+      category {
+        id
+        name
+        foreground
+        background
+      }
+    }
+  }
+}
diff --git a/client/src/helpers/instrumentType.js b/client/src/helpers/instrumentType.js
index a4892494..f2562d29 100644
--- a/client/src/helpers/instrumentType.js
+++ b/client/src/helpers/instrumentType.js
@@ -6,7 +6,7 @@ const instrumentType = (instrument) => {
   if (typeof instrument === 'string') {
     category = instrument;
   } else {
-    category = instrument.type.category;
+    return instrument.type.category.name;
   }
   return typeDictionary[category] || '';
 };
diff --git a/client/src/pages/instrumentOverview.vue b/client/src/pages/instrumentOverview.vue
index 21eb7fdf..e93f6041 100644
--- a/client/src/pages/instrumentOverview.vue
+++ b/client/src/pages/instrumentOverview.vue
@@ -48,7 +48,11 @@
           const {currentFilter} = instrumentFilter;
           if (currentFilter && currentFilter.indexOf(':') > -1) {
             const [filterType, identifier] = currentFilter.split(':');
-            this.filter = i => i.type[filterType] === identifier;
+            if(filterType === 'type') {
+              this.filter = i => i.type.id === identifier;
+            } else {
+              this.filter = i => i.type.category.id === identifier;
+            }
           } else {
             this.filter = i => i; // identity
           }

From b0a57abaa8c3c3c6ad02b3167a1505514a68c4d1 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 13 Sep 2022 16:34:56 +0200
Subject: [PATCH 6/8] Update the admin view of the new models

---
 server/basicknowledge/wagtail_hooks.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/basicknowledge/wagtail_hooks.py b/server/basicknowledge/wagtail_hooks.py
index 3065391a..a287f519 100644
--- a/server/basicknowledge/wagtail_hooks.py
+++ b/server/basicknowledge/wagtail_hooks.py
@@ -8,11 +8,18 @@ class InstrumentAdmin(ModelAdmin):
     list_display = ('title', 'new_type', 'status_string')
     search_fields = ('title', 'new_type__name')
 
+
 class InstrumentCategoryAdmin(ModelAdmin):
     model = InstrumentCategory
+    list_display = ('name', 'background', 'foreground')
+
 
 class InstrumentTypeAdmin(ModelAdmin):
     model = InstrumentType
+    list_display = ('name', 'category',)
+    inspect_view_enabled = True
+    inspect_view_fields = ('name', 'category', 'instruments',)
+
 
 modeladmin_register(InstrumentAdmin)
 modeladmin_register(InstrumentCategoryAdmin)

From 8d40c558f0932e224f1657b1020fd2d2ced4a7cf Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 13 Sep 2022 20:40:48 +0200
Subject: [PATCH 7/8] Fix unit test and cypress test

---
 .../instruments/instruments-page.spec.js      | 22 ++++++++++++++-----
 .../assignments/tests/test_myassignments.py   |  9 +++++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/client/cypress/integration/frontend/instruments/instruments-page.spec.js b/client/cypress/integration/frontend/instruments/instruments-page.spec.js
index 8bb11746..fb8db3ee 100644
--- a/client/cypress/integration/frontend/instruments/instruments-page.spec.js
+++ b/client/cypress/integration/frontend/instruments/instruments-page.spec.js
@@ -1,21 +1,33 @@
 describe('Instruments Page', () => {
   beforeEach(() => {
     cy.setup();
+    const languageCategory = {
+      name: 'Sprache & Kommunikation',
+      id: 'LANGUAGE_COMMUNICATION',
+      foreground: '#000000',
+      background: '#00ffff'
+    };
+    const societyCategory = {
+      name: 'Gesellschaft',
+      id: 'SOCIETY',
+      foreground: '#ffffff',
+      background: '#000fff'
+    };
     const analyse = {
       name: 'Analyse',
-      category: 'LANGUAGE_COMMUNICATION',
+      category: languageCategory,
       type: 'analyse',
     };
 
     const argumentation = {
       name: 'Argumentation',
-      category: 'LANGUAGE_COMMUNICATION',
+      category: languageCategory,
       type: 'argumentation',
     };
 
     const ethik = {
       name: 'Ethik',
-      category: 'SOCIETY',
+      category: societyCategory,
       type: 'ethik',
     };
 
@@ -47,13 +59,13 @@ describe('Instruments Page', () => {
             argumentation,
             {
               name: 'Beschreibung',
-              category: 'LANGUAGE_COMMUNICATION',
+              category: languageCategory,
               type: 'beschreibung',
             },
             ethik,
             {
               name: 'Identität und Sozialisation',
-              category: 'SOCIETY',
+              category: societyCategory,
               type: 'identitt-und-sozialisation',
             },
           ],
diff --git a/server/assignments/tests/test_myassignments.py b/server/assignments/tests/test_myassignments.py
index b7a4e205..68e6adfd 100644
--- a/server/assignments/tests/test_myassignments.py
+++ b/server/assignments/tests/test_myassignments.py
@@ -16,9 +16,9 @@ from users.models import User
 from users.services import create_users
 
 
-class MyAssignemntsText(DefaultUserTestCase):
+class MyAssignmentsTest(DefaultUserTestCase):
     def setUp(self):
-        super(MyAssignemntsText, self).setUp()
+        super(MyAssignmentsTest, self).setUp()
         self.assignment = AssignmentFactory(
             owner=self.teacher
         )
@@ -119,7 +119,10 @@ class MyAssignemntsText(DefaultUserTestCase):
                         type {
                           id
                           type
-                          category
+                          category {
+                            id
+                            name
+                          }
                         }
                         slug
                           bookmarks {

From bd2acdc7c610a683a77cd4b7c3bb00427d368e85 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Wed, 14 Sep 2022 11:53:16 +0200
Subject: [PATCH 8/8] Fix cypress test

---
 .../instruments/instruments-page.spec.js      | 85 +++++++++++++------
 .../gql/queries/instrumentCategoriesQuery.gql |  2 +-
 2 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/client/cypress/integration/frontend/instruments/instruments-page.spec.js b/client/cypress/integration/frontend/instruments/instruments-page.spec.js
index fb8db3ee..0e36b2a0 100644
--- a/client/cypress/integration/frontend/instruments/instruments-page.spec.js
+++ b/client/cypress/integration/frontend/instruments/instruments-page.spec.js
@@ -1,34 +1,50 @@
+const LANGUAGE_COMMUNICATION = 'LANGUAGE_COMMUNICATION';
+const LANGUAGE_COMMUNICATION_VALUE = 'Sprache & Kommunikation';
+const SOCIETY = 'SOCIETY';
+const SOCIETY_VALUE = 'Gesellschaft';
+const INTERDISCIPLINARY = 'INTERDISCIPLINARY';
+const INTERDISCIPLINARY_VALUE = 'Überfachliche Instrumente';
+
 describe('Instruments Page', () => {
   beforeEach(() => {
     cy.setup();
+
+
     const languageCategory = {
-      name: 'Sprache & Kommunikation',
-      id: 'LANGUAGE_COMMUNICATION',
+      name: LANGUAGE_COMMUNICATION_VALUE,
+      id: LANGUAGE_COMMUNICATION,
       foreground: '#000000',
-      background: '#00ffff'
+      background: '#00ffff',
     };
     const societyCategory = {
-      name: 'Gesellschaft',
-      id: 'SOCIETY',
+      name: SOCIETY_VALUE,
+      id: SOCIETY,
       foreground: '#ffffff',
-      background: '#000fff'
+      background: '#000fff',
     };
+    const ANALYSE = 'analyse';
+    const ARGUMENTATION = 'argumentation';
+    const ETHIK = 'ethik';
+
     const analyse = {
       name: 'Analyse',
       category: languageCategory,
-      type: 'analyse',
+      type: ANALYSE,
+      id: ANALYSE
     };
 
     const argumentation = {
       name: 'Argumentation',
       category: languageCategory,
-      type: 'argumentation',
+      type: ARGUMENTATION,
+      id: ARGUMENTATION
     };
 
     const ethik = {
       name: 'Ethik',
       category: societyCategory,
-      type: 'ethik',
+      type: ETHIK,
+      id: ETHIK
     };
 
     cy.mockGraphqlOps({
@@ -50,23 +66,40 @@ describe('Instruments Page', () => {
               type: ethik,
               title: 'Instrument: Ethik',
               slug: 'ethik',
-            }
+            },
           ],
         },
-        InstrumentTypesQuery: {
-          instrumentTypes: [
-            analyse,
-            argumentation,
+        InstrumentCategoriesQuery: {
+          instrumentCategories: [
             {
-              name: 'Beschreibung',
-              category: languageCategory,
-              type: 'beschreibung',
+              name: 'Sprache & Kommunikation',
+              id: LANGUAGE_COMMUNICATION,
+              types: [
+                analyse,
+                argumentation,
+                {
+                  name: 'Beschreibung',
+                  category: languageCategory,
+                  type: 'beschreibung',
+                },
+              ],
             },
-            ethik,
             {
-              name: 'Identität und Sozialisation',
-              category: societyCategory,
-              type: 'identitt-und-sozialisation',
+              name: SOCIETY_VALUE,
+              id: SOCIETY,
+              types: [
+                ethik,
+                {
+                  name: 'Identität und Sozialisation',
+                  category: societyCategory,
+                  type: 'identitt-und-sozialisation',
+                },
+              ],
+            },
+            {
+              name: INTERDISCIPLINARY_VALUE,
+              id: INTERDISCIPLINARY,
+              types: [],
             },
           ],
         },
@@ -79,19 +112,19 @@ describe('Instruments Page', () => {
 
     cy.getByDataCy('instrument').should('have.length', 3);
 
-    cy.getByDataCy('filter-language-communication').click();
+    cy.contains(LANGUAGE_COMMUNICATION_VALUE).click();
     cy.getByDataCy('instrument').should('have.length', 2);
 
-    cy.getByDataCy('filter-society').click();
+    cy.contains(SOCIETY_VALUE).click();
     cy.getByDataCy('instrument').should('have.length', 1);
 
-    cy.getByDataCy('filter-interdisciplinary').click();
+    cy.contains(INTERDISCIPLINARY_VALUE).click();
     cy.getByDataCy('instrument').should('have.length', 0);
 
-    cy.getByDataCy('filter-analyse').click();
+    cy.contains('Analyse').click();
     cy.getByDataCy('instrument').should('have.length', 1);
 
-    cy.getByDataCy('filter-ethik').click();
+    cy.contains('Ethik').click();
     cy.getByDataCy('instrument').should('have.length', 1);
 
     cy.getByDataCy('filter-all-instruments').click();
diff --git a/client/src/graphql/gql/queries/instrumentCategoriesQuery.gql b/client/src/graphql/gql/queries/instrumentCategoriesQuery.gql
index 99a1225f..0d565b1f 100644
--- a/client/src/graphql/gql/queries/instrumentCategoriesQuery.gql
+++ b/client/src/graphql/gql/queries/instrumentCategoriesQuery.gql
@@ -1,4 +1,4 @@
-query InstrumentTypesQuery {
+query InstrumentCategoriesQuery {
   instrumentCategories {
     name
     id