Compare commits

2 Commits
Author SHA1 Message Date
Amirmahdi 56f0e8dbe2 feat: add sub category for media 2026-05-30 20:39:53 +03:30
Amirmahdi 230bfc2ad8 feat: add like and save for playlist 2026-05-30 18:17:27 +03:30
13 changed files with 314 additions and 36 deletions
@@ -0,0 +1,67 @@
<?php
namespace App\Http\Controllers;
use App\Models\Category;
use Illuminate\Http\Request;
class CategoryController extends Controller
{
public function index(Request $request)
{
$query = Category::query()->withCount('subcategories');
if ($request->boolean('with_subcategories')) {
$query->with('subcategories');
}
return response()->json(
$query->orderBy('name')->get()
);
}
public function store(Request $request)
{
$data = $request->validate([
'name' => 'required|string|max:255|unique:categories,name',
]);
$category = Category::create($data);
return response()->json([
'message' => 'Category created successfully',
'category' => $category,
], 201);
}
public function show($id)
{
$category = Category::with('subcategories')->withCount('subcategories')->findOrFail($id);
return response()->json($category);
}
public function update(Request $request, $id)
{
$category = Category::findOrFail($id);
$data = $request->validate([
'name' => 'required|string|max:255|unique:categories,name,' . $category->id,
]);
$category->update($data);
return response()->json([
'message' => 'Category updated successfully',
'category' => $category,
]);
}
public function destroy($id)
{
$category = Category::findOrFail($id);
$category->delete();
return response()->json(['message' => 'Category deleted successfully']);
}
}
+6 -4
View File
@@ -12,7 +12,7 @@ class LikeController extends Controller
public function like(Request $request)
{
$request->validate([
'type' => 'required|string|in:music,media',
'type' => 'required|string|in:music,media,playlist',
'id' => 'required|integer',
]);
@@ -39,7 +39,7 @@ public function like(Request $request)
public function unlike(Request $request)
{
$request->validate([
'type' => 'required|string|in:music,media',
'type' => 'required|string|in:music,media,playlist',
'id' => 'required|integer',
]);
@@ -66,7 +66,7 @@ public function unlike(Request $request)
public function toggleLike(Request $request)
{
$request->validate([
'type' => 'required|string|in:music,media',
'type' => 'required|string|in:music,media,playlist',
'id' => 'required|integer',
]);
@@ -110,6 +110,7 @@ public function myLikedItems(Request $request)
'types' => [
'music' => 'App\\Models\\Music',
'media' => 'App\\Models\\Media',
'playlist' => 'App\\Models\\MusicPlaylist',
]
]);
// Transform the response
@@ -167,7 +168,7 @@ public function myLikedItems(Request $request)
public function checkLiked(Request $request)
{
$request->validate([
'type' => 'required|string|in:music,media',
'type' => 'required|string|in:music,media,playlist',
'id' => 'required|integer',
]);
@@ -227,6 +228,7 @@ private function getModelClass($type)
$models = [
'music' => \App\Models\Music::class,
'media' => \App\Models\Media::class,
'playlist' => \App\Models\MusicPlaylist::class,
];
return $models[$type] ?? null;
+14 -20
View File
@@ -19,7 +19,7 @@ public function store(Request $request)
'caption' => 'nullable|string',
'type' => 'required|in:audio,video',
'category_id' => 'nullable|exists:categories,id',
'category_name' => 'nullable|string|max:255',
'subcategory_id' => 'nullable|exists:sub_categories,id',
'image_id' => 'nullable|exists:images,id',
'duration' => 'nullable|integer',
'is_premium' => 'nullable|boolean',
@@ -33,12 +33,6 @@ public function store(Request $request)
$categoryId = $data['category_id'] ?? null;
if (!$categoryId && isset($data['category_name'])) {
$category = Category::firstOrCreate([
'name' => $data['category_name']
]);
$categoryId = $category->id;
}
$path = null;
if ($request->hasFile('file')) {
$path = $request->file('file')->store('media', 'public');
@@ -53,6 +47,7 @@ public function store(Request $request)
'external_url' => $data['external_url'] ?? null,
'image_id' => $data['image_id'] ?? null,
'category_id' => $categoryId,
'subcategory_id' => $data['subcategory_id'] ?? null,
'duration' => $data['duration'] ?? null,
'visibility' => $data['visibility'] ?? 'public',
'is_premium'=> $data['is_premium'] ?? false
@@ -69,12 +64,12 @@ public function store(Request $request)
}
return response()->json([
'message' => 'Media created successfully',
'media' => $media->load(['image', 'category' , 'tags']),
'media' => $media->load(['image', 'category', 'subCategory', 'tags']),
]);
}
public function index(Request $request)
{
$query = Media::with(['image', 'category', 'myNote', 'tags','comments'])
$query = Media::with(['image', 'category', 'subCategory', 'myNote', 'tags','comments'])
->where(function ($q) {
$q->where('visibility', 'public')
->orWhere('user_id', auth()->id());
@@ -91,6 +86,11 @@ public function index(Request $request)
$query->whereIn('category_id', $categories);
}
if ($request->filled('subcategories')) {
$subcategories = explode(',', $request->subcategories);
$query->whereIn('subcategory_id', $subcategories);
}
/*
|--------------------------------------------------------------------------
| 2️⃣ Multi Duration Ranges
@@ -324,6 +324,7 @@ public function show($id)
$media = Media::with([
'image',
'category',
'subCategory',
'myNote',
'tags',
'comments' => function($query) {
@@ -361,6 +362,7 @@ public function show($id)
'is_premium' => $media->is_premium,
'image' => $media->image,
'category' => $media->category,
'sub_category' => $media->subCategory,
'tags' => $media->tags,
'myNote' => $media->myNote,
'is_saved' => $media->is_saved,
@@ -442,9 +444,8 @@ public function update(Request $request, $id)
'caption' => 'nullable|string',
'type' => 'nullable|in:audio,video',
// support both: category_id or category_name
'category_id' => 'nullable|exists:categories,id',
'category_name' => 'nullable|string|max:255',
'subcategory_id' => 'nullable|exists:sub_categories,id',
'is_premium' => 'nullable|boolean',
'image_id' => 'nullable|exists:images,id',
'duration' => 'nullable|integer',
@@ -455,16 +456,8 @@ public function update(Request $request, $id)
'tags.*' => 'string',
]);
// --- handle auto-create category ---
$categoryId = $data['category_id'] ?? $media->category_id;
if (isset($data['category_name'])) {
$category = Category::firstOrCreate([
'name' => $data['category_name']
]);
$categoryId = $category->id;
}
// --- handle file replace ---
if ($request->hasFile('file')) {
Storage::disk('public')->delete($media->file_path);
@@ -477,6 +470,7 @@ public function update(Request $request, $id)
'caption' => $data['caption'] ?? $media->caption,
'type' => $data['type'] ?? $media->type,
'category_id' => $categoryId,
'subcategory_id' => array_key_exists('subcategory_id', $data) ? $data['subcategory_id'] : $media->subcategory_id,
'is_premium' => $data['is_premium'] ?? $media->is_premium,
'duration' => $data['duration'] ?? $media->duration,
'external_url' => $data['external_url'] ?? $media->external_url,
@@ -546,7 +540,7 @@ public function toggleSaveMedia($id)
// GET saved
public function saved()
{
return auth()->user()->savedMedia()->with(['image','category' , 'myNote' , 'tags'])->get();
return auth()->user()->savedMedia()->with(['image','category', 'subCategory', 'myNote' , 'tags'])->get();
}
public function storeNote(Request $request, $mediaId)
@@ -81,11 +81,15 @@ public function show($id)
'total_musics' => $playlist->musics->count(),
'total_duration' => $playlist->total_duration,
'total_comments' => $playlist->comments_count,
'total_likes' => $playlist->likes_count,
'total_saves' => $playlist->saved_count,
],
'user_interaction' => [
'has_commented' => $playlist->has_user_commented,
'user_comment' => $playlist->user_comment,
'user_comment_id' => $playlist->user_comment_id,
'has_liked' => $playlist->is_liked,
'has_saved' => $playlist->is_saved,
],
'comments' => $comments,
]);
+6 -4
View File
@@ -13,7 +13,7 @@ class SaveController extends Controller
public function save(Request $request)
{
$request->validate([
'type' => 'required|string|in:music,media,breathing-template',
'type' => 'required|string|in:music,media,breathing-template,playlist',
'id' => 'required|integer',
]);
@@ -40,7 +40,7 @@ public function save(Request $request)
public function unsave(Request $request)
{
$request->validate([
'type' => 'required|string|in:music,media,breathing-template',
'type' => 'required|string|in:music,media,breathing-template,playlist',
'id' => 'required|integer',
]);
@@ -67,7 +67,7 @@ public function unsave(Request $request)
public function toggleSave(Request $request)
{
$request->validate([
'type' => 'required|string|in:music,media,breathing-template',
'type' => 'required|string|in:music,media,breathing-template,playlist',
'id' => 'required|integer',
]);
@@ -112,6 +112,7 @@ public function mySavedItems(Request $request)
'music' => 'App\\Models\\Music',
'media' => 'App\\Models\\Media',
'breathing-template' => 'App\\Models\\BreathingTemplate',
'playlist' => 'App\\Models\\MusicPlaylist',
]
]);
}
@@ -121,7 +122,7 @@ public function mySavedItems(Request $request)
public function checkSaved(Request $request)
{
$request->validate([
'type' => 'required|string|in:music,media,breathing-template',
'type' => 'required|string|in:music,media,breathing-template,playlist',
'id' => 'required|integer',
]);
@@ -151,6 +152,7 @@ private function getModelClass($type)
'music' => \App\Models\Music::class,
'media' => \App\Models\Media::class,
'breathing-template' => \App\Models\BreathingTemplate::class,
'playlist' => \App\Models\MusicPlaylist::class,
];
return $models[$type] ?? null;
@@ -0,0 +1,97 @@
<?php
namespace App\Http\Controllers;
use App\Models\SubCategory;
use Illuminate\Http\Request;
class SubCategoryController extends Controller
{
public function index(Request $request, $categoryId = null)
{
$query = SubCategory::with('category')->withCount('media');
$categoryId = $categoryId ?? $request->input('category_id');
if ($categoryId) {
$query->where('category_id', $categoryId);
}
return response()->json(
$query->orderBy('name')->get()
);
}
public function store(Request $request)
{
$data = $request->validate([
'category_id' => 'required|exists:categories,id',
'name' => 'required|string|max:255',
]);
$existing = SubCategory::where('category_id', $data['category_id'])
->where('name', $data['name'])
->first();
if ($existing) {
return response()->json([
'message' => 'A subcategory with this name already exists in this category',
'errors' => ['name' => ['The subcategory name must be unique within this category.']],
], 422);
}
$subCategory = SubCategory::create($data);
return response()->json([
'message' => 'Subcategory created successfully',
'sub_category' => $subCategory->load('category'),
], 201);
}
public function show($id)
{
$subCategory = SubCategory::with('category')->withCount('media')->findOrFail($id);
return response()->json($subCategory);
}
public function update(Request $request, $id)
{
$subCategory = SubCategory::findOrFail($id);
$data = $request->validate([
'category_id' => 'sometimes|exists:categories,id',
'name' => 'sometimes|string|max:255',
]);
$categoryId = $data['category_id'] ?? $subCategory->category_id;
$name = $data['name'] ?? $subCategory->name;
$existing = SubCategory::where('category_id', $categoryId)
->where('name', $name)
->where('id', '!=', $subCategory->id)
->first();
if ($existing) {
return response()->json([
'message' => 'A subcategory with this name already exists in this category',
'errors' => ['name' => ['The subcategory name must be unique within this category.']],
], 422);
}
$subCategory->update($data);
return response()->json([
'message' => 'Subcategory updated successfully',
'sub_category' => $subCategory->load('category'),
]);
}
public function destroy($id)
{
$subCategory = SubCategory::findOrFail($id);
$subCategory->delete();
return response()->json(['message' => 'Subcategory deleted successfully']);
}
}
+5
View File
@@ -12,5 +12,10 @@ public function questions()
{
return $this->hasMany(Question::class);
}
public function subcategories()
{
return $this->hasMany(SubCategory::class);
}
}
+6
View File
@@ -14,6 +14,7 @@ class Media extends Model
'user_id',
'image_id',
'category_id',
'subcategory_id',
'title',
'caption',
'type',
@@ -48,6 +49,11 @@ public function category()
{
return $this->belongsTo(Category::class);
}
public function subCategory()
{
return $this->belongsTo(SubCategory::class, 'subcategory_id');
}
public function tags()
{
return $this->belongsToMany(Tag::class, 'media_tag');
+8 -2
View File
@@ -6,9 +6,11 @@
use Illuminate\Database\Eloquent\Relations\BelongsTo; // ← Add this
use Illuminate\Database\Eloquent\Relations\HasMany; // ← Add this
use App\Traits\HasComments; // Add this
use App\Traits\HasLikes;
use App\Traits\HasSaves;
class MusicPlaylist extends Model
{
use HasComments;
use HasComments, HasLikes, HasSaves;
protected $table = 'music_playlists';
protected $fillable = [
@@ -23,7 +25,11 @@ class MusicPlaylist extends Model
'comments_count',
'has_user_commented',
'user_comment',
'user_comment_id'
'user_comment_id',
'is_liked',
'likes_count',
'is_saved',
'saved_count'
];
public function category(): BelongsTo
{
+24
View File
@@ -0,0 +1,24 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
class SubCategory extends Model
{
protected $table = 'sub_categories';
protected $fillable = ['category_id', 'name'];
public function category(): BelongsTo
{
return $this->belongsTo(Category::class);
}
public function media(): HasMany
{
return $this->hasMany(Media::class, 'subcategory_id');
}
}
@@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('sub_categories', function (Blueprint $table) {
$table->id();
$table->foreignId('category_id')->constrained('categories')->cascadeOnDelete();
$table->string('name');
$table->timestamps();
$table->unique(['category_id', 'name']);
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('sub_categories');
}
};
@@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('media', function (Blueprint $table) {
$table->unsignedBigInteger('subcategory_id')->nullable()->after('category_id');
$table->foreign('subcategory_id')->references('id')->on('sub_categories')->nullOnDelete();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('media', function (Blueprint $table) {
$table->dropForeign(['subcategory_id']);
$table->dropColumn('subcategory_id');
});
}
};
+9
View File
@@ -15,6 +15,8 @@
use App\Http\Controllers\ImageController;
use App\Http\Controllers\MusicController;
use App\Http\Controllers\MediaController;
use App\Http\Controllers\CategoryController;
use App\Http\Controllers\SubCategoryController;
use App\Http\Controllers\MusicCategoryController;
use App\Http\Controllers\MusicPlaylistController;
use App\Http\Controllers\RatingController;
@@ -158,6 +160,13 @@
//add note to media
Route::post('/media/{id}/note', [MediaController::class, 'storeNote']);
// Media categories
Route::apiResource('categories', CategoryController::class);
// Media sub categories
Route::get('sub-categories/by-category/{categoryId}', [SubCategoryController::class, 'index']);
Route::apiResource('sub-categories', SubCategoryController::class);
// Music Categories