Changed Config Variables database and other entities.

migrations/Version20240604185317.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20240604185317 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('DROP SEQUENCE config_variable_id_seq CASCADE');
+        $this->addSql('DROP INDEX uniq_718569538a90aba9');
+        $this->addSql('ALTER TABLE config_variable DROP CONSTRAINT config_variable_pkey');
+        $this->addSql('ALTER TABLE config_variable DROP id');
+        $this->addSql('ALTER TABLE config_variable ALTER section SET NOT NULL');
+        $this->addSql('ALTER TABLE config_variable ALTER section TYPE VARCHAR(255)');
+        $this->addSql('ALTER TABLE config_variable ADD PRIMARY KEY (key)');
+    }
+
+    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 SEQUENCE config_variable_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('DROP INDEX config_variable_pkey');
+        $this->addSql('ALTER TABLE config_variable ADD id INT NOT NULL');
+        $this->addSql('ALTER TABLE config_variable ALTER section DROP NOT NULL');
+        $this->addSql('ALTER TABLE config_variable ALTER section TYPE VARCHAR(64)');
+        $this->addSql('CREATE UNIQUE INDEX uniq_718569538a90aba9 ON config_variable (key)');
+        $this->addSql('ALTER TABLE config_variable ADD PRIMARY KEY (id)');
+    }
+}

src/Controller/Admin/ConfigVariableCrudController.php

@@ -3,9 +3,11 @@
 namespace App\Controller\Admin;
 
 use App\Entity\ConfigVariable;
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+use App\Enum\ConfigSectionType;
-use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
+use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Field\ChoiceField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 
 class ConfigVariableCrudController extends AbstractCrudController
 {
@@ -14,10 +16,14 @@ class ConfigVariableCrudController extends AbstractCrudController
         return ConfigVariable::class;
     }
 
+    public function configureCrud(Crud $crud): Crud
+    {
+        return $crud;
+    }
 
     public function configureFields(string $pageName): iterable
     {
-        yield TextField::new('section');
+        yield ChoiceField::new ('section')->setChoices(ConfigSectionType::cases());
         yield TextField::new ('key');
         yield TextField::new ('value');
     }

src/Controller/Admin/RoomFareCrudController.php

@@ -20,7 +20,8 @@ class RoomFareCrudController extends AbstractCrudController
 
     public function configureFields(string $pageName): iterable
     {
-        $fieldFareTable = AssociationField::new ('fareTable')->setRequired(true);
+        $fieldFareTable = AssociationField::new('fareTable')->setRequired(true)
+            ->formatValue(fn ($value) => $value->getComment() . " (" . $value->getRoomCategory() . ")");
         if ($pageName == Crud::PAGE_EDIT) {
             $fieldFareTable->setDisabled(true);
         }

src/Entity/ConfigVariable.php

@@ -3,31 +3,25 @@
 namespace App\Entity;
 
 use App\Repository\ConfigVariableRepository;
+use App\Enum\ConfigSectionType;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity(repositoryClass: ConfigVariableRepository::class)]
 class ConfigVariable
 {
     #[ORM\Id]
-    #[ORM\GeneratedValue]
+    #[ORM\GeneratedValue("NONE")]
-    #[ORM\Column]
+    #[ORM\Column(length: 32, unique: true, nullable: false)]
-    private ?int $id = null;
+    private string $key = "";
-
-    #[ORM\Column(length: 32, unique: true)]
-    private ?string $key = null;
 
     #[ORM\Column(length: 255)]
     private ?string $value = null;
 
-    #[ORM\Column(length: 64, nullable: true)]
+    #[ORM\Column(type: 'string', enumType: ConfigSectionType::class, nullable: false)]
-    private ?string $section = null;
+    private ConfigSectionType $section = ConfigSectionType::General;
 
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
 
-    public function getKey(): ?string
+    public function getKey(): string
     {
         return $this->key;
     }
@@ -51,15 +45,20 @@ class ConfigVariable
         return $this;
     }
 
-    public function getSection(): ?string
+    public function getSection(): ConfigSectionType
     {
         return $this->section;
     }
 
-    public function setSection(?string $section): static
+    public function setSection(ConfigSectionType $section): static
     {
         $this->section = $section;
 
         return $this;
     }
+
+    function __toString(): string
+    {
+        return $this->getKey();
+    }
 }

src/Entity/FareTable.php

@@ -125,10 +125,14 @@ class FareTable
 
     public function __toString(): string
     {
+        $str = $this->id;
         if (!\is_null($this->comment)) {
-            return $this->comment;
+            $str = $this->comment;
         }
-        return $this->id;
+        $str . "(" . $this->roomCategory . ")";
+        if (!\is_null($this->roomCategory)) {
+        }
+        return $str;
     }
 
     /**

src/Enum/ConfigSectionType.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Enum;
+
+enum ConfigSectionType: string {
+    case General = 'GENERAL';
+    case Internal = 'INTERNAL';
+    case Company = 'COMPANY';
+    case Backend = 'BACK';
+    case Frontend = 'FRONT';
+    case Test = 'TEST';
+}

src/Service/ConfigVariableService.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Service;
+
+use App\Entity\ConfigVariable;
+use App\Repository\ConfigVariableRepository;
+
+use Doctrine\Common\Collections\ArrayCollection;
+
+/**
+ * Service to manage config variables.
+ */
+class ConfigVariableService
+{
+
+    public function __construct(
+        private ConfigVariableRepository $repoVariables
+    )  {}
+
+    public function getVariable(string $key) {
+        $var = $this->repoVariables->findVariableByKey($key);
+    }
+
+    /**
+     * Create and init all variables. 
+     * To be used during Setup process.
+     */
+    public function InitVariablesOnSetup(): void {
+
+        $entityManager = $this->repoVariables->getEntityManager();
+        $entityManager->beginTransaction();
+
+        try {
+            
+        }
+        catch (\Throwable $th) {
+            $entityManager->rollback();
+            throw $th;
+        }
+    }
+
+    private function AddConfigVariable(string $key, string $value, string $section) : Returntype {
+        
+    }
+
+}