Merge 05ed152 into 883ce33

tjcsl · Oct 12, 2019 · 43d0014 · 43d0014
2 parents 883ce33 + 05ed152
commit 43d0014
Showing 1 changed file with 33 additions and 0 deletions.
diff --git a/intranet/apps/eighth/models.py b/intranet/apps/eighth/models.py
@@ -1373,6 +1373,8 @@ def add_user(
                         level="debug",
                     )
 
+                    logger.debug("Signing user %d up for single-block activity %d in block %d", user.id, self.activity.id, self.block.id)
+
                     signup = EighthSignup.objects.create_signup(
                         user=user, scheduled_activity=self, after_deadline=after_deadline, own_signup=(request is not None and user == request.user)
                     )
@@ -1397,6 +1399,14 @@ def add_user(
                             level="debug",
                         )
 
+                        logger.debug(
+                            "Switching user %d from single-block activity %d to single-block activity %d in block %d",
+                            user.id,
+                            existing_signup.scheduled_activity.activity.id,
+                            self.activity.id,
+                            self.block.id,
+                        )
+
                         existing_signup.scheduled_activity = self
                         existing_signup.after_deadline = after_deadline
                         existing_signup.was_absent = False
@@ -1431,6 +1441,14 @@ def add_user(
                             level="debug",
                         )
 
+                        logger.debug(
+                            "Switching user %d from dual-block activity %d to single-block activity %d in block %d",
+                            user.id,
+                            existing_signup.scheduled_activity.activity.id,
+                            self.activity.id,
+                            self.block.id,
+                        )
+
                         EighthSignup.objects.filter(user=user, scheduled_activity__block__in=existing_blocks).delete()
                         EighthWaitlist.objects.filter(user=user, scheduled_activity=self).delete()
                         signup = EighthSignup.objects.create_signup(
@@ -1460,6 +1478,21 @@ def add_user(
             else:
                 existing_signups = EighthSignup.objects.filter(user=user, scheduled_activity__block__in=all_blocks)
 
+                first_signup = existing_signups.first()
+                prev_sched_act = first_signup.scheduled_activity if first_signup is not None else None
+                if prev_sched_act is None:
+                    logger.debug(
+                        "Signing user %d up for double-block activity %d during block %d and its sibling", user.id, self.activity.id, self.block.id
+                    )
+                else:
+                    logger.debug(
+                        "Switching user %d from activity %d to double-block activity %d during block %d (and also its sibling)",
+                        user.id,
+                        prev_sched_act.activity.id,
+                        self.activity.id,
+                        self.block.id,
+                    )
+
                 prev_data = {}
                 for signup in existing_signups:
                     add_breadcrumb(