From 2a3de2ce4b3c460e5f785cee13d8e71b5c7ba69c Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Wed, 13 Jun 2012 02:07:46 +0200
Subject: [PATCH] fix existing user

---
 example/data/CRFPA.txt                        | 22 -------------------
 .../commands/teleforma-import-users-pb.py     | 13 ++++++-----
 2 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 example/data/CRFPA.txt

diff --git a/example/data/CRFPA.txt b/example/data/CRFPA.txt
deleted file mode 100644
index da10933a..00000000
--- a/example/data/CRFPA.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Droit_administratif
-Droit_des_obligations
-Droit_commercial_des_affaires
-Droit_communautaire_et_européen
-Droit_de_la_famille_et_des_personnes
-Droit_du_travail
-Droit_fiscal
-Droit_international_privé
-Droit_patrimonial
-Droit_public_des_activités_économiques
-Droit_pénal
-Droit_Libertés_publiques
-Note_de_synthèse
-Procédure_administrative_et_contentieuse
-Procédure_civile
-Procédures_collectives_et_sûretés
-Procédure_pénale
-Oral-Procédures_communautaires
-Oral-Voies_d'ex
-Oral-Comptabilité_privée
-Oral-Finances_publiques
-Conférence-actualisation-septembre
diff --git a/teleforma/management/commands/teleforma-import-users-pb.py b/teleforma/management/commands/teleforma-import-users-pb.py
index b33d378b..0748803c 100644
--- a/teleforma/management/commands/teleforma-import-users-pb.py
+++ b/teleforma/management/commands/teleforma-import-users-pb.py
@@ -50,10 +50,16 @@ class Command(BaseCommand):
         email       = row[9].value
         username = slugify(first_name)[0] + '.' + slugify(last_name)
         username = username[:30]
+
+        #FIXME: NOT for production
+        user = User.objects.filter(username=username)
+        if user:
+            user.delete()
+
         users = User.objects.filter(username=username)
         i = 1
         while users:
-            username = slugify(first_name)[i] + '.' + slugify(last_name)
+            username = slugify(first_name)[:i] + '.' + slugify(last_name)
             users = User.objects.filter(username=username)
             if not users:
                 break
@@ -62,11 +68,6 @@ class Command(BaseCommand):
         date = row[14].value
         date_joined = datetime.datetime(*xlrd.xldate_as_tuple(date, self.book.datemode))
 
-        #FIXME: NOT for production
-#        user = User.objects.filter(username=username)
-#        if user:
-#            user.delete()
-
         user, created = User.objects.get_or_create(username=username, first_name=first_name,
                                      last_name=last_name, email=email, date_joined = date_joined)
 
-- 
2.39.5