From ec5c807fa6e8e9644aa23d0a8e7c7a2df2fd5c60 Mon Sep 17 00:00:00 2001 From: Julian Dehm Date: Wed, 29 Nov 2023 12:32:58 +0100 Subject: [PATCH] apps/projects: add topics as m2m relation --- Makefile | 4 ++ ..._alter_project_topics_project_m2mtopics.py | 34 +++++++++++++++++ .../0043_migrate_topics_to_m2m_topics.py | 38 +++++++++++++++++++ .../0044_remove_project_field_topics.py | 16 ++++++++ .../0045_rename_field_m2mtopics_to_topics.py | 15 ++++++++ adhocracy4/projects/models.py | 17 +++++++-- changelog/0007.md | 6 +++ 7 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 adhocracy4/projects/migrations/0042_topic_alter_project_topics_project_m2mtopics.py create mode 100644 adhocracy4/projects/migrations/0043_migrate_topics_to_m2m_topics.py create mode 100644 adhocracy4/projects/migrations/0044_remove_project_field_topics.py create mode 100644 adhocracy4/projects/migrations/0045_rename_field_m2mtopics_to_topics.py create mode 100644 changelog/0007.md diff --git a/Makefile b/Makefile index 795d61e94..1738dc9d6 100644 --- a/Makefile +++ b/Makefile @@ -45,11 +45,15 @@ lint: $(VIRTUAL_ENV)/bin/isort --diff -c $(SOURCE_DIRS) || EXIT_STATUS=$$?; \ $(VIRTUAL_ENV)/bin/flake8 $(SOURCE_DIRS) --exclude migrations,settings || EXIT_STATUS=$$?; \ npm run lint || EXIT_STATUS=$$?; \ + $(VIRTUAL_ENV)/bin/python manage.py makemigrations --dry-run --check --noinput || EXIT_STATUS=$$?; \ + exit $${EXIT_STATUS} .PHONY: lint-quick lint-quick: EXIT_STATUS=0; \ npm run lint-staged || EXIT_STATUS=$$?; \ + $(VIRTUAL_ENV)/bin/python manage.py makemigrations --dry-run --check --noinput || EXIT_STATUS=$$?; \ + exit $${EXIT_STATUS} .PHONY: lint-python-files lint-python-files: diff --git a/adhocracy4/projects/migrations/0042_topic_alter_project_topics_project_m2mtopics.py b/adhocracy4/projects/migrations/0042_topic_alter_project_topics_project_m2mtopics.py new file mode 100644 index 000000000..106ca3bdd --- /dev/null +++ b/adhocracy4/projects/migrations/0042_topic_alter_project_topics_project_m2mtopics.py @@ -0,0 +1,34 @@ +# Generated by Django 4.2 on 2023-11-29 13:18 + +import adhocracy4.projects.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("a4projects", "0041_ckeditor5_iframes"), + ] + + operations = [ + migrations.CreateModel( + name="Topic", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("code", models.CharField(blank=True, max_length=10)), + ("name", models.CharField(max_length=120, verbose_name="Topic")), + ], + ), + migrations.AddField( + model_name="project", + name="m2mtopics", + field=models.ManyToManyField(to="a4projects.topic"), + ), + ] diff --git a/adhocracy4/projects/migrations/0043_migrate_topics_to_m2m_topics.py b/adhocracy4/projects/migrations/0043_migrate_topics_to_m2m_topics.py new file mode 100644 index 000000000..dce03f053 --- /dev/null +++ b/adhocracy4/projects/migrations/0043_migrate_topics_to_m2m_topics.py @@ -0,0 +1,38 @@ +# Generated by Django 4.2 on 2023-11-29 13:20 + +from django.db import migrations +from django.conf import settings + + +def add_topics_to_m2m_table(apps, schema_editor): + if hasattr(settings, "A4_PROJECT_TOPICS"): + topicsenum = settings.A4_PROJECT_TOPICS + project = apps.get_model("a4projects", "Project") + for project in project.objects.all(): + for topic_code in project.topics: + project.m2mtopics.create( + code=topic_code, + name=[item[1] for item in topicsenum if item[0] == topic_code][0], + ) + else: + pass + + +def reverse_func(apps, schema_editor): + if hasattr(settings, "A4_PROJECT_TOPICS"): + project = apps.get_model("a4projects", "Project") + for project in project.objects.all(): + for topic in project.m2mtopics.all(): + project.m2mtopics.remove(topic) + else: + pass + + +class Migration(migrations.Migration): + dependencies = [ + ("a4projects", "0042_topic_alter_project_topics_project_m2mtopics"), + ] + + operations = [ + migrations.RunPython(add_topics_to_m2m_table, reverse_func), + ] diff --git a/adhocracy4/projects/migrations/0044_remove_project_field_topics.py b/adhocracy4/projects/migrations/0044_remove_project_field_topics.py new file mode 100644 index 000000000..c183a2d36 --- /dev/null +++ b/adhocracy4/projects/migrations/0044_remove_project_field_topics.py @@ -0,0 +1,16 @@ +# Generated by Django 4.2 on 2023-11-29 15:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("a4projects", "0043_migrate_topics_to_m2m_topics"), + ] + + operations = [ + migrations.RemoveField( + model_name="project", + name="topics", + ), + ] diff --git a/adhocracy4/projects/migrations/0045_rename_field_m2mtopics_to_topics.py b/adhocracy4/projects/migrations/0045_rename_field_m2mtopics_to_topics.py new file mode 100644 index 000000000..1ba59921b --- /dev/null +++ b/adhocracy4/projects/migrations/0045_rename_field_m2mtopics_to_topics.py @@ -0,0 +1,15 @@ +# Generated by Django 4.2 on 2023-11-29 15:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("a4projects", "0044_remove_project_field_topics"), + ] + + operations = [ + migrations.RenameField( + model_name="project", old_name="m2mtopics", new_name="topics" + ), + ] diff --git a/adhocracy4/projects/models.py b/adhocracy4/projects/models.py index f227c447c..b8e1261db 100644 --- a/adhocracy4/projects/models.py +++ b/adhocracy4/projects/models.py @@ -19,11 +19,21 @@ from adhocracy4.models import base from .enums import Access -from .fields import TopicField from .utils import get_module_clusters from .utils import get_module_clusters_dict +class Topic(models.Model): + code = models.CharField(blank=True, max_length=10) + name = models.CharField( + max_length=120, + verbose_name=_("Topic"), + ) + + def __str__(self): + return self.name + + class ProjectManager(models.Manager): def get_by_natural_key(self, name): return self.get(name=name) @@ -259,9 +269,8 @@ class Project( "dashboard." ), ) - topics = TopicField( - verbose_name=_("Project topics"), help_text=_("Add topics to your project.") - ) + topics = models.ManyToManyField(Topic) + project_type = models.CharField( blank=True, max_length=256, default="a4projects.Project" ) diff --git a/changelog/0007.md b/changelog/0007.md new file mode 100644 index 000000000..ebd389319 --- /dev/null +++ b/changelog/0007.md @@ -0,0 +1,6 @@ +# Changed + +- apps/projects: + add topics model/table + make topics a m2m relation to projects + stop making use of django-multiselectfield as it's not maintained