Added queue which holds a list of groups to sync.

Author: Tjeerd

app/AppKernel.php

@@ -22,6 +22,7 @@ public function registerBundles()
             new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Hslavich\SimplesamlphpBundle\HslavichSimplesamlphpBundle(),
             new SmartCore\Bundle\AcceleratorCacheBundle\AcceleratorCacheBundle(),
+            new Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle(),
             // custom bundles
             new AppBundle\AppBundle(),
         ];

app/config/config.yml

@@ -92,3 +92,8 @@ hslavich_simplesamlphp:
 accelerator_cache:
     host: %url%
     web_dir: %kernel.root_dir%/../web
+
+doctrine_cache:
+    providers:
+        cache:
+            type: file_system

app/config/services.yml

@@ -25,9 +25,14 @@ services:
         arguments: ["@guzzle.client.api_grouphub", "@app.api_normalizer"]
         private: true
 
+    app.queue:
+        class: AppBundle\Service\QueueService
+        arguments: ["@doctrine_cache.providers.cache"]
+        private: true
+
     app.sync:
         class: AppBundle\Service\SyncService
-        arguments: ["@app.grouphub_ldap_client", "@app.api_client", "@logger", "%admin_groups_sync%"]
+        arguments: ["@app.grouphub_ldap_client", "@app.api_client", "@logger", "@app.queue", "%admin_groups_sync%"]
 
     twig.extension.intl:
         class: Twig_Extensions_Extension_Intl
@@ -36,7 +41,7 @@ services:
 
     app.group_manager:
         class: AppBundle\Manager\GroupManager
-        arguments: ["@app.api_client", "@app.grouphub_ldap_client"]
+        arguments: ["@app.api_client", "@app.queue"]
 
     app.membership_manager:
         class: AppBundle\Manager\MembershipManager

composer.json

@@ -19,7 +19,7 @@
     "require": {
         "php": ">=5.5.9",
         "symfony/symfony": "3.0.*",
-        "doctrine/doctrine-cache-bundle": "^1.2",
+        "doctrine/doctrine-cache-bundle": "^1.3",
         "symfony/swiftmailer-bundle": "^2.3",
         "symfony/monolog-bundle": "^2.8",
         "sensio/distribution-bundle": "^5.0",

composer.lock

@@ -3,9 +3,9 @@
 namespace AppBundle\Manager;
 
 use AppBundle\Api\ApiClient;
-use AppBundle\Ldap\GrouphubClient;
 use AppBundle\Model\Collection;
 use AppBundle\Model\Group;
+use AppBundle\Service\QueueService;
 
 /**
  * Class GroupManager
@@ -18,18 +18,18 @@ class GroupManager
     private $client;
 
     /**
-     * @var GrouphubClient
+     * @var QueueService
      */
-    private $ldapClient;
+    private $queue;
 
     /***
-     * @param ApiClient      $client
-     * @param GrouphubClient $ldapClient
+     * @param ApiClient    $client
+     * @param QueueService $queue
      */
-    public function __construct(ApiClient $client, GrouphubClient $ldapClient)
+    public function __construct(ApiClient $client, QueueService $queue)
     {
         $this->client = $client;
-        $this->ldapClient = $ldapClient;
+        $this->queue = $queue;
     }
 
     /**
@@ -156,14 +156,18 @@ public function getGroup($id)
     public function deleteGroup($id)
     {
         $this->client->removeGroup($id);
+
+        $this->queue->addGroupToQueue($id);
     }
 
     /**
      * @param Group $group
      */
     public function addGroup(Group $group)
     {
-        $this->client->addGroup($group);
+        $group = $this->client->addGroup($group);
+
+        $this->queue->addGroupToQueue($group->getId());
     }
 
     /**
@@ -172,5 +176,7 @@ public function addGroup(Group $group)
     public function updateGroup(Group $group)
     {
         $this->client->updateGroup($group->getId(), $group);
+
+        $this->queue->addGroupToQueue($group->getId());
     }
 }

src/AppBundle/Manager/GroupManager.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace AppBundle\Service;
+
+use Doctrine\Common\Cache\Cache;
+
+/**
+ * Class QueueService
+ */
+class QueueService
+{
+    const QUEUE_CACHE_ID = 'grouphub-groups-queue';
+
+    /**
+     * @var Cache
+     */
+    private $cache;
+
+    /**
+     * @param Cache $cache
+     */
+    public function __construct(Cache $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getQueuedGroups()
+    {
+        if (!$this->cache->contains(self::QUEUE_CACHE_ID)) {
+            return [];
+        }
+
+        $groupIds = $this->cache->fetch(self::QUEUE_CACHE_ID);
+
+        if (!is_array($groupIds)) {
+            return [];
+        }
+
+        return $groupIds;
+    }
+
+    /**
+     *
+     */
+    public function clearGroupQueue()
+    {
+        $this->cache->delete(self::QUEUE_CACHE_ID);
+    }
+
+    /**
+     * @param int $id
+     */
+    public function addGroupToQueue($id)
+    {
+        $groupIds = [];
+
+        if ($this->cache->contains(self::QUEUE_CACHE_ID)) {
+            $groupIds = $this->cache->fetch(self::QUEUE_CACHE_ID);
+        }
+
+        $groupIds[$id] = $id;
+
+        $this->cache->save(self::QUEUE_CACHE_ID, $groupIds);
+    }
+}