@chevre/domain 21.30.0-alpha.5 → 21.30.0-alpha.7

package/example/src/chevre/optimizeActions.ts

@@ -16,11 +16,9 @@ async function main() {
     for (let index = 0; index < 24 * 548; index++) {
         const updateResult = await actionRepo.unsetUnnecessaryFields({
             filter: {
-                // typeOf: { $eq: chevre.factory.actionType.ConfirmAction },
-                // typeOf: { $eq: chevre.factory.actionType.SendAction },
-                // typeOf: { $eq: chevre.factory.actionType.ReturnAction },
-                typeOf: { $eq: chevre.factory.actionType.PayAction },
-                'purpose.typeOf': { $exists: true, $eq: chevre.factory.order.OrderType.Order },
+                typeOf: { $eq: chevre.factory.actionType.OrderAction },
+                'object.typeOf': { $exists: true, $eq: chevre.factory.order.OrderType.Order },
+                // 'purpose.typeOf': { $exists: true, $eq: chevre.factory.order.OrderType.Order },
                 startDate: {
                     $gte: moment()
                         .add(-(index + 1), 'hours')
@@ -32,9 +30,24 @@ async function main() {
                 // _id: { $eq: '61da235d94a80f000af85f6b' }
             },
             $unset: {
-                'purpose.project': 1,
-                'purpose.seller': 1,
-                'purpose.customer': 1
+                // 'purpose.project': 1,
+                // 'purpose.seller': 1,
+                // 'purpose.customer': 1
+                'object.project': 1,
+                'object.seller': 1,
+                'object.customer': 1,
+                'object.paymentMethods': 1,
+                'object.discounts': 1,
+                'object.acceptedOffers': 1,
+                'object.url': 1,
+                'object.orderStatus': 1,
+                'object.identifier': 1,
+                'object.isGift': 1,
+                'object.broker': 1,
+                'object.dateReturned': 1,
+                'object.name': 1,
+                'object.orderedItem': 1,
+                'object.returner': 1
             }
         });
         console.log(

package/example/src/chevre/searchActions.ts

@@ -24,7 +24,8 @@ async function main() {
             //         serviceOutput: { reservationFor: { id: { $eq: 'clhvvbpyn' } } }
             //     }
             // }
-            instrument: { transactionNumber: { $eq: 'x' } }
+            // instrument: { transactionNumber: { $eq: 'x' } },
+            sameAs: { id: { $eq: '66275034ae5d4c3e8997808c' } }
         },
         ['_id'],
         []

package/lib/chevre/repo/action.js

@@ -22,7 +22,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity 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, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73, _74, _75;
         const andConditions = [];
         const idIn = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$in;
         if (Array.isArray(idIn)) {
@@ -33,8 +33,6 @@ class MongoRepository {
             andConditions.push({ _id: { $nin: idNin } });
         }
         const projectIdEq = (_d = (_c = params.project) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof projectIdEq === 'string') {
             andConditions.push({
                 'project.id': {
@@ -42,8 +40,6 @@ class MongoRepository {
                 }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         const agentTypeOfIn = (_f = (_e = params.agent) === null || _e === void 0 ? void 0 : _e.typeOf) === null || _f === void 0 ? void 0 : _f.$in;
         if (Array.isArray(agentTypeOfIn)) {
             andConditions.push({
@@ -71,8 +67,6 @@ class MongoRepository {
             andConditions.push({ 'instrument.typeOf': { $exists: true, $eq: instrumentTypeOfEq } });
         }
         const locationIdEq = (_p = (_o = params.location) === null || _o === void 0 ? void 0 : _o.id) === null || _p === void 0 ? void 0 : _p.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof locationIdEq === 'string') {
             andConditions.push({
                 'location.id': {
@@ -82,8 +76,6 @@ class MongoRepository {
             });
         }
         const locationIdentifierEq = (_r = (_q = params.location) === null || _q === void 0 ? void 0 : _q.identifier) === null || _r === void 0 ? void 0 : _r.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof locationIdentifierEq === 'string') {
             andConditions.push({
                 'location.identifier': {
@@ -110,8 +102,6 @@ class MongoRepository {
                 }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         const objectPaymentMethodIdEq = (_1 = (_0 = params.object) === null || _0 === void 0 ? void 0 : _0.paymentMethodId) === null || _1 === void 0 ? void 0 : _1.$eq;
         if (typeof objectPaymentMethodIdEq === 'string') {
             andConditions.push({
@@ -131,8 +121,6 @@ class MongoRepository {
             });
         }
         const objectReservationForIdEq = (_7 = (_6 = (_5 = params.object) === null || _5 === void 0 ? void 0 : _5.reservationFor) === null || _6 === void 0 ? void 0 : _6.id) === null || _7 === void 0 ? void 0 : _7.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectReservationForIdEq === 'string') {
             andConditions.push({
                 'object.reservationFor.id': {
@@ -160,8 +148,6 @@ class MongoRepository {
             });
         }
         const objectPaymentMethodAccountIdEq = (_14 = (_13 = (_12 = params.object) === null || _12 === void 0 ? void 0 : _12.paymentMethod) === null || _13 === void 0 ? void 0 : _13.accountId) === null || _14 === void 0 ? void 0 : _14.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectPaymentMethodAccountIdEq === 'string') {
             andConditions.push({
                 'object.paymentMethod.accountId': {
@@ -171,8 +157,6 @@ class MongoRepository {
             });
         }
         const objectPaymentMethodPaymentMethodIdEq = (_17 = (_16 = (_15 = params.object) === null || _15 === void 0 ? void 0 : _15.paymentMethod) === null || _16 === void 0 ? void 0 : _16.paymentMethodId) === null || _17 === void 0 ? void 0 : _17.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectPaymentMethodPaymentMethodIdEq === 'string') {
             andConditions.push({
                 'object.paymentMethod.paymentMethodId': {
@@ -191,8 +175,6 @@ class MongoRepository {
             });
         }
         const objectPaymentMethodTypeOfEq = (_23 = (_22 = (_21 = params.object) === null || _21 === void 0 ? void 0 : _21.paymentMethod) === null || _22 === void 0 ? void 0 : _22.typeOf) === null || _23 === void 0 ? void 0 : _23.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectPaymentMethodTypeOfEq === 'string') {
             andConditions.push({
                 'object.paymentMethod.typeOf': {
@@ -202,8 +184,6 @@ class MongoRepository {
             });
         }
         const objectTypeOfEq = (_25 = (_24 = params.object) === null || _24 === void 0 ? void 0 : _24.typeOf) === null || _25 === void 0 ? void 0 : _25.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectTypeOfEq === 'string') {
             andConditions.push({
                 'object.typeOf': {
@@ -222,8 +202,6 @@ class MongoRepository {
             });
         }
         const objectIdEq = (_29 = (_28 = params.object) === null || _28 === void 0 ? void 0 : _28.id) === null || _29 === void 0 ? void 0 : _29.$eq;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof objectIdEq === 'string') {
             andConditions.push({
                 'object.id': {
@@ -272,8 +250,6 @@ class MongoRepository {
         if (typeof objectTransactionNumberEq === 'string') {
             andConditions.push({ 'object.transactionNumber': { $exists: true, $eq: objectTransactionNumberEq } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (typeof params.typeOf === 'string') {
             andConditions.push({
                 typeOf: params.typeOf
@@ -281,8 +257,6 @@ class MongoRepository {
         }
         else {
             const typeOfEq = (_46 = params.typeOf) === null || _46 === void 0 ? void 0 : _46.$eq;
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
             if (typeof typeOfEq === 'string') {
                 andConditions.push({
                     typeOf: { $eq: typeOfEq }
@@ -290,30 +264,22 @@ class MongoRepository {
             }
         }
         const actionStatusIn = (_47 = params.actionStatus) === null || _47 === void 0 ? void 0 : _47.$in;
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (Array.isArray(actionStatusIn)) {
             andConditions.push({
                 actionStatus: { $in: actionStatusIn }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         if (Array.isArray(params.actionStatusTypes)) {
             andConditions.push({
                 actionStatus: { $in: params.actionStatusTypes }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         const startDateGte = params.startFrom;
         if (startDateGte instanceof Date) {
             andConditions.push({
                 startDate: { $gte: startDateGte }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
         const startDateLte = params.startThrough;
         if (startDateLte instanceof Date) {
             andConditions.push({
@@ -437,6 +403,11 @@ class MongoRepository {
                 }
             });
         }
+        // sameAs(2024-04-23~)
+        const sameAsIdEq = (_75 = (_74 = params.sameAs) === null || _74 === void 0 ? void 0 : _74.id) === null || _75 === void 0 ? void 0 : _75.$eq;
+        if (typeof sameAsIdEq === 'string') {
+            andConditions.push({ 'sameAs.id': { $exists: true, $eq: sameAsIdEq } });
+        }
         return andConditions;
     }
     /**

package/lib/chevre/repo/mongoose/schemas/task.d.ts

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "Task";
-declare function createSchema(): Schema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
 export { modelName, indexes, createSchema };

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

@@ -18,7 +18,8 @@ const schemaDefinition = {
     executionResults: [mongoose_1.SchemaTypes.Mixed],
     executor: mongoose_1.SchemaTypes.Mixed,
     data: mongoose_1.SchemaTypes.Mixed,
-    dateAborted: Date
+    dateAborted: Date,
+    expires: Date // add(2024-04-23~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -46,17 +47,6 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * タスクスキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
-exports.createSchema = createSchema;
 const indexes = [
     [
         { createdAt: 1 },
@@ -123,24 +113,26 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'data.object.itemOffered.id': 1, runsAt: -1 },
-        {
-            name: 'searchByDataObjectItemOfferedId',
-            partialFilterExpression: {
-                'data.object.itemOffered.id': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'data.object.itemOffered.membershipFor.id': 1, runsAt: -1 },
-        {
-            name: 'searchByDataObjectItemOfferedMembershipForId',
-            partialFilterExpression: {
-                'data.object.itemOffered.membershipFor.id': { $exists: true }
-            }
-        }
-    ],
+    // 廃止(2024-04-23~)
+    // [
+    //     { 'data.object.itemOffered.id': 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByDataObjectItemOfferedId',
+    //         partialFilterExpression: {
+    //             'data.object.itemOffered.id': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // 廃止(2024-04-23~)
+    // [
+    //     { 'data.object.itemOffered.membershipFor.id': 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByDataObjectItemOfferedMembershipForId',
+    //         partialFilterExpression: {
+    //             'data.object.itemOffered.membershipFor.id': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'data.object.orderNumber': 1, runsAt: -1 },
         {
@@ -222,33 +214,52 @@ const indexes = [
                 lastTriedAt: { $type: 'date' }
             }
         }
-    ],
-    [
-        { 'data.transactionId': 1 },
-        {
-            partialFilterExpression: {
-                'data.transactionId': { $exists: true }
-            }
-        }
-    ],
-    [
-        // メール送信タスク存在確認に使用
-        { 'data.actionAttributes.object.identifier': 1, runsAt: -1 },
-        {
-            name: 'searchByDataActionAttributesObjectIdentifier',
-            partialFilterExpression: {
-                'data.actionAttributes.object.identifier': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'data.transactionId': 1, runsAt: -1 },
-        {
-            name: 'searchByDataTransactionId',
-            partialFilterExpression: {
-                'data.transactionId': { $exists: true }
-            }
-        }
     ]
+    // 廃止(2024-04-23~)
+    // [
+    //     { 'data.transactionId': 1 },
+    //     {
+    //         partialFilterExpression: {
+    //             'data.transactionId': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // 廃止(2024-04-23~)
+    // [
+    //     // メール送信タスク存在確認に使用
+    //     { 'data.actionAttributes.object.identifier': 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByDataActionAttributesObjectIdentifier',
+    //         partialFilterExpression: {
+    //             'data.actionAttributes.object.identifier': { $exists: true }
+    //         }
+    //     }
+    // ]
+    // 廃止(2024-04-23~)
+    // [
+    //     { 'data.transactionId': 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByDataTransactionId',
+    //         partialFilterExpression: {
+    //             'data.transactionId': { $exists: true }
+    //         }
+    //     }
+    // ]
 ];
 exports.indexes = indexes;
+/**
+ * タスクスキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

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

@@ -44,7 +44,7 @@ export interface IAggregateTask {
 interface IOptionOnCreate {
     emitImmediately: boolean;
 }
-export type IExecutableTaskKeys = 'data' | 'id' | 'name' | 'status' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt';
+export type IExecutableTaskKeys = 'data' | 'id' | 'name' | 'status' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'expires';
 export type IExecutableTask<T extends factory.taskName> = Pick<factory.task.ITask<T>, IExecutableTaskKeys>;
 /**
  * タスクリポジトリ

package/lib/chevre/repo/task.js

@@ -376,7 +376,8 @@ class MongoRepository {
                     numberOfTried: 1,
                     project: 1,
                     remainingNumberOfTries: 1,
-                    runsAt: 1
+                    runsAt: 1,
+                    expire: 1
                 }
             })
                 .exec();
@@ -413,7 +414,8 @@ class MongoRepository {
                     numberOfTried: 1,
                     project: 1,
                     remainingNumberOfTries: 1,
-                    runsAt: 1
+                    runsAt: 1,
+                    expire: 1
                 }
             })
                 .sort(sortOrder4executionOfTasks)

package/lib/chevre/service/task/refund.js

@@ -32,7 +32,7 @@ function call(params) {
         }
         let data;
         if (params.name === factory.taskName.Refund) {
-            data = Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
+            data = Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
              });
         }
         else {

package/lib/chevre/service/task.js

@@ -14,6 +14,7 @@ exports.notifyAbortedTasks = exports.abort = exports.retry = exports.execute = e
  * タスクサービス
  */
 const createDebug = require("debug");
+const moment = require("moment");
 const factory = require("../factory");
 const factory_1 = require("./notification/factory");
 const credentials_1 = require("../credentials");
@@ -92,6 +93,14 @@ function execute(task) {
     return (settings, options) => __awaiter(this, void 0, void 0, function* () {
         const taskRepo = new (yield Promise.resolve().then(() => require('../repo/task'))).MongoRepository(settings.connection);
         try {
+            // 期限検証(2024-04-23~)
+            if (task.expires instanceof Date) {
+                const taskExpired = moment(now)
+                    .isAfter(task.expires);
+                if (taskExpired) {
+                    throw new Error(`task expired [expires:${task.expires}]`);
+                }
+            }
             // タスク名の関数が定義されていなければ、TypeErrorとなる
             const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
             switch (task.name) {

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.368.0-alpha.1",
+    "@chevre/factory": "4.368.0-alpha.3",
     "@cinerino/sdk": "5.17.1",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.30.0-alpha.5"
+  "version": "21.30.0-alpha.7"
 }