diff --git a/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.yml b/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.yml index 56249257a..998df9bac 100644 --- a/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.yml +++ b/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/ShowServiceDbTest.php b/airtime_mvc/tests/application/services/database/ShowServiceDbTest.php index 70e411c24..f5b507488 100644 --- a/airtime_mvc/tests/application/services/database/ShowServiceDbTest.php +++ b/airtime_mvc/tests/application/services/database/ShowServiceDbTest.php @@ -66,7 +66,9 @@ class ShowServiceDbTest extends Zend_Test_PHPUnit_DatabaseTestCase "cb_custom_auth" => false, "custom_username" => null, "custom_password" => null, - "add_show_linked" => false + "add_show_linked" => false, + "add_show_has_autoplaylist" => 0, + "add_show_autoplaylist_id" => null ); $showService->setCcShow($data); diff --git a/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.yml b/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.yml index 122175442..acb06e167 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.yml @@ -14,3 +14,5 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null diff --git a/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.yml b/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.yml index bbbbdde8a..a7a49a0f8 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.yml @@ -14,6 +14,8 @@ cc_show: linked: true is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '2' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.yml b/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.yml index 59b81c4e0..70f3bd368 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.yml b/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.yml index 5efdb53b4..985642608 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.yml @@ -14,6 +14,8 @@ cc_show: linked: true is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.yml b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.yml index 55c020a38..26924e2a3 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.yml b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.yml index 571c86a37..376da3b25 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.yml b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.yml index 7ee1f084d..e76276884 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.yml b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.yml index 27588c038..9a9f33d2e 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.yml b/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.yml index 49d7d8cae..b3f596120 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.yml b/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.yml index af1e2b7e1..5a1380dad 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.yml b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.yml index 4be728073..c3ea3d927 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.yml b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.yml index 2971226d2..6a3f13ffa 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.yml b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.yml index b5d5b2539..3fb9e0b2a 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.yml b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.yml index 5f83336c3..6efb5d8d4 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.yml b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.yml index 063591c40..8308e9686 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.yml b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.yml index 4c51cb5b2..dae0535a8 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.yml b/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.yml index bbbbdde8a..a7a49a0f8 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.yml @@ -14,6 +14,8 @@ cc_show: linked: true is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '2' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.yml b/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.yml index e38f743b9..b910fb9af 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.yml b/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.yml index c1fb1e17d..73aa8d7bc 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: false image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '1' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.yml b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.yml index c447ccb20..67c42db42 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '2' diff --git a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.yml b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.yml index a039c6592..ceaa14218 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.yml +++ b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.yml @@ -14,6 +14,8 @@ cc_show: linked: false is_linkable: true image_path: '' + has_autoplaylist: false + autoplaylist_id: null cc_show_days: - id: '2' diff --git a/airtime_mvc/tests/application/testdata/ShowServiceData.php b/airtime_mvc/tests/application/testdata/ShowServiceData.php index 5aef49102..cb774d775 100644 --- a/airtime_mvc/tests/application/testdata/ShowServiceData.php +++ b/airtime_mvc/tests/application/testdata/ShowServiceData.php @@ -17,6 +17,8 @@ Class ShowServiceData "add_show_end_time" => "01:00", "add_show_duration" => "01h 00m", "add_show_timezone" => "UTC", + "add_show_has_autoplaylist" => false, + "add_show_autoplaylist_id" => null, "add_show_repeats" => 0, "add_show_linked" => 0, "add_show_repeat_type" => 0, @@ -92,6 +94,8 @@ Class ShowServiceData "add_show_end_time" => "01:00", "add_show_duration" => "01h 00m", "add_show_timezone" => "UTC", + "add_show_has_autoplaylist" => false, + "add_show_autoplaylist_id" => null, "add_show_repeats" => 1, "add_show_linked" => 0, "add_show_repeat_type" => 0, @@ -167,6 +171,8 @@ Class ShowServiceData "add_show_end_time" => "01:00", "add_show_duration" => "01h 00m", "add_show_timezone" => "UTC", + "add_show_has_autoplaylist" => false, + "add_show_autoplaylist_id" => null, "add_show_repeats" => 1, "add_show_linked" => 0, "add_show_repeat_type" => 0, @@ -253,6 +259,8 @@ Class ShowServiceData "add_show_end_time" => "02:00", "add_show_duration" => "01h 00m", "add_show_timezone" => "UTC", + "add_show_has_autoplaylist" => false, + "add_show_autoplaylist_id" => null, "add_show_repeats" => 0, "add_show_linked" => 0, "add_show_no_end" => 0, @@ -279,6 +287,8 @@ Class ShowServiceData "add_show_end_time" => "01:00", "add_show_duration" => "01h 00m", "add_show_timezone" => "UTC", + "add_show_has_autoplaylist" => false, + "add_show_autoplaylist_id" => null, "add_show_repeats" => 1, "add_show_linked" => 0, "add_show_repeat_type" => 0, @@ -355,6 +365,8 @@ Class ShowServiceData "add_show_end_time" => "01:00", "add_show_duration" => "01h 00m", "add_show_timezone" => "UTC", + "add_show_has_autoplaylist" => false, + "add_show_autoplaylist_id" => null, "add_show_repeats" => 0, "add_show_linked" => 0, "add_show_repeat_type" => 0, @@ -430,6 +442,8 @@ Class ShowServiceData "add_show_end_time" => "01:00", "add_show_duration" => "01h 00m", "add_show_timezone" => "UTC", + "add_show_has_autoplaylist" => false, + "add_show_autoplaylist_id" => null, "add_show_repeats" => 1, "add_show_linked" => 0, "add_show_repeat_type" => 0,