Marijn/TijdVoorDeTest
1
0
Fork 0
mirror of https://github.com/MarijnDoeve/TijdVoorDeTest.git synced 2026-03-05 20:44:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor entities and codebase for native property usage
Some checks failed
CI / Tests (push) Failing after 35s
Details
CI / Deploy (push) Has been skipped
Details

Browse Source 
- Replaced getters/setters with direct property access across entities and repositories.
- Added and configured `martin-georgiev/postgresql-for-doctrine` for PostgreSQL enhancements.
- Updated Doctrine configuration with types, mappings, and JSONB query functions.
- Removed unused `EliminationService` and related YAML configurations.
This commit is contained in:
Marijn Doeve
2025-10-07 21:46:20 +02:00
parent ab187a28b9
commit b66d2f9e86
51 changed files with 615 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/TijdVoorDeTest.iml generated
View File

@@ -164,6 +164,7 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/ux-turbo" /> <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/ux-turbo" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-uuid" /> <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-uuid" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/brevo-mailer" /> <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/brevo-mailer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />

1
.idea/php.xml generated
View File

@@ -195,6 +195,7 @@
<path value="$PROJECT_DIR$/vendor/symfony/brevo-mailer" /> <path value="$PROJECT_DIR$/vendor/symfony/brevo-mailer" />
<path value="$PROJECT_DIR$/vendor/symfony/translation" /> <path value="$PROJECT_DIR$/vendor/symfony/translation" />
<path value="$PROJECT_DIR$/vendor/symfony/validator" /> <path value="$PROJECT_DIR$/vendor/symfony/validator" />
<path value="$PROJECT_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
</include_path> </include_path>
</component> </component>
<component name="PhpInterpreters"> <component name="PhpInterpreters">

1
composer.json
View File

@@ -13,6 +13,7 @@
"doctrine/doctrine-bundle": "^2.16.2", "doctrine/doctrine-bundle": "^2.16.2",
"doctrine/doctrine-migrations-bundle": "^3.4.2", "doctrine/doctrine-migrations-bundle": "^3.4.2",
"doctrine/orm": "^3.5.2", "doctrine/orm": "^3.5.2",
"martin-georgiev/postgresql-for-doctrine": "^3.5",
"phpdocumentor/reflection-docblock": "^5.6.3", "phpdocumentor/reflection-docblock": "^5.6.3",
"phpoffice/phpspreadsheet": "^5.1", "phpoffice/phpspreadsheet": "^5.1",
"phpstan/phpdoc-parser": "^2.3", "phpstan/phpdoc-parser": "^2.3",

86
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "643289575c0db1293c406f8c21a598f3", "content-hash": "d9b29aa569964f735b9f65fe5e9a59f9",
"packages": [ "packages": [
{ {
"name": "composer/pcre", "name": "composer/pcre",
@@ -1706,6 +1706,90 @@
}, },
"time": "2022-12-02T22:17:43+00:00" "time": "2022-12-02T22:17:43+00:00"
}, },
{
"name": "martin-georgiev/postgresql-for-doctrine",
"version": "v3.5.1",
"source": {
"type": "git",
"url": "https://github.com/martin-georgiev/postgresql-for-doctrine.git",
"reference": "5d1621e48edd7c7306cf2b9e73e374727867d6af"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/martin-georgiev/postgresql-for-doctrine/zipball/5d1621e48edd7c7306cf2b9e73e374727867d6af",
"reference": "5d1621e48edd7c7306cf2b9e73e374727867d6af",
"shasum": ""
},
"require": {
"doctrine/dbal": "~2.10||~3.0||~4.0",
"ext-ctype": "*",
"ext-json": "*",
"ext-mbstring": "*",
"php": "^8.1"
},
"require-dev": {
"deptrac/deptrac": "^4.0",
"doctrine/orm": "~2.14||~3.0",
"ekino/phpstan-banned-code": "^3.0",
"friendsofphp/php-cs-fixer": "^3.87.1",
"phpstan/phpstan": "^2.1.22",
"phpstan/phpstan-deprecation-rules": "^2.0.3",
"phpstan/phpstan-doctrine": "^2.0.4",
"phpstan/phpstan-phpunit": "^2.0.7",
"phpunit/phpunit": "^10.5.53",
"rector/rector": "^2.1.5",
"symfony/cache": "^6.4||^7.0"
},
"suggest": {
"doctrine/orm": "~2.14||~3.0",
"php": "^8.3"
},
"type": "library",
"autoload": {
"psr-4": {
"MartinGeorgiev\\": "src/MartinGeorgiev/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Martin Georgiev",
"email": "martin.georgiev@gmail.com",
"role": "author"
}
],
"description": "Adds PostgreSQL enhancements to Doctrine. Provides support for JSON, JSONB and some array data types. Provides functions, operators and common expressions used when working with JSON data, arrays and features related to text search.",
"keywords": [
"array data types",
"dbal",
"doctrine",
"json",
"jsonb",
"martin georgiev",
"postgres",
"postgresql",
"text search",
"tsvector"
],
"support": {
"issues": "https://github.com/martin-georgiev/postgresql-for-doctrine/issues",
"source": "https://github.com/martin-georgiev/postgresql-for-doctrine/tree/v3.5.1"
},
"funding": [
{
"url": "https://github.com/sponsors/martin-georgiev",
"type": "custom"
},
{
"url": "https://github.com/martin-georgiev",
"type": "github"
}
],
"time": "2025-09-12T10:54:26+00:00"
},
{ {
"name": "phpdocumentor/reflection-common", "name": "phpdocumentor/reflection-common",
"version": "2.2.0", "version": "2.2.0",

15
config/packages/doctrine.yaml
View File

@@ -8,9 +8,22 @@ doctrine:
profiling_collect_backtrace: '%kernel.debug%' profiling_collect_backtrace: '%kernel.debug%'
use_savepoints: true use_savepoints: true
types:
# JSON types
jsonb: MartinGeorgiev\Doctrine\DBAL\Types\Jsonb
'jsonb[]': MartinGeorgiev\Doctrine\DBAL\Types\JsonbArray
tsrange: MartinGeorgiev\Doctrine\DBAL\Types\TsRange
mapping_types:
# JSON type mappings
jsonb: jsonb
'jsonb[]': 'jsonb[]'
_jsonb: 'jsonb[]'
tsrange: tsrange
orm: orm:
auto_generate_proxy_classes: true auto_generate_proxy_classes: true
enable_lazy_ghost_objects: true enable_native_lazy_objects: true
report_fields_where_declared: true report_fields_where_declared: true
validate_xml_mapping: true validate_xml_mapping: true
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware

4
config/packages/uid.yaml
View File

@@ -1,4 +0,0 @@
framework:
uid:
default_uuid_version: 7
time_based_uuid_version: 7

5
migrations/Version20241229195702.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20241229195702 extends AbstractMigration final class Version20241229195702 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20241229195702 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE answer (id UUID NOT NULL, question_id UUID NOT NULL, text VARCHAR(255) NOT NULL, is_right_answer BOOLEAN NOT NULL, PRIMARY KEY(id))'); $this->addSql('CREATE TABLE answer (id UUID NOT NULL, question_id UUID NOT NULL, text VARCHAR(255) NOT NULL, is_right_answer BOOLEAN NOT NULL, PRIMARY KEY(id))');
$this->addSql('CREATE INDEX IDX_DADD4A251E27F6BF ON answer (question_id)'); $this->addSql('CREATE INDEX IDX_DADD4A251E27F6BF ON answer (question_id)');
$this->addSql('COMMENT ON COLUMN answer.id IS \'(DC2Type:uuid)\''); $this->addSql('COMMENT ON COLUMN answer.id IS \'(DC2Type:uuid)\'');
@@ -67,7 +63,6 @@ final class Version20241229195702 extends AbstractMigration
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public'); $this->addSql('CREATE SCHEMA public');
$this->addSql('ALTER TABLE answer DROP CONSTRAINT FK_DADD4A251E27F6BF'); $this->addSql('ALTER TABLE answer DROP CONSTRAINT FK_DADD4A251E27F6BF');
$this->addSql('ALTER TABLE answer_candidate DROP CONSTRAINT FK_F54D5192AA334807'); $this->addSql('ALTER TABLE answer_candidate DROP CONSTRAINT FK_F54D5192AA334807');

5
migrations/Version20241229201314.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20241229201314 extends AbstractMigration final class Version20241229201314 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20241229201314 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE season_user (season_id UUID NOT NULL, user_id UUID NOT NULL, PRIMARY KEY(season_id, user_id))'); $this->addSql('CREATE TABLE season_user (season_id UUID NOT NULL, user_id UUID NOT NULL, PRIMARY KEY(season_id, user_id))');
$this->addSql('CREATE INDEX IDX_BDA4AD74EC001D1 ON season_user (season_id)'); $this->addSql('CREATE INDEX IDX_BDA4AD74EC001D1 ON season_user (season_id)');
$this->addSql('CREATE INDEX IDX_BDA4AD7A76ED395 ON season_user (user_id)'); $this->addSql('CREATE INDEX IDX_BDA4AD7A76ED395 ON season_user (user_id)');
@@ -31,7 +27,6 @@ final class Version20241229201314 extends AbstractMigration
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public'); $this->addSql('CREATE SCHEMA public');
$this->addSql('ALTER TABLE season_user DROP CONSTRAINT FK_BDA4AD74EC001D1'); $this->addSql('ALTER TABLE season_user DROP CONSTRAINT FK_BDA4AD74EC001D1');
$this->addSql('ALTER TABLE season_user DROP CONSTRAINT FK_BDA4AD7A76ED395'); $this->addSql('ALTER TABLE season_user DROP CONSTRAINT FK_BDA4AD7A76ED395');

5
migrations/Version20241229202103.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20241229202103 extends AbstractMigration final class Version20241229202103 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20241229202103 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE correction (id UUID NOT NULL, candidate_id UUID NOT NULL, quiz_id UUID NOT NULL, amount DOUBLE PRECISION NOT NULL, PRIMARY KEY(id))'); $this->addSql('CREATE TABLE correction (id UUID NOT NULL, candidate_id UUID NOT NULL, quiz_id UUID NOT NULL, amount DOUBLE PRECISION NOT NULL, PRIMARY KEY(id))');
$this->addSql('CREATE INDEX IDX_A29DA1B891BD8781 ON correction (candidate_id)'); $this->addSql('CREATE INDEX IDX_A29DA1B891BD8781 ON correction (candidate_id)');
$this->addSql('CREATE INDEX IDX_A29DA1B8853CD175 ON correction (quiz_id)'); $this->addSql('CREATE INDEX IDX_A29DA1B8853CD175 ON correction (quiz_id)');
@@ -32,7 +28,6 @@ final class Version20241229202103 extends AbstractMigration
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public'); $this->addSql('CREATE SCHEMA public');
$this->addSql('ALTER TABLE correction DROP CONSTRAINT FK_A29DA1B891BD8781'); $this->addSql('ALTER TABLE correction DROP CONSTRAINT FK_A29DA1B891BD8781');
$this->addSql('ALTER TABLE correction DROP CONSTRAINT FK_A29DA1B8853CD175'); $this->addSql('ALTER TABLE correction DROP CONSTRAINT FK_A29DA1B8853CD175');

5
migrations/Version20241229202155.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20241229202155 extends AbstractMigration final class Version20241229202155 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,13 +16,11 @@ final class Version20241229202155 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE UNIQUE INDEX UNIQ_A29DA1B891BD8781853CD175 ON correction (candidate_id, quiz_id)'); $this->addSql('CREATE UNIQUE INDEX UNIQ_A29DA1B891BD8781853CD175 ON correction (candidate_id, quiz_id)');
} }
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public'); $this->addSql('CREATE SCHEMA public');
$this->addSql('DROP INDEX UNIQ_A29DA1B891BD8781853CD175'); $this->addSql('DROP INDEX UNIQ_A29DA1B891BD8781853CD175');
} }

5
migrations/Version20241229204335.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20241229204335 extends AbstractMigration final class Version20241229204335 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,14 +16,12 @@ final class Version20241229204335 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE given_answer ALTER answer_id DROP NOT NULL'); $this->addSql('ALTER TABLE given_answer ALTER answer_id DROP NOT NULL');
$this->addSql('ALTER TABLE given_answer ALTER created DROP NOT NULL'); $this->addSql('ALTER TABLE given_answer ALTER created DROP NOT NULL');
} }
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public'); $this->addSql('CREATE SCHEMA public');
$this->addSql('ALTER TABLE given_answer ALTER answer_id SET NOT NULL'); $this->addSql('ALTER TABLE given_answer ALTER answer_id SET NOT NULL');
$this->addSql('ALTER TABLE given_answer ALTER created SET NOT NULL'); $this->addSql('ALTER TABLE given_answer ALTER created SET NOT NULL');

5
migrations/Version20250303221227.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250303221227 extends AbstractMigration final class Version20250303221227 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250303221227 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE given_answer ALTER created SET NOT NULL'); $this->addSql('ALTER TABLE given_answer ALTER created SET NOT NULL');
$this->addSql('ALTER TABLE season ADD active_quiz_id UUID DEFAULT NULL'); $this->addSql('ALTER TABLE season ADD active_quiz_id UUID DEFAULT NULL');
$this->addSql('COMMENT ON COLUMN season.active_quiz_id IS \'(DC2Type:uuid)\''); $this->addSql('COMMENT ON COLUMN season.active_quiz_id IS \'(DC2Type:uuid)\'');
@@ -29,7 +25,6 @@ final class Version20250303221227 extends AbstractMigration
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public'); $this->addSql('CREATE SCHEMA public');
$this->addSql('ALTER TABLE season DROP CONSTRAINT FK_F0E45BA96706D6B'); $this->addSql('ALTER TABLE season DROP CONSTRAINT FK_F0E45BA96706D6B');
$this->addSql('DROP INDEX IDX_F0E45BA96706D6B'); $this->addSql('DROP INDEX IDX_F0E45BA96706D6B');

5
migrations/Version20250311213417.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250311213417 extends AbstractMigration final class Version20250311213417 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250311213417 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE answer ALTER id TYPE UUID'); $this->addSql('ALTER TABLE answer ALTER id TYPE UUID');
$this->addSql('ALTER TABLE answer ALTER question_id TYPE UUID'); $this->addSql('ALTER TABLE answer ALTER question_id TYPE UUID');
$this->addSql('COMMENT ON COLUMN answer.id IS \'\''); $this->addSql('COMMENT ON COLUMN answer.id IS \'\'');
@@ -69,7 +65,6 @@ final class Version20250311213417 extends AbstractMigration
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE candidate ALTER id TYPE UUID'); $this->addSql('ALTER TABLE candidate ALTER id TYPE UUID');
$this->addSql('ALTER TABLE candidate ALTER season_id TYPE UUID'); $this->addSql('ALTER TABLE candidate ALTER season_id TYPE UUID');
$this->addSql('COMMENT ON COLUMN candidate.id IS \'(DC2Type:uuid)\''); $this->addSql('COMMENT ON COLUMN candidate.id IS \'(DC2Type:uuid)\'');

5
migrations/Version20250402185128.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250402185128 extends AbstractMigration final class Version20250402185128 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,13 +16,11 @@ final class Version20250402185128 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE elimination (id UUID NOT NULL, data JSON NOT NULL, PRIMARY KEY(id))'); $this->addSql('CREATE TABLE elimination (id UUID NOT NULL, data JSON NOT NULL, PRIMARY KEY(id))');
} }
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('DROP TABLE elimination'); $this->addSql('DROP TABLE elimination');
} }
} }

5
migrations/Version20250427174822.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250427174822 extends AbstractMigration final class Version20250427174822 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250427174822 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql(<<<'SQL' $this->addSql(<<<'SQL'
ALTER TABLE answer ADD ordering SMALLINT DEFAULT 0 NOT NULL ALTER TABLE answer ADD ordering SMALLINT DEFAULT 0 NOT NULL
SQL); SQL);
@@ -30,7 +26,6 @@ final class Version20250427174822 extends AbstractMigration
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql(<<<'SQL' $this->addSql(<<<'SQL'
ALTER TABLE answer DROP ordering ALTER TABLE answer DROP ordering
SQL); SQL);

5
migrations/Version20250504101440.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250504101440 extends AbstractMigration final class Version20250504101440 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250504101440 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql(<<<'SQL' $this->addSql(<<<'SQL'
CREATE UNIQUE INDEX UNIQ_C8B28E445E237E064EC001D1 ON candidate (name, season_id) CREATE UNIQUE INDEX UNIQ_C8B28E445E237E064EC001D1 ON candidate (name, season_id)
SQL); SQL);
@@ -30,7 +26,6 @@ final class Version20250504101440 extends AbstractMigration
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql(<<<'SQL' $this->addSql(<<<'SQL'
DROP INDEX UNIQ_A412FA925E237E064EC001D1 DROP INDEX UNIQ_A412FA925E237E064EC001D1
SQL); SQL);

3
migrations/Version20250606195952.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250606195952 extends AbstractMigration final class Version20250606195952 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string

5
migrations/Version20250607154730.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250607154730 extends AbstractMigration final class Version20250607154730 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250607154730 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql(<<<'SQL' $this->addSql(<<<'SQL'
ALTER TABLE season DROP CONSTRAINT FK_F0E45BA96706D6B ALTER TABLE season DROP CONSTRAINT FK_F0E45BA96706D6B
SQL); SQL);
@@ -30,7 +26,6 @@ final class Version20250607154730 extends AbstractMigration
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql(<<<'SQL' $this->addSql(<<<'SQL'
ALTER TABLE season DROP CONSTRAINT fk_f0e45ba96706d6b ALTER TABLE season DROP CONSTRAINT fk_f0e45ba96706d6b
SQL); SQL);

5
migrations/Version20250607184525.php
View File

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250607184525 extends AbstractMigration final class Version20250607184525 extends AbstractMigration
{ {
public function getDescription(): string public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250607184525 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql(<<<'SQL' $this->addSql(<<<'SQL'
ALTER TABLE elimination DROP CONSTRAINT FK_5947284F853CD175 ALTER TABLE elimination DROP CONSTRAINT FK_5947284F853CD175
SQL); SQL);
@@ -36,7 +32,6 @@ final class Version20250607184525 extends AbstractMigration
public function down(Schema $schema): void public function down(Schema $schema): void
{ {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql(<<<'SQL' $this->addSql(<<<'SQL'
ALTER TABLE given_answer DROP CONSTRAINT fk_9ac61a30853cd175 ALTER TABLE given_answer DROP CONSTRAINT fk_9ac61a30853cd175
SQL); SQL);

26
migrations/Version20251007194241.php Normal file
View File

@@ -0,0 +1,26 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
final class Version20251007194241 extends AbstractMigration
{
public function getDescription(): string
{
return 'Change elimination data type to jsonb';
}
public function up(Schema $schema): void
{
$this->addSql('ALTER TABLE elimination ALTER data TYPE JSONB');
}
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE elimination ALTER data TYPE JSON');
}
}

6
src/Command/AddSettingsCommand.php
View File

@@ -26,12 +26,12 @@ readonly class AddSettingsCommand
$io = new SymfonyStyle($input, $output); $io = new SymfonyStyle($input, $output);
foreach ($this->seasonRepository->findAll() as $season) { foreach ($this->seasonRepository->findAll() as $season) {
if (null !== $season->getSettings()) { if (null !== $season->settings) {
continue; continue;
} }
$io->text('Adding settings to season : '.$season->getSeasonCode()); $io->text('Adding settings to season : '.$season->seasonCode);
$season->setSettings(new SeasonSettings()); $season->settings = new SeasonSettings();
} }
$this->entityManager->flush(); $this->entityManager->flush();

2
src/Controller/Backoffice/BackofficeController.php
View File

@@ -61,7 +61,7 @@ final class BackofficeController extends AbstractController
$em->persist($season); $em->persist($season);
$em->flush(); $em->flush();
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]); return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
} }
return $this->render('backoffice/season_add.html.twig', ['form' => $form]); return $this->render('backoffice/season_add.html.twig', ['form' => $form]);

4
src/Controller/Backoffice/PrepareEliminationController.php
View File

@@ -26,7 +26,7 @@ final class PrepareEliminationController extends AbstractController
{ {
$elimination = $eliminationFactory->createEliminationFromQuiz($quiz); $elimination = $eliminationFactory->createEliminationFromQuiz($quiz);
return $this->redirectToRoute('tvdt_prepare_elimination_view', ['elimination' => $elimination->getId()]); return $this->redirectToRoute('tvdt_prepare_elimination_view', ['elimination' => $elimination->id]);
} }
#[Route( #[Route(
@@ -41,7 +41,7 @@ final class PrepareEliminationController extends AbstractController
$em->flush(); $em->flush();
if ($request->request->getBoolean('start')) { if ($request->request->getBoolean('start')) {
return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->getId()]); return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
} }
$this->addFlash('success', 'Elimination updated'); $this->addFlash('success', 'Elimination updated');

12
src/Controller/Backoffice/QuizController.php
View File

@@ -56,14 +56,14 @@ class QuizController extends AbstractController
)] )]
public function enableQuiz(Season $season, ?Quiz $quiz, EntityManagerInterface $em): RedirectResponse public function enableQuiz(Season $season, ?Quiz $quiz, EntityManagerInterface $em): RedirectResponse
{ {
$season->setActiveQuiz($quiz); $season->activeQuiz = $quiz;
$em->flush(); $em->flush();
if ($quiz instanceof Quiz) { if ($quiz instanceof Quiz) {
return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $season->getSeasonCode(), 'quiz' => $quiz->getId()]); return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $season->seasonCode, 'quiz' => $quiz->id]);
} }
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]); return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
} }
#[IsGranted(SeasonVoter::EDIT, subject: 'quiz')] #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
@@ -81,7 +81,7 @@ class QuizController extends AbstractController
$this->addFlash('error', $this->translator->trans('Error clearing quiz')); $this->addFlash('error', $this->translator->trans('Error clearing quiz'));
} }
return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->getSeason()->getSeasonCode(), 'quiz' => $quiz->getId()]); return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
} }
#[IsGranted(SeasonVoter::DELETE, subject: 'quiz')] #[IsGranted(SeasonVoter::DELETE, subject: 'quiz')]
@@ -96,7 +96,7 @@ class QuizController extends AbstractController
$this->addFlash('success', $this->translator->trans('Quiz deleted')); $this->addFlash('success', $this->translator->trans('Quiz deleted'));
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $quiz->getSeason()->getSeasonCode()]); return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $quiz->season->seasonCode]);
} }
#[IsGranted(SeasonVoter::EDIT, subject: 'quiz')] #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
@@ -115,6 +115,6 @@ class QuizController extends AbstractController
$quizCandidateRepository->setCorrectionsForCandidate($quiz, $candidate, $corrections); $quizCandidateRepository->setCorrectionsForCandidate($quiz, $candidate, $corrections);
return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->getSeason()->getSeasonCode(), 'quiz' => $quiz->getId()]); return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
} }
} }

8
src/Controller/Backoffice/SeasonController.php
View File

@@ -40,7 +40,7 @@ class SeasonController extends AbstractController
)] )]
public function index(Season $season, Request $request): Response public function index(Season $season, Request $request): Response
{ {
$form = $this->createForm(SettingsForm::class, $season->getSettings()); $form = $this->createForm(SettingsForm::class, $season->settings);
$form->handleRequest($request); $form->handleRequest($request);
@@ -74,7 +74,7 @@ class SeasonController extends AbstractController
$this->em->flush(); $this->em->flush();
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]); return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
} }
return $this->render('backoffice/season_add_candidates.html.twig', ['form' => $form]); return $this->render('backoffice/season_add_candidates.html.twig', ['form' => $form]);
@@ -100,13 +100,13 @@ class SeasonController extends AbstractController
$quizSpreadsheet->xlsxToQuiz($quiz, $sheet); $quizSpreadsheet->xlsxToQuiz($quiz, $sheet);
$quiz->setSeason($season); $quiz->season = $season;
$this->em->persist($quiz); $this->em->persist($quiz);
$this->em->flush(); $this->em->flush();
$this->addFlash(FlashType::Success, $this->translator->trans('Quiz Added!')); $this->addFlash(FlashType::Success, $this->translator->trans('Quiz Added!'));
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]); return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
} }
return $this->render('/backoffice/quiz_add.html.twig', ['form' => $form, 'season' => $season]); return $this->render('/backoffice/quiz_add.html.twig', ['form' => $form, 'season' => $season]);

12
src/Controller/EliminationController.php
View File

@@ -39,7 +39,7 @@ final class EliminationController extends AbstractController
if ($form->isSubmitted() && $form->isValid()) { if ($form->isSubmitted() && $form->isValid()) {
$name = $form->get('name')->getData(); $name = $form->get('name')->getData();
return $this->redirectToRoute('tvdt_elimination_candidate', ['elimination' => $elimination->getId(), 'candidateHash' => Base64::base64UrlEncode($name)]); return $this->redirectToRoute('tvdt_elimination_candidate', ['elimination' => $elimination->id, 'candidateHash' => Base64::base64UrlEncode($name)]);
} }
return $this->render('quiz/elimination/index.html.twig', [ return $this->render('quiz/elimination/index.html.twig', [
@@ -52,21 +52,21 @@ final class EliminationController extends AbstractController
#[Route('/elimination/{elimination}/{candidateHash}', name: 'tvdt_elimination_candidate', requirements: ['elimination' => Requirement::UUID, 'candidateHash' => self::CANDIDATE_HASH_REGEX])] #[Route('/elimination/{elimination}/{candidateHash}', name: 'tvdt_elimination_candidate', requirements: ['elimination' => Requirement::UUID, 'candidateHash' => self::CANDIDATE_HASH_REGEX])]
public function candidateScreen(Elimination $elimination, string $candidateHash, CandidateRepository $candidateRepository): Response public function candidateScreen(Elimination $elimination, string $candidateHash, CandidateRepository $candidateRepository): Response
{ {
$candidate = $candidateRepository->getCandidateByHash($elimination->getQuiz()->getSeason(), $candidateHash); $candidate = $candidateRepository->getCandidateByHash($elimination->quiz->season, $candidateHash);
if (!$candidate instanceof Candidate) { if (!$candidate instanceof Candidate) {
$this->addFlash(FlashType::Warning, $this->addFlash(FlashType::Warning,
t('Cound not find candidate with name %name%', ['%name%' => Base64::base64UrlDecode($candidateHash)])->trans($this->translator), t('Cound not find candidate with name %name%', ['%name%' => Base64::base64UrlDecode($candidateHash)])->trans($this->translator),
); );
return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->getId()]); return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
} }
$screenColour = $elimination->getScreenColour($candidate->getName()); $screenColour = $elimination->getScreenColour($candidate->name);
if (null === $screenColour) { if (null === $screenColour) {
$this->addFlash(FlashType::Warning, $this->translator->trans('Cound not find candidate with name %name% in elimination.', ['%name%' => $candidate->getName()])); $this->addFlash(FlashType::Warning, $this->translator->trans('Cound not find candidate with name %name% in elimination.', ['%name%' => $candidate->name]));
return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->getId()]); return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
} }
return $this->render('quiz/elimination/candidate.html.twig', [ return $this->render('quiz/elimination/candidate.html.twig', [

14
src/Controller/QuizController.php
View File

@@ -65,7 +65,7 @@ final class QuizController extends AbstractController
if ($form->isSubmitted() && $form->isValid()) { if ($form->isSubmitted() && $form->isValid()) {
$name = $form->get('name')->getData(); $name = $form->get('name')->getData();
return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->getSeasonCode(), 'nameHash' => Base64::base64UrlEncode($name)]); return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => Base64::base64UrlEncode($name)]);
} }
return $this->render('quiz/enter_name.twig', ['season' => $season, 'form' => $form]); return $this->render('quiz/enter_name.twig', ['season' => $season, 'form' => $form]);
@@ -91,15 +91,15 @@ final class QuizController extends AbstractController
if (!$candidate instanceof Candidate) { if (!$candidate instanceof Candidate) {
$this->addFlash(FlashType::Danger, $this->translator->trans('Candidate not found')); $this->addFlash(FlashType::Danger, $this->translator->trans('Candidate not found'));
return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->getSeasonCode()]); return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
} }
$quiz = $season->getActiveQuiz(); $quiz = $season->activeQuiz;
if (!$quiz instanceof Quiz) { if (!$quiz instanceof Quiz) {
$this->addFlash(FlashType::Warning, $this->translator->trans('There is no active quiz')); $this->addFlash(FlashType::Warning, $this->translator->trans('There is no active quiz'));
return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->getSeasonCode()]); return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
} }
if ('POST' === $request->getMethod()) { if ('POST' === $request->getMethod()) {
@@ -109,10 +109,10 @@ final class QuizController extends AbstractController
throw new BadRequestHttpException('Invalid Answer ID'); throw new BadRequestHttpException('Invalid Answer ID');
} }
$givenAnswer = new GivenAnswer($candidate, $answer->getQuestion()->getQuiz(), $answer); $givenAnswer = new GivenAnswer($candidate, $answer->question->quiz, $answer);
$givenAnswerRepository->save($givenAnswer); $givenAnswerRepository->save($givenAnswer);
return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->getSeasonCode(), 'nameHash' => $nameHash]); return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => $nameHash]);
} }
$question = $questionRepository->findNextQuestionForCandidate($candidate); $question = $questionRepository->findNextQuestionForCandidate($candidate);
@@ -120,7 +120,7 @@ final class QuizController extends AbstractController
if (!$question instanceof Question) { if (!$question instanceof Question) {
$this->addFlash(FlashType::Success, $this->translator->trans('Quiz completed')); $this->addFlash(FlashType::Success, $this->translator->trans('Quiz completed'));
return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->getSeasonCode()]); return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
} }
$quizCandidateRepository->createIfNotExist($quiz, $candidate); $quizCandidateRepository->createIfNotExist($quiz, $candidate);

4
src/Controller/RegistrationController.php
View File

@@ -41,7 +41,7 @@ final class RegistrationController extends AbstractController
/** @var string $plainPassword */ /** @var string $plainPassword */
$plainPassword = $form->get('plainPassword')->getData(); $plainPassword = $form->get('plainPassword')->getData();
$user->setPassword($userPasswordHasher->hashPassword($user, $plainPassword)); $user->password = $userPasswordHasher->hashPassword($user, $plainPassword);
$entityManager->persist($user); $entityManager->persist($user);
$entityManager->flush(); $entityManager->flush();
@@ -50,7 +50,7 @@ final class RegistrationController extends AbstractController
// generate a signed url and email it to the user // generate a signed url and email it to the user
$this->emailVerifier->sendEmailConfirmation('tvdt_verify_email', $user, $this->emailVerifier->sendEmailConfirmation('tvdt_verify_email', $user,
new TemplatedEmail() new TemplatedEmail()
->to((string) $user->getEmail()) ->to($user->email)
->subject($this->translator->trans('Please Confirm your Email')) ->subject($this->translator->trans('Please Confirm your Email'))
->htmlTemplate('backoffice/registration/confirmation_email.html.twig'), ->htmlTemplate('backoffice/registration/confirmation_email.html.twig'),
); );

596
src/DataFixtures/KrtekFixtures.php
View File

@@ -19,8 +19,9 @@ class KrtekFixtures extends Fixture
$season = new Season(); $season = new Season();
$manager->persist($season); $manager->persist($season);
$season->setName('Krtek Weekend') $season->name = 'Krtek Weekend';
->setSeasonCode('krtek') $season->seasonCode = 'krtek';
$season
->addCandidate(new Candidate('Claudia')) ->addCandidate(new Candidate('Claudia'))
->addCandidate(new Candidate('Eelco')) ->addCandidate(new Candidate('Eelco'))
->addCandidate(new Candidate('Elise')) ->addCandidate(new Candidate('Elise'))
@@ -35,338 +36,341 @@ class KrtekFixtures extends Fixture
->addCandidate(new Candidate('Robbert')) ->addCandidate(new Candidate('Robbert'))
->addCandidate(new Candidate('Tom')); ->addCandidate(new Candidate('Tom'));
$quiz1 = $this->createQuiz1($season); $quiz1 = $this->createQuiz1($season);
$season->addQuiz($quiz1) $season->addQuiz($quiz1);
->setActiveQuiz($quiz1) $season->activeQuiz = $quiz1;
->addQuiz($this->createQuiz2($season)); $season->addQuiz($this->createQuiz2($season));
$manager->flush(); $manager->flush();
} }
private function createQuiz1(Season $season): Quiz private function createQuiz1(Season $season): Quiz
{ {
return new Quiz() $quiz = new Quiz();
->setName('Quiz 1') $quiz->name = 'Quiz 1';
->setSeason($season) $quiz->season = $season;
->addQuestion(new Question() $q = new Question();
->setQuestion('Is de Krtek een man of een vrouw?') $q->question = 'Is de Krtek een man of een vrouw?';
->addAnswer(new Answer('Vrouw', true)) $q->addAnswer(new Answer('Vrouw', true))
->addAnswer(new Answer('Man')) ->addAnswer(new Answer('Man'));
->setOrdering(1), $q->ordering = 1;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Hoeveel broers heeft de Krtek?') $q->question = 'Hoeveel broers heeft de Krtek?';
->addAnswer(new Answer('Geen', true)) $q->addAnswer(new Answer('Geen', true))
->addAnswer(new Answer('1')) ->addAnswer(new Answer('1'))
->addAnswer(new Answer('2')) ->addAnswer(new Answer('2'));
->setOrdering(2), $q->ordering = 2;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Wat is de lievelingsfeestdag van de Krtek?') $q->question = 'Wat is de lievelingsfeestdag van de Krtek?';
->addAnswer(new Answer('Geen')) $q->addAnswer(new Answer('Geen'))
->addAnswer(new Answer('Diens eigen verjaardag')) ->addAnswer(new Answer('Diens eigen verjaardag'))
->addAnswer(new Answer('Koningsdag')) ->addAnswer(new Answer('Koningsdag'))
->addAnswer(new Answer('Kerst', true)) ->addAnswer(new Answer('Kerst', true))
->addAnswer(new Answer('Oud en Nieuw')) ->addAnswer(new Answer('Oud en Nieuw'));
->setOrdering(3), $q->ordering = 3;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Hoe kwam de Krtek naar Kersteren vandaag?') $q->question = 'Hoe kwam de Krtek naar Kersteren vandaag?';
->addAnswer(new Answer('Met het OV', true)) $q->addAnswer(new Answer('Met het OV', true))
->addAnswer(new Answer('Met de auto')) ->addAnswer(new Answer('Met de auto'));
->setOrdering(4), $q->ordering = 4;
) $quiz->addQuestion($q);
->addQuestion(new Question()
->setQuestion('Met wie keek de Krtek video bij binnenkomst?')
->addAnswer(new Answer('Claudia'))
->addAnswer(new Answer('Eelco'))
->addAnswer(new Answer('Elise'))
->addAnswer(new Answer('Gert-Jan'))
->addAnswer(new Answer('Iris'))
->addAnswer(new Answer('Jari'))
->addAnswer(new Answer('Lara'))
->addAnswer(new Answer('Lotte'))
->addAnswer(new Answer('Myrthe'))
->addAnswer(new Answer('Philine'))
->addAnswer(new Answer('Remy'))
->addAnswer(new Answer('Robbert'))
->addAnswer(new Answer('Tom', true))
->setOrdering(5),
)
->addQuestion(new Question() $q = new Question();
->setQuestion('Welk advies zou de Krtek zichzelf als kind geven?') $q->question = 'Met wie keek de Krtek video bij binnenkomst?';
->addAnswer(new Answer('Geef je vader een knuffel.')) $q->addAnswer(new Answer('Claudia'))
->addAnswer(new Answer('Trek je wat minder aan van anderen.')) ->addAnswer(new Answer('Eelco'))
->addAnswer(new Answer('Luister meer naar je eigen gevoel in plaats van naar wat anderen vinden.')) ->addAnswer(new Answer('Elise'))
->addAnswer(new Answer('Stel niet alles tot het laatste moment uit.')) ->addAnswer(new Answer('Gert-Jan'))
->addAnswer(new Answer('Altijd doorgaan.')) ->addAnswer(new Answer('Iris'))
->addAnswer(new Answer('Probeer ook eens buiten de lijntjes te kleuren', true)) ->addAnswer(new Answer('Jari'))
->addAnswer(new Answer('Ga als je groot bent op groepsreis! ')) ->addAnswer(new Answer('Lara'))
->addAnswer(new Answer('Trek minder aan van de mening van anderen, het is oké om anders te zijn.')) ->addAnswer(new Answer('Lotte'))
->setOrdering(6), ->addAnswer(new Answer('Myrthe'))
) ->addAnswer(new Answer('Philine'))
->addAnswer(new Answer('Remy'))
->addAnswer(new Answer('Robbert'))
->addAnswer(new Answer('Tom', true));
$q->ordering = 5;
$quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Wat voor soort schoenen droeg de Krtek bij het diner?') $q->question = 'Welk advies zou de Krtek zichzelf als kind geven?';
->addAnswer(new Answer('Sneakers')) $q->addAnswer(new Answer('Geef je vader een knuffel.'))
->addAnswer(new Answer('Wandel-/bergschoenen', true)) ->addAnswer(new Answer('Trek je wat minder aan van anderen.'))
->addAnswer(new Answer('Lederen schoenen')) ->addAnswer(new Answer('Luister meer naar je eigen gevoel in plaats van naar wat anderen vinden.'))
->addAnswer(new Answer('Pantoffels')) ->addAnswer(new Answer('Stel niet alles tot het laatste moment uit.'))
->addAnswer(new Answer('Hakken')) ->addAnswer(new Answer('Altijd doorgaan.'))
->addAnswer(new Answer('Geen schoenen, alleen sokken')) ->addAnswer(new Answer('Probeer ook eens buiten de lijntjes te kleuren', true))
->setOrdering(7), ->addAnswer(new Answer('Ga als je groot bent op groepsreis! '))
) ->addAnswer(new Answer('Trek minder aan van de mening van anderen, het is oké om anders te zijn.'));
$q->ordering = 6;
$quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Met welk vervoersmiddel reist de Krtek het liefste?') $q->question = 'Wat voor soort schoenen droeg de Krtek bij het diner?';
->addAnswer(new Answer('Fiets', true)) $q->addAnswer(new Answer('Sneakers'))
->addAnswer(new Answer('Auto')) ->addAnswer(new Answer('Wandel-/bergschoenen', true))
->addAnswer(new Answer('Trein')) ->addAnswer(new Answer('Lederen schoenen'))
->setOrdering(8), ->addAnswer(new Answer('Pantoffels'))
) ->addAnswer(new Answer('Hakken'))
->addAnswer(new Answer('Geen schoenen, alleen sokken'));
$q->ordering = 7;
$quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Heeft de Krtek een eigen auto?') $q->question = 'Met welk vervoersmiddel reist de Krtek het liefste?';
->addAnswer(new Answer('Ja')) $q->addAnswer(new Answer('Fiets', true))
->addAnswer(new Answer('Nee', true)) ->addAnswer(new Answer('Auto'))
->setOrdering(9), ->addAnswer(new Answer('Trein'));
) $q->ordering = 8;
$quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Van wie is de quote die de Krtek gepakt heeft') $q->question = 'Heeft de Krtek een eigen auto?';
->addAnswer(new Answer('Karen')) $q->addAnswer(new Answer('Ja'))
->addAnswer(new Answer('Gilles de Coster')) ->addAnswer(new Answer('Nee', true));
->addAnswer(new Answer('Kees Tol')) $q->ordering = 9;
->addAnswer(new Answer('Harry en John')) $quiz->addQuestion($q);
->addAnswer(new Answer('Georgina Verbaan'))
->addAnswer(new Answer('Marc-Marie Huijbregts'))
->addAnswer(new Answer('Fresia Cousiño Arias, Rik van de Westelaken'))
->addAnswer(new Answer('Ellie Lust'))
->addAnswer(new Answer('Bouba'))
->addAnswer(new Answer('Jan Versteegh'))
->addAnswer(new Answer('Dick Jol'))
->addAnswer(new Answer('Karin de Groot'))
->addAnswer(new Answer('Pieter'))
->addAnswer(new Answer('Renée Fokker'))
->addAnswer(new Answer('Sam, Davy', true))
->setOrdering(10),
)
->addQuestion(new Question() $q = new Question();
->setQuestion('Zou de Krtek molboekjes, jokers, vrijstellingen of topito’s uit iemands rugzak stelen om te kunnen winnen?') $q->question = 'Van wie is de quote die de Krtek gepakt heeft';
->addAnswer(new Answer('Ja')) $q->addAnswer(new Answer('Karen'))
->addAnswer(new Answer('Nee', true)) ->addAnswer(new Answer('Gilles de Coster'))
->setOrdering(11), ->addAnswer(new Answer('Kees Tol'))
) ->addAnswer(new Answer('Harry en John'))
->addAnswer(new Answer('Georgina Verbaan'))
->addAnswer(new Answer('Marc-Marie Huijbregts'))
->addAnswer(new Answer('Fresia Cousiño Arias, Rik van de Westelaken'))
->addAnswer(new Answer('Ellie Lust'))
->addAnswer(new Answer('Bouba'))
->addAnswer(new Answer('Jan Versteegh'))
->addAnswer(new Answer('Dick Jol'))
->addAnswer(new Answer('Karin de Groot'))
->addAnswer(new Answer('Pieter'))
->addAnswer(new Answer('Renée Fokker'))
->addAnswer(new Answer('Sam, Davy', true));
$q->ordering = 10;
$quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('In wat voor bed slaapt de Krtek dit weekend?') $q->question = 'Zou de Krtek molboekjes, jokers, vrijstellingen of topito’s uit iemands rugzak stelen om te kunnen winnen?';
->addAnswer(new Answer('Éénpersoons, losstaand bed')) $q->addAnswer(new Answer('Ja'))
->addAnswer(new Answer('Éénpersoonsbed, tegen een ander bed aan', true)) ->addAnswer(new Answer('Nee', true));
->addAnswer(new Answer('Tweepersoons bed')) $q->ordering = 11;
->setOrdering(12), $quiz->addQuestion($q);
)
->addQuestion(new Question() $q = new Question();
->setQuestion('Hoeveel jaar heeft de Krtek gedaan over de middelbare school?') $q->question = 'In wat voor bed slaapt de Krtek dit weekend?';
->addAnswer(new Answer('5')) $q->addAnswer(new Answer('Éénpersoons, losstaand bed'))
->addAnswer(new Answer('6', true)) ->addAnswer(new Answer('Éénpersoonsbed, tegen een ander bed aan', true))
->addAnswer(new Answer('7')) ->addAnswer(new Answer('Tweepersoons bed'));
->addAnswer(new Answer('8')) $q->ordering = 12;
->setOrdering(13), $quiz->addQuestion($q);
)
->addQuestion(new Question() $q = new Question();
->setQuestion('Waar zat de Krtek aan tafel bij het diner?') $q->question = 'Hoeveel jaar heeft de Krtek gedaan over de middelbare school?';
->addAnswer(new Answer('Met de rug naar de accommodatie')) $q->addAnswer(new Answer('5'))
->addAnswer(new Answer('Met de rug naar de buitenmuur', true)) ->addAnswer(new Answer('6', true))
->setOrdering(14), ->addAnswer(new Answer('7'))
) ->addAnswer(new Answer('8'));
$q->ordering = 13;
$quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Wie is de Krtek?') $q->question = 'Waar zat de Krtek aan tafel bij het diner?';
->addAnswer(new Answer('Claudia', true)) $q->addAnswer(new Answer('Met de rug naar de accommodatie'))
->addAnswer(new Answer('Eelco')) ->addAnswer(new Answer('Met de rug naar de buitenmuur', true));
->addAnswer(new Answer('Elise')) $q->ordering = 14;
->addAnswer(new Answer('Gert-Jan')) $quiz->addQuestion($q);
->addAnswer(new Answer('Iris'))
->addAnswer(new Answer('Jari')) $q = new Question();
->addAnswer(new Answer('Lara')) $q->question = 'Wie is de Krtek?';
->addAnswer(new Answer('Lotte')) $q->addAnswer(new Answer('Claudia', true))
->addAnswer(new Answer('Myrthe')) ->addAnswer(new Answer('Eelco'))
->addAnswer(new Answer('Philine')) ->addAnswer(new Answer('Elise'))
->addAnswer(new Answer('Remy')) ->addAnswer(new Answer('Gert-Jan'))
->addAnswer(new Answer('Robbert')) ->addAnswer(new Answer('Iris'))
->addAnswer(new Answer('Tom')) ->addAnswer(new Answer('Jari'))
->setOrdering(15), ->addAnswer(new Answer('Lara'))
) ->addAnswer(new Answer('Lotte'))
; ->addAnswer(new Answer('Myrthe'))
->addAnswer(new Answer('Philine'))
->addAnswer(new Answer('Remy'))
->addAnswer(new Answer('Robbert'))
->addAnswer(new Answer('Tom'));
$q->ordering = 15;
$quiz->addQuestion($q);
return $quiz;
} }
private function createQuiz2(Season $season): Quiz private function createQuiz2(Season $season): Quiz
{ {
return new Quiz() $quiz = new Quiz();
->setName('Quiz 2') $quiz->name = 'Quiz 2';
->setSeason($season) $quiz->season = $season;
->addQuestion(new Question() $q = new Question();
->setQuestion('Is de Krtek een man of een vrouw?') $q->question = 'Is de Krtek een man of een vrouw?';
->addAnswer(new Answer('Man')) $q->addAnswer(new Answer('Man'))
->addAnswer(new Answer('Vrouw', true)) ->addAnswer(new Answer('Vrouw', true));
->setOrdering(1), $q->ordering = 1;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Heeft de Krtek dieetwensen of allergieën?') $q->question = 'Heeft de Krtek dieetwensen of allergieën?';
->addAnswer(new Answer('nee')) $q->addAnswer(new Answer('nee'))
->addAnswer(new Answer('De Krtek is vegetariër', true)) ->addAnswer(new Answer('De Krtek is vegetariër', true))
->addAnswer(new Answer('De Krtek is flexitariër')) ->addAnswer(new Answer('De Krtek is flexitariër'))
->addAnswer(new Answer('De Krtek heeft een allergie')) ->addAnswer(new Answer('De Krtek heeft een allergie'))
->addAnswer(new Answer('De Krtek heeft een intolerantie')) ->addAnswer(new Answer('De Krtek heeft een intolerantie'))
->addAnswer(new Answer('De Krtek eet geen rundvlees')) ->addAnswer(new Answer('De Krtek eet geen rundvlees'))
->addAnswer(new Answer('De Krtek eet geen waterdieren')) ->addAnswer(new Answer('De Krtek eet geen waterdieren'));
->setOrdering(2), $q->ordering = 2;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Hoe heet het huisdier/de huisdieren van de Krtek?') $q->question = 'Hoe heet het huisdier/de huisdieren van de Krtek?';
->addAnswer(new Answer('Amy, Karel en Floyd')) $q->addAnswer(new Answer('Amy, Karel en Floyd'))
->addAnswer(new Answer('Flip en Majoor')) ->addAnswer(new Answer('Flip en Majoor'))
->addAnswer(new Answer('Benji')) ->addAnswer(new Answer('Benji'))
->addAnswer(new Answer('Sini')) ->addAnswer(new Answer('Sini'))
->addAnswer(new Answer('Tom')) ->addAnswer(new Answer('Tom'))
->addAnswer(new Answer('De huisdieren van de Krtek hebben geen naam')) ->addAnswer(new Answer('De huisdieren van de Krtek hebben geen naam'))
->addAnswer(new Answer('De Krtek heeft geen huisdieren', true)) ->addAnswer(new Answer('De Krtek heeft geen huisdieren', true));
->setOrdering(3), $q->ordering = 3;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Wat dronk de Krtek deze ochtend bij het ontbijt?') $q->question = 'Wat dronk de Krtek deze ochtend bij het ontbijt?';
->addAnswer(new Answer('Koffie')) $q->addAnswer(new Answer('Koffie'))
->addAnswer(new Answer('Thee')) ->addAnswer(new Answer('Thee'))
->addAnswer(new Answer('Water', true)) ->addAnswer(new Answer('Water', true))
->addAnswer(new Answer('Melk')) ->addAnswer(new Answer('Melk'))
->addAnswer(new Answer('Sap')) ->addAnswer(new Answer('Sap'))
->addAnswer(new Answer('Niks')) ->addAnswer(new Answer('Niks'));
->setOrdering(4), $q->ordering = 4;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Waar ging de eerste vakantie die de Krtek zich nog herinnert heen?') $q->question = 'Waar ging de eerste vakantie die de Krtek zich nog herinnert heen?';
->addAnswer(new Answer('Denemarken')) $q->addAnswer(new Answer('Denemarken'))
->addAnswer(new Answer('Drenthe')) ->addAnswer(new Answer('Drenthe'))
->addAnswer(new Answer('Mallorca')) ->addAnswer(new Answer('Mallorca'))
->addAnswer(new Answer('Marokko')) ->addAnswer(new Answer('Marokko'))
->addAnswer(new Answer('Oostenrijk')) ->addAnswer(new Answer('Oostenrijk'))
->addAnswer(new Answer('Turkije')) ->addAnswer(new Answer('Turkije'))
->addAnswer(new Answer('Zweden', true)) ->addAnswer(new Answer('Zweden', true));
->setOrdering(5), $q->ordering = 5;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Met welk groepje ging de Krtek als eerste het Douanespel in?') $q->question = 'Met welk groepje ging de Krtek als eerste het Douanespel in?';
->addAnswer(new Answer('Het eerste groepje', true)) $q->addAnswer(new Answer('Het eerste groepje', true))
->addAnswer(new Answer('Het tweede groepje')) ->addAnswer(new Answer('Het tweede groepje'))
->addAnswer(new Answer('Het derde groepje')) ->addAnswer(new Answer('Het derde groepje'))
->addAnswer(new Answer('Het vierde groepje')) ->addAnswer(new Answer('Het vierde groepje'))
->addAnswer(new Answer('Het vijfde groepje')) ->addAnswer(new Answer('Het vijfde groepje'));
->setOrdering(6), $q->ordering = 6;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Gelooft de Krtek ergens in?') $q->question = 'Gelooft de Krtek ergens in?';
->addAnswer(new Answer('Nee')) $q->addAnswer(new Answer('Nee'))
->addAnswer(new Answer('Het universum', true)) ->addAnswer(new Answer('Het universum', true))
->addAnswer(new Answer('Toeval')) ->addAnswer(new Answer('Toeval'))
->addAnswer(new Answer('De Krtek is hindoeïstisch')) ->addAnswer(new Answer('De Krtek is hindoeïstisch'));
->setOrdering(7), $q->ordering = 7;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('At de Krtek op vrijdagavond heksenkaas tijdens het diner?') $q->question = 'At de Krtek op vrijdagavond heksenkaas tijdens het diner?';
->addAnswer(new Answer('Ja', true)) $q->addAnswer(new Answer('Ja', true))
->addAnswer(new Answer('Nee')) ->addAnswer(new Answer('Nee'));
->setOrdering(8), $q->ordering = 8;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Hoe laat ging de Krtek gisteravond naar bed?') $q->question = 'Hoe laat ging de Krtek gisteravond naar bed?';
->addAnswer(new Answer('Tussen 0:00 en 0:59 uur')) $q->addAnswer(new Answer('Tussen 0:00 en 0:59 uur'))
->addAnswer(new Answer('Tussen 1:00 en 1:59 uur', true)) ->addAnswer(new Answer('Tussen 1:00 en 1:59 uur', true))
->addAnswer(new Answer('Tussen 2:00 en 2:59 uur')) ->addAnswer(new Answer('Tussen 2:00 en 2:59 uur'))
->addAnswer(new Answer('Na 3:00')) ->addAnswer(new Answer('Na 3:00'));
->setOrdering(9), $q->ordering = 9;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Hoeveel batterijen heeft de Krtek naar het bord gebracht bij het douanespel?') $q->question = 'Hoeveel batterijen heeft de Krtek naar het bord gebracht bij het douanespel?';
->addAnswer(new Answer('1')) $q->addAnswer(new Answer('1'))
->addAnswer(new Answer('2')) ->addAnswer(new Answer('2'))
->addAnswer(new Answer('3')) ->addAnswer(new Answer('3'))
->addAnswer(new Answer('geen', true)) ->addAnswer(new Answer('geen', true));
->setOrdering(10), $q->ordering = 10;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Wat keek de Krtek als kind graag op TV?') $q->question = 'Wat keek de Krtek als kind graag op TV?';
->addAnswer(new Answer('Digimon', true)) $q->addAnswer(new Answer('Digimon', true))
->addAnswer(new Answer('Floris')) ->addAnswer(new Answer('Floris'))
->addAnswer(new Answer('Het huis Anubis')) ->addAnswer(new Answer('Het huis Anubis'))
->addAnswer(new Answer('Sesamstraat')) ->addAnswer(new Answer('Sesamstraat'))
->addAnswer(new Answer('Spongebob Squarepants')) ->addAnswer(new Answer('Spongebob Squarepants'))
->addAnswer(new Answer('Teletubbies')) ->addAnswer(new Answer('Teletubbies'));
->setOrdering(11), $q->ordering = 11;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Waarin zat op de heenreis de bagage van de Krtek (voornamelijk)?') $q->question = 'Waarin zat op de heenreis de bagage van de Krtek (voornamelijk)?';
->addAnswer(new Answer('In koffer(s)', true)) $q->addAnswer(new Answer('In koffer(s)', true))
->addAnswer(new Answer('In losse tas(sen)')) ->addAnswer(new Answer('In losse tas(sen)'))
->addAnswer(new Answer('In een rugzak')) ->addAnswer(new Answer('In een rugzak'));
->setOrdering(12), $q->ordering = 12;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Van welk geluid gaan de haren van de Krtek overeind staan?') $q->question = 'Van welk geluid gaan de haren van de Krtek overeind staan?';
->addAnswer(new Answer('Een vork die door een metalen pan krast ')) $q->addAnswer(new Answer('Een vork die door een metalen pan krast '))
->addAnswer(new Answer('Smakkende mensen')) ->addAnswer(new Answer('Smakkende mensen'))
->addAnswer(new Answer('Een vork die over een bord schraapt')) ->addAnswer(new Answer('Een vork die over een bord schraapt'))
->addAnswer(new Answer('Schuren met schuurpapier')) ->addAnswer(new Answer('Schuren met schuurpapier'))
->addAnswer(new Answer('Nagels op een krijtbord')) ->addAnswer(new Answer('Nagels op een krijtbord'))
->addAnswer(new Answer('Servies dat tegen elkaar klettert')) ->addAnswer(new Answer('Servies dat tegen elkaar klettert'))
->addAnswer(new Answer('Het geroekoe van een duif', true)) ->addAnswer(new Answer('Het geroekoe van een duif', true))
->addAnswer(new Answer('Piepschuim')) ->addAnswer(new Answer('Piepschuim'));
->setOrdering(13), $q->ordering = 13;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Wilde de Krtek penningmeester worden?') $q->question = 'Wilde de Krtek penningmeester worden?';
->addAnswer(new Answer('Ja')) $q->addAnswer(new Answer('Ja'))
->addAnswer(new Answer('Nee', true)) ->addAnswer(new Answer('Nee', true));
->setOrdering(14), $q->ordering = 14;
) $quiz->addQuestion($q);
->addQuestion(new Question() $q = new Question();
->setQuestion('Wie is de Krtek?') $q->question = 'Wie is de Krtek?';
->addAnswer(new Answer('Claudia', true)) $q->addAnswer(new Answer('Claudia', true))
->addAnswer(new Answer('Eelco')) ->addAnswer(new Answer('Eelco'))
->addAnswer(new Answer('Elise')) ->addAnswer(new Answer('Elise'))
->addAnswer(new Answer('Gert-Jan')) ->addAnswer(new Answer('Gert-Jan'))
->addAnswer(new Answer('Iris')) ->addAnswer(new Answer('Iris'))
->addAnswer(new Answer('Jari')) ->addAnswer(new Answer('Jari'))
->addAnswer(new Answer('Lara')) ->addAnswer(new Answer('Lara'))
->addAnswer(new Answer('Lotte')) ->addAnswer(new Answer('Lotte'))
->addAnswer(new Answer('Myrthe')) ->addAnswer(new Answer('Myrthe'))
->addAnswer(new Answer('Philine')) ->addAnswer(new Answer('Philine'))
->addAnswer(new Answer('Remy')) ->addAnswer(new Answer('Remy'))
->addAnswer(new Answer('Robbert')) ->addAnswer(new Answer('Robbert'))
->addAnswer(new Answer('Tom')) ->addAnswer(new Answer('Tom'));
->setOrdering(15), $q->ordering = 15;
) $quiz->addQuestion($q);
;
return $quiz;
} }
} }

19
src/Dto/Result.php Normal file
View File

@@ -0,0 +1,19 @@
<?php
declare(strict_types=1);
namespace Tvdt\Dto;
use Symfony\Component\Uid\Uuid;
final readonly class Result
{
public function __construct(
public Uuid $id,
public string $name,
public int $correct,
public float $corrections,
public \DateInterval $time,
public float $score,
) {}
}

90
src/Entity/Answer.php
View File

@@ -8,7 +8,6 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
use Symfony\Bridge\Doctrine\Types\UuidType; use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Component\Uid\Uuid; use Symfony\Component\Uid\Uuid;
use Tvdt\Repository\AnswerRepository; use Tvdt\Repository\AnswerRepository;
@@ -17,114 +16,45 @@ use Tvdt\Repository\AnswerRepository;
class Answer class Answer
{ {
#[ORM\Column(type: UuidType::NAME)] #[ORM\Column(type: UuidType::NAME)]
#[ORM\CustomIdGenerator(class: UuidGenerator::class)] #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
#[ORM\GeneratedValue(strategy: 'CUSTOM')] #[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\Id] #[ORM\Id]
private Uuid $id; public private(set) Uuid $id;
#[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])] #[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
private int $ordering = 0; public int $ordering = 0;
#[ORM\JoinColumn(nullable: false)] #[ORM\JoinColumn(nullable: false)]
#[ORM\ManyToOne(inversedBy: 'answers')] #[ORM\ManyToOne(inversedBy: 'answers')]
private Question $question; public Question $question;
/** @var Collection<int, Candidate> */ /** @var Collection<int, Candidate> */
#[ORM\ManyToMany(targetEntity: Candidate::class, inversedBy: 'answersOnCandidate')] #[ORM\ManyToMany(targetEntity: Candidate::class, inversedBy: 'answersOnCandidate')]
private Collection $candidates; public private(set) Collection $candidates;
/** @var Collection<int, GivenAnswer> */ /** @var Collection<int, GivenAnswer> */
#[ORM\OneToMany(targetEntity: GivenAnswer::class, mappedBy: 'answer', orphanRemoval: true)] #[ORM\OneToMany(targetEntity: GivenAnswer::class, mappedBy: 'answer', orphanRemoval: true)]
private Collection $givenAnswers; public private(set) Collection $givenAnswers;
public function __construct( public function __construct(
#[ORM\Column(length: 255)] #[ORM\Column(length: 255)]
private string $text, public string $text,
#[ORM\Column] #[ORM\Column]
private bool $isRightAnswer = false, public bool $isRightAnswer = false,
) { ) {
$this->candidates = new ArrayCollection(); $this->candidates = new ArrayCollection();
$this->givenAnswers = new ArrayCollection(); $this->givenAnswers = new ArrayCollection();
} }
public function getId(): Uuid public function addCandidate(Candidate $candidate): void
{
return $this->id;
}
public function getText(): string
{
return $this->text;
}
public function setText(string $text): static
{
$this->text = $text;
return $this;
}
public function getQuestion(): Question
{
return $this->question;
}
public function setQuestion(Question $question): static
{
$this->question = $question;
return $this;
}
public function isRightAnswer(): bool
{
return $this->isRightAnswer;
}
public function setRightAnswer(bool $isRightAnswer): static
{
$this->isRightAnswer = $isRightAnswer;
return $this;
}
/** @return Collection<int, Candidate> */
public function getCandidates(): Collection
{
return $this->candidates;
}
public function addCandidate(Candidate $candidate): static
{ {
if (!$this->candidates->contains($candidate)) { if (!$this->candidates->contains($candidate)) {
$this->candidates->add($candidate); $this->candidates->add($candidate);
} }
return $this;
} }
public function removeCandidate(Candidate $candidate): static public function removeCandidate(Candidate $candidate): void
{ {
$this->candidates->removeElement($candidate); $this->candidates->removeElement($candidate);
return $this;
}
/** @return Collection<int, GivenAnswer> */
public function getGivenAnswers(): Collection
{
return $this->givenAnswers;
}
public function getOrdering(): int
{
return $this->ordering;
}
public function setOrdering(int $ordering): self
{
$this->ordering = $ordering;
return $this;
} }
} }

79
src/Entity/Candidate.php
View File

@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
use Symfony\Bridge\Doctrine\Types\UuidType; use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Component\Uid\Uuid; use Symfony\Component\Uid\Uuid;
use Tvdt\Helpers\Base64; use Tvdt\Helpers\Base64;
@@ -18,104 +17,52 @@ use Tvdt\Repository\CandidateRepository;
class Candidate class Candidate
{ {
#[ORM\Column(type: UuidType::NAME, unique: true)] #[ORM\Column(type: UuidType::NAME, unique: true)]
#[ORM\CustomIdGenerator(class: UuidGenerator::class)] #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
#[ORM\GeneratedValue(strategy: 'CUSTOM')] #[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\Id] #[ORM\Id]
private Uuid $id; public private(set) Uuid $id;
#[ORM\JoinColumn(nullable: false)] #[ORM\JoinColumn(nullable: false)]
#[ORM\ManyToOne(inversedBy: 'candidates')] #[ORM\ManyToOne(inversedBy: 'candidates')]
private Season $season; public Season $season;
/** @var Collection<int, Answer> */ /** @var Collection<int, Answer> */
#[ORM\ManyToMany(targetEntity: Answer::class, mappedBy: 'candidates')] #[ORM\ManyToMany(targetEntity: Answer::class, mappedBy: 'candidates')]
private Collection $answersOnCandidate; public private(set) Collection $answersOnCandidate;
/** @var Collection<int, GivenAnswer> */ /** @var Collection<int, GivenAnswer> */
#[ORM\OneToMany(targetEntity: GivenAnswer::class, mappedBy: 'candidate', orphanRemoval: true)] #[ORM\OneToMany(targetEntity: GivenAnswer::class, mappedBy: 'candidate', orphanRemoval: true)]
private Collection $givenAnswers; public private(set) Collection $givenAnswers;
/** @var Collection<int, QuizCandidate> */ /** @var Collection<int, QuizCandidate> */
#[ORM\OneToMany(targetEntity: QuizCandidate::class, mappedBy: 'candidate', orphanRemoval: true)] #[ORM\OneToMany(targetEntity: QuizCandidate::class, mappedBy: 'candidate', orphanRemoval: true)]
private Collection $quizData; public private(set) Collection $quizData;
public string $nameHash {
get => Base64::base64UrlEncode($this->name);
}
public function __construct( public function __construct(
#[ORM\Column(length: 16)] #[ORM\Column(length: 16)]
private string $name, public string $name,
) { ) {
$this->answersOnCandidate = new ArrayCollection(); $this->answersOnCandidate = new ArrayCollection();
$this->givenAnswers = new ArrayCollection(); $this->givenAnswers = new ArrayCollection();
$this->quizData = new ArrayCollection(); $this->quizData = new ArrayCollection();
} }
public function getId(): Uuid public function addAnswersOnCandidate(Answer $answersOnCandidate): void
{
return $this->id;
}
public function getSeason(): Season
{
return $this->season;
}
public function setSeason(Season $season): static
{
$this->season = $season;
return $this;
}
public function getName(): string
{
return $this->name;
}
public function setName(string $name): static
{
$this->name = $name;
return $this;
}
/** @return Collection<int, Answer> */
public function getAnswersOnCandidate(): Collection
{
return $this->answersOnCandidate;
}
public function addAnswersOnCandidate(Answer $answersOnCandidate): static
{ {
if (!$this->answersOnCandidate->contains($answersOnCandidate)) { if (!$this->answersOnCandidate->contains($answersOnCandidate)) {
$this->answersOnCandidate->add($answersOnCandidate); $this->answersOnCandidate->add($answersOnCandidate);
$answersOnCandidate->addCandidate($this); $answersOnCandidate->addCandidate($this);
} }
return $this;
} }
public function removeAnswersOnCandidate(Answer $answersOnCandidate): static public function removeAnswersOnCandidate(Answer $answersOnCandidate): void
{ {
if ($this->answersOnCandidate->removeElement($answersOnCandidate)) { if ($this->answersOnCandidate->removeElement($answersOnCandidate)) {
$answersOnCandidate->removeCandidate($this); $answersOnCandidate->removeCandidate($this);
} }
return $this;
}
/** @return Collection<int, GivenAnswer> */
public function getGivenAnswers(): Collection
{
return $this->givenAnswers;
}
/** @return Collection<int, QuizCandidate> */
public function getQuizData(): Collection
{
return $this->quizData;
}
public function getNameHash(): string
{
return Base64::base64UrlEncode($this->name);
} }
} }

42
src/Entity/Elimination.php
View File

@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Safe\DateTimeImmutable; use Safe\DateTimeImmutable;
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
use Symfony\Bridge\Doctrine\Types\UuidType; use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Component\HttpFoundation\InputBag; use Symfony\Component\HttpFoundation\InputBag;
use Symfony\Component\Uid\Uuid; use Symfony\Component\Uid\Uuid;
@@ -22,48 +21,24 @@ class Elimination
public const string SCREEN_RED = 'red'; public const string SCREEN_RED = 'red';
#[ORM\Column(type: UuidType::NAME, unique: true)] #[ORM\Column(type: UuidType::NAME, unique: true)]
#[ORM\CustomIdGenerator(class: UuidGenerator::class)] #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
#[ORM\GeneratedValue(strategy: 'CUSTOM')] #[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\Id] #[ORM\Id]
private Uuid $id; public private(set) Uuid $id;
/** @var array<string, mixed> */ /** @var array<string, mixed> */
#[ORM\Column(type: Types::JSON)] #[ORM\Column(type: Types::JSONB)]
private array $data = []; public array $data = [];
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)] #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
private \DateTimeImmutable $created; public private(set) \DateTimeImmutable $created;
public function __construct( public function __construct(
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')] #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
#[ORM\ManyToOne(inversedBy: 'eliminations')] #[ORM\ManyToOne(inversedBy: 'eliminations')]
private Quiz $quiz, public Quiz $quiz,
) {} ) {}
public function getId(): Uuid
{
return $this->id;
}
/** @return array<string, mixed> */
public function getData(): array
{
return $this->data;
}
/** @param array<string, mixed> $data */
public function setData(array $data): self
{
$this->data = $data;
return $this;
}
public function getQuiz(): Quiz
{
return $this->quiz;
}
/** @param InputBag<bool|float|int|string> $inputBag */ /** @param InputBag<bool|float|int|string> $inputBag */
public function updateFromInputBag(InputBag $inputBag): self public function updateFromInputBag(InputBag $inputBag): self
{ {
@@ -87,9 +62,4 @@ class Elimination
{ {
$this->created = new DateTimeImmutable(); $this->created = new DateTimeImmutable();
} }
public function getCreated(): \DateTimeInterface
{
return $this->created;
}
} }

38
src/Entity/GivenAnswer.php
View File

@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Safe\DateTimeImmutable; use Safe\DateTimeImmutable;
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
use Symfony\Bridge\Doctrine\Types\UuidType; use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Component\Uid\Uuid; use Symfony\Component\Uid\Uuid;
use Tvdt\Repository\GivenAnswerRepository; use Tvdt\Repository\GivenAnswerRepository;
@@ -17,53 +16,28 @@ use Tvdt\Repository\GivenAnswerRepository;
class GivenAnswer class GivenAnswer
{ {
#[ORM\Column(type: UuidType::NAME, unique: true)] #[ORM\Column(type: UuidType::NAME, unique: true)]
#[ORM\CustomIdGenerator(class: UuidGenerator::class)] #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
#[ORM\GeneratedValue(strategy: 'CUSTOM')] #[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\Id] #[ORM\Id]
private Uuid $id; public private(set) Uuid $id;
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)] #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
private \DateTimeImmutable $created; public private(set) \DateTimeImmutable $created;
public function __construct( public function __construct(
#[ORM\JoinColumn(nullable: false)] #[ORM\JoinColumn(nullable: false)]
#[ORM\ManyToOne(inversedBy: 'givenAnswers')] #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
private Candidate $candidate, private(set) Candidate $candidate,
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')] #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
#[ORM\ManyToOne] #[ORM\ManyToOne]
private Quiz $quiz, private(set) Quiz $quiz,
#[ORM\JoinColumn(nullable: false)] #[ORM\JoinColumn(nullable: false)]
#[ORM\ManyToOne(inversedBy: 'givenAnswers')] #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
private Answer $answer, private(set) Answer $answer,
) {} ) {}
public function getId(): Uuid
{
return $this->id;
}
public function getCandidate(): Candidate
{
return $this->candidate;
}
public function getQuiz(): Quiz
{
return $this->quiz;
}
public function getAnswer(): Answer
{
return $this->answer;
}
public function getCreated(): \DateTimeImmutable
{
return $this->created;
}
#[ORM\PrePersist] #[ORM\PrePersist]
public function setCreatedAtValue(): void public function setCreatedAtValue(): void
{ {

78
src/Entity/Question.php
View File

@@ -8,7 +8,6 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
use Symfony\Bridge\Doctrine\Types\UuidType; use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Component\Uid\Uuid; use Symfony\Component\Uid\Uuid;
use Tvdt\Repository\QuestionRepository; use Tvdt\Repository\QuestionRepository;
@@ -17,86 +16,39 @@ use Tvdt\Repository\QuestionRepository;
class Question class Question
{ {
#[ORM\Column(type: UuidType::NAME)] #[ORM\Column(type: UuidType::NAME)]
#[ORM\CustomIdGenerator(class: UuidGenerator::class)] #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
#[ORM\GeneratedValue(strategy: 'CUSTOM')] #[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\Id] #[ORM\Id]
private Uuid $id; public private(set) Uuid $id;
#[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])] #[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
private int $ordering; public int $ordering;
#[ORM\Column(type: Types::STRING, length: 255)] #[ORM\Column(type: Types::STRING, length: 255)]
private string $question; public string $question;
#[ORM\JoinColumn(nullable: false)] #[ORM\JoinColumn(nullable: false)]
#[ORM\ManyToOne(inversedBy: 'questions')] #[ORM\ManyToOne(inversedBy: 'questions')]
private Quiz $quiz; public Quiz $quiz;
#[ORM\Column] #[ORM\Column]
private bool $enabled = true; public bool $enabled = true;
/** @var Collection<int, Answer> */ /** @var Collection<int, Answer> */
#[ORM\OneToMany(targetEntity: Answer::class, mappedBy: 'question', cascade: ['persist'], orphanRemoval: true)] #[ORM\OneToMany(targetEntity: Answer::class, mappedBy: 'question', cascade: ['persist'], orphanRemoval: true)]
#[ORM\OrderBy(['ordering' => 'ASC'])] #[ORM\OrderBy(['ordering' => 'ASC'])]
private Collection $answers; public private(set) Collection $answers;
public function __construct() public function __construct()
{ {
$this->answers = new ArrayCollection(); $this->answers = new ArrayCollection();
} }
public function getId(): Uuid
{
return $this->id;
}
public function getQuestion(): string
{
return $this->question;
}
public function setQuestion(string $question): static
{
$this->question = $question;
return $this;
}
public function getQuiz(): Quiz
{
return $this->quiz;
}
public function setQuiz(Quiz $quiz): static
{
$this->quiz = $quiz;
return $this;
}
public function isEnabled(): ?bool
{
return $this->enabled;
}
public function setEnabled(bool $enabled): static
{
$this->enabled = $enabled;
return $this;
}
/** @return Collection<int, Answer> */
public function getAnswers(): Collection
{
return $this->answers;
}
public function addAnswer(Answer $answer): static public function addAnswer(Answer $answer): static
{ {
if (!$this->answers->contains($answer)) { if (!$this->answers->contains($answer)) {
$this->answers->add($answer); $this->answers->add($answer);
$answer->setQuestion($this); $answer->question = $this;
} }
return $this; return $this;
@@ -108,7 +60,7 @@ class Question
return 'This question has no answers'; return 'This question has no answers';
} }
$correctAnswers = $this->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer())->count(); $correctAnswers = $this->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer)->count();
if (0 === $correctAnswers) { if (0 === $correctAnswers) {
return 'This question has no correct answers'; return 'This question has no correct answers';
@@ -120,16 +72,4 @@ class Question
return null; return null;
} }
public function getOrdering(): int
{
return $this->ordering;
}
public function setOrdering(int $ordering): static
{
$this->ordering = $ordering;
return $this;
}
} }

78
src/Entity/Quiz.php
View File

@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
use Symfony\Bridge\Doctrine\Types\UuidType; use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Component\Uid\Uuid; use Symfony\Component\Uid\Uuid;
use Tvdt\Repository\QuizRepository; use Tvdt\Repository\QuizRepository;
@@ -17,34 +16,34 @@ use Tvdt\Repository\QuizRepository;
class Quiz class Quiz
{ {
#[ORM\Column(type: UuidType::NAME)] #[ORM\Column(type: UuidType::NAME)]
#[ORM\CustomIdGenerator(class: UuidGenerator::class)] #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
#[ORM\GeneratedValue(strategy: 'CUSTOM')] #[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\Id] #[ORM\Id]
private Uuid $id; public private(set) Uuid $id;
#[ORM\Column(length: 64)] #[ORM\Column(length: 64)]
private string $name; public string $name;
#[ORM\JoinColumn(nullable: false)] #[ORM\JoinColumn(nullable: false)]
#[ORM\ManyToOne(inversedBy: 'quizzes')] #[ORM\ManyToOne(inversedBy: 'quizzes')]
private Season $season; public Season $season;
/** @var Collection<int, Question> */ /** @var Collection<int, Question> */
#[ORM\OneToMany(targetEntity: Question::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)] #[ORM\OneToMany(targetEntity: Question::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)]
#[ORM\OrderBy(['ordering' => 'ASC'])] #[ORM\OrderBy(['ordering' => 'ASC'])]
private Collection $questions; public private(set) Collection $questions;
/** @var Collection<int, QuizCandidate> */ /** @var Collection<int, QuizCandidate> */
#[ORM\OneToMany(targetEntity: QuizCandidate::class, mappedBy: 'quiz', orphanRemoval: true)] #[ORM\OneToMany(targetEntity: QuizCandidate::class, mappedBy: 'quiz', orphanRemoval: true)]
private Collection $candidateData; public private(set) Collection $candidateData;
#[ORM\Column(nullable: false, options: ['default' => 1])] #[ORM\Column(nullable: false, options: ['default' => 1])]
private int $dropouts = 1; public int $dropouts = 1;
/** @var Collection<int, Elimination> */ /** @var Collection<int, Elimination> */
#[ORM\OneToMany(targetEntity: Elimination::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)] #[ORM\OneToMany(targetEntity: Elimination::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)]
#[ORM\OrderBy(['created' => 'DESC'])] #[ORM\OrderBy(['created' => 'DESC'])]
private Collection $eliminations; public private(set) Collection $eliminations;
public function __construct() public function __construct()
{ {
@@ -53,75 +52,16 @@ class Quiz
$this->eliminations = new ArrayCollection(); $this->eliminations = new ArrayCollection();
} }
public function getId(): Uuid
{
return $this->id;
}
public function getName(): ?string
{
return $this->name;
}
public function setName(string $name): static
{
$this->name = $name;
return $this;
}
public function getSeason(): Season
{
return $this->season;
}
public function setSeason(Season $season): static
{
$this->season = $season;
return $this;
}
/** @return Collection<int, Question> */
public function getQuestions(): Collection
{
return $this->questions;
}
public function addQuestion(Question $question): static public function addQuestion(Question $question): static
{ {
if (!$this->questions->contains($question)) { if (!$this->questions->contains($question)) {
$this->questions->add($question); $this->questions->add($question);
$question->setQuiz($this); $question->quiz = $this;
} }
return $this; return $this;
} }
/** @return Collection<int, QuizCandidate> */
public function getCandidateData(): Collection
{
return $this->candidateData;
}
public function getDropouts(): int
{
return $this->dropouts;
}
public function setDropouts(int $dropouts): static
{
$this->dropouts = $dropouts;
return $this;
}
/** @return Collection<int, Elimination> */
public function getEliminations(): Collection
{
return $this->eliminations;
}
public function addElimination(Elimination $elimination): self public function addElimination(Elimination $elimination): self
{ {
$this->eliminations->add($elimination); $this->eliminations->add($elimination);

45
src/Entity/QuizCandidate.php
View File

@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Safe\DateTimeImmutable; use Safe\DateTimeImmutable;
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
use Symfony\Bridge\Doctrine\Types\UuidType; use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Component\Uid\Uuid; use Symfony\Component\Uid\Uuid;
use Tvdt\Repository\QuizCandidateRepository; use Tvdt\Repository\QuizCandidateRepository;
@@ -18,59 +17,27 @@ use Tvdt\Repository\QuizCandidateRepository;
class QuizCandidate class QuizCandidate
{ {
#[ORM\Column(type: UuidType::NAME, unique: true)] #[ORM\Column(type: UuidType::NAME, unique: true)]
#[ORM\CustomIdGenerator(class: UuidGenerator::class)] #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
#[ORM\GeneratedValue(strategy: 'CUSTOM')] #[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\Id] #[ORM\Id]
private Uuid $id; public private(set) Uuid $id;
#[ORM\Column] #[ORM\Column]
private float $corrections = 0; public float $corrections = 0;
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE)] #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE)]
private \DateTimeImmutable $created; public private(set) \DateTimeImmutable $created;
public function __construct( public function __construct(
#[ORM\JoinColumn(nullable: false)] #[ORM\JoinColumn(nullable: false)]
#[ORM\ManyToOne(inversedBy: 'candidateData')] #[ORM\ManyToOne(inversedBy: 'candidateData')]
private Quiz $quiz, public Quiz $quiz,
#[ORM\JoinColumn(nullable: false)] #[ORM\JoinColumn(nullable: false)]
#[ORM\ManyToOne(inversedBy: 'quizData')] #[ORM\ManyToOne(inversedBy: 'quizData')]
private Candidate $candidate, public Candidate $candidate,
) {} ) {}
public function getId(): Uuid
{
return $this->id;
}
public function getCandidate(): Candidate
{
return $this->candidate;
}
public function getQuiz(): Quiz
{
return $this->quiz;
}
public function getCorrections(): ?float
{
return $this->corrections;
}
public function setCorrections(float $corrections): static
{
$this->corrections = $corrections;
return $this;
}
public function getCreated(): \DateTimeImmutable
{
return $this->created;
}
#[ORM\PrePersist] #[ORM\PrePersist]
public function setCreatedAtValue(): void public function setCreatedAtValue(): void
{ {

94
src/Entity/Season.php
View File

@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
use Symfony\Bridge\Doctrine\Types\UuidType; use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Component\Uid\Uuid; use Symfony\Component\Uid\Uuid;
use Tvdt\Repository\SeasonRepository; use Tvdt\Repository\SeasonRepository;
@@ -18,37 +17,37 @@ class Season
private const string SEASON_CODE_CHARACTERS = 'bcdfghjklmnpqrstvwxz'; private const string SEASON_CODE_CHARACTERS = 'bcdfghjklmnpqrstvwxz';
#[ORM\Column(type: UuidType::NAME)] #[ORM\Column(type: UuidType::NAME)]
#[ORM\CustomIdGenerator(class: UuidGenerator::class)] #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
#[ORM\GeneratedValue(strategy: 'CUSTOM')] #[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\Id] #[ORM\Id]
private Uuid $id; public private(set) Uuid $id;
#[ORM\Column(length: 64)] #[ORM\Column(length: 64)]
private string $name; public string $name;
#[ORM\Column(length: 5)] #[ORM\Column(length: 5)]
private string $seasonCode; public string $seasonCode;
/** @var Collection<int, Quiz> */ /** @var Collection<int, Quiz> */
#[ORM\OneToMany(targetEntity: Quiz::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)] #[ORM\OneToMany(targetEntity: Quiz::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)]
private Collection $quizzes; public private(set) Collection $quizzes;
/** @var Collection<int, Candidate> */ /** @var Collection<int, Candidate> */
#[ORM\OneToMany(targetEntity: Candidate::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)] #[ORM\OneToMany(targetEntity: Candidate::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => 'ASC'])]
private Collection $candidates; public private(set) Collection $candidates;
/** @var Collection<int, User> */ /** @var Collection<int, User> */
#[ORM\ManyToMany(targetEntity: User::class, inversedBy: 'seasons')] #[ORM\ManyToMany(targetEntity: User::class, inversedBy: 'seasons')]
private Collection $owners; public private(set) Collection $owners;
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')] #[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
#[ORM\ManyToOne] #[ORM\ManyToOne]
private ?Quiz $ActiveQuiz = null; public ?Quiz $activeQuiz = null;
#[ORM\JoinColumn(nullable: true)] #[ORM\JoinColumn(nullable: true)]
#[ORM\OneToOne(cascade: ['persist', 'remove'])] #[ORM\OneToOne(cascade: ['persist', 'remove'])]
private ?SeasonSettings $settings = null; public ?SeasonSettings $settings = null;
public function __construct() public function __construct()
{ {
@@ -58,73 +57,26 @@ class Season
$this->owners = new ArrayCollection(); $this->owners = new ArrayCollection();
} }
public function getId(): Uuid
{
return $this->id;
}
public function getName(): string
{
return $this->name;
}
public function setName(string $name): static
{
$this->name = $name;
return $this;
}
public function getSeasonCode(): ?string
{
return $this->seasonCode;
}
public function setSeasonCode(string $seasonCode): static
{
$this->seasonCode = $seasonCode;
return $this;
}
/** @return Collection<int, Quiz> */
public function getQuizzes(): Collection
{
return $this->quizzes;
}
public function addQuiz(Quiz $quiz): static public function addQuiz(Quiz $quiz): static
{ {
if (!$this->quizzes->contains($quiz)) { if (!$this->quizzes->contains($quiz)) {
$this->quizzes->add($quiz); $this->quizzes->add($quiz);
$quiz->setSeason($this); $quiz->season = $this;
} }
return $this; return $this;
} }
/** @return Collection<int, Candidate> */
public function getCandidates(): Collection
{
return $this->candidates;
}
public function addCandidate(Candidate $candidate): static public function addCandidate(Candidate $candidate): static
{ {
if (!$this->candidates->contains($candidate)) { if (!$this->candidates->contains($candidate)) {
$this->candidates->add($candidate); $this->candidates->add($candidate);
$candidate->setSeason($this); $candidate->season = $this;
} }
return $this; return $this;
} }
/** @return Collection<int, User> */
public function getOwners(): Collection
{
return $this->owners;
}
public function addOwner(User $owner): static public function addOwner(User $owner): static
{ {
if (!$this->owners->contains($owner)) { if (!$this->owners->contains($owner)) {
@@ -141,18 +93,6 @@ class Season
return $this; return $this;
} }
public function getActiveQuiz(): ?Quiz
{
return $this->ActiveQuiz;
}
public function setActiveQuiz(?Quiz $ActiveQuiz): static
{
$this->ActiveQuiz = $ActiveQuiz;
return $this;
}
public function isOwner(User $user): bool public function isOwner(User $user): bool
{ {
return $this->owners->contains($user); return $this->owners->contains($user);
@@ -171,16 +111,4 @@ class Season
return $this; return $this;
} }
public function getSettings(): ?SeasonSettings
{
return $this->settings;
}
public function setSettings(SeasonSettings $settings): static
{
$this->settings = $settings;
return $this;
}
} }

38
src/Entity/SeasonSettings.php
View File

@@ -6,7 +6,6 @@ namespace Tvdt\Entity;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
use Symfony\Bridge\Doctrine\Types\UuidType; use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Component\Uid\Uuid; use Symfony\Component\Uid\Uuid;
use Tvdt\Repository\SeasonSettingsRepository; use Tvdt\Repository\SeasonSettingsRepository;
@@ -15,43 +14,14 @@ use Tvdt\Repository\SeasonSettingsRepository;
class SeasonSettings class SeasonSettings
{ {
#[ORM\Column(type: UuidType::NAME)] #[ORM\Column(type: UuidType::NAME)]
#[ORM\CustomIdGenerator(class: UuidGenerator::class)] #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
#[ORM\GeneratedValue(strategy: 'CUSTOM')] #[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\Id] #[ORM\Id]
private Uuid $id; public private(set) Uuid $id;
#[ORM\Column(type: Types::BOOLEAN, options: ['default' => false])] #[ORM\Column(type: Types::BOOLEAN, options: ['default' => false])]
private bool $showNumbers = false; public bool $showNumbers = false;
#[ORM\Column(type: Types::BOOLEAN, options: ['default' => false])] #[ORM\Column(type: Types::BOOLEAN, options: ['default' => false])]
private bool $confirmAnswers = false; public bool $confirmAnswers = false;
public function getId(): Uuid
{
return $this->id;
}
public function isShowNumbers(): bool
{
return $this->showNumbers;
}
public function setShowNumbers(bool $showNumbers): self
{
$this->showNumbers = $showNumbers;
return $this;
}
public function isConfirmAnswers(): bool
{
return $this->confirmAnswers;
}
public function setConfirmAnswers(bool $confirmAnswers): self
{
$this->confirmAnswers = $confirmAnswers;
return $this;
}
} }

74
src/Entity/User.php
View File

@@ -8,7 +8,6 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
use Symfony\Bridge\Doctrine\Types\UuidType; use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
@@ -23,51 +22,38 @@ use Tvdt\Repository\UserRepository;
class User implements UserInterface, PasswordAuthenticatedUserInterface class User implements UserInterface, PasswordAuthenticatedUserInterface
{ {
#[ORM\Column(type: UuidType::NAME, unique: true)] #[ORM\Column(type: UuidType::NAME, unique: true)]
#[ORM\CustomIdGenerator(class: UuidGenerator::class)] #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
#[ORM\GeneratedValue(strategy: 'CUSTOM')] #[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\Id] #[ORM\Id]
private Uuid $id; public private(set) Uuid $id;
#[ORM\Column(length: 180)] #[ORM\Column(length: 180)]
private string $email; public string $email;
/** @var list<string> The user roles */ /** @var list<string> The user roles */
#[ORM\Column(type: Types::JSON)] #[ORM\Column(type: Types::JSON)]
private array $roles = []; public array $roles = [];
/** @var string The hashed password */ /** @var string The hashed password */
#[ORM\Column] #[ORM\Column]
private string $password; public string $password;
/** @var Collection<int, Season> */ /** @var Collection<int, Season> */
#[ORM\ManyToMany(targetEntity: Season::class, mappedBy: 'owners')] #[ORM\ManyToMany(targetEntity: Season::class, mappedBy: 'owners')]
private Collection $seasons; public private(set) Collection $seasons;
#[ORM\Column] #[ORM\Column]
private bool $isVerified = false; public bool $isVerified = false;
public bool $isAdmin {
get => \in_array('ROLE_ADMIN', $this->getRoles(), true);
}
public function __construct() public function __construct()
{ {
$this->seasons = new ArrayCollection(); $this->seasons = new ArrayCollection();
} }
public function getId(): Uuid
{
return $this->id;
}
public function getEmail(): ?string
{
return $this->email;
}
public function setEmail(string $email): static
{
$this->email = $email;
return $this;
}
/** /**
* A visual identifier that represents this user. * A visual identifier that represents this user.
* *
@@ -97,27 +83,12 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
return array_unique($roles); return array_unique($roles);
} }
/** @param list<string> $roles */
public function setRoles(array $roles): static
{
$this->roles = $roles;
return $this;
}
/** @see PasswordAuthenticatedUserInterface */ /** @see PasswordAuthenticatedUserInterface */
public function getPassword(): ?string public function getPassword(): ?string
{ {
return $this->password; return $this->password;
} }
public function setPassword(string $password): static
{
$this->password = $password;
return $this;
}
/** @see UserInterface */ /** @see UserInterface */
public function eraseCredentials(): void public function eraseCredentials(): void
{ {
@@ -125,12 +96,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
// $this->plainPassword = null; // $this->plainPassword = null;
} }
/** @return Collection<int, Season> */
public function getSeasons(): Collection
{
return $this->seasons;
}
public function addSeason(Season $season): static public function addSeason(Season $season): static
{ {
if (!$this->seasons->contains($season)) { if (!$this->seasons->contains($season)) {
@@ -149,21 +114,4 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
return $this; return $this;
} }
public function isVerified(): bool
{
return $this->isVerified;
}
public function setIsVerified(bool $isVerified): static
{
$this->isVerified = $isVerified;
return $this;
}
public function isAdmin(): bool
{
return \in_array('ROLE_ADMIN', $this->getRoles(), true);
}
} }

4
src/Factory/EliminationFactory.php
View File

@@ -26,10 +26,10 @@ final readonly class EliminationFactory
$simpleScores = []; $simpleScores = [];
foreach (array_reverse($scores) as $i => $score) { foreach (array_reverse($scores) as $i => $score) {
$simpleScores[$score['name']] = $i < $quiz->getDropouts() ? Elimination::SCREEN_RED : Elimination::SCREEN_GREEN; $simpleScores[$score->name] = $i < $quiz->dropouts ? Elimination::SCREEN_RED : Elimination::SCREEN_GREEN;
} }
$elimination->setData($simpleScores); $elimination->data = $simpleScores;
$this->em->flush(); $this->em->flush();

33
src/Repository/CandidateRepository.php
View File

@@ -6,8 +6,10 @@ namespace Tvdt\Repository;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry; use Doctrine\Persistence\ManagerRegistry;
use Safe\DateTimeImmutable;
use Safe\Exceptions\DatetimeException;
use Safe\Exceptions\UrlException; use Safe\Exceptions\UrlException;
use Symfony\Component\Uid\Uuid; use Tvdt\Dto\Result;
use Tvdt\Entity\Candidate; use Tvdt\Entity\Candidate;
use Tvdt\Entity\Quiz; use Tvdt\Entity\Quiz;
use Tvdt\Entity\Season; use Tvdt\Entity\Season;
@@ -15,9 +17,6 @@ use Tvdt\Helpers\Base64;
/** /**
* @extends ServiceEntityRepository<Candidate> * @extends ServiceEntityRepository<Candidate>
*
* @phpstan-type Result array{id: Uuid, name: string, correct: int, time: \DateInterval, corrections: float, score: float}
* @phpstan-type ResultList list<Result>
*/ */
class CandidateRepository extends ServiceEntityRepository class CandidateRepository extends ServiceEntityRepository
{ {
@@ -53,25 +52,39 @@ class CandidateRepository extends ServiceEntityRepository
} }
} }
/** @return ResultList */ /**
* @throws DatetimeException
*
* @return list<Result>
*/
public function getScores(Quiz $quiz): array public function getScores(Quiz $quiz): array
{ {
return $this->getEntityManager()->createQuery(<<<DQL $result = $this->getEntityManager()->createQuery(<<<DQL
select select
c.id, c.id,
c.name, c.name,
count(case when a.isRightAnswer = true then 1 else null end) as correct, sum(case when a.isRightAnswer = true then 1 else 0 end) as correct,
qc.corrections, qc.corrections,
max(ga.created) - qc.created as time, max(ga.created) as end_time,
(count(case when a.isRightAnswer = true then 1 else null end) + qc.corrections) as score qc.created as start_time,
(sum(case when a.isRightAnswer = true then 1 else 0 end) + qc.corrections) as score
from Tvdt\Entity\Candidate c from Tvdt\Entity\Candidate c
join c.givenAnswers ga join c.givenAnswers ga
join ga.answer a join ga.answer a
join c.quizData qc join c.quizData qc
where qc.quiz = :quiz and ga.quiz = :quiz where qc.quiz = :quiz and ga.quiz = :quiz
group by ga.quiz, c.id, qc.id group by ga.quiz, c.id, qc.id
order by score desc, time asc order by score desc, max(ga.created) - qc.created asc
DQL DQL
)->setParameter('quiz', $quiz)->getResult(); )->setParameter('quiz', $quiz)->getResult();
return array_map(static fn (array $row): Result => new Result(
id: $row['id'],
name: $row['name'],
correct: (int) $row['correct'],
corrections: $row['corrections'],
time: new DateTimeImmutable($row['end_time'])->diff($row['start_time']),
score: $row['score'],
), $result);
} }
} }

2
src/Repository/QuestionRepository.php
View File

@@ -35,7 +35,7 @@ class QuestionRepository extends ServiceEntityRepository
DQL) DQL)
->setMaxResults(1) ->setMaxResults(1)
->setParameter('candidate', $candidate) ->setParameter('candidate', $candidate)
->setParameter('quiz', $candidate->getSeason()->getActiveQuiz()) ->setParameter('quiz', $candidate->season->activeQuiz)
->getOneOrNullResult(); ->getOneOrNullResult();
} }
} }

2
src/Repository/QuizCandidateRepository.php
View File

@@ -41,7 +41,7 @@ class QuizCandidateRepository extends ServiceEntityRepository
throw new \InvalidArgumentException('Quiz candidate not found'); throw new \InvalidArgumentException('Quiz candidate not found');
} }
$quizCandidate->setCorrections($corrections); $quizCandidate->corrections = $corrections;
$this->getEntityManager()->flush(); $this->getEntityManager()->flush();
} }
} }

4
src/Repository/UserRepository.php
View File

@@ -23,7 +23,7 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
* */ * */
public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void
{ {
$user->setPassword($newHashedPassword); $user->password = $newHashedPassword;
$this->getEntityManager()->persist($user); $this->getEntityManager()->persist($user);
$this->getEntityManager()->flush(); $this->getEntityManager()->flush();
} }
@@ -35,7 +35,7 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
throw new \InvalidArgumentException('User not found'); throw new \InvalidArgumentException('User not found');
} }
$user->setRoles(['ROLE_ADMIN']); $user->roles = ['ROLE_ADMIN'];
$this->getEntityManager()->flush(); $this->getEntityManager()->flush();
} }
} }

10
src/Security/EmailVerifier.php
View File

@@ -25,9 +25,9 @@ readonly class EmailVerifier
{ {
$signatureComponents = $this->verifyEmailHelper->generateSignature( $signatureComponents = $this->verifyEmailHelper->generateSignature(
$verifyEmailRouteName, $verifyEmailRouteName,
(string) $user->getId(), $user->id->toRfc4122(),
(string) $user->getEmail(), $user->email,
['id' => $user->getId()], ['id' => $user->id],
); );
$context = $email->getContext(); $context = $email->getContext();
@@ -42,9 +42,9 @@ readonly class EmailVerifier
public function handleEmailConfirmation(Request $request, User $user): void public function handleEmailConfirmation(Request $request, User $user): void
{ {
$this->verifyEmailHelper->validateEmailConfirmationFromRequest($request, (string) $user->getId(), (string) $user->getEmail()); $this->verifyEmailHelper->validateEmailConfirmationFromRequest($request, $user->id->toRfc4122(), $user->email);
$user->setIsVerified(true); $user->isVerified = true;
$this->entityManager->persist($user); $this->entityManager->persist($user);
$this->entityManager->flush(); $this->entityManager->flush();

19
src/Security/Voter/SeasonVoter.php
View File

@@ -15,7 +15,7 @@ use Tvdt\Entity\Quiz;
use Tvdt\Entity\Season; use Tvdt\Entity\Season;
use Tvdt\Entity\User; use Tvdt\Entity\User;
/** @extends Voter<string, Season> */ /** @extends Voter<string, Season|Elimination|Quiz|Candidate|Answer|Question> */
final class SeasonVoter extends Voter final class SeasonVoter extends Voter
{ {
public const string EDIT = 'SEASON_EDIT'; public const string EDIT = 'SEASON_EDIT';
@@ -28,16 +28,15 @@ final class SeasonVoter extends Voter
{ {
return \in_array($attribute, [self::EDIT, self::DELETE, self::ELIMINATION], true) return \in_array($attribute, [self::EDIT, self::DELETE, self::ELIMINATION], true)
&& ( && (
$subject instanceof Season $subject instanceof Answer
|| $subject instanceof Elimination
|| $subject instanceof Quiz
|| $subject instanceof Candidate || $subject instanceof Candidate
|| $subject instanceof Answer || $subject instanceof Elimination
|| $subject instanceof Season
|| $subject instanceof Question || $subject instanceof Question
|| $subject instanceof Quiz
); );
} }
/** @param Season|Elimination|Quiz|Candidate|Answer|Question $subject */
protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token, ?Vote $vote = null): bool protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token, ?Vote $vote = null): bool
{ {
$user = $token->getUser(); $user = $token->getUser();
@@ -45,21 +44,21 @@ final class SeasonVoter extends Voter
return false; return false;
} }
if ($user->isAdmin()) { if ($user->isAdmin) {
return true; return true;
} }
switch (true) { switch (true) {
case $subject instanceof Answer: case $subject instanceof Answer:
$season = $subject->getQuestion()->getQuiz()->getSeason(); $season = $subject->question->quiz->season;
break; break;
case $subject instanceof Elimination: case $subject instanceof Elimination:
case $subject instanceof Question: case $subject instanceof Question:
$season = $subject->getQuiz()->getSeason(); $season = $subject->quiz->season;
break; break;
case $subject instanceof Candidate: case $subject instanceof Candidate:
case $subject instanceof Quiz: case $subject instanceof Quiz:
$season = $subject->getSeason(); $season = $subject->season;
break; break;
case $subject instanceof Season: case $subject instanceof Season:
$season = $subject; $season = $subject;

16
src/Service/EliminationService.php
View File

@@ -1,16 +0,0 @@
<?php
declare(strict_types=1);
namespace Tvdt\Service;
use Tvdt\Repository\CandidateRepository;
/**
* @phpstan-import-type ResultList from CandidateRepository
*/
class EliminationService
{
/** @phpstan-param ResultList $result */
public function createEliminationFromResult(array $result): void {}
}

6
src/Service/QuizSpreadsheetService.php
View File

@@ -84,8 +84,8 @@ class QuizSpreadsheetService
} }
$question = new Question(); $question = new Question();
$question->setQuestion((string) $questionArr[0]); $question->question = (string) $questionArr[0];
$question->setOrdering($questionCounter++); $question->ordering = $questionCounter++;
$answerCounter = 1; $answerCounter = 1;
$arrCounter = 1; $arrCounter = 1;
@@ -100,7 +100,7 @@ class QuizSpreadsheetService
} }
$answer = new Answer((string) $questionArr[$arrCounter++], (bool) $questionArr[$arrCounter++]); $answer = new Answer((string) $questionArr[$arrCounter++], (bool) $questionArr[$arrCounter++]);
$answer->setOrdering($answerCounter++); $answer->ordering = $answerCounter++;
$question->addAnswer($answer); $question->addAnswer($answer);
} }

2
templates/backoffice/quiz.html.twig
View File

@@ -109,7 +109,7 @@
</form> </form>
</td> </td>
<td>{{ candidate.score|default('x') }}</td> <td>{{ candidate.score|default('x') }}</td>
<td>{{ candidate.time }}</td> <td>{{ candidate.time.format('%i:%S') }}</td>
</tr> </tr>
{% else %} {% else %}
<tr> <tr>

10
tests/Security/Voter/SeasonVoterTest.php
View File

@@ -53,19 +53,19 @@ final class SeasonVoterTest extends TestCase
$season->method('isOwner')->willReturn(true); $season->method('isOwner')->willReturn(true);
$quiz = self::createStub(Quiz::class); $quiz = self::createStub(Quiz::class);
$quiz->method('getSeason')->willReturn($season); $quiz->season = $season;
$elimination = self::createStub(Elimination::class); $elimination = self::createStub(Elimination::class);
$elimination->method('getQuiz')->willReturn($quiz); $elimination->quiz = $quiz;
$candidate = self::createStub(Candidate::class); $candidate = self::createStub(Candidate::class);
$candidate->method('getSeason')->willReturn($season); $candidate->season = $season;
$question = self::createStub(Question::class); $question = self::createStub(Question::class);
$question->method('getQuiz')->willReturn($quiz); $question->quiz = $quiz;
$answer = self::createStub(Answer::class); $answer = self::createStub(Answer::class);
$answer->method('getQuestion')->willReturn($question); $answer->question = $question;
yield 'Season' => [$season]; yield 'Season' => [$season];
yield 'Elimination' => [$elimination]; yield 'Elimination' => [$elimination];