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

fix gitlab tests

Browse Source
This commit is contained in:
root
2026-06-09 02:32:58 -04:00
parent 20a0b6c4e5
commit 6def9993da
1489 changed files with 10449 additions and 11356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/Settings/ConfigurationAdminController.php
+3 -3
View File
@@ -39,7 +39,7 @@ class ConfigurationAdminController extends BaseApiController
public function update(ConfigurationUpdateRequest $request, int $id): JsonResponse
{
$config = $this->service->update($id, $request->validated());
if (! $config) {
if (!$config) {
return response()->json(['ok' => false, 'message' => 'Configuration not found.'], 404);
}
@@ -52,7 +52,7 @@ class ConfigurationAdminController extends BaseApiController
public function destroy(int $id): JsonResponse
{
$deleted = $this->service->delete($id);
if (! $deleted) {
if (!$deleted) {
return response()->json(['ok' => false, 'message' => 'Configuration not found.'], 404);
}
@@ -62,7 +62,7 @@ class ConfigurationAdminController extends BaseApiController
public function getByKey(string $configKey): JsonResponse
{
$config = $this->service->getByKey($configKey);
if (! $config) {
if (!$config) {
return response()->json(['ok' => false, 'message' => 'Configuration not found.'], 404);
}
app/Http/Controllers/Api/Settings/EventController.php
+4 -2
View File
@@ -50,7 +50,7 @@ class EventController extends BaseApiController
public function show(int $eventId): JsonResponse
{
$event = $this->listService->find($eventId);
if (! $event) {
if (!$event) {
return response()->json(['ok' => false, 'message' => 'Event not found.'], 404);
}
@@ -73,7 +73,6 @@ class EventController extends BaseApiController
$result = $this->managementService->create($payload, $request->file('flyer'), $guard);
} catch (\Throwable $e) {
Log::error('Event creation failed.', ['error' => $e->getMessage()]);
return response()->json(['ok' => false, 'message' => 'Failed to create event.'], 500);
}
@@ -177,6 +176,9 @@ class EventController extends BaseApiController
]);
}
/**
* @return int|JsonResponse
*/
private function authenticatedUserIdOrUnauthorized(): int|JsonResponse
{
$userId = (int) (auth()->id() ?? 0);
app/Http/Controllers/Api/Settings/PreferencesController.php
+9 -9
View File
@@ -58,7 +58,7 @@ class PreferencesController extends BaseApiController
public function showForUser(int $userId): JsonResponse
{
$row = Preferences::query()->where('user_id', $userId)->first();
if (! $row) {
if (!$row) {
return $this->error('Preferences not found.', Response::HTTP_NOT_FOUND);
}
@@ -82,8 +82,7 @@ class PreferencesController extends BaseApiController
try {
$saved = $this->commandService->upsert($guard, $request->validated());
} catch (\Throwable $e) {
Log::error('Preferences save failed: '.$e->getMessage());
Log::error('Preferences save failed: ' . $e->getMessage());
return $this->error('Unable to save preferences.', Response::HTTP_INTERNAL_SERVER_ERROR);
}
@@ -104,8 +103,7 @@ class PreferencesController extends BaseApiController
try {
$saved = $this->commandService->upsert($userId, $request->validated());
} catch (\Throwable $e) {
Log::error('Preferences update failed: '.$e->getMessage());
Log::error('Preferences update failed: ' . $e->getMessage());
return $this->error('Unable to save preferences.', Response::HTTP_INTERNAL_SERVER_ERROR);
}
@@ -119,7 +117,7 @@ class PreferencesController extends BaseApiController
public function destroy(int $userId): JsonResponse
{
$row = Preferences::query()->where('user_id', $userId)->first();
if (! $row) {
if (!$row) {
return $this->error('Preferences not found.', Response::HTTP_NOT_FOUND);
}
@@ -128,18 +126,20 @@ class PreferencesController extends BaseApiController
try {
$deleted = $this->commandService->delete($row);
} catch (\Throwable $e) {
Log::error('Preferences delete failed: '.$e->getMessage());
Log::error('Preferences delete failed: ' . $e->getMessage());
return $this->error('Unable to delete preferences.', Response::HTTP_INTERNAL_SERVER_ERROR);
}
if (! $deleted) {
if (!$deleted) {
return $this->error('Unable to delete preferences.', Response::HTTP_INTERNAL_SERVER_ERROR);
}
return $this->success(null, 'Preferences deleted.');
}
/**
* @return int|JsonResponse
*/
private function authenticatedUserIdOrUnauthorized(): int|JsonResponse
{
$userId = (int) (auth()->id() ?? 0);
app/Http/Controllers/Api/Settings/SchoolCalendarController.php
+12 -12
View File
@@ -99,7 +99,7 @@ class SchoolCalendarController extends BaseApiController
public function show(int $eventId): JsonResponse
{
$event = $this->queryService->findEvent($eventId);
if (! $event) {
if (!$event) {
return $this->error('Event not found.', Response::HTTP_NOT_FOUND);
}
@@ -116,8 +116,7 @@ class SchoolCalendarController extends BaseApiController
try {
$result = $this->mutationService->create($payload, $targets);
} catch (\Throwable $e) {
Log::error('SchoolCalendar store failed: '.$e->getMessage());
Log::error('SchoolCalendar store failed: ' . $e->getMessage());
return $this->error('Failed to save event.', Response::HTTP_INTERNAL_SERVER_ERROR);
}
@@ -130,7 +129,7 @@ class SchoolCalendarController extends BaseApiController
public function update(SchoolCalendarUpdateRequest $request, int $eventId): JsonResponse
{
$event = $this->queryService->findEvent($eventId);
if (! $event) {
if (!$event) {
return $this->error('Event not found.', Response::HTTP_NOT_FOUND);
}
@@ -140,8 +139,7 @@ class SchoolCalendarController extends BaseApiController
try {
$result = $this->mutationService->update($event, $payload, $targets);
} catch (\Throwable $e) {
Log::error('SchoolCalendar update failed: '.$e->getMessage());
Log::error('SchoolCalendar update failed: ' . $e->getMessage());
return $this->error('Failed to update event.', Response::HTTP_INTERNAL_SERVER_ERROR);
}
@@ -154,15 +152,14 @@ class SchoolCalendarController extends BaseApiController
public function destroy(int $eventId): JsonResponse
{
$event = $this->queryService->findEvent($eventId);
if (! $event) {
if (!$event) {
return $this->error('Event not found.', Response::HTTP_NOT_FOUND);
}
try {
$this->mutationService->delete($event);
} catch (\Throwable $e) {
Log::error('SchoolCalendar delete failed: '.$e->getMessage());
Log::error('SchoolCalendar delete failed: ' . $e->getMessage());
return $this->error('Failed to delete event.', Response::HTTP_INTERNAL_SERVER_ERROR);
}
@@ -172,12 +169,15 @@ class SchoolCalendarController extends BaseApiController
private function extractEmailTargets(array $payload): array
{
return [
'parents' => ! empty($payload['send_email_parent']),
'teachers' => ! empty($payload['send_email_teacher']),
'admins' => ! empty($payload['send_email_admin']),
'parents' => !empty($payload['send_email_parent']),
'teachers' => !empty($payload['send_email_teacher']),
'admins' => !empty($payload['send_email_admin']),
];
}
/**
* @return int|JsonResponse
*/
private function authenticatedUserIdOrUnauthorized(): int|JsonResponse
{
$userId = (int) (auth()->id() ?? 0);
app/Http/Controllers/Api/Settings/SettingsController.php
+4 -2
View File
@@ -40,8 +40,7 @@ class SettingsController extends BaseApiController
try {
$updated = $this->settingsService->update($request->validated(), $guard);
} catch (\Throwable $e) {
Log::error('Settings update failed: '.$e->getMessage());
Log::error('Settings update failed: ' . $e->getMessage());
return $this->error('Unable to update settings.', Response::HTTP_INTERNAL_SERVER_ERROR);
}
@@ -50,6 +49,9 @@ class SettingsController extends BaseApiController
], 'Settings updated.');
}
/**
* @return int|JsonResponse
*/
private function authenticatedUserIdOrUnauthorized(): int|JsonResponse
{
$userId = (int) (auth()->id() ?? 0);