Skip to content

Commit

Permalink
MDL-67585 core_course: Service factory for course content items.
Browse files Browse the repository at this point in the history
  • Loading branch information
abgreeve authored and snake committed Feb 20, 2020
1 parent 806e736 commit 5c78541
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 24 deletions.
56 changes: 56 additions & 0 deletions course/classes/local/factory/content_item_service_factory.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Contains the service_factory, a locator for services for course content items.
*
* Services encapsulate the business logic, and any data manipulation code, and are what clients should interact with.
*
* @package core_course
* @copyright 2020 Adrian Greeve <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_course\local\factory;

defined('MOODLE_INTERNAL') || die();

use core_course\local\repository\caching_content_item_readonly_repository;
use core_course\local\repository\content_item_readonly_repository;
use core_course\local\service\content_item_service;

/**
* Class service_factory, providing functions for location of service objects for course content items.
*
* This class is responsible for providing service objects to clients only.
*
* @copyright 2020 Adrian Greeve <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class content_item_service_factory {

/**
* Returns a basic service object providing operations for course content items.
*
* @return content_item_service
*/
public static function get_content_item_service(): content_item_service {
return new content_item_service(
new caching_content_item_readonly_repository(
\cache::make('core', 'user_course_content_items'),
new content_item_readonly_repository()
)
);
}
}
18 changes: 3 additions & 15 deletions course/externallib.php
Original file line number Diff line number Diff line change
Expand Up @@ -4257,12 +4257,7 @@ public static function add_content_item_to_user_favourites(string $componentname

self::validate_context(context_user::instance($USER->id));

$contentitemservice = new \core_course\local\service\content_item_service(
new \core_course\local\repository\caching_content_item_readonly_repository(
\cache::make('core', 'user_course_content_items'),
new \core_course\local\repository\content_item_readonly_repository()
)
);
$contentitemservice = \core_course\local\factory\content_item_service_factory::get_content_item_service();

return $contentitemservice->add_to_user_favourites($USER, $componentname, $contentitemid);
}
Expand Down Expand Up @@ -4311,12 +4306,7 @@ public static function remove_content_item_from_user_favourites(string $componen

self::validate_context(context_user::instance($USER->id));

$contentitemservice = new \core_course\local\service\content_item_service(
new \core_course\local\repository\caching_content_item_readonly_repository(
\cache::make('core', 'user_course_content_items'),
new \core_course\local\repository\content_item_readonly_repository()
)
);
$contentitemservice = \core_course\local\factory\content_item_service_factory::get_content_item_service();

return $contentitemservice->remove_from_user_favourites($USER, $componentname, $contentitemid);
}
Expand Down Expand Up @@ -4373,9 +4363,7 @@ public static function get_course_content_items(int $courseid) {
self::validate_context($coursecontext);
$course = get_course($courseid);

$contentitemservice = new \core_course\local\service\content_item_service(
new \core_course\local\repository\content_item_readonly_repository()
);
$contentitemservice = \core_course\local\factory\content_item_service_factory::get_content_item_service();

$contentitems = $contentitemservice->get_content_items_for_user_in_course($USER, $course);
return ['content_items' => $contentitems];
Expand Down
4 changes: 1 addition & 3 deletions course/format/singleactivity/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -387,9 +387,7 @@ public function activity_has_subtypes() {
if (!($modname = $this->get_activitytype())) {
return null;
}
$contentitemservice = new \core_course\local\service\content_item_service(
new \core_course\local\repository\content_item_readonly_repository()
);
$contentitemservice = \core_course\local\factory\content_item_service_factory::get_content_item_service();
$metadata = $contentitemservice->get_content_items_for_user_in_course($USER, $this->get_course());

// If there are multiple items originating from this mod_xxx component, then it's deemed to have subtypes.
Expand Down
7 changes: 1 addition & 6 deletions course/renderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -279,12 +279,7 @@ function course_section_add_cm_control($course, $section, $sectionreturn = null,
}

// Retrieve all modules with associated metadata
$contentitemservice = new \core_course\local\service\content_item_service(
new \core_course\local\repository\caching_content_item_readonly_repository(
\cache::make('core', 'user_course_content_items'),
new \core_course\local\repository\content_item_readonly_repository()
)
);
$contentitemservice = \core_course\local\factory\content_item_service_factory::get_content_item_service();
$urlparams = ['section' => $section];
if (!is_null($sectionreturn)) {
$urlparams['sr'] = $sectionreturn;
Expand Down

0 comments on commit 5c78541

Please sign in to comment.