Implement meta-field key filtering

caluma/core/filters.py

@@ -183,6 +183,10 @@ def filter_for_lookup(cls, field, lookup_type):
         return filter_class, params
 
 
+class MetaFilterSet(FilterSet):
+    meta_has_key = CharFilter(lookup_expr="has_key", field_name="meta")
+
+
 class DjangoFilterConnectionField(filter.DjangoFilterConnectionField):
     """
     Django connection filter field with object type get_queryset support.

caluma/form/filters.py

@@ -1,14 +1,14 @@
 from . import models
 from ..core.filters import (
-    FilterSet,
     GlobalIDFilter,
     GlobalIDMultipleChoiceFilter,
+    MetaFilterSet,
     OrderingFilter,
     SearchFilter,
 )
 
 
-class FormFilterSet(FilterSet):
+class FormFilterSet(MetaFilterSet):
     search = SearchFilter(fields=("slug", "name", "description"))
     order_by = OrderingFilter(label="FormOrdering", fields=("name",))
 
@@ -17,7 +17,7 @@ class Meta:
         fields = ("slug", "name", "description", "is_published", "is_archived")
 
 
-class OptionFilterSet(FilterSet):
+class OptionFilterSet(MetaFilterSet):
     search = SearchFilter(fields=("slug", "label"))
     order_by = OrderingFilter(label="OptionOrdering", fields=("label",))
 
@@ -26,7 +26,7 @@ class Meta:
         fields = ("slug", "label")
 
 
-class QuestionFilterSet(FilterSet):
+class QuestionFilterSet(MetaFilterSet):
     exclude_forms = GlobalIDMultipleChoiceFilter(field_name="forms", exclude=True)
     search = SearchFilter(fields=("slug", "label"))
     order_by = OrderingFilter(label="QuestionOrdering", fields=("label",))
@@ -36,7 +36,7 @@ class Meta:
         fields = ("slug", "label", "is_required", "is_hidden", "is_archived")
 
 
-class DocumentFilterSet(FilterSet):
+class DocumentFilterSet(MetaFilterSet):
     id = GlobalIDFilter()
     search = SearchFilter(
         fields=("form__slug", "form__name", "form__description", "answers__value")
@@ -48,7 +48,7 @@ class Meta:
         fields = ("form", "search", "id")
 
 
-class AnswerFilterSet(FilterSet):
+class AnswerFilterSet(MetaFilterSet):
     search = SearchFilter(fields=("value",))
     order_by = OrderingFilter(label="AnswerOrdering")
 

caluma/form/schema.py

@@ -1,5 +1,6 @@
 import graphene
 from graphene import relay
+from graphene.types import generic
 from graphene_django.rest_framework import serializer_converter
 
 from . import filters, models, serializers
@@ -43,7 +44,7 @@ class Question(Node, graphene.Interface):
     is_required = QuestionJexl(required=True)
     is_hidden = QuestionJexl(required=True)
     is_archived = graphene.Boolean(required=True)
-    meta = graphene.JSONString(required=True)
+    meta = generic.GenericScalar(required=True)
     forms = DjangoFilterConnectionField(
         "caluma.form.schema.Form", filterset_class=filters.FormFilterSet
     )
@@ -172,6 +173,7 @@ class Form(DjangoObjectType):
     questions = DjangoFilterSetConnectionField(
         QuestionConnection, filterset_class=filters.QuestionFilterSet
     )
+    meta = generic.GenericScalar()
 
     class Meta:
         model = models.Form
@@ -299,7 +301,7 @@ class Answer(Node, graphene.Interface):
     created_by_group = graphene.String()
     modified_at = graphene.DateTime(required=True)
     question = graphene.Field(Question, required=True)
-    meta = graphene.JSONString(required=True)
+    meta = generic.GenericScalar(required=True)
 
     @classmethod
     def resolve_type(cls, instance, info):

caluma/form/tests/snapshots/snap_test_form.py

@@ -19,7 +19,7 @@
         "clientMutationId": "testid",
         "form": {
             "id": "Rm9ybTplZmZvcnQtbWVldA==",
-            "meta": "{}",
+            "meta": {},
             "name": "Brian Williams",
             "slug": "effort-meet",
         },
@@ -31,7 +31,7 @@
         "clientMutationId": "testid",
         "form": {
             "id": "Rm9ybTplZmZvcnQtbWVldA==",
-            "meta": "{}",
+            "meta": {},
             "name": "Brian Williams",
             "slug": "effort-meet",
         },
@@ -43,7 +43,7 @@
         "clientMutationId": "testid",
         "form": {
             "id": "Rm9ybTplZmZvcnQtbWVldA==",
-            "meta": "{}",
+            "meta": {},
             "name": "Brian Williams",
             "slug": "effort-meet",
         },
@@ -55,7 +55,7 @@
         "clientMutationId": "testid",
         "form": {
             "id": "Rm9ybTplZmZvcnQtbWVldA==",
-            "meta": "{}",
+            "meta": {},
             "name": "Brian Williams",
             "slug": "effort-meet",
         },
@@ -69,7 +69,7 @@
                 "node": {
                     "description": "First result",
                     "id": "Rm9ybTplZmZvcnQtbWVldA==",
-                    "meta": "{}",
+                    "meta": {},
                     "name": "1st",
                     "questions": {
                         "edges": [
@@ -89,7 +89,7 @@
                 "node": {
                     "description": "Second result",
                     "id": "Rm9ybTpraXRjaGVuLWRldmVsb3A=",
-                    "meta": "{}",
+                    "meta": {},
                     "name": "2nd",
                     "questions": {"edges": []},
                     "slug": "kitchen-develop",
@@ -99,7 +99,7 @@
                 "node": {
                     "description": "Second result",
                     "id": "Rm9ybTpzZXJ2aWNlLWJhbmstYXJt",
-                    "meta": "{}",
+                    "meta": {},
                     "name": "3rd",
                     "questions": {"edges": []},
                     "slug": "service-bank-arm",

caluma/form/tests/snapshots/snap_test_question.py

@@ -14,7 +14,7 @@
             "__typename": "TableQuestion",
             "id": "VGFibGVRdWVzdGlvbjpzb3VuZC1haXItbWlzc2lvbg==",
             "label": "Thomas Johnson",
-            "meta": "{}",
+            "meta": {},
             "rowForm": {"slug": "effort-meet"},
             "slug": "sound-air-mission",
         },
@@ -31,7 +31,7 @@
                     "integerMaxValue": 10,
                     "integerMinValue": 0,
                     "label": "Thomas Johnson",
-                    "meta": "{}",
+                    "meta": {},
                     "slug": "sound-air-mission",
                 }
             }
@@ -49,7 +49,7 @@
                     "floatMinValue": 0.0,
                     "id": "RmxvYXRRdWVzdGlvbjpzb3VuZC1haXItbWlzc2lvbg==",
                     "label": "Thomas Johnson",
-                    "meta": "{}",
+                    "meta": {},
                     "slug": "sound-air-mission",
                 }
             }
@@ -67,7 +67,7 @@
                     "floatMinValue": None,
                     "id": "RmxvYXRRdWVzdGlvbjpzb3VuZC1haXItbWlzc2lvbg==",
                     "label": "Thomas Johnson",
-                    "meta": "{}",
+                    "meta": {},
                     "slug": "sound-air-mission",
                 }
             }
@@ -84,7 +84,7 @@
                     "id": "VGV4dFF1ZXN0aW9uOnNvdW5kLWFpci1taXNzaW9u",
                     "label": "Thomas Johnson",
                     "maxLength": 10,
-                    "meta": "{}",
+                    "meta": {},
                     "slug": "sound-air-mission",
                 }
             }
@@ -101,7 +101,7 @@
                     "id": "VGV4dGFyZWFRdWVzdGlvbjpzb3VuZC1haXItbWlzc2lvbg==",
                     "label": "Thomas Johnson",
                     "maxLength": 10,
-                    "meta": "{}",
+                    "meta": {},
                     "slug": "sound-air-mission",
                 }
             }
@@ -117,7 +117,7 @@
                     "__typename": "ChoiceQuestion",
                     "id": "Q2hvaWNlUXVlc3Rpb246c291bmQtYWlyLW1pc3Npb24=",
                     "label": "Thomas Johnson",
-                    "meta": "{}",
+                    "meta": {},
                     "options": {"edges": [{"node": {"slug": "example-indicate"}}]},
                     "slug": "sound-air-mission",
                 }
@@ -134,7 +134,7 @@
                     "__typename": "MultipleChoiceQuestion",
                     "id": "TXVsdGlwbGVDaG9pY2VRdWVzdGlvbjpzb3VuZC1haXItbWlzc2lvbg==",
                     "label": "Thomas Johnson",
-                    "meta": "{}",
+                    "meta": {},
                     "options": {"edges": [{"node": {"slug": "example-indicate"}}]},
                     "slug": "sound-air-mission",
                 }
@@ -150,7 +150,7 @@
             "__typename": "TextQuestion",
             "id": "VGV4dFF1ZXN0aW9uOnNvdW5kLWFpci1taXNzaW9u",
             "label": "Thomas Johnson",
-            "meta": "{}",
+            "meta": {},
             "slug": "sound-air-mission",
         },
     }
@@ -163,7 +163,7 @@
             "__typename": "TextareaQuestion",
             "id": "VGV4dGFyZWFRdWVzdGlvbjpzb3VuZC1haXItbWlzc2lvbg==",
             "label": "Thomas Johnson",
-            "meta": "{}",
+            "meta": {},
             "slug": "sound-air-mission",
         },
     }
@@ -176,7 +176,7 @@
             "__typename": "IntegerQuestion",
             "id": "SW50ZWdlclF1ZXN0aW9uOnNvdW5kLWFpci1taXNzaW9u",
             "label": "Thomas Johnson",
-            "meta": "{}",
+            "meta": {},
             "slug": "sound-air-mission",
         },
     }
@@ -189,7 +189,7 @@
             "__typename": "FloatQuestion",
             "id": "RmxvYXRRdWVzdGlvbjpzb3VuZC1haXItbWlzc2lvbg==",
             "label": "Thomas Johnson",
-            "meta": "{}",
+            "meta": {},
             "slug": "sound-air-mission",
         },
     }
@@ -203,7 +203,7 @@
             "id": "RmxvYXRRdWVzdGlvbjpzb3VuZC1haXItbWlzc2lvbg==",
             "label": "Thomas Johnson",
             "maxValue": 10.0,
-            "meta": "{}",
+            "meta": {},
             "minValue": 0.0,
             "slug": "sound-air-mission",
         },
@@ -217,7 +217,7 @@
             "__typename": "IntegerQuestion",
             "id": "SW50ZWdlclF1ZXN0aW9uOnNvdW5kLWFpci1taXNzaW9u",
             "label": "Thomas Johnson",
-            "meta": "{}",
+            "meta": {},
             "slug": "sound-air-mission",
         },
     }
@@ -230,7 +230,7 @@
             "__typename": "MultipleChoiceQuestion",
             "id": "TXVsdGlwbGVDaG9pY2VRdWVzdGlvbjpzb3VuZC1haXItbWlzc2lvbg==",
             "label": "Thomas Johnson",
-            "meta": "{}",
+            "meta": {},
             "options": {
                 "edges": [
                     {
@@ -254,7 +254,7 @@
             "__typename": "ChoiceQuestion",
             "id": "Q2hvaWNlUXVlc3Rpb246c291bmQtYWlyLW1pc3Npb24=",
             "label": "Thomas Johnson",
-            "meta": "{}",
+            "meta": {},
             "options": {
                 "edges": [
                     {"node": {"label": "Kelly Brock", "slug": "example-indicate"}}