Skip to content

Make sure getUsersFavoritingObject can be run without a user #23184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Oct 7, 2020
Merged

Make sure getUsersFavoritingObject can be run without a user #23184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 33 additions & 19 deletions lib/private/TagManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,32 +38,27 @@
namespace OC;

use OC\Tagging\TagMapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\ITagManager;
use OCP\ITags;
use OCP\IUserSession;

class TagManager implements \OCP\ITagManager {
class TagManager implements ITagManager {

/**
* User session
*
* @var \OCP\IUserSession
*/
/** @var TagMapper */
private $mapper;

/** @var IUserSession */
private $userSession;

/**
* TagMapper
*
* @var TagMapper
*/
private $mapper;
/** @var IDBConnection */
private $connection;

/**
* Constructor.
*
* @param TagMapper $mapper Instance of the TagMapper abstraction layer.
* @param \OCP\IUserSession $userSession the user session
*/
public function __construct(TagMapper $mapper, \OCP\IUserSession $userSession) {
public function __construct(TagMapper $mapper, IUserSession $userSession, IDBConnection $connection) {
$this->mapper = $mapper;
$this->userSession = $userSession;
$this->connection = $connection;
}

/**
Expand All @@ -90,4 +85,23 @@ public function load($type, $defaultTags = [], $includeShared = false, $userId =
}
return new Tags($this->mapper, $userId, $type, $defaultTags);
}

/**
* Get all users who favorited an object
*
* @param string $objectType
* @param int $objectId
* @return array
*/
public function getUsersFavoritingObject(string $objectType, int $objectId): array {
$query = $this->connection->getQueryBuilder();
$query->select('uid')
->from('vcategory_to_object', 'o')
->innerJoin('o', 'vcategory', 'c', $query->expr()->eq('o.categoryid', 'c.id'))
->where($query->expr()->eq('objid', $query->createNamedParameter($objectId, IQueryBuilder::PARAM_INT)))
->andWhere($query->expr()->eq('c.type', $query->createNamedParameter($objectType)))
->andWhere($query->expr()->eq('c.category', $query->createNamedParameter(ITags::TAG_FAVORITE)));

return $query->execute()->fetchAll(\PDO::FETCH_COLUMN);
}
}
17 changes: 0 additions & 17 deletions lib/private/Tags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,23 +641,6 @@ public function removeFromFavorites($objid) {
return $this->unTag($objid, ITags::TAG_FAVORITE);
}

/**
* Get all users who favorited an object
*/
public function getUsersFavoritingObject($objId) {
$entries = [];

$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
$query->select('uid')
->from('vcategory_to_object', 'o')
->innerJoin('o', 'vcategory', 'c', $query->expr()->eq('o.categoryid', 'c.id'))
->where($query->expr()->eq('objid', $query->createNamedParameter($objId, IQueryBuilder::PARAM_INT)))
->andWhere($query->expr()->eq('c.type', $query->createNamedParameter($this->type)))
->andWhere($query->expr()->eq('c.category', $query->createNamedParameter(ITags::TAG_FAVORITE)));

return $query->execute()->fetchAll(\PDO::FETCH_COLUMN);
}

/**
* Creates a tag/object relation.
*
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/TagsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ protected function setUp(): void {

$this->objectType = $this->getUniqueID('type_');
$this->tagMapper = new \OC\Tagging\TagMapper(\OC::$server->getDatabaseConnection());
$this->tagMgr = new \OC\TagManager($this->tagMapper, $this->userSession);
$this->tagMgr = new \OC\TagManager($this->tagMapper, $this->userSession, \OC::$server->getDatabaseConnection());
}

protected function tearDown(): void {
Expand All @@ -78,7 +78,7 @@ public function testTagManagerWithoutUserReturnsNull() {
->expects($this->any())
->method('getUser')
->willReturn(null);
$this->tagMgr = new \OC\TagManager($this->tagMapper, $this->userSession);
$this->tagMgr = new \OC\TagManager($this->tagMapper, $this->userSession, \OC::$server->getDatabaseConnection());
$this->assertNull($this->tagMgr->load($this->objectType));
}

Expand Down