feat: 🎸 Use subqueries

Author: ZedLi

addons/api/addon/utils/sqlite-query.js

@@ -69,7 +69,7 @@ function addFilterConditions({ filters, parameters, conditions }) {
       ? filterArrayOrObject
       : filterArrayOrObject.values;
 
-    if (!filterValueArray || !filterValueArray.length) {
+    if (!filterValueArray || !filterValueArray.length || key === 'subqueries') {
       continue;
     }
 
@@ -131,6 +131,22 @@ function addFilterConditions({ filters, parameters, conditions }) {
       ),
     );
   }
+
+  if (filters.subqueries?.length > 0) {
+    filters.subqueries.forEach((subquery) => {
+      const { resource, query, select } = subquery;
+      const { sql, parameters: subqueryParams } = generateSQLExpressions(
+        resource,
+        query,
+        {
+          select,
+        },
+      );
+
+      conditions.push(`id IN (${sql})`);
+      parameters.push(...subqueryParams);
+    });
+  }
 }
 
 function addSearchConditions({

addons/api/tests/unit/utils/sqlite-query-test.js

@@ -410,6 +410,48 @@ module('Unit | Utility | sqlite-query', function (hooks) {
     ]);
   });
 
+  test('it generates subqueries with filters', function (assert) {
+    const query = {
+      filters: {
+        type: [{ equals: 'ssh' }],
+        subqueries: [
+          {
+            resource: 'session',
+            query: {
+              filters: {
+                status: [{ equals: 'active' }],
+              },
+            },
+            select: [{ field: 'target_id' }],
+          },
+          {
+            resource: 'session-recording',
+            query: {
+              filters: {
+                state: [{ equals: 'available' }],
+              },
+            },
+            select: [{ field: 'target_id' }],
+          },
+        ],
+      },
+    };
+
+    const { sql, parameters } = generateSQLExpressions('target', query);
+    assert.strictEqual(
+      sql,
+      `
+        SELECT * FROM "target"
+        WHERE (type = ?) AND id IN (SELECT target_id FROM "session"
+                                    WHERE (status = ?)
+                                    ORDER BY created_time DESC) AND id IN (SELECT target_id FROM "session_recording"
+                                                                            WHERE (state = ?)
+                                                                            ORDER BY created_time DESC)
+        ORDER BY created_time DESC`.removeExtraWhiteSpace(),
+    );
+    assert.deepEqual(parameters, ['ssh', 'active', 'available']);
+  });
+
   test('it generates SQL with all clauses combined', function (assert) {
     const query = {
       search: 'favorite',

ui/admin/app/routes/scopes/scope/targets/index.js

@@ -92,19 +92,25 @@ export default class ScopesScopeTargetsIndexRoute extends Route {
       });
 
       if (this.can.can('list model', scope, { collection: 'sessions' })) {
-        const sessions = await this.store.query('session', {
-          scope_id,
-          query: {
-            filters: {
-              scope_id: [{ equals: scope_id }],
-              status: [
-                { equals: STATUS_SESSION_ACTIVE },
-                { equals: STATUS_SESSION_PENDING },
-              ],
+        await this.store.query(
+          'session',
+          {
+            scope_id,
+            query: {
+              filters: {
+                scope_id: [{ equals: scope_id }],
+                status: [
+                  { equals: STATUS_SESSION_ACTIVE },
+                  { equals: STATUS_SESSION_PENDING },
+                ],
+              },
             },
+            page: 1,
+            pageSize: 1,
           },
-        });
-        this.addActiveSessionFilters(filters, availableSessions, sessions);
+          { pushToStore: false },
+        );
+        this.addActiveSessionFilters(filters, availableSessions);
       }
 
       const typeMap = {
@@ -186,38 +192,52 @@ export default class ScopesScopeTargetsIndexRoute extends Route {
    * Add the filters for active sessions to the filter object.
    * @param filters
    * @param availableSessions
-   * @param sessions
    */
-  addActiveSessionFilters = (filters, availableSessions, sessions) => {
-    const uniqueTargetIdsWithSessions = new Set(
-      sessions.map((session) => session.target_id),
-    );
-
+  addActiveSessionFilters = (filters, availableSessions) => {
     // Don't add any filtering if the user selects both which is equivalent to no filters
     if (availableSessions.length === 2) {
       return;
     }
 
     availableSessions.forEach((availability) => {
       if (availability === 'yes') {
-        filters.id.logicalOperator = 'or';
-        uniqueTargetIdsWithSessions.forEach((targetId) => {
-          filters.id.values.push({ equals: targetId });
-        });
-
-        // If there's no sessions just set it to a dummy value
-        // so the search returns no results
-        if (uniqueTargetIdsWithSessions.size === 0) {
-          filters.id.values.push({ equals: 'none' });
-        }
+        filters.subqueries = [
+          {
+            resource: 'session',
+            query: {
+              filters: {
+                status: {
+                  logicalOperator: 'or',
+                  values: [
+                    { equals: STATUS_SESSION_ACTIVE },
+                    { equals: STATUS_SESSION_PENDING },
+                  ],
+                },
+              },
+            },
+            select: [{ field: 'target_id' }],
+          },
+        ];
       }
 
       if (availability === 'no') {
-        filters.id.logicalOperator = 'and';
-
-        uniqueTargetIdsWithSessions.forEach((targetId) => {
-          filters.id.values.push({ notEquals: targetId });
-        });
+        filters.subqueries = [
+          {
+            resource: 'session',
+            query: {
+              filters: {
+                status: {
+                  logicalOperator: 'and',
+                  values: [
+                    { notEquals: STATUS_SESSION_ACTIVE },
+                    { notEquals: STATUS_SESSION_PENDING },
+                  ],
+                },
+              },
+            },
+            select: [{ field: 'target_id' }],
+          },
+        ];
       }
     });
   };