Course Article Page

www/application/classes/Controller/Admin.php

@@ -204,11 +204,27 @@ public function scripts_resetArticlesTimeline()
             $articles[$key] = $article;
         }
 
+        $courses = Model_Courses::getActiveCourses();
+
+        /** rebuld array*/
+        foreach ($courses as $key => $value) {
+            $course = array(
+                'id' => $courses[$key]->id,
+                'dt_create' => $courses[$key]->dt_publish,
+            );
+            $courses[$key] = $course;
+        }
+
         // #TODO add to $feed array with courses later
-        $feed = new Model_Feed_Articles('article');
-        $feed->clear();
-        $feed->init($articles);
+        $feed_articles = new Model_Feed_Articles('article');
+        $feed_courses = new Model_Feed_Articles('course');
+
+        $feed_articles->clear();
+        $feed_courses->clear();
+
+        $feed_articles->init($articles);
+        $feed_courses->init($courses);
 
-        return 'Articles timeline was successfully updated';
+        return 'Articles and Courses timeline was successfully updated';
     }
 }

www/application/classes/Controller/Articles/Index.php

@@ -127,15 +127,53 @@ public function action_show()
      */
     public function getFeed()
     {
+        $cacheKey = LANG . ':articles-feed';
+        $cached = $this->memcache->get($cacheKey);
+
+        if ($cached) {
+            return $cached;
+        }
+
+        $articles = new Model_Article();
+        $article_items  = $articles->getActiveArticles($clearCache=true);
+
+        $courses = new Model_Courses();
+        $course_items  = $courses->getActiveCourses(false, true);
+
         /**
-         * Prepare Feed model
+         * Prepare feed items array
          */
-        $feed = new Model_Feed_Articles();
+        $feed_items = [];
+        $do_not_add_these_articles_to_feed = [];
 
         /**
-         * Get all published articles
+         * Add course articles to feed items
          */
-        $feed_items  = $feed->get();
+        foreach ($course_items as $course) {
+            $feed_items[$course->dt_publish] = $course;
+            $coauthorship = new Model_Coauthors($course->id);
+            $course->coauthor = Model_User::get($coauthorship->user_id);
+
+            foreach ($course->course_articles as $article) {
+                $do_not_add_these_articles_to_feed[] = $article->id;
+            }
+        }
+
+        /**
+         * Add articles to feed items if they weren't added as part of course
+         */
+        foreach ($article_items as $article) {
+            if (in_array($article->id, $do_not_add_these_articles_to_feed)) {
+                continue;
+            }
+
+            $feed_items[$article->dt_publish] = $article;
+            $coauthorship = new Model_Coauthors($article->id);
+            $article->coauthor = Model_User::get($coauthorship->user_id);
+        }
+
+        ksort($feed_items);
+        $feed_items = array_reverse($feed_items);
 
         /**
          * List of published articles ids
@@ -175,6 +213,8 @@ public function getFeed()
             }
         }
 
+        $this->memcache->set($cacheKey, $feed_items);
+
         return $feed_items;
     }
 
@@ -227,10 +267,12 @@ private function getArticlesFromCourse($articleId, $courseId)
          * search in array of article ids the position of current article
          */
         $counter = 0;
+        $position = 0;
+
         foreach ($course_articles as $articles) {
-            $articleList[] = Model_Article::get($articles['article_id']);
+            $articleList[] = Model_Article::get($articles->id);
 
-            if ($articles['article_id'] == $articleId) {
+            if ($articles->id == $articleId) {
                 $position = $counter;
             }
 
@@ -242,14 +284,14 @@ private function getArticlesFromCourse($articleId, $courseId)
          * If next or previous article exists, then we send it to view
          */
         if ($position + 1 < count($course_articles)) {
-            $nextArticleId = $course_articles[$position + 1]['article_id'];
+            $nextArticleId = $course_articles[$position + 1]->id;
             $nextArticle = Model_Article::get($nextArticleId);
 
             $this->view["nextArticle"] = $nextArticle;
         }
 
         if ($position - 1 >= 0) {
-            $previousArticleId = $course_articles[$position - 1]['article_id'];
+            $previousArticleId = $course_articles[$position - 1]->id;
             $previousArticle = Model_Article::get($previousArticleId);
 
             $this->view["previousArticle"] = $previousArticle;

www/application/classes/Controller/Articles/Modify.php

@@ -216,7 +216,9 @@ public function action_save()
                 $courses_to_delete = array_diff($current_courses, $courses_ids);
                 $courses_to_add = array_diff($courses_ids, $current_courses);
 
-                Model_Courses::deleteArticles($article->id, $courses_to_delete);
+                if ($courses_to_delete) {
+                    Model_Courses::deleteArticles($article->id, $courses_to_delete);
+                }
 
                 foreach ($courses_to_add as $course_id) {
                     Model_Courses::addArticle($article->id, $course_id);
@@ -238,6 +240,10 @@ public function action_save()
             $recentArticlesFeed->remove($article->id);
         }
 
+        // Очистка кэша фидов
+        $this->memcache->delete('en:articles-feed');
+        $this->memcache->delete('ru:articles-feed');
+
         // Если поле uri пустое, то редиректить на обычный роут /article/id
         $redirect = ($uri) ? '/' . $article->uri : '/article/' . $article->id;
 

www/application/classes/Controller/Courses/Index.php

@@ -5,18 +5,25 @@ class Controller_Courses_Index extends Controller_Base_preDispatch
     public function action_show()
     {
         $courseId = $this->request->param('id') ?: $this->request->query('id');
+        $isAlias = $this->request->query('id');
 
         $course = Model_Courses::get($courseId);
 
         if ($course->id == 0) {
             throw new HTTP_Exception_404();
         }
 
+        if (!empty($courseId)) {
+            if ($course->uri && !$isAlias) {
+                $this->redirect($course->uri);
+            }
+        }
+
         $this->view["course"] = $course;
 
         $this->title = $course->title;
         $this->description = $course->description;
 
         $this->template->content = View::factory('templates/courses/course', $this->view);
     }
-}
+}

www/application/classes/Controller/Courses/Modify.php

@@ -77,6 +77,9 @@ public function action_save()
                 } else {
                     $insertedId   = $course->insert();
                     $course->uri = Model_Aliases::addAlias($alias, Aliases_Controller::COURSE, $insertedId);
+                    // If course is published right after creation set 'dt_publish' immediately
+                    $course->dt_publish = $course->is_published ? date('Y-m-d H:i:s') : null;
+                    $course->update();
                 }
 
                 if ($course->is_published && !$course->is_removed) {

www/application/classes/Model/Courses.php

@@ -15,6 +15,8 @@ class Model_Courses extends Model
     public $description;
     public $cover;
     public $is_big_cover;
+    public $course_articles = [];
+    public $course_authors = [];
     public $dt_publish;
     public $dt_create;
     public $dt_update;
@@ -83,6 +85,9 @@ private function fillByRow($course_row)
             }
         }
 
+        $this->course_articles = self::getArticles($this->id);
+        $this->course_authors  = $this->getUniqueCourseAuthors();
+
         return $this;
     }
 
@@ -182,7 +187,7 @@ public static function deleteArticles($article_id, $courses_ids = 0)
     {
         $deleteQuery = Dao_CoursesArticles::delete()->where('article_id', '=', $article_id);
 
-        if (!$courses_ids) {
+        if ($courses_ids === 0) {
             return $deleteQuery->execute();
         }
 
@@ -215,13 +220,32 @@ public static function get($id = 0, $needClearCache = false)
     }
 
     /**
-     * Получить все активные (опубликованные и не удалённые курсы) в порядке убывания ID.
+     *  Return
+     *  a) All published courses to output them on Article editing page
+     *  b) All published courses, containing at least one Article to show in feed
+     *
+     * @return Model_Courses[] - array of Model_Courses
      */
-    public static function getActiveCourses($clearCache = false)
+    public static function getActiveCourses($clearCache = false, $excludeCoursesWithoutArticles = false)
     {
-        return Model_Courses::getCourses(false, false, !$clearCache ? Date::MINUTE * 5 : null);
-    }
+        $active_courses = Model_Courses::getCourses(false, false, !$clearCache ? Date::MINUTE * 5 : null);
+        $courses_with_articles = array();
+
+        if ($excludeCoursesWithoutArticles) {
+
+            foreach ($active_courses as $course) {
+                if (self::getArticles($course->id)) {
+                    $courses_with_articles[] = $course;
+                }
+            }
+
+            return $courses_with_articles;
 
+        } else {
+            return $active_courses;
+        }
+
+    }
 
     /**
      * Получить все неудалённые курсы в порядке убывания ID.
@@ -284,17 +308,65 @@ private static function rowsToModels($course_rows)
     }
 
     /**
-     * Получить id статей, входящих в курс
-     *
-     * @param $course_id
-     * @return bool|object
+     * Get Articles from Course
+     * @param [int] $courseId  - ID of Course
+     * @return Model_Article[] - Array of Articles
      */
     public static function getArticles($course_id)
     {
         if (!$course_id) {
             return false;
         }
 
-        return Dao_CoursesArticles::select('article_id')->where('course_id', '=', $course_id)->execute();
+        $articles_ids = Dao_CoursesArticles::select('article_id')->where('course_id', '=', $course_id)->execute();
+
+        /** $articleList - empty array. Needs to fill by article ids */
+        $articleList = array();
+
+        /**
+         * If Course has Articles
+         */
+        if ($articles_ids) {
+            foreach ($articles_ids as $article) {
+                $course_article = Model_Article::get($article['article_id']);
+
+                /**
+                 * Show only published Articles in Course
+                 */
+                if ($course_article->is_published) {
+                    $articleList[] = $course_article;
+                }
+            }
+            /** Get Articles with Coauthors to display on Course Page */
+            foreach ($articleList as $article) {
+                $coauthorship      = new Model_Coauthors($article->id);
+                $article->coauthor = Model_User::get($coauthorship->user_id);
+            }
+        }
+
+        return $articleList;
+    }
+
+     /**
+     * Return unique article authors from the Course
+     * @param  Model_Article[] - Articles included in specific Course
+     * @return Model_User[]    - Array of unique Course authors
+     */
+    public function getUniqueCourseAuthors()
+    {
+        $course_articles = self::getArticles($this->id);
+        $course_authors_ids = array();
+        $course_authors     = array();
+
+        foreach ($course_articles as $article) {
+            $author_id = $article->author->id;
+
+            if (!in_array($author_id, $course_authors_ids))
+            {
+                $course_authors_ids[] = $author_id;
+                $course_authors[] = Model_User::get($author_id);
+            }
+        }
+        return $course_authors;
     }
 }

www/application/config/system-aliases.php

@@ -9,6 +9,7 @@
         '',
         'ajax',
         'admin',
+        'ajax',
         'article',
         'articles',
         'auth',

www/application/views/main.php

@@ -37,7 +37,7 @@
     <link rel="apple-touch-icon-precomposed" sizes="180x180" href="/apple-touch-icon-180x180.png" />
 
     <? if (!empty($_SERVER['HAWK_TOKEN'])): ?>
-        <script src="https://cdn.rawgit.com/codex-team/hawk.client/5f545116/hawk.js" onload="hawk.init('<?= $_SERVER['HAWK_TOKEN'] ?>')"></script>
+        <script src="https://cdn.rawgit.com/codex-team/hawk.javascript/master/hawk.js" onload="hawk.init({token: '<?= $_SERVER['HAWK_TOKEN'] ?>', revision: <?= filemtime('public/build/bundle.js') ?>})"></script>
     <? endif; ?>
 
 </head>