use pg-boss instead of graphile-worker, list orgs for user

Author: cslarson

db.sql

@@ -9,7 +9,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE TABLE IF NOT EXISTS users (
   id SERIAL PRIMARY KEY,
-  github_id INTEGER NOT NULL UNIQUE,
+  github_id INTEGER UNIQUE,
   username VARCHAR NOT NULL UNIQUE,
   email VARCHAR,
   created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),

package.json

@@ -26,7 +26,6 @@
     "ethers": "^4.0.37",
     "express-session": "^1.16.2",
     "fs-extra": "^8.1.0",
-    "graphile-worker": "0.1.0-alpha.0",
     "ipfs-http-client": "^36.0.0",
     "isomorphic-unfetch": "^3.0.0",
     "jsonwebtoken": "^8.5.1",

pages/api/cred/[encodedTarget].js

@@ -1,7 +1,7 @@
 const hash = require('hash.js')
 const { readFile, readdir } = require('fs-extra')
 const base64url = require("base64url")
-// const { boss, COLLECT_CRED_QUEUE } = require('../../../server/queue')
+const { COLLECT_CRED_QUEUE } = require('../../../utils/constants')
 
 export default async(req, res) => {
   const encodedTarget = req.query['encodedTarget']
@@ -15,9 +15,7 @@ export default async(req, res) => {
     resData = {data: await collateCred(encodedTarget)}
   } catch(e){
     console.log(e)
-    // ensure no existing task
-    let job = await req.runner.addJob('collectCred', {target, githubToken})
-    // let job = await boss.publishOnce(COLLECT_CRED_QUEUE, {target, githubToken}, null, target)
+    let job = await req.boss.publishOnce(COLLECT_CRED_QUEUE, {target, githubToken}, null, target)
     resData = {job, data: null}
   }
 

pages/index.js

@@ -1,17 +1,23 @@
 import Header from '../components/Header'
 import { auth } from '../utils/auth'
+import { getUserInstallationsByUserId } from '../utils/installation'
 
 const Index = (props) =>
   <div>
     <Header user={props.user} />
     <p>{props.user ? `Welcome, ${props.user.username}` : `please login`}</p>
     <p>This is the home page</p>
+    {props.installations.length && <React.Fragment>
+      <p>Your organizations:</p>
+      <ul>{props.installations.map(i=><li key={i.id}>{i.name}</li>)}</ul>
+    </React.Fragment>}
   </div>
 
 Index.getInitialProps = async function(ctx) {
   const { query } = ctx
   const user = await auth(ctx)
-  return { user }
+  const installations = user ? await getUserInstallationsByUserId(user.id) : []
+  return { user, installations }
 }
 
 export default Index

server/index.js

@@ -3,10 +3,10 @@ const session = require('express-session')
 const next = require('next')
 const { postgraphile } = require('postgraphile')
 const PgManyToManyPlugin = require("@graphile-contrib/pg-many-to-many");
-const { run } = require('graphile-worker')
-const { GH_OAUTH_URL } = require('../utils/constants')
-// const { startBoss } = require('./queue')
-// const collectCred = require('../processors/collectCred')
+const { COLLECT_CRED_QUEUE, GH_OAUTH_URL } = require('../utils/constants')
+const PgBoss = require('pg-boss')
+const boss = new PgBoss(process.env.DATABASE_URL)
+const collectCred = require('../tasks/collectCred')
 
 const dev = process.env.NODE_ENV !== 'production'
 const app = next({ dev })
@@ -16,16 +16,15 @@ main()
 
 async function main(){
   // await startBoss()
-  const runner = await run({
-    connectionString: process.env.DATABASE_URL,
-    taskDirectory: `${__dirname}/../tasks`,
-  })
+
+  await boss.start()
+  await boss.subscribe(COLLECT_CRED_QUEUE, collectCred)
 
   await app.prepare()
   const server = express()
 
   server.use('/api', (req,res,next)=>{
-    req.runner = runner
+    req.boss = boss
     next()
   })
 

server/queue.js

@@ -2,10 +2,7 @@ const { mkdirp } = require('fs-extra')
 const { promisify } = require('util')
 const exec = promisify(require('child_process').exec);
 
-module.exports = async function(data){
-  const target = data.target
-  const githubToken = data.githubToken
-
+module.exports = async function({data: {target, githubToken}}){
   const dir = `${process.env.SOURCECRED_OUTPUT}`
   await mkdirp(dir)
 

tasks/collectCred.js

@@ -2,5 +2,6 @@
   "GH_OAUTH_URL": "https://github.com/login/oauth/authorize",
   "GH_ACCESS_TOKEN_URL": "https://github.com/login/oauth/access_token",
   "GH_USER_URL": "https://api.github.com/user",
-  "GH_INSTALLATION_REPOS_URL": "https://api.github.com/installation/repositories"
+  "GH_INSTALLATION_REPOS_URL": "https://api.github.com/installation/repositories",
+  "COLLECT_CRED_QUEUE": "collect-cred"
 }

utils/constants.json

@@ -29,6 +29,26 @@ export async function getInstallation({user, githubId}){
   return installation
 }
 
+export async function getUserInstallationsByUserId(userId){
+  let query = `
+  query {
+    userById(id: ${userId}) {
+      id
+      installationsByInstallationUserUserIdAndInstallationId {
+        nodes {
+          id
+          name
+          target
+        }
+      }
+    }
+  }
+  `
+
+  let resData = await gqlQuery(query)
+  return resData.data.userById.installationsByInstallationUserUserIdAndInstallationId.nodes
+}
+
 async function createInstallationUser({userId, installationId}){
 
   let query = `