cleanup and properly retrieve device ref

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

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src-electron/db/query-endpoint.js b/src-electron/db/query-endpoint.js
@@ -68,6 +68,7 @@ ORDER BY E1.ENDPOINT_IDENTIFIER
  * @returns {Promise<Array>} - A promise that resolves to an array of rows containing DEVICE_TYPE_REF.
  */
 async function getRootNode(db, packageIds) {
+  console.log(packageIds)
   const query = `
     SELECT DEVICE_TYPE_REF
     FROM ENDPOINT_COMPOSITION
@@ -77,7 +78,7 @@ async function getRootNode(db, packageIds) {
     dbEnum.composition.rootNode,
     ...packageIds
   ])
-  return result.rows
+  return result.DEVICE_TYPE_REF
 }
 
 /**

diff --git a/src-electron/rest/endpoint.js b/src-electron/rest/endpoint.js
@@ -204,9 +204,14 @@ function httpPostEndpointType(db) {
 function httpGetRootNode(db) {
   return async (request, response) => {
     let sessionId = request.zapSessionId
-    let packageIds = await queryPackage.getSessionZclPackageIds(db, sessionId)
+    console.log(sessionId)
+    let packages = await queryPackage.getPackageSessionPackagePairBySessionId(
+      db,
+      sessionId
+    )
+    let packageIds = packages.map((item) => item.pkg.id)
     let rootNode = await queryEndpoint.getRootNode(db, packageIds)
-    response.status(StatusCodes.OK).json(rootNode)
+    response.status(StatusCodes.OK).json({ rootNode: rootNode })
   }
 }