From b9e7927935f3dfdd3b4926b8afd02c8683bc3657 Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Fri, 21 Jul 2023 14:53:44 +0200 Subject: [PATCH] updating api calls according to the front --- app/Http/Controllers/API/AppController.php | 4 +- app/Http/Controllers/API/SyncController.php | 12 +++-- app/Http/Resources/ApiResponseResource.php | 2 + app/Http/Resources/AppUserCollection.php | 19 -------- app/Http/Resources/AppUserResource.php | 33 ++++++++++++++ app/Http/Resources/ContactResource.php | 41 +++++++++++++++++ app/Http/Resources/ContactsCollection.php | 19 -------- app/Http/Resources/DirectoriesCollection.php | 19 -------- app/Http/Resources/DirectoryResource.php | 30 +++++++++++++ app/Http/Resources/DocumentResource.php | 47 ++++++++++++++++++++ app/Http/Resources/DocumentsCollection.php | 19 -------- app/Models/Document.php | 4 +- 12 files changed, 166 insertions(+), 83 deletions(-) delete mode 100644 app/Http/Resources/AppUserCollection.php create mode 100644 app/Http/Resources/AppUserResource.php create mode 100644 app/Http/Resources/ContactResource.php delete mode 100644 app/Http/Resources/ContactsCollection.php delete mode 100644 app/Http/Resources/DirectoriesCollection.php create mode 100644 app/Http/Resources/DirectoryResource.php create mode 100644 app/Http/Resources/DocumentResource.php delete mode 100644 app/Http/Resources/DocumentsCollection.php diff --git a/app/Http/Controllers/API/AppController.php b/app/Http/Controllers/API/AppController.php index 6ca236a..0eac5e1 100644 --- a/app/Http/Controllers/API/AppController.php +++ b/app/Http/Controllers/API/AppController.php @@ -19,7 +19,9 @@ class AppController extends Controller $settings = Setting::where('key', 'Button1')->orWhere('key', 'Button2')->orWhere('key', 'Button3')->get(); foreach ($settings as $setting) { - $response['folders'][$setting->key] = Directory::find($setting->value)->only('id', 'name'); + $directory = Directory::find($setting->value)->only('id', 'name'); + $directory['name'] = json_encode($directory['name']); + $response['folders'][$setting->key] = $directory; } return new ApiResponseResource("OK", $response); diff --git a/app/Http/Controllers/API/SyncController.php b/app/Http/Controllers/API/SyncController.php index 33b8271..686b051 100644 --- a/app/Http/Controllers/API/SyncController.php +++ b/app/Http/Controllers/API/SyncController.php @@ -3,6 +3,10 @@ namespace App\Http\Controllers\API; use App\Http\Controllers\Controller; +use App\Http\Resources\AppUserResource; +use App\Http\Resources\ContactResource; +use App\Http\Resources\DirectoryResource; +use App\Http\Resources\DocumentResource; use App\Mail\SendFlyer; use App\Mail\SendFlyerFailed; use App\Models\AppUser; @@ -26,7 +30,7 @@ class SyncController extends Controller */ public function getUsers(Request $request) { - return new \App\Http\Resources\AppUserCollection(AppUser::where('status', 1)->get()); + return AppUserResource::collection(AppUser::where('status', 1)->get()); } /** @@ -37,7 +41,7 @@ class SyncController extends Controller { $userId = $request->userId; $this->syncContacts($request->contacts, $userId); - return new \App\Http\Resources\ContactsCollection(Contact::where('app_user_id', $userId)->get()); + return ContactResource::collection(Contact::where('app_user_id', $userId)->get()); } /** @@ -46,7 +50,7 @@ class SyncController extends Controller */ public function getDirectories(Request $request) { - return new \App\Http\Resources\DirectoriesCollection(Directory::all()); + return DirectoryResource::collection(Directory::all()); } /** @@ -55,7 +59,7 @@ class SyncController extends Controller */ public function getDocuments(Request $request) { - return new \App\Http\Resources\DocumentsCollection(Document::where('status', 1)->get()); + return DocumentResource::collection(Document::where('status', 1)->get()); } /** diff --git a/app/Http/Resources/ApiResponseResource.php b/app/Http/Resources/ApiResponseResource.php index d132077..5e031a8 100644 --- a/app/Http/Resources/ApiResponseResource.php +++ b/app/Http/Resources/ApiResponseResource.php @@ -35,6 +35,8 @@ class ApiResponseResource extends JsonResource * * @param \Illuminate\Http\Request $request * @return array + * @phpcs:disable Squiz.Commenting.FunctionComment.TypeHintMissing + * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass */ public function toArray($request) { diff --git a/app/Http/Resources/AppUserCollection.php b/app/Http/Resources/AppUserCollection.php deleted file mode 100644 index fa5b396..0000000 --- a/app/Http/Resources/AppUserCollection.php +++ /dev/null @@ -1,19 +0,0 @@ - $this->id, + 'email' => $this->email, + 'surname' => $this->lastname, + 'firstname' => $this->firstname, + 'password' => $this->password, + 'activated' => $this->status, + 'role' => ($this->role === 1) ? "TOTAL" : "USER", + 'authorizedFolders' => $this->authorizedFolders, + 'created_at' => $this->created_at, + 'updated_at' => $this->updated_at, + ]; + } +} diff --git a/app/Http/Resources/ContactResource.php b/app/Http/Resources/ContactResource.php new file mode 100644 index 0000000..a0e0445 --- /dev/null +++ b/app/Http/Resources/ContactResource.php @@ -0,0 +1,41 @@ + $this->id, + 'email' => $this->email, + 'type' => $this->type, + 'other' => $this->other, + 'select1' => $this->select1, + 'select2' => $this->select2, + 'name' => $this->lastname, + 'firstname' => $this->firstname, + 'company' => $this->company, + 'address' => $this->address, + 'phone' => $this->phone, + 'products' => $this->products, + 'card_url' => $this->card_url, + 'notes' => $this->notes, + 'visits' => $this->visits, + 'user_id' => $this->app_user_id, + 'created_at' => $this->created_at, + 'updated_at' => $this->updated_at, + ]; + } +} diff --git a/app/Http/Resources/ContactsCollection.php b/app/Http/Resources/ContactsCollection.php deleted file mode 100644 index d5102ad..0000000 --- a/app/Http/Resources/ContactsCollection.php +++ /dev/null @@ -1,19 +0,0 @@ - $this->id, + 'name' => json_encode($this->name), + 'parent' => $this->directory_id, + 'order' => $this->order, + 'needAuthorization' => $this->needAuthorization, + 'created_at' => $this->created_at, + 'updated_at' => $this->updated_at, + ]; + } +} diff --git a/app/Http/Resources/DocumentResource.php b/app/Http/Resources/DocumentResource.php new file mode 100644 index 0000000..a4c085a --- /dev/null +++ b/app/Http/Resources/DocumentResource.php @@ -0,0 +1,47 @@ +lang) { + case 1: + $tmpLang = "fr"; + break; + case 2: + $tmpLang = "en"; + break; + case 3: + $tmpLang = "de"; + break; + case 4: + $tmpLang = "nl"; + break; + } + return [ + 'id' => $this->id, + 'uuid' => $this->uuid, + 'title' => $this->title, + 'type' => $this->type, + 'directory' => $this->directory_id, + 'path' => $this->path, + 'lang' => $tmpLang, + 'published' => ($this->status) ? 1 : 0, + 'parent' => $this->document_id, + 'created_at' => $this->created_at, + 'updated_at' => $this->updated_at, + ]; + } +} diff --git a/app/Http/Resources/DocumentsCollection.php b/app/Http/Resources/DocumentsCollection.php deleted file mode 100644 index 6647935..0000000 --- a/app/Http/Resources/DocumentsCollection.php +++ /dev/null @@ -1,19 +0,0 @@ -