Refactor fixtures

ArmaForces · Nov 1, 2023 · e613da2 · e613da2
1 parent 771a4ca
commit e613da2
Show file tree

Hide file tree

Showing 19 changed files with 788 additions and 34 deletions.
diff --git a/src/DataFixtures/Dlc/CslaIronCurtain.php → ...ixtures/Dlc/CslaIronCurtainDlcFixture.php b/src/DataFixtures/Dlc/CslaIronCurtain.php → ...ixtures/Dlc/CslaIronCurtainDlcFixture.php
@@ -9,17 +9,18 @@
 use Doctrine\Persistence\ObjectManager;
 use Ramsey\Uuid\Uuid;
 
-class CslaIronCurtain extends Fixture
+class CslaIronCurtainDlcFixture extends Fixture
 {
     public const ID = 'ebd772ce-e5b5-4813-9ad0-777915660d37';
+    public const APP_ID = 1294440;
 
     public function load(ObjectManager $manager): void
     {
         $dlc = new Dlc(
             Uuid::fromString(self::ID),
             'Arma 3 Creator DLC: CSLA Iron Curtain',
             null,
-            1294440,
+            self::APP_ID,
             'csla'
         );
 

diff --git a/...ixtures/Dlc/GlobalMobilizationFixture.php → ...ures/Dlc/GlobalMobilizationDlcFixture.php b/...ixtures/Dlc/GlobalMobilizationFixture.php → ...ures/Dlc/GlobalMobilizationDlcFixture.php
@@ -9,17 +9,18 @@
 use Doctrine\Persistence\ObjectManager;
 use Ramsey\Uuid\Uuid;
 
-class GlobalMobilizationFixture extends Fixture
+class GlobalMobilizationDlcFixture extends Fixture
 {
     public const ID = 'c2cd8ffd-0b4b-449b-aca5-cb91f16a9e54';
+    public const APP_ID = 1042220;
 
     public function load(ObjectManager $manager): void
     {
         $dlc = new Dlc(
             Uuid::fromString(self::ID),
             'Arma 3 Creator DLC: Global Mobilization - Cold War Germany',
             null,
-            1042220,
+            self::APP_ID,
             'gm'
         );
 

diff --git a/...ataFixtures/Dlc/SogPrairieFireFixture.php → ...Fixtures/Dlc/SogPrairieFireDlcFixture.php b/...ataFixtures/Dlc/SogPrairieFireFixture.php → ...Fixtures/Dlc/SogPrairieFireDlcFixture.php
@@ -9,17 +9,18 @@
 use Doctrine\Persistence\ObjectManager;
 use Ramsey\Uuid\Uuid;
 
-class SogPrairieFireFixture extends Fixture
+class SogPrairieFireDlcFixture extends Fixture
 {
     public const ID = '805dfa49-ef6b-4259-85c5-a09565174448';
+    public const APP_ID = 1227700;
 
     public function load(ObjectManager $manager): void
     {
         $dlc = new Dlc(
             Uuid::fromString(self::ID),
             'Arma 3 Creator DLC: S.O.G. Prairie Fire',
             null,
-            1227700,
+            self::APP_ID,
             'vn'
         );
 

diff --git a/...DataFixtures/Dlc/WesternSaharaFixture.php → ...aFixtures/Dlc/Spearhead1944DlcFixture.php b/...DataFixtures/Dlc/WesternSaharaFixture.php → ...aFixtures/Dlc/Spearhead1944DlcFixture.php
@@ -9,18 +9,19 @@
 use Doctrine\Persistence\ObjectManager;
 use Ramsey\Uuid\Uuid;
 
-class WesternSaharaFixture extends Fixture
+class Spearhead1944DlcFixture extends Fixture
 {
-    public const ID = '5f19a8b4-b879-48af-b9d6-73c21f846b3f';
+    public const ID = 'c42adf33-2f16-4bdf-bc38-66d7d037d677';
+    public const APP_ID = 1175380;
 
     public function load(ObjectManager $manager): void
     {
         $dlc = new Dlc(
             Uuid::fromString(self::ID),
-            'Arma 3 Creator DLC: Western Sahara',
+            'Arma 3 Creator DLC: Spearhead 1944',
             null,
-            1681170,
-            'ws'
+            self::APP_ID,
+            'spe'
         );
 
         $manager->persist($dlc);

diff --git a/src/DataFixtures/Mod/Directory/ArmaScriptProfilerModFixture.php b/src/DataFixtures/Mod/Directory/ArmaScriptProfilerModFixture.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\DataFixtures\Mod\Directory;
+
+use App\Entity\Mod\DirectoryMod;
+use App\Test\Traits\TimeTrait;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Persistence\ObjectManager;
+use Ramsey\Uuid\Uuid;
+
+class ArmaScriptProfilerModFixture extends Fixture
+{
+    use TimeTrait;
+
+    public const ID = '5506ae1b-2851-40e7-a15a-48f1fe6daaed';
+    public const DIRECTORY = '@Arma Script Profiler';
+
+    public function load(ObjectManager $manager): void
+    {
+        $this->withTimeFrozenAt('2020-01-01T00:00:00+00:00', function () use ($manager): void {
+            $mod = new DirectoryMod(
+                Uuid::fromString(self::ID),
+                'Arma Script Profiler',
+                null,
+                null,
+                self::DIRECTORY
+            );
+
+            $manager->persist($mod);
+            $manager->flush();
+
+            $this->addReference(self::ID, $mod);
+        });
+    }
+}
diff --git a/src/DataFixtures/Mod/Directory/Deprecated/R3ModFixture.php b/src/DataFixtures/Mod/Directory/Deprecated/R3ModFixture.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\DataFixtures\Mod\Directory\Deprecated;
+
+use App\Entity\Mod\DirectoryMod;
+use App\Entity\Mod\Enum\ModStatusEnum;
+use App\Test\Traits\TimeTrait;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Persistence\ObjectManager;
+use Ramsey\Uuid\Uuid;
+
+class R3ModFixture extends Fixture
+{
+    use TimeTrait;
+
+    public const ID = '50b2c68a-1ea0-44b8-9b4d-6e0a47627d47';
+    public const DIRECTORY = '@R3';
+
+    public function load(ObjectManager $manager): void
+    {
+        $this->withTimeFrozenAt('2020-01-01T00:00:00+00:00', function () use ($manager): void {
+            $mod = new DirectoryMod(
+                Uuid::fromString(self::ID),
+                'R3',
+                null,
+                ModStatusEnum::DEPRECATED,
+                self::DIRECTORY
+            );
+
+            $manager->persist($mod);
+            $manager->flush();
+
+            $this->addReference(self::ID, $mod);
+        });
+    }
+}
diff --git a/...AceInteractionMenuExpansionModFixture.php → ...AceInteractionMenuExpansionModFixture.php b/...AceInteractionMenuExpansionModFixture.php → ...AceInteractionMenuExpansionModFixture.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\DataFixtures\Mod\Optional;
+namespace App\DataFixtures\Mod\SteamWorkshop\Optional;
 
 use App\Entity\Mod\Enum\ModTypeEnum;
 use App\Entity\Mod\SteamWorkshopMod;
@@ -16,6 +16,7 @@ class AceInteractionMenuExpansionModFixture extends Fixture
     use TimeTrait;
 
     public const ID = '37f58e30-5194-4594-89af-4a82c7fc02be';
+    public const ITEM_ID = 1376867375;
 
     public function load(ObjectManager $manager): void
     {
@@ -26,7 +27,7 @@ public function load(ObjectManager $manager): void
                 null,
                 null,
                 ModTypeEnum::OPTIONAL,
-                1376867375
+                self::ITEM_ID
             );
 
             $manager->persist($mod);

diff --git a/...Mod/Required/ArmaForcesModsModFixture.php → .../Required/ArmaForcesMedicalModFixture.php b/...Mod/Required/ArmaForcesModsModFixture.php → .../Required/ArmaForcesMedicalModFixture.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\DataFixtures\Mod\Required;
+namespace App\DataFixtures\Mod\SteamWorkshop\Required;
 
 use App\Entity\Mod\Enum\ModTypeEnum;
 use App\Entity\Mod\SteamWorkshopMod;
@@ -11,22 +11,23 @@
 use Doctrine\Persistence\ObjectManager;
 use Ramsey\Uuid\Uuid;
 
-class ArmaForcesModsModFixture extends Fixture
+class ArmaForcesMedicalModFixture extends Fixture
 {
     use TimeTrait;
 
     public const ID = '0e4e059c-eef6-42a9-aec3-abdab344ec21';
+    public const ITEM_ID = 1981535406;
 
     public function load(ObjectManager $manager): void
     {
         $this->withTimeFrozenAt('2020-01-01T00:00:00+00:00', function () use ($manager): void {
             $mod = new SteamWorkshopMod(
                 Uuid::fromString(self::ID),
-                'ArmaForces - Mods',
+                'ArmaForces - Medical',
                 null,
                 null,
                 ModTypeEnum::REQUIRED,
-                1934142795
+                self::ITEM_ID
             );
 
             $manager->persist($mod);

diff --git a/...Broken/ArmaForcesAceMedicalModFixture.php → ...Broken/ArmaForcesAceMedicalModFixture.php b/...Broken/ArmaForcesAceMedicalModFixture.php → ...Broken/ArmaForcesAceMedicalModFixture.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\DataFixtures\Mod\Required\Broken;
+namespace App\DataFixtures\Mod\SteamWorkshop\Required\Broken;
 
 use App\Entity\Mod\Enum\ModStatusEnum;
 use App\Entity\Mod\Enum\ModTypeEnum;
@@ -17,6 +17,7 @@ class ArmaForcesAceMedicalModFixture extends Fixture
     use TimeTrait;
 
     public const ID = '2f1d2dea-a7a6-4509-b478-66a980d724ca';
+    public const ITEM_ID = 1704054308;
 
     public function load(ObjectManager $manager): void
     {
@@ -27,7 +28,7 @@ public function load(ObjectManager $manager): void
                 null,
                 ModStatusEnum::BROKEN,
                 ModTypeEnum::REQUIRED,
-                1704054308
+                self::ITEM_ID
             );
 
             $manager->persist($mod);

diff --git a/...ecated/LegacyArmaForcesModsModFixture.php → ...ecated/LegacyArmaForcesModsModFixture.php b/...ecated/LegacyArmaForcesModsModFixture.php → ...ecated/LegacyArmaForcesModsModFixture.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\DataFixtures\Mod\Required\Deprecated;
+namespace App\DataFixtures\Mod\SteamWorkshop\Required\Deprecated;
 
 use App\Entity\Mod\Enum\ModStatusEnum;
 use App\Entity\Mod\Enum\ModTypeEnum;
@@ -17,6 +17,7 @@ class LegacyArmaForcesModsModFixture extends Fixture
     use TimeTrait;
 
     public const ID = '7e11c37e-930e-49e8-a87d-8f942d98edb0';
+    public const ITEM_ID = 1639399387;
 
     public function load(ObjectManager $manager): void
     {
@@ -27,7 +28,7 @@ public function load(ObjectManager $manager): void
                 null,
                 ModStatusEnum::DEPRECATED,
                 ModTypeEnum::REQUIRED,
-                1639399387
+                self::ITEM_ID
             );
 
             $manager->persist($mod);

diff --git a/...d/ArmaForcesJbadBuildingFixModFixture.php → ...d/ArmaForcesJbadBuildingFixModFixture.php b/...d/ArmaForcesJbadBuildingFixModFixture.php → ...d/ArmaForcesJbadBuildingFixModFixture.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\DataFixtures\Mod\Required\Disabled;
+namespace App\DataFixtures\Mod\SteamWorkshop\Required\Disabled;
 
 use App\Entity\Mod\Enum\ModStatusEnum;
 use App\Entity\Mod\Enum\ModTypeEnum;
@@ -17,6 +17,7 @@ class ArmaForcesJbadBuildingFixModFixture extends Fixture
     use TimeTrait;
 
     public const ID = 'b8e88103-69d2-438b-8d89-933ccfdb3a5a';
+    public const ITEM_ID = 1781106281;
 
     public function load(ObjectManager $manager): void
     {
@@ -27,7 +28,7 @@ public function load(ObjectManager $manager): void
                 null,
                 ModStatusEnum::DISABLED,
                 ModTypeEnum::REQUIRED,
-                1781106281
+                self::ITEM_ID
             );
 
             $manager->persist($mod);

diff --git a/src/DataFixtures/ModList/DefaultModListFixture.php b/src/DataFixtures/ModList/DefaultModListFixture.php
@@ -4,8 +4,6 @@
 
 namespace App\DataFixtures\ModList;
 
-use App\DataFixtures\Mod\Optional;
-use App\DataFixtures\Mod\Required;
 use App\Entity\ModList\ModList;
 use App\Test\Traits\TimeTrait;
 use Doctrine\Bundle\FixturesBundle\Fixture;
@@ -21,11 +19,13 @@ class DefaultModListFixture extends Fixture
     public function load(ObjectManager $manager): void
     {
         $mods = [
-            $this->getReference(Optional\AceInteractionMenuExpansionModFixture::ID),
-            $this->getReference(Required\ArmaForcesModsModFixture::ID),
-            $this->getReference(Required\Broken\ArmaForcesAceMedicalModFixture::ID),
-            $this->getReference(Required\Deprecated\LegacyArmaForcesModsModFixture::ID),
-            $this->getReference(Required\Disabled\ArmaForcesJbadBuildingFixModFixture::ID),
+            $this->getReference(\App\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture::ID),
+            $this->getReference(\App\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture::ID),
+            $this->getReference(\App\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture::ID),
+            $this->getReference(\App\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture::ID),
+            $this->getReference(
+                \App\DataFixtures\Mod\SteamWorkshop\Required\Disabled\ArmaForcesJbadBuildingFixModFixture::ID
+            ),
         ];
 
         $this->withTimeFrozenAt('2020-01-01T00:00:00+00:00', function () use ($manager, $mods): void {

diff --git a/src/DataFixtures/User/AdminUserFixture.php b/src/DataFixtures/User/AdminUserFixture.php
@@ -21,7 +21,7 @@ public function load(ObjectManager $manager): void
 
         $user = new User(
             Uuid::fromString(self::ID),
-            'admin#1111',
+            'admin#0',
             'admin@example.com',
             self::ID,
             $permissions,

diff --git a/src/DataFixtures/User/RegularUserFixture.php b/src/DataFixtures/User/RegularUserFixture.php
@@ -20,7 +20,7 @@ public function load(ObjectManager $manager): void
 
         $user = new User(
             Uuid::fromString(self::ID),
-            'regular#2222',
+            'regular#0',
             'regular@example.com',
             self::ID,
             $permissions,

diff --git a/src/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1981535406.json b/src/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1981535406.json
@@ -0,0 +1,41 @@
+{
+    "response": {
+        "result": 1,
+        "resultcount": 1,
+        "publishedfiledetails": [
+            {
+                "publishedfileid": "1981535406",
+                "result": 1,
+                "creator": "76561199002669156",
+                "creator_app_id": 107410,
+                "consumer_app_id": 107410,
+                "filename": "",
+                "file_size": 295103,
+                "file_url": "",
+                "hcontent_file": "6332893528122366633",
+                "preview_url": "https://steamuserimages-a.akamaihd.net/ugc/772868569532489292/64412B75F35CB6E699F5B132441B4894AC10778E/",
+                "hcontent_preview": "772868569532489292",
+                "title": "ArmaForces - Medical",
+                "description": "[h1]Introducing ArmaForces Medical System.[/h1]\r\n- More efficient bandaging\r\n- Bandages are more durable, stay for even 30 minutes if applied right bandage on correct wound!\r\n- All medical actions take less time to complete\r\n- New pain fighting medication - Apap - with no side effects!\r\n\r\n[h2]Decreased treatment times[/h2]\r\n- Bandaging time / 2\r\n- Applying Tourniquet 7 -> 2.5 s\r\n- Removing Tourniquet 7 -> 1.5 s\r\n- Splint 7 -> 5 s\r\n- IV 12 -> 5 s\r\n\r\n[h2]Reworked bandages[/h2]\r\n- All bandages are at least 2-3 times more efficient than in standard ACE\r\n- 3 types of efficiency (standard ACE bandages are maximum at 2)\r\n  - Super - 10-8 base efficiency\r\n  - Increased - 6-4 base efficiency\r\n  - Standard - 2-4 base efficiency\r\n- Much longer wound opening times, especially for super efficiency\r\n  - Super - 10% opening chance, 10-30 minutes durability\r\n  - Increased - 30% opening chance, 6-20 minutes\r\n  - Standard - 40% opening chance, 5-10 minutes\r\n\r\n[h2]Pain fighting medication (Apap) without side effects[/h2]\r\n- A bit weaker than morphine (0.6 vs 0.8 pain fighting force)\r\n- Effect lasts for up to 10 minutes (vs 30 for morphine)\r\n- Only for conscious units (so morphine is still viable)\r\n\r\n[h1]Future plans:[/h1]\r\nWe first want to adjust mod to our gameplay and style, possible changes/tweaks in:\r\n- action times\r\n- bandages efficiency\r\n- medications effects\r\n\r\n[h1]Source:[/h1]\r\nhttps://github.com/ArmaForces/Medical\r\n\r\n[h1]Other ArmaForces addons:[/h1]\r\nhttps://steamcommunity.com/sharedfiles/filedetails/?id=1643238133",
+                "time_created": 1580174253,
+                "time_updated": 1697582262,
+                "visibility": 0,
+                "banned": 0,
+                "ban_reason": "",
+                "subscriptions": 1658,
+                "favorited": 91,
+                "lifetime_subscriptions": 3969,
+                "lifetime_favorited": 99,
+                "views": 4261,
+                "tags": [
+                    {
+                        "tag": "Mod"
+                    },
+                    {
+                        "tag": "Mechanics"
+                    }
+                ]
+            }
+        ]
+    }
+}