Shift selling rebased version of #882

src/teams/migrations/0064_teamshiftassignment_teamshift_team_members_new.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.21 on 2025-06-09 15:29
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teams', '0063_alter_team_member_group'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TeamShiftAssignment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('updated', models.DateTimeField(auto_now=True)),
+                ('for_sale', models.BooleanField(default=False, help_text='Is the shift assignment for sale?')),
+                ('team_member', models.ForeignKey(help_text='The team member on shift', on_delete=django.db.models.deletion.CASCADE, to='teams.teammember')),
+                ('team_shift', models.ForeignKey(help_text='The shift', on_delete=django.db.models.deletion.CASCADE, to='teams.teamshift')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='teamshift',
+            name='team_members_new',
+            field=models.ManyToManyField(blank=True, related_name='team_members_new', through='teams.TeamShiftAssignment', to='teams.teammember'),
+        ),
+    ]

src/teams/migrations/0065_teamshiftassignment_migrate_data.py

@@ -0,0 +1,19 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+def migrate_assignments(apps, schema_editor):
+    TeamShift = apps.get_model("teams", "TeamShift")
+    for teamshift in TeamShift.objects.all():
+        members = teamshift.team_members.all()
+        teamshift.team_members_new.set(members)
+        teamshift.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teams', '0064_teamshiftassignment_teamshift_team_members_new'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_assignments),
+    ]

src/teams/migrations/0066_remove_teamshift_team_members.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.21 on 2025-06-09 15:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teams', '0065_teamshiftassignment_migrate_data'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='teamshift',
+            name='team_members',
+        ),
+    ]

src/teams/migrations/0067_rename_team_members_new_teamshift_team_members.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.21 on 2025-06-09 15:38
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teams', '0066_remove_teamshift_team_members'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='teamshift',
+            old_name='team_members_new',
+            new_name='team_members',
+        ),
+    ]

src/teams/migrations/0068_alter_teamshift_team_members.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.21 on 2025-06-09 15:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teams', '0067_rename_team_members_new_teamshift_team_members'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='teamshift',
+            name='team_members',
+            field=models.ManyToManyField(blank=True, through='teams.TeamShiftAssignment', to='teams.teammember'),
+        ),
+    ]

src/teams/models.py

@@ -548,6 +548,31 @@ class TaskComment(
     comment = models.TextField()
 
 
+class TeamShiftAssignment(CampRelatedModel):
+    """Model for storing the for_sale state of the shift assignment."""
+    team_shift = models.ForeignKey(
+        "teams.TeamShift",
+        on_delete=models.CASCADE,
+        help_text="The shift",
+    )
+
+    team_member = models.ForeignKey(
+        "teams.TeamMember",
+        on_delete=models.CASCADE,
+        help_text="The team member on shift",
+    )
+
+    for_sale = models.BooleanField(
+        default=False,
+        help_text="Is the shift assignment for sale?",
+    )
+
+    @property
+    def camp(self) -> Camp:
+        """All CampRelatedModels must have a camp FK or a camp property."""
+        return self.team_shift.camp
+
+
 class TeamShift(ExportModelOperationsMixin("team_shift"), CampRelatedModel):
     """Model for team shifts."""
     class Meta:
@@ -563,7 +588,7 @@ class Meta:
 
     shift_range = DateTimeRangeField()
 
-    team_members = models.ManyToManyField(TeamMember, blank=True)
+    team_members = models.ManyToManyField("teams.TeamMember", blank=True, through=TeamShiftAssignment)
 
     people_required = models.IntegerField(default=1)
 
@@ -582,3 +607,8 @@ def __str__(self) -> str:
     def users(self) -> list[TeamMember]:
         """Returns a list of team members on this shift."""
         return [member.user for member in self.team_members.all()]
+
+    @property
+    def for_sale_count(self) -> int:
+        """Returns a count of shifts for sale."""
+        return self.team_members.filter(teamshiftassignment__for_sale=False).count 

src/teams/templates/team_shift_list.html

@@ -55,11 +55,11 @@ <h4>
             {{ shift.shift_range.upper|date:'H:i' }}
           </td>
           <td>
-            {{ shift.people_required }}
+            {{ shift.team_members.count }} of {{ shift.people_required }} assigned 
           </td>
           <td>
-            {% for member in shift.team_members.all %}
-              {{ member.user.profile.get_public_credit_name }}{% if not forloop.last %},{% endif %}
+            {% for member in shift.teamshiftassignment_set.all %}
+              {{ member.team_member.user.profile.get_public_credit_name }}{% if member.for_sale %} <em>(for sale!)</em>{% endif %}{% if not forloop.last %},{% endif %} 
             {% empty %}
               None!
             {% endfor %}
@@ -80,7 +80,11 @@ <h4>
                  href="{% url 'teams:shift_member_drop' camp_slug=camp.slug team_slug=team.slug pk=shift.pk %}">
                 <i class="fas fa-thumbs-down"></i> Unassign me
               </a>
-            {% elif shift.people_required > shift.team_members.count %}
+              <a class="btn btn-warning"
+                 href="{% url 'teams:shift_member_sell' camp_slug=camp.slug team_slug=team.slug pk=shift.pk %}">
+                  <i class="fas fa-thumbs-down"></i> Mark for sale 
+              </a>
+            {% elif shift.people_required > shift.for_sale_count %} 
               <a class="btn btn-success"
                  href="{% url 'teams:shift_member_take' camp_slug=camp.slug team_slug=team.slug pk=shift.pk %}">
                 <i class="fas fa-thumbs-up"></i> Assign me

src/teams/templates/team_user_shifts.html

@@ -33,10 +33,14 @@ <h4>
           </td>
           <td>
             {{ shift.shift_range.upper|date:'H:i' }}
-          </td>
-          <td>
-            <a class="btn btn-danger"
-               href="{% url 'teams:shift_member_drop' camp_slug=camp.slug team_slug=shift.team.slug pk=shift.pk %}">
+        </td>
+	<td>
+          <a class="btn btn-warning"
+             href="{% url 'teams:shift_member_sell' camp_slug=camp.slug team_slug=shift.team.slug pk=shift.pk %}">
+              <i class="fas fa-thumbs-down"></i> Sell shift
+        <td>
+          <a class="btn btn-danger"
+             href="{% url 'teams:shift_member_drop' camp_slug=camp.slug team_slug=shift.team.slug pk=shift.pk %}">
               <i class="fas fa-thumbs-down"></i> Unassign me
             </a>
           </td>

src/teams/tests/test_shift_views.py

@@ -209,6 +209,7 @@ def test_team_shift_actions(self) -> None:
         )
         team_shift_2.save()
 
+        # Test taking a shift
         url = reverse("teams:shift_member_take", kwargs={
             "team_slug": team_shift_1.team.slug,
             "camp_slug": self.camp.slug,
@@ -225,6 +226,7 @@ def test_team_shift_actions(self) -> None:
         matches = [s for s in rows if "Unassign me" in str(s)]
         self.assertEqual(len(matches), 1, "team shift assign failed")
 
+        # Test taking a double shift
         url = reverse("teams:shift_member_take", kwargs={
             "team_slug": team_shift_1.team.slug,
             "camp_slug": self.camp.slug,
@@ -241,6 +243,42 @@ def test_team_shift_actions(self) -> None:
         matches = [s for s in rows if "overlapping" in str(s)]
         self.assertEqual(len(matches), 1, "team shift double assign failed to fail")
 
+        # Test selling a shift 
+        url = reverse("teams:shift_member_sell", kwargs={
+            "team_slug": team_shift_1.team.slug,
+            "camp_slug": self.camp.slug,
+            "pk": team_shift_1.pk,
+        })
+        response = self.client.get(
+            path=url,
+            follow=True,
+        )
+        assert response.status_code == 200
+        content = response.content.decode()
+        soup = BeautifulSoup(content, "html.parser")
+        rows = soup.select_one("table#main_table > tbody > tr:nth-of-type(1) td:nth-of-type(4)")
+        matches = [s for s in rows if "for sale!" in str(s)]
+        self.assertEqual(len(matches), 1, "team shift sell failed")
+
+        # Test taking a sellable shift with user1
+        self.client.force_login(self.users[1]) # Noc team member
+        url = reverse("teams:shift_member_take", kwargs={
+            "team_slug": team_shift_1.team.slug,
+            "camp_slug": self.camp.slug,
+            "pk": team_shift_1.pk,
+        })
+        response = self.client.get(
+            path=url,
+            follow=True,
+        )
+        assert response.status_code == 200
+        content = response.content.decode()
+        soup = BeautifulSoup(content, "html.parser")
+        rows = soup.select_one("table#main_table > tbody > tr:nth-of-type(1) td:nth-of-type(5)")
+        matches = [s for s in rows if "Unassign me" in str(s)]
+        self.assertEqual(len(matches), 1, "team shift assign failed")
+
+        # Test dropping a shift 
         url = reverse("teams:shift_member_drop", kwargs={
             "team_slug": team_shift_1.team.slug,
             "camp_slug": self.camp.slug,

src/teams/urls.py

@@ -20,6 +20,7 @@
 from teams.views.members import TeamMemberRemoveView
 from teams.views.members import TeamMembersView
 from teams.views.shifts import MemberDropsShift
+from teams.views.shifts import MemberSellsShift 
 from teams.views.shifts import MemberTakesShift
 from teams.views.shifts import ShiftCreateMultipleView
 from teams.views.shifts import ShiftCreateView
@@ -176,6 +177,11 @@
                                             MemberDropsShift.as_view(),
                                             name="shift_member_drop",
                                         ),
+                                        path(
+                                            "sell",
+                                            MemberSellsShift.as_view(),
+                                            name="shift_member_sell",
+                                        ),
                                     ],
                                 ),
                             ),

src/teams/views/shifts.py

@@ -26,6 +26,7 @@
 from teams.models import Team
 from teams.models import TeamMember
 from teams.models import TeamShift
+from teams.models import TeamShiftAssignment
 from utils.mixins import IsTeamPermContextMixin
 
 from .mixins import EnsureTeamLeadMixin
@@ -333,6 +334,9 @@ def get(self, request: HttpRequest, **kwargs) -> HttpResponseRedirect:
                 template.render(Context({"shifts": overlapping_shifts})),
             )
         else:
+            # Remove at most one shift assignment for sale
+            for shift_assignment in shift.team_members.filter(teamshiftassignment__for_sale=True)[:1]:
+                shift.team_members.remove(shift_assignment)
             shift.team_members.add(team_member)
 
         kwargs.pop("pk")
@@ -357,6 +361,23 @@ def get(self, request: HttpRequest, **kwargs) -> HttpResponseRedirect:
 
         return HttpResponseRedirect(reverse("teams:shifts", kwargs=kwargs))
 
+class MemberSellsShift(LoginRequiredMixin, CampViewMixin, View):
+
+    http_methods = ["get"]
+
+    def get(self, request, **kwargs):
+        shift = TeamShift.objects.get(id=kwargs["pk"])
+        team = Team.objects.get(camp=self.camp, slug=kwargs["team_slug"])
+
+        team_member = TeamMember.objects.get(team=team, user=request.user)
+
+        shift_assignment = TeamShiftAssignment.objects.get(team_member = team_member, team_shift = shift)
+        shift_assignment.for_sale = True
+        shift_assignment.save()
+
+        kwargs.pop("pk")
+
+        return HttpResponseRedirect(reverse("teams:shifts", kwargs=kwargs))
 
 class UserShifts(CampViewMixin, TemplateView):
     """View for showing shifts for current user."""

src/utils/bootstrap/base.py

@@ -2177,6 +2177,7 @@ def bootstrap_tests(self) -> None:
 
         self.camp = self.camps[1][0]
         self.add_team_permissions(self.camp)
+        self.camp.activate_team_permissions()
         self.teams = teams[self.camp.camp.lower.year]
         for member in TeamMember.objects.filter(team__camp=self.camp):
             member.save()