Refactor entities

ArmaForces · Aug 14, 2023 · db546db · db546db
1 parent 51fdb9c
commit db546db
Show file tree

Hide file tree

Showing 113 changed files with 923 additions and 1,178 deletions.
diff --git a/config/doctrine/Mod/AbstractMod.orm.xml b/config/doctrine/Mod/AbstractMod.orm.xml
@@ -7,8 +7,6 @@
     <entity name="App\Entity\Mod\AbstractMod" table="mods" repository-class="App\Repository\Mod\ModRepository" inheritance-type="SINGLE_TABLE">
         <field name="name" type="string" length="255"/>
         <field name="description" type="string" length="255" nullable="true"/>
-
-        <field name="type" type="mod_type_enum" length="255"/>
         <field name="status" type="mod_status_enum" length="255" nullable="true"/>
 
         <discriminator-column name="source" type="string" length="255"/>

diff --git a/config/doctrine/Mod/SteamWorkshopMod.orm.xml b/config/doctrine/Mod/SteamWorkshopMod.orm.xml
@@ -5,6 +5,7 @@
                           https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
     <entity name="App\Entity\Mod\SteamWorkshopMod" repository-class="App\Repository\Mod\SteamWorkshopModRepository">
+        <field name="type" type="mod_type_enum" length="255"/>
         <field name="itemId" type="bigint" unique="true"/>
     </entity>
 

diff --git a/migrations/Version20230814124403.php b/migrations/Version20230814124403.php
@@ -0,0 +1,33 @@
+<?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 Version20230814124403 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Remove mod type from directory mod entity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE mods CHANGE type type VARCHAR(255) DEFAULT NULL COMMENT \'(DC2Type:mod_type_enum)\'');
+        $this->addSql("UPDATE mods SET type = NULL WHERE source = 'directory'");
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql("UPDATE mods SET type = 'server_side' WHERE source = 'directory'");
+        $this->addSql('ALTER TABLE mods CHANGE type type VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci` COMMENT \'(DC2Type:mod_type_enum)\'');
+    }
+}
diff --git a/src/Api/Controller/GetModListByNameAction.php b/src/Api/Controller/GetModListByNameAction.php
@@ -4,7 +4,7 @@
 
 namespace App\Api\Controller;
 
-use App\Entity\ModList\ModListInterface;
+use App\Entity\ModList\ModList;
 use App\Repository\ModList\ModListRepository;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -15,7 +15,7 @@ public function __construct(
     ) {
     }
 
-    public function __invoke(string $name): ?ModListInterface
+    public function __invoke(string $name): ?ModList
     {
         $modList = $this->modListRepository->findOneBy([
             'name' => $name,

diff --git a/src/Api/DataTransformer/Attendance/AttendanceInputDataTransformer.php b/src/Api/DataTransformer/Attendance/AttendanceInputDataTransformer.php
@@ -8,7 +8,6 @@
 use ApiPlatform\Core\Validator\ValidatorInterface;
 use App\Api\Input\Attendance\AttendanceInput;
 use App\Entity\Attendance\Attendance;
-use App\Entity\Attendance\AttendanceInterface;
 use Ramsey\Uuid\Uuid;
 
 class AttendanceInputDataTransformer implements DataTransformerInterface
@@ -28,7 +27,7 @@ public function transform($object, string $to, array $context = []): Attendance
 
     public function supportsTransformation($data, string $to, array $context = []): bool
     {
-        if ($data instanceof AttendanceInterface) {
+        if ($data instanceof Attendance) {
             return false;
         }
 

diff --git a/src/Api/DataTransformer/Attendance/AttendanceOutputDataTransformer.php b/src/Api/DataTransformer/Attendance/AttendanceOutputDataTransformer.php
@@ -6,13 +6,13 @@
 
 use ApiPlatform\Core\DataTransformer\DataTransformerInterface;
 use App\Api\Output\Attendance\AttendanceOutput;
-use App\Entity\Attendance\AttendanceInterface;
+use App\Entity\Attendance\Attendance;
 
 class AttendanceOutputDataTransformer implements DataTransformerInterface
 {
     public function transform($object, string $to, array $context = []): AttendanceOutput
     {
-        /** @var AttendanceInterface $object */
+        /** @var Attendance $object */
         $output = new AttendanceOutput();
 
         $output->setId($object->getId()->toString());
@@ -25,6 +25,6 @@ public function transform($object, string $to, array $context = []): AttendanceO
 
     public function supportsTransformation($data, string $to, array $context = []): bool
     {
-        return AttendanceOutput::class === $to && $data instanceof AttendanceInterface;
+        return AttendanceOutput::class === $to && $data instanceof Attendance;
     }
 }
diff --git a/src/Api/DataTransformer/Dlc/DlcOutputDataTransformer.php b/src/Api/DataTransformer/Dlc/DlcOutputDataTransformer.php
@@ -6,13 +6,13 @@
 
 use ApiPlatform\Core\DataTransformer\DataTransformerInterface;
 use App\Api\Output\Dlc\DlcOutput;
-use App\Entity\Dlc\DlcInterface;
+use App\Entity\Dlc\Dlc;
 
 class DlcOutputDataTransformer implements DataTransformerInterface
 {
     public function transform($object, string $to, array $context = []): DlcOutput
     {
-        /** @var DlcInterface $object */
+        /** @var Dlc $object */
         $output = new DlcOutput();
 
         $output->setId($object->getId()->toString());
@@ -27,6 +27,6 @@ public function transform($object, string $to, array $context = []): DlcOutput
 
     public function supportsTransformation($data, string $to, array $context = []): bool
     {
-        return DlcOutput::class === $to && $data instanceof DlcInterface;
+        return DlcOutput::class === $to && $data instanceof Dlc;
     }
 }
diff --git a/src/Api/DataTransformer/Mod/ModOutputDataTransformer.php b/src/Api/DataTransformer/Mod/ModOutputDataTransformer.php
@@ -6,33 +6,34 @@
 
 use ApiPlatform\Core\DataTransformer\DataTransformerInterface;
 use App\Api\Output\Mod\ModOutput;
+use App\Entity\Mod\AbstractMod;
 use App\Entity\Mod\DirectoryMod;
 use App\Entity\Mod\Enum\ModSourceEnum;
-use App\Entity\Mod\ModInterface;
+use App\Entity\Mod\Enum\ModTypeEnum;
 use App\Entity\Mod\SteamWorkshopMod;
 
 class ModOutputDataTransformer implements DataTransformerInterface
 {
     public function transform($object, string $to, array $context = []): ModOutput
     {
-        /** @var ModInterface $object */
+        /** @var AbstractMod $object */
         $output = new ModOutput();
 
         $output->setId($object->getId()->toString());
         $output->setName($object->getName());
         $output->setCreatedAt($object->getCreatedAt());
         $output->setLastUpdatedAt($object->getLastUpdatedAt());
 
-        $output->setType($object->getType()->getValue());
-
         /** @var null|string $status */
         $status = $object->getStatus() ? $object->getStatus()->getValue() : null;
         $output->setStatus($status);
 
         if ($object instanceof SteamWorkshopMod) {
+            $output->setType($object->getType()->getValue());
             $output->setSource(ModSourceEnum::STEAM_WORKSHOP);
             $output->setItemId($object->getItemId());
         } elseif ($object instanceof DirectoryMod) {
+            $output->setType(ModTypeEnum::SERVER_SIDE);
             $output->setSource(ModSourceEnum::DIRECTORY);
             $output->setDirectory($object->getDirectory());
         }
@@ -42,6 +43,6 @@ public function transform($object, string $to, array $context = []): ModOutput
 
     public function supportsTransformation($data, string $to, array $context = []): bool
     {
-        return ModOutput::class === $to && $data instanceof ModInterface;
+        return ModOutput::class === $to && $data instanceof AbstractMod;
     }
 }
diff --git a/src/Api/DataTransformer/ModList/ModListDetailsOutputDataTransformer.php b/src/Api/DataTransformer/ModList/ModListDetailsOutputDataTransformer.php
@@ -11,9 +11,8 @@
 use App\Api\Output\Mod\ModOutput;
 use App\Api\Output\ModList\ModListDetailsOutput;
 use App\Api\Output\ModList\ModListOutput;
-use App\Entity\Dlc\DlcInterface;
+use App\Entity\Dlc\Dlc;
 use App\Entity\ModList\ModList;
-use App\Entity\ModList\ModListInterface;
 use App\Repository\Mod\ModRepository;
 
 class ModListDetailsOutputDataTransformer implements DataTransformerInterface
@@ -27,7 +26,7 @@ public function __construct(
 
     public function transform($object, string $to, array $context = []): ModListOutput
     {
-        /** @var ModListInterface $object */
+        /** @var ModList $object */
         $output = new ModListDetailsOutput();
 
         $output->setId($object->getId()->toString());
@@ -44,7 +43,7 @@ public function transform($object, string $to, array $context = []): ModListOutp
         $output->setMods($mods);
 
         $dlcs = array_map(
-            fn (DlcInterface $dlc) => $this->dlcOutputDataTransformer->transform($dlc, DlcOutput::class, $context),
+            fn (Dlc $dlc) => $this->dlcOutputDataTransformer->transform($dlc, DlcOutput::class, $context),
             $object->getDlcs()
         );
         $output->setDlcs($dlcs);

diff --git a/src/DataFixtures/Dlc/CslaIronCurtain.php b/src/DataFixtures/Dlc/CslaIronCurtain.php
@@ -18,6 +18,7 @@ public function load(ObjectManager $manager): void
         $dlc = new Dlc(
             Uuid::fromString(self::ID),
             'Arma 3 Creator DLC: CSLA Iron Curtain',
+            null,
             1294440,
             'csla'
         );

diff --git a/src/DataFixtures/Dlc/GlobalMobilizationFixture.php b/src/DataFixtures/Dlc/GlobalMobilizationFixture.php
@@ -18,6 +18,7 @@ public function load(ObjectManager $manager): void
         $dlc = new Dlc(
             Uuid::fromString(self::ID),
             'Arma 3 Creator DLC: Global Mobilization - Cold War Germany',
+            null,
             1042220,
             'gm'
         );

diff --git a/src/DataFixtures/Dlc/SogPrairieFireFixture.php b/src/DataFixtures/Dlc/SogPrairieFireFixture.php
@@ -18,6 +18,7 @@ public function load(ObjectManager $manager): void
         $dlc = new Dlc(
             Uuid::fromString(self::ID),
             'Arma 3 Creator DLC: S.O.G. Prairie Fire',
+            null,
             1227700,
             'vn'
         );

diff --git a/src/DataFixtures/Dlc/WesternSaharaFixture.php b/src/DataFixtures/Dlc/WesternSaharaFixture.php
@@ -18,6 +18,7 @@ public function load(ObjectManager $manager): void
         $dlc = new Dlc(
             Uuid::fromString(self::ID),
             'Arma 3 Creator DLC: Western Sahara',
+            null,
             1681170,
             'ws'
         );

diff --git a/src/DataFixtures/Mod/Optional/AceInteractionMenuExpansionModFixture.php b/src/DataFixtures/Mod/Optional/AceInteractionMenuExpansionModFixture.php
@@ -19,6 +19,8 @@ public function load(ObjectManager $manager): void
         $mod = new SteamWorkshopMod(
             Uuid::fromString(self::ID),
             'ACE Interaction Menu Expansion',
+            null,
+            null,
             ModTypeEnum::get(ModTypeEnum::OPTIONAL),
             1376867375
         );

diff --git a/src/DataFixtures/Mod/Required/ArmaForcesModsModFixture.php b/src/DataFixtures/Mod/Required/ArmaForcesModsModFixture.php
@@ -19,6 +19,8 @@ public function load(ObjectManager $manager): void
         $mod = new SteamWorkshopMod(
             Uuid::fromString(self::ID),
             'ArmaForces - Mods',
+            null,
+            null,
             ModTypeEnum::get(ModTypeEnum::REQUIRED),
             1934142795
         );

diff --git a/src/DataFixtures/Mod/Required/Broken/ArmaForcesAceMedicalModFixture.php b/src/DataFixtures/Mod/Required/Broken/ArmaForcesAceMedicalModFixture.php
@@ -20,11 +20,11 @@ public function load(ObjectManager $manager): void
         $mod = new SteamWorkshopMod(
             Uuid::fromString(self::ID),
             'ArmaForces - ACE Medical [OBSOLETE]',
+            null,
+            ModStatusEnum::get(ModStatusEnum::BROKEN),
             ModTypeEnum::get(ModTypeEnum::REQUIRED),
             1704054308
         );
-        $mod->setStatus(ModStatusEnum::get(ModStatusEnum::BROKEN));
-        $mod->setCreatedAt(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-01 00:00:00'));
 
         $manager->persist($mod);
         $manager->flush();

diff --git a/src/DataFixtures/Mod/Required/Deprecated/LegacyArmaForcesModsModFixture.php b/src/DataFixtures/Mod/Required/Deprecated/LegacyArmaForcesModsModFixture.php
@@ -20,11 +20,11 @@ public function load(ObjectManager $manager): void
         $mod = new SteamWorkshopMod(
             Uuid::fromString(self::ID),
             '[legacy] ArmaForces - Mods',
+            null,
+            ModStatusEnum::get(ModStatusEnum::DEPRECATED),
             ModTypeEnum::get(ModTypeEnum::REQUIRED),
             1639399387
         );
-        $mod->setStatus(ModStatusEnum::get(ModStatusEnum::DEPRECATED));
-        $mod->setCreatedAt(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-01 00:00:00'));
 
         $manager->persist($mod);
         $manager->flush();

diff --git a/src/DataFixtures/Mod/Required/Disabled/ArmaForcesJbadBuildingFixModFixture.php b/src/DataFixtures/Mod/Required/Disabled/ArmaForcesJbadBuildingFixModFixture.php
@@ -20,11 +20,11 @@ public function load(ObjectManager $manager): void
         $mod = new SteamWorkshopMod(
             Uuid::fromString(self::ID),
             '[OBSOLETE] ArmaForces - JBAD Building Fix',
+            null,
+            ModStatusEnum::get(ModStatusEnum::DISABLED),
             ModTypeEnum::get(ModTypeEnum::REQUIRED),
             1781106281
         );
-        $mod->setStatus(ModStatusEnum::get(ModStatusEnum::DISABLED));
-        $mod->setCreatedAt(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-01 00:00:00'));
 
         $manager->persist($mod);
         $manager->flush();

diff --git a/src/DataFixtures/ModGroup/RhsModGroupFixture.php b/src/DataFixtures/ModGroup/RhsModGroupFixture.php
@@ -17,7 +17,9 @@ public function load(ObjectManager $manager): void
     {
         $modGroup = new ModGroup(
             Uuid::fromString(self::ID),
-            'RHS'
+            'RHS',
+            null,
+            []
         );
         $modGroup->setCreatedAt(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-01 00:00:00'));
 

diff --git a/src/DataFixtures/ModList/DefaultModListFixture.php b/src/DataFixtures/ModList/DefaultModListFixture.php
@@ -17,12 +17,6 @@ class DefaultModListFixture extends Fixture
 
     public function load(ObjectManager $manager): void
     {
-        $modList = new ModList(
-            Uuid::fromString(self::ID),
-            'Default'
-        );
-        $modList->setCreatedAt(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-01 00:00:00'));
-
         $mods = [
             $this->getReference(Optional\AceInteractionMenuExpansionModFixture::ID),
             $this->getReference(Required\ArmaForcesModsModFixture::ID),
@@ -31,9 +25,18 @@ public function load(ObjectManager $manager): void
             $this->getReference(Required\Disabled\ArmaForcesJbadBuildingFixModFixture::ID),
         ];
 
-        foreach ($mods as $mod) {
-            $modList->addMod($mod);
-        }
+        $modList = new ModList(
+            Uuid::fromString(self::ID),
+            'Default',
+            null,
+            $mods,
+            [],
+            [],
+            null,
+            true,
+            false,
+        );
+        $modList->setCreatedAt(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-01 00:00:00'));
 
         $manager->persist($modList);
         $manager->flush();

diff --git a/src/DataFixtures/User/AdminUserFixture.php b/src/DataFixtures/User/AdminUserFixture.php
@@ -24,7 +24,10 @@ public function load(ObjectManager $manager): void
             'admin#1111',
             'admin@example.com',
             self::ID,
-            $permissions
+            $permissions,
+            [],
+            null,
+            null
         );
 
         $manager->persist($permissions);

diff --git a/src/DataFixtures/User/RegularUserFixture.php b/src/DataFixtures/User/RegularUserFixture.php
@@ -23,7 +23,10 @@ public function load(ObjectManager $manager): void
             'regular#2222',
             'regular@example.com',
             self::ID,
-            $permissions
+            $permissions,
+            [],
+            null,
+            null
         );
 
         $manager->persist($permissions);