1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 20:14:04 +00:00

add TenantModel interface, fix issues pointed out by @carlos-mora

This commit is contained in:
Samuel Štancl 2019-08-10 09:25:34 +02:00
parent de025a6a4d
commit 4d7c6b6683
5 changed files with 59 additions and 37 deletions

View file

@ -4,12 +4,12 @@ namespace Stancl\Tenancy;
use Illuminate\Database\Eloquent\Model;
class Tenant extends Model
class Tenant extends Model implements TenantModel
{
protected $dataColumn = 'data';
protected $specialColumns = [];
protected $guarded = [];
protected $publicKey = 'uuid';
protected $primaryKey = 'uuid';
public $incrementing = false;
/**
@ -19,12 +19,6 @@ class Tenant extends Model
*/
private $dataObject;
/**
* Get data from the data column.
*
* @param string $key
* @return mixed
*/
public function getFromData(string $key)
{
$this->dataObject = $this->dataObject ?? json_decode($this->{$this->dataColumn});
@ -32,23 +26,11 @@ class Tenant extends Model
return $this->dataObject->$key;
}
/**
* Get data from tenant storage.
*
* @param string $key
* @return mixed
*/
public function get(string $key)
{
return $this->$key ?? $this->getFromData($key) ?? null;
}
/**
* Get multiple values from tenant storage.
*
* @param array $keys
* @return array
*/
public function getMany(array $keys): array
{
return array_reduce($keys, function ($keys, $key) {
@ -58,13 +40,6 @@ class Tenant extends Model
}, []);
}
/**
* Put data into tenant storage.
*
* @param string $key
* @param mixed $value
* @return mixed
*/
public function put(string $key, $value)
{
if (array_key_exists($key, $this->specialColumns)) {