diff --git a/app/Casts/AsInput.php b/app/Casts/AsInput.php index ed31c2c..cd68b4d 100644 --- a/app/Casts/AsInput.php +++ b/app/Casts/AsInput.php @@ -26,7 +26,7 @@ class AsInput implements CastsAttributes // phpcs:enable /** @var array $inputData */ $inputData = \json_decode($value, true); - $inputClass = InputTypeEnum::make($inputData['type'])->inputTypes(); + $inputClass = InputTypeEnum::make($inputData['type'])->getInputClass(); return $inputClass::from(InputData::make(...\array_values($inputData)), $inputData['required'] ?? false); } diff --git a/app/Enums/Formularies/InputTypeEnum.php b/app/Enums/Formularies/InputTypeEnum.php index ad24abb..0cae89c 100644 --- a/app/Enums/Formularies/InputTypeEnum.php +++ b/app/Enums/Formularies/InputTypeEnum.php @@ -39,11 +39,11 @@ enum InputTypeEnum: int ]; /** - * Get translation key. + * Get InputType class based on the enum value. * * @return string */ - public function inputTypes(): string + public function getInputClass(): string { return match ($this) { self::text => InputText::class, diff --git a/app/Http/Controllers/API/AppController.php b/app/Http/Controllers/API/AppController.php index f393f50..345e353 100644 --- a/app/Http/Controllers/API/AppController.php +++ b/app/Http/Controllers/API/AppController.php @@ -22,7 +22,7 @@ class AppController extends Controller $response = []; $settings = Setting::query() ->where('tenant_id', $tenantKey) - ->where('key', 'Button1') + ->orWhere('key', 'Button1') ->orWhere('key', 'Button2') ->orWhere('key', 'Button3') ->get(); diff --git a/app/Http/Controllers/API/SyncController.php b/app/Http/Controllers/API/SyncController.php index 23fe203..13a5626 100644 --- a/app/Http/Controllers/API/SyncController.php +++ b/app/Http/Controllers/API/SyncController.php @@ -32,14 +32,13 @@ use Illuminate\Support\Facades\URL; class SyncController extends Controller { /** - * @return \App\Http\Resources\ApiResponseResource + * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ - public function getUsers(): \App\Http\Resources\ApiResponseResource + public function getUsers(): \Illuminate\Http\Resources\Json\AnonymousResourceCollection { - $users = AppUserResource::collection( + return AppUserResource::collection( AppUser::query()->where('tenant_id', \tenant()->getKey())->where('status', 1)->get() - )->toArray(request()); - return new ApiResponseResource("OK", $users); + ); } // *** --- START CONTACTS --- diff --git a/app/Http/Requests/Api/Contacts/UpsertContactsRequest.php b/app/Http/Requests/Api/Contacts/UpsertContactsRequest.php index a5ffcfb..9a830ce 100644 --- a/app/Http/Requests/Api/Contacts/UpsertContactsRequest.php +++ b/app/Http/Requests/Api/Contacts/UpsertContactsRequest.php @@ -6,6 +6,7 @@ use App\Enums\Formularies\InputTypeEnum; use App\Lib\Inputs\Definition\InputData; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\ValidationException; +use Illuminate\Validation\Rules\Enum; class UpsertContactsRequest extends FormRequest { @@ -68,10 +69,7 @@ class UpsertContactsRequest extends FormRequest 'contacts.*.data.*' => 'array', 'contacts.*.data.*.title' => 'present|string|min:1|max:255', 'contacts.*.data.*.formSlug' => 'present|string|min:1|max:255', - 'contacts.*.data.*.type' => 'present|in:' . implode( - ',', - array_column(InputTypeEnum::cases(), 'name') - ), + 'contacts.*.data.*.type' => ['present', new Enum(InputTypeEnum::class)], 'contacts.*.data.*.value' => 'present', 'contacts.*.data.*.required' => 'present|boolean', 'contacts.*.data.*.send_to_app_user_id' => 'nullable|numeric', @@ -108,10 +106,15 @@ class UpsertContactsRequest extends FormRequest 'error' => "wrong formSlug on data index '{$index}'" ]); } - $type = InputTypeEnum::make($data->get('type') ? $data->get('type') : null, 'name'); + $type = InputTypeEnum::make($data->get('type') ? $data->get('type') : null); + if (\is_null($type)) { + throw ValidationException::withMessages([ + 'error' => "wrong inputType on data index '{$index}'" + ]); + } $value = $data['value'] ?? null; $required = $data->get('required') ? true : false; - $inputClass = $type->inputTypes(); + $inputClass = $type->getInputClass(); return $inputClass::from(InputData::make( $title, $formSlug, diff --git a/app/Http/Resources/DocumentResource.php b/app/Http/Resources/DocumentResource.php index a7ef613..65f8843 100644 --- a/app/Http/Resources/DocumentResource.php +++ b/app/Http/Resources/DocumentResource.php @@ -28,7 +28,7 @@ class DocumentResource extends JsonResource 'type' => $document->type, 'directory' => $document->directory_id, 'path' => $document->path, - 'lang' => $document->lang->value, + 'lang' => $document->lang->name, 'published' => ($document->status) ? 1 : 0, 'parent' => $document->document_id, 'created_at' => $document->created_at,