The end of Clipper

GestioCOF fetches the clipper accounts from an LDAP database and doesn't
need to store clippers in a table anymore.

gestioncof/autocomplete.py

@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from ldap3 import Connection
 
 from django import shortcuts
 from django.http import Http404
 from django.db.models import Q
-
 from django.contrib.auth.models import User
-from gestioncof.models import CofProfile, Clipper
+from django.conf import settings
+
+from gestioncof.models import CofProfile
 from gestioncof.decorators import buro_required
 
 
@@ -25,37 +24,49 @@ def autocomplete(request):
     queries = {}
     bits = q.split()
 
+    # Fetching data from User and CofProfile tables
     queries['members'] = CofProfile.objects.filter(Q(is_cof=True))
     queries['users'] = User.objects.filter(Q(profile__is_cof=False))
-    queries['clippers'] = Clipper.objects
     for bit in bits:
         queries['members'] = queries['members'].filter(
-                 Q(user__first_name__icontains=bit)
-                 | Q(user__last_name__icontains=bit)
-                 | Q(user__username__icontains=bit)
-                 | Q(login_clipper__icontains=bit))
+            Q(user__first_name__icontains=bit)
+            | Q(user__last_name__icontains=bit)
+            | Q(user__username__icontains=bit)
+            | Q(login_clipper__icontains=bit))
         queries['users'] = queries['users'].filter(
-                 Q(first_name__icontains=bit)
-                 | Q(last_name__icontains=bit)
-                 | Q(username__icontains=bit))
-        queries['clippers'] = queries['clippers'].filter(
-                 Q(fullname__icontains=bit)
-                 | Q(username__icontains=bit))
+            Q(first_name__icontains=bit)
+            | Q(last_name__icontains=bit)
+            | Q(username__icontains=bit))
     queries['members'] = queries['members'].distinct()
     queries['users'] = queries['users'].distinct()
-    usernames = list(queries['members'].values_list('login_clipper',
-                                                    flat='True')) \
+
+    # Clearing redundancies
+    usernames = (
+        list(queries['members'].values_list('login_clipper', flat='True'))
         + list(queries['users'].values_list('profile__login_clipper',
                                             flat='True'))
-    queries['clippers'] = queries['clippers'] \
-        .exclude(username__in=usernames).distinct()
-    # add clippers
+    )
 
+    # Fetching data from the SPI
+    if hasattr(settings, 'LDAP_SERVER_URL'):
+        # Fetching
+        ldap_query = '(|{:s})'.format(''.join(
+            ['(cn=*{:s}*)'.format(bit) for bit in bits]
+        ))
+        with Connection(settings.LDAP_SERVER_URL) as conn:
+            queries['clippers'] = conn.search(
+                'dc=spi,dc=ens,dc=fr', query,
+                attributes=['uid', 'cn']
+            )
+        # Clearing redundancies
+        queries['clippers'] = [
+            {'clipper': clipper.uid, 'fullname': clipper.cn}
+            for clipper in queries['clippers']
+            if clipper.uid not in usernames
+        ]
+
+    # Resulting data
     data.update(queries)
-
-    options = 0
-    for query in queries.values():
-        options += len(query)
-    data['options'] = options
+    data['options'] = sum([len(query) for query in queries])
 
     return shortcuts.render(request, "autocomplete_user.html", data)

gestioncof/migrations/0009_delete_clipper.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gestioncof', '0008_py3'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Clipper',
+        ),
+    ]

gestioncof/models.py

@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from django.db import models
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
@@ -258,15 +254,6 @@ class SurveyAnswer(models.Model):
                 self.survey.title)
 
 
-@python_2_unicode_compatible
-class Clipper(models.Model):
-    username = models.CharField("Identifiant", max_length=20)
-    fullname = models.CharField("Nom complet", max_length=200)
-
-    def __str__(self):
-        return "Clipper %s" % self.username
-
-
 @python_2_unicode_compatible
 class CalendarSubscription(models.Model):
     token = models.UUIDField()

gestioncof/templates/autocomplete_user.html

@@ -15,7 +15,7 @@
 {% if clippers %}
     <li class="autocomplete-header">Utilisateurs <tt>clipper</tt></li>
     {% for clipper in clippers %}{% if forloop.counter < 5 %}
-    <li class="autocomplete-value"><a href="{% url 'clipper-registration' clipper.username %}">{{ clipper|highlight_clipper:q }}</a></li>
+    <li class="autocomplete-value"><a href="{% url 'clipper-registration' clipper.clipper clipper.fullname %}">{{ clipper|highlight_clipper:q }}</a></li>
     {% elif forloop.counter == 5 %}<li class="autocomplete-more">...</a>{% endif %}{% endfor %}
 {% endif %}
 

gestioncof/templatetags/utils.py

@@ -43,7 +43,7 @@ def highlight_user(user, q):
 @register.filter
 def highlight_clipper(clipper, q):
     if clipper.fullname:
-        text = "%s (<tt>%s</tt>)" % (clipper.fullname, clipper.username)
+        text = "%s (<tt>%s</tt>)" % (clipper.fullname, clipper.clipper)
     else:
-        text = clipper.username
+        text = clipper.clipper
     return highlight_text(text, q)

gestioncof/views.py

@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import unicodecsv
 import uuid
 from datetime import timedelta
@@ -25,7 +21,7 @@ from gestioncof.models import Event, EventRegistration, EventOption, \
 from gestioncof.models import EventCommentField, EventCommentValue, \
     CalendarSubscription
 from gestioncof.shared import send_custom_mail
-from gestioncof.models import CofProfile, Clipper, Club
+from gestioncof.models import CofProfile, Club
 from gestioncof.decorators import buro_required, cof_required
 from gestioncof.forms import UserProfileForm, EventStatusFilterForm, \
         SurveyForm, SurveyStatusFilterForm, RegistrationUserForm, \
@@ -321,11 +317,10 @@ def registration_set_ro_fields(user_form, profile_form):
 
 
 @buro_required
-def registration_form2(request, login_clipper=None, username=None):
+def registration_form2(request, login_clipper=None, username=None, fullname=None):
     events = Event.objects.filter(old=False).all()
     member = None
     if login_clipper:
-        clipper = get_object_or_404(Clipper, username=login_clipper)
         try:  # check if the given user is already registered
             member = User.objects.get(username=login_clipper)
             username = member.username
@@ -336,8 +331,8 @@ def registration_form2(request, login_clipper=None, username=None):
             user_form = RegistrationUserForm(initial={
                 'username': login_clipper,
                 'email': "%s@clipper.ens.fr" % login_clipper})
-            if clipper.fullname:
-                bits = clipper.fullname.split(" ")
+            if fullname:
+                bits = fullname.split(" ")
                 user_form.fields['first_name'].initial = bits[0]
                 if len(bits) > 1:
                     user_form.fields['last_name'].initial = " ".join(bits[1:])
@@ -412,12 +407,12 @@ def registration(request):
             try:
                 member = User.objects.get(username=username)
                 user_form = RegistrationUserForm(request_dict, instance=member)
-            except User.DoesNotExist:
-                try:
-                    clipper = Clipper.objects.get(username=username)
-                    login_clipper = clipper.username
-                except Clipper.DoesNotExist:
+                if member.profile.login_clipper:
+                    login_clipper = member.profile.login_clipper
+                else:
                     user_form.force_long_username()
+            except User.DoesNotExist:
+                user_form.force_long_username()
         else:
             user_form.force_long_username()