Split up public body models, remove obsolete PublicBodyTag

Author: stefanw

froide/foirequest/tests/factories.py

@@ -24,7 +24,6 @@
     FoiLawFactory,
     JurisdictionFactory,
     PublicBodyFactory,
-    PublicBodyTagFactory,
 )
 
 from ..models import (
@@ -251,9 +250,6 @@ def make_world() -> Site:
     topic_1 = CategoryFactory.create(is_topic=True)
     topic_2 = CategoryFactory.create(is_topic=True)
 
-    tag_1 = PublicBodyTagFactory.create(is_topic=True)
-    tag_2 = PublicBodyTagFactory.create(is_topic=True)
-
     mediator_bund = PublicBodyFactory.create(jurisdiction=bund, site=site)
     mediator_bund.categories.add(topic_1)
 
@@ -283,12 +279,10 @@ def make_world() -> Site:
     for _ in range(5):
         pb_bund_1 = PublicBodyFactory.create(jurisdiction=bund, site=site)
         pb_bund_1.categories.add(topic_1)
-        pb_bund_1.tags.add(tag_1)
         pb_bund_1.laws.add(ifg_bund, uig_bund, meta_bund)
     for _ in range(5):
         pb_nrw_1 = PublicBodyFactory.create(jurisdiction=nrw, site=site)
         pb_nrw_1.categories.add(topic_2)
-        pb_nrw_1.tags.add(tag_2)
         pb_nrw_1.laws.add(ifg_nrw, uig_nrw, meta_nrw)
     req = FoiRequestFactory.create(
         site=site, user=user1, jurisdiction=bund, law=meta_bund, public_body=pb_bund_1

froide/publicbody/admin.py

@@ -43,8 +43,6 @@
     ProposedPublicBody,
     PublicBody,
     PublicBodyChangeProposal,
-    PublicBodyTag,
-    TaggedPublicBody,
 )
 
 CATEGORY_AUTOCOMPLETE_URL = reverse_lazy("api:category-autocomplete")
@@ -82,7 +80,7 @@ def execute_replace_publicbody(admin, request, queryset, action_obj):
     that point to obj with assign_obj.
     Dark magic ahead.
     """
-    BLOCK_LIST = [CategorizedPublicBody, TaggedPublicBody, PublicBody]
+    BLOCK_LIST = [CategorizedPublicBody, PublicBody]
     relations = [
         f
         for f in PublicBody._meta.get_fields()
@@ -599,20 +597,6 @@ class JurisdictionAdmin(admin.ModelAdmin):
     raw_id_fields = ("region",)
 
 
-@admin.register(PublicBodyTag)
-class PublicBodyTagAdmin(admin.ModelAdmin):
-    list_display = ["name", "slug", "is_topic", "rank"]
-    list_filter = ["is_topic", "rank"]
-    ordering = ["rank", "name"]
-    search_fields = ["name"]
-    prepopulated_fields = {"slug": ["name"]}
-
-
-@admin.register(TaggedPublicBody)
-class TaggedPublicBodyAdmin(admin.ModelAdmin):
-    raw_id_fields = ("content_object", "tag")
-
-
 def execute_assign_parent(admin, request, queryset, action_obj):
     for obj in queryset:
         obj.move(action_obj, "sorted-child")

froide/publicbody/factories.py

@@ -17,7 +17,6 @@
     FoiLaw,
     Jurisdiction,
     PublicBody,
-    PublicBodyTag,
 )
 
 
@@ -36,14 +35,6 @@ class Meta:
     rank = factory.Sequence(lambda n: n)
 
 
-class PublicBodyTagFactory(DjangoModelFactory):
-    class Meta:
-        model = PublicBodyTag
-
-    name = factory.Sequence(lambda n: "Public Body Tag {0}".format(n))
-    slug = factory.LazyAttribute(lambda o: slugify(o.name))
-
-
 class CategoryFactory(DjangoModelFactory):
     class Meta:
         model = Category

froide/publicbody/migrations/0010_auto_20171225_0633.py

@@ -9,10 +9,9 @@ def create_categories(apps, schema_editor):
     """
     Copy all PublicBodyTags to Categories
     """
-    from ..models import Category, TaggedPublicBody  # Use treebeard API
+    TaggedPublicBody = apps.get_model("publicbody", "TaggedPublicBody")
+    Category = apps.get_model("publicbody", "Category")
 
-    # Category = apps.get_model('publicbody', 'Category')
-    # PublicBody = apps.get_model('publicbody', 'PublicBody')
     categories = {}
     for tpb in TaggedPublicBody.objects.all():
         if tpb.tag.slug in categories: