From e6e5a5fd640957d2633f6d174b834395ad79e2f2 Mon Sep 17 00:00:00 2001 From: Saad Jutt Date: Tue, 21 Dec 2021 14:24:27 +0500 Subject: [PATCH] chore(code): updated route to code/execute --- api/src/controllers/{run.ts => code.ts} | 22 +++++++++++----------- api/src/controllers/index.ts | 2 +- api/src/routes/api/{run.ts => code.ts} | 6 +++--- api/src/routes/api/index.ts | 4 ++-- api/tsoa.json | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) rename api/src/controllers/{run.ts => code.ts} (74%) rename api/src/routes/api/{run.ts => code.ts} (74%) diff --git a/api/src/controllers/run.ts b/api/src/controllers/code.ts similarity index 74% rename from api/src/controllers/run.ts rename to api/src/controllers/code.ts index 7adb695..6aa8c17 100644 --- a/api/src/controllers/run.ts +++ b/api/src/controllers/code.ts @@ -3,7 +3,7 @@ import { Request, Security, Route, Tags, Post, Body } from 'tsoa' import { ExecutionController } from './internal' import { PreProgramVars } from '../types' -interface RunSASPayload { +interface ExecuteSASCodePayload { /** * Code of SAS program * @example "* SAS Code HERE;" @@ -12,23 +12,23 @@ interface RunSASPayload { } @Security('bearerAuth') -@Route('SASjsApi/run') -@Tags('RUN') -export class RUNController { +@Route('SASjsApi/code') +@Tags('CODE') +export class CodeController { /** - * Trigger a SAS program. - * @summary Run SAS Program, return raw content + * Execute SAS code. + * @summary Run SAS Code and returns log */ - @Post('/code') - public async runSAS( + @Post('/execute') + public async executeSASCode( @Request() request: express.Request, - @Body() body: RunSASPayload + @Body() body: ExecuteSASCodePayload ): Promise { - return runSAS(request, body) + return executeSASCode(request, body) } } -const runSAS = async (req: any, { code }: RunSASPayload) => { +const executeSASCode = async (req: any, { code }: ExecuteSASCodePayload) => { try { const result = await new ExecutionController().executeProgram( code, diff --git a/api/src/controllers/index.ts b/api/src/controllers/index.ts index 4522358..d2efa88 100644 --- a/api/src/controllers/index.ts +++ b/api/src/controllers/index.ts @@ -1,8 +1,8 @@ export * from './auth' export * from './client' +export * from './code' export * from './drive' export * from './group' -export * from './run' export * from './session' export * from './stp' export * from './user' diff --git a/api/src/routes/api/run.ts b/api/src/routes/api/code.ts similarity index 74% rename from api/src/routes/api/run.ts rename to api/src/routes/api/code.ts index e45ad64..ef4af95 100644 --- a/api/src/routes/api/run.ts +++ b/api/src/routes/api/code.ts @@ -1,17 +1,17 @@ import express from 'express' import { runSASValidation } from '../../utils' -import { RUNController } from '../../controllers/' +import { CodeController } from '../../controllers/' const runRouter = express.Router() -const controller = new RUNController() +const controller = new CodeController() runRouter.post('/code', async (req, res) => { const { error, value: body } = runSASValidation(req.body) if (error) return res.status(400).send(error.details[0].message) try { - const response = await controller.runSAS(req, body) + const response = await controller.executeSASCode(req, body) res.send(response) } catch (err: any) { const statusCode = err.code diff --git a/api/src/routes/api/index.ts b/api/src/routes/api/index.ts index 650b01c..e21022d 100644 --- a/api/src/routes/api/index.ts +++ b/api/src/routes/api/index.ts @@ -11,7 +11,7 @@ import { import driveRouter from './drive' import stpRouter from './stp' -import runRouter from './run' +import codeRouter from './code' import userRouter from './user' import groupRouter from './group' import clientRouter from './client' @@ -32,7 +32,7 @@ router.use( router.use('/drive', authenticateAccessToken, driveRouter) router.use('/group', desktopRestrict, groupRouter) router.use('/stp', authenticateAccessToken, stpRouter) -router.use('/run', authenticateAccessToken, runRouter) +router.use('/code', authenticateAccessToken, codeRouter) router.use('/user', desktopRestrict, userRouter) router.use( '/', diff --git a/api/tsoa.json b/api/tsoa.json index 842e35b..8fe396f 100644 --- a/api/tsoa.json +++ b/api/tsoa.json @@ -40,8 +40,8 @@ "description": "Operations about STP" }, { - "name": "RUN", - "description": "Execute SAS code" + "name": "CODE", + "description": "Operations on SAS code" } ], "yaml": true,