1. Updated faker project custom types to use new formats.

2. Added to ActivityAPI Query lookup a worker and job filter.
icomefromthenet · Apr 2, 2015 · 4730154 · 4730154
1 parent 8fbcfd0
commit 4730154
Show file tree

Hide file tree

Showing 23 changed files with 1,185 additions and 1,794 deletions.
diff --git a/config/dev.api.xml b/config/dev.api.xml
@@ -11,11 +11,11 @@
          bootstrap="../src/LaterJobApi/app.php"
 >
     <php>
-        <var name="DB_DSN" value="mysql:dbname=c9;host=172.17.1.244" />
+        <var name="DB_DSN" value="mysql:dbname=c9;host=172.17.26.172" />
         <var name="DB_USER" value="icomefromthenet" />
         <var name="DB_PASSWD" value="" />
         <var name="DB_DBNAME" value="c9" />
-        <var name="DB_HOST"    value ="172.17.1.244" />
+        <var name="DB_HOST"    value ="172.17.26.172" />
         <var name="APP_ENVIRONMENT" value="development" />
     </php>
     <testsuites>

diff --git a/config/dev.lib.xml b/config/dev.lib.xml
@@ -11,11 +11,11 @@
          bootstrap="../vendor/autoload.php"
 >
     <php>
-        <var name="DB_DSN" value="mysql:dbname=c9;host=172.17.1.244" />
+        <var name="DB_DSN" value="mysql:dbname=c9;host=172.17.26.172" />
         <var name="DB_USER" value="icomefromthenet" />
         <var name="DB_PASSWD" value="" />
         <var name="DB_DBNAME" value="c9" />
-        <var name="DB_HOST"    value ="172.17.1.244" />
+        <var name="DB_HOST"    value ="172.17.26.172" />
         <var name="APP_ENVIRONMENT" value="development" />
     </php>
     <testsuites>

diff --git a/faker/extension/bootstrap.php b/faker/extension/bootstrap.php
@@ -15,7 +15,7 @@
 use Faker\PlatformFactory;
 use Faker\ColumnTypeFactory;
 use Faker\Components\Faker\Formatter\FormatterFactory;
-use Faker\Components\Faker\TypeFactory;
+use Faker\Components\Engine\Common\TypeRepository;
 use Faker\Locale\LocaleFactory;
 
 /*
@@ -70,11 +70,12 @@
 |
 | Example:
 |
-| TypeFactory::registerExtension('vector','Faker\\Extension\\Faker\\Type\\Vector');
+| TypeRepository::registerExtension('vector','Faker\\Extension\\Faker\\Type\\Vector');
 */
 
-   TypeFactory::registerExtension('job_id','Faker\\Extension\\Faker\\Type\\Job');
-   TypeFactory::registerExtension('job_data','Faker\\Extension\\Faker\\Type\\Data');
+   TypeRepository::registerExtension('job_id','Faker\\Extension\\Faker\\Type\\Job');
+   TypeRepository::registerExtension('worker','Faker\\Extension\\Faker\\Type\\Worker');
+   TypeRepository::registerExtension('job_data','Faker\\Extension\\Faker\\Type\\Data');
 
 /*
 |--------------------------------------------------------------------------
@@ -103,4 +104,20 @@
 
   //LocaleFactory::registerExtension('french','Faker\\Components\\Extension\\Locale\\FrenchLocale');
 
+
+/*
+|--------------------------------------------------------------------------
+| Load Later Job UUID CLASS
+|--------------------------------------------------------------------------
+|
+| Needed for extension types
+| 
+*/ 
+
+
+require_once(__DIR__.'/../../src/LaterJob/UUID.php');
+require_once(__DIR__.'/../../src/LaterJob/Util/GeneratorInterface.php');
+require_once(__DIR__.'/../../src/LaterJob/Util/MersenneRandom.php');
+
+
 /* End of File */
diff --git a/faker/extension/faker/type/data.php b/faker/extension/faker/type/data.php
@@ -1,11 +1,11 @@
 <?php
 namespace Faker\Extension\Faker\Type;
 
-use Faker\Components\Faker\Exception as FakerException,
-    Faker\Components\Faker\Type\Type,
-    Faker\Components\Faker\Utilities,
-    Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition,
-    Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Faker\Components\Faker\Exception as FakerException;
+use Faker\Components\Engine\Common\Type\Type;
+use Faker\Components\Faker\Utilities;
+use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 
 class Data extends Type
 {
@@ -17,7 +17,7 @@ class Data extends Type
     *
     * @return string
     */
-    public function generate($rows,$values = array())
+    public function generate($rows,&$values = array(),$last = array())
     {
         return serialize(new \stdClass());        
     }
@@ -31,7 +31,7 @@ public function generate($rows,$values = array())
     *
     * @return \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition
     */
-    public function getConfigExtension(ArrayNodeDefinition $rootNode)
+    public function getConfigTreeExtension(NodeDefinition $rootNode)
     {
         return $rootNode;
 

diff --git a/faker/extension/faker/type/job.php b/faker/extension/faker/type/job.php
@@ -1,13 +1,13 @@
 <?php
 namespace Faker\Extension\Faker\Type;
 
-use Faker\Components\Faker\Exception as FakerException,
-    Faker\Components\Faker\Type\Type,
-    Faker\Components\Faker\Utilities,
-    Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition,
-    Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Faker\Components\Faker\Exception as FakerException;
+use Faker\Components\Faker\Utilities;
+use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use LaterJob\UUID;
 use LaterJob\Util\MersenneRandom;
+use Faker\Components\Engine\Common\Type\Type;
 
 class Job extends Type
 {
@@ -21,7 +21,7 @@ class Job extends Type
     *
     * @return string
     */
-    public function generate($rows,$values = array())
+    public function generate($rows,&$values = array(),$last = array())
     {
         if(self::$uuid === null) {
             self::$uuid = new UUID(new MersenneRandom(1000));
@@ -39,7 +39,7 @@ public function generate($rows,$values = array())
     *
     * @return \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition
     */
-    public function getConfigExtension(ArrayNodeDefinition $rootNode)
+    public function getConfigTreeExtension(NodeDefinition $rootNode)
     {
         return $rootNode;
 

diff --git a/faker/extension/faker/type/nulltype.php b/faker/extension/faker/type/nulltype.php
@@ -1,11 +1,11 @@
 <?php
 namespace Faker\Extension\Faker\Type;
 
-use Faker\Components\Faker\Exception as FakerException,
-    Faker\Components\Faker\Type\Type,
-    Faker\Components\Faker\Utilities,
-    Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition,
-    Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Faker\Components\Faker\Exception as FakerException;
+use Faker\Components\Engine\Common\Type\Type;
+use Faker\Components\Faker\Utilities;
+use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use LaterJob\UUID;
 
 class NullType extends Type
@@ -18,7 +18,7 @@ class NullType extends Type
     *
     * @return string
     */
-    public function generate($rows,$values = array())
+    public function generate($rows,&$values = array(),$last = array())
     {
         return null;
     }
@@ -31,7 +31,7 @@ public function generate($rows,$values = array())
     *
     * @return \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition
     */
-    public function getConfigExtension(ArrayNodeDefinition $rootNode)
+     public function getConfigTreeExtension(NodeDefinition $rootNode)
     {
         return $rootNode;
 

diff --git a/faker/sources/purgehistory_handler_test.xml b/faker/sources/purgehistory_handler_test.xml
@@ -10,7 +10,7 @@
   </column>
 
   <column name="worker_id" type="string">
-   <datatype name="nulltype" />
+   <datatype name="worker" />
   </column>
 
   <column name="job_id" type="string">

diff --git a/src/LaterJob/Activity.php b/src/LaterJob/Activity.php
@@ -42,11 +42,13 @@ public function __construct(EventDispatcherInterface $event)
       *  @param string $order 'ASC | DESC'
       *  @param DateTime $before
       *  @param DateTime $after
+      *  @param string a job UUID
+      *  @param string a worker UUID
       *  @return Traversable 
       */
-    public function query($offset, $limit, $order = 'ASC', DateTime $before = null, DateTime $after = null)
+    public function query($offset, $limit, $order = 'ASC', DateTime $before = null, DateTime $after = null,$job_id = null, $worker_id = null)
     {
-        $event = new QueueQueryActivityEvent($offset,$limit,$order,$before,$after);
+        $event = new QueueQueryActivityEvent($offset,$limit,$order,$before,$after,$job_id,$worker_id);
 
         $this->event->dispatch(QueueEventsMap::QUEUE_QUERY_ACTIVITY,$event);
 

diff --git a/src/LaterJob/Event/QueueQueryActivityEvent.php b/src/LaterJob/Event/QueueQueryActivityEvent.php
@@ -37,21 +37,55 @@ class QueueQueryActivityEvent extends Event
       */
     protected $order;
 
+    /**
+     * @var string the UUID of a worker to filter on 
+     */ 
+    protected $worker_id;
+
+    /**
+     * @var string the UUID of a job to filter on 
+     */ 
+    protected $job_id;
+
     /**
       *  Class Constructor
       *
       *  @access public
       */
-    public function __construct($offset, $limit, $order = 'ASC', DateTime $before = null, DateTime $after = null)
+    public function __construct($offset, $limit, $order = 'ASC', DateTime $before = null, DateTime $after = null, $job_id = null, $worker_id = null)
     {
-        $this->before  = $before;
-        $this->after   = $after;
-        $this->limit   = $limit;
-        $this->offset  = $offset;
-        $this->order   = $order;
+        $this->before    = $before;
+        $this->after     = $after;
+        $this->limit     = $limit;
+        $this->offset    = $offset;
+        $this->order     = $order;
+        $this->worker_id = $worker_id;
+        $this->job_id    = $job_id;
 
         $this->removed = 0;
     }
+
+    /**
+     *  fetch a job UUID
+     * 
+     * @access public
+     * @return string
+     */ 
+    public function getJobID()
+    {
+        return $this->job_id;
+    }
+
+    /**
+     *  Fetch a worker UUID
+     * 
+     * @return string
+     * @access public
+     */ 
+    public function getWorkerID()
+    {
+        return $this->worker_id;
+    }
 
     /**
       *  Return the before date

diff --git a/src/LaterJob/Log/ConsoleSubscriber.php b/src/LaterJob/Log/ConsoleSubscriber.php
@@ -219,7 +219,9 @@ public function logQueueQueryActivityEvent(QueueQueryActivityEvent $event)
             'limit'  => $event->getLimit(),
             'order'  => $event->getOrder(),
             'before' => $event->getBefore(),
-            'after'  => $event->getAfter()
+            'after'  => $event->getAfter(),
+            'job_id' => $event->getJobID(),
+            'worker_id' => $event->getWorkerID()
         )));
     }
 

diff --git a/src/LaterJob/Log/LogSubscriber.php b/src/LaterJob/Log/LogSubscriber.php
@@ -222,7 +222,9 @@ public function logQueueQueryActivityEvent(QueueQueryActivityEvent $event)
             'limit'  => $event->getLimit(),
             'order'  => $event->getOrder(),
             'before' => $event->getBefore(),
-            'after'  => $event->getAfter()
+            'after'  => $event->getAfter(),
+            'job_id' => $event->getJobID(),
+            'worker_id' => $event->getWorkerID()
         ));
     }
 

diff --git a/src/LaterJob/Model/Activity/QueueSubscriber.php b/src/LaterJob/Model/Activity/QueueSubscriber.php
@@ -100,6 +100,14 @@ public function onQueryActivity(QueueQueryActivityEvent $event)
                 $query->offset($event->getOffset());
             }
 
+            if($event->getWorkerID() !== null) {
+                $query->filterByWorker($event->getWorkerID());    
+            }   
+
+            if($event->getJobID() !== null) {
+                $query->filterByJob($event->getJobID());
+            }
+
             # set the order by the date added
             $query->orderByOccured($event->getOrder());
 

diff --git a/src/LaterJob/Tests/ActivityTest.php b/src/LaterJob/Tests/ActivityTest.php
@@ -22,6 +22,8 @@ public function testActivityQuery()
         $before = new DateTime();
         $after = new DateTime();
         $order = 'asc';
+        $job_id =  '8c195538-2d1b-3bae-a372-3bdf2cb6d9d4';
+        $worker_id = '8c195538-2d1b-3bae-a372-3bdf2cb6d9d3';
 
         $mock_event     = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
 
@@ -31,7 +33,7 @@ public function testActivityQuery()
                    ->method('dispatch')
                    ->with($this->equalTo(QueueEventsMap::QUEUE_QUERY_ACTIVITY),$this->isInstanceOf('LaterJob\Event\QueueQueryActivityEvent'));
 
-        $activity->query($offset,$limit,$order,$before,$after);
+        $activity->query($offset,$limit,$order,$before,$after,$job_id,$worker_id);
     }
 
 

diff --git a/src/LaterJob/Tests/Base/Fixture/fixture.xml b/src/LaterJob/Tests/Base/Fixture/fixture.xml
@@ -733,7 +733,7 @@
 <column>transition_msg</column>
 <row>
 <value>1</value>
-<null /><value>8c195538-2d1b-3bae-a372-3bdf2cb6d9d3</value>
+<value>3d7c4077-6025-3910-a209-51b661747293</value><value>8c195538-2d1b-3bae-a372-3bdf2cb6d9d3</value>
 <value>1</value>
 <value>2012-11-19 13:01:00</value>
 <value>W2</value>