#23: order pledges by expiry date in /pledge list (closes #23)

config-ci.json

@@ -1,9 +1,10 @@
 {
   "db": "db-test",
-  "domain": "pledge.our.buildo.io",
+  "domain": "ci.pledge.com.fake",
   "interval": 1,
   "slack": {
-    "incomingWebhookURL": "https://hooks.slack.com/services/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"
+    "clientId": "123456789.123456789",
+    "clientSecret": "abcdef123456789"
   }
 }
 

config-prod.json

@@ -1,9 +1,10 @@
 {
   "db": "/var/lib/pledge/db",
-  "domain": "pledge.our.buildo.io",
+  "domain": "https://pledge.our.buildo.io",
   "interval": 1,
   "slack": {
-    "incomingWebhookURL": "https://hooks.slack.com/services/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"
+    "clientId": "2194261799.137771655351",
+    "clientSecret": "37ca4f24926ff3b36f39f6f2f77faaff"
   }
 }
 

config.json.example

@@ -3,7 +3,8 @@
   "domain": "my.deploy.url",
   "interval": 1,
   "slack": {
-    "incomingWebhookURL": "https://url/of/incoming/webhook"
+    "clientId": "123456789.123456789",
+    "clientSecret": "abcdef123456789"
   }
 }
 

nodemon.json

@@ -0,0 +1,3 @@
+{
+  "ignore": ["tests/*"]
+}

package.json

@@ -14,6 +14,7 @@
     "build": "npm run clean && babel src --out-dir lib && cp config.json lib || true",
     "watch": "npm run clean && cp config.json lib && babel src --out-dir lib --watch",
     "start": "DEBUG=pledge,http,express:* node lib/index.js",
+    "restart": "DEBUG=pledge,http,express:* nodemon --config nodemon.json lib/index.js",
     "test": "jest"
   },
   "repository": {
@@ -27,6 +28,7 @@
   },
   "homepage": "https://github.com/buildo/pledge#readme",
   "dependencies": {
+    "@slack/client": "^3.8.1",
     "babel-core": "^6.4.5",
     "babel-polyfill": "^6.4.5",
     "babel-runtime": "^6.9.2",
@@ -39,6 +41,7 @@
     "mockdate": "^2.0.1",
     "request": "^2.75.0",
     "request-promise": "^2.0.1",
+    "simple-oauth2": "^1.0.3",
     "sqlite": "^2.0.2",
     "supertest": "^2.0.1"
   },
@@ -54,6 +57,7 @@
     "babel-preset-stage-0": "^6.5.0",
     "eslint": "^2.4.0",
     "eslint-config-buildo": "github:buildo/eslint-config-buildo",
-    "jest": "^18.1.0"
+    "jest": "^18.1.0",
+    "nodemon": "^1.11.0"
   }
 }

src/db.js

@@ -2,14 +2,14 @@ import db from 'sqlite';
 import config from '../config.json';
 import { formatDate } from './utils';
 
-const schemaVersion = 3;
-
 const createTables = async () => {
   await db.run(`
     CREATE TABLE pledges (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
+      teamId TEXT NOT NULL,
       requester TEXT NOT NULL,
       performer TEXT NOT NULL,
+      performerId TEXT NOT NULL,
       content TEXT NOT NULL,
       deadline INTEGER NOT NULL,
       completed BOOLEAN NOT NULL DEFAULT 0,
@@ -18,95 +18,90 @@ const createTables = async () => {
     );
   `);
   await db.run(`
-    CREATE TABLE schemaVersions (
-      version INTEGER NOT NULL,
-      migrationDate INTEGER NOT NULL
+    CREATE TABLE teams (
+      teamName TEXT NOT NULL,
+      teamId TEXT NOT NULL,
+      botUserId TEXT NOT NULL,
+      botAccessToken TEXT NOT NULL,
+      createdAt INTEGER NOT NULL
     );
   `);
-  await db.run('INSERT INTO schemaVersions values (?, ?)', schemaVersion, Date.now());
 };
 
-const migrateIfNeeded = async () => {
-  const hasSchemaVersionsTable = !!(await db.get(`
-    SELECT 1 FROM sqlite_master WHERE name ='schemaVersions' and type='table';
-  `));
-  const currentVersion = hasSchemaVersionsTable ?
-    (await db.get('SELECT max(version) as v FROM schemaVersions')).v : 1;
-  console.log(`starting pledge, current DB version is ${currentVersion}`); // eslint-disable-line no-console
-  if (currentVersion < 2) {
-    // version 1 did not have a schemaVersions table, let's create it
-    await db.run(`
-      CREATE TABLE if not exists schemaVersions (
-        version INTEGER NOT NULL,
-        migrationDate INTEGER NOT NULL
-      );`
-    );
-    // add first version line with migrationDate = now
-    await db.run(`
-      INSERT INTO schemaVersions values (2, ?)
-    `, Date.now()
-    );
-    // perform migration v1 => v2
-    await db.run(`
-      ALTER TABLE pledges
-      ADD COLUMN expiredNotificationSent BOOLEAN NOT NULL DEFAULT 0`
-    );
-    console.log('migrated DB to version 2'); // eslint-disable-line no-console
-  }
+export const getTeam = (teamId) => {
+  return db.get(`
+    SELECT teamId, teamName, botUserId, botAccessToken, createdAt
+    FROM teams
+    WHERE teamId = ?
+  `, teamId
+  );
+};
 
-  if (currentVersion < 3) {
-    // add version line with migrationDate = now
-    await db.run(`
-      INSERT INTO schemaVersions values (3, ?)
-    `, Date.now()
-    );
-    // perform migration v2 => v3
-    await db.run(`
-      ALTER TABLE pledges
-      ADD COLUMN completed BOOLEAN NOT NULL DEFAULT 0`
-    );
-    console.log('migrated DB to version 3'); // eslint-disable-line no-console
-  }
+export const deleteTeam = (teamId) => {
+  return db.run(`
+    DELETE FROM teams
+    WHERE teamId = ?
+  `, teamId
+  );
+};
+
+export const insertTeam = (teamId, teamName, botUserId, botAccessToken) => {
+  return db.run(`
+    INSERT INTO teams (teamId, teamName, botUserId, botAccessToken, createdAt)
+    VALUES (?, ?, ?, ?, ?)
+  `, teamId, teamName, botUserId, botAccessToken, Date.now()
+  );
 };
 
-export const getList = async requester => {
+export const getList = async (requester, teamId) => {
   const requests = (await db.all(`
-    SELECT id, requester, performer, content, deadline
+    SELECT id, teamId, requester, performer, content, deadline
     FROM pledges
-    WHERE requester = ? AND completed = 0
-  `, requester)).map(x => ({ ...x, deadline: formatDate(new Date(x.deadline)) }));
+    WHERE requester = ? AND teamId = ? AND completed = 0
+    ORDER BY deadline ASC
+  `, requester, teamId)).map(x => ({ ...x, deadline: formatDate(new Date(x.deadline)) }));
 
   const pledges = (await db.all(`
-    SELECT id, requester, performer, content, deadline
+    SELECT id, teamId, requester, performer, content, deadline
     FROM pledges
-    WHERE performer = ? AND completed = 0
-  `, requester)).map(x => ({ ...x, deadline: formatDate(new Date(x.deadline)) }));
+    WHERE performer = ? AND teamId = ? AND completed = 0
+    ORDER BY deadline ASC
+  `, requester, teamId)).map(x => ({ ...x, deadline: formatDate(new Date(x.deadline)) }));
 
   return { requests, pledges };
 };
 
 export const getPledge = (pledgeId) => {
   return db.get(`
-    SELECT id, requester, performer, content, deadline
+    SELECT id, teamId, requester, performer, performerId, content, deadline
     FROM pledges
     WHERE id = ?
   `, pledgeId
   );
 };
 
-export const insertPledge = ({ requester, performer, content, deadline }) => {
+export const insertPledge = ({ teamId, requester, performer, performerId, content, deadline }) => {
   return db.run(`
-    INSERT INTO pledges (requester, performer, content, deadline, created_at)
-    VALUES (?, ?, ?, ?, ?)
-  `, requester, performer, content, deadline, Date.now()
+    INSERT INTO pledges (teamId, requester, performer, performerId, content, deadline, created_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?)
+  `, teamId, requester, performer, performerId, content, deadline, Date.now()
+  );
+};
+
+export const getTeamByBotAccessToken = (botAccessToken) => {
+  return db.get(`
+    SELECT teamId, teamName, botUserId, botAccessToken, createdAt
+    FROM teams
+    WHERE botAccessToken = ?
+  `, botAccessToken
   );
 };
 
 export const findAllPledgesExpiredToNotify = () => {
   return db.all(`
-    SELECT id, requester, performer, content, deadline
+    SELECT id, teamId, requester, performer, performerId, content, deadline
     FROM pledges
-    WHERE deadline < ? AND expiredNotificationSent = 0
+    WHERE deadline < ? AND expiredNotificationSent = 0 AND completed = 0
   `, Date.now()
   );
 };
@@ -146,11 +141,8 @@ export const init = async (dbFilename = config.db) => {
   const hasPledgesTable = !!(await db.get(`
     SELECT 1 FROM sqlite_master WHERE name ='pledges' and type='table';
   `));
-  if (hasPledgesTable) {
-    await migrateIfNeeded();
-  } else {
-    console.log('creating tables'); // eslint-disable-line no-console
-    createTables();
+  if (!hasPledgesTable) {
+    await createTables();
   }
 };