1 files changed, 33 insertions, 24 deletions

diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js
index f1a5ddf2b..4189fbcdd 100644
--- a/src/internal-server/app/Controllers/Http/WorkspaceController.js
+++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js
@@ -1,11 +1,16 @@
 const Workspace = use('App/Models/Workspace');
-const { validateAll } = use('Validator');
+const {
+  validateAll,
+} = use('Validator');
 
-const { v4: uuid } = require('uuid');
+const uuid = require('uuid/v4');
 
 class WorkspaceController {
   // Create a new workspace for user
-  async create({ request, response }) {
+  async create({
+    request,
+    response,
+  }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -24,10 +29,7 @@ class WorkspaceController {
     let workspaceId;
     do {
       workspaceId = uuid();
-    } while (
-      (await Workspace.query().where('workspaceId', workspaceId).fetch()).rows
-        .length > 0
-    ); // eslint-disable-line no-await-in-loop
+    } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
 
     const order = (await Workspace.all()).rows.length;
 
@@ -48,7 +50,11 @@ class WorkspaceController {
     });
   }
 
-  async edit({ request, response, params }) {
+  async edit({
+    request,
+    response,
+    params,
+  }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -63,19 +69,20 @@ class WorkspaceController {
     }
 
     const data = request.all();
-    const { id } = params;
+    const {
+      id,
+    } = params;
 
     // Update data in database
-    await Workspace.query()
-      .where('workspaceId', id)
-      .update({
-        name: data.name,
-        services: JSON.stringify(data.services),
-      });
+    await (Workspace.query()
+      .where('workspaceId', id)).update({
+      name: data.name,
+      services: JSON.stringify(data.services),
+    });
 
     // Get updated row
-    const workspace = (await Workspace.query().where('workspaceId', id).fetch())
-      .rows[0];
+    const workspace = (await Workspace.query()
+      .where('workspaceId', id).fetch()).rows[0];
 
     return response.send({
       id: workspace.workspaceId,
@@ -104,10 +111,13 @@ class WorkspaceController {
       });
     }
 
-    const { id } = params;
+    const {
+      id,
+    } = params;
 
     // Update data in database
-    await Workspace.query().where('workspaceId', id).delete();
+    await (Workspace.query()
+      .where('workspaceId', id)).delete();
 
     return response.send({
       message: 'Successfully deleted workspace',
@@ -115,7 +125,9 @@ class WorkspaceController {
   }
 
   // List all workspaces a user has created
-  async list({ response }) {
+  async list({
+    response,
+  }) {
     const workspaces = (await Workspace.all()).rows;
     // Convert to array with all data Franz wants
     let workspacesArray = [];
@@ -124,10 +136,7 @@ class WorkspaceController {
         id: workspace.workspaceId,
         name: workspace.name,
         order: workspace.order,
-        services:
-          typeof workspace.services === 'string'
-            ? JSON.parse(workspace.services)
-            : workspace.services,
+        services: typeof workspace.services === 'string' ? JSON.parse(workspace.services) : workspace.services,
         userId: 1,
       }));
     }