CC-3094 : Rebroadcast editing problems

airtime_mvc/application/models/Show.php

@@ -105,6 +105,13 @@ class Application_Model_Show {
         return $res;
     }
 
+    //remove everything about this show.
+    public function deleteShow()
+    {
+        $show = CcShowQuery::create()->findPK($this->_showId);
+        $show->delete();
+    }
+
     public function resizeShow($deltaDay, $deltaMin)
     {
         global $CC_DBC;
@@ -280,7 +287,7 @@ class Application_Model_Show {
         $showId = $this->getId();
 
         $sql = "SELECT starts FROM cc_show_instances "
-            ."WHERE instance_id = $showId "
+            ."WHERE show_id = $showId AND rebroadcast = 1"
             ."ORDER BY starts";
 
         $rebroadcasts = $CC_DBC->GetAll($sql);
@@ -1229,8 +1236,10 @@ class Application_Model_Show {
                 $showInstance->correctScheduleStartTimes();
             }
 
+            //don't create rebroadcasts for a deleted recorded show.
+            if ($ccShowInstance->getDbModifiedInstance() == false) {
                 self::createRebroadcastInstances($rebroadcasts, $currentUtcTimestamp, $show_id, $show_instance_id, $start, $duration, $timezone);
-
+            }
 
             if ($p_interval == 'P1M'){
                 /* When adding months, there is a problem if we are on January 31st and add one month with PHP.

airtime_mvc/application/models/ShowInstance.php

@@ -399,19 +399,30 @@ class Application_Model_ShowInstance {
         global $CC_DBC;
 
         // see if it was recording show
-        $recording = CcShowInstancesQuery::create()
+        $recording = $this->isRecorded();
-            ->findPK($this->_instanceId)
-            ->getDbRecord();
         // get show id
-        $showId = CcShowInstancesQuery::create()
+        $showId = $this->getShowId();
-            ->findPK($this->_instanceId)
+
-            ->getDbShowId();
+        $show = $this->getShow();
+
+        $current_timestamp = gmdate("Y-m-d H:i");
+
+        if ($current_timestamp < $this->getShowInstanceStart()) {
+
+            if ($show->isRepeating()) {
 
                 CcShowInstancesQuery::create()
                     ->findPK($this->_instanceId)
                     ->setDbModifiedInstance(true)
                     ->save();
 
+                //delete the rebroadcasts of the removed recorded show.
+                if ($recording) {
+                    CcShowInstancesQuery::create()
+                        ->filterByDbOriginalShow($this->_instanceId)
+                        ->delete();
+                }
+
                 /* Automatically delete all files scheduled in cc_schedules table. */
                 CcScheduleQuery::create()
                     ->filterByDbInstanceId($this->_instanceId)
@@ -423,8 +434,6 @@ class Application_Model_ShowInstance {
                     ->filterByDbModifiedInstance(false)
                     ->findOne();
 
-        
-
                 /* If we didn't find any instances of the show that haven't
                  * been deleted, then just erase everything related to that show.
                  * We can just delete, the show and the foreign key-constraint should
@@ -434,6 +443,12 @@ class Application_Model_ShowInstance {
                         ->filterByDbId($showId)
                         ->delete();
                 }
+            }
+            else {
+
+                $show->deleteShow();
+            }
+        }
 
         Application_Model_RabbitMq::PushSchedule();
         if($recording){