Fix behaviour when initial sessions is set to 0, meaning creation of reserved sessions should be delayed.

Author: GrahamDumpleton

training-portal/src/project/apps/workshops/manager/sessions.py

@@ -381,6 +381,15 @@ def initiate_reserved_sessions(portal):
             if environment.reserved == 0:
                 continue
 
+            # If initial number of sessions is 0 and no workshop sessions
+            # have yet been created, then skip to next one, as will only go
+            # on to create reserved sessions when the first request for a
+            # session arrives.
+
+            if environment.initial == 0:
+                if environment.all_sessions_count() == 0:
+                    continue
+
             # If already at capacity, skip to next one.
 
             spare_capacity = environment.capacity - environment.active_sessions_count()
@@ -424,6 +433,15 @@ def initiate_reserved_sessions(portal):
             if environment.reserved == 0:
                 continue
 
+            # If initial number of sessions is 0 and no workshop sessions
+            # have yet been created, then skip to next one, as will only go
+            # on to create reserved sessions when the first request for a
+            # session arrives.
+
+            if environment.initial == 0:
+                if environment.all_sessions_count() == 0:
+                    continue
+
             # If already have required number of reserved sessons, skip to
             # next one.
 

training-portal/src/project/apps/workshops/models.py

@@ -262,6 +262,30 @@ def active_sessions_count(self):
 
     active_sessions_count.short_description = "Active"
 
+    def all_sessions(self):
+        """Returns the set of all workshop sessions across all workshop
+        environments. This includes any reserved workshop sessions that have
+        not as yet been allocated to a user, workshop sessions which are
+        currently being shutdown, as well as stopped workshop sessions that
+        haven't been purged.
+
+        """
+
+        return Session.objects.filter(environment__portal=self)
+
+    def all_sessions_count(self):
+        """Returns the count of all workshop sessions across all workshop
+        environments. This includes any reserved workshop sessions that have
+        not as yet been allocated to a user, workshop sessions which are
+        currently being shutdown, as well as stopped workshop sessions that
+        haven't been purged.
+
+        """
+
+        return self.total_sessions().count()
+
+    all_sessions_count.short_description = "Total"
+
     def capacity_available(self):
         """Returns whether there is capacity to have another workshop session.
         This will always return True if no sessions maximum was specified for
@@ -499,6 +523,28 @@ def active_sessions_count(self):
 
     active_sessions_count.short_description = "Active"
 
+    def all_sessions(self):
+        """Returns the set of all workshop sessions. This includes any
+        reserved workshop sessions that have not as yet been allocated to a
+        user, workshop sessions which are currently being shutdown, as well as
+        stopped workshop sessions that haven't been purged.
+
+        """
+
+        return self.session_set.all()
+
+    def all_sessions_count(self):
+        """Returns the count of all workshop sessions. This includes any
+        reserved workshop sessions that have not as yet been allocated to a
+        user,workshop sessions which are currently being shutdown, as well as
+        stopped workshop sessions that haven't been purged.
+
+        """
+
+        return self.all_sessions().count()
+
+    all_sessions_count.short_description = "Total"
+
     def allocated_session_for_user(self, user):
         """Returns any allocated workshop session for the defined user. There
         should only be at most one, so only need to return the first if one