bug fix: import parent endpoints (#1265)

project-chip · Feb 14, 2024 · 8faab07 · 8faab07
1 parent 108fb3e
commit 8faab07
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 20 deletions.
diff --git a/src-electron/db/query-impexp.js b/src-electron/db/query-impexp.js
@@ -30,15 +30,8 @@ const queryUpgrade = require('../matter/matter.js')
  * @param {*} sessionId
  * @param {*} endpoint
  * @param {*} endpointTypeRef
- * @param {*} parentRef
  */
-async function importEndpoint(
-  db,
-  sessionId,
-  endpoint,
-  endpointTypeRef,
-  parentRef
-) {
+async function importEndpoint(db, sessionId, endpoint, endpointTypeRef) {
   return dbApi.dbInsert(
     db,
     `
@@ -47,14 +40,12 @@ INSERT INTO ENDPOINT (
   ENDPOINT_TYPE_REF,
   PROFILE,
   ENDPOINT_IDENTIFIER,
-  NETWORK_IDENTIFIER,
-  PARENT_ENDPOINT_REF
+  NETWORK_IDENTIFIER
 ) VALUES (
   ?,
   ?,
   ?,
   ?,
-  ?,
   ?
 )
   `,
@@ -64,11 +55,29 @@ INSERT INTO ENDPOINT (
       endpoint.profileId,
       endpoint.endpointId,
       endpoint.networkId,
-      parentRef,
     ]
   )
 }
 
+/**
+ * Imports the parent endpoint
+ * @param {} db
+ * @param {*} sessionId
+ * @param {*} endpointId
+ * @param {*} parentRef
+ */
+async function importParentEndpoint(db, sessionRef, endpointId, parentRef) {
+  return dbApi.dbAll(
+    db,
+    `
+  UPDATE ENDPOINT
+  SET PARENT_ENDPOINT_REF = ?
+  WHERE ENDPOINT_IDENTIFIER = ? AND SESSION_REF = ?
+  `,
+    [parentRef, endpointId, sessionRef]
+  )
+}
+
 /**
  * Extracts endpoints.
  *
@@ -885,6 +894,7 @@ VALUES
 
 exports.exportEndpointTypes = exportEndpointTypes
 exports.importEndpointType = importEndpointType
+exports.importParentEndpoint = importParentEndpoint
 
 exports.exportClustersFromEndpointType = exportClustersFromEndpointType
 exports.importClusterForEndpointType = importClusterForEndpointType

diff --git a/src-electron/importexport/import-json.js b/src-electron/importexport/import-json.js
@@ -1153,6 +1153,7 @@ async function importEndpointTypes(
   const sortedEndpoints = sortEndpoints(endpoints)
 
   if (endpointTypes != null) {
+    let parentRef
     env.logDebug(`Loading ${endpointTypes.length} endpoint types`)
     let deviceTypeSpecCheckComplianceMessage = ''
     let clusterSpecCheckComplianceMessage = ''
@@ -1171,21 +1172,14 @@ async function importEndpointTypes(
         endpointTypes[i]
       )
       let endpointId = ''
-      let parentRef
       if (sortedEndpoints[i]) {
         for (let j = 0; j < sortedEndpoints[i].length; j++) {
           endpointId = sortedEndpoints[i][j].endpointId
-          parentRef = await queryEndpoint.getParentEndpointRef(
-            db,
-            sortedEndpoints[i][j].parentEndpointIdentifier,
-            sessionId
-          )
           await queryImpexp.importEndpoint(
             db,
             sessionId,
             sortedEndpoints[i][j],
-            endpointTypeId,
-            parentRef
+            endpointTypeId
           )
         }
       }
@@ -1342,6 +1336,26 @@ async function importEndpointTypes(
           specMessageIndent
         )
     }
+
+    //post processing - import parent endpoints
+    for (let i = 0; i < endpointTypes.length; i++) {
+      if (sortedEndpoints[i]) {
+        for (let j = 0; j < sortedEndpoints[i].length; j++) {
+          parentRef = await queryEndpoint.getParentEndpointRef(
+            db,
+            sortedEndpoints[i][j].parentEndpointIdentifier,
+            sessionId
+          )
+          await queryImpexp.importParentEndpoint(
+            db,
+            sessionId,
+            sortedEndpoints[i][j].endpointId,
+            parentRef
+          )
+        }
+      }
+    }
+
     if (deviceTypeSpecCheckComplianceMessage.length > 0) {
       deviceTypeSpecCheckComplianceMessage = dottedLine.concat(
         deviceTypeSpecCheckComplianceFailureTitle,