Refactor WebPushSubscription logic to streamline subscription creation

app/Filament/Resources/RfqTransporterBidResource/Pages/EditRfqTransporterBid.php

@@ -104,31 +104,63 @@ class EditRfqTransporterBid extends EditRecord
         //     );
         // }
 
-        foreach ($users as $user) {
+        // foreach ($users as $user) {
 
-        Log::info('Checking push subscription for user', [
+        // Log::info('Checking push subscription for user', [
-            'user_id' => $user->id,
+        //     'user_id' => $user->id,
-            'name' => $user->name,
+        //     'name' => $user->name,
-            'subscription_count' => $user->pushSubscriptions()->count(),
+        //     'subscription_count' => $user->pushSubscriptions()->count(),
-        ]);
+        // ]);
-            if ($user->pushSubscriptions()->exists()) {
+        //     if ($user->pushSubscriptions()->exists()) {
+
+        //         Log::info('Sending push notification', [
+        //             'user_id' => $user->id,
+        //         ]);
+        //         $user->notify(
+        //             new PushAlertNotification(
+        //                 'Rank Updated',
+        //                 $body
+        //             )
+        //         );
+        //     }
+        //     else {
+        //         Log::warning('User has NO push subscription', [
+        //             'user_id' => $user->id,
+        //         ]);
+        //     }
+        // }
+
+
+            foreach ($users as $user) {
+
+                $count = $user->pushSubscriptions()->count();
+
+                Log::info('Checking push subscription for user', [
+                    'user_id' => $user->id,
+                    'name' => $user->name,
+                    'subscription_count' => $count,
+                ]);
+
+                if ($count == 0) {
+                    Log::warning('User has NO push subscription', [
+                        'user_id' => $user->id,
+                    ]);
+                    continue;
+                }
 
                 Log::info('Sending push notification', [
                     'user_id' => $user->id,
                 ]);
-                $user->notify(
+
-                    new PushAlertNotification(
+                // ✅ THIS IS ALL YOU NEED
-                        'Rank Updated',
+                $user->notify(new PushAlertNotification(
-                        $body
+                    'Rank Updated',
-                    )
+                    $body
-                );
+                ));
             }
-            else {
+
-                Log::warning('User has NO push subscription', [
+
-                    'user_id' => $user->id,
+
-                ]);
-            }
-        }
     }
 
     protected function getHeaderActions(): array

resources/views/filament/pages/notification-settings.blade.php

@@ -65,7 +65,6 @@
                 },
                 body: JSON.stringify(subscription)
             });
-
             alert("Push notifications enabled ✅");
         }
     </script>

routes/api.php

@@ -25,12 +25,15 @@ use App\Http\Controllers\ObdController;
 use App\Http\Controllers\PalletController;
 use App\Http\Controllers\PdfController;
 use App\Http\Controllers\PlantController;
+use App\Http\Controllers\PrintController;
 use App\Http\Controllers\ProductionStickerReprintController;
 use App\Http\Controllers\SapFileController;
 use App\Http\Controllers\StickerMasterController;
 // use App\Http\Controllers\TelegramController;
 use App\Http\Controllers\TestingPanelController;
 use App\Http\Controllers\UserController;
+use App\Models\WebPushSubscription;
+use Filament\Facades\Filament;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
@@ -185,3 +188,46 @@ Route::post('file/store', [SapFileController::class, 'store'])->name('file.store
 // Route::post('send-telegram', [TelegramController::class, 'sendMessage']);
 
 // Route::post('invoice-exit', [InvoiceValidationController::class, 'handle']);
+
+
+Route::post('/print-pdf', [PrintController::class, 'print']);
+
+
+ Route::post('/push/subscribe', function (Request $request) {
+
+    $user = Filament::auth()->user();
+    abort_if(!$user, 401);
+
+    $request->validate([
+        'endpoint' => 'required|string',
+        'keys.p256dh' => 'required|string',
+        'keys.auth' => 'required|string',
+    ]);
+
+    // WebPushSubscription::updateOrCreate(
+    //     ['endpoint' => $request->endpoint],
+    //     [
+    //         'subscribable_type' => get_class($user),
+    //         'subscribable_id'   => $user->id,
+    //         'public_key'        => $request->keys['p256dh'],
+    //         'auth_token'        => $request->keys['auth'],
+    //         'content_encoding'  => $request->contentEncoding ?? 'aesgcm',
+    //     ]
+    // );
+
+    WebPushSubscription::updateOrCreate(
+        [
+            'endpoint'          => $request->endpoint,
+            'subscribable_type' => get_class($user),
+            'subscribable_id'   => $user->id,
+        ],
+        [
+            'public_key'       => $request->keys['p256dh'],
+            'auth_token'       => $request->keys['auth'],
+            'content_encoding' => $request->contentEncoding ?? 'aesgcm',
+        ]
+    );
+
+
+    return response()->json(['success' => true]);
+});

routes/web.php

@@ -58,30 +58,30 @@ use App\Http\Livewire\CustomLogin;
         'keys.auth' => 'required|string',
     ]);
 
-    // WebPushSubscription::updateOrCreate(
-    //     ['endpoint' => $request->endpoint],
-    //     [
-    //         'subscribable_type' => get_class($user),
-    //         'subscribable_id'   => $user->id,
-    //         'public_key'        => $request->keys['p256dh'],
-    //         'auth_token'        => $request->keys['auth'],
-    //         'content_encoding'  => $request->contentEncoding ?? 'aesgcm',
-    //     ]
-    // );
-
     WebPushSubscription::updateOrCreate(
+        ['endpoint' => $request->endpoint],
         [
-            'endpoint'          => $request->endpoint,
             'subscribable_type' => get_class($user),
             'subscribable_id'   => $user->id,
-        ],
+            'public_key'        => $request->keys['p256dh'],
-        [
+            'auth_token'        => $request->keys['auth'],
-            'public_key'       => $request->keys['p256dh'],
+            'content_encoding'  => $request->contentEncoding ?? 'aesgcm',
-            'auth_token'       => $request->keys['auth'],
-            'content_encoding' => $request->contentEncoding ?? 'aesgcm',
         ]
     );
 
+    // WebPushSubscription::updateOrCreate(
+    //     [
+    //         'endpoint'          => $request->endpoint,
+    //         'subscribable_type' => get_class($user),
+    //         'subscribable_id'   => $user->id,
+    //     ],
+    //     [
+    //         'public_key'       => $request->keys['p256dh'],
+    //         'auth_token'       => $request->keys['auth'],
+    //         'content_encoding' => $request->contentEncoding ?? 'aesgcm',
+    //     ]
+    // );
+
 
     return response()->json(['success' => true]);
 });