Finished blocklist and added enable status to types

Author: Casassarnau

application/emails.py

@@ -0,0 +1,15 @@
+from django.urls import reverse
+
+from app.emails import Email
+
+
+def send_email_to_blocked_admins(request, users, application, blocked_user):
+    url = request.build_absolute_uri(reverse('change_status_application', kwargs={
+        'uuid': application.get_uuid, 'status': application.STATUS_PENDING
+    }))
+    context = {
+        'application': application,
+        'blocked_user': blocked_user,
+        'url': url,
+    }
+    Email(name='new_blocked', context=context, to=users, request=request).send()

application/migrations/0009_alter_application_options_alter_application_status.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.0.4 on 2022-08-23 13:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('application', '0008_application_last_modified'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='application',
+            options={'permissions': (('can_review_application', 'Can review application'), ('can_invite_application', 'Can invite application'), ('can_review_dubious_application', 'Can review dubious application'), ('can_review_blocked_application', 'Can review blocked application'))},
+        ),
+        migrations.AlterField(
+            model_name='application',
+            name='status',
+            field=models.CharField(choices=[('P', 'Under review'), ('R', 'Wait listed'), ('I', 'Invited'), ('LR', 'Last reminder'), ('C', 'Confirmed'), ('X', 'Cancelled'), ('A', 'Attended'), ('E', 'Expired'), ('D', 'Dubious'), ('IV', 'Invalid'), ('BL', 'Blocked'), ('NC', 'Needs change')], default='P', max_length=2),
+        ),
+    ]

application/migrations/0010_remove_applicationtypeconfig_needs_confirmation_and_more.py

@@ -0,0 +1,41 @@
+# Generated by Django 4.0.4 on 2022-08-23 18:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('application', '0009_alter_application_options_alter_application_status'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='applicationtypeconfig',
+            name='needs_confirmation',
+        ),
+        migrations.RemoveField(
+            model_name='applicationtypeconfig',
+            name='review',
+        ),
+        migrations.AddField(
+            model_name='applicationtypeconfig',
+            name='auto_blocklist',
+            field=models.BooleanField(default=True, help_text='Applications pass test of blocklist table on apply'),
+        ),
+        migrations.AddField(
+            model_name='applicationtypeconfig',
+            name='auto_confirm',
+            field=models.BooleanField(default=False, help_text='Applications set on status confirmed by default'),
+        ),
+        migrations.AddField(
+            model_name='applicationtypeconfig',
+            name='dubious',
+            field=models.BooleanField(default=True, help_text='Dubious reviewing system'),
+        ),
+        migrations.AddField(
+            model_name='applicationtypeconfig',
+            name='vote',
+            field=models.BooleanField(default=True, help_text='Activate voting system'),
+        ),
+    ]

application/migrations/0011_rename_auto_blocklist_applicationtypeconfig_blocklist.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.4 on 2022-08-23 18:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('application', '0010_remove_applicationtypeconfig_needs_confirmation_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='applicationtypeconfig',
+            old_name='auto_blocklist',
+            new_name='blocklist',
+        ),
+    ]

application/migrations/0012_applicationtypeconfig_compatible_with_others.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.4 on 2022-08-23 18:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('application', '0011_rename_auto_blocklist_applicationtypeconfig_blocklist'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='applicationtypeconfig',
+            name='compatible_with_others',
+            field=models.BooleanField(default=False, help_text='User can confirm in more than one type'),
+        ),
+    ]

application/models.py

@@ -32,8 +32,17 @@ class ApplicationTypeConfig(models.Model):
     start_application_date = models.DateTimeField(default=timezone.now, null=True)
     end_application_date = models.DateTimeField(default=timezone.now, null=True)
     group = models.ForeignKey(Group, on_delete=models.DO_NOTHING)
-    review = models.BooleanField(default=True)
-    needs_confirmation = models.BooleanField(default=False)
+    vote = models.BooleanField(default=True, help_text=_('Activate voting system'))
+    dubious = models.BooleanField(default=True, help_text=_('Dubious reviewing system'))
+    blocklist = models.BooleanField(default=True, help_text=_('Applications pass test of blocklist table on apply'))
+    auto_confirm = models.BooleanField(default=False, help_text=_('Applications set on status confirmed by default'))
+    compatible_with_others = models.BooleanField(default=False, help_text=_('User can confirm in more than one type'))
+
+    def vote_enabled(self):
+        return self.vote and not self.auto_confirm
+
+    def dubious_enabled(self):
+        return self.dubious and not self.auto_confirm
 
     @property
     def get_token(self):
@@ -86,7 +95,7 @@ class Application(models.Model):
     STATUS_DUBIOUS = 'D'
     STATUS_NEEDS_CHANGE = 'NC'
     STATUS_INVALID = 'IV'
-    STATUS_BLACKLISTED = 'BL'
+    STATUS_BLOCKED = 'BL'
     STATUS = [
         (STATUS_PENDING, _('Under review')),
         (STATUS_REJECTED, _('Wait listed')),
@@ -98,7 +107,7 @@ class Application(models.Model):
         (STATUS_EXPIRED, _('Expired')),
         (STATUS_DUBIOUS, _('Dubious')),
         (STATUS_INVALID, _('Invalid')),
-        (STATUS_BLACKLISTED, _('Blacklisted')),
+        (STATUS_BLOCKED, _('Blocked')),
         (STATUS_NEEDS_CHANGE, _('Needs change')),
     ]
     STATUS_COLORS = {
@@ -113,7 +122,7 @@ class Application(models.Model):
         STATUS_EXPIRED: 'danger',
         STATUS_INVALID: 'danger',
         STATUS_REJECTED: 'danger',
-        STATUS_BLACKLISTED: 'danger',
+        STATUS_BLOCKED: 'danger',
     }
     STATUS_DESCRIPTION = {
         STATUS_NEEDS_CHANGE: _('Your application might have some misleading information. '
@@ -127,7 +136,7 @@ class Application(models.Model):
         STATUS_EXPIRED: _('Your application have been expired. Please contact us quick if you want to come.'),
         STATUS_INVALID: _('Your application have been invalidated. It seems you cannot join us with this role.'),
         STATUS_REJECTED: _('We are so sorry, but our hack is full...'),
-        STATUS_BLACKLISTED: _('User was blacklisted by your organization.'),
+        STATUS_BLOCKED: _('User was blocked by your organization.'),
         STATUS_DUBIOUS: _('This application has something suspicious'),
         STATUS_ATTENDED: _('You have arrived at the event. Have fun!'),
     }
@@ -162,14 +171,15 @@ def form_data(self):
 
     def set_status(self, status):
         self.status = status
+        self.status_changed = True
         self.status_update_date = timezone.now()
 
     @form_data.setter
     def form_data(self, data):
         self.data = json.dumps(data)
 
     def __str__(self):
-        return self.user.email
+        return '%s: %s' % (self.type.name, self.user.email)
 
     @property
     def get_uuid(self):
@@ -180,7 +190,7 @@ def get_public_status_display(self):
         return [y for (x, y) in self.STATUS if x == status][0]
 
     def get_public_status(self):
-        if self.status in [self.STATUS_BLACKLISTED, self.STATUS_DUBIOUS]:
+        if self.status in [self.STATUS_BLOCKED, self.STATUS_DUBIOUS]:
             return self.STATUS_PENDING
         return self.status
 
@@ -218,7 +228,10 @@ def can_edit(self):
         return self.status in [self.STATUS_PENDING, self.STATUS_NEEDS_CHANGE]
 
     def save(self, *args, **kwargs):
-        self.last_modified = timezone.now()
+        if getattr(self, 'status_changed', False):
+            self.last_modified = self.status_update_date
+        else:
+            self.last_modified = timezone.now()
         super().save(*args, **kwargs)
 
     class Meta:
@@ -227,6 +240,7 @@ class Meta:
             ('can_review_application', _('Can review application')),
             ('can_invite_application', _('Can invite application')),
             ('can_review_dubious_application', _('Can review dubious application')),
+            ('can_review_blocked_application', _('Can review blocked application')),
         )
 
 

application/templates/mails/new_blocked.html

@@ -0,0 +1,24 @@
+{% extends 'mails/base.html' %}
+{% block content %}
+    <p>Hi there,</p>
+    <p>I have found that one of the applications may be from one of the users on the Blocked List.</p>
+    <br>
+    <p><strong>{{ application.type.name }} application user:</strong></p>
+    <ul>
+        <li><strong>Name:</strong> {{ application.user.get_full_name }}</li>
+        <li><strong>Email:</strong> {{ application.user.email }}</li>
+    </ul>
+    <br>
+    <p><strong>Blocked list user:</strong></p>
+    <ul>
+        <li><strong>Name:</strong> {{ blocked_user.full_name }}</li>
+        <li><strong>Email:</strong> {{ blocked_user.email }}</li>
+    </ul>
+    <br>
+    <p>If this is an error you can change it to Under Review status by clicking Clear status.</p>
+
+    {% include 'mails/components/button.html' with url=url text='Clear status' %}
+
+    <p>Best regards,</p>
+    <p>{{ app_name }}.</p>
+{% endblock %}

application/templates/mails/new_blocked.txt

@@ -0,0 +1 @@
+New {{ application.type.name }} application blocked

application/views.py

@@ -1,19 +1,23 @@
 from django.contrib import messages
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.core.exceptions import PermissionDenied
 from django.core.files.storage import FileSystemStorage
 from django.db import transaction
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
+from django.utils import timezone
 from django.views import View
 from django.views.generic import TemplateView
 from django.utils.translation import gettext as _
 
 from application import forms
+from application.emails import send_email_to_blocked_admins
 from application.models import Application, ApplicationTypeConfig, ApplicationLog
 from user.forms import UserProfileForm
 from user.mixins import LoginRequiredMixin
+from user.models import BlockedUser
 
 
 class ApplicationHome(LoginRequiredMixin, TemplateView):
@@ -65,15 +69,31 @@ def get_context_data(self, **kwargs):
                         'application_type': application_type, 'user_form': user_form, 'public': self.public})
         return context
 
+    def block_application(self, user, application):
+        blocked_user = BlockedUser.get_blocked(full_name=user.get_full_name(), email=user.email)
+        application.status = Application.STATUS_BLOCKED
+        User = get_user_model()
+        perms = ['can_review_blocked_application', 'can_review_blocked_application_%s' %
+                 application.type.name.lower()]
+        users_emails = User.get_users_with_permissions(perms).values_list('email', flat=True)
+        send_email_to_blocked_admins(self.request, users_emails, application=application, blocked_user=blocked_user)
+
     def save_application(self, form, app_type, user):
         try:
             if not self.public:
                 raise Application.DoesNotExist()
-            Application.objects.get(user=user, type__name__iexact=self.request.GET.get('type', 'Hacker').lower())
+            Application.objects.get(user=user, type_id=app_type.pk)
         except Application.DoesNotExist:
             instance = form.save(commit=False)
             instance.user = user
             instance.type_id = app_type.pk
+            if app_type.auto_confirm:
+                instance.status = Application.STATUS_CONFIRMED
+            if app_type.blocklist:
+                try:
+                    self.block_application(user, application=instance)
+                except BlockedUser.DoesNotExist:
+                    pass
             with transaction.atomic():
                 instance.save()
                 form.save_files(instance=instance)
@@ -245,4 +265,8 @@ def get(self, request, **kwargs):
             if new_status == Application.STATUS_ATTENDED:
                 group = Group.objects.get_or_create(application.type.name)
                 group.user_set.add(application.user)
+            if new_status == application.STATUS_CONFIRMED:
+                Application.objects.exclude(uuid=application.get_uuid)\
+                    .filter(user=application.user, type__compatible_with_others=False)\
+                    .update(status=Application.STATUS_CANCELLED, status_update_date=timezone.now())
         return redirect(next_page)

review/migrations/0003_blockedlist.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.0.4 on 2022-08-23 12:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('review', '0002_alter_vote_calculated_vote'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BlockedList',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('full_name', models.CharField(max_length=100)),
+                ('email', models.EmailField(max_length=100)),
+            ],
+        ),
+    ]

review/migrations/0004_delete_blockedlist.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.0.4 on 2022-08-23 12:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('review', '0003_blockedlist'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='BlockedList',
+        ),
+    ]

review/templates/application_detail.html

@@ -211,7 +211,7 @@ <h2>{% translate 'Score' %}</h2>
                         });
                     });
                 </script>
-            {% elif perms|add_type:application.type.name|has_application_perm:'can_review_dubious_application' and application.status == application.STATUS_DUBIOUS or application.status ==  application.STATUS_NEEDS_CHANGE %}
+            {% elif application.type.dubious_enabled and perms|add_type:application.type.name|has_application_perm:'can_review_dubious_application' and application.status == application.STATUS_DUBIOUS or application.status ==  application.STATUS_NEEDS_CHANGE %}
                 <form method="post" class="mt-2">
                     <h3>{% if application.status == application.STATUS_DUBIOUS %}{% translate 'Dubious form' %}{% else %}{% translate 'Correction form' %}{% endif %}</h3>
                     {% csrf_token %}
@@ -225,8 +225,15 @@ <h3>{% if application.status == application.STATUS_DUBIOUS %}{% translate 'Dubio
                     </div>
                 </form>
             {% endif %}
+            {% if application.type.blocklist and blocked_user %}
+                <h2>{% translate 'Blocked user:' %}</h2>
+                <ul>
+                    <li><strong>{% translate 'Name:' %}</strong> {{ blocked_user.full_name }}</li>
+                    <li><strong>{% translate 'Email:' %}</strong> {{ blocked_user.email }}</li>
+                </ul>
+            {% endif %}
             <div class="d-grid gap-2 col-lg-6 mx-auto mt-2">
-                {% if application.status != application.STATUS_DUBIOUS and application.status !=  application.STATUS_NEEDS_CHANGE %}
+                {% if application.type.dubious_enabled and application.status != application.STATUS_DUBIOUS and application.status !=  application.STATUS_NEEDS_CHANGE and application.status != application.STATUS_BLOCKED %}
                     <button class="btn btn-warning" onclick="mark_dubious()">{% translate 'Mark as dubious' %}</button>
                     <script>
                         function mark_dubious() {
@@ -236,6 +243,9 @@ <h3>{% if application.status == application.STATUS_DUBIOUS %}{% translate 'Dubio
                         }
                     </script>
                 {% endif %}
+                {% if application.type.blocklist and application.status == application.STATUS_BLOCKED and perms|add_type:application.type.name|has_application_perm:'can_review_blocked_application' %}
+                    <a class="btn btn-primary" href="{% url 'change_status_application' application.get_uuid application.STATUS_PENDING %}?next={{ request.get_path }}" onclick="return confirm('{% translate "This application will be unblocked. Are you sure?" %}')">{% translate 'This should not be blocked' %}</a>
+                {% endif %}
             </div>
         </div>
     {% else %}