fix(buddy-system): quick match if matcher faculty has not been set

fiesta/apps/accounts/forms/profile.py

@@ -13,6 +13,8 @@
 
 class UserProfileForm(BaseModelForm):
     FIELDS_TO_CONFIGURATION = {
+        UserProfile.university: SectionsConfiguration.required_university,
+        UserProfile.faculty: SectionsConfiguration.required_faculty,
         UserProfile.nationality: SectionsConfiguration.required_nationality,
         UserProfile.gender: SectionsConfiguration.required_gender,
         UserProfile.picture: SectionsConfiguration.required_picture,

fiesta/apps/buddy_system/forms.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
+from django.core.exceptions import ValidationError
 from django.forms import BooleanField, HiddenInput, fields_for_model
 from django.template.loader import render_to_string
 from django.utils.functional import lazy
 from django.utils.translation import gettext_lazy as _
 
-from apps.accounts.models import UserProfile
+from apps.accounts.models import User, UserProfile
 from apps.buddy_system.models import BuddyRequest, BuddyRequestMatch
 from apps.fiestaforms.fields.array import ChoicedArrayField
 from apps.fiestaforms.forms import BaseModelForm
@@ -100,15 +101,22 @@ class Meta:
 
 class QuickBuddyMatchForm(BaseModelForm):
     submit_text = _("Match")
+    instance: BuddyRequestMatch
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        # self.fields["issuer"].disabled = True
-
     class Meta:
         model = BuddyRequestMatch
         fields = ("matcher",)
         widgets = {
             "matcher": ActiveLocalMembersFromSectionWidget,
         }
+
+    def clean_matcher(self):
+        matcher: User = self.cleaned_data["matcher"]
+
+        if not matcher.profile_or_none.faculty:
+            raise ValidationError(_("This user has not set their faculty. Please ask them to do so or do it yourself."))
+
+        return matcher

fiesta/apps/buddy_system/views/editor.py

@@ -11,6 +11,7 @@
 from django_tables2 import Column, TemplateColumn, tables
 from django_tables2.utils import Accessor
 
+from apps.accounts.models import User, UserProfile
 from apps.buddy_system.forms import BuddyRequestEditorForm, QuickBuddyMatchForm
 from apps.buddy_system.models import BuddyRequest, BuddyRequestMatch
 from apps.fiestaforms.views.htmx import HtmxFormMixin
@@ -175,15 +176,19 @@ class QuickBuddyMatchView(
 
     def get_initial(self):
         try:
+            matcher: User = self.get_object().match.matcher
+            profile: UserProfile = matcher.profile_or_none
             return {
-                "matcher": self.get_object().match.matcher,
+                "matcher": matcher,
+                # SectionPluginsValidator ensures that faculty is required if BuddySystem is enabled
+                "matcher_faculty": profile.faculty if profile else None,
             }
         except BuddyRequestMatch.DoesNotExist:
             return {}
 
     @transaction.atomic
     def form_valid(self, form):
-        br: BuddyRequest = self.get_object()
+        br: BuddyRequest = form.instance
 
         try:
             if br.match:
@@ -192,9 +197,12 @@ def form_valid(self, form):
         except BuddyRequestMatch.DoesNotExist:
             pass
 
+        matcher: User = form.cleaned_data.get("matcher")
+
         match = BuddyRequestMatch(
             request=br,
-            matcher=form.cleaned_data.get("matcher"),
+            matcher=matcher,
+            matcher_faculty=matcher.profile_or_none.faculty,
         )
 
         match.save()

fiesta/apps/sections/migrations/0017_sectionsconfiguration_required_faculty.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2023-11-10 22:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sections', '0016_alter_sectionmembership_state'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sectionsconfiguration',
+            name='required_faculty',
+            field=models.BooleanField(blank=True, default=None, help_text='Flag if field is needed to fill in user profile: True=field is required, False=field is optional, None=field is not available', null=True, verbose_name='required faculty'),
+        ),
+    ]

fiesta/apps/sections/migrations/0018_sectionsconfiguration_required_university.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2023-11-10 23:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sections', '0017_sectionsconfiguration_required_faculty'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sectionsconfiguration',
+            name='required_university',
+            field=models.BooleanField(blank=True, default=None, help_text='Flag if field is needed to fill in user profile: True=field is required, False=field is optional, None=field is not available', null=True, verbose_name='required university'),
+        ),
+    ]

fiesta/apps/sections/models/configuration.py

@@ -13,6 +13,20 @@
 
 
 class SectionsConfiguration(BasePluginConfiguration):
+    required_university = BooleanField(
+        verbose_name=_("required university"),
+        default=None,
+        null=True,
+        blank=True,
+        help_text=FLAG_HELP_TEXT,
+    )
+    required_faculty = BooleanField(
+        verbose_name=_("required faculty"),
+        default=None,
+        null=True,
+        blank=True,
+        help_text=FLAG_HELP_TEXT,
+    )
     required_nationality = BooleanField(
         verbose_name=_("required nationality"),
         default=None,