Huge Beta Release Fixes

app/Events/TagFrequencyChanged.php

@@ -14,7 +14,11 @@ class TagFrequencyChanged
     /**
      * Create a new event instance.
      */
-    public function __construct(public ?array $oldTags, public ?array $newTags) {}
+    public function __construct(
+        public string $tagType,
+        public array $oldTags,
+        public array $newTags
+    ) {}
 
     /**
      * Get the channels the event should broadcast on.

app/Filament/Admin/Resources/ComputerScienceResource.php

@@ -5,12 +5,17 @@
 use App\Filament\Admin\Resources\ComputerScienceResource\Pages;
 use App\Filament\Admin\Resources\UserResource\RelationManagers\UserRelationManager;
 use App\Models\ComputerScienceResource as ModelsComputerScienceResource;
+use Filament\Forms;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
+use Filament\Tables\Actions\BulkAction;
+use Filament\Tables\Actions\DeleteAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 
 class ComputerScienceResource extends Resource
 {
@@ -24,6 +29,51 @@ public static function getEloquentQuery(): Builder
 
     protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
 
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('name')
+                    ->required()
+                    ->maxLength(255),
+
+                Forms\Components\Textarea::make('description')
+                    ->maxLength(65535)
+                    ->columnSpanFull(),
+
+                Forms\Components\TextInput::make('slug')
+                    ->maxLength(255),
+
+                Forms\Components\Select::make('user_id')
+                    ->relationship('user', 'name')
+                    ->required(),
+
+                Forms\Components\TagsInput::make('topic_tags')
+                    ->label('Topic Tags')
+                    ->disabled()
+                    ->helperText('These are computed from relationships'),
+
+                Forms\Components\TagsInput::make('programming_language_tags')
+                    ->label('Programming Language Tags')
+                    ->disabled()
+                    ->helperText('These are computed from relationships'),
+
+                Forms\Components\TagsInput::make('general_tags')
+                    ->label('General Tags')
+                    ->disabled()
+                    ->helperText('These are computed from relationships'),
+
+                // Editable date fields
+                Forms\Components\DateTimePicker::make('created_at')
+                    ->label('Created Date')
+                    ->seconds(false),
+
+                Forms\Components\DateTimePicker::make('updated_at')
+                    ->label('Updated Date')
+                    ->seconds(false),
+            ]);
+    }
+
     public static function table(Table $table): Table
     {
         return $table
@@ -35,7 +85,7 @@ public static function table(Table $table): Table
                 TextColumn::make('name')->searchable()
                     ->description(fn (ModelsComputerScienceResource $resource): string => $resource->description)->wrap(),
                 TextColumn::make('topic_tags')
-                    ->label('Topics')
+                    ->label('topics_tags')
                     ->badge()
                     ->color('primary')
                     ->getStateUsing(fn ($record) => $record->topic_tags),
@@ -57,10 +107,29 @@ public static function table(Table $table): Table
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
+                // Custom delete action that uses model delete() method
+                DeleteAction::make()
+                    ->action(function (ModelsComputerScienceResource $record) {
+                        // This calls the model's delete() method, triggering all events
+                        $record->delete();
+                    }),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
+                    // Custom bulk delete action that uses model delete() method
+                    BulkAction::make('delete')
+                        ->label('Delete selected')
+                        ->icon('heroicon-o-trash')
+                        ->color('danger')
+                        ->requiresConfirmation()
+                        ->action(function (Collection $records) {
+                            // Loop through each record and call delete() individually
+                            // This ensures all model events and custom logic are triggered
+                            $records->each(function ($record) {
+                                $record->delete();
+                            });
+                        })
+                        ->deselectRecordsAfterCompletion(),
                 ]),
             ]);
     }

app/Http/Controllers/ComputerScienceResourceController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Events\TagFrequencyChanged;
 use App\Http\Requests\StoreResourceRequest;
 use App\Models\ComputerScienceResource;
 use App\Models\NewsPost;
@@ -13,6 +12,7 @@
 use App\Services\ResourceReviewService;
 use App\Services\SortingManagers\GeneralVotesSortingManager;
 use App\Services\SortingManagers\ResourceSortingManager;
+use App\Services\UpvoteService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -27,6 +27,7 @@ public function __construct(
         protected GeneralVotesSortingManager $generalVotesSortingManager,
         protected ResourceReviewService $reviewService,
         protected ResourceSortingManager $resourceSortingManager,
+        protected UpvoteService $upvoteService,
     ) {}
 
     /**
@@ -109,11 +110,10 @@ public function store(StoreResourceRequest $request)
                 $resource->general_tags = $validatedData['general_tags'];
             }
 
-            // Dispatch tag frequency change event
-            TagFrequencyChanged::dispatch(null, $resource->tagCounter());
-
             DB::commit();
 
+            $this->upvoteService->upvote('resource', $resource->id);
+
             Log::info('Resource created', [
                 'resource_id' => $resource->id,
                 'user_id' => Auth::id(),
@@ -122,8 +122,9 @@ public function store(StoreResourceRequest $request)
                 'platforms' => $resource->platforms,
             ]);
 
-            return redirect(route('resources.show', ['slug' => $resource->slug]))
-                ->with('success', 'Created Resource Succesfully!');
+            session()->flash('success', 'Created Resource!');
+
+            return response()->json($resource);
         } catch (Throwable $e) {
             DB::rollBack();
             Log::critical('Failed to create resource', [
@@ -133,7 +134,7 @@ public function store(StoreResourceRequest $request)
                 'data' => $validatedData,
             ]);
 
-            return back()->withErrors(['error' => 'Failed to create resource. Please try again.']);
+            return response()->json([], 500);
         }
     }
 
@@ -168,14 +169,15 @@ public function show(Request $request, string $slug, string $tab = 'reviews')
         if ($tab === 'reviews') {
             $userReview = null;
             if ($userId = Auth::id()) {
-                $userReview = ResourceReview::where('user_id', $userId)->first();
+                $userReview = ResourceReview::whereBelongsTo($computerScienceResource)
+                    ->firstWhere('user_id', $userId);
             }
 
             $data['userReview'] = $userReview;
 
             $data['reviews'] = Inertia::defer(
                 function () use ($computerScienceResource, $sortBy, $request) {
-                    $query = ResourceReview::where('computer_science_resource_id', $computerScienceResource->id);
+                    $query = ResourceReview::whereBelongsTo($computerScienceResource);
                     $query = $this->generalVotesSortingManager->applySort($query, $sortBy, ResourceReview::class);
 
                     return $query->with('user')->paginate(10)->appends($request->query());
@@ -184,7 +186,7 @@ function () use ($computerScienceResource, $sortBy, $request) {
         } elseif ($tab === 'edits') {
             $data['resourceEdits'] = Inertia::defer(
                 function () use ($computerScienceResource, $sortBy, $request) {
-                    $query = ResourceEdits::where('computer_science_resource_id', $computerScienceResource->id);
+                    $query = ResourceEdits::whereBelongsTo($computerScienceResource);
                     $query = $this->generalVotesSortingManager->applySort($query, $sortBy, ResourceEdits::class);
 
                     return $query->with('user')->paginate(10)->appends($request->query());

app/Http/Controllers/ResourceEditsController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Events\TagFrequencyChanged;
 use App\Http\Requests\StoreResourceEdit;
 use App\Models\ComputerScienceResource;
 use App\Models\ResourceEdits;
@@ -69,7 +68,7 @@ public function store(ComputerScienceResource $computerScienceResource, StoreRes
         ]);
 
         return redirect()->route('resource_edits.show', ['slug' => $resourceEdit->slug])
-            ->with('success', 'The proposed edits were created. Others can now view it.');
+            ->with('success', 'Edits Created!');
     }
 
     /**
@@ -95,7 +94,7 @@ public function show(string $slug)
     {
         $resourceEdits = ResourceEdits::where('slug', $slug)->firstOrFail();
 
-        $resourceEdits->load('resource');
+        $resourceEdits->load('computerScienceResource');
         $resourceEdits->load('user');
 
         return Inertia::render('ResourceEdits/Show', [
@@ -112,7 +111,6 @@ public function merge(ResourceEditsService $editsService, ResourceEdits $resourc
         DB::beginTransaction();
         try {
             $resource = ComputerScienceResource::findOrFail($resourceEdits->computer_science_resource_id);
-            $oldTagCounter = $resource->tagCounter();
 
             // Go through each property in proposed_changes, and if it exists. then set the value
             $changes = $resourceEdits->proposed_changes;
@@ -151,11 +149,6 @@ public function merge(ResourceEditsService $editsService, ResourceEdits $resourc
                 }
             }
 
-            // Get the new tag counter
-            $newTags = collect($allTags)->flatten()->countBy()->toArray();
-            // Change tag frequency
-            TagFrequencyChanged::dispatch($oldTagCounter, $newTags);
-
             // Delete the edit since we successfully merged the changes
             $resourceEdits->delete();
 
@@ -170,7 +163,7 @@ public function merge(ResourceEditsService $editsService, ResourceEdits $resourc
             ]);
 
             return redirect(route('resources.show', ['slug' => $resource->slug]))
-                ->with('success', 'Successfully merged new changed!');
+                ->with('success', 'Successfully Merged Changes!');
         } catch (Throwable $e) {
             DB::rollBack();
             Log::critical('Failed to merge resource edits', [

app/Http/Controllers/ResourceReviewController.php

@@ -58,7 +58,7 @@ public function store(StoreResourceReview $request, ComputerScienceResource $com
             'review_id' => $review->id,
         ]);
 
-        return response()->json();
+        return response()->json($review);
     }
 
     public function update(StoreResourceReview $request, ComputerScienceResource $computerScienceResource)
@@ -106,6 +106,6 @@ public function update(StoreResourceReview $request, ComputerScienceResource $co
             'review_id' => $existingReview->id,
         ]);
 
-        return response()->json();
+        return response()->json($existingReview);
     }
 }

app/Http/Controllers/TagFrequencyController.php

@@ -6,15 +6,22 @@
 
 class TagFrequencyController extends Controller
 {
-    public function search(string $query = '')
+    public function search(string $type, string $query = '')
     {
         if (strlen($query) > 50) {
-            return response()->json(['message' => 'Query too long.'], 422);
+            return response()->json(['message' => 'Query too long'], 422);
         }
 
-        $prefixed_tags = TagFrequency::where('tag', 'like', $query.'%')
+        if (! in_array($type, ['topics_tags', 'programming_languages_tags', 'general_tags'])) {
+            return response()->json(['message' => 'Not a valid type'], 422);
+        }
+
+        $escaped = addcslashes($query, '%_\\');
+
+        $prefixed_tags = TagFrequency::where('tag', 'like', $escaped.'%')
+            ->where('type', $type)
             ->orderByDesc('count')
-            ->limit(20)
+            ->limit(30)
             ->get();
 
         return response()->json([