bug fix for inserting rootNode

paulr34 · Aug 1, 2024 · 99b678b · 99b678b
1 parent 938c0f6
commit 99b678b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src-electron/db/query-loader.js b/src-electron/db/query-loader.js
@@ -940,11 +940,11 @@ async function insertAtomics(db, packageId, data) {
  * @returns A promise resolved with the result of the database insert operation.
  */
 function insertEndpointComposition(db, packageId, composition, context) {
-  if (context.mandatoryDeviceTypes === composition.code) {
+  if (parseInt(context.mandatoryDeviceTypes, 16) === composition.code) {
     return dbApi.dbInsert(
       db,
       'INSERT INTO ENDPOINT_COMPOSITION (PACKAGE_REF, TYPE, CODE) VALUES (?, ?, ?)',
-      [packageId, dbEnum.mandatoryDeviceType, composition.code]
+      [packageId, dbEnum.composition.rootNode, composition.code]
     )
   } else {
     return dbApi.dbInsert(

diff --git a/src-electron/zcl/zcl-loader-silabs.js b/src-electron/zcl/zcl-loader-silabs.js
@@ -1670,10 +1670,12 @@ function prepareDeviceType(deviceType) {
  */
 async function processDeviceTypes(db, filePath, packageId, data, context) {
   env.logDebug(`${filePath}, ${packageId}: ${data.length} deviceTypes.`)
-  console.log(context.mandatoryDeviceTypes)
   let deviceTypes = data.map((x) => prepareDeviceType(x))
   for (let deviceType of deviceTypes) {
-    if (deviceType.compositionType != null) {
+    if (
+      deviceType.compositionType != null ||
+      deviceType.code === parseInt(context.mandatoryDeviceTypes, 16)
+    ) {
       await queryLoader.insertEndpointComposition(
         db,
         packageId,