fix

course_service/courses/models.py

@@ -59,13 +59,7 @@ class CourseManager(models.Manager):
 
         except ObjectDoesNotExist:
             kwargs['slug'] = slug
-            kwargs['route'] = CourseRoute.objects.create(
-                name=kwargs['title'],
-                is_template=True,
-                out_key=''.join(random.choice(string.ascii_letters) for x in range(15)),
-            )
             course = self.create(**kwargs)
-            course.save()
 
         return course
 

csv/load_courses.py

@@ -12,6 +12,7 @@ from course_service.courses.api import InApiTeacher
 from django.contrib.auth import get_user_model
 from course_service.courses.models import Course, Vertex, Topic
 from course_service.maps.models import CourseRoute, CourseMap, PivotVertex, PivotCourseMap
+from storage.models import File
 
 if __name__ == '__main__':
     CourseMap.objects.all().delete()
@@ -32,7 +33,7 @@ if __name__ == '__main__':
             try:
                 for teacher in teachers:
                     if teacher:
-                        teacher = get_user_model().objects.get(id=teacher)
+                        teacher = get_user_model().objects.get(id=teacher).token
                         InApiTeacher.add_teacher(course.slug, teacher)
 
             except get_user_model().DoesNotExist:
@@ -45,33 +46,43 @@ if __name__ == '__main__':
             model_type = row.pop('type', None)
             description = row.pop('description', None)
             title = row.pop('title', None)
-            extra_data = row.pop('extra_data', None)
+            pk = row.pop('id', None)
+            materials = [File.objects.get(id=i).key for i in row.pop('materials', None)]
             if model_type == 'topic':
                 course = Course.objects.get(id=row.pop('course', None))
                 Topic.objects.create(
-                    id=extra_data['id'],
+                    id=pk,
-                    icon=extra_data['icon'],
+                    icon=row.pop('icon', None),
                     course=course,
                     description=description,
                     title=title,
                 )
+
+            if model_type == 'tutorial':
+                topic = Topic.objects.get(id=row.pop('parent', None))
+                Vertex.objects.create(
+                    id=pk,
+                    video=row.pop('video', None),
+                    materials=materials,
+                    topic=topic,
+                    description=description,
+                    title=title,
+                )
+
             if model_type == 'task':
-                topic = Course.objects.get(id=row.pop('parent', None))
+                topic = Topic.objects.get(id=row.pop('parent', None))
                 Vertex.objects.create(
-                    id=extra_data['id'],
+                    id=pk,
-                    video=extra_data['video'],
+                    materials=materials,
-                    materials=extra_data['materials'],
                     topic=topic,
                     description=description,
                     title=title,
+                    valid_type=1,
                 )
-            topic = row.pop('parent', None)
-            parents = [Vertex.objects.get(object_id=parent, content_type__model='topic')] if parent else []
-            Vertex.objects.create_with_dependencies(model=model, course=course, parents=parents, **row)
 
     for course in Course.objects.all():
         map_obj = CourseMap.objects.create(course=course)
-        route_obj = CourseRoute.objects.create(name='''Основной шаблон по курсу "%s"''' % course.title)
+        route_obj = CourseRoute.objects.create(name='''%s''' % course.title)
         course.route = route_obj
         sort = 0
         for vertex in Vertex.objects.filter(course=course).order_by("object_id"):