melabidi/alrahma_sunday_school_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update controllers logic

Browse Source
This commit is contained in:
root
2026-04-23 00:04:35 -04:00
parent 1977a513df
commit ca4ba272fc
353 changed files with 13402 additions and 1301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/Incidents/IncidentController.php
+32 -4
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers\Api\Incidents;
use App\Http\Controllers\Api\BaseApiController;
use App\Http\Controllers\Api\Core\BaseApiController;
use App\Http\Requests\Incidents\IncidentCancelRequest;
use App\Http\Requests\Incidents\IncidentCloseRequest;
use App\Http\Requests\Incidents\IncidentListRequest;
@@ -86,6 +86,11 @@ class IncidentController extends BaseApiController
public function store(Request $request): JsonResponse
{
$guard = $this->authenticatedUserIdOrUnauthorized();
if ($guard instanceof JsonResponse) {
return $guard;
}
$data = array_merge($request->query->all(), $request->all(), $request->json()->all());
$validator = Validator::make($data, [
'student_id' => ['required', 'integer', 'min:1'],
@@ -104,7 +109,7 @@ class IncidentController extends BaseApiController
}
$payload = $validator->validated();
$result = $this->currentService->addIncident($payload, (int) (auth()->id() ?? 0));
$result = $this->currentService->addIncident($payload, $guard);
if (empty($result['ok'])) {
return response()->json(['ok' => false, 'message' => $result['message'] ?? 'Failed to add incident.'], 422);
@@ -129,6 +134,11 @@ class IncidentController extends BaseApiController
public function close(Request $request, int $incidentId): JsonResponse
{
$guard = $this->authenticatedUserIdOrUnauthorized();
if ($guard instanceof JsonResponse) {
return $guard;
}
$data = array_merge($request->query->all(), $request->all(), $request->json()->all());
$validator = Validator::make($data, [
'state_description' => ['required', 'string', 'max:2000'],
@@ -147,7 +157,7 @@ class IncidentController extends BaseApiController
$incidentId,
(string) $payload['state_description'],
$payload['action_taken'] ?? null,
(int) (auth()->id() ?? 0)
$guard
);
if (empty($result['ok'])) {
@@ -162,12 +172,17 @@ class IncidentController extends BaseApiController
public function cancel(IncidentCancelRequest $request, int $incidentId): JsonResponse
{
$guard = $this->authenticatedUserIdOrUnauthorized();
if ($guard instanceof JsonResponse) {
return $guard;
}
$payload = $request->validated();
$result = $this->currentService->cancelIncident(
$incidentId,
$payload['state_description'] ?? null,
$payload['action_taken'] ?? null,
(int) (auth()->id() ?? 0)
$guard
);
if (empty($result['ok'])) {
@@ -179,4 +194,17 @@ class IncidentController extends BaseApiController
'incident_id' => $result['incident_id'],
]);
}
/**
* @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;
}
}