1 files changed, 9 insertions, 4 deletions

diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js
index 528721f13..9ba2b174e 100644
--- a/src/internal-server/app/Controllers/Http/WorkspaceController.js
+++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js
@@ -25,11 +25,13 @@ class WorkspaceController {
     do {
       workspaceId = uuid();
     } while (
+      // eslint-disable-next-line no-await-in-loop, unicorn/no-await-expression-member
       (await Workspace.query().where('workspaceId', workspaceId).fetch()).rows
         .length > 0
     );
 
-    const order = (await Workspace.all()).rows.length;
+    const allWorkspaces = await Workspace.all();
+    const order = allWorkspaces.rows.length;
     const { name } = data;
     delete data.name;
 
@@ -76,8 +78,10 @@ class WorkspaceController {
       });
 
     // Get updated row
-    const workspace = (await Workspace.query().where('workspaceId', id).fetch())
-      .rows[0];
+    const workspaceQuery = await Workspace.query()
+      .where('workspaceId', id)
+      .fetch();
+    const workspace = workspaceQuery.rows[0];
 
     return response.send({
       id: workspace.workspaceId,
@@ -118,7 +122,8 @@ class WorkspaceController {
 
   // List all workspaces a user has created
   async list({ response }) {
-    const workspaces = (await Workspace.all()).rows;
+    const allWorkspaces = await Workspace.all();
+    const workspaces = allWorkspaces.rows;
     // Convert to array with all data Franz wants
     let workspacesArray = [];
     if (workspaces) {