added usergroup model and migrations

n0rdlicht · n0rdlicht · commit 3e741bcec018 · 2022-02-23T14:17:46.000+01:00
diff --git a/django/gsmap/admin.py b/django/gsmap/admin.py
@@ -10,7 +10,7 @@
 from parler.admin import TranslatableAdmin
 from parler.forms import TranslatableModelForm
 from sortedm2m_filter_horizontal_widget.forms import SortedFilteredSelectMultiple
-from gsmap.models import Municipality, Snapshot, Workspace, Category, Attachement, Annotation
+from gsmap.models import Municipality, Snapshot, Workspace, Category, Usergroup, Attachement, Annotation
 
 
 class MunicipalityAdmin(admin.OSMGeoAdmin):
@@ -134,15 +134,15 @@ class WorkspaceAdmin(admin.OSMGeoAdmin):
                 ('mode'),
                 ('findme_enabled', 'annotations_open', 'annotations_likes_enabled', 'polygon_open', 'polygon_likes_enabled'),
                 ('annotations_contact_name', 'annotations_contact_email'),
-                'categories',
+                'categories', 'usergroups'
             )
         }),
     )
     list_display = ('id', 'title', 'annotations_open', 'created', 'modified')
     search_fields = ['title']
 
     def formfield_for_manytomany(self, db_field, request=None, **kwargs):
-        if db_field.name == 'snapshots' or db_field.name == 'categories':
+        if db_field.name == 'snapshots' or db_field.name == 'categories' or db_field.name == 'usergroups':
             kwargs['widget'] = SortedFilteredSelectMultiple()
         return super().formfield_for_manytomany(db_field, request, **kwargs)
 
@@ -159,7 +159,7 @@ class AnnotationAdmin(admin.OSMGeoAdmin):
             )
         }),
         (_('Main'), {
-            'fields': ('kind', 'data', 'category', 'rating', 'workspace','deleted', 'public'),
+            'fields': ('kind', 'data', 'category', 'usergroup', 'rating', 'workspace','deleted', 'public'),
         }),
     )
     list_display = (
@@ -175,7 +175,7 @@ class AnnotationAdmin(admin.OSMGeoAdmin):
         'workspace',
     )
     inlines = [ AttachementInline, ]
-    list_filter = ('workspace', 'category', 'kind')
+    list_filter = ('workspace', 'category', 'kind', 'usergroup')
     search_fields = ('id', 'data')
 
 class CategoryAdminForm(TranslatableModelForm):
@@ -214,13 +214,27 @@ class CategoryAdmin(TranslatableAdmin): # admin.OSMGeoAdmin,
     list_filter = ('namespace', 'hide_in_list', 'color')
     search_fields = ('id', 'translations__name', 'namespace')
 
-    # def get_prepopulated_fields(self, request, obj=None):
-    #     return {
-    #         'slug': ('name',)
-    #     }
+class UsergroupAdmin(TranslatableAdmin): # admin.OSMGeoAdmin, 
+    readonly_fields = ('created', 'modified')
+    fieldsets = (
+        (_('Meta'), {
+            'fields': ('deleted', 'created', 'modified'),
+        }),
+        (_('Category'), {
+            'fields': ('key', 'name'),
+        }),
+    )
+
+    list_display = (
+        'key',
+        'name',
+    )
+
+    search_fields = ('id', 'name', 'key')
 
 admin.site.register(Municipality, MunicipalityAdmin)
 admin.site.register(Snapshot, SnapshotAdmin)
 admin.site.register(Workspace, WorkspaceAdmin)
 admin.site.register(Category, CategoryAdmin)
+admin.site.register(Usergroup, UsergroupAdmin)
 admin.site.register(Annotation, AnnotationAdmin)
diff --git a/django/gsmap/migrations/0036_auto_20220223_1048.py b/django/gsmap/migrations/0036_auto_20220223_1048.py
@@ -0,0 +1,102 @@
+# Generated by Django 3.1.13 on 2022-02-23 10:48
+
+from django.db import migrations, models
+import django.db.models.deletion
+from django.utils.text import slugify
+import parler.fields
+import parler.models
+import sortedm2m.fields
+
+def forwards_func(apps, schema_editor):
+    Annotation = apps.get_model('gsmap', 'Annotation') 
+    Usergroup = apps.get_model('gsmap', 'Usergroup')
+
+    usergroups = list(map(get_usergroup_from_data, Annotation.objects.all()))
+    usergroups = [x for i, x in enumerate(usergroups) if usergroups.index(x) == i and x is not None]
+
+    for usergroup in usergroups:
+        exists = list(Usergroup.objects.filter(key=create_usergroup_key(usergroup)))
+        if len(exists) == 0:
+            g = Usergroup(
+                key=create_usergroup_key(usergroup)
+            )
+            g.set_current_language("de")
+            g.name = usergroup
+            g.save()
+
+    for object in Annotation.objects.all():
+        usergroup = get_usergroup_from_data(object)
+        if usergroup:
+            object.usergroup = Usergroup.objects.filter(key=create_usergroup_key(usergroup)).first()
+            object.data["properties"].pop("usergroup")
+            object.save()
+
+def backwards_func(apps, schema_editor):
+    Annotation = apps.get_model('gsmap', 'Annotation')
+
+    for object in Annotation.objects.all():
+        if object.usergroup:
+            object.data["properties"]["usergroup"] = object.usergroup.get_translation("de").name
+            object.save()   # Note this only calls Model.save()
+
+def get_usergroup_from_data(annotation):
+    data = annotation.data
+    if "properties" in data.keys() and "usergroup" in data["properties"].keys():
+        return data["properties"]["usergroup"]
+    return None
+
+def create_usergroup_key(usergroup):
+    return slugify(usergroup)[:50]
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gsmap', '0035_auto_20220222_2317'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Usergroup',
+            fields=[
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('modified', models.DateTimeField(auto_now=True)),
+                ('deleted', models.BooleanField(default=False)),
+                ('key', models.CharField(max_length=50, primary_key=True, serialize=False, unique=True)),
+            ],
+            options={
+                'verbose_name_plural': 'usergroups',
+            },
+            bases=(parler.models.TranslatableModelMixin, models.Model),
+        ),
+        migrations.AddField(
+            model_name='annotation',
+            name='usergroup',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='gsmap.usergroup'),
+        ),
+        migrations.AddField(
+            model_name='workspace',
+            name='usergroups',
+            field=sortedm2m.fields.SortedManyToManyField(help_text=None, to='gsmap.Usergroup'),
+        ),
+        migrations.CreateModel(
+            name='UsergroupTranslation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('language_code', models.CharField(db_index=True, max_length=15, verbose_name='Language')),
+                ('name', models.CharField(max_length=255)),
+                ('master', parler.fields.TranslationsForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='gsmap.usergroup')),
+            ],
+            options={
+                'verbose_name': 'usergroup Translation',
+                'db_table': 'gsmap_usergroup_translation',
+                'db_tablespace': '',
+                'managed': True,
+                'default_permissions': (),
+                'unique_together': {('language_code', 'master')},
+            },
+            bases=(parler.models.TranslatedFieldsModelMixin, models.Model),
+        ),
+
+        # Also migrate data from/to inside data json field
+        migrations.RunPython(forwards_func, backwards_func),
+    ]
diff --git a/django/gsmap/models.py b/django/gsmap/models.py
@@ -344,6 +344,27 @@ class Meta:
     def __str__(self):
         return f'{self.namespace}/{self.name}'
 
+class Usergroup(TranslatableModel):
+    class Meta:
+        verbose_name_plural = 'usergroups'
+        # ordering = ['name']
+
+    created = models.DateTimeField(auto_now_add=True)
+    modified = models.DateTimeField(auto_now=True)
+    deleted = models.BooleanField(default=False)
+
+    key = models.CharField(
+        max_length=50, unique=True,
+        primary_key=True
+    )
+
+    translations = TranslatedFields(
+        name=models.CharField(max_length=255),
+    )
+
+    def __str__(self):
+        return f'{self.name}'
+
 class Workspace(models.Model):
     class Meta:
         ordering = ['-created']
@@ -361,6 +382,7 @@ class Meta:
     snapshots = SortedManyToManyField(Snapshot)
 
     categories = SortedManyToManyField(Category)
+    usergroups = SortedManyToManyField(Usergroup)
 
     MODE_CHOICES = [
         ("OFF", _("Off")),
@@ -429,6 +451,10 @@ class Meta:
         Category, default=None, blank=True,
         null=True, on_delete=models.SET_NULL
     )
+    usergroup = models.ForeignKey(
+        Usergroup, default=None, blank=True,
+        null=True, on_delete=models.SET_NULL
+    )
     author_email = models.EmailField(max_length=254)
     rating = models.DecimalField(default=0, decimal_places=2, max_digits=6)
     workspace =  models.ForeignKey(Workspace, on_delete=models.CASCADE)
@@ -460,13 +486,6 @@ def description(self):
         else:
             return None
     
-    @property
-    def usergroup(self):
-        if "properties" in self.data.keys() and "usergroup" in self.data["properties"].keys():
-            return f'{self.data["properties"]["usergroup"]}'
-        else:
-            return None
-    
     def __str__(self):
         return self.fullname
 
diff --git a/django/gsmap/schema.py b/django/gsmap/schema.py
@@ -11,7 +11,7 @@
 from graphene_django.types import DjangoObjectType
 from graphene_django.filter import DjangoFilterConnectionField
 from graphene_django.converter import convert_django_field
-from gsmap.models import Municipality, Snapshot, SnapshotPermission, Workspace, Annotation, Category, Attachement
+from gsmap.models import Municipality, Snapshot, SnapshotPermission, Workspace, Annotation, Category, Usergroup, Attachement
 from graphene_django.rest_framework.mutation import SerializerMutation
 import graphene_django_optimizer as gql_optimizer
 
@@ -122,12 +122,32 @@ class Meta:
         interfaces = [graphene.relay.Node]
 
     name = graphene.String(
-        language_code=graphene.Argument(Q_LANGUAGE, default_value=translation.get_language()),
+        language_code=graphene.Argument(Q_LANGUAGE, default_value=Q_LANGUAGE[settings.PARLER_DEFAULT_LANGUAGE_CODE]),
     )
     pk = graphene.Int(source='id')
 
-    def resolve_name(root: Category, info, language_code=None):
-        return root.safe_translation_getter("name", language_code=language_code)
+    def resolve_name(self, info, language_code=None):
+        lang = Q_LANGUAGE.get(language_code).name
+        return self.safe_translation_getter("name", language_code=lang)
+
+class UsergroupNode(DjangoObjectType):
+    class Meta:
+        model = Usergroup
+        fields = ['key', 'name']
+        filter_fields = {
+            'key': ['exact'],
+            'name': ['exact', 'icontains', 'istartswith'],
+        }
+        interfaces = [graphene.relay.Node]
+
+    name = graphene.String(
+        language_code=graphene.Argument(Q_LANGUAGE, default_value=Q_LANGUAGE[settings.PARLER_DEFAULT_LANGUAGE_CODE]),
+    )
+    key = graphene.String(source='key')
+
+    def resolve_name(self, info, language_code=None):
+        lang = Q_LANGUAGE.get(language_code).name
+        return self.safe_translation_getter("name", language_code=lang)
 
 class AttachementNode(DjangoObjectType):
     class Meta:
@@ -170,6 +190,8 @@ class Meta:
         CategoryNode,
         show_all=graphene.Argument(graphene.Boolean, default_value=False),
     )
+    
+    usergroups = graphene.List(UsergroupNode)
 
     def resolve_snapshots(self, info):
         return gql_optimizer.query(self.snapshots.all(), info)
@@ -182,6 +204,9 @@ def resolve_categories(self, info, show_all):
             return gql_optimizer.query(self.categories.all(),info)
         else:
             return gql_optimizer.query(self.categories.filter(Q(hide_in_list=0)),info)
+    
+    def resolve_usergroups(self, info):
+        return gql_optimizer.query(self.usergroups.all(), info)
 
 class SnapshotMutation(graphene.relay.ClientIDMutation):
     class Input:
diff --git a/django/gsmap/serializers.py b/django/gsmap/serializers.py
@@ -17,14 +17,17 @@ class Meta:
             'data',
             'category',
             'author_email',
+            'usergroup',
             'workspace',
         )
     
     def validate(self, data):
-        if not data.get("workspace").annotations_open:
-            raise serializers.ValidationError(f'Rating annotations is not allowed currently for this workspace.')
+        if not (data.get("workspace").annotations_open or data.get("workspace").poylgons_open):
+            raise serializers.ValidationError('Rating annotations is not allowed currently for this workspace.')
         if not data.get("author_email"):
-            raise serializers.ValidationError(f'Adding annotations to this workspace requires an email.')
+            raise serializers.ValidationError('Adding annotations to this workspace requires an email.')
+        if not data.get("usergroup"):
+            raise serializers.ValidationError('Adding annotations to this workspace requires a usergroup.')
         
         return data
 
diff --git a/vue/src/components/SnapshotMap.vue b/vue/src/components/SnapshotMap.vue
@@ -231,7 +231,9 @@
                         required
                       />
                       <v-select
-                        :items="usergroups"
+                        :items="annotations.usergroups"
+                        item-text="name"
+                        item-value="key"
                         v-model="newAnnotation.usergroup"
                         label="Personengruppe"
                         :rules="[v => !!v || $t('mandatory')]"
@@ -612,7 +614,6 @@ export default {
       timeout: null,
       guides: null,
       commentstepper: 1,
-      usergroups: ['Anwohner:in', 'Bürger:in', 'Beschäftigte:r', 'Student:in', 'Andere'],
       currentCommentIndex: null,
       ratingpause: false,
       dialog: false,
@@ -1247,12 +1248,12 @@ export default {
             properties: {
               fill: true,
               title: this.newAnnotation.title,
-              description: this.newAnnotation.text,
-              usergroup: this.newAnnotation.usergroup
+              description: this.newAnnotation.text
             }
           };
           formData.append('category', this.newAnnotation.category);
           formData.append('author_email', this.newAnnotation.email);
+          formData.append('usergroup', this.newAnnotation.usergroup);
           formData.append('data', JSON.stringify(data));
           break;
         }
@@ -1269,12 +1270,12 @@ export default {
             },
             properties: {
               title: this.newAnnotation.title,
-              description: this.newAnnotation.text,
-              usergroup: this.newAnnotation.usergroup
+              description: this.newAnnotation.text
             }
           };
           formData.append('category', this.newAnnotation.category);
           formData.append('author_email', this.newAnnotation.email);
+          formData.append('usergroup', this.newAnnotation.usergroup);
           formData.append('data', JSON.stringify(data));
           break;
         }
diff --git a/vue/src/views/Workspace.vue b/vue/src/views/Workspace.vue
