Updated to latest

This commit is contained in:
Fritz Ramirez
2024-04-19 03:06:08 -04:00
parent e959e6b185
commit e65189f50c
37 changed files with 1107 additions and 559 deletions
@@ -147,13 +147,22 @@ class StudioPlusVideoController extends Controller
'asinData',
'videoType',
'otts.links',
'channel.user',
'channel.user.staff',
'urls',
])
->filter($request)
->when($request->filled('category_id'), fn ($query) => $query->where('studio_plus_category_id', $request->category_id))
->when($request->filled('status') && $request->status !== 'All' && $request->status !== 'MVL', fn ($query) => $query->where('status', $status))
->when($request->filled('start_date') && $request->filled('end_date'), fn ($query) => $query->whereBetween(DB::raw('DATE(created_at)'), [$request->start_date, $request->end_date]))
->when($request->filled('start_date') && $request->filled('end_date'), function($query) use($request) {
if($request->filled('tracks')){
$query->whereHas('tracks', function($query) use($request) {
$query->where('name', $request->tracks);
$query->whereBetween(DB::raw('DATE(created_at)'), [$request->start_date, $request->end_date]);
});
} else {
$query->whereBetween(DB::raw('DATE(created_at)'), [$request->start_date, $request->end_date]);
}
})
->when($request->filled('user_id'), function($query) use($request) {
$query->whereHas('channel.user', function($query) use($request) {
$query->where('id', $request->user_id);
@@ -193,6 +202,11 @@ class StudioPlusVideoController extends Controller
->when($request->filled('types'), function($query) use($request) {
$query->whereIn('studio_plus_video_type_id', $request->types);
})
->when($request->filled('tracks'), function($query) use($request) {
$query->whereHas('tracks', function($query) use($request) {
$query->where('name', $request->tracks);
});
})
// ->when($request->filled('types'), function($query) use($request) {
// $types = array_map(function($item) {
// return strtoupper($item);
@@ -609,7 +623,16 @@ class StudioPlusVideoController extends Controller
->filter($request)
->when($request->filled('category_id'), fn ($query) => $query->where('studio_plus_category_id', $request->category_id))
->when($request->filled('status') && $request->status !== 'All' && $request->status !== 'MVL', fn ($query) => $query->where('status', explode(',', $request->status) ?: ''))
->when($request->filled('start_date') && $request->filled('end_date'), fn ($query) => $query->whereBetween(DB::raw('DATE(created_at)'), [$request->start_date, $request->end_date]))
->when($request->filled('start_date') && $request->filled('end_date'), function($query) use($request) {
if($request->filled('tracks')){
$query->whereHas('tracks', function($query) use($request) {
$query->where('name', $request->tracks);
$query->whereBetween(DB::raw('DATE(created_at)'), [$request->start_date, $request->end_date]);
});
} else {
$query->whereBetween(DB::raw('DATE(created_at)'), [$request->start_date, $request->end_date]);
}
})
->when($request->filled('user_id'), function($query) use($request) {
$query->whereHas('channel.user', function($query) use($request) {
$query->where('id', $request->user_id);
@@ -653,6 +676,11 @@ class StudioPlusVideoController extends Controller
->when($request->filled('types'), function($query) use($request) {
$query->whereIn('studio_plus_video_type_id', $request->types);
})
->when($request->filled('tracks'), function($query) use($request) {
$query->whereHas('tracks', function($query) use($request) {
$query->where('name', $request->tracks);
});
})
// ->when($request->filled('types'), function($query) use($request) {
// $types = array_map(function($item) {
// return strtoupper($item);
@@ -945,7 +973,7 @@ class StudioPlusVideoController extends Controller
'otts.links',
'category',
'asinData',
'channel.user',
'channel.user.staff',
'urls',
]);
@@ -1005,7 +1033,7 @@ class StudioPlusVideoController extends Controller
'otts.links',
'category',
'asinData',
'channel.user',
'channel.user.staff',
'urls',
]);
@@ -1054,7 +1082,7 @@ class StudioPlusVideoController extends Controller
'otts.links',
'category',
'asinData',
'channel.user',
'channel.user.staff',
'urls',
]);
@@ -1100,7 +1128,7 @@ class StudioPlusVideoController extends Controller
'otts.links',
'category',
'asinData',
'channel.user',
'channel.user.staff',
'urls',
]);
@@ -1196,7 +1224,7 @@ class StudioPlusVideoController extends Controller
'otts.links',
'category',
'asinData',
'channel.user',
'channel.user.staff',
'urls',
]);
}
@@ -1301,7 +1329,7 @@ class StudioPlusVideoController extends Controller
'otts.links',
'category',
'asinData',
'channel.user',
'channel.user.staff',
'urls'
]);