Replace third-party JSONField with Django built-in JSONField

openwisp_notifications/base/notifications.py

@@ -12,7 +12,6 @@
 from django.db import models
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-from jsonfield.fields import JSONField
 from model_utils import Choices
 
 
@@ -91,7 +90,7 @@ class AbstractNotification(models.Model):
     deleted = models.BooleanField(_("deleted"), default=False, db_index=True)
     emailed = models.BooleanField(_("emailed"), default=False, db_index=True)
 
-    data = JSONField(_("data"), blank=True, null=True)
+    data = models.JSONField(_("data"), blank=True, null=True)
 
     objects = NotificationQuerySet.as_manager()
 

openwisp_notifications/handlers.py

@@ -31,8 +31,6 @@
 
 logger = logging.getLogger(__name__)
 
-EXTRA_DATA = app_settings.get_config()["USE_JSONFIELD"]
-
 User = get_user_model()
 
 Notification = load_model("Notification")
@@ -163,7 +161,7 @@ def notify_handler(**kwargs):
                     "%s_content_type" % opt,
                     ContentType.objects.get_for_model(obj),
                 )
-        if kwargs and EXTRA_DATA:
+        if kwargs:
             notification.data = kwargs
         notification.save()
         notification_list.append(notification)

openwisp_notifications/migrations/0010_replace_jsonfield_with_django_builtin.py

@@ -0,0 +1,18 @@
+# Generated migration to replace third-party JSONField with Django's built-in JSONField
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('openwisp_notifications', '0009_alter_notificationsetting_organization_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='notification',
+            name='data',
+            field=models.JSONField(blank=True, null=True, verbose_name='data'),
+        ),
+    ]

openwisp_notifications/settings.py

@@ -4,7 +4,6 @@
 
 CONFIG_DEFAULTS = {
     "PAGINATE_BY": 20,
-    "USE_JSONFIELD": True,
     "SOFT_DELETE": False,
     "NUM_TO_FETCH": 10,
     "CACHE_TIMEOUT": 2,

requirements.txt

@@ -1,4 +1,3 @@
 openwisp-users @ https://github.com/openwisp/openwisp-users/tarball/1.2
 openwisp-utils[rest,celery,channels] @ https://github.com/openwisp/openwisp-utils/tarball/1.2
 markdown~=3.8.2
-jsonfield>=2.1.0

tests/openwisp2/sample_notifications/migrations/0003_replace_jsonfield_with_django_builtin.py

@@ -0,0 +1,18 @@
+# Generated migration to replace third-party JSONField with Django's built-in JSONField
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sample_notifications', '0002_testapp'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='notification',
+            name='data',
+            field=models.JSONField(blank=True, null=True, verbose_name='data'),
+        ),
+    ]