From 02448db3466b01007b8a267a73b884c2119d2d03 Mon Sep 17 00:00:00 2001 From: AmirmahdiNourkazemi Date: Wed, 20 May 2026 15:42:10 +0330 Subject: [PATCH] refactor --- app/Http/Controllers/MediaController.php | 4 +-- app/Models/Music.php | 31 ------------------------ 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index e48ce5b..5bc147f 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -321,7 +321,7 @@ public function filters(Request $request) public function show($id) { - $media = Media::with(['image', 'category', 'myNote', 'tags' ,'comments']) + $media = Media::with(['image', 'category', 'myNote', 'tags']) ->where('id', $id) ->where(function($query) { $query->where('visibility', 'public') @@ -348,7 +348,7 @@ public function show($id) 'is_premium' => $media->is_premium, 'comments' => $media->comments, 'average_rating' => $media->average_rating, - 'your_rating' => $media->user_rating, + 'user_rating' => $media->user_rating, 'comments_count' => $media->comments()->count(), ]); } diff --git a/app/Models/Music.php b/app/Models/Music.php index cf13e10..64e8c1e 100644 --- a/app/Models/Music.php +++ b/app/Models/Music.php @@ -45,37 +45,6 @@ public function tags(): BelongsToMany protected $appends = ['url', 'image_url' , 'average_rating', 'user_rating', 'comments_count']; - // New rating and comment relationships - public function ratings(): MorphMany - { - return $this->morphMany(Rating::class, 'rateable'); - } - - public function comments(): MorphMany - { - return $this->morphMany(Comment::class, 'commentable'); - } - - // Accessors for ratings - public function getAverageRatingAttribute(): float - { - return round($this->ratings()->avg('stars'), 1); - } - - public function getUserRatingAttribute(): ?int - { - if (!auth()->check()) return null; - - return $this->ratings() - ->where('user_id', auth()->id()) - ->value('stars'); - } - - public function getCommentsCountAttribute(): int - { - return $this->comments()->count(); - } - // Accessor for full URL public function getUrlAttribute() { return asset('storage/' . $this->file_path);