Add limit and frontend fluff for foobar check-ins within the hour (#321)

* Add limit and frontend fluff for foobar check-ins within the hour

* Fix test, refactor to single place to set timeout

* Make black happy

stregreport/tests.py

@@ -1,7 +1,10 @@
+import datetime
+
 from django.test import TestCase
 from django.urls import reverse
 from stregreport import views
 from stregreport.models import BreadRazzia
+from freezegun import freeze_time
 
 
 class ParseIdStringTests(TestCase):
@@ -116,26 +119,27 @@ def test_bread_razzia_member_can_only_register_once(self):
         self.assertContains(response_add_2, "already checked in", status_code=200)
 
     def test_foobar_razzia_member_can_register_multiple_times(self):
-        self.client.login(username="tester", password="treotreo")
-        response = self.client.get(reverse("razzia_new_FB"), follow=True)
-        razzia_url, _ = response.redirect_chain[-1]
-
-        response_members_0 = self.client.get(razzia_url + "members", follow=True)
-
-        response_add_1 = self.client.post(razzia_url, {"username": "jokke"}, follow=True)
-
-        response_add_2 = self.client.post(razzia_url, {"username": "jokke"}, follow=True)
-
-        response_members_2 = self.client.get(razzia_url + "members", follow=True)
-
-        self.assertEqual(response_add_1.status_code, 200)
-        self.assertEqual(response_add_2.status_code, 200)
-        self.assertTemplateUsed(response_add_1, "admin/stregsystem/razzia/foobar.html")
-        self.assertTemplateUsed(response_add_2, "admin/stregsystem/razzia/foobar.html")
-        self.assertNotContains(response_add_1, "last checked in at", status_code=200)
-        self.assertContains(response_add_2, "last checked in at", status_code=200)
-        self.assertContains(response_members_0, "0 fember(s)", status_code=200)
-        self.assertContains(response_members_2, "2 fember(s)", status_code=200)
+        with freeze_time() as frozen_datetime:
+            self.client.login(username="tester", password="treotreo")
+            response = self.client.get(reverse("razzia_new_FB"), follow=True)
+            razzia_url, _ = response.redirect_chain[-1]
+
+            response_members_0 = self.client.get(razzia_url + "members", follow=True)
+
+            response_add_1 = self.client.post(razzia_url, {"username": "jokke"}, follow=True)
+            frozen_datetime.tick(delta=datetime.timedelta(hours=1, minutes=1))
+            response_add_2 = self.client.post(razzia_url, {"username": "jokke"}, follow=True)
+
+            response_members_2 = self.client.get(razzia_url + "members", follow=True)
+
+            self.assertEqual(response_add_1.status_code, 200)
+            self.assertEqual(response_add_2.status_code, 200)
+            self.assertTemplateUsed(response_add_1, "admin/stregsystem/razzia/foobar.html")
+            self.assertTemplateUsed(response_add_2, "admin/stregsystem/razzia/foobar.html")
+            self.assertNotContains(response_add_1, "last checked in at", status_code=200)
+            self.assertContains(response_add_2, "last checked in at", status_code=200)
+            self.assertContains(response_members_0, "0 fember(s)", status_code=200)
+            self.assertContains(response_members_2, "2 fember(s)", status_code=200)
 
     def test_razzia_registered_member_is_in_member_list(self):
         self.client.login(username="tester", password="treotreo")

stregreport/views.py

@@ -58,10 +58,18 @@ def razzia_view_single(request, razzia_id, queryname, razzia_type=BreadRazzia.BR
         if len(result) > 0:
             member = result[0]
             entries = list(razzia.razziaentry_set.filter(member__pk=member.pk).order_by('-time'))
-            already_used = len(entries) > 0
-            if already_used:
-                entry = entries[0]
-            if not already_used or razzia_type == BreadRazzia.FOOBAR:
+            already_checked_in = len(entries) > 0
+            wait_time = datetime.timedelta(minutes=30)
+            if already_checked_in:
+                last_entry = entries[0]
+                within_wait = last_entry.time > timezone.now() - wait_time
+            # if member has already checked in within the last hour, don't allow another check in
+            if already_checked_in and within_wait and razzia_type == BreadRazzia.FOOBAR:
+                drunkard = True
+                # time until next check in is legal
+                remaining_time_secs = int(((last_entry.time + wait_time) - timezone.now()).total_seconds() % 60)
+                remaining_time_mins = int(((last_entry.time + wait_time) - timezone.now()).total_seconds() // 60)
+            if not already_checked_in or (razzia_type == BreadRazzia.FOOBAR and not within_wait):
                 RazziaEntry(member=member, razzia=razzia).save()
 
     templates = {

stregsystem/templates/admin/stregsystem/razzia/bread.html

@@ -4,7 +4,7 @@
 
 {% block member_present %}
 <div class="status">
-	<div class="fa {% if already_used %} fa-minus-circle failure {% else %} fa-check-circle sucess {% endif %}" aria-hidden="true"></div>
+	<div class="fa {% if already_checked_in %} fa-minus-circle failure {% else %} fa-check-circle sucess {% endif %}" aria-hidden="true"></div>
 </div>
-{{member.firstname}} {{member.lastname}} ({{member.username}}) {% if already_used %} already checked in at {{ entry.time }} {% endif %}
+{{member.firstname}} {{member.lastname}} ({{member.username}}) {% if already_checked_in %} already checked in at {{ last_entry.time }} {% endif %}
 {% endblock %}

stregsystem/templates/admin/stregsystem/razzia/foobar.html

@@ -4,7 +4,31 @@
 
 {% block member_present %}
 <div class="status">
-	<div class="fa {% if already_used %} fa-exclamation-circle sucess {% else %} fa-check-circle sucess {% endif %}" aria-hidden="true"></div>
+    {% if drunkard %}
+            <script>
+                // fade/flash background color to more easily notify foobar crew
+                let ofs = 0;
+                let el = document.body;
+                window.setInterval(function(){
+                  el.style.background = 'rgba(255,255,0,'+Math.abs(Math.sin(ofs))+')';
+                  ofs += 0.02;
+                }, 10);
+            </script>
+        <div class="fa fa-exclamation-triangle failure" aria-hidden="true"></div>
+	{% else %}
+        <div class="fa {% if already_used %} fa-exclamation-circle sucess {% else %} fa-check-circle sucess {% endif %}" aria-hidden="true"></div>
+    {% endif %}
 </div>
-{{member.firstname}} {{member.lastname}} ({{member.username}}) {% if already_used %} last checked in at {{entry.time}} {% endif %}
+{% if drunkard %}
+    {{member.firstname}} {{member.lastname}} ({{member.username}}) <b>wait {{ remaining_time_mins }}m {{ remaining_time_secs }}s </b> before next free beer
+{% else %}
+    {{member.firstname}} {{member.lastname}} ({{member.username}}) {% if already_checked_in %} last checked in at {{last_entry.time}} {% endif %}
+{% endif %}
+
+{% endblock %}
+
+{% block drunkard_present %}
+    fa-exclamation-triangle
+    {% if drunkard %} checked in within the previous hour, wait {{ remaining_time }}{% endif %}
 {% endblock %}
+