From ca4060e087663da73ee0a513ac48893ae26ce074 Mon Sep 17 00:00:00 2001
From: Andrey <andrey.korolev@skillbox.ru>
Date: Mon, 18 Dec 2017 21:16:16 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D0=B6=D1=83=D1=80?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D1=8B=20(=D1=82=D0=B5=D0=BC,=20=D1=83=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=BE=D0=B2,=20=D0=BA=D1=83=D1=80=D1=81=D0=BE?=
 =?UTF-8?q?=D0=B2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 csv/load_perm.py | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/csv/load_perm.py b/csv/load_perm.py
index 1d70bf3..46c3d38 100644
--- a/csv/load_perm.py
+++ b/csv/load_perm.py
@@ -27,28 +27,29 @@ if __name__ == '__main__':
 
             try:
                 user = get_user_model().objects.get(id=row['user'])
-                p, c = Progress.objects.get_or_create(
-                    user=user,
-                    route=route,
-                    teacher=get_user_model().objects.get(id=row['teacher']),
+            except get_user_model().DoesNotExist:
+                print(row['user'])
+                break
+
+            p = Progress.objects.create(
+                user=user,
+                route=route,
+                teacher=get_user_model().objects.get(id=row['teacher']),
+            )
+
+            pivots = json.loads(row['success'])
+            for pivot in pivots:
+                pv = PivotProgressVertex.objects.create(
+                    progress=p,
+                    vertex=Vertex.objects.get(id=pivot['id']).token,
+                    teacher=get_user_model().objects.get(id=pivot['teacher']),
+                    status=1,
                 )
 
-                pivots = json.loads(row['success'])
-                for pivot in pivots:
-                    pv = PivotProgressVertex.objects.create(
-                        progress=p,
-                        vertex=Vertex.objects.get(id=pivot['id']).token,
-                        teacher=get_user_model().objects.get(id=pivot['teacher']),
-                        status=1,
-                    )
-
-                    if pivot['date']:
-                        pv.date = datetime.strptime(pivot['date'].split('.')[0], '%Y-%m-%d %H:%M:%S')
-                        pv.status = 2
-                        pv.save()
+                if pivot['date']:
+                    pv.date = datetime.strptime(pivot['date'].split('.')[0], '%Y-%m-%d %H:%M:%S')
+                    pv.status = 2
+                    pv.save()
 
-                g = Group.objects.get(name='students')
-                g.user_set.add(user)
-
-            except get_user_model().DoesNotExist:
-                print(row['user'])
+            g = Group.objects.get(name='students')
+            g.user_set.add(user)