adjust queries and template

Author: felixrindt

ephios/core/models/events.py

@@ -546,8 +546,9 @@ def save(self, *args, **kwargs):
             # Currently, this permission does not get removed automatically.
             assign_perm("core.view_event", user_or_group=self.user, obj=self.shift.event)
 
-    @property
+    @cached_property
     def participant(self):
+        # pylint: disable=invalid-overridden-method
         return self.user.as_participant()
 
     class Meta:

ephios/core/services/matching.py

@@ -9,6 +9,8 @@
 from ephios.core.services.qualification import QualificationUniverse
 from ephios.core.signup.participants import AbstractParticipant
 
+# pylint: disable=too-many-instance-attributes too-many-locals
+
 
 @dataclasses.dataclass(unsafe_hash=True)
 class Position:
@@ -123,24 +125,25 @@ def score_pairing(
     # (similar for prefers and skill level). It can be arbitrarily big, but must be at least bigger than the sum of
     # all the other constants used in the score.
     padded_participant_count = 10 + 2 * number_of_participants
-    base_score = 1.0
+    base_score = 5.0
     preferred_value = 3.0
     max_aux_value = 2.0
     confirmed_value = 2.0
     max_skill_value = 1.0
     required_value = padded_participant_count * sum(
         (base_score, preferred_value, max_skill_value, confirmed_value, max_aux_value)
     )
-    designated_unqualified_value = required_value**2
+    designated_unqualified_value = required_value * required_value
     designated_and_qualified_value = 2 * designated_unqualified_value
-    undesignated_unqualified_value = designated_unqualified_value**2
+    undesignated_unqualified_value = designated_unqualified_value * designated_unqualified_value
 
-    is_designated = participant in position.designated_for
     # optimally, we should reject a pairing for a participant designated for another position,
     # but we don't have that info here.
+    is_designated = participant in position.designated_for
+
     is_qualified = position.required_skill <= participant.skill
 
-    if not is_designated and not is_qualified:
+    if not is_designated and (not is_qualified or position.designation_only):
         # the participant does not have some required skill
         return -undesignated_unqualified_value  # avoid matching unqualified participants
 
@@ -177,7 +180,9 @@ def match_participants_to_positions(
 ) -> Matching:
     participants = list(participants)
     positions = list(positions)
-    confirmed_participants = list(confirmed_participants) if confirmed_participants else []
+    confirmed_participants = (
+        frozenset(confirmed_participants) if confirmed_participants else frozenset()
+    )
     costs = csr_matrix(
         [
             [

ephios/plugins/complexsignup/structure.py

@@ -320,8 +320,10 @@ def _search_block(
     composed_label: Optional[str] = None,
 ):  # pylint: disable=too-many-locals
     required_here = set(required_qualifications)
-    for requirement in block.qualification_requirements.filter(everyone=True):
-        # at least one is not supported
+    for requirement in block.qualification_requirements.all():
+        if not requirement.everyone:
+            # at least one is not supported
+            raise ValueError("unsupported requirement")
         required_here |= set(requirement.qualifications.all())
 
     all_positions = []
@@ -343,11 +345,16 @@ def _search_block(
         "signup_stats": SignupStats.ZERO,
     }
     if block.is_composite():
-        for composition in block.sub_blocks.through.objects.filter(
-            composite_block=block
-        ).prefetch_related(
-            "sub_block__positions__qualifications",
-            "sub_block__qualification_requirements__qualifications",
+        for composition in (
+            block.sub_compositions.all()
+            .select_related(
+                "sub_block",
+            )
+            .prefetch_related(
+                "sub_block__positions__qualifications",
+                "sub_block__qualification_requirements__qualifications",
+                "sub_block__sub_compositions",
+            )
         ):
             positions, sub_structure = _search_block(
                 block=composition.sub_block,

ephios/plugins/complexsignup/templates/complexsignup/shift_state.html

@@ -4,7 +4,7 @@
 {% block groups %}
     {% include "complexsignup/shift_state_block.html" with current=structure flatten=False %}
     {% if matching.unpaired_participations %}
-        <div class="row">
+        <div class="row mt-3">
             <div class="col-12 order-sm-1 col-sm-auto text-body-secondary">
                 {% translate "unassigned" %}
             </div>