wip

src/Interfaces/StorageDriver.php

@@ -6,6 +6,7 @@ interface StorageDriver
 {
     public function identifyTenant(string $domain): array;
 
+    /** @return array[] */
     public function getAllTenants(array $uuids = []): array;
 
     public function getTenantById(string $uuid, array $fields = []): array;

src/StorageDrivers/DatabaseStorageDriver.php

@@ -3,14 +3,10 @@
 namespace Stancl\Tenancy\StorageDrivers;
 
 use Stancl\Tenancy\Interfaces\StorageDriver;
+use Stancl\Tenancy\Tenant;
 
 class DatabaseStorageDriver implements StorageDriver
 {
-    public function __construct()
-    {
-        //
-    }
-
     public function identifyTenant(string $domain): array
     {
         $id = $this->getTenantIdByDomain($domain);
@@ -41,24 +37,14 @@ class DatabaseStorageDriver implements StorageDriver
 
     public function getTenantIdByDomain(string $domain): ?string
     {
-        return $this->redis->hget("domains:$domain", 'tenant_id') ?: null;
+        return Tenant::where('domain', $domain)->first()->uuid ?? null;
     }
 
     public function createTenant(string $domain, string $uuid): array
     {
-        $this->redis->hmset("domains:$domain", 'tenant_id', $uuid);
+        return Tenant::create(['uuid' => $uuid, 'domain' => $domain])->toArray();
-        $this->redis->hmset("tenants:$uuid", 'uuid', json_encode($uuid), 'domain', json_encode($domain));
-
-        return $this->redis->hgetall("tenants:$uuid");
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @param string $id
-     * @return bool
-     * @todo Make tenant & domain deletion atomic.
-     */
     public function deleteTenant(string $id): bool
     {
         try {
@@ -67,9 +53,7 @@ class DatabaseStorageDriver implements StorageDriver
             throw new \Exception("No tenant with UUID $id exists.");
         }
 
-        $this->redis->del("domains:$domain");
+        return Tenant::find($id)->delete();
-
-        return (bool) $this->redis->del("tenants:$id");
     }
 
     public function getAllTenants(array $uuids = []): array
@@ -78,49 +62,42 @@ class DatabaseStorageDriver implements StorageDriver
             return "tenants:{$hash}";
         }, $uuids);
 
-        if (! $hashes) {
+        return Tenant::all()->map(function ($model) {
-            // Prefix is applied to all functions except scan().
+            return $model->toArray();
-            // This code applies the correct prefix manually.
+        })->toArray();
-            $redis_prefix = config('database.redis.options.prefix');
-
-            if (config('database.redis.client') === 'phpredis') {
-                $redis_prefix = $this->redis->getOption($this->redis->client()::OPT_PREFIX) ?? $redis_prefix;
-                $all_keys = $this->redis->scan(null, $redis_prefix . 'tenants:*');
-            } else {
-                $all_keys = $this->redis->scan(null, 'MATCH', $redis_prefix . 'tenants:*')[1];
-            }
-
-            $hashes = array_map(function ($key) use ($redis_prefix) {
-                // Left strip $redis_prefix from $key
-                return substr($key, strlen($redis_prefix));
-            }, $all_keys);
-        }
-
-        return array_map(function ($tenant) {
-            return $this->redis->hgetall($tenant);
-        }, $hashes);
     }
 
     public function get(string $uuid, string $key)
     {
-        return $this->redis->hget("tenants:$uuid", $key);
+        $tenant = Tenant::find($uuid);
+        return $tenant->$key ?? json_decode($tenant->data)[$key] ?? null;
     }
 
     public function getMany(string $uuid, array $keys): array
     {
-        return $this->redis->hmget("tenants:$uuid", $keys);
+        // todo move this logic to the model?
+        $tenant = Tenant::find($uuid);
+        $tenant_data = null; // cache - json_decode() can be expensive
+        $get_from_tenant_data = function ($key) use ($tenant, &$tenant_data) {
+            $tenant_data = $tenant_data ?? json_decode($tenant->data);
+            return $tenant_data[$key] ?? null;
+        };
+
+        return array_reduce($keys, function ($keys, $key) use ($tenant, $get_from_tenant_data) {
+            $keys[$key] = $tenant->$key ?? $get_from_tenant_data($key) ?? null;
+            return $keys;
+        }, []);
     }
 
     public function put(string $uuid, string $key, $value)
     {
-        $this->redis->hset("tenants:$uuid", $key, $value);
+        // return Tenant::find($uuid) TODO
-
-        return $value;
     }
 
     public function putMany(string $uuid, array $values): array
     {
-        $this->redis->hmset("tenants:$uuid", $values);
+        // todo
+        // $this->redis->hmset("tenants:$uuid", $values);
 
         return $values;
     }

src/Tenant.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Stancl\Tenancy;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Tenant extends Model
+{
+    // todo if not attribute exists in db, put into json data
+}

src/assets/2019_08_08_000000_create_tenants_table.php

@@ -14,8 +14,8 @@ class CreateTenantsTable extends Migration
     public function up()
     {
         Schema::create('tenants', function (Blueprint $table) {
-            $table->string('uuid', 36);
+            $table->string('uuid', 36)->primary();
-            $table->string('domain', 255);
+            $table->string('domain', 255)->index();
             $table->string('data', 1024);
         });
     }