Add org teams

* add method / test to create teams as part of orgs
* add option to team.list to filter by organization

Author: kamicut

app/db/migrations/20200326113917_organization.js

@@ -19,9 +19,17 @@ exports.up = async (knex) => {
     table.integer('osm_id')
     table.unique(['organization_id', 'osm_id'])
   })
+
+  await knex.schema.createTable('organization_team', table => {
+    table.increments('id')
+    table.integer('team_id').references('id').inTable('team').onDelete('CASCADE')
+    table.integer('organization_id').references('id').inTable('organization').onDelete('CASCADE')
+    table.unique(['organization_id', 'team_id'])
+  })
 }
 
 exports.down = async (knex) => {
+  await knex.schema.dropTable('organization_team')
   await knex.schema.dropTable('organization_manager')
   await knex.schema.dropTable('organization_owner')
   await knex.schema.dropTable('organization')

app/lib/organization.js

@@ -1,4 +1,5 @@
 const db = require('../db')
+const team = require('./team')
 const { map, prop, contains } = require('ramda')
 const { unpack } = require('./utils')
 
@@ -147,6 +148,26 @@ async function removeManager (id, osmId) {
   return unpack(conn('organization_manager').where({ organization_id: id, osm_id: osmId }).del())
 }
 
+/**
+ * Create organization team
+ *
+ * An organization team is a team that is assigned to the organization
+ * at creation time. Only organization managers can create teams
+ *
+ * @param {int} organizationId - organization id
+ * @param {object} data - params for team (see team.create function)
+ * @param {int} osmId - id of the organization manager
+ * @return {promise}
+ */
+async function createOrgTeam (organizationId, data, osmId) {
+  const conn = await db()
+
+  return conn.transaction(async trx => {
+    const record = await team.create(data, osmId, trx)
+    await trx('organization_team').insert({ team_id: record.id, organization_id: organizationId })
+  })
+}
+
 /**
  * Checks if the osm user is an owner of a team
  * @param {int} organizationId - organization id
@@ -187,5 +208,6 @@ module.exports = {
   getOwners,
   getManagers,
   isOwner,
-  isManager
+  isManager,
+  createOrgTeam
 }

app/lib/team.js

@@ -80,12 +80,13 @@ async function getModerators (id) {
 *
 * @param options
 * @param {int} options.osmId - filter by whether osmId is a member
+* @param {int} options.organizationId - filter by whether team belongs to organization
 * @param {Array[float]} options.bbox - filter for teams whose location is in bbox (xmin, ymin, xmax, ymax)
 * @return {Promise[Array]}
 **/
 async function list (options) {
   options = options || {}
-  const { osmId, bbox } = options
+  const { osmId, bbox, organizationId } = options
 
   const conn = await db()
   const st = knexPostgis(conn)
@@ -98,6 +99,12 @@ async function list (options) {
     })
   }
 
+  if (organizationId) {
+    query = query.whereIn('id', function () {
+      this.select('team_id').from('organization_team').where('organization_id', organizationId)
+    })
+  }
+
   if (bbox) {
     query = query.where(st.boundingBoxContained('location', st.makeEnvelope(...bbox)))
   }
@@ -129,12 +136,14 @@ async function listModeratedBy (osmId) {
 * @param {string} data.name - name of the team
 * @param {geojson} data.location - lat/lon of team
 * @param {int} osmId - id of first moderator
+* @param {object} conn - optional parameter for database connection to re-use connection in case of nested
+*   transactions. This is used when a team is created as part of an organization
 * @return {promise}
 **/
-async function create (data, osmId) {
+async function create (data, osmId, conn) {
   if (!osmId) throw new Error('moderator osm id is required as second argument')
   if (!data.name) throw new Error('data.name property is required')
-  const conn = await db()
+  conn = conn || await db()
   const st = knexPostgis(conn)
 
   // convert location to postgis geom

app/tests/api/organization-model.test.js

@@ -3,6 +3,7 @@ const test = require('ava')
 const { prop, map, contains } = require('ramda')
 const db = require('../../db')
 const organization = require('../../lib/organization')
+const team = require('../../lib/team')
 
 const migrationsDirectory = path.join(__dirname, '..', '..', 'db', 'migrations')
 
@@ -91,8 +92,8 @@ test('update an organization', async t => {
   const newName = 'update test - new name'
   const user = 1
   const created = await organization.create({ name }, user)
-  const updated = await organization.update(created.id, { name: newName },)
-  
+  const updated = await organization.update(created.id, { name: newName })
+
   // tests
   t.is(updated.name, newName)
 
@@ -102,7 +103,8 @@ test('update an organization', async t => {
 })
 
 /**
- * Test add an owner
+ * Test adding an owner
+ * - After adding an owner the number of owners increases by 1
  */
 test('add owners', async t => {
   // setup
@@ -112,7 +114,6 @@ test('add owners', async t => {
   const created = await organization.create({ name }, user)
   await organization.addOwner(created.id, user2)
 
-
   // tests
   const owners = map(prop('osm_id'), await organization.getOwners(created.id))
   t.is(owners.length, 2)
@@ -123,6 +124,12 @@ test('add owners', async t => {
   await t.throwsAsync(organization.addOwner(created.id, user2))
 })
 
+/**
+ * Test removing owners
+ * - After adding and removing an owner the number of owners should remain the same
+ * - Removing a user that is not an owner throws an error
+ * - Trying to remove the last owner throws an error
+ */
 test('remove owners', async t => {
   // setup
   const name = 'remove owners'
@@ -171,6 +178,11 @@ test('add managers', async t => {
   await t.throwsAsync(organization.addManager(created.id, user2))
 })
 
+/**
+ * Test removing managers
+ * - After adding and removing a manager the number of owners should remain the same
+ * - Removing a user that is not a manager throws an error
+ */
 test('remove managers', async t => {
   // setup
   const name = 'remove managers'
@@ -191,3 +203,20 @@ test('remove managers', async t => {
   const error = await t.throwsAsync(organization.removeManager(created.id, user3))
   t.is(error.message, 'osmId is not a manager')
 })
+
+/**
+ * Test creating a team as part of an organization
+ */
+test('create an organization team', async t => {
+  // setup
+  const orgName = 'organization team'
+  const teamName = 'org team 1'
+  const user = 1
+  const org = await organization.create({ name: orgName }, user)
+  await organization.createOrgTeam(org.id, { name: teamName }, user)
+
+  // tests
+  const teams = await team.list({ organizationId: org.id })
+  t.is(teams.length, 1)
+  t.is(teams[0].name, teamName)
+})