Request instantiation moved out of Interactor

AlexKupreev · Jun 18, 2014 · 03068ec · 03068ec
1 parent 0d29b02
commit 03068ec
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/app/interactor/Task/Creation.php b/app/interactor/Task/Creation.php
@@ -41,7 +41,7 @@ public function __construct(
         $this->session = $session;
     }
 
-    public function execute(Request\Task\Creation $request)
+    public function execute(Request\Task\Creation $request, Response\Task\Creation $response)
     {
         $userId = $this->session->getLoggedInUserId();
         $this->taskRepo->create(
@@ -52,9 +52,6 @@ public function execute(Request\Task\Creation $request)
             $request->getNotes()
         );
 
-        $response = new Response\Task\Creation;
         $response->setStatusOk();
-
-        return $response;
     }
 }
diff --git a/app/response/Task/Creation.php b/app/response/Task/Creation.php
@@ -8,6 +8,7 @@
  * Response of Task Creation Interactor
  *
  */
-class Creation extends Service\Response {
+class Creation extends Service\Response
+{
 
 }
diff --git a/app/service/Response.php b/app/service/Response.php
@@ -6,7 +6,8 @@
  * Base Response class
  *
  */
-abstract class Response {
+abstract class Response
+{
 
     const OK = 200;
     const ERROR_VALIDATION = 400;

diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
@@ -24,6 +24,7 @@
 use app\interactor as Interactor;
 use app\service as Service;
 use app\request as Request;
+use app\response as Response;
 
 /**
  * Features context.
@@ -94,9 +95,12 @@ public function iCreateATaskWithTheFollowingInformation(TableNode $table)
         }
 
         $request = new Request\Task\Creation($data);
+        $response = new Response\Task\Creation;
 
         $taskCreator = new Interactor\Task\Creation($this->taskRepo, $this->userRepo, $this->sessionService);
-        $this->response = $taskCreator->execute($request);
+        $taskCreator->execute($request, $response);
+
+        $this->response = $response;
     }
 
     /**
@@ -112,7 +116,7 @@ public function taskShouldBeCreated()
      */
     public function taskShouldNotBeCreated()
     {
-        Test::assertFalse($this->response);
+        Test::assertFalse($this->response->isStatusOk());
     }
 
     /**