From e0fe546422bdb97e451574496934c2a948a3ff16 Mon Sep 17 00:00:00 2001
From: Paul Regan <paregan@silabs.com>
Date: Mon, 26 Aug 2024 16:45:07 -0400
Subject: [PATCH] cleanup and properly retrieve device ref

---
 src-electron/db/query-endpoint.js | 3 ++-
 src-electron/rest/endpoint.js     | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src-electron/db/query-endpoint.js b/src-electron/db/query-endpoint.js
index afb95bfb05..c1f16672b1 100644
--- 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
index 9a4b79489e..b35e6e634b 100644
--- 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 })
   }
 }