feat(api): recover specific asset lookup

Closes eveseat/seat#650
eveseat · Aug 24, 2020 · cd4ab85 · cd4ab85
1 parent ac3bd05
commit cd4ab85
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/src/Http/Controllers/Api/v2/CharacterController.php b/src/Http/Controllers/Api/v2/CharacterController.php
@@ -73,6 +73,14 @@ class CharacterController extends ApiController
      *          ),
      *          in="path"
      *      ),
+     *      @OA\Parameter(
+     *          name="item_id",
+     *          description="Specific Item ID",
+     *          @OA\Schema(
+     *              type="integer"
+     *          ),
+     *          in="query"
+     *      ),
      *      @OA\Response(response=200, description="Successful operation",
      *          @OA\JsonContent(
      *              type="object",
@@ -102,10 +110,13 @@ class CharacterController extends ApiController
      */
     public function getAssets(int $character_id)
     {
+        $query = CharacterAsset::with('type')
+            ->where('character_id', $character_id);
 
-        return Resource::collection(CharacterAsset::with('type')
-            ->where('character_id', $character_id)
-            ->paginate());
+        if (request()->exists('item_id'))
+            $query->where('item_id', request()->query('item_id'));
+
+        return Resource::collection($query->paginate());
     }
 
     /**

diff --git a/src/Http/Controllers/Api/v2/CorporationController.php b/src/Http/Controllers/Api/v2/CorporationController.php
@@ -64,6 +64,14 @@ class CorporationController extends ApiController
      *          ),
      *          in="path"
      *      ),
+     *      @OA\Parameter(
+     *          name="item_id",
+     *          description="Specific Item ID",
+     *          @OA\Schema(
+     *              type="integer"
+     *          ),
+     *          in="query"
+     *      ),
      *      @OA\Response(response=200, description="Successful operation",
      *          @OA\JsonContent(
      *              type="object",
@@ -92,10 +100,13 @@ class CorporationController extends ApiController
      */
     public function getAssets(int $corporation_id)
     {
+        $query = CorporationAsset::with('type')
+            ->where('corporation_id', $corporation_id);
 
-        return Resource::collection(CorporationAsset::with('type')
-            ->where('corporation_id', $corporation_id)
-            ->paginate());
+        if (request()->exists('item_id'))
+            $query->where('item_id', request()->query('item_id'));
+
+        return Resource::collection($query->paginate());
     }
 
     /**

diff --git a/src/Http/routes.php b/src/Http/routes.php
@@ -104,7 +104,7 @@
 
             Route::group(['prefix' => 'character'], function () {
 
-                Route::get('/assets/{character_id}/{item_id?}')->uses('CharacterController@getAssets');
+                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');