#960 simple form save on review opinion

opentech/apply/review/forms.py

@@ -91,12 +91,3 @@ class ReviewOpinionForm(forms.ModelForm):
     class Meta:
         model = ReviewOpinion
         fields = ('opinion',)
-
-    def __init__(self, *args, **kwargs):
-        if kwargs.get('user'):
-            self.user = kwargs.pop('user')
-        super().__init__(*args, **kwargs)
-
-    def save(self, commit=True):
-        # TODO: save the review here
-        return super().save(False)

opentech/apply/review/migrations/0015_reviewopinion.py → opentech/apply/review/migrations/0015_review_opinion.py

-# Generated by Django 2.0.10 on 2019-02-14 14:55
+# Generated by Django 2.0.10 on 2019-02-16 12:19
 
 from django.conf import settings
 from django.db import migrations, models
@@ -22,4 +22,8 @@ class Migration(migrations.Migration):
                 ('review', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='opinions', to='review.Review')),
             ],
         ),
+        migrations.AlterUniqueTogether(
+            name='reviewopinion',
+            unique_together={('author', 'review')},
+        ),
     ]

opentech/apply/review/models.py

@@ -178,3 +178,6 @@ class ReviewOpinion(models.Model):
         on_delete=models.PROTECT,
     )
     opinion = models.IntegerField(choices=OPINION_CHOICES)
+
+    class Meta:
+        unique_together = ('author', 'review')

opentech/apply/review/views.py

@@ -126,17 +126,15 @@ class ReviewOpinionFormView(SingleObjectMixin, FormView):
     form_class = ReviewOpinionForm
     model = Review
 
-    def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
-        kwargs['user'] = self.request.user
-        return kwargs
-
     def post(self, request, *args, **kwargs):
         self.object = self.get_object()
 
         form = self.get_form()
         if form.is_valid():
-            form.save()
+            review_opinion = form.save(commit=False)
+            review_opinion.author = self.request.user
+            review_opinion.review = self.object
+            review_opinion.save()
 
         return super().post(request, *args, **kwargs)