From 9aa421bb03f464543d6512fb77df5b8faf765af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20LEUILLIOT?= Date: Sat, 12 Dec 2020 17:46:05 +0100 Subject: [PATCH] refactor: remove bookmarks feature since there are no longer ways to collect bookmarks and esi seems frozen for now, remove bookmark feature and its dependencies. Closes eveseat/seat#695 --- .../Api/v2/CharacterController.php | 42 ------------- .../Api/v2/CorporationController.php | 44 ------------- src/Http/Resources/BookmarkResource.php | 61 ------------------- src/Http/routes.php | 2 - 4 files changed, 149 deletions(-) delete mode 100644 src/Http/Resources/BookmarkResource.php diff --git a/src/Http/Controllers/Api/v2/CharacterController.php b/src/Http/Controllers/Api/v2/CharacterController.php index 5980a42..e54bc20 100644 --- a/src/Http/Controllers/Api/v2/CharacterController.php +++ b/src/Http/Controllers/Api/v2/CharacterController.php @@ -23,7 +23,6 @@ namespace Seat\Api\Http\Controllers\Api\v2; use Illuminate\Http\Resources\Json\Resource; -use Seat\Api\Http\Resources\BookmarkResource; use Seat\Api\Http\Resources\CharacterSheetResource; use Seat\Api\Http\Resources\ContactResource; use Seat\Api\Http\Resources\ContractResource; @@ -33,7 +32,6 @@ use Seat\Api\Http\Resources\MailResource; use Seat\Api\Http\Resources\NotificationResource; use Seat\Eveapi\Models\Assets\CharacterAsset; -use Seat\Eveapi\Models\Bookmarks\CharacterBookmark; use Seat\Eveapi\Models\Character\CharacterCorporationHistory; use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Eveapi\Models\Character\CharacterNotification; @@ -123,46 +121,6 @@ public function getAssets(int $character_id) return Resource::collection($query->paginate()); } - /** - * @OA\Get( - * path="/v2/character/bookmarks/{character_id}", - * tags={"Bookmarks"}, - * summary="Get a paginated list of bookmarks for a character", - * description="Returns a list of bookmarks", - * security={ - * {"ApiKeyAuth": {}} - * }, - * @OA\Parameter( - * name="character_id", - * description="Character id", - * required=true, - * @OA\Schema( - * type="integer" - * ), - * in="path" - * ), - * @OA\Response(response=200, description="Successful operation", - * @OA\JsonContent( - * type="object", - * @OA\Property( - * type="array", - * property="data", - * @OA\Items(ref="#/components/schemas/CharacterBookmark") - * ) - * ) - * ), - * @OA\Response(response=400, description="Bad request"), - * @OA\Response(response=401, description="Unauthorized"), - * ) - * - * @param int $chacter_id - */ - public function getBookmarks(int $character_id) - { - - return BookmarkResource::collection(CharacterBookmark::where('character_id', $character_id)->get()); - } - /** * @OA\Get( * path="/v2/character/contacts/{character_id}", diff --git a/src/Http/Controllers/Api/v2/CorporationController.php b/src/Http/Controllers/Api/v2/CorporationController.php index dc4e152..4b9f6bf 100644 --- a/src/Http/Controllers/Api/v2/CorporationController.php +++ b/src/Http/Controllers/Api/v2/CorporationController.php @@ -23,14 +23,12 @@ namespace Seat\Api\Http\Controllers\Api\v2; use Illuminate\Http\Resources\Json\Resource; -use Seat\Api\Http\Resources\BookmarkResource; use Seat\Api\Http\Resources\ContactResource; use Seat\Api\Http\Resources\ContractResource; use Seat\Api\Http\Resources\CorporationSheetResource; use Seat\Api\Http\Resources\IndustryResource; use Seat\Api\Http\Resources\MemberTrackingResource; use Seat\Eveapi\Models\Assets\CorporationAsset; -use Seat\Eveapi\Models\Bookmarks\CorporationBookmark; use Seat\Eveapi\Models\Contacts\CorporationContact; use Seat\Eveapi\Models\Contracts\CorporationContract; use Seat\Eveapi\Models\Corporation\CorporationInfo; @@ -113,48 +111,6 @@ public function getAssets(int $corporation_id) return Resource::collection($query->paginate()); } - /** - * @OA\Get( - * path="/v2/corporation/bookmarks/{corporation_id}", - * tags={"Bookmarks"}, - * summary="Get a list of bookmarks for a corporation", - * description="Returns a list of bookmarks", - * security={ - * {"ApiKeyAuth": {}} - * }, - * @OA\Parameter( - * name="corporation_id", - * description="Corporation id", - * required=true, - * @OA\Schema( - * type="integer" - * ), - * in="path" - * ), - * @OA\Response(response=200, description="Successful operation", - * @OA\JsonContent( - * type="object", - * @OA\Property( - * type="array", - * property="data", - * @OA\Items(ref="#/components/schemas/CorporationBookmark") - * ) - * ) - * ), - * @OA\Response(response=400, description="Bad request"), - * @OA\Response(response=401, description="Unauthorized"), - * ) - * - * @param int $corporation_id - * - * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection - */ - public function getBookmarks(int $corporation_id) - { - - return BookmarkResource::collection(CorporationBookmark::where('corporation_id', $corporation_id)->get()); - } - /** * @OA\Get( * path="/v2/corporation/contacts/{corporation_id}", diff --git a/src/Http/Resources/BookmarkResource.php b/src/Http/Resources/BookmarkResource.php deleted file mode 100644 index 3471f51..0000000 --- a/src/Http/Resources/BookmarkResource.php +++ /dev/null @@ -1,61 +0,0 @@ - $this->bookmark_id, - 'folder_id' => $this->folder_id, - 'folder_name' => $this->folder->name, - 'system' => $this->solar_system, - 'created' => $this->created, - 'label' => $this->label, - 'notes' => $this->notes, - 'location_id' => $this->location_id, - 'creator_id' => $this->creator_id, - 'item_id' => $this->item_id, - 'type_id' => $this->type_id, - 'x' => $this->x, - 'y' => $this->y, - 'z' => $this->z, - 'map_id' => $this->map_id, - ]; - } -} diff --git a/src/Http/routes.php b/src/Http/routes.php index 70ab0b2..d306fff 100644 --- a/src/Http/routes.php +++ b/src/Http/routes.php @@ -105,7 +105,6 @@ Route::group(['prefix' => 'character'], function () { Route::get('/assets/{character_id}')->uses('CharacterController@getAssets'); - Route::get('/bookmarks/{character_id}')->uses('CharacterController@getBookmarks'); Route::get('/contacts/{character_id}')->uses('CharacterController@getContacts'); Route::get('/industry/{character_id}')->uses('CharacterController@getIndustry'); Route::get('/killmails/{character_id}/{killmail_id?}')->uses('KillmailsController@getCharacterKillmails'); @@ -125,7 +124,6 @@ Route::group(['prefix' => 'corporation'], function () { Route::get('/assets/{corporation_id}')->uses('CorporationController@getAssets'); - Route::get('/bookmarks/{corporation_id}')->uses('CorporationController@getBookmarks'); Route::get('/contacts/{corporation_id}')->uses('CorporationController@getContacts'); Route::get('/contracts/{corporation_id}')->uses('CorporationController@getContracts'); Route::get('/industry/{corporation_id}')->uses('CorporationController@getIndustry');