Skip to content

Commit aa24c0e

Browse files
Chartman123Chartman123
committed
update backend code so that it can load all submissions of a user
Signed-off-by: Christian Hartmann <chris-hartmann@gmx.de>
1 parent 2275ad9 commit aa24c0e

12 files changed

Lines changed: 60 additions & 83 deletions

File tree

‎lib/Controller/ApiController.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,11 @@ public function getSubmissions(int $formId, ?string $fileFormat = null): DataRes
11591159
}
11601160

11611161
// Load submissions and currently active questions
1162-
$submissions = $this->submissionService->getSubmissions($formId);
1162+
if (in_array(Constants::PERMISSION_RESULTS, $this->formsService->getPermissions($form))) {
1163+
$submissions = $this->submissionService->getSubmissions($formId);
1164+
} else {
1165+
$submissions = $this->submissionService->getSubmissions($formId, $this->currentUser->getUID());
1166+
}
11631167
$questions = $this->formsService->getQuestions($formId);
11641168

11651169
// Append Display Names
@@ -1338,7 +1342,7 @@ public function updateSubmission(int $formId, int $submissionId, array $answers,
13381342
$form = $this->loadFormForSubmission($formId, $shareHash);
13391343

13401344
if (!$form->getAllowEdit()) {
1341-
throw new OCSBadRequestException('Can only update if AllowEdit is set');
1345+
throw new OCSBadRequestException('Can only update if allowEdit is set');
13421346
}
13431347

13441348
$questions = $this->formsService->getQuestions($formId);
@@ -1353,12 +1357,12 @@ public function updateSubmission(int $formId, int $submissionId, array $answers,
13531357

13541358
// get existing submission of this user
13551359
try {
1356-
$submission = $this->submissionMapper->findByFormAndUser($form->getId(), $this->currentUser->getUID());
1360+
$submission = $this->submissionMapper->findById($form->getId());
13571361
} catch (DoesNotExistException $e) {
13581362
throw new OCSBadRequestException('Cannot update a non existing submission');
13591363
}
13601364

1361-
if ($submissionId != $submission->getId()) {
1365+
if ($this->currentUser->getUID() != $submission->getUserId()) {
13621366
throw new OCSForbiddenException('Can only update your own submissions');
13631367
}
13641368

‎lib/Db/SubmissionMapper.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@ public function findByForm(int $formId): array {
5151
* @param int $formId
5252
* @param string $userId
5353
*
54-
* @return Submission
55-
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
54+
* @return Submission[]
5655
* @throws \OCP\AppFramework\Db\DoesNotExistException if not found
5756
*/
58-
public function findByFormAndUser(int $formId, string $userId): Submission {
57+
public function findByFormAndUser(int $formId, string $userId): array {
5958
$qb = $this->db->getQueryBuilder();
6059

6160
$qb->select('*')
@@ -67,7 +66,7 @@ public function findByFormAndUser(int $formId, string $userId): Submission {
6766
//Newest submissions first
6867
->orderBy('timestamp', 'DESC');
6968

70-
return $this->findEntity($qb);
69+
return $this->findEntities($qb);
7170
}
7271

7372
/**
@@ -109,10 +108,11 @@ public function hasFormSubmissionsByUser(Form $form, string $userId): bool {
109108
/**
110109
* Count submissions by form
111110
* @param int $formId ID of the form to count submissions
111+
* @param null|string $userId (optional) ID of the current user, defaults to `null`
112112
* @throws \Exception
113113
*/
114-
public function countSubmissions(int $formId): int {
115-
return $this->countSubmissionsWithFilters($formId, null, -1);
114+
public function countSubmissions(int $formId, ?string $userId = null): int {
115+
return $this->countSubmissionsWithFilters($formId, $userId, -1);
116116
}
117117

118118
/**

lib/Migration/Version050000Date20250109201500.php renamed to lib/Migration/Version050200Date20250109201500.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use OCP\Migration\IOutput;
1616
use OCP\Migration\SimpleMigrationStep;
1717

18-
class Version050000Date20250109201500 extends SimpleMigrationStep {
18+
class Version050200Date20250109201500 extends SimpleMigrationStep {
1919

2020
/**
2121
* @param IOutput $output

‎lib/ResponseDefinitions.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@
123123
* shares: list<FormsShare>,
124124
* submissionCount?: int,
125125
* submissionMessage: ?string,
126-
* answers?: array<string,mixed>,
127-
* newSubmission?: bool,
128-
* submissionId?: int,
129126
* }
130127
*
131128
* @psalm-type FormsUploadedFile = array{

‎lib/Service/FormsService.php‎

Lines changed: 23 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
use OCA\Forms\Activity\ActivityManager;
1111
use OCA\Forms\Constants;
12-
use OCA\Forms\Db\AnswerMapper;
1312
use OCA\Forms\Db\Form;
1413
use OCA\Forms\Db\FormMapper;
1514
use OCA\Forms\Db\OptionMapper;
@@ -23,7 +22,6 @@
2322
use OCA\Forms\ResponseDefinitions;
2423
use OCP\AppFramework\Db\DoesNotExistException;
2524
use OCP\AppFramework\Db\IMapperException;
26-
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
2725
use OCP\EventDispatcher\IEventDispatcher;
2826
use OCP\Files\IRootFolder;
2927
use OCP\Files\NotFoundException;
@@ -56,7 +54,6 @@ public function __construct(
5654
private QuestionMapper $questionMapper,
5755
private ShareMapper $shareMapper,
5856
private SubmissionMapper $submissionMapper,
59-
private AnswerMapper $answerMapper,
6057
private ConfigService $configService,
6158
private IGroupManager $groupManager,
6259
private IUserManager $userManager,
@@ -99,32 +96,6 @@ private function getOptions(int $questionId): array {
9996
}
10097
}
10198

102-
private function getAnswers(int $formId, int $submissionId, string $userId): array {
103-
104-
$answerList = [];
105-
$answerEntities = $this->answerMapper->findBySubmission($submissionId);
106-
foreach ($answerEntities as $answerEntity) {
107-
$answer = $answerEntity->read();
108-
$questionId = $answer['questionId'];
109-
if (!array_key_exists($questionId, $answerList)) {
110-
$answerList[$questionId] = [];
111-
}
112-
$options = $this->getOptions($answer['questionId']);
113-
if (!empty($options)) {
114-
// match option text to option index
115-
foreach ($options as $option) {
116-
if ($option['text'] == $answer['text']) {
117-
$answerList[$questionId][] = strval($option['id']);
118-
}
119-
}
120-
} else {
121-
// copy the text
122-
$answerList[$questionId][] = $answer['text'];
123-
}
124-
}
125-
return $answerList;
126-
}
127-
12899
/**
129100
* Load questions corresponding to form
130101
*
@@ -222,25 +193,6 @@ public function getShares(int $formId): array {
222193
public function getForm(Form $form): array {
223194
$result = $form->read();
224195
$result['questions'] = $this->getQuestions($form->getId());
225-
226-
// add previous submission if there is one by this user for this form
227-
if ($this->currentUser->getUID() && $form->getAllowEdit()) {
228-
$submissionEntity = null;
229-
try {
230-
$submissionEntity = $this->submissionMapper->findByFormAndUser($form->getId(), $this->currentUser->getUID());
231-
$answers = $this->getAnswers($form->getId(), $submissionEntity->getId(), $this->currentUser->getUID());
232-
if (!empty($answers)) {
233-
$result['answers'] = $answers;
234-
$result['newSubmission'] = false;
235-
$result['submissionId'] = $submissionEntity->getId();
236-
}
237-
} catch (DoesNotExistException $e) {
238-
//handle silently
239-
} catch (MultipleObjectsReturnedException $e) {
240-
//handle silently
241-
}
242-
}
243-
244196
$result['shares'] = $this->getShares($form->getId());
245197

246198
// Append permissions for current user.
@@ -251,6 +203,11 @@ public function getForm(Form $form): array {
251203
// Append submissionCount if currentUser has permissions to see results
252204
if (in_array(Constants::PERMISSION_RESULTS, $result['permissions'])) {
253205
$result['submissionCount'] = $this->submissionMapper->countSubmissions($form->getId());
206+
} else {
207+
$userSubmissionCount = $this->submissionMapper->countSubmissions($form->getId(), $this->currentUser->getUID());
208+
if ($userSubmissionCount > 0) {
209+
$result['submissionCount'] = $userSubmissionCount;
210+
}
254211
}
255212

256213
if ($result['fileId']) {
@@ -287,6 +244,11 @@ public function getPartialFormArray(Form $form): array {
287244
// Append submissionCount if currentUser has permissions to see results
288245
if (in_array(Constants::PERMISSION_RESULTS, $result['permissions'])) {
289246
$result['submissionCount'] = $this->submissionMapper->countSubmissions($form->getId());
247+
} else {
248+
$userSubmissionCount = $this->submissionMapper->countSubmissions($form->getId(), $this->currentUser->getUID());
249+
if ($userSubmissionCount > 0) {
250+
$result['submissionCount'] = $userSubmissionCount;
251+
}
290252
}
291253

292254
return $result;
@@ -356,14 +318,24 @@ public function canEditForm(Form $form): bool {
356318
return in_array(Constants::PERMISSION_EDIT, $this->getPermissions($form));
357319
}
358320

321+
/**
322+
* Determines if the current user has permission to view the results of a given form.
323+
*
324+
* A user can see the results of a form if they have made at least one submission
325+
* to the form or possess the required permission to view results.
326+
*
327+
* @param Form $form The form for which the results visibility is being checked.
328+
* @return bool True if the user can see the results, false otherwise.
329+
*/
359330
/**
360331
* Can the current user see results of a form
361332
*
362333
* @param Form $form
363334
* @return boolean
364335
*/
365336
public function canSeeResults(Form $form): bool {
366-
return in_array(Constants::PERMISSION_RESULTS, $this->getPermissions($form));
337+
return $this->submissionMapper->countSubmissions($form->getId(), $this->currentUser->getUID()) > 0
338+
|| in_array(Constants::PERMISSION_RESULTS, $this->getPermissions($form));
367339
}
368340

369341
/**
@@ -399,7 +371,7 @@ public function canSubmit(Form $form): bool {
399371
return true;
400372
}
401373

402-
// Refuse access, if SubmitMultiple is not set and AllowEdit is not set and user already has taken part.
374+
// Refuse access, if submitMultiple is not set and allowEdit is not set and user already has taken part.
403375
if (
404376
!$form->getSubmitMultiple() && !$form->getAllowEdit() &&
405377
$this->submissionMapper->hasFormSubmissionsByUser($form, $this->currentUser->getUID())
@@ -493,7 +465,7 @@ private function isSharedFormShown(Form $form): bool {
493465
return false;
494466
}
495467

496-
// Shown if permitall and showntoall are both set.
468+
// Shown if permitAll and showToAll are both set.
497469
if ($form->getAccess()['permitAllUsers'] &&
498470
$form->getAccess()['showToAllUsers'] &&
499471
$this->configService->getAllowPermitAll() &&

‎lib/Service/SubmissionService.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ private function getAnswers(int $submissionId): array {
9191
* Get all submissions of a form
9292
*
9393
* @param int $formId the form id
94+
* @param string|null $userId optional user id to filter submissions
9495
* @return list<array{
9596
* id: int,
9697
* formId: int,
@@ -99,10 +100,15 @@ private function getAnswers(int $submissionId): array {
99100
* answers: list<FormsAnswer>,
100101
* }>
101102
*/
102-
public function getSubmissions(int $formId): array {
103+
public function getSubmissions(int $formId, ?string $userId = null): array {
103104
$submissionList = [];
104105
try {
105-
$submissionEntities = $this->submissionMapper->findByForm($formId);
106+
if (is_null($userId)) {
107+
$submissionEntities = $this->submissionMapper->findByForm($formId);
108+
} else {
109+
$submissionEntities = $this->submissionMapper->findByFormAndUser($formId, $userId);
110+
}
111+
106112
foreach ($submissionEntities as $submissionEntity) {
107113
$submission = $submissionEntity->read();
108114
$submission['answers'] = $this->getAnswers($submission['id']);

‎openapi.json‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -208,19 +208,6 @@
208208
"submissionMessage": {
209209
"type": "string",
210210
"nullable": true
211-
},
212-
"answers": {
213-
"type": "object",
214-
"additionalProperties": {
215-
"type": "object"
216-
}
217-
},
218-
"newSubmission": {
219-
"type": "boolean"
220-
},
221-
"submissionId": {
222-
"type": "integer",
223-
"format": "int64"
224211
}
225212
}
226213
},
@@ -3430,6 +3417,7 @@
34303417
"put": {
34313418
"operationId": "api-update-submission",
34323419
"summary": "Update an existing submission",
3420+
"description": "This endpoint allows CORS requests",
34333421
"tags": [
34343422
"api"
34353423
],

‎src/components/Questions/QuestionDropdown.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export default {
150150
}
151151
152152
const selected = this.values.map((id) =>
153-
this.options.find((option) => option.id === parseInt(id)),
153+
this.options.find((option) => option.id === id),
154154
)
155155
156156
return this.isMultiple ? selected : selected[0]

‎src/components/TopBar.vue‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ export default {
8787
type: Array,
8888
default: () => [],
8989
},
90+
91+
submissionCount: {
92+
type: Number,
93+
default: 0,
94+
},
9095
},
9196
9297
setup() {
@@ -124,8 +129,9 @@ export default {
124129
)
125130
},
126131
canSeeResults() {
127-
return this.permissions.includes(
128-
this.PERMISSION_TYPES.PERMISSION_RESULTS,
132+
return (
133+
this.permissions.includes(this.PERMISSION_TYPES.PERMISSION_RESULTS)
134+
|| this.submissionCount > 0
129135
)
130136
},
131137
canShare() {
@@ -136,6 +142,7 @@ export default {
136142
return (
137143
this.permissions.length === 1
138144
&& this.permissions.includes(this.PERMISSION_TYPES.PERMISSION_SUBMIT)
145+
&& this.submissionCount === 0
139146
)
140147
},
141148
},

‎src/views/Create.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
:archived="isFormArchived"
1414
:permissions="form?.permissions"
1515
:sidebar-opened="sidebarOpened"
16+
:submission-count="form?.submissionCount"
1617
@share-form="onShareForm" />
1718

1819
<NcEmptyContent

0 commit comments

Comments
 (0)