fix required fields

Author: nora-shap

codecov_auth/admin.py

@@ -686,6 +686,16 @@ def get_form(self, request, obj=None, change=False, **kwargs):
         field.widget.can_change_related = False
         field.widget.can_delete_related = False
 
+        # workaround for when a model field has null=True without blank=True
+        for field_name in [
+            "trial_start_date",
+            "trial_end_date",
+            "trial_status",
+            "free",
+        ]:
+            if form.base_fields.get(field_name):
+                form.base_fields[field_name].required = False
+
         return form
 
     def has_add_permission(self, _, obj=None):
@@ -706,11 +716,11 @@ def get_deleted_objects(self, objs, request):
 
     def save_related(self, request: HttpRequest, form, formsets, change: bool) -> None:
         if formsets:
-            token_formset = formsets[0]
-            token_id = token_formset.data.get("organization_tokens-0-id")
-            token_refresh = token_formset.data.get("organization_tokens-0-REFRESH")
+            formset = formsets[0]
+            token_id = formset.data.get("organization_tokens-0-id")
+            token_refresh = formset.data.get("organization_tokens-0-REFRESH")
             # token_id only exists if the token already exists (edit operation)
-            if token_formset.is_valid() and token_id and token_refresh:
+            if formset.is_valid() and token_id and token_refresh:
                 OrgLevelTokenService.refresh_token(token_id)
         return super().save_related(request, form, formsets, change)
 

codecov_auth/tests/test_admin.py

@@ -242,7 +242,10 @@ def test_org_token_refresh_request_calls_service_to_refresh_token(
             "organization_tokens-0-REFRESH": "on",
             "_continue": ["Save and continue editing"],
         }
-        self.client.post(request_url, data=fake_data)
+        res = self.client.post(request_url, data=fake_data)
+
+        # redirected to list page if form change is successful
+        self.assertEqual(res.status_code, 302)
         mock_refresh.assert_called_with(str(org_token.id))
 
     @patch(
@@ -278,7 +281,10 @@ def test_org_token_request_doesnt_call_service_to_refresh_token(self, mock_refre
             "organization_tokens-0-token_type": ["upload"],
             "_continue": ["Save and continue editing"],
         }
-        self.client.post(request_url, data=fake_data)
+        res = self.client.post(request_url, data=fake_data)
+
+        # redirected to list page if form change is successful
+        self.assertEqual(res.status_code, 302)
         mock_refresh.assert_not_called()
 
     def test_start_trial_ui_display(self):