Page MenuHomePhorge
Files F117755077

D2809.1775202052.diff
No OneTemporary
Actions

Authored By
Unknown
Size
12 KB
Referenced Files
None
Subscribers
None

D2809.1775202052.diff
View Options

diff --git a/src/app/Discount.php b/src/app/Discount.php
--- a/src/app/Discount.php
+++ b/src/app/Discount.php
@@ -2,6 +2,7 @@
namespace App;
+use App\Traits\BelongsToTenantTrait;
use App\Traits\UuidKeyTrait;
use Illuminate\Database\Eloquent\Model;
use Spatie\Translatable\HasTranslations;
@@ -17,6 +18,7 @@
*/
class Discount extends Model
{
+ use BelongsToTenantTrait;
use HasTranslations;
use UuidKeyTrait;
@@ -58,16 +60,6 @@
$this->attributes['discount'] = $discount;
}
- /**
- * The tenant for this discount.
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function tenant()
- {
- return $this->belongsTo('App\Tenant', 'tenant_id', 'id');
- }
-
/**
* List of wallets with this discount assigned.
*
diff --git a/src/app/Domain.php b/src/app/Domain.php
--- a/src/app/Domain.php
+++ b/src/app/Domain.php
@@ -3,6 +3,7 @@
namespace App;
use App\Wallet;
+use App\Traits\BelongsToTenantTrait;
use App\Traits\BinaryUuidKeyTrait;
use App\Traits\DomainConfigTrait;
use App\Traits\SettingsTrait;
@@ -19,6 +20,7 @@
*/
class Domain extends Model
{
+ use BelongsToTenantTrait;
use BinaryUuidKeyTrait;
use DomainConfigTrait;
use SettingsTrait;
@@ -392,16 +394,6 @@
$this->save();
}
- /**
- * The tenant for this domain.
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function tenant()
- {
- return $this->belongsTo('App\Tenant', 'tenant_id', 'id');
- }
-
/**
* Unsuspend this domain.
*
diff --git a/src/app/Group.php b/src/app/Group.php
--- a/src/app/Group.php
+++ b/src/app/Group.php
@@ -2,6 +2,7 @@
namespace App;
+use App\Traits\BelongsToTenantTrait;
use App\Traits\BinaryUuidKeyTrait;
use App\Wallet;
use Illuminate\Database\Eloquent\Model;
@@ -18,6 +19,7 @@
*/
class Group extends Model
{
+ use BelongsToTenantTrait;
use BinaryUuidKeyTrait;
use SoftDeletes;
@@ -250,16 +252,6 @@
$this->save();
}
- /**
- * The tenant for this group.
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function tenant()
- {
- return $this->belongsTo('App\Tenant', 'tenant_id', 'id');
- }
-
/**
* Unsuspend this group.
*
diff --git a/src/app/Observers/DiscountObserver.php b/src/app/Observers/DiscountObserver.php
deleted file mode 100644
--- a/src/app/Observers/DiscountObserver.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Observers;
-
-use App\Discount;
-
-/**
- * This is an observer for the Discount model definition.
- */
-class DiscountObserver
-{
- /**
- * Ensure the discount ID is a custom ID (uuid).
- *
- * @param \App\Discount $discount The discount object
- *
- * @return void
- */
- public function creating(Discount $discount): void
- {
- $discount->tenant_id = \config('app.tenant_id');
- }
-}
diff --git a/src/app/Observers/DomainObserver.php b/src/app/Observers/DomainObserver.php
--- a/src/app/Observers/DomainObserver.php
+++ b/src/app/Observers/DomainObserver.php
@@ -19,8 +19,6 @@
$domain->namespace = \strtolower($domain->namespace);
$domain->status |= Domain::STATUS_NEW;
-
- $domain->tenant_id = \config('app.tenant_id');
}
/**
diff --git a/src/app/Observers/GroupObserver.php b/src/app/Observers/GroupObserver.php
--- a/src/app/Observers/GroupObserver.php
+++ b/src/app/Observers/GroupObserver.php
@@ -17,8 +17,6 @@
public function creating(Group $group): void
{
$group->status |= Group::STATUS_NEW | Group::STATUS_ACTIVE;
-
- $group->tenant_id = \config('app.tenant_id');
}
/**
diff --git a/src/app/Observers/PackageObserver.php b/src/app/Observers/PackageObserver.php
deleted file mode 100644
--- a/src/app/Observers/PackageObserver.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Observers;
-
-use App\Package;
-
-/**
- * This is an observer for the Package model definition.
- */
-class PackageObserver
-{
- /**
- * Handle the "creating" event on an Package.
- *
- * @param Package $package The Package being created.
- *
- * @return void
- */
- public function creating(Package $package)
- {
- $package->tenant_id = \config('app.tenant_id');
- }
-}
diff --git a/src/app/Observers/PlanObserver.php b/src/app/Observers/PlanObserver.php
deleted file mode 100644
--- a/src/app/Observers/PlanObserver.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Observers;
-
-use App\Plan;
-
-/**
- * This is an observer for the Plan model definition.
- */
-class PlanObserver
-{
- /**
- * Handle the "creating" event on an Plan.
- *
- * Ensures that the entry uses a custom ID (uuid).
- *
- * @param Plan $plan The Plan being created.
- *
- * @return void
- */
- public function creating(Plan $plan)
- {
- $plan->tenant_id = \config('app.tenant_id');
- }
-}
diff --git a/src/app/Observers/SignupInvitationObserver.php b/src/app/Observers/SignupInvitationObserver.php
--- a/src/app/Observers/SignupInvitationObserver.php
+++ b/src/app/Observers/SignupInvitationObserver.php
@@ -19,8 +19,6 @@
public function creating(SI $invitation)
{
$invitation->status = SI::STATUS_NEW;
-
- $invitation->tenant_id = \config('app.tenant_id');
}
/**
diff --git a/src/app/Observers/SkuObserver.php b/src/app/Observers/SkuObserver.php
deleted file mode 100644
--- a/src/app/Observers/SkuObserver.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Observers;
-
-use App\Sku;
-
-class SkuObserver
-{
- /**
- * Ensure the SKU ID is a custom ID (uuid).
- *
- * @param Sku $sku The SKU object
- *
- * @return void
- */
- public function creating(Sku $sku)
- {
- $sku->tenant_id = \config('app.tenant_id');
- }
-}
diff --git a/src/app/Observers/UserObserver.php b/src/app/Observers/UserObserver.php
--- a/src/app/Observers/UserObserver.php
+++ b/src/app/Observers/UserObserver.php
@@ -27,8 +27,6 @@
// only users that are not imported get the benefit of the doubt.
$user->status |= User::STATUS_NEW | User::STATUS_ACTIVE;
-
- $user->tenant_id = \config('app.tenant_id');
}
/**
diff --git a/src/app/Package.php b/src/app/Package.php
--- a/src/app/Package.php
+++ b/src/app/Package.php
@@ -2,6 +2,7 @@
namespace App;
+use App\Traits\BelongsToTenantTrait;
use App\Traits\UuidKeyTrait;
use Illuminate\Database\Eloquent\Model;
use Spatie\Translatable\HasTranslations;
@@ -32,6 +33,7 @@
*/
class Package extends Model
{
+ use BelongsToTenantTrait;
use HasTranslations;
use UuidKeyTrait;
@@ -103,14 +105,4 @@
['qty']
);
}
-
- /**
- * The tenant for this package.
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function tenant()
- {
- return $this->belongsTo('App\Tenant', 'tenant_id', 'id');
- }
}
diff --git a/src/app/Plan.php b/src/app/Plan.php
--- a/src/app/Plan.php
+++ b/src/app/Plan.php
@@ -2,6 +2,7 @@
namespace App;
+use App\Traits\BelongsToTenantTrait;
use App\Traits\UuidKeyTrait;
use Illuminate\Database\Eloquent\Model;
use Spatie\Translatable\HasTranslations;
@@ -27,6 +28,7 @@
*/
class Plan extends Model
{
+ use BelongsToTenantTrait;
use HasTranslations;
use UuidKeyTrait;
@@ -114,14 +116,4 @@
return false;
}
-
- /**
- * The tenant for this plan.
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function tenant()
- {
- return $this->belongsTo('App\Tenant', 'tenant_id', 'id');
- }
}
diff --git a/src/app/Providers/AppServiceProvider.php b/src/app/Providers/AppServiceProvider.php
--- a/src/app/Providers/AppServiceProvider.php
+++ b/src/app/Providers/AppServiceProvider.php
@@ -44,18 +44,14 @@
*/
public function boot()
{
- \App\Discount::observe(\App\Observers\DiscountObserver::class);
\App\Domain::observe(\App\Observers\DomainObserver::class);
\App\Entitlement::observe(\App\Observers\EntitlementObserver::class);
\App\Group::observe(\App\Observers\GroupObserver::class);
\App\OpenVidu\Connection::observe(\App\Observers\OpenVidu\ConnectionObserver::class);
- \App\Package::observe(\App\Observers\PackageObserver::class);
\App\PackageSku::observe(\App\Observers\PackageSkuObserver::class);
- \App\Plan::observe(\App\Observers\PlanObserver::class);
\App\PlanPackage::observe(\App\Observers\PlanPackageObserver::class);
\App\SignupCode::observe(\App\Observers\SignupCodeObserver::class);
\App\SignupInvitation::observe(\App\Observers\SignupInvitationObserver::class);
- \App\Sku::observe(\App\Observers\SkuObserver::class);
\App\Transaction::observe(\App\Observers\TransactionObserver::class);
\App\User::observe(\App\Observers\UserObserver::class);
\App\UserAlias::observe(\App\Observers\UserAliasObserver::class);
diff --git a/src/app/SignupInvitation.php b/src/app/SignupInvitation.php
--- a/src/app/SignupInvitation.php
+++ b/src/app/SignupInvitation.php
@@ -4,6 +4,7 @@
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
+use App\Traits\BelongsToTenantTrait;
use App\Traits\UuidKeyTrait;
/**
@@ -17,6 +18,7 @@
*/
class SignupInvitation extends Model
{
+ use BelongsToTenantTrait;
use UuidKeyTrait;
// just created
@@ -76,16 +78,6 @@
return ($this->status & self::STATUS_SENT) > 0;
}
- /**
- * The tenant for this invitation.
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function tenant()
- {
- return $this->belongsTo('App\Tenant', 'tenant_id', 'id');
- }
-
/**
* The account to which the invitation was used for.
*
diff --git a/src/app/Sku.php b/src/app/Sku.php
--- a/src/app/Sku.php
+++ b/src/app/Sku.php
@@ -4,6 +4,7 @@
use Illuminate\Database\Eloquent\Model;
use Spatie\Translatable\HasTranslations;
+use App\Traits\BelongsToTenantTrait;
use App\Traits\UuidKeyTrait;
/**
@@ -23,6 +24,7 @@
*/
class Sku extends Model
{
+ use BelongsToTenantTrait;
use HasTranslations;
use UuidKeyTrait;
@@ -71,14 +73,4 @@
'package_skus'
)->using('App\PackageSku')->withPivot(['cost', 'qty']);
}
-
- /**
- * The tenant for this SKU.
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function tenant()
- {
- return $this->belongsTo('App\Tenant', 'tenant_id', 'id');
- }
}
diff --git a/src/app/Traits/BelongsToTenantTrait.php b/src/app/Traits/BelongsToTenantTrait.php
new file mode 100644
--- /dev/null
+++ b/src/app/Traits/BelongsToTenantTrait.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Traits;
+
+trait BelongsToTenantTrait
+{
+ /**
+ * Boot function from Laravel.
+ */
+ protected static function bootBelongsToTenantTrait()
+ {
+ static::creating(function ($model) {
+ $model->tenant_id = \config('app.tenant_id');
+ });
+ }
+
+
+ /**
+ * The tenant for this model.
+ *
+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+ */
+ public function tenant()
+ {
+ return $this->belongsTo('App\Tenant', 'tenant_id', 'id');
+ }
+}
diff --git a/src/app/User.php b/src/app/User.php
--- a/src/app/User.php
+++ b/src/app/User.php
@@ -5,6 +5,7 @@
use App\Entitlement;
use App\UserAlias;
use App\Sku;
+use App\Traits\BelongsToTenantTrait;
use App\Traits\BinaryUuidKeyTrait;
use App\Traits\UserConfigTrait;
use App\Traits\UserAliasesTrait;
@@ -28,6 +29,7 @@
*/
class User extends Authenticatable
{
+ use BelongsToTenantTrait;
use BinaryUuidKeyTrait;
use NullableFields;
use UserConfigTrait;
@@ -646,16 +648,6 @@
$this->save();
}
- /**
- * The tenant for this user account.
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function tenant()
- {
- return $this->belongsTo('App\Tenant', 'tenant_id', 'id');
- }
-
/**
* Unsuspend this domain.
*

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 7:40 AM (9 h, 59 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18823055
Default Alt Text
D2809.1775202052.diff (12 KB)

Event Timeline