update controllers logic

2026-04-23 00:04:35 -04:00
parent 1977a513df
commit ca4ba272fc
353 changed files with 13402 additions and 1301 deletions
@@ -22,14 +22,30 @@ class BadgeController extends Controller

    public function generatePdf(Request $request)
    {
+        $guard = $this->authenticatedUserIdOrUnauthorized();
+        if ($guard instanceof JsonResponse) {
+            return $guard;
+        }
+
        $validator = Validator::make($request->all(), [
-            'user_ids' => ['required', 'array', 'min:1'],
-            'user_ids.*' => ['integer', 'min:1'],
+            'user_ids' => ['nullable', 'array'],
+            'user_ids.*' => ['integer', 'exists:users,id'],
+            'student_ids' => ['nullable', 'array'],
+            'student_ids.*' => ['integer', 'exists:students,id'],
            'school_year' => ['nullable', 'string', 'max:50'],
            'roles' => ['nullable', 'array'],
            'classes' => ['nullable', 'array'],
        ]);

+        $validator->after(function ($validator): void {
+            $data = $validator->getData();
+            $users = array_values(array_filter((array) ($data['user_ids'] ?? []), static fn ($v) => (int) $v > 0));
+            $students = array_values(array_filter((array) ($data['student_ids'] ?? []), static fn ($v) => (int) $v > 0));
+            if ($users === [] && $students === []) {
+                $validator->errors()->add('user_ids', 'Provide at least one user id or student id.');
+            }
+        });
+
        if ($validator->fails()) {
            return response()->json([
                'message' => 'Validation failed.',
@@ -40,11 +56,12 @@ class BadgeController extends Controller
        $data = $validator->validated();

        return $this->badgePdfService->generate(
+            studentIds: $data['student_ids'] ?? [],
            userIds: $data['user_ids'] ?? [],
            schoolYear: $data['school_year'] ?? null,
            rolesMap: $data['roles'] ?? [],
            classesMap: $data['classes'] ?? [],
-            actorId: optional($request->user())->id
+            actorId: $guard
        );
    }

@@ -54,7 +71,7 @@ class BadgeController extends Controller
            return response()->json([
                'ok' => true,
                'data' => $this->badgePrintLogService->getStatus(
-                    $this->parseUserIds($request),
+                    $this->parseCombinedBadgeIds($request),
                    $request->input('school_year')
                ),
            ]);
@@ -69,14 +86,30 @@ class BadgeController extends Controller
    public function logPrint(Request $request): JsonResponse
    {
        try {
+            $guard = $this->authenticatedUserIdOrUnauthorized();
+            if ($guard instanceof JsonResponse) {
+                return $guard;
+            }
+
            $validator = Validator::make($request->all(), [
-                'user_ids' => ['required', 'array', 'min:1'],
-                'user_ids.*' => ['integer', 'min:1'],
+                'user_ids' => ['nullable', 'array'],
+                'user_ids.*' => ['integer', 'exists:users,id'],
+                'student_ids' => ['nullable', 'array'],
+                'student_ids.*' => ['integer', 'exists:students,id'],
                'school_year' => ['nullable', 'string', 'max:50'],
                'roles' => ['nullable', 'array'],
                'classes' => ['nullable', 'array'],
            ]);

+            $validator->after(function ($validator): void {
+                $data = $validator->getData();
+                $users = array_values(array_filter((array) ($data['user_ids'] ?? []), static fn ($v) => (int) $v > 0));
+                $students = array_values(array_filter((array) ($data['student_ids'] ?? []), static fn ($v) => (int) $v > 0));
+                if ($users === [] && $students === []) {
+                    $validator->errors()->add('user_ids', 'Provide at least one user id or student id.');
+                }
+            });
+
            if ($validator->fails()) {
                return response()->json([
                    'message' => 'Validation failed.',
@@ -87,8 +120,11 @@ class BadgeController extends Controller
            $data = $validator->validated();

            $inserted = $this->badgePrintLogService->log(
-                userIds: $data['user_ids'] ?? [],
-                actorId: optional($request->user())->id,
+                userIds: array_values(array_unique(array_merge(
+                    $data['user_ids'] ?? [],
+                    $data['student_ids'] ?? []
+                ))),
+                actorId: $guard,
                schoolYear: $data['school_year'] ?? null,
                rolesMap: $data['roles'] ?? [],
                classesMap: $data['classes'] ?? []
@@ -112,24 +148,75 @@ class BadgeController extends Controller
            'ok' => true,
            'data' => $this->badgeFormDataService->build(
                schoolYear: $request->input('school_year'),
-                selectedUserIds: $this->parseUserIds($request),
+                selectedUserIds: $this->parseStaffUserIds($request),
                activeRole: $request->input('active_role')
            ),
        ]);
    }

-    private function parseUserIds(Request $request): array
+    /**
+     * Staff user IDs for the badge picker (`users.id`).
+     *
+     * @return int[]
+     */
+    private function parseStaffUserIds(Request $request): array
    {
-        $userIds = $request->input('user_ids', $request->query('user_ids', []));
+        $ids = $request->input('user_ids', $request->query('user_ids', []));

-        if (is_string($userIds)) {
-            $userIds = array_filter(array_map('trim', explode(',', $userIds)), 'strlen');
-        } elseif (!is_array($userIds)) {
-            $userIds = $userIds ? [$userIds] : [];
+        if (is_string($ids)) {
+            $ids = array_filter(array_map('trim', explode(',', $ids)), 'strlen');
+        } elseif (!is_array($ids)) {
+            $ids = $ids ? [$ids] : [];
        }

-        $userIds = array_values(array_unique(array_map(static fn ($v) => (int) $v, $userIds)));
+        $ids = array_values(array_unique(array_map(static fn ($v) => (int) $v, $ids)));

-        return array_values(array_filter($userIds, static fn ($v) => $v > 0));
+        return array_values(array_filter($ids, static fn ($v) => $v > 0));
+    }
+
+    /**
+     * Combined `users.id` and `students.id` for print-status (same numeric space as stored in logs).
+     *
+     * @return int[]
+     */
+    private function parseCombinedBadgeIds(Request $request): array
+    {
+        return array_values(array_unique(array_merge(
+            $this->parseStaffUserIds($request),
+            $this->parseStudentIds($request)
+        )));
+    }
+
+    /**
+     * Student primary keys (`students.id`) from query or body.
+     *
+     * @return int[]
+     */
+    private function parseStudentIds(Request $request): array
+    {
+        $ids = $request->input('student_ids', $request->query('student_ids', []));
+
+        if (is_string($ids)) {
+            $ids = array_filter(array_map('trim', explode(',', $ids)), 'strlen');
+        } elseif (!is_array($ids)) {
+            $ids = $ids ? [$ids] : [];
+        }
+
+        $ids = array_values(array_unique(array_map(static fn ($v) => (int) $v, $ids)));
+
+        return array_values(array_filter($ids, static fn ($v) => $v > 0));
+    }
+
+    /**
+     * @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;
    }
 }