feat(routes): separate routes into web and api

src/routes/api/files.ts

@@ -0,0 +1,35 @@
+import express from 'express'
+import { createFileTree, getTreeExample } from '../../controllers'
+import { isFileTree } from '../../types'
+
+const filesRouter = express.Router()
+
+filesRouter.post('/deploy', async (req, res) => {
+  if (!isFileTree(req.body.fileTree)) {
+    res.status(400).send({
+      status: 'failure',
+      message: 'Provided not supported data format.',
+      example: getTreeExample()
+    })
+
+    return
+  }
+
+  await createFileTree(
+    req.body.fileTree.members,
+    req.body.appLoc ? req.body.appLoc.replace(/^\//, '').split('/') : []
+  )
+    .then(() => {
+      res.status(200).send({
+        status: 'success',
+        message: 'Files deployed successfully to @sasjs/server.'
+      })
+    })
+    .catch((err) => {
+      res
+        .status(500)
+        .send({ status: 'failure', message: 'Deployment failed!', ...err })
+    })
+})
+
+export default filesRouter

src/routes/api/index.ts

@@ -0,0 +1,10 @@
+import express from 'express'
+import filesRouter from './files'
+import stpRouter from './stp'
+
+const router = express.Router()
+
+router.use('/files', filesRouter)
+router.use('/stp', stpRouter)
+
+export default router

src/routes/api/spec/routes.spec.ts

@@ -0,0 +1,114 @@
+import request from 'supertest'
+import app from '../../../app'
+import { getTreeExample } from '../../../controllers/deploy'
+import { getTmpFilesFolderPath } from '../../../utils/file'
+import { folderExists, fileExists, readFile, deleteFolder } from '@sasjs/utils'
+import path from 'path'
+
+describe('files', () => {
+  describe('deploy', () => {
+    const shouldFailAssertion = async (payload: any) => {
+      const res = await request(app)
+        .post('/SASjsApi/files/deploy')
+        .send(payload)
+
+      expect(res.statusCode).toEqual(400)
+      expect(res.body).toEqual({
+        status: 'failure',
+        message: 'Provided not supported data format.',
+        example: getTreeExample()
+      })
+    }
+
+    it('should respond with payload example if valid payload was not provided', async () => {
+      await shouldFailAssertion(null)
+      await shouldFailAssertion(undefined)
+      await shouldFailAssertion('data')
+      await shouldFailAssertion({})
+      await shouldFailAssertion({
+        userId: 1,
+        title: 'test is cool'
+      })
+      await shouldFailAssertion({
+        membersWRONG: []
+      })
+      await shouldFailAssertion({
+        members: {}
+      })
+      await shouldFailAssertion({
+        members: [
+          {
+            nameWRONG: 'jobs',
+            type: 'folder',
+            members: []
+          }
+        ]
+      })
+      await shouldFailAssertion({
+        members: [
+          {
+            name: 'jobs',
+            type: 'WRONG',
+            members: []
+          }
+        ]
+      })
+      await shouldFailAssertion({
+        members: [
+          {
+            name: 'jobs',
+            type: 'folder',
+            members: [
+              {
+                name: 'extract',
+                type: 'folder',
+                members: [
+                  {
+                    name: 'makedata1',
+                    type: 'service',
+                    codeWRONG: '%put Hello World!;'
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      })
+    })
+
+    it('should respond with payload example if valid payload was not provided', async () => {
+      const res = await request(app)
+        .post('/SASjsApi/files/deploy')
+        .send({ fileTree: getTreeExample() })
+
+      expect(res.statusCode).toEqual(200)
+      expect(res.text).toEqual(
+        '{"status":"success","message":"Files deployed successfully to @sasjs/server."}'
+      )
+      await expect(folderExists(getTmpFilesFolderPath())).resolves.toEqual(true)
+
+      const testJobFolder = path.join(
+        getTmpFilesFolderPath(),
+        'jobs',
+        'extract'
+      )
+      await expect(folderExists(testJobFolder)).resolves.toEqual(true)
+
+      const testJobFile =
+        path.join(
+          testJobFolder,
+          getTreeExample().members[0].members[0].members[0].name
+        ) + '.sas'
+
+      console.log(`[testJobFile]`, testJobFile)
+
+      await expect(fileExists(testJobFile)).resolves.toEqual(true)
+
+      await expect(readFile(testJobFile)).resolves.toEqual(
+        getTreeExample().members[0].members[0].members[0].code
+      )
+
+      await deleteFolder(getTmpFilesFolderPath())
+    })
+  })
+})

src/routes/api/stp.ts

@@ -0,0 +1,59 @@
+import express from 'express'
+import { ExecutionResult, isRequestQuery, isFileTree } from '../../types'
+import path from 'path'
+import { getTmpFilesFolderPath, makeFilesNamesMap } from '../../utils'
+import { ExecutionController, FileUploadController } from '../../controllers'
+
+const stpRouter = express.Router()
+
+const fileUploadController = new FileUploadController()
+
+stpRouter.post(
+  '/execute',
+  fileUploadController.preuploadMiddleware,
+  fileUploadController.getMulterUploadObject().any(),
+  async (req: any, res: any) => {
+    if (isRequestQuery(req.body)) {
+      let sasCodePath =
+        path
+          .join(getTmpFilesFolderPath(), req.body._program)
+          .replace(new RegExp('/', 'g'), path.sep) + '.sas'
+
+      let filesNamesMap = null
+
+      if (req.files && req.files.length > 0) {
+        filesNamesMap = makeFilesNamesMap(req.files)
+      }
+
+      await new ExecutionController()
+        .execute(
+          sasCodePath,
+          undefined,
+          req.sasSession,
+          { ...req.query, ...req.body },
+          { filesNamesMap: filesNamesMap },
+          true
+        )
+        .then((result: {}) => {
+          res.status(200).send({
+            status: 'success',
+            ...result
+          })
+        })
+        .catch((err: {} | string) => {
+          res.status(400).send({
+            status: 'failure',
+            message: 'Job execution failed.',
+            ...(typeof err === 'object' ? err : { details: err })
+          })
+        })
+    } else {
+      res.status(400).send({
+        status: 'failure',
+        message: `Please provide the location of SAS code`
+      })
+    }
+  }
+)
+
+export default stpRouter