WIP: Submission logic refactor

closes #3947

Author: nikolas

econplayground/api/serializers.py

@@ -231,9 +231,7 @@ class SubmissionSerializer(serializers.ModelSerializer):
     class Meta:
         model = Submission
         fields = (
-            'graph', 'score',
-            'feedback_fulfilled', 'feedback_unfulfilled',
-            'created_at',
+            'graph', 'score', 'created_at',
         )
 
 

econplayground/api/tests/test_views.py

@@ -462,16 +462,12 @@ def test_create(self):
 
         response = self.client.post('/api/submissions/', {
             'graph': self.g2.pk,
-            'feedback_unfulfilled': 'a;;b',
-            'feedback_fulfilled': 'success!',
             'score': 0.6,
         })
         s = Submission.objects.last()
         self.assertEqual(response.status_code, 201)
         self.assertEqual(Submission.objects.count(), 2)
         self.assertEqual(s.score, Decimal('0.6'))
-        self.assertEqual(s.feedback_unfulfilled, 'a;;b')
-        self.assertEqual(s.feedback_fulfilled, 'success!')
 
     def test_create_dup_fail(self):
         response = self.client.post('/api/submissions/', {

econplayground/main/migrations/0128_remove_submission_feedback_fulfilled_and_more.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.2.1 on 2025-05-29 20:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0127_cohort_context_id_cohort_deployment_id'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='submission',
+            name='feedback_fulfilled',
+        ),
+        migrations.RemoveField(
+            model_name='submission',
+            name='feedback_unfulfilled',
+        ),
+    ]

econplayground/main/models.py

@@ -550,8 +550,5 @@ class Meta:
     # Corresponds to the line_x_x_score
     score = models.DecimalField(max_digits=8, decimal_places=4, default=0)
 
-    feedback_fulfilled = models.TextField(blank=True, default='')
-    feedback_unfulfilled = models.TextField(blank=True, default='')
-
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)

econplayground/main/tests/factories.py

@@ -111,8 +111,6 @@ class Meta:
 
     graph = factory.SubFactory(GraphFactory)
     user = factory.SubFactory(UserFactory)
-    feedback_fulfilled = fuzzy.FuzzyText()
-    feedback_unfulfilled = fuzzy.FuzzyText()
     score = fuzzy.FuzzyDecimal(0.0, 1.0)
 
 

media/js/src/GraphViewer.jsx

@@ -398,40 +398,6 @@ export default class GraphViewer extends React.Component {
             </div>
         );
     }
-    // When the submission is loaded by the Viewer, see if
-    // this.state.currentFeedback should be updated.
-    componentDidUpdate(prevProps) {
-        if (prevProps.submission !== this.props.submission) {
-            this.loadFeedback(
-                this.props.submission.feedback_unfulfilled,
-                this.props.submission.feedback_fulfilled);
-        }
-    }
-    loadFeedback(unfulfilledFeedback, fulfilledFeedback) {
-        const currentFeedback = [];
-
-        unfulfilledFeedback = unfulfilledFeedback.split(';;');
-        fulfilledFeedback = fulfilledFeedback.split(';;');
-
-        unfulfilledFeedback.forEach(e => {
-            if (e) {
-                currentFeedback.push({
-                    feedback: e,
-                    fulfilled: false
-                });
-            }
-        });
-        fulfilledFeedback.forEach(e => {
-            if (e) {
-                currentFeedback.push({
-                    feedback: e,
-                    fulfilled: true
-                });
-            }
-        });
-
-        this.setState({currentFeedback: currentFeedback});
-    }
     handleSubmit(event) {
         event.preventDefault();
         const assessment = new Assessment(this.props.assessment);
@@ -448,21 +414,8 @@ export default class GraphViewer extends React.Component {
 
             this.setState({score: score});
 
-            // Save the user's feedback on their Submission object to
-            // make it persistent.
-            const fulfilledFeedback = responses
-                .filter(x => x.fulfilled)
-                .map(x => x.feedback)
-                .join(';;');
-            const unfulfilledFeedback = responses
-                .filter(x => !x.fulfilled)
-                .map(x => x.feedback)
-                .join(';;');
-
             getOrCreateSubmission({
                 graph: this.props.gId,
-                feedback_fulfilled: fulfilledFeedback,
-                feedback_unfulfilled: unfulfilledFeedback,
                 score: score
             }).then(function() {
                 form.submit();