@openstax/ts-utils 1.3.0 → 1.3.1

package/dist/cjs/services/lrsGateway/file-system.js

@@ -86,19 +86,33 @@ const fileSystemLrsGateway = (initializer) => (configProvider) => (authProvider)
         await save;
         return statementsWithDefaults;
     };
-    const getAllXapiStatements = async ({ user, anyUser, ...options }) => {
+    const getAllXapiStatements = async ({ user, anyUser, fetchUntil, ...options }) => {
         const authUser = await authProvider.getUser();
         await load;
-        return (data || []).filter(statement => {
+        let filteredData = (data || []).filter(statement => {
             var _a, _b, _c, _d;
+            const statementDate = new Date(statement.timestamp);
+            const sinceDate = options.since ? new Date(options.since) : null;
+            const untilDate = options.until ? new Date(options.until) : null;
             return (anyUser === true || statement.actor.account.name === (user || (0, assertions_1.assertDefined)(authUser, new errors_1.UnauthorizedError()).uuid))
                 && (!options.verb || statement.verb.id === options.verb)
                 && (!options.registration || ((_a = statement.context) === null || _a === void 0 ? void 0 : _a.registration) === options.registration)
                 && (!options.activity || (options.related_activities
                     ? ((statement.object.id === options.activity && statement.object.objectType === 'Activity')
                         || (!!((_d = (_c = (_b = statement.context) === null || _b === void 0 ? void 0 : _b.contextActivities) === null || _c === void 0 ? void 0 : _c.parent) === null || _d === void 0 ? void 0 : _d.find(parent => parent.id === options.activity && parent.objectType === 'Activity'))))
-                    : (statement.object.id === options.activity && statement.object.objectType === 'Activity')));
+                    : (statement.object.id === options.activity && statement.object.objectType === 'Activity')))
+                && (!sinceDate || statementDate >= sinceDate)
+                && (!untilDate || statementDate <= untilDate);
         });
+        if (fetchUntil) {
+            for (let i = 0; i < filteredData.length; i += pageSize) {
+                if (fetchUntil(filteredData.slice(0, i + pageSize))) {
+                    filteredData = filteredData.slice(0, i + pageSize);
+                    break;
+                }
+            }
+        }
+        return filteredData;
     };
     const getMoreXapiStatements = async (more) => {
         const { args, offset } = JSON.parse(more);

package/dist/cjs/services/lrsGateway/index.d.ts

@@ -90,6 +90,8 @@ export declare const lrsGateway: <C extends string = "lrs">(initializer: Initial
         related_activities?: boolean | undefined;
         user?: string | undefined;
         anyUser?: boolean | undefined;
+        since?: string | undefined;
+        until?: string | undefined;
     } & {
         ensureSync?: boolean | undefined;
     }) => Promise<{
@@ -100,15 +102,19 @@ export declare const lrsGateway: <C extends string = "lrs">(initializer: Initial
         more: string;
         statements: XapiStatement[];
     }>;
-    getAllXapiStatements: (params: {
+    getAllXapiStatements: ({ fetchUntil, ...params }: {
         verb?: string | undefined;
         activity?: string | undefined;
         registration?: string | undefined;
         related_activities?: boolean | undefined;
         user?: string | undefined;
         anyUser?: boolean | undefined;
+        since?: string | undefined;
+        until?: string | undefined;
     } & {
         ensureSync?: boolean | undefined;
+    } & {
+        fetchUntil?: ((statements: XapiStatement[]) => boolean) | undefined;
     }) => Promise<XapiStatement[]>;
 };
 export {};

package/dist/cjs/services/lrsGateway/index.js

@@ -123,9 +123,9 @@ ${await response.text()}`);
                 return formatGetXapiStatementsResponse(fetchXapiStatements(fetchParams));
             }
         };
-        const getAllXapiStatements = async (params) => {
+        const getAllXapiStatements = async ({ fetchUntil, ...params }) => {
             const loadRemaining = async (result) => {
-                if (!result.more) {
+                if (!result.more || (fetchUntil && fetchUntil(result.statements))) {
                     return result.statements;
                 }
                 const { more, statements } = await getMoreXapiStatements(result.more);