Fixed type/message filters in getResults, added support for tag/status

EqualifyEverything · Aug 9, 2024 · 2effa1e · 2effa1e
1 parent ac5035a
commit 2effa1e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/routes/getResultsAll.ts b/src/routes/getResultsAll.ts
@@ -7,7 +7,7 @@ export const getResultsAll = async ({ request, reply }) => {
     */
     await db.connect();
     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'];
+    const types = ['properties', 'urls', 'messages', 'nodes', 'tags', 'types', 'status'];
     const filters = Object.fromEntries(types.map(obj => [obj, []]));
     for (const type of types) {
         filters[type] = report.filters.filter(obj => obj.type === type).map(obj => obj.value)
@@ -26,19 +26,31 @@ export const getResultsAll = async ({ request, reply }) => {
             $urlIds: [uuid!],
             ${filters.types.length > 0 ? '$typeIds: [String],' : ''}
             ${filters.messages.length > 0 ? '$messageIds: [uuid],' : ''}
+            ${filters.tags.length > 0 ? '$tagIds: [uuid],' : ''}
+            ${filters.status.length > 0 ? '$equalified: Boolean,' : ''}
         ) {
             nodes: enodes(where: {
                 url_id: {_in: $urlIds},
-                ${filters.types.length > 0 ? `message_nodes: {message: {type: {_in: $typeIds}}},` : ``}
-                ${filters.messages.length > 0 ? `message_nodes: {message: {id: {_in: $messageIds}}},` : ``}
+                ${filters.status.length > 0 ? `equalified: {_eq: $equalified},` : ''}
+                ${filters.types.length > 0 && filters.messages.length > 0 ? `message_nodes: {message: {id: {_in: $messageIds}, type: {_in: $typeIds}}},` : `
+                    ${filters.types.length > 0 ? `message_nodes: {message: {type: {_in: $typeIds}}},` : ``}
+                    ${filters.messages.length > 0 ? `message_nodes: {message: {id: {_in: $messageIds}}},` : ``}
+                    ${filters.tags.length > 0 ? `message_nodes: {message: {message_tags:{tag:{id: {_in: $tagIds}}}}},` : ``}
+                `}
             }) {
                 nodeId: id
                 createdAt: created_at
                 html
                 targets
                 relatedUrlId: url_id
                 equalified
-                messageNodes: message_nodes {
+                messageNodes: message_nodes(where:{
+                    ${filters.types.length > 0 && filters.messages.length > 0 ? `message: {id: {_in: $messageIds}, type: {_in: $typeIds}},` : `
+                        ${filters.types.length > 0 ? `message: {type: {_in: $typeIds}},` : ``}
+                        ${filters.messages.length > 0 ? `message: {id: {_in: $messageIds}},` : ``}
+                        ${filters.tags.length > 0 ? `message: {message_tags:{tag:{id: {_in: $tagIds}}}},` : ``}
+                    `}
+                }) {
                     id
                     node: enode {
                         equalified
@@ -47,7 +59,9 @@ export const getResultsAll = async ({ request, reply }) => {
                         id
                         message
                         type
-                        messageTags: message_tags {
+                        messageTags: message_tags(where:{
+                            ${filters.tags.length > 0 ? `tag:{id: {_in: $tagIds}},` : ``}
+                        }) {
                             tag {
                                 id
                                 tag
@@ -61,6 +75,8 @@ export const getResultsAll = async ({ request, reply }) => {
             urlIds: urls.map(obj => obj.id),
             ...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 }),
         },
     });
     const filteredNodes = response?.nodes ?? [];

diff --git a/src/routes/getScans.ts b/src/routes/getScans.ts
@@ -4,7 +4,7 @@ export const getScans = async ({ request, reply }) => {
     const response = await graphql({
         request,
         query: `query($limit: Int, $offset: Int){
-            scans: scans_aggregate(limit: $limit, offset: $offset, order_by: {created_at: asc}, ${(request.query.scanIds) ? `where: { id: {_in: [
+            scans: scans_aggregate(limit: $limit, offset: $offset, order_by: {created_at: desc}, ${(request.query.scanIds) ? `where: { id: {_in: [
                         ${request.query.scanIds.split(',').map(obj => `"${obj}"`).join()}
                     ]}}` : ''}
                 ) {