Revert "Django3: remove old non-JSONFields and kept the new ones only"

This reverts commit ff6184b.

Author: humitos

readthedocs/builds/migrations/0039_remove_old_jsonfields.py

@@ -19,6 +19,7 @@
     ModificationDateTimeField,
 )
 from django_extensions.db.models import TimeStampedModel
+from jsonfield import JSONField
 from polymorphic.models import PolymorphicModel
 
 import readthedocs.builds.automation_actions as actions
@@ -661,7 +662,8 @@ class Build(models.Model):
         null=True,
         blank=True,
     )
-    _config = models.JSONField(_('Configuration used in the build'), default=dict)
+    _config = JSONField(_('Configuration used in the build'), default=dict)
+    _config_json = models.JSONField(_('Configuration used in the build'), default=dict)
 
     length = models.IntegerField(_('Build Length'), null=True, blank=True)
 

readthedocs/builds/models.py

@@ -12,6 +12,7 @@
 from django.db import models, transaction
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
+from jsonfield import JSONField
 from pygments import highlight
 from pygments.formatters import HtmlFormatter
 from pygments.lexers import JsonLexer
@@ -143,15 +144,17 @@ class HttpExchange(models.Model):
 
     date = models.DateTimeField(_('Date'), auto_now_add=True)
 
-    request_headers = models.JSONField(
+    request_headers = JSONField(_('Request headers'))
+    request_headers_json = models.JSONField(
         _('Request headers'),
         # Delete after deploy
         null=True,
         default=None,
     )
     request_body = models.TextField(_('Request body'))
 
-    response_headers = models.JSONField(
+    response_headers = JSONField(_('Request headers'))
+    response_headers_json = models.JSONField(
         _('Request headers'),
         # Delete after deploy
         null=True,
@@ -295,7 +298,8 @@ class Integration(models.Model):
         max_length=32,
         choices=INTEGRATIONS,
     )
-    provider_data = models.JSONField(_('Provider data'), default=dict)
+    provider_data = JSONField(_('Provider data'), default=dict)
+    provider_data_json = models.JSONField(_('Provider data'), default=dict)
     exchanges = GenericRelation(
         'HttpExchange',
         related_query_name='integrations',

readthedocs/integrations/migrations/0009_remove_old_jsonfields.py

@@ -21,10 +21,6 @@ drf-flex-fields==0.9.7
 drf-extensions==0.7.1
 
 django-vanilla-views==3.0.0
-
-# This module is only used on migrations. We are now using Django's official
-# JSONField. We should probably squash these migrations and remove this
-# dependency as well.
 jsonfield==3.1.0
 
 requests==2.27.1