moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-66269 mod_forum: refactor post vault class to remove duplications

Browse source 
Part of MDL-66075.
This commit is contained in:
Shamim Rezaie 2019-08-17 19:23:57 +10:00 • committed by Simey Lameze
parent e61a41b425
commit 1ff734a47d
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
mod/forum/classes/local/vaults/post.php
View file

@ -112,22 +112,7 @@ class post extends db_table_vault {
bool $canseeprivatereplies, bool $canseeprivatereplies,
string $orderby = 'created ASC' string $orderby = 'created ASC'
) : array { ) : array {
$alias = $this->get_table_alias(); return $this->get_from_discussion_ids($user, [$discussionid], $canseeprivatereplies, $orderby);
[
'where' => $privatewhere,
'params' => $privateparams,
] = $this->get_private_reply_sql($user, $canseeprivatereplies);
$wheresql = "{$alias}.discussion = :discussionid {$privatewhere}";
$orderbysql = $alias . '.' . $orderby;
$sql = $this->generate_get_records_sql($wheresql, $orderbysql);
$records = $this->get_db()->get_records_sql($sql, array_merge([
'discussionid' => $discussionid,
], $privateparams));
return $this->transform_db_records_to_entities($records);
} }
/** /**
@ -136,9 +121,15 @@ class post extends db_table_vault {
* @param stdClass $user The user to check the unread count for * @param stdClass $user The user to check the unread count for
* @param int[] $discussionids The list of discussion ids to load posts for * @param int[] $discussionids The list of discussion ids to load posts for
* @param bool $canseeprivatereplies Whether this user can see all private replies or not * @param bool $canseeprivatereplies Whether this user can see all private replies or not
* @param string $orderby Order the results
* @return post_entity[] * @return post_entity[]
*/ */
public function get_from_discussion_ids(stdClass $user, array $discussionids, bool $canseeprivatereplies) : array { public function get_from_discussion_ids(
stdClass $user,
array $discussionids,
bool $canseeprivatereplies,
string $orderby = ''
) : array {
if (empty($discussionids)) { if (empty($discussionids)) {
return []; return [];
} }
@ -153,7 +144,13 @@ class post extends db_table_vault {
$wheresql = "{$alias}.discussion {$insql} {$privatewhere}"; $wheresql = "{$alias}.discussion {$insql} {$privatewhere}";
$sql = $this->generate_get_records_sql($wheresql, ''); if ($orderby) {
$orderbysql = $alias . '.' . $orderby;
} else {
$orderbysql = '';
}
$sql = $this->generate_get_records_sql($wheresql, $orderbysql);
$records = $this->get_db()->get_records_sql($sql, array_merge($params, $privateparams)); $records = $this->get_db()->get_records_sql($sql, array_merge($params, $privateparams));
return $this->transform_db_records_to_entities($records); return $this->transform_db_records_to_entities($records);