Fix IntegrityError and make CoC agreement required

amy/extforms/forms.py

@@ -34,6 +34,11 @@ class TrainingRequestForm(forms.ModelForm):
 
     helper = BootstrapHelper(wider_labels=True, add_cancel_button=False)
 
+    code_of_conduct_agreement = forms.BooleanField(
+        required=True,
+        label=TrainingRequest._meta.get_field("code_of_conduct_agreement").verbose_name,
+    )
+
     class Meta:
         model = TrainingRequest
         fields = (
@@ -257,6 +262,7 @@ def clean_eventbrite_url(self):
         eventbrite_url = self.cleaned_data.get("eventbrite_url", "")
         if eventbrite_url and "eventbrite" not in urlparse(eventbrite_url).hostname:
             raise ValidationError("Must be an Eventbrite URL.")
+        return eventbrite_url
 
     def clean(self):
         super().clean()

amy/extforms/tests/test_training_request_form.py

@@ -26,6 +26,7 @@ def setUp(self):
         self.data = {
             "review_process": "preapproved",
             "member_code": "coolprogrammers",
+            "eventbrite_url": "https://www.eventbrite.com/e/711576483417",
             "personal": "John",
             "family": "Smith",
             "email": "[email protected]",
@@ -510,3 +511,20 @@ def test_eventbrite_url_validation__valid(self):
         # Assert
         self.assertEqual(rv.status_code, 200)
         self.assertNotContains(rv, self.INVALID_EVENTBRITE_URL_ERROR)
+
+    def test_coc_agreement_required(self):
+        """Should error if CoC checkbox is not ticked."""
+        # Arrange
+        self.setUpMembership()
+        data = {"code_of_conduct_agreement": "false"}
+
+        # Act
+        rv = self.client.post(reverse("training_request"), data=data)
+        errors = dict(rv.context["form"].errors)
+
+        # Assert
+        self.assertEqual(rv.status_code, 200)
+        self.assertIn("code_of_conduct_agreement", errors)
+        self.assertListEqual(
+            errors["code_of_conduct_agreement"], ["This field is required."]
+        )