Disallow duplicate user email (#44)

* New placeholders * Allow one email or phone per district or pincode * transaction test * Fix assertions * Fix formatting issues * Run black only on push, not PR. See issue wearerequired/lint-action#13 * Messages UI *Alert Messages UI * Fix test * Test case and ago group
Beta-Persei · May 21, 2021 · 9eb4c59 · 9eb4c59
1 parent b680155
commit 9eb4c59
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 52 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -7,8 +7,6 @@ on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
     branches: [ master ]
-  pull_request:
-    branches: [ master ]
 
 jobs:
   black:

diff --git a/static/css/index.css b/static/css/index.css
@@ -130,7 +130,7 @@ a {
   margin: auto;
 
   width: 20em;
-  height: 40em;
+  height: 42em;
 
   padding: 1em 2em;
   padding-bottom: 0;
@@ -182,6 +182,14 @@ a {
   z-index: 1;
 }
 
+#search-form form .form-group {
+  margin-bottom: 0.5rem;
+}
+
+#search-form form .form-field:nth-of-type(2) .form-group {
+  margin-top: 0.5rem;
+}
+
 /* Search type selectors */
 #search_type-field {
   display: flex;

diff --git a/subscribers/forms.py b/subscribers/forms.py
@@ -27,9 +27,11 @@ class Meta:
             "search_type",
         ]
         widgets = {
-            "email": forms.TextInput(attrs={"placeholder": "Email"}),
-            "phone_number": forms.TextInput(attrs={"placeholder": "Phone Number"}),
-            "pincode": forms.TextInput(attrs={"placeholder": "Pincode"}),
+            "email": forms.TextInput(attrs={"placeholder": "you@example.com"}),
+            "phone_number": forms.TextInput(
+                attrs={"placeholder": "10-digit number (Optional)"}
+            ),
+            "pincode": forms.TextInput(attrs={"placeholder": "110006"}),
             "district_id": forms.Select,
         }
 
@@ -40,8 +42,8 @@ def clean(self):
         if not cleaned_data.get("email") and not cleaned_data.get("phone_number"):
             error.update(
                 {
-                    "email": "Please enter at least one out of email or phone number.",
-                    "phone_number": "Please enter at least one out of email or phone number.",
+                    "email": "Please enter either email or phone number.",
+                    "phone_number": "Please enter either email or phone number.",
                 }
             )
 
@@ -67,6 +69,52 @@ def clean(self):
                         "district_id": "Please select your district",
                     }
                 )
+
+        if cleaned_data.get("email") or cleaned_data.get("phone_number"):
+            email = cleaned_data.get("email")
+            phone_number = cleaned_data.get("phone_number")
+
+            if cleaned_data.get("pincode"):
+                if email:
+                    if Subscriber.objects.filter(
+                        email=email, pincode=cleaned_data.get("pincode")
+                    ).exists():
+                        error.update(
+                            {
+                                "pincode": "You have already subscribed at this pincode.",
+                            }
+                        )
+                elif phone_number:
+                    if Subscriber.objects.filter(
+                        phone_number=phone_number, pincode=cleaned_data.get("pincode")
+                    ).exists():
+                        error.update(
+                            {
+                                "pincode": "You have already subscribed at this pincode.",
+                            }
+                        )
+
+            if cleaned_data.get("district_id"):
+                if email:
+                    if Subscriber.objects.filter(
+                        email=email, district_id=cleaned_data.get("district_id")
+                    ).exists():
+                        error.update(
+                            {
+                                "district_id": "You have already subscribed at this district.",
+                            }
+                        )
+                elif phone_number:
+                    if Subscriber.objects.filter(
+                        phone_number=phone_number,
+                        district_id=cleaned_data.get("district_id"),
+                    ).exists():
+                        error.update(
+                            {
+                                "district_id": "You have already subscribed at this district.",
+                            }
+                        )
+
         if cleaned_data.get("pincode") and cleaned_data.get("district_id"):
             cleaned_data.pop("district_id")
 

diff --git a/subscribers/models.py b/subscribers/models.py
@@ -14,8 +14,8 @@
 from subscribers.utils import send_mail, send_whatsapp
 
 AGE_CATEGORY = [
-    (18, "18+"),
-    (45, "45+"),
+    (18, "18 and older"),
+    (45, "45 and older"),
 ]
 
 
@@ -28,10 +28,17 @@ class Subscriber(models.Model):
         validators=[MinValueValidator(100000), MaxValueValidator(999999)],
         blank=True,
         null=True,
+        help_text="Don't know your pincode? Use 'By District'",
+    )
+    district_id = models.IntegerField(
+        "district",
+        blank=True,
+        null=True,
+        help_text="Districts are based on voting districts",
     )
-    district_id = models.IntegerField("district", blank=True, null=True)
     age_limit = models.IntegerField(
         "age limit",
+        help_text="Select your age category",
         choices=AGE_CATEGORY,
         default=AGE_CATEGORY[0][0],
         null=False,
@@ -52,9 +59,13 @@ class Subscriber(models.Model):
     )
 
     def __str__(self):
+        s = []
+        if self.email:
+            s.append(str(self.email))
         if self.phone_number:
-            return str(self.phone_number)
-        return self.email
+            s.append(str(self.phone_number))
+
+        return " ".join(s)
 
     @staticmethod
     def _filter_centers(centers, age_limit):

diff --git a/subscribers/templates/subscribers/base.html b/subscribers/templates/subscribers/base.html
@@ -63,14 +63,17 @@ <h1 class="display-3">Vaccination Notifications</h1>
 
     <main>
         {% if messages %}
-            {% for message in messages %}
-                <div class="alert alert-{{ message.tags }} alert-dismissible fade show" role="alert">
-                    {{ message }}
-                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-            {% endfor %}
+            <div id="message-container" 
+                style="position: fixed; padding: 2em 1em; max-width: 32em; margin: auto; z-index: 10; bottom: 0; right: 0;">
+                {% for message in messages %}
+                    <div class="alert alert-{{ message.tags }} alert-dismissible fade show" role="alert">
+                        {{ message }}
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                {% endfor %}
+            </div>
         {% endif %}
 
         {% block content %}

diff --git a/subscribers/templates/subscribers/index.html b/subscribers/templates/subscribers/index.html
@@ -29,6 +29,10 @@
             </div>
         </div>
 
+        <div id="age_limit-field" class="form-field">
+            {{ form.age_limit|as_crispy_field }}
+        </div>
+
         <div id="email-field" class="form-field">
             {{ form.email|as_crispy_field  }}
         </div>
@@ -37,10 +41,6 @@
             {{ form.phone_number|as_crispy_field }}
         </div>
 
-        <div id="age_limit-field" class="form-field">
-            {{ form.age_limit|as_crispy_field }}
-        </div>
-
         <div id="pincode-field" class="form-field">
             {{ form.pincode|as_crispy_field }}
         </div>

diff --git a/subscribers/tests/test_forms.py b/subscribers/tests/test_forms.py
@@ -1,12 +1,12 @@
 from http import HTTPStatus
 
 from django.contrib.messages import get_messages
-from django.test import SimpleTestCase
+from django.test import TestCase
 
 from subscribers.forms import SubscriberForm
 
 
-class TestSubscriberForm(SimpleTestCase):
+class TestSubscriberForm(TestCase):
     def test_valid_form_data(self):
         valid_form_data = [
             {

diff --git a/subscribers/tests/test_models.py b/subscribers/tests/test_models.py
@@ -20,6 +20,12 @@ def setUp(self):
         self.subscriber2 = Subscriber.objects.create(
             phone_number="9999999999", district_id=1
         )
+        self.subscriber3 = Subscriber.objects.create(
+            email="foo@bar.com",
+            phone_number="9999999999",
+            pincode=222222,
+            district_id=2,
+        )
 
         self.test_centers = [
             {
@@ -149,6 +155,7 @@ def setUp(self):
     def test_str_method(self):
         self.assertEqual(str(self.subscriber1), "foo@bar.com")
         self.assertEqual(str(self.subscriber2), "+919999999999")
+        self.assertEqual(str(self.subscriber3), "foo@bar.com +919999999999")
 
     def test_filter_centers(self):
         filter_18 = Subscriber._filter_centers(self.parsed_test_centers, 18)

diff --git a/subscribers/tests/test_tasks.py.103b43e9630af265634bea6b5700d287.tmp b/subscribers/tests/test_tasks.py.103b43e9630af265634bea6b5700d287.tmp
diff --git a/subscribers/tests/test_views.py b/subscribers/tests/test_views.py
@@ -49,7 +49,7 @@ def test_subscriber_create_view_post_valid(self):
         self.assertEqual(len(messages), 1)
         self.assertEqual(
             str(messages[0]),
-            "You will be notified via email whenever a vaccinaton slot is available!",
+            "You will be notified when a vaccinaton slot is available!",
         )
 
     def test_unsubscriber_view_get(self):

diff --git a/subscribers/views.py b/subscribers/views.py
@@ -13,7 +13,7 @@ class SubscriberCreateView(SuccessMessageMixin, FormView):
 
     template_name = "subscribers/index.html"
     success_message = (
-        "You will be notified via email whenever a vaccinaton slot is available!"
+        "You will be notified when a vaccinaton slot is available!"
     )
     success_url = "/"
 
@@ -38,7 +38,7 @@ def unsubscribe_view(request, pk):
         messages.add_message(
             request,
             messages.SUCCESS,
-            "You have unsubscribed from slot availability updates.",
+            "You have unsubscribed from vaccinaton slot updates.",
         )
     except ObjectDoesNotExist:
         messages.add_message(request, messages.WARNING, "Oops! Something went wrong.")