[TM-1461] fix distinct responses

wri · Nov 19, 2024 · ae9a1d5 · ae9a1d5
1 parent f70e777
commit ae9a1d5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/app/Http/Controllers/V2/Entities/EntityTypeController.php b/app/Http/Controllers/V2/Entities/EntityTypeController.php
@@ -113,7 +113,7 @@ private function getSitePolygonsWithFiltersAndSorts($sitePolygonsQuery, Request
             }
         }
 
-        return $sitePolygonsQuery;
+        return $sitePolygonsQuery->get();
     }
 
 }
diff --git a/openapi-src/V2/paths/Entity/get-v2-entity-polygon.yml b/openapi-src/V2/paths/Entity/get-v2-entity-polygon.yml
@@ -26,9 +26,14 @@ responses:
   '200':
     description: Successful response
     schema:
-      type: object
-      properties:
-        count:
-          type: number
+      $ref: '../../definitions/_index.yml#/EntityPolygonResponse'
+  '400':
+    description: Bad request, UUID parameter is missing
   '500':
     description: Internal server error
+    schema:
+      type: object
+      properties:
+        error:
+          type: string
+          description: Error message
diff --git a/openapi-src/V2/paths/Entity/get-v2-type-entity.yml b/openapi-src/V2/paths/Entity/get-v2-type-entity.yml
@@ -26,7 +26,7 @@ responses:
   '200':
     description: Successful response
     schema:
-      $ref: '../../definitions/_index.yml#/EntityPolygonResponse'
+      $ref: '../../definitions/_index.yml#/EntityTypeResponse'
   '400':
     description: Bad request, UUID parameter is missing
   '500':

diff --git a/openapi-src/V2/paths/_index.yml b/openapi-src/V2/paths/_index.yml
@@ -2752,7 +2752,7 @@
     $ref: './Entity/get-v2-entity-count.yml'
 /v2/entity/polygons:
   get:
-    $ref: './Entity/get-v2-type-entity.yml'
+    $ref: './Entity/get-v2-entity-polygon.yml'
 /v2/{ENTITY}/{UUID}/status:
   put:
     $ref: './Entity/put-v2-entity-uuid-status.yml'

diff --git a/resources/docs/swagger-v2.yml b/resources/docs/swagger-v2.yml
@@ -98166,6 +98166,11 @@ paths:
                       type: boolean
                     version_name:
                       type: string
+              bbox:
+                type: array
+                items:
+                  type: number
+                description: Bounding box of the entity
         '400':
           description: 'Bad request, UUID parameter is missing'
         '500':
@@ -98236,7 +98241,7 @@ paths:
         - in: query
           name: sort
           required: false
-          description: 'Sort criteria in the format `sort[field]=direction`, e.g. `sort[poly_name]=asc or sort[status]=desc`'
+          description: 'Sort criteria in the format `sort[poly_name]=asc or sort[status]=desc`'
           type: string
       responses:
         '200':
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            return $sitePolygonsQuery;
+            return $sitePolygonsQuery->get();
         }
     }