From 3130fbeff0060700929832190e6a458c290722c5 Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Tue, 21 Jun 2022 03:41:44 +0500
Subject: [PATCH] chore: code refactor for getting session controller

---
 api/src/controllers/internal/Execution.ts     | 22 ++------------
 .../internal/FileUploadController.ts          | 30 +++++++------------
 api/src/controllers/internal/Session.ts       | 21 +++++++++++--
 3 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/api/src/controllers/internal/Execution.ts b/api/src/controllers/internal/Execution.ts
index 60d3508..7f3541d 100644
--- a/api/src/controllers/internal/Execution.ts
+++ b/api/src/controllers/internal/Execution.ts
@@ -1,12 +1,6 @@
 import path from 'path'
 import fs from 'fs'
-import {
-  SASSessionController,
-  JSSessionController,
-  getSASSessionController,
-  getJSSessionController,
-  processProgram
-} from './'
+import { getSessionController, processProgram } from './'
 import { readFile, fileExists, createFile, readFileBinary } from '@sasjs/utils'
 import { PreProgramVars, Session, TreeNode } from '../../types'
 import {
@@ -78,19 +72,7 @@ export class ExecutionController {
     session: sessionByFileUpload,
     runTime
   }: ExecuteProgramParams): Promise<ExecuteReturnRaw | ExecuteReturnJson> {
-    let sessionController: SASSessionController | JSSessionController
-
-    switch (runTime) {
-      case RunTimeType.SAS:
-        sessionController = getSASSessionController()
-        break
-      case RunTimeType.JS:
-        sessionController = getJSSessionController()
-        break
-
-      default:
-        throw new Error('No Runtime is configured1')
-    }
+    const sessionController = getSessionController(runTime)
 
     const session =
       sessionByFileUpload ?? (await sessionController.getSession())
diff --git a/api/src/controllers/internal/FileUploadController.ts b/api/src/controllers/internal/FileUploadController.ts
index 92af4e9..a06f512 100644
--- a/api/src/controllers/internal/FileUploadController.ts
+++ b/api/src/controllers/internal/FileUploadController.ts
@@ -1,12 +1,7 @@
 import { Request, RequestHandler } from 'express'
 import multer from 'multer'
 import { uuidv4 } from '@sasjs/utils'
-import {
-  SASSessionController,
-  JSSessionController,
-  getSASSessionController,
-  getJSSessionController
-} from '.'
+import { getSessionController } from '.'
 import {
   executeProgramRawValidation,
   getRunTimeAndFilePath,
@@ -42,25 +37,22 @@ export class FileUploadController {
     try {
       ;({ runTime } = await getRunTimeAndFilePath(programPath))
     } catch (err: any) {
-      res.status(400).send({
+      return res.status(400).send({
         status: 'failure',
         message: 'Job execution failed',
         error: typeof err === 'object' ? err.toString() : err
       })
     }
 
-    let sessionController: SASSessionController | JSSessionController
-
-    switch (runTime) {
-      case RunTimeType.SAS:
-        sessionController = getSASSessionController()
-        break
-      case RunTimeType.JS:
-        sessionController = getJSSessionController()
-        break
-
-      default:
-        return res.status(400).send('No Runtime is configured1')
+    let sessionController
+    try {
+      sessionController = getSessionController(runTime)
+    } catch (err: any) {
+      return res.status(400).send({
+        status: 'failure',
+        message: err.message,
+        error: typeof err === 'object' ? err.toString() : err
+      })
     }
 
     const session = await sessionController.getSession()
diff --git a/api/src/controllers/internal/Session.ts b/api/src/controllers/internal/Session.ts
index 4080f16..3b57f16 100644
--- a/api/src/controllers/internal/Session.ts
+++ b/api/src/controllers/internal/Session.ts
@@ -5,7 +5,8 @@ import { execFile } from 'child_process'
 import {
   getSessionsFolder,
   generateUniqueFileName,
-  sysInitCompiledPath
+  sysInitCompiledPath,
+  RunTimeType
 } from '../../utils'
 import {
   deleteFolder,
@@ -193,7 +194,21 @@ export class JSSessionController extends SessionController {
   }
 }
 
-export const getSASSessionController = (): SASSessionController => {
+export const getSessionController = (
+  runTime: RunTimeType
+): SASSessionController | JSSessionController => {
+  if (runTime === RunTimeType.SAS) {
+    return getSASSessionController()
+  }
+
+  if (runTime === RunTimeType.JS) {
+    return getJSSessionController()
+  }
+
+  throw new Error('No Runtime is configured')
+}
+
+const getSASSessionController = (): SASSessionController => {
   if (process.sasSessionController) return process.sasSessionController
 
   process.sasSessionController = new SASSessionController()
@@ -201,7 +216,7 @@ export const getSASSessionController = (): SASSessionController => {
   return process.sasSessionController
 }
 
-export const getJSSessionController = (): JSSessionController => {
+const getJSSessionController = (): JSSessionController => {
   if (process.jsSessionController) return process.jsSessionController
 
   process.jsSessionController = new JSSessionController()