Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-06 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Upgraded database schema to enforce constraints in UserToUserGroup table

Browse Source 
* [ADD] Unit testing. Work in progress
* [MOD] Code refactoring
This commit is contained in:
nuxsmin
2018-07-25 01:03:47 +02:00
parent b786f26213
commit cf41764c22
8 changed files with 458 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/SP/Repositories/UserGroup/UserToUserGroupRepository.php
View File

@@ -62,7 +62,7 @@ class UserToUserGroupRepository extends Repository
*
* @param $userId
*
* @return array
* @return \SP\Storage\Database\QueryResult
* @throws \SP\Core\Exceptions\ConstraintException
* @throws \SP\Core\Exceptions\QueryException
*/
@@ -72,7 +72,7 @@ class UserToUserGroupRepository extends Repository
$queryData->setQuery('SELECT userGroupId FROM UserToUserGroup WHERE userId = ?');
$queryData->addParam($userId);
return $this->db->doSelect($queryData)->getDataAsArray();
return $this->db->doSelect($queryData);
}
/**
@@ -81,7 +81,7 @@ class UserToUserGroupRepository extends Repository
* @param int $id
* @param array $users
*
* @return UserToUserGroupRepository
* @return int
* @throws \SP\Core\Exceptions\ConstraintException
* @throws \SP\Core\Exceptions\QueryException
*/
@@ -96,7 +96,7 @@ class UserToUserGroupRepository extends Repository
*
* @param $id int
*
* @return $this
* @return int
* @throws \SP\Core\Exceptions\ConstraintException
* @throws \SP\Core\Exceptions\QueryException
*/
@@ -107,9 +107,7 @@ class UserToUserGroupRepository extends Repository
$queryData->addParam($id);
$queryData->setOnErrorMessage(__u('Error al eliminar los usuarios del grupo'));
$this->db->doQuery($queryData);
return $this;
return $this->db->doQuery($queryData)->getAffectedNumRows();
}
/**
@@ -118,12 +116,16 @@ class UserToUserGroupRepository extends Repository
* @param int $groupId
* @param array $users
*
* @return UserToUserGroupRepository
* @return int
* @throws \SP\Core\Exceptions\ConstraintException
* @throws \SP\Core\Exceptions\QueryException
*/
public function add($groupId, array $users)
{
if (empty($users)) {
return 0;
}
$query = /** @lang SQL */
'INSERT INTO UserToUserGroup (userId, userGroupId) VALUES ' . $this->getParamsFromArray($users, '(?,?)');
@@ -137,9 +139,7 @@ class UserToUserGroupRepository extends Repository
$queryData->setOnErrorMessage(__u('Error al asignar los usuarios al grupo'));
$this->db->doQuery($queryData);
return $this;
return $this->db->doQuery($queryData)->getAffectedNumRows();
}
/**
@@ -147,7 +147,7 @@ class UserToUserGroupRepository extends Repository
*
* @param $id int
*
* @return UserToUserGroupData[]
* @return \SP\Storage\Database\QueryResult
* @throws \SP\Core\Exceptions\ConstraintException
* @throws \SP\Core\Exceptions\QueryException
*/
@@ -158,6 +158,6 @@ class UserToUserGroupRepository extends Repository
$queryData->setQuery('SELECT userGroupId, userId FROM UserToUserGroup WHERE userGroupId = ?');
$queryData->addParam($id);
return $this->db->doSelect($queryData)->getDataAsArray();
return $this->db->doSelect($queryData);
}
}