Skip to content

[stable5.4] fix(analytics): count answers per question and handle forms without answers #3876

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
Chartman123 merged 2 commits into from
Nov 11, 2026
Merged

[stable5.4] fix(analytics): count answers per question and handle forms without answers #3876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58fab9d
fix(analytics): do not fail on forms without answers
AndyScherzinger Nov 10, 2026
2ba7b04
fix(analytics): count the answers of each question separately
AndyScherzinger Nov 10, 2026
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
17 changes: 8 additions & 9 deletions lib/Analytics/AnalyticsDatasource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public function getTemplate(): array {
public function readData($option): array {
$questionMap = [];
$answerCounts = [];
$results = [];

$formId = $option['formId'];

Expand All @@ -109,19 +110,17 @@ public function readData($option): array {
$submissions = $this->submissionService->getSubmissions($formId);
foreach ($submissions as $submission) {
foreach ($submission['answers'] as $answer) {
$questionText = $questionMap[$answer['questionId']];
$key = $questionText . '|' . $answer['text'];
if (isset($answerCounts[$key])) {
$answerCounts[$key]++;
} else {
$answerCounts[$key] = 1;
if (!isset($questionMap[$answer['questionId']])) {
continue;
}
$answerCounts[$answer['questionId']][$answer['text']] = ($answerCounts[$answer['questionId']][$answer['text']] ?? 0) + 1;
}
}

foreach ($answerCounts as $key => $count) {
[$questionText, $text] = explode('|', $key);
$results[] = [$questionText, $text, $count];
foreach ($answerCounts as $questionId => $counts) {
foreach ($counts as $text => $count) {
$results[] = [$questionMap[$questionId], (string)$text, $count];
}
}

// Sort by questionText ascending and count descending
Expand Down
43 changes: 43 additions & 0 deletions tests/Unit/Analytics/AnalyticsDatasourceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,47 @@ public function testReadData() {

$this->assertEquals($expectedData, $data);
}

public function testReadDataWithoutAnswers(): void {
$this->formsService->method('getQuestions')->willReturn([['id' => 1, 'text' => 'Question 1']]);
$this->submissionService->method('getSubmissions')->willReturn([]);
$this->l10n->method('t')->willReturnArgument(0);

$this->assertSame([], $this->analyticsDatasource->readData(['formId' => 123])['data']);
}

public function testReadDataSkipsAnswersOfDeletedQuestions(): void {
$this->formsService->method('getQuestions')->willReturn([['id' => 1, 'text' => 'Question 1']]);
$this->submissionService->method('getSubmissions')->willReturn([
['answers' => [
['questionId' => 1, 'text' => 'Answer 1'],
['questionId' => 2, 'text' => 'Answer of a deleted question'],
]],
]);
$this->l10n->method('t')->willReturnArgument(0);

$this->assertSame([['Question 1', 'Answer 1', 1]], $this->analyticsDatasource->readData(['formId' => 123])['data']);
}

public function testReadDataKeepsSeparatorsAndQuestionsWithTheSameTitle(): void {
$this->formsService->method('getQuestions')->willReturn([
['id' => 1, 'text' => 'Pick A|B'],
['id' => 2, 'text' => 'Comment'],
['id' => 3, 'text' => 'Comment'],
]);
$this->submissionService->method('getSubmissions')->willReturn([
['answers' => [
['questionId' => 1, 'text' => 'a|b'],
['questionId' => 2, 'text' => '5'],
['questionId' => 3, 'text' => '5'],
]],
]);
$this->l10n->method('t')->willReturnArgument(0);

$this->assertSame([
['Comment', '5', 1],
['Comment', '5', 1],
['Pick A|B', 'a|b', 1],
], $this->analyticsDatasource->readData(['formId' => 123])['data']);
}
}
Loading