From 4dac65eb8a34625603eed3a5b66e7a7564a8fd7c Mon Sep 17 00:00:00 2001 From: Tuan Dang Date: Sun, 1 Jan 2023 10:54:23 +0700 Subject: [PATCH] Begin action route for getting an action by id --- backend/src/app.ts | 4 +--- .../src/ee/controllers/v1/actionController.ts | 20 +++++++++++++++++++ backend/src/ee/controllers/v1/index.ts | 4 +++- backend/src/ee/routes/v1/action.ts | 17 ++++++++++++++++ backend/src/ee/routes/v1/index.ts | 4 ++-- backend/src/ee/routes/v1/log.ts | 4 ---- 6 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 backend/src/ee/controllers/v1/actionController.ts create mode 100644 backend/src/ee/routes/v1/action.ts delete mode 100644 backend/src/ee/routes/v1/log.ts diff --git a/backend/src/app.ts b/backend/src/app.ts index 4e8e23fc0..8320a7d76 100644 --- a/backend/src/app.ts +++ b/backend/src/app.ts @@ -13,8 +13,7 @@ import { apiLimiter } from './helpers/rateLimiter'; import { workspace as eeWorkspaceRouter, - secret as eeSecretRouter, - log as eeLogRouter, + secret as eeSecretRouter } from './ee/routes/v1'; import { signup as v1SignupRouter, @@ -70,7 +69,6 @@ if (NODE_ENV === 'production') { // (EE) routes app.use('/api/v1/secret', eeSecretRouter); app.use('/api/v1/workspace', eeWorkspaceRouter); -app.use('/api/v1/log', eeLogRouter); // v1 routes app.use('/api/v1/signup', v1SignupRouter); diff --git a/backend/src/ee/controllers/v1/actionController.ts b/backend/src/ee/controllers/v1/actionController.ts new file mode 100644 index 000000000..20b470037 --- /dev/null +++ b/backend/src/ee/controllers/v1/actionController.ts @@ -0,0 +1,20 @@ +import { Request, Response } from 'express'; +import * as Sentry from '@sentry/node'; +import { Action } from '../../models'; + +export const getAction = (req: Request, res: Response) => { + let action; + // try { + // const { actionId } = req.params; + + // action = await Action.findById(actionId); + + + // } catch (err) { + + // } + + return res.status(200).send({ + action + }); +} \ No newline at end of file diff --git a/backend/src/ee/controllers/v1/index.ts b/backend/src/ee/controllers/v1/index.ts index 23880070d..2a082de70 100644 --- a/backend/src/ee/controllers/v1/index.ts +++ b/backend/src/ee/controllers/v1/index.ts @@ -1,9 +1,11 @@ import * as stripeController from './stripeController'; import * as secretController from './secretController'; import * as workspaceController from './workspaceController'; +import * as actionController from './actionController'; export { stripeController, secretController, - workspaceController + workspaceController, + actionController } \ No newline at end of file diff --git a/backend/src/ee/routes/v1/action.ts b/backend/src/ee/routes/v1/action.ts new file mode 100644 index 000000000..5dca83cf9 --- /dev/null +++ b/backend/src/ee/routes/v1/action.ts @@ -0,0 +1,17 @@ +import express from 'express'; +const router = express.Router(); +import { + validateRequest +} from '../../../middleware'; +import { param } from 'express-validator'; +import { actionController } from '../../controllers/v1'; + +// TODO: put into action controller +router.get( + '/:actionId', + param('actionId').exists().trim(), + validateRequest, + actionController.getAction +); + +export default router; \ No newline at end of file diff --git a/backend/src/ee/routes/v1/index.ts b/backend/src/ee/routes/v1/index.ts index 810a050a6..02fc80939 100644 --- a/backend/src/ee/routes/v1/index.ts +++ b/backend/src/ee/routes/v1/index.ts @@ -1,9 +1,9 @@ import secret from './secret'; import workspace from './workspace'; -import log from './log'; +import action from './action'; export { secret, workspace, - log + action } \ No newline at end of file diff --git a/backend/src/ee/routes/v1/log.ts b/backend/src/ee/routes/v1/log.ts deleted file mode 100644 index d90cb867c..000000000 --- a/backend/src/ee/routes/v1/log.ts +++ /dev/null @@ -1,4 +0,0 @@ -import express from 'express'; -const router = express.Router(); - -export default router; \ No newline at end of file