Merge "Renders Pod Destriptor File earlier"

4 files changed, 26 insertions, 1 deletions

diff --git a/dashboard/src/booking/migrations/0002_booking_pdf.py b/dashboard/src/booking/migrations/0002_booking_pdf.py
new file mode 100644
index 0000000..53232c9
--- /dev/null
+++ b/dashboard/src/booking/migrations/0002_booking_pdf.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1 on 2018-11-09 16:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('booking', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='booking',
+            name='pdf',
+            field=models.TextField(blank=True, default=''),
+        ),
+    ]
diff --git a/dashboard/src/booking/models.py b/dashboard/src/booking/models.py
index d0c77b4..74b766d 100644
--- a/dashboard/src/booking/models.py
+++ b/dashboard/src/booking/models.py
@@ -57,6 +57,7 @@ class Booking(models.Model):
     config_bundle = models.ForeignKey(ConfigBundle, on_delete=models.SET_NULL, null=True)
     project = models.CharField(max_length=100, default="", blank=True, null=True)
     lab = models.ForeignKey(Lab, null=True, on_delete=models.SET_NULL)
+    pdf = models.TextField(blank=True, default="")
 
     class Meta:
         db_table = 'booking'
diff --git a/dashboard/src/booking/views.py b/dashboard/src/booking/views.py
index ab43519..29b53e2 100644
--- a/dashboard/src/booking/views.py
+++ b/dashboard/src/booking/views.py
@@ -112,7 +112,7 @@ def booking_detail_view(request, booking_id):
         {
             'title': 'Booking Details',
             'booking': booking,
-            'pdf': ResourceManager().makePDF(booking.resource),
+            'pdf': booking.pdf,
             'user_id': user.id
         })
 
diff --git a/dashboard/src/workflow/models.py b/dashboard/src/workflow/models.py
index bed6f52..73a142e 100644
--- a/dashboard/src/workflow/models.py
+++ b/dashboard/src/workflow/models.py
@@ -528,6 +528,12 @@ class Repository():
             booking.collaborators.add(collaborator)
 
         try:
+            booking.pdf = ResourceManager().makePDF(booking.resource)
+            booking.save()
+        except Exception as e:
+            return "BOOK, failed to create Pod Desriptor File: " + str(e)
+
+        try:
             JobFactory.makeCompleteJob(booking)
         except Exception as e:
             return "BOOK, serializing for api generated exception: " + str(e) + " CODE:0xFFFF"