bug fixes for enums

Signed-off-by: MarioRadu <magda_marior@yahoo.com>

Author: marioradu05

data/doctrine/fixtures/AdminLoader.php

@@ -7,12 +7,10 @@
 use Admin\Admin\Entity\Admin;
 use Admin\Admin\Entity\AdminRole;
 use Admin\Admin\Enum\AdminRoleEnum;
-use Admin\Admin\Repository\AdminRoleRepository;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function assert;
 use function password_hash;
 
 use const PASSWORD_DEFAULT;
@@ -21,17 +19,14 @@ class AdminLoader implements FixtureInterface, DependentFixtureInterface
 {
     public function load(ObjectManager $manager): void
     {
-        /** @var AdminRoleRepository $repository */
-        $repository    = $manager->getRepository(AdminRole::class);
-        $superuserRole = $repository->findOneBy(['name' => AdminRoleEnum::Superuser]);
-        assert($superuserRole instanceof AdminRole);
-
         $admin = (new Admin())
             ->setIdentity('admin')
             ->setPassword(password_hash('dotadmin', PASSWORD_DEFAULT))
             ->setFirstName('Dotkernel')
             ->setLastName('Admin')
-            ->addRole($superuserRole);
+            ->addRole(
+                $manager->getRepository(AdminRole::class)->findOneBy(['name' => AdminRoleEnum::Superuser])
+            );
 
         $manager->persist($admin);
         $manager->flush();

…ine/migrations/Version20250307115830.php …ine/migrations/Version20250310084727.phpdata/doctrine/migrations/Version20250307115830.php renamed to data/doctrine/migrations/Version20250310084727.php data/doctrine/migrations/Version20250307115830.php renamed to data/doctrine/migrations/Version20250310084727.php

@@ -10,7 +10,7 @@
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
-final class Version20250307115830 extends AbstractMigration
+final class Version20250310084727 extends AbstractMigration
 {
     public function getDescription(): string
     {
@@ -20,11 +20,11 @@ public function getDescription(): string
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE admin (uuid BINARY(16) NOT NULL, identity VARCHAR(100) NOT NULL, firstName VARCHAR(255) DEFAULT NULL, lastName VARCHAR(255) DEFAULT NULL, password VARCHAR(100) NOT NULL, status VARCHAR(255) DEFAULT \'active\' NOT NULL, created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_880E0D766A95E9C4 (identity), PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');
+        $this->addSql('CREATE TABLE admin (uuid BINARY(16) NOT NULL, identity VARCHAR(100) NOT NULL, firstName VARCHAR(255) DEFAULT NULL, lastName VARCHAR(255) DEFAULT NULL, password VARCHAR(100) NOT NULL, status ENUM(\'active\', \'inactive\') DEFAULT \'active\' NOT NULL, created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_880E0D766A95E9C4 (identity), PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');
         $this->addSql('CREATE TABLE admin_roles (userUuid BINARY(16) NOT NULL, roleUuid BINARY(16) NOT NULL, INDEX IDX_1614D53DD73087E9 (userUuid), INDEX IDX_1614D53D88446210 (roleUuid), PRIMARY KEY(userUuid, roleUuid)) DEFAULT CHARACTER SET utf8mb4');
-        $this->addSql('CREATE TABLE admin_login (uuid BINARY(16) NOT NULL, adminIp VARCHAR(50) DEFAULT NULL, country VARCHAR(50) DEFAULT NULL, continent VARCHAR(50) DEFAULT NULL, organization VARCHAR(50) DEFAULT NULL, deviceType VARCHAR(20) DEFAULT NULL, deviceBrand VARCHAR(20) DEFAULT NULL, deviceModel VARCHAR(40) DEFAULT NULL, isMobile VARCHAR(255) DEFAULT NULL, osName VARCHAR(20) DEFAULT NULL, osVersion VARCHAR(20) DEFAULT NULL, osPlatform VARCHAR(20) DEFAULT NULL, clientType VARCHAR(20) DEFAULT NULL, clientName VARCHAR(40) DEFAULT NULL, clientEngine VARCHAR(20) DEFAULT NULL, clientVersion VARCHAR(20) DEFAULT NULL, loginStatus VARCHAR(255) DEFAULT NULL, identity VARCHAR(100) DEFAULT NULL, created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');
-        $this->addSql('CREATE TABLE admin_role (uuid BINARY(16) NOT NULL, name VARCHAR(255) DEFAULT \'admin\', created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');
-        $this->addSql('CREATE TABLE settings (uuid BINARY(16) NOT NULL, identifier VARCHAR(255) NOT NULL, value LONGTEXT NOT NULL, created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, admin_uuid BINARY(16) DEFAULT NULL, INDEX IDX_E545A0C5F166D246 (admin_uuid), PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');
+        $this->addSql('CREATE TABLE admin_login (uuid BINARY(16) NOT NULL, adminIp VARCHAR(50) DEFAULT NULL, country VARCHAR(50) DEFAULT NULL, continent VARCHAR(50) DEFAULT NULL, organization VARCHAR(50) DEFAULT NULL, deviceType VARCHAR(20) DEFAULT NULL, deviceBrand VARCHAR(20) DEFAULT NULL, deviceModel VARCHAR(40) DEFAULT NULL, isMobile ENUM(\'yes\', \'no\') DEFAULT NULL, osName VARCHAR(20) DEFAULT NULL, osVersion VARCHAR(20) DEFAULT NULL, osPlatform VARCHAR(20) DEFAULT NULL, clientType VARCHAR(20) DEFAULT NULL, clientName VARCHAR(40) DEFAULT NULL, clientEngine VARCHAR(20) DEFAULT NULL, clientVersion VARCHAR(20) DEFAULT NULL, loginStatus ENUM(\'success\', \'fail\') DEFAULT NULL, identity VARCHAR(100) DEFAULT NULL, created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');
+        $this->addSql('CREATE TABLE admin_role (uuid BINARY(16) NOT NULL, name ENUM(\'admin\', \'superuser\') DEFAULT \'admin\', created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');
+        $this->addSql('CREATE TABLE settings (uuid BINARY(16) NOT NULL, identifier ENUM(\'table_admin_list_selected_columns\', \'table_admin_list_logins_selected_columns\') NOT NULL, value LONGTEXT NOT NULL, created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, admin_uuid BINARY(16) DEFAULT NULL, INDEX IDX_E545A0C5F166D246 (admin_uuid), PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');
         $this->addSql('ALTER TABLE admin_roles ADD CONSTRAINT FK_1614D53DD73087E9 FOREIGN KEY (userUuid) REFERENCES admin (uuid)');
         $this->addSql('ALTER TABLE admin_roles ADD CONSTRAINT FK_1614D53D88446210 FOREIGN KEY (roleUuid) REFERENCES admin_role (uuid)');
         $this->addSql('ALTER TABLE settings ADD CONSTRAINT FK_E545A0C5F166D246 FOREIGN KEY (admin_uuid) REFERENCES admin (uuid)');

public/images/loading-sm.gif

@@ -36,7 +36,11 @@ class Admin extends AbstractEntity implements AdminInterface
     #[ORM\Column(name: 'password', type: 'string', length: 100)]
     protected string $password;
 
-    #[ORM\Column(type: 'string', enumType: AdminStatusEnum::class, options: ['default' => AdminStatusEnum::Active])]
+    #[ORM\Column(
+        type: 'admin_status_enum',
+        enumType: AdminStatusEnum::class,
+        options: ['default' => AdminStatusEnum::Active]
+    )]
     protected AdminStatusEnum $status = AdminStatusEnum::Active;
 
     #[ORM\ManyToMany(targetEntity: AdminRole::class, fetch: 'EAGER')]
@@ -45,7 +49,7 @@ class Admin extends AbstractEntity implements AdminInterface
     #[ORM\InverseJoinColumn(name: 'roleUuid', referencedColumnName: 'uuid')]
     protected Collection $roles;
 
-    #[ORM\OneToMany(mappedBy: 'admin', targetEntity: Setting::class)]
+    #[ORM\OneToMany(targetEntity: Setting::class, mappedBy: 'admin')]
     protected Collection $settings;
 
     public function __construct()

public/images/loading.gif

@@ -40,7 +40,7 @@ class AdminLogin extends AbstractEntity
     #[ORM\Column(name: 'deviceModel', type: 'string', length: 40, nullable: true)]
     protected ?string $deviceModel = null;
 
-    #[ORM\Column(type: 'string', nullable: true, enumType: YesNoEnum::class)]
+    #[ORM\Column(type: 'yes_no_enum', nullable: true, enumType: YesNoEnum::class)]
     protected ?YesNoEnum $isMobile = null;
 
     #[ORM\Column(name: 'osName', type: 'string', length: 20, nullable: true)]
@@ -64,7 +64,7 @@ class AdminLogin extends AbstractEntity
     #[ORM\Column(name: 'clientVersion', type: 'string', length: 20, nullable: true)]
     protected ?string $clientVersion = null;
 
-    #[ORM\Column(type: 'string', nullable: true, enumType: SuccessFailureEnum::class)]
+    #[ORM\Column(type: 'success_failure_enum', nullable: true, enumType: SuccessFailureEnum::class)]
     protected ?SuccessFailureEnum $loginStatus = null;
 
     #[ORM\Column(name: 'identity', type: 'string', length: 100, nullable: true)]

src/Admin/src/Entity/Admin.php

@@ -19,7 +19,7 @@ class AdminRole extends AbstractEntity
     use TimestampsTrait;
 
     #[ORM\Column(
-        type: 'string',
+        type: 'admin_role_enum',
         nullable: true,
         enumType: AdminRoleEnum::class,
         options: ['default' => AdminRoleEnum::Admin]

src/Admin/src/Entity/AdminLogin.php

@@ -8,12 +8,9 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\DBAL\Types\Type;
-use InvalidArgumentException;
 
 use function array_map;
-use function gettype;
 use function implode;
-use function is_object;
 use function sprintf;
 
 abstract class AbstractEnumType extends Type
@@ -31,25 +28,13 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
 
     public function convertToPHPValue(mixed $value, AbstractPlatform $platform): mixed
     {
-        if ($value === null) {
-            return null;
-        }
-
-        return $this->getEnumClass()::from($value);
+        return $value;
     }
 
     public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): mixed
     {
-        if ($value === null) {
-            return null;
-        }
-
         if (! $value instanceof BackedEnum) {
-            throw new InvalidArgumentException(sprintf(
-                'Expected instance of %s, got %s',
-                $this->getEnumClass(),
-                is_object($value) ? $value::class : gettype($value)
-            ));
+            return $value;
         }
 
         return $value->value;

src/Admin/src/Entity/AdminRole.php

@@ -26,7 +26,7 @@ class Setting extends AbstractEntity
     #[ORM\JoinColumn(name: 'admin_uuid', referencedColumnName: 'uuid')]
     protected Admin $admin;
 
-    #[ORM\Column(type: 'string', enumType: SettingEnum::class)]
+    #[ORM\Column(type: 'setting_enum', enumType: SettingEnum::class)]
     protected SettingEnum $identifier;
 
     #[ORM\Column(name: "value", type: "text")]