deblan/forms
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Convert AccessList

Browse source 
Signed-off-by: Jonas Rittershofer <jotoeri@users.noreply.github.com>
This commit is contained in:
Jonas Rittershofer 2020-04-09 18:21:59 +02:00
commit 68f2d9f2c6
8 changed files with 120 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/Db/Form.php
View file

@ -37,8 +37,8 @@ use OCP\AppFramework\Db\Entity;
* @method void setDescription(string $value)
* @method string getOwnerId()
* @method void setOwnerId(string $value)
* @method string getAccess()
* @method void setAccess(string $value)
* @method array getAccess()
* @method void setAccess(array $value)
* @method string getCreated()
* @method void setCreated(string $value)
* @method string getExpirationDate()
@ -54,7 +54,7 @@ class Form extends Entity {
protected $title;
protected $description;
protected $ownerId;
protected $access;
protected $accessJson;
protected $created;
protected $expirationDate;
protected $isAnonymous;
@ -68,11 +68,22 @@ class Form extends Entity {
$this->addType('submitOnce', 'bool');
}
/**
* JSON-Decoding of access-column.
*/
public function getAccess(): array {
return json_decode($this->getAccessJson(), true); // assoc=true, => Convert to associative Array
}
/**
* JSON-Encoding of access-column.
*/
public function setAccess(array $access) {
$this->setAccessJson(json_encode($access));
}
public function read() {
$accessType = $this->getAccess();
if (!strpos('|public|hidden|registered', $accessType)) {
$accessType = 'select';
}
if ($this->getExpirationDate() === null) {
$expired = false;
$expires = false;
@ -89,7 +100,7 @@ class Form extends Entity {
'ownerId' => $this->getOwnerId(),
'ownerDisplayName' => \OC_User::getDisplayName($this->getOwnerId()),
'created' => $this->getCreated(),
'access' => $accessType,
'access' => $this->getAccess(),
'expires' => $expires,
'expired' => $expired,
'expirationDate' => $this->getExpirationDate(),

11
lib/Db/SubmissionMapper.php
View file

@ -66,7 +66,7 @@ class SubmissionMapper extends QBMapper {
* @throws \OCP\AppFramework\Db\DoesNotExistException if not found
* @return array
*/
public function findParticipantsByForm(int $formId, $limit = null, $offset = null): array {
public function findParticipantsByForm(int $formId): array {
$qb = $this->db->getQueryBuilder();
$qb->select('user_id')
@ -75,7 +75,14 @@ class SubmissionMapper extends QBMapper {
$qb->expr()->eq('form_id', $qb->createNamedParameter($formId, IQueryBuilder::PARAM_INT))
);
return $this->findEntities($qb);
$submissionEntities = $this->findEntities($qb);
// From array of submissionEntities produce array of userIds.
$userIds = array_map(function($submissionEntity) {
return $submissionEntity->getUserId();
}, $submissionEntities);
return $userIds;
}
/**