From 15cf291bc990c081018ffa8a55bbad0ed684d9c0 Mon Sep 17 00:00:00 2001
From: ryan <ryanrain@gmail.com>
Date: Fri, 14 Dec 2018 15:24:28 -0600
Subject: [PATCH] set auto-generated smartblock and playlist title directly
 from input

---
 .../rest/controllers/PodcastController.php    |  5 +-
 .../application/services/PodcastService.php   | 75 ++++++++++---------
 .../public/js/airtime/library/podcast.js      | 13 +++-
 3 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/airtime_mvc/application/modules/rest/controllers/PodcastController.php b/airtime_mvc/application/modules/rest/controllers/PodcastController.php
index b3fc38832..eb454cb94 100644
--- a/airtime_mvc/application/modules/rest/controllers/PodcastController.php
+++ b/airtime_mvc/application/modules/rest/controllers/PodcastController.php
@@ -198,14 +198,15 @@ class Rest_PodcastController extends Zend_Rest_Controller
 
     public function smartblockAction() {
 
+        $title = $this->_getParam('title', []);
         $id = $this->_getParam('id', []);
         if (!$id) {
             return;
         }
         $podcast = Application_Service_PodcastService::getPodcastById($id);
 
-        logging::info($podcast);
-        Application_Service_PodcastService::createPodcastSmartblockAndPlaylist($podcast);
+        // logging::info($podcast);
+        Application_Service_PodcastService::createPodcastSmartblockAndPlaylist($podcast, $title);
     }
 
 
diff --git a/airtime_mvc/application/services/PodcastService.php b/airtime_mvc/application/services/PodcastService.php
index f5abb8590..b67028a8c 100644
--- a/airtime_mvc/application/services/PodcastService.php
+++ b/airtime_mvc/application/services/PodcastService.php
@@ -162,55 +162,56 @@ class Application_Service_PodcastService
 
     /**
      * @param $podcast
+     * @param $title passed in directly from web UI input
      * This will automatically create a smartblock and playlist for this podcast.
      */
 
-    public static function createPodcastSmartblockAndPlaylist($podcast)
+    public static function createPodcastSmartblockAndPlaylist($podcast, $title)
     {
         if (is_array($podcast)) {
             $newpodcast = new Podcast();
             $newpodcast->fromArray($podcast, BasePeer::TYPE_FIELDNAME);
             $podcast = $newpodcast;
         }
-            // Base class
-            $newBl = new Application_Model_Block();
-            $newBl->setCreator(Application_Model_User::getCurrentUser()->getId());
-            $newBl->setName($podcast->getDbTitle());
-            $newBl->setDescription('Auto-generated smartblock for podcast');
-            $newBl->saveType('dynamic');
-            // limit the smartblock to 1 item
-            $row = new CcBlockcriteria();
-            $row->setDbCriteria('limit');
-            $row->setDbModifier('items');
-            $row->setDbValue(1);
-            $row->setDbBlockId($newBl->getId());
-            $row->save();
+        // Base class
+        $newBl = new Application_Model_Block();
+        $newBl->setCreator(Application_Model_User::getCurrentUser()->getId());
+        $newBl->setName($title);
+        $newBl->setDescription('Auto-generated smartblock for podcast');
+        $newBl->saveType('dynamic');
+        // limit the smartblock to 1 item
+        $row = new CcBlockcriteria();
+        $row->setDbCriteria('limit');
+        $row->setDbModifier('items');
+        $row->setDbValue(1);
+        $row->setDbBlockId($newBl->getId());
+        $row->save();
 
-            // sort so that it is the newest item
-            $row = new CcBlockcriteria();
-            $row->setDbCriteria('sort');
-            $row->setDbModifier('N/A');
-            $row->setDbValue('newest');
-            $row->setDbBlockId($newBl->getId());
-            $row->save();
+        // sort so that it is the newest item
+        $row = new CcBlockcriteria();
+        $row->setDbCriteria('sort');
+        $row->setDbModifier('N/A');
+        $row->setDbValue('newest');
+        $row->setDbBlockId($newBl->getId());
+        $row->save();
 
-            // match the track by ensuring the album title matches the podcast
-            $row = new CcBlockcriteria();
-            $row->setDbCriteria('album_title');
-            $row->setDbModifier('is');
-            $row->setDbValue($newBl->getName());
-            $row->setDbBlockId($newBl->getId());
-            $row->save();
+        // match the track by ensuring the album title matches the podcast
+        $row = new CcBlockcriteria();
+        $row->setDbCriteria('album_title');
+        $row->setDbModifier('is');
+        $row->setDbValue($title);
+        $row->setDbBlockId($newBl->getId());
+        $row->save();
 
-            $newPl = new Application_Model_Playlist();
-            $newPl->setName($podcast->getDbTitle());
-            $newPl->setCreator(Application_Model_User::getCurrentUser()->getId());
-            $row = new CcPlaylistcontents();
-            $row->setDbBlockId($newBl->getId());
-            $row->setDbPlaylistId($newPl->getId());
-            $row->setDbType(2);
-            $row->save();
-        }
+        $newPl = new Application_Model_Playlist();
+        $newPl->setName($title);
+        $newPl->setCreator(Application_Model_User::getCurrentUser()->getId());
+        $row = new CcPlaylistcontents();
+        $row->setDbBlockId($newBl->getId());
+        $row->setDbPlaylistId($newPl->getId());
+        $row->setDbType(2);
+        $row->save();
+    }
 
 
     public static function createStationPodcast()
diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js
index 38d5728db..70a125eb1 100644
--- a/airtime_mvc/public/js/airtime/library/podcast.js
+++ b/airtime_mvc/public/js/airtime/library/podcast.js
@@ -54,7 +54,18 @@ var AIRTIME = (function (AIRTIME) {
          * Generate a smartblock and playlist for this smartblock.
          */
         $scope.createSmartblock =  function () {
-            $.post(endpoint + "smartblock", {csrf_token: $("#csrf").val(), id: $scope.podcast.id}, callback);
+            // send smarblock creation instruction to API
+            $.post(
+                endpoint + "smartblock", 
+                {
+                    csrf_token: $("#csrf").val(), 
+                    id: $scope.podcast.id,
+                    title: $scope.podcast.title
+                }, 
+                callback
+            );
+            // save podcast
+            $scope.savePodcast();
         };
         /**
          * Close the tab and discard any changes made to the podcast data.