Merge pull request #435 from UCF/default-value-highlights

Highlights Data Consistency Fix

core/views.py

@@ -286,7 +286,7 @@ def get_initial(self):
             initial['jobs_source'] = jobs_source
 
         if highlights:
-            initial['highlights'] = highlights
+            initial['highlights'] = json.dumps(highlights)
 
         return initial
 
@@ -323,10 +323,10 @@ def form_valid(self, form):
         # Filter out entries with empty 'icon_class' or 'description'
         filtered_highlights = [entry for entry in highlights_list if entry['icon_class'] or entry['description']]
         if filtered_highlights:
-            program.highlights = json.dumps(filtered_highlights)
+            program.highlights = filtered_highlights
             program.save()
         if not filtered_highlights:
-            program.highlights = json.dumps([])
+            program.highlights = []
             program.save()
 
         # Remove jobs that are no longer listed

programs/migrations/0062_auto_20240724_1513.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.20 on 2024-07-24 15:13
+import json
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    def forward(apps, schema_editor):
+        Program = apps.get_model('programs', 'Program')
+        for row in Program.objects.filter(highlights__isnull=False):
+            highlights = row.highlights
+            if isinstance(highlights, str):
+                highlights = json.loads(highlights)
+
+            row.highlights = highlights
+            row.save()
+
+
+    dependencies = [
+        ('programs', '0061_alter_program_highlights'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            forward,
+            reverse_code=migrations.RunPython.noop
+        )
+    ]

programs/serializers.py

@@ -387,10 +387,6 @@ class Meta:
         )
         model = AcademicTerm
 
-class HighlightField(serializers.JSONField):
-    def to_representation(self, value):
-        # Convert the JSON to a dictionary for display
-            return json.loads(value) if value else []
 
 class ProgramSerializer(DynamicFieldSetMixin, serializers.ModelSerializer):
     level = serializers.StringRelatedField(many=False)
@@ -436,8 +432,6 @@ class ProgramSerializer(DynamicFieldSetMixin, serializers.ModelSerializer):
     area_of_interest = serializers.SerializerMethodField()
     subarea_of_interest = serializers.SerializerMethodField()
 
-    highlights = HighlightField(read_only=True)
-
     def get_excerpt(self, obj: Program):
         return obj.excerpt