fix conference copy command, fix hash method for public_id, fix staging env

diff --git a/bin b/bin
index c5d2023de2f038cb865a148076a4dc4ec24efaf7..52d01bc8d0ec34d96ae3751fa5709a8ae05066fd 160000 (submodule)
--- a/bin
+++ b/bin
@@ -1 +1 @@
-Subproject commit c5d2023de2f038cb865a148076a4dc4ec24efaf7
+Subproject commit 52d01bc8d0ec34d96ae3751fa5709a8ae05066fd

diff --git a/env/staging.env b/env/staging.env
index ba85578706be9488ac8b4d29e92527d7d5a842bd..93fb2bb515645b2ef97a62aa33b112c8e02f7ca8 100644 (file)
--- a/env/staging.env
+++ b/env/staging.env
@@ -2,7 +2,9 @@ DEBUG=True
 
 DB_PORT=5432
 DB_HOST=db
+POSTGRES_HOST=db
 POSTGRES_PASSWORD=mysecretpassword
 POSTGRES_DATABASE=teleforma
+POSTGRES_DB=teleforma
 POSTGRES_USER=teleforma
 POSTGRES_HOST_AUTH_METHOD=trust

diff --git a/lib/pdfannotator b/lib/pdfannotator
index c6b953270e4e8a7d97853d7a784f8e6df9ed9c53..ce69eca18a6f5b8774215725fd6b42534f13412f 160000 (submodule)
--- a/lib/pdfannotator
+++ b/lib/pdfannotator
@@ -1 +1 @@
-Subproject commit c6b953270e4e8a7d97853d7a784f8e6df9ed9c53
+Subproject commit ce69eca18a6f5b8774215725fd6b42534f13412f

diff --git a/teleforma/management/commands/teleforma-copy-conferences.py b/teleforma/management/commands/teleforma-copy-conferences.py
index 152bace449706026eb24502cee633e117e92bc5e..d2c121c645836866016a3affead398ff924f5d71 100644 (file)
--- a/teleforma/management/commands/teleforma-copy-conferences.py
+++ b/teleforma/management/commands/teleforma-copy-conferences.py
@@ -8,7 +8,7 @@ from django.template.defaultfilters import slugify
 from teleforma.models import *
 import logging
 import os
-
+from copy import deepcopy
 
 class Logger:
     """A logging object"""
@@ -28,7 +28,7 @@ class Command(BaseCommand):
     course_codes = ['Libertes', 'Anglais']
     period_from_name = 'Estivale'
     period_to_name = 'Semestrielle'
-    course_types = ['Corrections', 'Capsules']
+    course_types = ['Cours', 'Corrections', 'Capsules']
 
     def handle(self, *args, **options):
         period_from = Period.objects.get(name=self.period_from_name)
@@ -37,22 +37,28 @@ class Command(BaseCommand):
         for course_code in self.course_codes:
             course = Course.objects.get(code=course_code)
             for course_type in self.course_types:
-                course_type = CourseType.objects.get(name=self.course_type)
+                course_type = CourseType.objects.get(name=course_type)
                 medias = Media.objects.filter(course=course, course_type=course_type, is_published=True)
                 conferences = course.conference.filter(period=period_from, course_type=course_type)
                 conference_published_list = []
 
                 for conference in conferences:
-                    if conference.media.all()[0].is_published:
-                        conference_published_list.append(conference)
+                    medias = conference.media.all()
+                    if medias.count() == 2:
+                        if medias[0].is_published or medias[1].is_published:
+                            print(conference, conference.public_id)
+                            conference_published_list.append(conference)
 
                 for conference in conference_published_list:
-                    medias = conference.media.all()
+                    medias = deepcopy(conference.media.all())
                     conference.pk = None
+                    conference.public_id = None
                     conference.period = period_to
                     conference.save()
+                    print(conference.public_id)
                     for media in medias:
                         media.pk = None
+                        media.save()
                         media.period = period_to
                         media.conference = conference
                         media.save()

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 94960ae2db2c3ec90a765682ba5b7e301c4e0e20..5a0be47b34ff0d0f45cda321e8af5d2452a09f93 100755 (executable)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -38,6 +38,7 @@ import datetime
 import mimetypes
 import os
 import string
+import random
 from teleforma.utils import guess_mimetypes
 
 import django.db.models as models
@@ -46,7 +47,7 @@ from django.contrib.auth.models import User
 from django.core.paginator import InvalidPage
 from django.db import models
 from django.forms.fields import FileField
-from django.template.defaultfilters import random, slugify
+from django.template.defaultfilters import slugify
 from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 # from quiz.models import Quiz