mirror of
https://github.com/MarijnDoeve/TijdVoorDeTest.git
synced 2026-07-05 15:10:16 +02:00
Answer on candidate (#72)
* Add Penalty Seconds on tests * Refactors and start of candidate answer relation * Add breadcrumbs and UI consistency updates across backoffice templates * Add breadcrumbs and UI consistency updates across backoffice templates * Add Dutch translations for email verification and security messages * Rector * Refactor for code consistency and type safety assertions across repositories and entities * Refactor candidate-related logic to optimize queries, improve template separation, and add "Answer Mapping" functionality. * Cleanup * Update Symfony * Add coderabbit config * Fixes from coderabbit
This commit is contained in:
@@ -13,7 +13,7 @@ use Symfony\Component\Uid\Uuid;
|
||||
use Tvdt\Repository\AnswerRepository;
|
||||
|
||||
#[ORM\Entity(repositoryClass: AnswerRepository::class)]
|
||||
class Answer
|
||||
class Answer implements \Stringable
|
||||
{
|
||||
#[ORM\Column(type: UuidType::NAME)]
|
||||
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
||||
@@ -57,4 +57,9 @@ class Answer
|
||||
{
|
||||
$this->candidates->removeElement($candidate);
|
||||
}
|
||||
|
||||
public function __toString(): string
|
||||
{
|
||||
return $this->text;
|
||||
}
|
||||
}
|
||||
|
||||
+3
-17
@@ -13,7 +13,7 @@ use Symfony\Component\Uid\Uuid;
|
||||
use Tvdt\Repository\QuestionRepository;
|
||||
|
||||
#[ORM\Entity(repositoryClass: QuestionRepository::class)]
|
||||
class Question
|
||||
class Question implements \Stringable
|
||||
{
|
||||
#[ORM\Column(type: UuidType::NAME)]
|
||||
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
||||
@@ -54,22 +54,8 @@ class Question
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getErrors(): ?string
|
||||
public function __toString(): string
|
||||
{
|
||||
if (0 === \count($this->answers)) {
|
||||
return 'This question has no answers';
|
||||
}
|
||||
|
||||
$correctAnswers = $this->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer)->count();
|
||||
|
||||
if (0 === $correctAnswers) {
|
||||
return 'This question has no correct answers';
|
||||
}
|
||||
|
||||
if ($correctAnswers > 1) {
|
||||
return 'This question has multiple correct answers';
|
||||
}
|
||||
|
||||
return null;
|
||||
return $this->question ?? '';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,4 +68,115 @@ class Quiz
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get errors for all questions in the quiz.
|
||||
* Returns an array where keys are question IDs and values are error messages.
|
||||
*
|
||||
* @return array<string, string>
|
||||
*/
|
||||
public function getQuestionErrors(): array
|
||||
{
|
||||
$errors = [];
|
||||
|
||||
// Check if any answer in the entire quiz has candidate relations
|
||||
$hasCandidateRelations = false;
|
||||
foreach ($this->questions as $question) {
|
||||
foreach ($question->answers as $answer) {
|
||||
if ($answer->candidates->count() > 0) {
|
||||
$hasCandidateRelations = true;
|
||||
break 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Pre-compute active candidates once for all questions
|
||||
$activeCandidates = [];
|
||||
if ($hasCandidateRelations) {
|
||||
foreach ($this->candidateData as $quizCandidate) {
|
||||
if ($quizCandidate->active) {
|
||||
$activeCandidates[] = $quizCandidate->candidate;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($this->questions as $question) {
|
||||
$error = $this->getQuestionError($question, $hasCandidateRelations, $activeCandidates);
|
||||
if (null !== $error) {
|
||||
$errors[$question->id->toString()] = $error;
|
||||
}
|
||||
}
|
||||
|
||||
return $errors;
|
||||
}
|
||||
|
||||
/** @param list<Candidate> $activeCandidates */
|
||||
private function getQuestionError(Question $question, bool $hasCandidateRelations, array $activeCandidates): ?string
|
||||
{
|
||||
if (0 === \count($question->answers)) {
|
||||
return 'This question has no answers';
|
||||
}
|
||||
|
||||
$correctAnswers = $question->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer)->count();
|
||||
|
||||
if (0 === $correctAnswers) {
|
||||
return 'This question has no correct answers';
|
||||
}
|
||||
|
||||
if ($correctAnswers > 1) {
|
||||
return 'This question has multiple correct answers';
|
||||
}
|
||||
|
||||
// Only validate candidate-answer relations if at least one exists in the quiz
|
||||
if ($hasCandidateRelations) {
|
||||
$candidateCounts = [];
|
||||
|
||||
// Count how many times each candidate appears in answers
|
||||
foreach ($question->answers as $answer) {
|
||||
foreach ($answer->candidates as $candidate) {
|
||||
$candidateId = $candidate->id->toString();
|
||||
if (!isset($candidateCounts[$candidateId])) {
|
||||
$candidateCounts[$candidateId] = ['name' => $candidate->name, 'count' => 0];
|
||||
}
|
||||
|
||||
++$candidateCounts[$candidateId]['count'];
|
||||
}
|
||||
}
|
||||
|
||||
// Check for missing and duplicate candidates (only active ones)
|
||||
$missing = [];
|
||||
$duplicates = [];
|
||||
|
||||
foreach ($activeCandidates as $candidate) {
|
||||
$candidateId = $candidate->id->toString();
|
||||
$count = $candidateCounts[$candidateId]['count'] ?? 0;
|
||||
|
||||
if (0 === $count) {
|
||||
$missing[] = $candidate->name;
|
||||
} elseif ($count > 1) {
|
||||
$duplicates[] = $candidate->name;
|
||||
}
|
||||
}
|
||||
|
||||
if ([] !== $missing || [] !== $duplicates) {
|
||||
$errors = [];
|
||||
if ([] !== $missing) {
|
||||
// If all active candidates are missing, show a special message
|
||||
if (\count($missing) === \count($activeCandidates)) {
|
||||
$errors[] = 'No candidates assigned to this question';
|
||||
} else {
|
||||
$errors[] = 'Missing candidates: '.implode(', ', $missing);
|
||||
}
|
||||
}
|
||||
|
||||
if ([] !== $duplicates) {
|
||||
$errors[] = 'Duplicate candidates: '.implode(', ', $duplicates);
|
||||
}
|
||||
|
||||
return implode('. ', $errors);
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,6 +24,15 @@ class QuizCandidate
|
||||
#[ORM\Column]
|
||||
public float $corrections = 0;
|
||||
|
||||
#[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
|
||||
public int $penaltySeconds = 0;
|
||||
|
||||
#[ORM\Column(type: Types::BOOLEAN, options: ['default' => true])]
|
||||
public bool $active = true;
|
||||
|
||||
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: true)]
|
||||
public ?\DateTimeImmutable $started = null;
|
||||
|
||||
#[Gedmo\Timestampable(on: 'create')]
|
||||
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE)]
|
||||
public private(set) \DateTimeImmutable $created;
|
||||
|
||||
@@ -30,6 +30,7 @@ class Season
|
||||
|
||||
/** @var Collection<int, Quiz> */
|
||||
#[ORM\OneToMany(targetEntity: Quiz::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)]
|
||||
#[ORM\OrderBy(['id' => 'ASC'])]
|
||||
public private(set) Collection $quizzes;
|
||||
|
||||
/** @var Collection<int, Candidate> */
|
||||
@@ -39,6 +40,7 @@ class Season
|
||||
|
||||
/** @var Collection<int, User> */
|
||||
#[ORM\ManyToMany(targetEntity: User::class, inversedBy: 'seasons')]
|
||||
#[ORM\OrderBy(['email' => 'ASC'])]
|
||||
public private(set) Collection $owners;
|
||||
|
||||
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
||||
|
||||
Reference in New Issue
Block a user