messages implemented
This commit is contained in:
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Dashboard;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Artwork;
|
||||
use App\Services\UserStatsService;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
@@ -17,23 +18,10 @@ class FavoriteController extends Controller
|
||||
$user = $request->user();
|
||||
$perPage = 20;
|
||||
|
||||
$favTable = DB::getSchemaBuilder()->hasTable('user_favorites') ? 'user_favorites' : (DB::getSchemaBuilder()->hasTable('favourites') ? 'favourites' : null);
|
||||
if (! $favTable) {
|
||||
return view('dashboard.favorites', ['artworks' => new LengthAwarePaginator([], 0, $perPage)]);
|
||||
}
|
||||
|
||||
$favTable = 'artwork_favourites';
|
||||
$sort = $request->query('sort', 'newest');
|
||||
$order = $sort === 'oldest' ? 'asc' : 'desc';
|
||||
|
||||
// Determine a column to order by (legacy 'datum' or modern timestamps)
|
||||
$schema = DB::getSchemaBuilder();
|
||||
$orderColumn = null;
|
||||
foreach (['datum', 'created_at', 'created', 'date'] as $col) {
|
||||
if ($schema->hasColumn($favTable, $col)) {
|
||||
$orderColumn = $col;
|
||||
break;
|
||||
}
|
||||
}
|
||||
$orderColumn = 'created_at';
|
||||
|
||||
$query = DB::table($favTable)->where('user_id', (int) $user->id);
|
||||
if ($orderColumn) {
|
||||
@@ -78,19 +66,18 @@ class FavoriteController extends Controller
|
||||
$artwork = (int) $last;
|
||||
}
|
||||
}
|
||||
$favTable = DB::getSchemaBuilder()->hasTable('user_favorites') ? 'user_favorites' : (DB::getSchemaBuilder()->hasTable('favourites') ? 'favourites' : null);
|
||||
if ($favTable) {
|
||||
$artworkId = is_object($artwork) ? (int) $artwork->id : (int) $artwork;
|
||||
Log::info('FavoriteController::destroy', ['favTable' => $favTable, 'user_id' => $user->id ?? null, 'artwork' => $artwork, 'artworkId' => $artworkId]);
|
||||
$deleted = DB::table($favTable)
|
||||
->where('user_id', (int) $user->id)
|
||||
->where('artwork_id', $artworkId)
|
||||
->delete();
|
||||
$artworkId = is_object($artwork) ? (int) $artwork->id : (int) $artwork;
|
||||
Log::info('FavoriteController::destroy', ['user_id' => $user->id ?? null, 'artworkId' => $artworkId]);
|
||||
// Look up creator before deleting so we can decrement their counter
|
||||
$creatorId = (int) DB::table('artworks')->where('id', $artworkId)->value('user_id');
|
||||
|
||||
// Fallback: some schemas or test setups may not match user_id; try deleting by artwork_id alone
|
||||
if (! $deleted) {
|
||||
DB::table($favTable)->where('artwork_id', $artworkId)->delete();
|
||||
}
|
||||
DB::table('artwork_favourites')
|
||||
->where('user_id', (int) $user->id)
|
||||
->where('artwork_id', $artworkId)
|
||||
->delete();
|
||||
|
||||
if ($creatorId) {
|
||||
app(UserStatsService::class)->decrementFavoritesReceived($creatorId);
|
||||
}
|
||||
|
||||
return redirect()->route('dashboard.favorites')->with('status', 'favourite-removed');
|
||||
|
||||
Reference in New Issue
Block a user