cleanup and some fixes

paulr34 · Aug 26, 2024 · ebe0035 · ebe0035
1 parent 350d2f6
commit ebe0035
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src-electron/db/query-endpoint.js b/src-electron/db/query-endpoint.js
@@ -23,8 +23,7 @@
 const dbApi = require('./db-api.js')
 const bin = require('../util/bin')
 const dbMapping = require('./db-mapping.js')
-const dbEnum = require('./db-enum.js')
-const { dbEnums } = require('util/post-import-api.js')
+const dbEnum = require('../../src-shared/db-enum.js')
 
 /**
  * Returns a promise resolving into all endpoints.
@@ -74,7 +73,7 @@ async function getRootNode(db, packageIds) {
     FROM ENDPOINT_COMPOSITION
     WHERE TYPE = ? AND PACKAGE_REF IN (${packageIds.map(() => '?').join(', ')})
   `
-  const result = await db.query(query, [
+  const result = await dbApi.dbGet(db, query, [
     dbEnum.composition.rootNode,
     ...packageIds
   ])

diff --git a/src-electron/rest/endpoint.js b/src-electron/rest/endpoint.js
@@ -24,11 +24,11 @@ const queryEndpointType = require('../db/query-endpoint-type.js')
 const queryEndpoint = require('../db/query-endpoint.js')
 const queryConfig = require('../db/query-config.js')
 const querySession = require('../db/query-session.js')
+const queryPackage = require('../db/query-package.js')
 const validation = require('../validation/validation.js')
 const restApi = require('../../src-shared/rest-api.js')
 const notification = require('../db/query-session-notification.js')
 const { StatusCodes } = require('http-status-codes')
-const { getSessionZclPackageIds } = require('db/query-package.js')
 
 /**
  * HTTP DELETE: endpoint
@@ -204,7 +204,7 @@ function httpPostEndpointType(db) {
 function httpGetRootNode(db) {
   return async (request, response) => {
     let sessionId = request.zapSessionId
-    let packageIds = getSessionZclPackageIds(db, sessionId)
+    let packageIds = await queryPackage.getSessionZclPackageIds(db, sessionId)
     let rootNode = await queryEndpoint.getRootNode(db, packageIds)
     response.status(StatusCodes.OK).json(rootNode)
   }

diff --git a/src-shared/rest-api.js b/src-shared/rest-api.js
@@ -72,7 +72,8 @@ const uri = {
   sessionCreate: '/zcl/sessionCreate',
   reloadSession: '/zcl/reloadSession',
   init: '/init',
-  forcedExternal: '/zcl/forcedExternal'
+  forcedExternal: '/zcl/forcedExternal',
+  rootNode: '/zcl/rootNode'
 }
 
 const uiMode = {