Added packages table. Added duplication prevention.

hiqdev · Nov 30, 2016 · d1130a1 · d1130a1
1 parent eb0e60c
commit d1130a1
Show file tree

Hide file tree

Showing 12 changed files with 146 additions and 45 deletions.
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace hiqdev\assetpackagist;
+
+use hiqdev\assetpackagist\repositories\PackageRepository;
+use Yii;
+use yii\base\Application;
+use yii\base\BootstrapInterface;
+
+class Bootstrap implements BootstrapInterface
+{
+    /**
+     * Bootstrap method to be called during application bootstrap stage.
+     * @param Application $app the application currently running
+     */
+    public function bootstrap($app)
+    {
+        Yii::$container->set('db', function () { return Yii::$app->get('db'); });
+        Yii::$container->set(PackageRepository::class, PackageRepository::class, [\yii\di\Instance::of('db')]);
+    }
+}
diff --git a/src/commands/AbstractPackageCommand.php b/src/commands/AbstractPackageCommand.php
@@ -3,6 +3,8 @@
 namespace hiqdev\assetpackagist\commands;
 
 use hiqdev\assetpackagist\models\AssetPackage;
+use hiqdev\assetpackagist\repositories\PackageRepository;
+use Yii;
 use yii\base\Component;
 use zhuravljov\yii\queue\Job;
 
@@ -16,6 +18,11 @@ abstract class AbstractPackageCommand extends Component implements Job
      */
     protected $package;
 
+    /**
+     * @var PackageRepository
+     */
+    protected $packageRepository;
+
     /**
      * Triggers event before run
      */
@@ -35,13 +42,15 @@ public function afterRun()
     /**
      * CollectDependenciesCommand constructor.
      * @param AssetPackage $package
+     * @param PackageRepository $packageRepository
      * @param array $config
      */
-    public function __construct(AssetPackage $package, $config = [])
+    public function __construct(AssetPackage $package, PackageRepository $packageRepository, $config = [])
     {
         parent::__construct($config);
 
         $this->package = $package;
+        $this->packageRepository = $packageRepository;
     }
 
     /**
@@ -52,6 +61,7 @@ public function __construct(AssetPackage $package, $config = [])
     public function __wakeup()
     {
         $this->package->load();
+        $this->packageRepository = Yii::createObject(PackageRepository::class);
     }
 
     /**

diff --git a/src/commands/CollectDependenciesCommand.php b/src/commands/CollectDependenciesCommand.php
@@ -32,10 +32,16 @@ public function run()
         }
 
         foreach (array_keys($requires) as $name) {
-            Yii::$app->queue->push('package', new PackageUpdateCommand(AssetPackage::fromFullName($name)));
-        }
+            $assetPackage = AssetPackage::fromFullName($name);
 
-        Yii::trace(Console::renderColoredString('Created update command for %y' . count($requires) . "%n packages\n"), __CLASS__);
+            if ($this->packageRepository->exists($assetPackage)) {
+                Yii::trace(Console::renderColoredString('Package %N' . $assetPackage->getFullName() . "%n already exists. Skipping.\n"), __CLASS__);
+                continue;
+            }
+
+            Yii::$app->queue->push('package', Yii::createObject(PackageUpdateCommand::class, [$assetPackage]));
+            Yii::trace(Console::renderColoredString('Created update command for %Y' . $assetPackage->getFullName() . "%n package\n"), __CLASS__);
+        }
 
         $this->afterRun();
     }

diff --git a/src/commands/PackageUpdateCommand.php b/src/commands/PackageUpdateCommand.php
@@ -16,11 +16,16 @@ public function run()
     {
         $this->beforeRun();
 
-        if ($this->package->canBeUpdated()) {
+        if (!$this->package->canBeUpdated()) {
+            if (!$this->packageRepository->exists($this->package)) {
+                $this->packageRepository->insert($this->package);
+            }
+        } else {
             $this->package->update();
+            $this->packageRepository->save($this->packages);
         }
 
-        Yii::$app->queue->push('package', new CollectDependenciesCommand($this->package));
+        Yii::$app->queue->push('package', Yii::createObject(CollectDependenciesCommand::class, [$this->package]));
 
         $this->afterRun();
     }

diff --git a/src/config/bootstrap.php b/src/config/bootstrap.php
diff --git a/src/config/hidev.php b/src/config/hidev.php
@@ -10,6 +10,7 @@
  */
 
 return [
+    'bootstrap' => ['log', \hiqdev\assetpackagist\Bootstrap::class],
     'components' => [
         'config' => [
             'include' => [

diff --git a/src/config/hisite.php b/src/config/hisite.php
@@ -13,7 +13,7 @@
     'id'            => 'asset-packagist',
     'name'          => 'Asset Packagist',
     'controllerNamespace' => 'hiqdev\assetpackagist\controllers',
-    'bootstrap' => ['log'],
+    'bootstrap' => ['log', \hiqdev\assetpackagist\Bootstrap::class],
     'components' => [
         'packageStorage' => [
             'class' => \hiqdev\assetpackagist\components\Storage::class,

diff --git a/src/console/AssetPackageController.php b/src/console/AssetPackageController.php
@@ -11,8 +11,9 @@
 
 namespace hiqdev\assetpackagist\console;
 
-use hiqdev\assetpackagist\commands\CollectDependenciesCommand;
+use hiqdev\assetpackagist\commands\PackageUpdateCommand;
 use hiqdev\assetpackagist\models\AssetPackage;
+use hiqdev\assetpackagist\repositories\PackageRepository;
 use Yii;
 use yii\helpers\Console;
 
@@ -27,11 +28,9 @@ public function actionUpdate($type, $name)
     {
         try {
             $package = new AssetPackage($type, $name);
-            $package->update();
+            Yii::createObject(PackageUpdateCommand::class, [$package])->run();
             echo 'updated ' . $package->getHash() . ' ' . $package->getFullName() . "\n";
 
-            Yii::$app->queue->push('package', new CollectDependenciesCommand($package));
-
             return true;
         } catch (\Exception $e) {
             echo Console::renderColoredString("%Rfailed%N $type/$name:%n {$e->getMessage()}\n");

diff --git a/src/console/QueueController.php b/src/console/QueueController.php
@@ -3,6 +3,7 @@
 namespace hiqdev\assetpackagist\console;
 
 use hiqdev\assetpackagist\commands\AbstractPackageCommand;
+use hiqdev\assetpackagist\repositories\PackageRepository;
 use Yii;
 use yii\base\Event;
 use yii\console\Controller;

diff --git a/src/controllers/SiteController.php b/src/controllers/SiteController.php
@@ -12,10 +12,9 @@
 namespace hiqdev\assetpackagist\controllers;
 
 use Exception;
-use hiqdev\assetpackagist\commands\CollectDependenciesCommand;
-use hiqdev\assetpackagist\commands\DependenciesUpdateCommand;
 use hiqdev\assetpackagist\commands\PackageUpdateCommand;
 use hiqdev\assetpackagist\models\AssetPackage;
+use hiqdev\assetpackagist\repositories\PackageRepository;
 use Yii;
 use yii\filters\VerbFilter;
 
@@ -98,9 +97,7 @@ public function actionUpdate()
 
         $package = $this->getAssetPackage($query);
         if ($package->canBeUpdated()) {
-            $package->update();
-
-            Yii::$app->queue->push('package', new CollectDependenciesCommand($package));
+            Yii::createObject(PackageUpdateCommand::class, [$package])->run(); // TODO: think of command bus
         } else {
             Yii::$app->session->addFlash('update-impossible', true);
         }

diff --git a/src/migrations/m161130_163000_package.php b/src/migrations/m161130_163000_package.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace hiqdev\assetpackagist\migrations;
+
+use yii\db\Migration;
+
+/**
+ * Migration for queue message storage
+ *
+ * @author Dmytro Naumenko <d.naumenko.a@gmail.com>
+ */
+class m161130_163000_package extends Migration
+{
+    public $tableName = '{{%package}}';
+    public $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+
+    public function up()
+    {
+        $this->createTable($this->tableName, [
+            'type' => $this->string()->notNull(),
+            'name' => $this->string()->notNull(),
+            'last_update' => $this->integer(),
+            'PRIMARY KEY (type, name)'
+        ], $this->tableOptions);
+    }
+
+    public function down()
+    {
+        $this->dropTable($this->tableName);
+    }
+}
diff --git a/src/repositories/PackageRepository.php b/src/repositories/PackageRepository.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace hiqdev\assetpackagist\repositories;
+
+use hiqdev\assetpackagist\models\AssetPackage;
+use yii\db\Connection;
+use yii\db\Query;
+
+class PackageRepository
+{
+    /**
+     * @var Connection
+     */
+    protected $db;
+
+    public function __construct(Connection $db)
+    {
+        $this->db = $db;
+    }
+
+    public function save(AssetPackage $package)
+    {
+        if ($this->exists($package)) {
+            $this->update($package);
+        } else {
+            $this->insert($package);
+        }
+    }
+
+    public function insert(AssetPackage $package) {
+        $this->db->createCommand()->insert('package', [
+            'type' => $package->getType(),
+            'name' => $package->getName(),
+            'last_update' => $package->getUpdateTime(),
+        ])->execute();
+    }
+
+    public function update(AssetPackage $package)
+    {
+        $this->db->createCommand()->update('package', [
+            'last_update' => $package->getUpdateTime()
+        ], [
+            'type' => $package->getType(),
+            'name' => $package->getName(),
+        ])->execute();
+    }
+
+    /**
+     * @param AssetPackage $package
+     * @return bool
+     */
+    public function exists(AssetPackage $package)
+    {
+        return (new Query())
+            ->from('package')
+            ->where(['type' => $package->getType(), 'name' => $package->getName()])
+            ->exists($this->db);
+    }
+}