Merge branch 'develop' into flag_cv

polmf · web-flow · commit 828a7e9b299c · 2025-10-22T20:33:12.000-04:00
diff --git a/applications/models/hacker.py b/applications/models/hacker.py
@@ -88,11 +88,16 @@ def annotate_vote(cls, qs):
         return qs.annotate(vote_avg=Avg("vote__calculated_vote"))
 
     def invalidate(self):
+        """
+        Marks the application as invalid, but only if its current status is "dubious".
+        Also, if the user has a team, it deletes it.
+        """
         if self.status != APP_DUBIOUS:
-            raise ValidationError(
-                "Applications can only be marked as invalid if they are dubious first"
-            )
-        self.status = APP_INVALID
+            raise ValidationError('Applications can only be marked as invalid if they are dubious first')
+        self.status = APP_INVALID    
+        team = getattr(self.user, 'team', None) 
+        if team:
+            team.delete()         
         self.save()
 
     def set_dubious(self):
@@ -125,6 +130,10 @@ def set_contacted(self, user):
             self.save()
 
     def confirm_blacklist(self, user, motive_of_ban):
+        """
+        Confirms the application as blacklisted, but only if its current status is "APP_BLACKLISTED".
+        Also, if the user has a team, it deletes it.
+        """
         if self.status != APP_BLACKLISTED:
             raise ValidationError(
                 "Applications can only be confirmed as blacklisted if they are blacklisted first"
@@ -137,6 +146,9 @@ def confirm_blacklist(self, user, motive_of_ban):
                 self.user, motive_of_ban
             )
         blacklist_user.save()
+        team = getattr(self.user, 'team', None) 
+        if team:
+            team.delete()
         self.save()
 
     def set_blacklist(self):
diff --git a/meals/templates/meal_checkin.html b/meals/templates/meal_checkin.html
@@ -45,33 +45,36 @@ <h1 style="font-size: larger">{{ meal_name }}</h1>
 
         <video id="qr-video" style="width: 100%; height: 100%; "></video>
         <script nonce="{{ request.csp_nonce }}">
-          // set timer bool
-          isReady = true;
+          let isReady = true;
+          let lastScannedQR = null;
+          let lastScanTime = 0;
 
-          // Load qr video and add function to execute when scans a qr
           document.addEventListener('DOMContentLoaded', () => {
             let scanner = new Scanner('qr-video', (content) => {
-              if (content.data && isReady) {
-                SuperScan('{% url 'cool_meals_api' %}', content.data, scanner)
+              const now = Date.now();
+
+              if (now - lastScanTime > 10000) {
+                lastScannedQR = null;
+              }
+
+              if (content.data && isReady && content.data !== lastScannedQR) {
+                lastScannedQR = content.data;
+                lastScanTime = now;
+                SuperScan('{% url 'cool_meals_api' %}', content.data, scanner);
                 isReady = false;
-                setTimeout(()=>{
+                setTimeout(() => {
                   isReady = true;
-                }, 1000)
+                }, 1000);
+              } else if (content.data === lastScannedQR) {
+                console.log("Duplicate QR detected (ignored): " + content.data);
               }
-              console.log("SCANED: "+ content.data);
+              console.log("SCANNED: " + content.data);
             }, {
               popup: false,
-            })
+            });
             scanner.show();
-            // $('.scan-again').click(() => {
-              // scanner.show()
-              // document.getElementById('no').style.display = "none";
-              //document.getElementById('success').style.display = "none";
-            // })
-          })
+          });
 
-
-          // Core function to send data to meals API
           function SuperScan(theUrl, content, scanner) {
             $.ajax({
               type: "POST",
@@ -89,37 +92,22 @@ <h1 style="font-size: larger">{{ meal_name }}</h1>
                   document.getElementById('deny').innerHTML = "Something went wrong.";
                 }
 
-                if (data.success == true) { // 200 ok means can eat
-                  // show success alert
-
+                if (data.success == true) {
                   $('#success').fadeOut("fast");
                   $('#success').fadeIn("fast");
-                  // Display user's diet
-
-                  // console.log(data.responseText.diet);
                   document.getElementById('succ').innerHTML = "User allowed to entry <br> Diet: <b>" + data.diet + "</b>";
-                  // hide no pass alert
                   document.getElementById('no').style.display = "none";
-
-                } else { // else, (may be 400). Has already eatern.
-                  // hide success alert
+                } else {
                   document.getElementById('success').style.display = "none";
-
                   document.getElementById('deny').innerHTML = data.error;
-                  // show no pass alert
                   $('#no').fadeOut("fast");
                   $('#no').fadeIn("fast");
-                  // hide alert after time desired.
-
                 }
               }
-
-
             });
           }
-
-
         </script>
+
       </div>
 
     </div>
diff --git a/teams/forms.py b/teams/forms.py
@@ -6,26 +6,48 @@
 
 
 class JoinTeamForm(forms.ModelForm):
+    """
+    Form for joining an existing team.
+    Validates that the team exists and that it is not full.
+    If the team does not exist, it raises a validation error.
+    If the team is full, it raises a validation error.
+    """
+
     def clean_team_code(self):
-        team_code = self.cleaned_data['team_code']
+        team_code = self.cleaned_data["team_code"]
         teammates = Team.objects.filter(team_code=team_code).count()
         if teammates == 0:
-            raise forms.ValidationError("No team exists with the current code. Did you want to create a team instead?")
-        max_teammates = getattr(settings, 'HACKATHON_MAX_TEAMMATES', 4)
+            raise forms.ValidationError(
+                "No team exists with the current code. Did you want to create a team instead?"
+            )
+        max_teammates = getattr(settings, "HACKATHON_MAX_TEAMMATES", 4)
         if teammates == max_teammates:
-            raise forms.ValidationError("Full team. Max teammates is %d" % max_teammates)
-        if Team.objects.filter(team_code=team_code).exclude(
-                user__hackerapplication_application__status__in=[APP_PENDING, APP_LAST_REMIDER, APP_DUBIOUS]).exists():
-            raise forms.ValidationError("Some members of this team are accepted or cancelled. You can't join their "
-                                        "team here but don't worry you still can join them on the event.")
+            raise forms.ValidationError(
+                "Full team. Max teammates is %d" % max_teammates
+            )
+        if (
+            Team.objects.filter(team_code=team_code)
+            .exclude(
+                user__hackerapplication_application__status__in=[
+                    APP_PENDING,
+                    APP_LAST_REMIDER,
+                    APP_DUBIOUS,
+                ]
+            )
+            .exists()
+        ):
+            raise forms.ValidationError(
+                "Some members of this team are accepted or cancelled. You can't join their "
+                "team here but don't worry you still can join them on the event."
+            )
         return team_code
 
     class Meta:
         model = Team
-        exclude = ['user', ]
-        labels = {
-            'team_code': 'Your team code'
-        }
+        exclude = [
+            "user",
+        ]
+        labels = {"team_code": "Your team code"}
         help_texts = {
-            'team_code': 'Paste here the team code that your teammate has sent you'
+            "team_code": "Paste here the team code that your teammate has sent you"
         }
diff --git a/teams/migrations/0002_alter_team_team_code.py b/teams/migrations/0002_alter_team_team_code.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.23 on 2025-09-26 17:46
+
+from django.db import migrations, models
+import teams.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teams', '0001_teams'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='team',
+            name='team_code',
+            field=models.CharField(default=teams.models.generate_team_id, max_length=36),
+        ),
+    ]
diff --git a/teams/models.py b/teams/models.py
@@ -1,22 +1,23 @@
-import random
-
+import uuid
 from django.db import models
-
 from user.models import User
 
-TEAM_ID_LENGTH = 13
+MAX_LENGTH_TEAM_CODE = 36
 
 
 def generate_team_id():
-    s = "abcdefghijklmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    while True:
-        team_id = "".join(random.sample(s, TEAM_ID_LENGTH))
-        if not Team.objects.filter(team_code=team_id).exists():
-            return team_id
+    return str(uuid.uuid4())
 
 
 class Team(models.Model):
-    team_code = models.CharField(default=generate_team_id, max_length=TEAM_ID_LENGTH)
+    """
+    This model represents a team of hackers. For each hacker in a team, there is one entry
+    in this table with the same team_code. The user field is a foreign key to the user
+    """
+
+    team_code = models.CharField(
+        default=generate_team_id, max_length=MAX_LENGTH_TEAM_CODE
+    )
     user = models.OneToOneField(User, on_delete=models.CASCADE)
 
     class Meta:
diff --git a/teams/views.py b/teams/views.py
@@ -10,52 +10,65 @@
 
 
 class HackerTeam(IsHackerMixin, TabsView):
-    template_name = 'team.html'
+    """
+    View for hackers to manage their team.
+    Hackers can create a new team, join an existing team or leave their current team,
+    by making a POST request with theappropriate action.
+    """
+
+    template_name = "team.html"
 
     def get_current_tabs(self):
         return hacker_tabs(self.request.user)
 
     def get_context_data(self, **kwargs):
         c = super(HackerTeam, self).get_context_data(**kwargs)
-        team = getattr(self.request.user, 'team', None)
-        app = getattr(self.request.user, 'hackerapplication_application', None)
+        team = getattr(self.request.user, "team", None)
+        app = getattr(self.request.user, "hackerapplication_application", None)
         teammates = []
         if team:
-            teammates = models.Team.objects.filter(team_code=team.team_code) \
-                .values('user__name', 'user__email', 'user__hackerapplication_application')
-            teammates = list(map(lambda x:
-                                 {'name': x['user__name'], 'email': x['user__email'],
-                                  'app': x['user__hackerapplication_application']},
-                                 teammates))
+            teammates = models.Team.objects.filter(team_code=team.team_code).values(
+                "user__name", "user__email", "user__hackerapplication_application"
+            )
+            teammates = list(
+                map(
+                    lambda x: {
+                        "name": x["user__name"],
+                        "email": x["user__email"],
+                        "app": x["user__hackerapplication_application"],
+                    },
+                    teammates,
+                )
+            )
         instance = models.Team()
-        instance.team_code = ''
+        instance.team_code = ""
         form = forms.JoinTeamForm(instance=instance)
-        c.update({'team': team, 'teammates': teammates, 'app': app, 'form': form})
+        c.update({"team": team, "teammates": teammates, "app": app, "form": form})
         return c
 
     def post(self, request, *args, **kwargs):
 
-        if request.POST.get('create', None):
+        if request.POST.get("create", None):
             team = models.Team()
             team.user = request.user
             team.save()
-            return HttpResponseRedirect(reverse('teams'))
-        if request.POST.get('leave', None):
-            team = getattr(request.user, 'team', None)
+            return HttpResponseRedirect(reverse("teams"))
+        if request.POST.get("leave", None):
+            team = getattr(request.user, "team", None)
             if team:
                 team.delete()
-            return HttpResponseRedirect(reverse('teams'))
+            return HttpResponseRedirect(reverse("teams"))
         else:
             form = forms.JoinTeamForm(request.POST, request.FILES)
             if form.is_valid():
                 team = form.save(commit=False)
                 team.user = request.user
                 team.save()
 
-                messages.success(request, 'Team joined successfully!')
+                messages.success(request, "Team joined successfully!")
 
-                return HttpResponseRedirect(reverse('teams'))
+                return HttpResponseRedirect(reverse("teams"))
             else:
                 c = self.get_context_data()
-                c.update({'form': form})
+                c.update({"form": form})
                 return render(request, self.template_name, c)
