#469 enum p8

eventhorizonpl · Jan 27, 2022 · 1f400d5 · 1f400d5
1 parent 979cb7b
commit 1f400d5
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 20 deletions.
diff --git a/src/Factory/ReminderMessageFactory.php b/src/Factory/ReminderMessageFactory.php
@@ -5,6 +5,7 @@
 namespace App\Factory;
 
 use App\Entity\ReminderMessage;
+use App\Enum\ReminderMessageTypeEnum;
 use Symfony\Component\Uid\Uuid;
 
 class ReminderMessageFactory
@@ -19,7 +20,7 @@ public function createReminderMessage(): ReminderMessage
 
     public function createReminderMessageWithRequired(
         string $content,
-        string $type
+        ReminderMessageTypeEnum $type
     ): ReminderMessage {
         $reminderMessage = $this->createReminderMessage();
 

diff --git a/src/Factory/ReportFactory.php b/src/Factory/ReportFactory.php
@@ -5,6 +5,7 @@
 namespace App\Factory;
 
 use App\Entity\Report;
+use App\Enum\{ReportStatusEnum, ReportTypeEnum};
 use Symfony\Component\Uid\Uuid;
 
 class ReportFactory
@@ -19,8 +20,8 @@ public function createReport(): Report
 
     public function createReportWithRequired(
         array $data,
-        string $status,
-        string $type
+        ReportStatusEnum $status,
+        ReportTypeEnum $type
     ): Report {
         $report = $this->createReport();
 

diff --git a/src/Factory/RewardFactory.php b/src/Factory/RewardFactory.php
@@ -5,6 +5,7 @@
 namespace App\Factory;
 
 use App\Entity\Reward;
+use App\Enum\RewardTypeEnum;
 use Symfony\Component\Uid\Uuid;
 
 class RewardFactory
@@ -21,7 +22,7 @@ public function createRewardWithRequired(
         bool $isAwarded,
         string $name,
         int $requiredNumberOfCompletions,
-        string $type
+        RewardTypeEnum $type
     ): Reward {
         $reward = $this->createReward();
 

diff --git a/src/Factory/RoutineFactory.php b/src/Factory/RoutineFactory.php
@@ -5,6 +5,7 @@
 namespace App\Factory;
 
 use App\Entity\Routine;
+use App\Enum\RoutineTypeEnum;
 use Symfony\Component\Uid\Uuid;
 
 class RoutineFactory
@@ -20,7 +21,7 @@ public function createRoutine(): Routine
     public function createRoutineWithRequired(
         bool $isEnabled,
         string $name,
-        string $type
+        RoutineTypeEnum $type
     ): Routine {
         $routine = $this->createRoutine();
 

diff --git a/tests/Factory/ReminderMessageFactoryTest.php b/tests/Factory/ReminderMessageFactoryTest.php
@@ -5,6 +5,7 @@
 namespace App\Tests\Factory;
 
 use App\Entity\ReminderMessage;
+use App\Enum\ReminderMessageTypeEnum;
 use App\Factory\ReminderMessageFactory;
 use App\Tests\AbstractTestCase;
 use Faker\{Factory, Generator};
@@ -47,9 +48,7 @@ public function testCreateReminderMessage(): void
     public function testCreateReminderMessageWithRequired(): void
     {
         $content = $this->faker->sentence();
-        $type = $this->faker->randomElement(
-            ReminderMessage::getTypeFormChoices()
-        );
+        $type = ReminderMessageTypeEnum::EMAIL;
         $reminderMessageFactory = new ReminderMessageFactory();
         $reminderMessage = $reminderMessageFactory->createReminderMessageWithRequired(
             $content,

diff --git a/tests/Factory/ReportFactoryTest.php b/tests/Factory/ReportFactoryTest.php
@@ -5,6 +5,7 @@
 namespace App\Tests\Factory;
 
 use App\Entity\Report;
+use App\Enum\{ReportStatusEnum, ReportTypeEnum};
 use App\Factory\ReportFactory;
 use App\Tests\AbstractTestCase;
 use Faker\{Factory, Generator};
@@ -47,12 +48,8 @@ public function testCreateReport(): void
     public function testCreateReportWithRequired(): void
     {
         $data = $this->faker->words();
-        $status = $this->faker->randomElement(
-            Report::getStatusFormChoices()
-        );
-        $type = $this->faker->randomElement(
-            Report::getTypeFormChoices()
-        );
+        $status = ReportStatusEnum::INITIAL;
+        $type = ReportTypeEnum::POST_REMIND_MESSAGES;
         $reportFactory = new ReportFactory();
         $report = $reportFactory->createReportWithRequired(
             $data,

diff --git a/tests/Factory/RewardFactoryTest.php b/tests/Factory/RewardFactoryTest.php
@@ -5,6 +5,7 @@
 namespace App\Tests\Factory;
 
 use App\Entity\Reward;
+use App\Enum\RewardTypeEnum;
 use App\Factory\RewardFactory;
 use App\Tests\AbstractTestCase;
 use Faker\{Factory, Generator};
@@ -49,9 +50,7 @@ public function testCreateRewardWithRequired(): void
         $isAwarded = $this->faker->boolean();
         $name = $this->faker->sentence();
         $requiredNumberOfCompletions = $this->faker->randomNumber();
-        $type = $this->faker->randomElement(
-            Reward::getTypeFormChoices()
-        );
+        $type = RewardTypeEnum::ALL;
         $rewardFactory = new RewardFactory();
         $reward = $rewardFactory->createRewardWithRequired(
             $isAwarded,

diff --git a/tests/Factory/RoutineFactoryTest.php b/tests/Factory/RoutineFactoryTest.php
@@ -5,6 +5,7 @@
 namespace App\Tests\Factory;
 
 use App\Entity\Routine;
+use App\Enum\RoutineTypeEnum;
 use App\Factory\RoutineFactory;
 use App\Tests\AbstractTestCase;
 use Faker\{Factory, Generator};
@@ -48,9 +49,7 @@ public function testCreateRoutineWithRequired(): void
     {
         $isEnabled = $this->faker->boolean();
         $name = $this->faker->sentence();
-        $type = $this->faker->randomElement(
-            Routine::getTypeFormChoices()
-        );
+        $type = RoutineTypeEnum::HOBBY;
         $routineFactory = new RoutineFactory();
         $routine = $routineFactory->createRoutineWithRequired(
             $isEnabled,