Removed "Discovery Process", now passing correct user ID in processScans

Author: heythisischris

src/routes/addScans.ts

@@ -31,7 +31,6 @@ export const addScans = async ({ request, reply }) => {
                     const discoveryDict = {
                         single: 'url',
                         sitemap: 'sitemapurl',
-                        discovery_process: 'sitemapurl',
                     }
 
                     const scanResponse = await (await fetch(`https://scan.equalify.app/generate/${discoveryDict?.[propertyDiscovery] ?? 'url'}`, {

src/scheduled/processScans.ts

@@ -1,10 +1,9 @@
-import { jwtClaims } from '#src/app';
 import { db } from '#src/utils';
 
 export const processScans = async () => {
     // This route is called once every minute by Amazon EventBridge Scheduler
     await db.connect();
-    const scans = (await db.query(`SELECT "id", "job_id", "property_id" FROM "scans" WHERE "processing"=TRUE ORDER BY "created_at" DESC`)).rows;
+    const scans = (await db.query(`SELECT "id", "job_id", "property_id", "user_id" FROM "scans" WHERE "processing"=TRUE ORDER BY "created_at" DESC`)).rows;
     await Promise.allSettled(scans.map(scan => new Promise(async (res) => {
         try {
             const { result, status } = await (await fetch(`https://scan.equalify.app/results/${scan.job_id}`)).json();
@@ -38,60 +37,60 @@ const scanProcessor = async ({ result, scan }) => {
         row.id =
             (await db.query({
                 text: `SELECT "id" FROM "urls" WHERE "user_id"=$1 AND "url"=$2 AND "property_id"=$3`,
-                values: [jwtClaims.sub, row.url, scan.property_id],
+                values: [scan.user_id, row.url, scan.property_id],
             })).rows?.[0]?.id
             ??
             (await db.query({
                 text: `INSERT INTO "urls" ("user_id", "url", "property_id") VALUES ($1, $2, $3) RETURNING "id"`,
-                values: [jwtClaims.sub, row.url, scan.property_id]
+                values: [scan.user_id, row.url, scan.property_id]
             })).rows?.[0]?.id;
     }
     for (const row of result.nodes) {
         row.id =
             (await db.query({
                 text: `SELECT "id" FROM "enodes" WHERE "user_id"=$1 AND "html"=$2 AND "targets"=$3 AND "url_id"=$4`,
-                values: [jwtClaims.sub, row.html, JSON.stringify(row.targets), row.url_id],
+                values: [scan.user_id, row.html, JSON.stringify(row.targets), row.url_id],
             })).rows?.[0]?.id
             ??
             (await db.query({
                 text: `INSERT INTO "enodes" ("user_id", "html", "targets", "url_id") VALUES ($1, $2, $3, $4) RETURNING "id"`,
-                values: [jwtClaims.sub, row.html, JSON.stringify(row.targets), result.urls.find(obj => obj.urlId === row.relatedUrlId).id],
+                values: [scan.user_id, row.html, JSON.stringify(row.targets), result.urls.find(obj => obj.urlId === row.relatedUrlId).id],
             })).rows?.[0]?.id;
     }
     for (const row of result.tags) {
         row.id =
             (await db.query({
                 text: `SELECT "id" FROM "tags" WHERE "user_id"=$1 AND "tag"=$2`,
-                values: [jwtClaims.sub, row.tag],
+                values: [scan.user_id, row.tag],
             })).rows?.[0]?.id
             ??
             (await db.query({
                 text: `INSERT INTO "tags" ("user_id", "tag") VALUES ($1, $2) RETURNING "id"`,
-                values: [jwtClaims.sub, row.tag],
+                values: [scan.user_id, row.tag],
             })).rows?.[0]?.id;
     }
     for (const row of result.messages) {
         row.id =
             (await db.query({
                 text: `SELECT "id" FROM "messages" WHERE "user_id"=$1 AND "message"=$2 AND "type"=$3`,
-                values: [jwtClaims.sub, row.message, row.type],
+                values: [scan.user_id, row.message, row.type],
             })).rows?.[0]?.id
             ??
             (await db.query({
                 text: `INSERT INTO "messages" ("user_id", "message", "type") VALUES ($1, $2, $3) RETURNING "id"`,
-                values: [jwtClaims.sub, row.message, row.type],
+                values: [scan.user_id, row.message, row.type],
             })).rows?.[0]?.id;
 
         for (const relatedNodeId of row.relatedNodeIds) {
             await db.query({
                 text: `INSERT INTO "message_nodes" ("user_id", "message_id", "enode_id") VALUES ($1, $2, $3)`,
-                values: [jwtClaims.sub, row.id, result.nodes.find(obj => obj.nodeId === relatedNodeId).id]
+                values: [scan.user_id, row.id, result.nodes.find(obj => obj.nodeId === relatedNodeId).id]
             })
         }
         for (const relatedTagId of row.relatedTagIds) {
             await db.query({
                 text: `INSERT INTO "message_tags" ("user_id", "message_id", "tag_id") VALUES ($1, $2, $3)`,
-                values: [jwtClaims.sub, row.id, result.tags.find(obj => obj.tagId === relatedTagId).id]
+                values: [scan.user_id, row.id, result.tags.find(obj => obj.tagId === relatedTagId).id]
             })
         }
     }