From 824130d3cddd60ae92538a6dfa4a2d93ba305db1 Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Sun, 14 Dec 2025 16:06:15 +0700 Subject: [PATCH] refactor(models): Correct spelling of 'viwes' to 'views' in Article model and remove unused CascadeSoftDeletes trait from Bottle and Category models for improved clarity and maintainability. --- app/Models/Article.php | 2 +- app/Models/Bottle.php | 5 +- app/Models/Category.php | 5 +- app/Models/User.php | 111 +++++++++++++++++++++------------------- 4 files changed, 60 insertions(+), 63 deletions(-) diff --git a/app/Models/Article.php b/app/Models/Article.php index 0f77d91..eed2170 100644 --- a/app/Models/Article.php +++ b/app/Models/Article.php @@ -24,7 +24,7 @@ protected function casts(): array return [ 'status' => ArticleStatus::class, 'published_at' => 'datetime', - 'viwes' => 'int', + 'views' => 'int', ]; } diff --git a/app/Models/Bottle.php b/app/Models/Bottle.php index 48f9b1f..a7d000a 100644 --- a/app/Models/Bottle.php +++ b/app/Models/Bottle.php @@ -2,7 +2,6 @@ namespace App\Models; -use Dyrynda\Database\Support\CascadeSoftDeletes; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; @@ -16,12 +15,10 @@ class Bottle extends Model implements HasMedia { - use CascadeSoftDeletes, HasFactory, HashableId, HasSlug, InteractsWithMedia, SoftDeletes; + use HasFactory, HashableId, HasSlug, InteractsWithMedia, SoftDeletes; protected $guarded = ['id']; - protected $cascadeDeletes = ['outlets']; - protected function casts(): array { return [ diff --git a/app/Models/Category.php b/app/Models/Category.php index 15aaed8..9fbfe17 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -2,7 +2,6 @@ namespace App\Models; -use Dyrynda\Database\Support\CascadeSoftDeletes; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; @@ -13,12 +12,10 @@ class Category extends Model { - use CascadeSoftDeletes, HasFactory, HashableId, HasSlug, SoftDeletes; + use HasFactory, HashableId, HasSlug, SoftDeletes; protected $guarded = ['id']; - protected $cascadeDeletes = ['perfumes']; - protected function casts(): array { return [ diff --git a/app/Models/User.php b/app/Models/User.php index b7bf5a0..1a4e1ff 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -57,16 +57,17 @@ protected function withoutDeveloper(Builder $query): void }); } - public function employee(): HasOne - { - return $this->hasOne(Employee::class); - } - + // HasOne relationships (alphabetical) public function customer(): HasOne { return $this->hasOne(Customer::class); } + public function employee(): HasOne + { + return $this->hasOne(Employee::class); + } + public function membership(): HasOne { return $this->hasOne(Membership::class); @@ -82,69 +83,66 @@ public function referralUsage(): HasOne return $this->hasOne(ReferralUsage::class); } + // BelongsToMany relationships (alphabetical) public function outlets(): BelongsToMany { return $this->belongsToMany(Outlet::class); } - public function articles(): HasMany - { - return $this->hasMany(Article::class, 'author_id'); - } - - public function payrolls(): HasMany - { - return $this->hasMany(Payroll::class); - } - - public function expenses(): HasMany - { - return $this->hasMany(Expense::class); - } - - public function orders(): HasMany - { - return $this->hasMany(Order::class); - } - - public function items(): HasMany - { - return $this->hasMany(OrderItem::class); - } - - public function purchaseItems(): HasMany - { - return $this->hasMany(PurchaseItem::class); - } - - public function payments(): HasMany - { - return $this->hasMany(Payment::class); - } - - public function salaryHistories(): HasMany - { - return $this->hasMany(SalaryHistory::class); - } - - public function priceRequests(): HasMany - { - return $this->hasMany(PriceRequest::class); - } - public function vouchers(): BelongsToMany { return $this->belongsToMany(Voucher::class); } + // HasMany relationships (alphabetical) + public function articles(): HasMany + { + return $this->hasMany(Article::class, 'author_id'); + } + + public function broadcasts(): HasMany + { + return $this->hasMany(Broadcast::class); + } + + public function expenses(): HasMany + { + return $this->hasMany(Expense::class); + } + + public function items(): HasMany + { + return $this->hasMany(OrderItem::class); + } + + public function orders(): HasMany + { + return $this->hasMany(Order::class); + } + + public function payments(): HasMany + { + return $this->hasMany(Payment::class); + } + + public function payrolls(): HasMany + { + return $this->hasMany(Payroll::class); + } + public function pointRecords(): HasMany { return $this->hasMany(PointRecord::class); } - public function stockOpnameItems(): HasMany + public function priceRequests(): HasMany { - return $this->hasMany(StockOpnameItem::class); + return $this->hasMany(PriceRequest::class); + } + + public function purchaseItems(): HasMany + { + return $this->hasMany(PurchaseItem::class); } public function pushNotifications(): HasMany @@ -152,8 +150,13 @@ public function pushNotifications(): HasMany return $this->hasMany(PushNotification::class); } - public function broadcasts(): HasMany + public function salaryHistories(): HasMany { - return $this->hasMany(Broadcast::class); + return $this->hasMany(SalaryHistory::class); + } + + public function stockOpnameItems(): HasMany + { + return $this->hasMany(StockOpnameItem::class); } }