Let team leads pull in applicants who picked no team (#403)

Volunteers who applied without choosing a team were invisible to leads (no team
roster lists them). Surface them on each team dashboard as "Applicants without a
team", and let a lead (or admin) add one to their team with a button.

- TeamDashboardView exposes unassigned_applicants (pending, no team, same
  edition).
- AddApplicantToTeamView (scoped by TeamLeadRequiredMixin) attaches a genuinely
  unassigned, pending, same-edition applicant to the team's pending roster; the
  normal approval still applies.

575 tests pass, 100% coverage; lint clean.

Author: Mariatta

portal/urls.py

@@ -82,6 +82,11 @@
         volunteer_view.TeamDashboardView.as_view(),
         name="team_dashboard",
     ),
+    path(
+        "teams/<int:pk>/applicants/<int:profile_pk>/add/",
+        volunteer_view.AddApplicantToTeamView.as_view(),
+        name="team_add_applicant",
+    ),
     path(
         "teams/<int:pk>/edit/",
         volunteer_view.TeamUpdate.as_view(),

templates/team/team_dashboard.html

@@ -196,6 +196,63 @@ <h3 class="h5 mt-4" id="approved">
                 </p>
             {% endif %}
         </div>
+        {# Applicants who applied without a team: leads can pull one onto their #}
+        {# team. Outside the roster filter (they are not team members yet). #}
+        {% if can_manage_members and unassigned_applicants %}
+            <div class="mt-5">
+                <h3 class="h5">
+                    <i class="fa-solid fa-user-plus text-primary"></i>
+                    {% trans "Applicants without a team" %}
+                    <span class="badge bg-primary rounded-pill">{{ unassigned_applicants.count }}</span>
+                </h3>
+                <p class="small text-secondary">
+                    {% trans "These volunteers applied but no team has picked them up yet. Add anyone who'd be a fit for yours." %}
+                </p>
+                <div class="table-responsive">
+                    <table class="table table-hover table-sm align-middle">
+                        <thead class="table-light">
+                            <tr>
+                                <th>
+                                    {% trans "Volunteer" %}
+                                </th>
+                                <th>
+                                    {% trans "Region" %}
+                                </th>
+                                <th>
+                                    {% trans "Discord" %}
+                                </th>
+                                <th>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for applicant in unassigned_applicants %}
+                                <tr>
+                                    <td>
+                                        {{ applicant.user.get_full_name|default:applicant.user.username }}
+                                    </td>
+                                    <td>
+                                        {{ applicant.region|default:"-" }}
+                                    </td>
+                                    <td>
+                                        {{ applicant.discord_username|default:"-" }}
+                                    </td>
+                                    <td>
+                                        <form method="post"
+                                              action="{% url 'team_add_applicant' team.id applicant.id %}">
+                                            {% csrf_token %}
+                                            <button type="submit" class="btn btn-sm btn-outline-primary">
+                                                <i class="fa-solid fa-plus"></i> {% trans "Add to team" %}
+                                            </button>
+                                        </form>
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        {% endif %}
         <script>
         (function () {
             var buttons = document.querySelectorAll(".js-roster-filter");

tests/volunteer/test_views.py

@@ -1669,6 +1669,148 @@ def test_lead_dashboard_rail_lists_only_their_teams(
         assert "OtherTeam" not in response.content.decode()
 
 
+@pytest.mark.django_db
+class TestUnassignedApplicants:
+    """Leads can see, and pull in, applicants who picked no team."""
+
+    def _lead_team(self, portal_user, conference):
+        team = Team.objects.create(
+            short_name="Comms", description="d", conference=conference
+        )
+        lead = VolunteerProfile.objects.create(
+            user=portal_user,
+            conference=conference,
+            application_status=ApplicationStatus.APPROVED,
+        )
+        team.team_leads.add(lead)
+        return team
+
+    def _applicant(self, django_user_model, username, conference, **kwargs):
+        return VolunteerProfile.objects.create(
+            user=django_user_model.objects.create_user(username),
+            conference=conference,
+            application_status=kwargs.get("status", ApplicationStatus.PENDING),
+        )
+
+    def test_lead_sees_unassigned_applicants(
+        self, client, portal_user, conference, django_user_model
+    ):
+        team = self._lead_team(portal_user, conference)
+        applicant = self._applicant(django_user_model, "app", conference)
+        client.force_login(portal_user)
+        response = client.get(reverse("team_dashboard", kwargs={"pk": team.pk}))
+        assert applicant in list(response.context["unassigned_applicants"])
+        content = response.content.decode()
+        assert "Applicants without a team" in content
+        assert (
+            reverse(
+                "team_add_applicant",
+                kwargs={"pk": team.pk, "profile_pk": applicant.pk},
+            )
+            in content
+        )
+
+    def test_assigned_and_nonpending_are_excluded(
+        self, client, portal_user, conference, django_user_model
+    ):
+        team = self._lead_team(portal_user, conference)
+        other = Team.objects.create(
+            short_name="Other", description="d", conference=conference
+        )
+        assigned = self._applicant(django_user_model, "assigned", conference)
+        assigned.teams.add(other)
+        approved = self._applicant(
+            django_user_model,
+            "appr",
+            conference,
+            status=ApplicationStatus.APPROVED,
+        )
+        client.force_login(portal_user)
+        unassigned = list(
+            client.get(reverse("team_dashboard", kwargs={"pk": team.pk})).context[
+                "unassigned_applicants"
+            ]
+        )
+        assert assigned not in unassigned  # already on a team
+        assert approved not in unassigned  # not pending
+
+    def test_lead_can_add_applicant_to_their_team(
+        self, client, portal_user, conference, django_user_model
+    ):
+        team = self._lead_team(portal_user, conference)
+        applicant = self._applicant(django_user_model, "app", conference)
+        client.force_login(portal_user)
+        response = client.post(
+            reverse(
+                "team_add_applicant",
+                kwargs={"pk": team.pk, "profile_pk": applicant.pk},
+            )
+        )
+        assertRedirects(response, reverse("team_dashboard", kwargs={"pk": team.pk}))
+        assert team in applicant.teams.all()
+        # ...and now shows in the team's pending roster.
+        assert applicant in Team.objects.get(pk=team.pk).pending_members
+
+    def test_non_lead_cannot_add(
+        self, client, portal_user, conference, django_user_model
+    ):
+        team = Team.objects.create(
+            short_name="Comms", description="d", conference=conference
+        )
+        applicant = self._applicant(django_user_model, "app", conference)
+        client.force_login(portal_user)  # not a lead of this team
+        response = client.post(
+            reverse(
+                "team_add_applicant",
+                kwargs={"pk": team.pk, "profile_pk": applicant.pk},
+            )
+        )
+        assert response.status_code in (302, 403)
+        assert applicant.teams.count() == 0
+
+    def test_add_rejects_already_assigned_applicant(
+        self, client, admin_user, conference, django_user_model
+    ):
+        team = Team.objects.create(
+            short_name="Comms", description="d", conference=conference
+        )
+        other = Team.objects.create(
+            short_name="Other", description="d", conference=conference
+        )
+        applicant = self._applicant(django_user_model, "app", conference)
+        applicant.teams.add(other)
+        client.force_login(admin_user)
+        client.post(
+            reverse(
+                "team_add_applicant",
+                kwargs={"pk": team.pk, "profile_pk": applicant.pk},
+            )
+        )
+        assert list(applicant.teams.all()) == [other]  # unchanged
+
+    def test_add_missing_applicant_warns(self, client, admin_user, conference):
+        team = Team.objects.create(
+            short_name="Comms", description="d", conference=conference
+        )
+        client.force_login(admin_user)
+        response = client.post(
+            reverse("team_add_applicant", kwargs={"pk": team.pk, "profile_pk": 99999})
+        )
+        assertRedirects(response, reverse("team_dashboard", kwargs={"pk": team.pk}))
+
+    def test_add_missing_team_redirects(
+        self, client, admin_user, conference, django_user_model
+    ):
+        applicant = self._applicant(django_user_model, "app", conference)
+        client.force_login(admin_user)
+        response = client.post(
+            reverse(
+                "team_add_applicant", kwargs={"pk": 99999, "profile_pk": applicant.pk}
+            )
+        )
+        assertRedirects(response, reverse("teams"))
+
+
 @pytest.mark.django_db
 class TestMyTeams:
     def _lead(self, user, conference):

volunteer/views.py

@@ -485,13 +485,56 @@ def get_context_data(self, **kwargs):
             is_admin or team.team_leads.filter(user=user).exists()
         )
 
+        # Applicants who applied to this edition without picking a team. A lead
+        # can pull one onto their team; no other roster surfaces them.
+        context["unassigned_applicants"] = (
+            VolunteerProfile.objects.filter(
+                conference=team.conference,
+                application_status=ApplicationStatus.PENDING,
+                teams__isnull=True,
+            )
+            .select_related("user")
+            .order_by("user__username")
+        )
+
         # Teams rail (Stage B): sibling teams in this edition the user may open,
         # with the current team highlighted.
         context["sidebar_teams"] = sidebar_teams_for(user, team.conference)
         context["sidebar_current_team_id"] = team.id
         return context
 
 
+class AddApplicantToTeamView(TeamLeadRequiredMixin, View):
+    """Let a lead (or admin) pull an unassigned applicant onto their team.
+
+    Scoped by ``TeamLeadRequiredMixin`` to the team in the URL. Only a genuinely
+    unassigned, pending applicant from the same edition can be added; they join
+    the team's pending roster and still go through the normal approval.
+    """
+
+    def post(self, request, pk, profile_pk):
+        team = Team.objects.filter(pk=pk).first()
+        if team is None:
+            return redirect("teams")
+
+        applicant = VolunteerProfile.objects.filter(pk=profile_pk).first()
+        if (
+            applicant is None
+            or applicant.conference_id != team.conference_id
+            or applicant.application_status != ApplicationStatus.PENDING
+            or applicant.teams.exists()
+        ):
+            messages.warning(
+                request, "That volunteer is no longer available to add to this team."
+            )
+            return redirect("team_dashboard", pk=team.pk)
+
+        applicant.teams.add(team)
+        name = applicant.user.get_full_name() or applicant.user.username
+        messages.success(request, f"Added {name} to {team.short_name}.")
+        return redirect("team_dashboard", pk=team.pk)
+
+
 class MyTeamsView(LoginRequiredMixin, ListView):
     """Teams the current user leads, across every edition.