fix: validators

- export class in validators rather than singleton object
- remove multiple string validation

Author: jatinkatyal13

src/routes/api/run/index.ts

@@ -4,8 +4,9 @@ import Validator from './validators'
 import { successListener } from 'rabbitmq/jobqueue'
 
 const router: Router = Router()
+const validator = new Validator()
 
-router.post('/', Validator.POST, Controller.runPOST)
+router.post('/', validator.POST, Controller.runPOST)
 successListener.on('run_result', Controller.onSuccess)
 
 export default router

src/routes/api/run/validators.ts

@@ -2,7 +2,7 @@ import { Handler } from 'express'
 import BaseValidator from 'validators/baseValidator'
 import * as Joi from '@hapi/joi'
 
-class RunValidator extends BaseValidator {
+export default class RunValidator extends BaseValidator {
   POST: Handler
 
   constructor() {
@@ -28,11 +28,9 @@ class RunValidator extends BaseValidator {
     callback: Joi
       .string()
       .uri()
-      .when('mode', { is: 'callback', then: Joi.string().required() }),
+      .when('mode', { is: 'callback', then: Joi.required() }),
     enc: Joi
       .string()
       .valid('base64', 'url')
   })
 }
-
-export default new RunValidator()

src/routes/api/submit/index.ts

@@ -4,8 +4,9 @@ import Validator from './validators'
 import { successListener } from 'rabbitmq/jobqueue'
 
 const router: Router = Router()
+const validator = new Validator()
 
-router.post('/', Validator.POST, Controller.submitPOST)
+router.post('/', validator.POST, Controller.submitPOST)
 successListener.on('submit_result', Controller.onSuccess)
 
 export default router

src/routes/api/submit/validators.ts

@@ -2,7 +2,7 @@ import { Handler } from 'express'
 import BaseValidator from 'validators/baseValidator'
 import * as Joi from '@hapi/joi'
 
-class RunValidator extends BaseValidator {
+export default class RunValidator extends BaseValidator {
   POST: Handler
 
   constructor() {
@@ -25,7 +25,7 @@ class RunValidator extends BaseValidator {
     callback: Joi
       .string()
       .uri()
-      .when('mode', { is: 'callback', then: Joi.string().required() }),
+      .when('mode', { is: 'callback', then: Joi.required() }),
     testcases: Joi
       .array()
       .min(1)
@@ -39,5 +39,3 @@ class RunValidator extends BaseValidator {
       .required()
   })
 }
-
-export default new RunValidator()