Allow api to accept bbox for paginatedList

Author: kamicut

src/components/tables/teams.js

@@ -10,20 +10,24 @@ import qs from 'qs'
 
 const APP_URL = process.env.APP_URL
 
-function TeamsTable({ type, orgId }) {
+function TeamsTable({ type, orgId, bbox }) {
   const [page, setPage] = useState(1)
   const [search, setSearch] = useState(null)
   const [sort, setSort] = useState({
     key: 'name',
     direction: 'asc',
   })
 
-  const querystring = qs.stringify({
-    search,
-    page,
-    sort: sort.key,
-    order: sort.direction,
-  })
+  const querystring = qs.stringify(
+    {
+      search,
+      page,
+      sort: sort.key,
+      order: sort.direction,
+      bbox: bbox,
+    },
+    { arrayFormat: 'comma' }
+  )
 
   let apiBasePath
   let emptyMessage

src/models/team.js

@@ -349,24 +349,35 @@ async function paginatedList(options = {}) {
  *
  * @param options
  * @param {Array[float]} options.bbox - filter for teams whose location is in bbox (xmin, ymin, xmax, ymax)
+ * @param {int} options.organizationId - filter by whether team belongs to organization
  * @return {[Array]} Array of teams
  **/
-async function list({ bbox }) {
+async function list({ bbox, organizationId, includePrivate }) {
   // TODO: this method should be merged to the paginatedList() method when possible
   // for consistency, as they both return a list of teams.
 
   const st = knexPostgis(db)
 
-  let query = db('team')
-    .select(...teamAttributes, st.asGeoJSON('location'))
-    .where('privacy', 'public')
+  let query = db('team').select(...teamAttributes, st.asGeoJSON('location'))
 
   if (bbox) {
     query = query.where(
       st.boundingBoxContained('location', st.makeEnvelope(...bbox))
     )
   }
 
+  if (!includePrivate) {
+    query.where('privacy', 'public')
+  }
+
+  if (organizationId) {
+    query = query.whereIn('id', function () {
+      this.select('team_id')
+        .from('organization_team')
+        .where('organization_id', organizationId)
+    })
+  }
+
   return query
 }
 

src/pages/api/organizations/[orgId]/teams.js

@@ -2,6 +2,7 @@ import { createBaseHandler } from '../../../../middlewares/base-handler'
 import { validate } from '../../../../middlewares/validation'
 import Organization from '../../../../models/organization'
 import Team from '../../../../models/team'
+import Boom from '@hapi/boom'
 import * as Yup from 'yup'
 import canCreateOrgTeam from '../../../../middlewares/can/create-org-team'
 import canViewOrgTeams from '../../../../middlewares/can/view-org-teams'
@@ -103,15 +104,25 @@ handler.get(
     }).required(),
   }),
   async function (req, res) {
-    const { orgId, page, perPage, search, sort, order } = req.query
+    const { orgId, page, perPage, search, sort, order, bbox } = req.query
     const {
       org: { isMember, isOwner, isManager },
     } = req
+
+    let bounds = bbox || null
+    if (bbox) {
+      bounds = bbox.split(',').map((num) => parseFloat(num))
+      if (bounds.length !== 4) {
+        throw Boom.badRequest('error in bbox param')
+      }
+    }
+
     return res.send(
       await Team.paginatedList({
         organizationId: orgId,
         page,
         perPage,
+        bbox: bounds,
         search,
         sort,
         order,