Merge pull request #11 from Mapsred/04-move-defaultstatus-to-ticketst…

…atusmanager Replace Ticket by TicketInterface
Mapsred · Jun 2, 2018 · 389a54d · 389a54d
2 parents 087a6d5 + 370a5e2
commit 389a54d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/Manager/TicketManager.php b/Manager/TicketManager.php
@@ -3,26 +3,20 @@
 namespace Maps_red\TicketingBundle\Manager;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Maps_red\TicketingBundle\Model\TicketInterface;
 
 class TicketManager extends AbstractManager
 {
-    /** @var string $defaultStatusName */
-    private $defaultStatusName;
-
     /** @var bool $enableHistory */
     private $enableHistory;
 
     /**
      * TicketManager constructor.
      * @param EntityManagerInterface $manager
      * @param string $class
-     * @param string $defaultStatusName
      * @param bool $enableHistory
      */
-    public function __construct(EntityManagerInterface $manager, string $class, string $defaultStatusName, bool $enableHistory)
+    public function __construct(EntityManagerInterface $manager, string $class, bool $enableHistory)
     {
-        $this->defaultStatusName = $defaultStatusName;
         $this->enableHistory = $enableHistory;
         parent::__construct($manager, $class);
     }

diff --git a/Manager/TicketStatusManager.php b/Manager/TicketStatusManager.php
@@ -2,6 +2,31 @@
 
 namespace Maps_red\TicketingBundle\Manager;
 
+use Doctrine\ORM\EntityManagerInterface;
+use Maps_red\TicketingBundle\Model\TicketStatusInterface;
+
 class TicketStatusManager extends AbstractManager
 {
+    /** @var string $defaultStatusName */
+    private $defaultStatusName;
+
+    /**
+     * TicketStatusManager constructor.
+     * @param EntityManagerInterface $manager
+     * @param string $class
+     * @param string $defaultStatusName
+     */
+    public function __construct(EntityManagerInterface $manager, string $class, string $defaultStatusName)
+    {
+        parent::__construct($manager, $class);
+        $this->defaultStatusName = $defaultStatusName;
+    }
+
+    /**
+     * @return TicketStatusInterface|null|object
+     */
+    public function getDefaultStatus()
+    {
+        return $this->getRepository()->findOneBy(['name' => $this->defaultStatusName]);
+    }
 }
diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml
@@ -14,7 +14,7 @@ services:
 
     Maps_red\TicketingBundle\Manager\TicketManager:
         tags:
-            - { name: ticketing.manager, class: 'ticket', default_status_name: true, enable_history: true}
+            - { name: ticketing.manager, class: 'ticket', enable_history: true}
 
     Maps_red\TicketingBundle\Manager\TicketCategoryManager:
         tags:
@@ -34,7 +34,7 @@ services:
 
     Maps_red\TicketingBundle\Manager\TicketStatusManager:
         tags:
-            - { name: ticketing.manager, class: 'ticket_status'}
+            - { name: ticketing.manager, class: 'ticket_status', default_status_name: true}
 
     Maps_red\TicketingBundle\EventSubscriber\RequestSubscriber:
         autowire: true