fixed the way entities are fetched

jaljo · Jul 16, 2020 · e78715d · e78715d
1 parent 35e12d2
commit e78715d
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 21 deletions.
diff --git a/config/services/command_handlers.yaml b/config/services/command_handlers.yaml
@@ -18,7 +18,9 @@ services:
     App\Domain\Command\Handler\PublishArticle:
         arguments:
             - '@Doctrine\ORM\EntityManagerInterface'
+            - '@App\Application\Repository\ArticleRepository'
 
     App\Domain\Command\Handler\EditArticle:
         arguments:
             - '@Doctrine\ORM\EntityManagerInterface'
+            - '@App\Application\Repository\ArticleRepository'
diff --git a/src/Application/Controller/ArticleController.php b/src/Application/Controller/ArticleController.php
@@ -141,8 +141,8 @@ public function update(Request $request, int $id): JsonResponse
     public function publish(int $id): JsonResponse
     {
         try {
-            $article = $this->bus->executeCommand(new Command\ReadArticle($id));
-            $this->bus->executeCommand(new Command\PublishArticle($article));
+            $publishArticle = new Command\PublishArticle($id);
+            $article = $this->bus->executeCommand($publishArticle);
         }
         catch (ResourceNotFoundException $exception) {
             return new JsonResponse(null, Response::HTTP_NOT_FOUND);

diff --git a/src/Domain/Command/EditArticle.php b/src/Domain/Command/EditArticle.php
@@ -7,9 +7,9 @@
 class EditArticle
 {
     /**
-     * @var Article
+     * @var int
      */
-    private $article;
+    private $id;
 
     /**
      * @var string
@@ -23,14 +23,14 @@ class EditArticle
 
     public function __construct(Article $article)
     {
-        $this->article = $article;
+        $this->id = $article->getId();
         $this->title = $article->getTitle();
         $this->content = $article->getContent();
     }
 
-    public function getArticle(): Article
+    public function getId(): int
     {
-        return $this->article;
+        return $this->id;
     }
 
     public function getTitle(): string

diff --git a/src/Domain/Command/Handler/EditArticle.php b/src/Domain/Command/Handler/EditArticle.php
@@ -2,8 +2,10 @@
 
 namespace App\Domain\Command\Handler;
 
-use App\Domain\Model\Article;
 use App\Domain\Command\EditArticle as EditArticleCommand;
+use App\Domain\Exception\ResourceNotFoundException;
+use App\Domain\Model\Article;
+use App\Domain\Repository\ArticleRepository;
 use Doctrine\Common\Persistence\ObjectManager;
 
 class EditArticle
@@ -13,15 +15,30 @@ class EditArticle
      */
     private $manager;
 
+    /**
+     * @var ArticleRepository
+     */
+    private $repository;
+
     public function __construct(
-        ObjectManager $manager
+        ObjectManager $manager,
+        ArticleRepository $repository
     ) {
         $this->manager = $manager;
+        $this->repository = $repository;
     }
 
+    /**
+     * @throws ResourceNotFoundException
+     */
     public function __invoke(EditArticleCommand $command): Article
     {
-        $article = $command->getArticle();
+        $article = $this->repository->findOneById($command->getId());
+
+        if ($article === null) {
+            throw new ResourceNotFoundException();
+        }
+
         $article->edit(
             $command->getTitle(),
             $command->getContent()

diff --git a/src/Domain/Command/Handler/PublishArticle.php b/src/Domain/Command/Handler/PublishArticle.php
@@ -2,9 +2,10 @@
 
 namespace App\Domain\Command\Handler;
 
-use App\Domain\Model\Article;
 use App\Domain\Command\PublishArticle as PublishArticleCommand;
 use App\Domain\Exception\ResourceNotFoundException;
+use App\Domain\Model\Article;
+use App\Domain\Repository\ArticleRepository;
 use Doctrine\Common\Persistence\ObjectManager;
 
 class PublishArticle
@@ -14,18 +15,30 @@ class PublishArticle
      */
     private $manager;
 
+    /**
+     * @var ArticleRepository
+     */
+    private $repository;
+
     public function __construct(
-        ObjectManager $manager
+        ObjectManager $manager,
+        ArticleRepository $repository
     ) {
         $this->manager = $manager;
+        $this->repository = $repository;
     }
 
     /**
      * @throws ResourceNotFoundException
      */
     public function __invoke(PublishArticleCommand $command): Article
     {
-        $article = $command->getArticle();
+        $article = $this->repository->findOneById($command->getId());
+
+        if ($article === null) {
+            throw new ResourceNotFoundException();
+        }
+
         $article->publish();
 
         $this->manager->persist($article);

diff --git a/src/Domain/Command/PublishArticle.php b/src/Domain/Command/PublishArticle.php
@@ -2,22 +2,20 @@
 
 namespace App\Domain\Command;
 
-use App\Domain\Model\Article;
-
 class PublishArticle
 {
     /**
-     * @var Article
+     * @var int
      */
-    private $article;
+    private $id;
 
-    public function __construct(Article $article)
+    public function __construct(int $id)
     {
-        $this->article = $article;
+        $this->id = $id;
     }
 
-    public function getArticle(): Article
+    public function getId(): int
     {
-        return $this->article;
+        return $this->id;
     }
 }