From 467f4ab83316ae9424dc8a1ed5ad0b697d136990 Mon Sep 17 00:00:00 2001 From: Luca Wlcek Date: Fri, 17 Nov 2023 16:33:50 +0100 Subject: [PATCH] fixed remove functions --- backend/internal/nginx.js | 3 +-- backend/internal/ssl-passthrough-host.js | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/backend/internal/nginx.js b/backend/internal/nginx.js index 8b570d0f..1f18585d 100644 --- a/backend/internal/nginx.js +++ b/backend/internal/nginx.js @@ -259,8 +259,7 @@ const internalNginx = { const allHosts = await passthroughHostModel .query() .where('is_deleted', 0) - .groupBy('id') - .omit(['is_deleted']); + .groupBy('id'); host = { all_passthrough_hosts: allHosts.map((host) => { // Replace dots in domain diff --git a/backend/internal/ssl-passthrough-host.js b/backend/internal/ssl-passthrough-host.js index a6b3f157..cdeec7f3 100644 --- a/backend/internal/ssl-passthrough-host.js +++ b/backend/internal/ssl-passthrough-host.js @@ -130,7 +130,7 @@ const internalPassthroughHost = { .query() .where('is_deleted', 0) .andWhere('id', data.id) - .allowEager('[owner]') + .allowGraph('[owner]') .first(); if (access_data.permission_visibility !== 'all') { @@ -143,7 +143,7 @@ const internalPassthroughHost = { } if (typeof data.expand !== 'undefined' && data.expand !== null) { - query.eager('[' + data.expand.join(', ') + ']'); + query.withGraphFetched('[' + data.expand.join(', ') + ']'); } return query; @@ -315,8 +315,7 @@ const internalPassthroughHost = { .query() .where('is_deleted', 0) .groupBy('id') - .omit(['is_deleted']) - .allowEager('[owner]') + .allowGraph('[owner]') .orderBy('domain_name', 'ASC'); if (access_data.permission_visibility !== 'all') { @@ -331,7 +330,7 @@ const internalPassthroughHost = { } if (typeof expand !== 'undefined' && expand !== null) { - query.eager('[' + expand.join(', ') + ']'); + query.withGraphFetched('[' + expand.join(', ') + ']'); } return query;