archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 06:04:03 +00:00
Code Activity

Fix tests

Browse source
This commit is contained in:
Samuel Štancl 2019-10-27 20:19:06 +01:00
parent e872139c88
commit a535e3e6b7
7 changed files with 67 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/StorageDrivers/Database/DomainRepository.php
View file

@ -7,7 +7,7 @@ use Stancl\Tenancy\Tenant;
class DomainRepository extends Repository
{
public function getTenantIdByDomain(string $domain): string
public function getTenantIdByDomain(string $domain): ?string
{
return $this->where('domain', $domain)->first()->tenant_id ?? null;
}
@ -20,7 +20,7 @@ class DomainRepository extends Repository
public function getTenantDomains($tenant)
{
$id = $tenant instanceof Tenant ? $tenant->id : $tenant;
return $this->where('tenant_id', $id)->get('domain')->toArray();
return $this->where('tenant_id', $id)->get('domain')->pluck('domain')->all();
}
public function insertTenantDomains(Tenant $tenant)
@ -32,11 +32,11 @@ class DomainRepository extends Repository
public function updateTenantDomains(Tenant $tenant)
{
$originalDomains = $this->domains->getTenantDomains($tenant);
$originalDomains = $this->getTenantDomains($tenant);
$deletedDomains = array_diff($originalDomains, $tenant->domains);
$newDomains = array_intersect($originalDomains, $tenant->domains);
$newDomains = array_diff($tenant->domains, $originalDomains);
$this->domains->whereIn('domain', $deletedDomains)->delete();
$this->whereIn('domain', $deletedDomains)->delete();
foreach ($newDomains as $domain) {
$this->insert([