Clean up errors with Make Command, extend Task parameters from template, allow override of paramaters from createTask

Author: Chris Chambers

src/Asana.php

@@ -105,10 +105,12 @@ public function getUsers($opt_fields = null)
      */
     public function createTask($data = [])
     {
-        if (isset($this->templateData)) {
-            $data = $this->templateData;
-        } elseif (!count($data)) {
-            throw new \Exception('Asana create task data not set');
+        if (isset($this->templateData) && isset($data)) {
+            $data = array_merge($this->templateData, $data);
+        }
+
+        if (!count($data)) {
+            throw new Exception('Asana create task data not set');
         }
 
         $data = array_merge([
@@ -120,13 +122,20 @@ public function createTask($data = [])
     }
 
     /**
+     * Replace data in Task Templates with array variables passed here
+     *
+     * USAGE - asana()->getTemplate('App\Asana\CreateSomeAsanaTask')->applyData(['name' => 'My Name'])->createTask();
+     *
      * @param $data
+     *
      * @return $this
+     * @author Chris Chambers https://github.com/labelworx
+     * @version 1.0
      */
     public function applyData($data)
     {
         foreach ($data as $key => $value) {
-            $data['{' . $key . '}'] = $value;
+            $data['{{' . $key . '}}'] = $value;
             unset($data[$key]);
         }
 
@@ -138,11 +147,15 @@ public function applyData($data)
     }
 
     /**
-     * Gets task data from a class
+     * Gets task data from a defined class.  Use php artisan make:asana to stub out a template class
      *
-     * @param $className
+     * USAGE - asana()->getTemplate('App\Asana\CreateSomeAsanaTask')->createTask();
+     *
+     * @param  string $className
      * @return $this
      * @throws Exception
+     * @author Chris Chambers https://github.com/labelworx
+     * @version 1.0
      */
     public function getTemplate($className)
     {

src/AsanaMakeCommand.php

@@ -11,7 +11,7 @@ class AsanaMakeCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'make:asana {className : Class (singular) for example ToDoAsanaTask}';
+    protected $signature = 'make:asana {name : Class (singular) for example ToDoAsanaTask}';
 
     /**
      * The console command description.
@@ -34,11 +34,10 @@ public function __construct()
      * Execute the console command.
      *
      * @return bool|void|null
-     * @throws Exception
      */
     public function handle()
     {
-        $this->createTaskClassFile($this->argument('className'));
+        $this->createTaskClassFile($this->argument('name'));
     }
 
     /**
@@ -55,12 +54,14 @@ protected function getStub()
      * Create the Asana Task Template Class file
      *
      * @param $className
-     * @throws Exception
      */
     protected function createTaskClassFile($className)
     {
-        if (file_exists("Asana/{$className}.php")) {
-            throw new Exception('Asana task class already exists');
+        $this->checkDirectory();
+
+        if (file_exists(app_path('Asana')."/{$className}.php")) {
+            $this->error('Asana task class already exists');
+            exit;
         }
 
         $taskTemplate = str_replace(
@@ -71,4 +72,17 @@ protected function createTaskClassFile($className)
 
         file_put_contents(app_path("Asana/{$className}.php"), $taskTemplate);
     }
+
+    /**
+     * Create the directory for template classes if it does not exist
+     */
+    protected function checkDirectory()
+    {
+        if (!file_exists(app_path('Asana'))) {
+            if (!mkdir(app_path('Asana'))) {
+                $this->error('Could not create ' . app_path('Asana') . ' directory');
+                exit;
+            }
+        }
+    }
 }

src/AsanaTask.php

@@ -0,0 +1,109 @@
+<?php
+
+
+namespace Torann\LaravelAsana;
+
+use Illuminate\Support\Str;
+
+class AsanaTask
+{
+
+    protected $assignee;
+    protected $custom_fields = [];
+    protected $due_at;
+    protected $due_on;
+    protected $followers = [];
+    protected $name;
+    protected $notes;
+    protected $parent;
+    protected $projects = [];
+    protected $tags = [];
+    protected $workspace;
+
+    private $data = [];
+
+    public function buildTaskData()
+    {
+        $this->setAssignee();
+        $this->setCustomFields();
+        $this->setDueAt();
+        $this->setDueOn();
+        $this->setFollowers();
+        $this->setName();
+        $this->setNotes();
+        $this->setParent();
+        $this->setProjects();
+        $this->setTags();
+        $this->setWorkspace();
+
+        return $this->data;
+    }
+
+    private function setAssignee() {
+        if (Str::length($this->assignee)) {
+            $this->data['assignee'] = $this->assignee;
+        }
+    }
+
+    private function setCustomFields() {
+        if (is_array($this->custom_fields) && count($this->custom_fields)) {
+            $this->data['custom_fields'] = $this->custom_fields;
+        }
+    }
+
+    private function setDueAt() {
+        if (Str::length($this->due_at)) {
+            $this->data['due_at'] = $this->due_at;
+        }
+    }
+
+    private function setDueOn() {
+        if (Str::length($this->due_on)) {
+            $this->data['due_on'] = $this->due_on;
+        }
+    }
+
+    private function setFollowers() {
+        if (is_array($this->followers) && count($this->followers)) {
+            $this->data['followers'] = $this->followers;
+        }
+    }
+
+    private function setName() {
+        if (Str::length($this->name)) {
+            $this->data['name'] = $this->name;
+        }
+    }
+
+    private function setNotes() {
+        if (Str::length($this->notes)) {
+            $this->data['notes'] = $this->notes;
+        }
+    }
+
+    private function setParent() {
+        if (Str::length($this->parent)) {
+            $this->data['parent'] = $this->parent;
+        }
+    }
+
+    private function setProjects() {
+        if (is_array($this->projects) && count($this->projects)) {
+            $this->data['projects'] = $this->projects;
+        }
+    }
+
+    private function setTags() {
+        if (is_array($this->tags) && count($this->tags)) {
+            $this->data['tags'] = $this->tags;
+        }
+    }
+
+    private function setWorkspace()
+    {
+        if (Str::length($this->workspace)) {
+            $this->data['workspace'] = $this->workspace;
+        }
+    }
+
+}

stubs/AsanaTask.stub

@@ -6,6 +6,14 @@ use \Torann\LaravelAsana\AsanaTask;
 
 class {{className}} extends AsanaTask
 {
+    /**
+     * You can set parameters in all fields using {{name}} syntax.  These can then be swapped out by
+     * using the applyData() method before you call createTask();
+     *
+     * USAGE - asana()->getTemplate('App\Asana\CreateSomeAsanaTask')->applyData(['name' => 'My Name'])->createTask();
+     *
+     * NOTE - If you pass data directly into the createTask() method then this will override data set in this class.
+     */
 
     /**
      * The ID or email of the user the task should be assigned to.  Leave unset for not assigned.