@chevre/domain 22.9.0-alpha.64 → 22.9.0-alpha.65

package/example/src/chevre/findExportableTransaction.ts

@@ -0,0 +1,41 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
+
+    setInterval(
+        async () => {
+            const startTime = process.hrtime();
+            const transaction = await transactionRepo.findExportableTransaction({
+                // status: { $eq: params.status },
+                // id: params.id,
+                endDate: {
+                    $lt: moment()
+                        // tslint:disable-next-line:no-magic-numbers
+                        .add(-60, 'seconds')
+                        .toDate()
+                },
+                sort: { endDate: chevre.factory.sortType.Ascending }
+            });
+            const diff = process.hrtime(startTime);
+            console.log(`took ${diff[0]} seconds and ${diff[1]} nanoseconds.`);
+
+            // tslint:disable-next-line:no-null-keyword
+            console.dir(transaction?.id, { depth: null });
+        },
+        // tslint:disable-next-line:no-magic-numbers
+        1000
+    );
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/mongoose/schemas/transaction.js

@@ -193,6 +193,16 @@ const indexes = [
         { status: 1, expires: 1 },
         { name: 'makeExpired' }
     ],
+    [
+        { status: 1, 'tasksExportAction.actionStatus': 1, endDate: 1 },
+        {
+            name: 'exportTasksIfExists',
+            partialFilterExpression: {
+                'tasksExportAction.actionStatus': { $exists: true },
+                endDate: { $exists: true }
+            }
+        }
+    ],
     [
         { 'tasksExportAction.actionStatus': 1, startDate: -1 },
         {

package/lib/chevre/repo/transaction.d.ts

@@ -123,6 +123,22 @@ export declare class TransactionRepo {
         endDate: {
             $lt: Date;
         };
+        sort?: {
+            endDate?: factory.sortType;
+            startDate?: factory.sortType;
+        };
+    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | null>;
+    findExportableTransaction(params: {
+        status?: {
+            $eq?: factory.transactionStatusType;
+        };
+        endDate: {
+            $lt: Date;
+        };
+        sort?: {
+            endDate?: factory.sortType;
+            startDate?: factory.sortType;
+        };
     }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | null>;
     reexportTasksByExportAction(params: {
         intervalInMinutes: number;

package/lib/chevre/repo/transaction.js

@@ -553,7 +553,7 @@ class TransactionRepo {
      */
     startExportTasks(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c, _d;
             const statusEq = (_a = params.status) === null || _a === void 0 ? void 0 : _a.$eq;
             const endDateLt = (_b = params.endDate) === null || _b === void 0 ? void 0 : _b.$lt;
             if (typeof statusEq === 'string') {
@@ -567,11 +567,7 @@ class TransactionRepo {
             if (!(endDateLt instanceof Date)) {
                 throw new factory.errors.Argument('endDate.$lt', 'must be Date');
             }
-            // const typeOfIn = params.typeOf?.$in;
-            const sort = {
-                startDate: factory.sortType.Ascending
-            };
-            return this.transactionModel.findOneAndUpdate(Object.assign({ 
+            const query = this.transactionModel.findOneAndUpdate(Object.assign({ 
                 // ...(Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined,
                 status: Object.assign({}, (typeof statusEq === 'string')
                     ? { $eq: statusEq }
@@ -596,8 +592,57 @@ class TransactionRepo {
                     id: { $toString: '$_id' },
                     typeOf: 1
                 }
-            })
-                .sort(sort)
+            });
+            if (typeof ((_c = params.sort) === null || _c === void 0 ? void 0 : _c.endDate) === 'number' || typeof ((_d = params.sort) === null || _d === void 0 ? void 0 : _d.startDate) === 'number') {
+                query.sort(params.sort);
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean() // 2024-08-26~
+                .exec()
+                // tslint:disable-next-line:no-null-keyword
+                .then((doc) => (doc === null) ? null : doc);
+        });
+    }
+    findExportableTransaction(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
+            const statusEq = (_a = params.status) === null || _a === void 0 ? void 0 : _a.$eq;
+            const endDateLt = (_b = params.endDate) === null || _b === void 0 ? void 0 : _b.$lt;
+            if (typeof statusEq === 'string') {
+                switch (statusEq) {
+                    case factory.transactionStatusType.InProgress:
+                        throw new factory.errors.NotImplemented(`status "${params.status}" not implemented on startExportTasks`);
+                    default:
+                    // no op
+                }
+            }
+            if (!(endDateLt instanceof Date)) {
+                throw new factory.errors.Argument('endDate.$lt', 'must be Date');
+            }
+            const query = this.transactionModel.findOne({
+                status: Object.assign({}, (typeof statusEq === 'string')
+                    ? { $eq: statusEq }
+                    : {
+                        $in: [
+                            factory.transactionStatusType.Canceled,
+                            factory.transactionStatusType.Confirmed,
+                            factory.transactionStatusType.Expired
+                        ]
+                    }),
+                'tasksExportAction.actionStatus': {
+                    $exists: true,
+                    $eq: factory.actionStatusType.PotentialActionStatus
+                },
+                endDate: { $exists: true, $lt: endDateLt }
+            }, {
+                _id: 0,
+                id: { $toString: '$_id' },
+                typeOf: 1
+            });
+            if (typeof ((_c = params.sort) === null || _c === void 0 ? void 0 : _c.endDate) === 'number' || typeof ((_d = params.sort) === null || _d === void 0 ? void 0 : _d.startDate) === 'number') {
+                query.sort(params.sort);
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .lean() // 2024-08-26~
                 .exec()
                 // tslint:disable-next-line:no-null-keyword

package/lib/chevre/service/transaction.d.ts

@@ -56,4 +56,8 @@ export declare function exportOneTransactionTasksIfExists(params: {
     endDate: {
         $lt: Date;
     };
+    sort?: {
+        endDate?: factory.sortType;
+        startDate?: factory.sortType;
+    };
 }): IExportTasksOperation<void>;

package/lib/chevre/service/transaction.js

@@ -112,9 +112,9 @@ function updateAgent(params) {
 function exportOneTransactionTasksIfExists(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const transaction = yield repos.transaction.startExportTasks(Object.assign(Object.assign({ tasksExportAction: {
+        const transaction = yield repos.transaction.startExportTasks(Object.assign(Object.assign(Object.assign({ tasksExportAction: {
                 agent: { name: params.tasksExportAction.agent.name }
-            }, endDate: { $lt: params.endDate.$lt } }, (typeof params.id === 'string') ? { id: params.id } : undefined), (typeof ((_a = params.status) === null || _a === void 0 ? void 0 : _a.$eq) === 'string') ? { status: params.status } : undefined));
+            }, endDate: { $lt: params.endDate.$lt } }, (typeof params.id === 'string') ? { id: params.id } : undefined), (typeof ((_a = params.status) === null || _a === void 0 ? void 0 : _a.$eq) === 'string') ? { status: params.status } : undefined), (params.sort !== undefined) ? { sort: params.sort } : undefined));
         if (transaction === null) {
             return;
         }

package/package.json

@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.64"
+  "version": "22.9.0-alpha.65"
 }