performance boost

cityssm · Nov 23, 2023 · 5f8282d · 5f8282d
1 parent 746172b
commit 5f8282d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/database/getAsset.js b/database/getAsset.js
@@ -47,9 +47,9 @@ export async function getAssetByAssetAlias(assetAlias, aliasTypeId, connectedEmi
         sql += ' and aliasTypeId = ?';
         sqlParameters.push(aliasTypeId);
     }
-    const assetId = emileDB.prepare(sql).get(sqlParameters);
+    const assetId = emileDB.prepare(sql).pluck().get(sqlParameters);
     if (assetId !== undefined) {
-        asset = getAsset(assetId.assetId, emileDB);
+        asset = getAsset(assetId, emileDB);
     }
     if (connectedEmileDB === undefined) {
         emileDB.close();

diff --git a/database/getAsset.ts b/database/getAsset.ts
@@ -87,12 +87,12 @@ export async function getAssetByAssetAlias(
     sqlParameters.push(aliasTypeId)
   }
 
-  const assetId = emileDB.prepare(sql).get(sqlParameters) as
-    | { assetId: number }
+  const assetId = emileDB.prepare(sql).pluck().get(sqlParameters) as
+    | number
     | undefined
 
   if (assetId !== undefined) {
-    asset = getAsset(assetId.assetId, emileDB)
+    asset = getAsset(assetId, emileDB)
   }
 
   if (connectedEmileDB === undefined) {

diff --git a/database/isValidUserReportKey.js b/database/isValidUserReportKey.js
@@ -6,7 +6,7 @@ const accessMillis = getConfigProperty('settings.reportKeyAccessDays') * 86400 *
 export function isValidUserReportKey(reportKey, requestIp) {
     const emileDB = sqlite(databasePath, { readonly: true });
     const ipAddress = isLocal(requestIp) ? 'localhost' : requestIp;
-    const result = emileDB
+    const userName = emileDB
         .prepare(`select u.userName
         from UserAccessLog l
         left join Users u on l.userName = u.userName
@@ -15,7 +15,8 @@ export function isValidUserReportKey(reportKey, requestIp) {
         and u.recordDelete_timeMillis is null
         and u.canLogin = 1
         and ? - l.accessTimeMillis <= ?`)
+        .pluck()
         .get(ipAddress, reportKey, Date.now(), accessMillis);
     emileDB.close();
-    return (result?.userName ?? '') !== '';
+    return (userName ?? '') !== '';
 }
diff --git a/database/isValidUserReportKey.ts b/database/isValidUserReportKey.ts
@@ -15,7 +15,7 @@ export function isValidUserReportKey(
 
   const ipAddress = isLocal(requestIp) ? 'localhost' : requestIp
 
-  const result = emileDB
+  const userName = emileDB
     .prepare(
       `select u.userName
         from UserAccessLog l
@@ -26,11 +26,10 @@ export function isValidUserReportKey(
         and u.canLogin = 1
         and ? - l.accessTimeMillis <= ?`
     )
-    .get(ipAddress, reportKey, Date.now(), accessMillis) as
-    | { userName: string }
-    | undefined
+    .pluck()
+    .get(ipAddress, reportKey, Date.now(), accessMillis) as string | undefined
 
   emileDB.close()
 
-  return (result?.userName ?? '') !== ''
+  return (userName ?? '') !== ''
 }