in prog

Author: ryantanen

backend/ohq/migrations/0022_booking.py

@@ -1,13 +1,13 @@
-# Generated by Django 5.0.3 on 2025-01-26 19:14
+# Generated by Django 5.0.3 on 2025-04-11 22:07
 
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
+        ("ohq", "0021_occurrence"),
         ("ohq", "0021_queue_question_timer_enabled_and_more"),
-        ("ohq", "0025_alter_booking_unique_together"),
     ]
 
     operations = []

…q/migrations/0026_merge_20250126_1914.py …q/migrations/0022_merge_20250411_2207.pybackend/ohq/migrations/0026_merge_20250126_1914.py renamed to backend/ohq/migrations/0022_merge_20250411_2207.py backend/ohq/migrations/0026_merge_20250126_1914.py renamed to backend/ohq/migrations/0022_merge_20250411_2207.py

@@ -462,7 +462,7 @@ class Occurrence(models.Model):
     original_end = models.DateTimeField(("original end"))
     created_on = models.DateTimeField(("created on"), auto_now_add=True)
     updated_on = models.DateTimeField(("updated on"), auto_now=True)
-    interval = models.IntegerField(("interval"), blank=True, validators=[MinValueValidator(5), MaxValueValidator(60)])
+    interval = models.IntegerField(("interval"), blank=True, null=True, validators=[MinValueValidator(5), MaxValueValidator(60)])
 
     class Meta:
         verbose_name = ("occurrence")
@@ -480,23 +480,43 @@ def __init__(self, *args, **kwargs):
             self.location = event.location
 
     def save(self, *args, **kwargs):
+        # Get the old instance if this is an update
+        old_instance = None
+        if self.pk:
+            old_instance = Occurrence.objects.get(pk=self.pk)
+
         super().save(*args, **kwargs)
 
-        if self.pk: # If save is called on object update, not creation
-            self.bookings.all().delete()
-
-        delta = self.end - self.start
-        delta_minutes = delta.total_seconds() / 60
-        booking_count = int(delta_minutes // self.interval)
-        for i in range(booking_count):
-            booking_start = self.start + timedelta(minutes=i * self.interval)
-            booking_end = booking_start + timedelta(minutes=self.interval)
-            Booking.objects.create(
-                occurrence=self,
-                user=None,
-                start=booking_start,
-                end = booking_end,
-            )
+        # Only update bookings if:
+        # 1. This is a new occurrence
+        # 2. The interval has changed
+        # 3. The start or end time has changed
+        should_update_bookings = (
+            not old_instance or  # New occurrence
+            old_instance.interval != self.interval or  # Interval changed
+            old_instance.start != self.start or  # Start time changed
+            old_instance.end != self.end  # End time changed
+        )
+
+        if should_update_bookings and self.interval:
+            # Delete existing bookings
+            if self.pk:
+                self.bookings.all().delete()
+
+            # Create new bookings
+            delta = self.end - self.start
+            delta_minutes = delta.total_seconds() / 60
+            booking_count = int(delta_minutes // self.interval)
+            
+            for i in range(booking_count):
+                booking_start = self.start + timedelta(minutes=i * self.interval)
+                booking_end = booking_start + timedelta(minutes=self.interval)
+                Booking.objects.create(
+                    occurrence=self,
+                    user=None,
+                    start=booking_start,
+                    end=booking_end,
+                )
 
     def moved(self):
         return self.original_start != self.start or self.original_end != self.end