update controllers logic

app/Http/Controllers/Api/ExtraCharges/ExtraChargesController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Api\ExtraCharges;
 
-use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Controllers\Api\Core\BaseApiController;
 use App\Http\Requests\ExtraCharges\StoreExtraChargeRequest;
 use App\Http\Requests\ExtraCharges\UpdateExtraChargeRequest;
 use App\Http\Resources\ExtraCharges\ExtraChargeInvoiceOptionResource;
@@ -87,8 +87,13 @@ class ExtraChargesController extends BaseApiController
 
     public function store(StoreExtraChargeRequest $request): JsonResponse
     {
+        $userId = $this->authenticatedUserIdOrUnauthorized();
+        if ($userId instanceof JsonResponse) {
+            return $userId;
+        }
+
         $payload = $request->validated();
-        $payload['created_by'] = (int) (auth()->id() ?? 0);
+        $payload['created_by'] = $userId;
 
         $result = $this->chargeService->createCharge($payload);
 
@@ -102,8 +107,13 @@ class ExtraChargesController extends BaseApiController
             return response()->json(['ok' => false, 'error' => 'Charge not found'], 404);
         }
 
+        $userId = $this->authenticatedUserIdOrUnauthorized();
+        if ($userId instanceof JsonResponse) {
+            return $userId;
+        }
+
         $payload = $request->validated();
-        $payload['updated_by'] = (int) (auth()->id() ?? 0);
+        $payload['updated_by'] = $userId;
 
         $ok = $this->chargeService->updateCharge($charge, $payload);
 
@@ -140,4 +150,17 @@ class ExtraChargesController extends BaseApiController
             'ok' => $ok,
         ], $ok ? 200 : 422);
     }
+
+    /**
+     * @return int|JsonResponse
+     */
+    private function authenticatedUserIdOrUnauthorized(): int|JsonResponse
+    {
+        $userId = (int) (auth()->id() ?? 0);
+        if ($userId <= 0) {
+            return response()->json(['ok' => false, 'message' => 'Unauthorized.'], 401);
+        }
+
+        return $userId;
+    }
 }