@chevre/domain 21.8.0-alpha.3 → 21.8.0-alpha.5

package/example/src/chevre/db/stats.ts

@@ -0,0 +1,22 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+const KILO_BYTES = 1024;
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const stats = await mongoose.connection.db.collection('tasks')
+        .stats({
+            scale: KILO_BYTES * KILO_BYTES
+        });
+    console.log('scaleFactor:', stats.scaleFactor);
+    console.log('avgObjSize:', stats.avgObjSize);
+    console.log('count:', stats.count);
+    console.log('size:', stats.size);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/searchTasks.ts

@@ -10,18 +10,18 @@ async function main() {
 
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
-    const tasks = await taskRepo.taskModel.find(
+    const tasks = await taskRepo.search(
         {
-            'project.id': { $eq: project.id },
-            name: { $eq: chevre.factory.taskName.SendOrder },
-            'data.object.orderNumber': {
-                $exists: true,
-                $eq: 'xxx'
+            limit: 1,
+            project: { id: { $eq: project.id } },
+            name: { $in: [chevre.factory.taskName.SendOrder] },
+            data: {
+                object: {
+                    orderNumber: { $eq: 'xxx' }
+                }
             }
         }
-    )
-        .limit(1)
-        .exec();
+    );
     console.log('tasks found', tasks);
     console.log(tasks.length, 'tasks found');
 }

package/lib/chevre/repo/task.js

@@ -31,7 +31,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         const andConditions = [];
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
@@ -115,32 +115,21 @@ class MongoRepository {
         }
         const objectIdEq = (_k = (_j = (_h = params.data) === null || _h === void 0 ? void 0 : _h.object) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$eq;
         if (typeof objectIdEq === 'string') {
-            andConditions.push({
-                'data.object.id': {
-                    $exists: true,
-                    $eq: objectIdEq
-                }
-            });
+            andConditions.push({ 'data.object.id': { $exists: true, $eq: objectIdEq } });
+        }
+        const objectOrderNumberEq = (_o = (_m = (_l = params.data) === null || _l === void 0 ? void 0 : _l.object) === null || _m === void 0 ? void 0 : _m.orderNumber) === null || _o === void 0 ? void 0 : _o.$eq;
+        if (typeof objectOrderNumberEq === 'string') {
+            andConditions.push({ 'data.object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });
         }
-        const objectTransactionNumberEq = (_o = (_m = (_l = params.data) === null || _l === void 0 ? void 0 : _l.object) === null || _m === void 0 ? void 0 : _m.transactionNumber) === null || _o === void 0 ? void 0 : _o.$eq;
+        const objectTransactionNumberEq = (_r = (_q = (_p = params.data) === null || _p === void 0 ? void 0 : _p.object) === null || _q === void 0 ? void 0 : _q.transactionNumber) === null || _r === void 0 ? void 0 : _r.$eq;
         if (typeof objectTransactionNumberEq === 'string') {
-            andConditions.push({
-                'data.object.transactionNumber': {
-                    $exists: true,
-                    $eq: objectTransactionNumberEq
-                }
-            });
+            andConditions.push({ 'data.object.transactionNumber': { $exists: true, $eq: objectTransactionNumberEq } });
         }
-        const objectPurposeIdEq = (_r = (_q = (_p = params.data) === null || _p === void 0 ? void 0 : _p.purpose) === null || _q === void 0 ? void 0 : _q.id) === null || _r === void 0 ? void 0 : _r.$eq;
+        const objectPurposeIdEq = (_u = (_t = (_s = params.data) === null || _s === void 0 ? void 0 : _s.purpose) === null || _t === void 0 ? void 0 : _t.id) === null || _u === void 0 ? void 0 : _u.$eq;
         if (typeof objectPurposeIdEq === 'string') {
-            andConditions.push({
-                'data.purpose.id': {
-                    $exists: true,
-                    $eq: objectPurposeIdEq
-                }
-            });
+            andConditions.push({ 'data.purpose.id': { $exists: true, $eq: objectPurposeIdEq } });
         }
-        const objectPurposeOrderNumberEq = (_u = (_t = (_s = params.data) === null || _s === void 0 ? void 0 : _s.purpose) === null || _t === void 0 ? void 0 : _t.orderNumber) === null || _u === void 0 ? void 0 : _u.$eq;
+        const objectPurposeOrderNumberEq = (_x = (_w = (_v = params.data) === null || _v === void 0 ? void 0 : _v.purpose) === null || _w === void 0 ? void 0 : _w.orderNumber) === null || _x === void 0 ? void 0 : _x.$eq;
         if (typeof objectPurposeOrderNumberEq === 'string') {
             andConditions.push({
                 'data.purpose.orderNumber': {

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -134,12 +134,10 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
             .toDate();
         const tasks = [];
         yield Promise.all(order.paymentMethods.map((invoice) => __awaiter(this, void 0, void 0, function* () {
-            // tslint:disable-next-line:no-suspicious-comment
-            // TODO 注文にpaymentStatusを保証した後に実装する
-            // PaymentAutomaticallyAppliedであれば、自動決済処理を実行
-            // if (invoice.paymentStatus !== factory.paymentStatusType.PaymentAutomaticallyApplied) {
-            //     return;
-            // }
+            // PaymentAutomaticallyAppliedであれば、自動決済処理を実行(2023-08-24~)
+            if (invoice.paymentStatus !== factory.paymentStatusType.PaymentAutomaticallyApplied) {
+                return;
+            }
             // 冗長なタスク作成を回避
             const existingTasks = yield repos.task.search({
                 limit: 1,

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.327.0-alpha.1",
+    "@chevre/factory": "4.327.0-alpha.2",
     "@cinerino/sdk": "3.165.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.3"
+  "version": "21.8.0-alpha.5"
 }