Clean up the misnaming of columns.

The naming standard is:
  ANY column that ends with '_ID' is a primary key in the table.
  ANY column that ends with '_REF' is a foreign key in the table.
  So 'ENDPOINT_ID' and 'NETWORK_ID' were misnamed in the ENDPOINT table, and were changed to 'ENDPOINT_IDENTIFIER' and 'NETWORK_IDENTIFIER'.

src-electron/db/db-mapping.js

@@ -191,12 +191,12 @@ export const dbMap = {
   endpoint: (x) => {
     if (x == null) return undefined
     return {
-      endpointRef: x.ENDPOINT_REF,
+      endpointRef: x.ENDPOINT_ID,
       sessionRef: x.SESSION_REF,
-      endpointId: x.ENDPOINT_ID,
+      endpointId: x.ENDPOINT_IDENTIFIER,
       endpointTypeRef: x.ENDPOINT_TYPE_REF,
       profileId: x.PROFILE,
-      networkId: x.NETWORK_ID,
+      networkId: x.NETWORK_IDENTIFIER,
     }
   },
 

src-electron/db/query-config.js

@@ -288,22 +288,22 @@ export function getAllEndpointTypeClusterState(db, endpointTypeId) {
  * @export
  * @param {*} db
  * @param {*} sessionId
- * @param {*} endpointId
+ * @param {*} endpointIdentifier
  * @param {*} endpointTypeRef
- * @param {*} networkId
+ * @param {*} networkIdentifier
  * @returns Promise to update endpoints.
  */
 export function insertEndpoint(
   db,
   sessionId,
-  endpointId,
+  endpointIdentifier,
   endpointTypeRef,
-  networkId
+  networkIdentifier
 ) {
   return DbApi.dbInsert(
     db,
-    'INSERT OR REPLACE INTO ENDPOINT ( SESSION_REF, ENDPOINT_ID, ENDPOINT_TYPE_REF, NETWORK_ID ) VALUES ( ?, ?, ?, ?)',
-    [sessionId, endpointId, endpointTypeRef, networkId]
+    'INSERT OR REPLACE INTO ENDPOINT ( SESSION_REF, ENDPOINT_IDENTIFIER, ENDPOINT_TYPE_REF, NETWORK_IDENTIFIER ) VALUES ( ?, ?, ?, ?)',
+    [sessionId, endpointIdentifier, endpointTypeRef, networkIdentifier]
   )
 }
 
@@ -316,27 +316,21 @@ export function insertEndpoint(
  * @returns Promise to delete an endpoint that resolves with the number of rows that were deleted.
  */
 export function deleteEndpoint(db, id) {
-  return DbApi.dbRemove(db, 'DELETE FROM ENDPOINT WHERE ENDPOINT_REF = ?', [id])
+  return DbApi.dbRemove(db, 'DELETE FROM ENDPOINT WHERE ENDPOINT_ID = ?', [id])
 }
 
-export function updateEndpoint(
-  db,
-  sessionId,
-  endpointRef,
-  param,
-  updatedValue
-) {
+export function updateEndpoint(db, sessionId, endpointId, param, updatedValue) {
   return DbApi.dbUpdate(
     db,
-    `UPDATE ENDPOINT SET ${param} = ? WHERE ENDPOINT_REF = ? AND SESSION_REF = ?`,
-    [updatedValue, endpointRef, sessionId]
+    `UPDATE ENDPOINT SET ${param} = ? WHERE ENDPOINT_ID = ? AND SESSION_REF = ?`,
+    [updatedValue, endpointId, sessionId]
   )
 }
 
 export function selectEndpoint(db, endpointRef) {
   return DbApi.dbGet(
     db,
-    'SELECT ENDPOINT_REF, SESSION_REF, ENDPOINT_ID, ENDPOINT_TYPE_REF, PROFILE, NETWORK_ID FROM ENDPOINT WHERE ENDPOINT_REF = ?',
+    'SELECT ENDPOINT_ID, SESSION_REF, ENDPOINT_IDENTIFIER, ENDPOINT_TYPE_REF, PROFILE, NETWORK_IDENTIFIER FROM ENDPOINT WHERE ENDPOINT_ID = ?',
     [endpointRef]
   ).then(DbMapping.dbMap.endpoint)
 }

src-electron/db/zap-schema.sql

@@ -170,7 +170,7 @@ CREATE TABLE IF NOT EXISTS "STRUCT" (
  */
 DROP TABLE IF EXISTS "STRUCT_ITEM";
 CREATE TABLE IF NOT EXISTS "STRUCT_ITEM" (
-  "STRUCT_REF" integer, 
+  "STRUCT_REF" integer,
   "NAME" text,
   "TYPE" text,
   foreign key (STRUCT_REF) references STRUCT(STRUCT_ID)
@@ -280,12 +280,12 @@ CREATE TABLE IF NOT EXISTS "ENDPOINT_TYPE" (
  */
 DROP TABLE IF EXISTS "ENDPOINT";
 CREATE TABLE IF NOT EXISTS "ENDPOINT" (
-  "ENDPOINT_REF" integer primary key autoincrement,
+  "ENDPOINT_ID" integer primary key autoincrement,
   "SESSION_REF" integer,
-  "ENDPOINT_ID" integer,
   "ENDPOINT_TYPE_REF" integer,
   "PROFILE" integer,
-  "NETWORK_ID" integer,
+  "ENDPOINT_IDENTIFIER" integer,
+  "NETWORK_IDENTIFIER" integer,
   foreign key (SESSION_REF) references SESSION(SESSION_ID) on delete cascade,
   foreign key (ENDPOINT_TYPE_REF) references ENDPOINT_TYPE(ENDPOINT_TYPE_ID)
 );
@@ -296,7 +296,7 @@ CREATE TABLE IF NOT EXISTS "ENDPOINT" (
  */
 DROP TABLE IF EXISTS "ENDPOINT_TYPE_CLUSTER";
 CREATE TABLE IF NOT EXISTS "ENDPOINT_TYPE_CLUSTER" (
-  "ENDPOINT_TYPE_CLUSTER_ID" integer primary key autoincrement, 
+  "ENDPOINT_TYPE_CLUSTER_ID" integer primary key autoincrement,
   "ENDPOINT_TYPE_REF" integer,
   "CLUSTER_REF" integer,
   "SIDE" text,
@@ -312,7 +312,7 @@ CREATE TABLE IF NOT EXISTS "ENDPOINT_TYPE_CLUSTER" (
 DROP TABLE IF EXISTS "ENDPOINT_TYPE_ATTRIBUTE";
 CREATE TABLE IF NOT EXISTS "ENDPOINT_TYPE_ATTRIBUTE" (
   "ENDPOINT_TYPE_REF" integer,
-  "ENDPOINT_TYPE_CLUSTER_REF" integer, 
+  "ENDPOINT_TYPE_CLUSTER_REF" integer,
   "ATTRIBUTE_REF" integer,
   "INCLUDED" integer default false,
   "EXTERNAL" integer default false,
@@ -327,7 +327,11 @@ CREATE TABLE IF NOT EXISTS "ENDPOINT_TYPE_ATTRIBUTE" (
   foreign key (ENDPOINT_TYPE_REF) references ENDPOINT_TYPE(ENDPOINT_TYPE_ID) on delete cascade,
   foreign key (ENDPOINT_TYPE_CLUSTER_REF) references ENDPOINT_TYPE_CLUSTER(ENDPOINT_TYPE_CLUSTER_ID),
   foreign key (ATTRIBUTE_REF) references ATTRIBUTE(ATTRIBUTE_ID),
-  UNIQUE(ENDPOINT_TYPE_REF, ATTRIBUTE_REF, ENDPOINT_TYPE_CLUSTER_REF)
+  UNIQUE(
+    ENDPOINT_TYPE_REF,
+    ATTRIBUTE_REF,
+    ENDPOINT_TYPE_CLUSTER_REF
+  )
 );
 /*
  ENDPOINT_TYPE_COMMAND table contains the user data configuration for the various parameters that exist
@@ -336,16 +340,19 @@ CREATE TABLE IF NOT EXISTS "ENDPOINT_TYPE_ATTRIBUTE" (
 DROP TABLE IF EXISTS "ENDPOINT_TYPE_COMMAND";
 CREATE TABLE IF NOT EXISTS "ENDPOINT_TYPE_COMMAND" (
   "ENDPOINT_TYPE_REF" integer,
-  "ENDPOINT_TYPE_CLUSTER_REF" integer, 
+  "ENDPOINT_TYPE_CLUSTER_REF" integer,
   "COMMAND_REF" integer,
   "INCOMING" integer default false,
   "OUTGOING" integer default false,
   foreign key (ENDPOINT_TYPE_REF) references ENDPOINT_TYPE(ENDPOINT_TYPE_ID) on delete cascade,
   foreign key (ENDPOINT_TYPE_CLUSTER_REF) references ENDPOINT_TYPE_CLUSTER(ENDPOINT_TYPE_CLUSTER_ID),
   foreign key (COMMAND_REF) references COMMAND(COMMAND_ID),
-  UNIQUE(ENDPOINT_TYPE_REF, COMMAND_REF, ENDPOINT_TYPE_CLUSTER_REF)
+  UNIQUE(
+    ENDPOINT_TYPE_REF,
+    COMMAND_REF,
+    ENDPOINT_TYPE_CLUSTER_REF
+  )
 );
-
 /*
  * 
  * $$$$$$$$\        $$\                                                   
@@ -360,7 +367,6 @@ CREATE TABLE IF NOT EXISTS "ENDPOINT_TYPE_COMMAND" (
  *                      \$$$$$$  |\$$$$$$  |                              
  *                       \______/  \______/                               
  */
-
 CREATE TRIGGER IF NOT EXISTS "INSERT_TRIGGER_ENDPOINT_TYPE_ATTRIBUTE"
 AFTER
 INSERT ON "ENDPOINT_TYPE_ATTRIBUTE" BEGIN

src-electron/importexport/export.js

@@ -74,22 +74,22 @@ export function createStateFromDatabase(db, sessionId) {
 
     // Deal with the key/value table
     var getKeyValues = Mapping.exportSessionKeyValues(db, sessionId).then(
-      (rows) => {
-        state.keyValuePairs = rows
-        Env.logInfo(`Retrieved session keys: ${rows.length}`)
-        return Promise.resolve(rows)
+      (data) => {
+        state.keyValuePairs = data
+        Env.logInfo(`Retrieved session keys: ${data.length}`)
+        return Promise.resolve(data)
       }
     )
     promises.push(getKeyValues)
 
-    var getAllEndpoint = Mapping.exportEndpointTypes(db, sessionId).then(
-      (rows) => {
-        Env.logInfo(`Retrieved endpoint types: ${rows.length}`)
-        state.endpointTypes = rows
-        return Promise.resolve(rows)
+    var getAllEndpointTypes = Mapping.exportEndpointTypes(db, sessionId).then(
+      (data) => {
+        Env.logInfo(`Retrieved endpoint types: ${data.length}`)
+        state.endpointTypes = data
+        return Promise.resolve(data)
       }
     )
-    promises.push(getAllEndpoint)
+    promises.push(getAllEndpointTypes)
 
     return Promise.all(promises)
       .then(() => resolve(state))

src-electron/rest/user-data.js

@@ -274,13 +274,13 @@ export function registerSessionApi(db, app) {
         var changeParam = ''
         switch (context.updatedKey) {
           case 'endpointId':
-            changeParam = 'ENDPOINT_ID'
+            changeParam = 'ENDPOINT_IDENTIFIER'
             break
           case 'endpointType':
             changeParam = 'ENDPOINT_TYPE_REF'
             break
           case 'networkId':
-            changeParam = 'NETWORK_ID'
+            changeParam = 'NETWORK_IDENTIFIER'
             break
         }
         updateEndpoint(