From 047a868782ee66f426f65a36ce9b87ec49c07cf8 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 11 Jul 2013 13:07:24 +0200
Subject: [PATCH] cleanup conf create

---
 teleforma/models/core.py |  2 +-
 teleforma/views/core.py  | 25 +++++--------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index ae2f2c60..84797c17 100644
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -339,10 +339,10 @@ class Conference(Model):
             self.comment = data['comment']
 
         if 'room' in data.keys():
-
             self.room, c = Room.objects.get_or_create(name=data['room'],
                                                    organization=organization)
         self.save()
+        self.course.save()
 
     class Meta(MetaCore):
         db_table = app_label + '_' + 'conference'
diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 038fbc5a..5b4401c1 100644
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -545,26 +545,11 @@ class ConferenceRecordView(PeriodAccessMixin, FormView):
     @jsonrpc_method('teleforma.create_conference')
     def create(request, conference):
         if isinstance(conference, dict):
-            course = Course.objects.get(code=conference['course_code'])
-            course_type = CourseType.objects.get(name=conference['course_type'])
-            conf, c = Conference.objects.get_or_create(public_id=conference['id'],
-                                                       course=course, course_type=course_type)
-            if c:
-                user = User.objects.get(username=conference['professor_id'])
-                conf.professor = Professor.objects.get(user=user)
-                try:
-                    organization, c = Organization.objects.get_or_create(name=conference['organization'])
-                    conf.room, c = Room.objects.get_or_create(name=conference['room'],
-                                                       organization=organization)
-                except:
-                    pass
-
-                conf.date_begin = datetime.datetime.now()
-                conf.period, c = Period.objects.get_or_create(name=conference['period'])
-                conf.session = conference['session']
-                conf.comment = conference['comment']
-                conf.save()
-                course.save()
+            conf = Conference.objects.filter(public_id=conference['id'])
+            if not conf:
+                conf = Conference()
+                conf.from_json_dict(conference)
+
                 for stream in conference['streams']:
                     host = stream['host']
                     port = stream['port']
-- 
2.39.5