WiP on segments

models/subscriptions.js

@@ -6,6 +6,8 @@ const interoperableErrors = require('../shared/interoperable-errors');
 const shares = require('./shares');
 const fields = require('./fields');
 const { SubscriptionStatus } = require('../shared/lists');
+const segments = require('./segments');
+
 
 const allowedKeysBase = new Set(['cid', 'email']);
 
@@ -18,16 +20,23 @@ function hash(entity) {
 }
 
 
-async function listDTAjax(context, listId, params) {
+async function listDTAjax(context, listId, segmentId, params) {
     return await knex.transaction(async tx => {
         await shares.enforceEntityPermissionTx(tx, context, 'list', listId, 'viewSubscriptions');
 
         const flds = await fields.listByOrderListTx(tx, listId, ['column']);
+        const addSegmentQuery = segmentId ? await segments.getQueryGeneratorTx(tx, listId, segmentId) : () => {};
 
         return await dtHelpers.ajaxListTx(
             tx,
             params,
-            builder => builder.from(`subscription__${listId}`),
+            builder => {
+                const query = builder.from(`subscription__${listId}`);
+                query.where(function() {
+                    addSegmentQuery(this);
+                });
+                return query;
+            },
             ['id', 'cid', 'email', 'status', 'created', ...flds.map(fld => fld.column)]
         );
     });