Fixed bug w/ inserting messageNodes w/o correct messageId

EqualifyEverything · Aug 17, 2024 · 94b348b · 94b348b
1 parent 36aafaa
commit 94b348b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 21 deletions.
diff --git a/src/internal/processScans.ts b/src/internal/processScans.ts
@@ -144,11 +144,10 @@ const scanProcessor = async ({ result, scan }) => {
                 })).rows?.[0]?.id;
         }
         for (const row of result.messages) {
-            const existingId = (await db.query({
+            row.id = (await db.query({
                 text: `SELECT "id" FROM "messages" WHERE "user_id"=$1 AND "message"=$2 AND "type"=$3`,
                 values: [scan.user_id, row.message, row.type],
-            })).rows?.[0]?.id;
-            row.id = existingId ??
+            })).rows?.[0]?.id ??
                 (await db.query({
                     text: `INSERT INTO "messages" ("user_id", "message", "type") VALUES ($1, $2, $3) RETURNING "id"`,
                     values: [scan.user_id, row.message, row.type],
@@ -158,41 +157,35 @@ const scanProcessor = async ({ result, scan }) => {
                 try {
                     const messsageNodeExists = (await db.query({
                         text: `SELECT "id" FROM "message_nodes" WHERE "user_id"=$1 AND "message_id"=$2 AND "enode_id"=$3`,
-                        values: [scan.user_id, existingId, result.nodes.find(obj => obj.nodeId === relatedNodeId)?.id],
+                        values: [scan.user_id, row.id, result.nodes.find(obj => obj.nodeId === relatedNodeId)?.id],
                     })).rows?.[0]?.id;
                     if (!messsageNodeExists) {
                         await db.query({
                             text: `INSERT INTO "message_nodes" ("user_id", "message_id", "enode_id") VALUES ($1, $2, $3)`,
-                            values: [scan.user_id, existingId, result.nodes.find(obj => obj.nodeId === relatedNodeId)?.id]
+                            values: [scan.user_id, row.id, result.nodes.find(obj => obj.nodeId === relatedNodeId)?.id]
                         })
                     }
                 }
                 catch (err) {
-                    console.log(err);
-                    console.log(`messageNode error`);
-                    console.log(JSON.stringify({ row }));
-                    return;
+                    console.log(err, `messageNode error`, JSON.stringify({ row }));
                 }
             }
 
             for (const relatedTagId of row.relatedTagIds) {
                 try {
                     const messageTagExists = (await db.query({
                         text: `SELECT "id" FROM "message_tags" WHERE "user_id"=$1 AND "message_id"=$2 AND "tag_id"=$3`,
-                        values: [scan.user_id, existingId, result.nodes.find(obj => obj.nodeId === relatedTagId)?.id],
+                        values: [scan.user_id, row.id, result.nodes.find(obj => obj.nodeId === relatedTagId)?.id],
                     })).rows?.[0]?.id;
                     if (!messageTagExists) {
                         await db.query({
                             text: `INSERT INTO "message_tags" ("user_id", "message_id", "tag_id") VALUES ($1, $2, $3)`,
-                            values: [scan.user_id, existingId, result.tags.find(obj => obj.tagId === relatedTagId)?.id]
+                            values: [scan.user_id, row.id, result.tags.find(obj => obj.tagId === relatedTagId)?.id]
                         })
                     }
                 }
                 catch (err) {
-                    console.log(err);
-                    console.log(`messageTag error`);
-                    console.log(JSON.stringify({ row }));
-                    return;
+                    console.log(err, `messageTag error`, JSON.stringify({ row }));
                 }
             }
         }

diff --git a/src/routes/getResultsAll.ts b/src/routes/getResultsAll.ts
@@ -6,7 +6,7 @@ export const getResultsAll = async ({ request, reply }) => {
     Messages, Tags, Properties, Pages are sorted by properties related to the most nodes w/ nodeEqualified set to false (most to least)
     */
     await db.connect();
-    const report = (await db.query(`SELECT "id", "name", "filters" FROM "reports" WHERE "id" = $1`, [request.query.reportId])).rows?.[0];
+    const report = (await db.query(`SELECT "id", "name", "filters" FROM "reports" WHERE "id" = $1`, [request.query.reportId])).rows[0];
     const types = ['properties', 'urls', 'messages', 'nodes', 'tags', 'types', 'status'];
     const filters = Object.fromEntries(types.map(obj => [obj, []]));
     for (const type of types) {
@@ -77,14 +77,14 @@ export const getResultsAll = async ({ request, reply }) => {
             ...filters.types.length > 0 && ({ typeIds: filters.types }),
             ...filters.messages.length > 0 && ({ messageIds: filters.messages }),
             ...filters.tags.length > 0 && ({ tagIds: filters.tags }),
-            ...filters.status.length > 0 && ({ equalified: filters.status?.[0] === 'active' ? false : true }),
+            ...filters.status.length > 0 && ({ equalified: filters.status[0] === 'active' ? false : true }),
         },
     });
-    const filteredNodes = response?.nodes ?? [];
+    const filteredNodes = response.nodes ?? [];
 
     const formattedMessages = {};
     for (const message of filteredNodes.map(obj => obj.messageNodes).flat()) {
-        if (!formattedMessages?.[message.message.id]) {
+        if (!formattedMessages[message.message.id]) {
             formattedMessages[message.message.id] = {
                 id: message.message.id,
                 message: message.message.message,
@@ -102,7 +102,7 @@ export const getResultsAll = async ({ request, reply }) => {
         .map(obj => obj.message.messageTags).flat()
         .map(obj => obj.tag)
     ) {
-        if (!formattedTags?.[tag.tag]) {
+        if (!formattedTags[tag.tag]) {
             formattedTags[tag.tag] = {
                 id: tag.id,
                 tag: tag.tag,
@@ -114,7 +114,7 @@ export const getResultsAll = async ({ request, reply }) => {
     for (const node of filteredNodes) {
         for (const nodeUpdate of node.enodeUpdates) {
             const date = nodeUpdate.createdAt.split('T')[0];
-            if (!formattedChart?.[date]) {
+            if (!formattedChart[date]) {
                 formattedChart[date] = {
                     date: date,
                     equalified: 0,