fix: run endpoint and submissions model

Author: jatinkatyal13

package.json

@@ -46,7 +46,7 @@
     "start": "scripts/wait-for-it.sh ${AMQP_HOST}:${AMQP_PORT} -- node dist/run.js",
     "test": "node_modules/.bin/mocha --timeout 12000 --exit --require ts-node/register test/utils/setup*.ts test/*.ts",
     "cover": "nyc npm test",
-    "seedlangs": "node dist/db/scripts/seed-defaultlangs.js",
+    "seedlangs": "node dist/scripts/seed-defaultlangs.js",
     "precodecov": "npm run cover",
     "codecov": "codecov"
   },

src/db/models.ts

@@ -0,0 +1,40 @@
+import Sequelize from "sequelize";
+
+export type ApiKeyAttrs  = {
+  id: number,
+  key: string,
+  whitelist_domains: string[] | undefined
+  whitelist_ips: string[] | undefined
+}
+
+export type ApiKeyInstance = Sequelize.Instance<ApiKeyAttrs> & ApiKeyAttrs
+
+export const define = (
+  db: Sequelize.Sequelize
+): Sequelize.Model<ApiKeyInstance, ApiKeyAttrs> => {
+  return db.define('apikeys', {
+    id: {
+      type: Sequelize.INTEGER,
+      autoIncrement: true,
+      primaryKey: true
+    },
+    key: {
+      type: Sequelize.STRING(32),
+      unique: true,
+      allowNull: false
+    },
+    whitelist_domains: {
+      type: Sequelize.ARRAY(Sequelize.STRING)
+    },
+    whitelist_ips: {
+      type: Sequelize.ARRAY(Sequelize.STRING)
+    }
+  })
+}
+
+export const associate = ({ langs, submissions }) => {
+  submissions.belongsTo(langs, {
+    foreignKey: 'lang',
+    otherKey: 'lang_slug'
+  })
+};

src/models/ApiKeys.ts

@@ -0,0 +1,26 @@
+import Sequelize from "sequelize";
+
+export type LangsAttributes = { 
+  lang_slug: string, 
+  lang_name:string, 
+  lang_version: string 
+}
+
+export type LangInstance = Sequelize.Instance<LangsAttributes> & LangsAttributes
+
+export const define = (
+  db: Sequelize.Sequelize
+): Sequelize.Model<LangInstance, LangsAttributes> => {
+  return db.define('langs', {
+    lang_slug: {
+      type: Sequelize.STRING(10),
+      primaryKey: true
+    },
+    lang_name: Sequelize.STRING(10),
+    lang_version: Sequelize.STRING(5)
+  }, {
+    timestamps: false
+  })
+}
+
+export const associate = () => {};

src/models/Lang.ts

@@ -0,0 +1,55 @@
+import Sequelize from "sequelize";
+
+export type Testcase = {
+  id: number,
+  score: number,
+  time: string,
+  result: string
+}
+
+export type SubmissionAttributes = {
+  id?: number
+  lang: string
+  start_time: Date
+  end_time?: Date
+  mode: string
+  results?: Array<Testcase>
+  outputs?: Array<string>
+  callback?: string
+}
+
+export type SubmissionInstance = Sequelize.Instance<SubmissionAttributes> & SubmissionAttributes
+
+export const define = (
+  db: Sequelize.Sequelize
+): Sequelize.Model<SubmissionInstance, SubmissionAttributes> => {
+  return db.define('submissions', {
+    id: {
+      type: Sequelize.INTEGER,
+      autoIncrement: true,
+      primaryKey: true
+    },
+    lang: {
+      type: Sequelize.STRING(10)
+    },
+    start_time: Sequelize.DATE,
+    end_time: Sequelize.DATE,
+    mode: {
+      type: Sequelize.STRING,
+      allowNull: false
+    },
+    results: Sequelize.JSON,
+    outputs: Sequelize.ARRAY(Sequelize.STRING),
+    callback: Sequelize.STRING
+  }, {
+    paranoid: true, // We do not want to lose any submission data
+    timestamps: false // Start and end times are already logged
+  })
+}
+
+export const associate = ({ langs, submissions }) => {
+  submissions.belongsTo(langs, {
+    foreignKey: 'lang',
+    otherKey: 'lang_slug'
+  })
+};

src/models/Submission.ts

@@ -0,0 +1,42 @@
+import * as Sequelize from 'sequelize'
+import * as path from 'path'
+import * as fs from 'fs'
+import config = require('../../config')
+import dbg = require('debug')
+
+const basename  = path.basename(module.filename);
+const db: any = {}
+const dbModel = {}
+const debug = dbg('judge:models')
+
+const sequelize = new Sequelize(config.DB.DATABASE, config.DB.USERNAME, config.DB.PASSWORD, {
+  dialect: 'postgres',
+  host: config.DB.HOST,
+  logging: debug,
+  pool: {
+    max: 10,
+    idle: 10000
+  }
+})
+
+fs
+  .readdirSync(__dirname)
+  .filter(function(file) {
+    return (file.indexOf('.') !== 0) && (file !== basename) && (['.ts'].includes(file.slice(-3)));
+  })
+  .forEach(function(file) {
+    var model = require(path.join(__dirname, file)).define(sequelize);
+    dbModel[model.name] = require(path.join(__dirname, file))
+    db[model.name] = model;
+  });
+
+Object.keys(dbModel).forEach(function(modelName) {
+  if(dbModel[modelName].associate){
+    dbModel[modelName].associate(db)
+  }
+});
+
+db.sequelize = sequelize;
+db.Sequelize = Sequelize;
+
+export default db

src/models/index.ts

@@ -44,7 +44,11 @@ amqp.connect(`amqp://${config.AMQP.USER}:${config.AMQP.PASS}@${config.AMQP.HOST}
       jobChannel = channel
       jobChannel.consume(successQ, (msg) => {
         debug(`SUCCESS:CONSUME: msg.content = ${msg.content.toString()}`)
-        successListener.emit('success', JSON.parse(msg.content.toString()))
+
+        const payload = JSON.parse(msg.content.toString())
+        const eventName = payload.testcases ? 'submit_result' : 'run_result'
+        
+        successListener.emit(eventName, payload)
         jobChannel.ack(msg)
       })
     })

src/rabbitmq/jobqueue.ts

@@ -1,5 +1,5 @@
 import {NextFunction, Request, Response, Router} from 'express'
-import {route as run} from './run'
+import run from './run'
 import {route as submissions} from './submissions'
 import {route as langs} from './langs'
 import {checkValidApiKey} from '../../validators/ApiKeyValidators'

src/routes/api/index.ts

@@ -1,5 +1,5 @@
 import {Router} from 'express'
-import {Langs} from '../../db/models'
+import DB from 'models'
 
 const route: Router = Router()