@chevre/domain 21.8.0-alpha.23 → 21.8.0-alpha.24

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

@@ -57,6 +57,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     status?: string | undefined;
     data?: any;
     project?: any;
+    identifier?: string | undefined;
     runsAt?: Date | undefined;
     remainingNumberOfTries?: number | undefined;
     lastTriedAt?: Date | undefined;
@@ -69,6 +70,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     status?: string | undefined;
     data?: any;
     project?: any;
+    identifier?: string | undefined;
     runsAt?: Date | undefined;
     remainingNumberOfTries?: number | undefined;
     lastTriedAt?: Date | undefined;
@@ -81,6 +83,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     status?: string | undefined;
     data?: any;
     project?: any;
+    identifier?: string | undefined;
     runsAt?: Date | undefined;
     remainingNumberOfTries?: number | undefined;
     lastTriedAt?: Date | undefined;

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

@@ -9,6 +9,7 @@ exports.modelName = modelName;
  * タスクスキーマ
  */
 const schema = new mongoose_1.Schema({
+    identifier: String,
     project: mongoose_1.SchemaTypes.Mixed,
     name: String,
     status: String,
@@ -52,6 +53,13 @@ schema.index({ 'project.id': 1, runsAt: -1 }, { name: 'searchByProjectId-v202207
 schema.index({ name: 1, runsAt: -1 }, { name: 'searchByName-v2' });
 schema.index({ status: 1, runsAt: -1 }, { name: 'searchByStatus-v2' });
 schema.index({ runsAt: -1 }, { name: 'searchByRunsAt-v2' });
+// identifier追加(2023-09-01~)
+schema.index({ identifier: 1, runsAt: -1 }, {
+    name: 'searchByIdentifier',
+    partialFilterExpression: {
+        identifier: { $exists: true }
+    }
+});
 schema.index({ dateAborted: 1, runsAt: -1 }, {
     name: 'searchByDateAborted',
     partialFilterExpression: {

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

@@ -30,6 +30,10 @@ export declare class MongoRepository {
     saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[], options: IOptionOnCreate): Promise<{
         id: string;
     }[]>;
+    /**
+     * タスク識別子から冪等作成する
+     */
+    createIfNotExistByIdentifier(params: factory.task.IAttributes<factory.taskName>, options: IOptionOnCreate): Promise<void>;
     createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>, options: IOptionOnCreate): Promise<void>;
     /**
      * 取引削除タスク冪等作成

package/lib/chevre/repo/task.js

@@ -174,6 +174,30 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * タスク識別子から冪等作成する
+     */
+    createIfNotExistByIdentifier(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof params.identifier !== 'string' || params.identifier.length === 0) {
+                throw new factory.errors.ArgumentNull('identifier');
+            }
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                identifier: { $exists: true, $eq: params.identifier }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
     createInformTaskIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const createdTask = yield this.taskModel.findOneAndUpdate({

package/lib/chevre/service/order/onOrderStatusChanged/factory.d.ts

@@ -21,10 +21,6 @@ export declare function createConfirmRegisterServiceActionObjectByOrder(params:
     order: factory.order.IOrder;
 }): factory.action.interact.confirm.registerService.IObject[];
 export type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
-export declare function createOnPlaceOrderTasksByTransaction(params: {
-    object: factory.order.IOrder | IExternalOrder;
-    potentialActions?: factory.action.trade.order.IPotentialActions;
-}): factory.task.IAttributes<factory.taskName>[];
 /**
  * 注文配送後のアクション
  */

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOnOrderCancelledTasksByTransaction = exports.createOnOrderReturnedTasksByTransaction = exports.createOnOrderSentTasksByTransaction = exports.createOnPlaceOrderTasksByTransaction = exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
+exports.createOnOrderCancelledTasksByTransaction = exports.createOnOrderReturnedTasksByTransaction = exports.createOnOrderSentTasksByTransaction = exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const jwt = require("jsonwebtoken");
 const util_1 = require("util");
@@ -262,62 +262,38 @@ function createConfirmRegisterServiceActionObjectByOrder(params) {
     });
 }
 exports.createConfirmRegisterServiceActionObjectByOrder = createConfirmRegisterServiceActionObjectByOrder;
-function createOnPlaceOrderTasksByTransaction(params) {
-    const potentialActions = params.potentialActions;
-    const now = new Date();
-    // potentialActionsのためのタスクを生成
-    const taskAttributes = [];
-    // tslint:disable-next-line:no-single-line-block-comment
-    /* istanbul ignore else */
-    if (potentialActions !== undefined) {
-        // 冗長なsendOrderタスク作成を回避(createSendOrderTransactionTaskIfNotExistへ移行)(2023-08-25~)
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        // if (potentialActions.sendOrder !== undefined) {
-        //     const sendOrderTaskData: factory.task.IData<factory.taskName.SendOrder> = {
-        //         project: potentialActions.sendOrder.project,
-        //         object: {
-        //             ...potentialActions.sendOrder.object,
-        //             confirmationNumber: params.object.confirmationNumber
-        //         }
-        //         // 廃止(2023-08-21~)
-        //         // ...(potentialActions.sendOrder.potentialActions !== undefined)
-        //         //     ? { potentialActions: potentialActions.sendOrder.potentialActions }
-        //         //     : undefined
-        //     };
-        //     const sendOrderTask: factory.task.IAttributes<factory.taskName.SendOrder> = {
-        //         project: potentialActions.sendOrder.project,
-        //         name: factory.taskName.SendOrder,
-        //         status: factory.taskStatus.Ready,
-        //         runsAt: now, // なるはやで実行
-        //         remainingNumberOfTries: 10,
-        //         numberOfTried: 0,
-        //         executionResults: [],
-        //         data: sendOrderTaskData
-        //     };
-        //     taskAttributes.push(sendOrderTask);
-        // }
-        // ポイント付与
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (Array.isArray(potentialActions.givePointAward)) {
-            taskAttributes.push(...potentialActions.givePointAward.map((a) => {
-                return {
-                    project: a.project,
-                    name: factory.taskName.GivePointAward,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: a
-                };
-            }));
-        }
-    }
-    return taskAttributes;
-}
-exports.createOnPlaceOrderTasksByTransaction = createOnPlaceOrderTasksByTransaction;
+// export function createOnPlaceOrderTasksByTransaction(params: {
+//     object: factory.order.IOrder | IExternalOrder;
+//     potentialActions?: factory.action.trade.order.IPotentialActions;
+// }): factory.task.IAttributes<factory.taskName>[] {
+//     const potentialActions = params.potentialActions;
+//     const now = new Date();
+//     // potentialActionsのためのタスクを生成
+//     const taskAttributes: factory.task.IAttributes<factory.taskName>[] = [];
+//     // tslint:disable-next-line:no-single-line-block-comment
+//     /* istanbul ignore else */
+//     if (potentialActions !== undefined) {
+//         // ポイント付与
+//         // tslint:disable-next-line:no-single-line-block-comment
+//         /* istanbul ignore else */
+//         if (Array.isArray(potentialActions.givePointAward)) {
+//             taskAttributes.push(...potentialActions.givePointAward.map(
+//                 (a): factory.task.IAttributes<factory.taskName.GivePointAward> => {
+//                     return {
+//                         project: a.project,
+//                         name: factory.taskName.GivePointAward,
+//                         status: factory.taskStatus.Ready,
+//                         runsAt: now, // なるはやで実行
+//                         remainingNumberOfTries: 10,
+//                         numberOfTried: 0,
+//                         executionResults: [],
+//                         data: a
+//                     };
+//                 }));
+//         }
+//     }
+//     return taskAttributes;
+// }
 /**
  * 注文配送後のアクション
  */

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

@@ -94,19 +94,19 @@ function onOrderStatusChanged(params) {
                     // ...await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
                     // createConfirmReserveTransactionTasksIfNotExistへ移行(2023-08-25~)
                     // ...await createConfirmReserveTransactionTasks(params.order, simpleOrder)(repos),
-                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos),
+                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos)
                     // 取引のpotentialActionsを適用(2023-08-17~)
-                    ...(0, factory_1.createOnPlaceOrderTasksByTransaction)({
-                        object: params.order,
-                        // potentialActions: params.potentialActions
-                        potentialActions: (_h = (_g = (_f = params.placeOrderTransaction) === null || _f === void 0 ? void 0 : _f.potentialActions) === null || _g === void 0 ? void 0 : _g.order) === null || _h === void 0 ? void 0 : _h.potentialActions
-                    })
+                    // createGivePointAwardTaskIfNotExistへ移行(2023-09-01~)
+                    // ...createOnPlaceOrderTasksByTransaction({
+                    //     object: params.order,
+                    //     potentialActions: params.placeOrderTransaction?.potentialActions?.order?.potentialActions
+                    // })
                 ];
                 break;
             case factory.orderStatus.OrderReturned:
-                const potentialActionsByTransaction = (_m = (_l = (_k = (_j = params.returnOrderTransaction) === null || _j === void 0 ? void 0 : _j.potentialActions) === null || _k === void 0 ? void 0 : _k.returnOrder) === null || _l === void 0 ? void 0 : _l.find((returnOrderActionByTransaction) => {
+                const potentialActionsByTransaction = (_j = (_h = (_g = (_f = params.returnOrderTransaction) === null || _f === void 0 ? void 0 : _f.potentialActions) === null || _g === void 0 ? void 0 : _g.returnOrder) === null || _h === void 0 ? void 0 : _h.find((returnOrderActionByTransaction) => {
                     return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
-                })) === null || _m === void 0 ? void 0 : _m.potentialActions;
+                })) === null || _j === void 0 ? void 0 : _j.potentialActions;
                 tasks = [
                     ...(0, factory_1.createInformTasks)(params.order),
                     ...createReturnReserveTransactionTasks(params.order, simpleOrder),
@@ -133,6 +133,9 @@ function onOrderStatusChanged(params) {
                 // 冗長なsendOrderタスク作成を回避(2023-08-25~)
                 yield createSendOrderTransactionTaskIfNotExist({
                     object: params.order,
+                    potentialActions: (_m = (_l = (_k = params.placeOrderTransaction) === null || _k === void 0 ? void 0 : _k.potentialActions) === null || _l === void 0 ? void 0 : _l.order) === null || _m === void 0 ? void 0 : _m.potentialActions
+                })(repos);
+                yield createGivePointAwardTaskIfNotExist({
                     potentialActions: (_q = (_p = (_o = params.placeOrderTransaction) === null || _o === void 0 ? void 0 : _o.potentialActions) === null || _p === void 0 ? void 0 : _p.order) === null || _q === void 0 ? void 0 : _q.potentialActions
                 })(repos);
                 break;
@@ -309,6 +312,35 @@ function createSendOrderTransactionTaskIfNotExist(params) {
         }
     });
 }
+function createGivePointAwardTaskIfNotExist(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const now = new Date();
+        const givePointAwardsByTransaction = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.givePointAward;
+        if (Array.isArray(givePointAwardsByTransaction)) {
+            for (const givePointAwardByTransaction of givePointAwardsByTransaction) {
+                let taskIdentifier = `${givePointAwardByTransaction.project.id}:${factory.taskName.GivePointAward}:${Date.now()}`;
+                if (typeof givePointAwardByTransaction.object.identifier === 'string'
+                    && givePointAwardByTransaction.object.identifier.length > 0) {
+                    taskIdentifier = `${givePointAwardByTransaction.project.id}:${factory.taskName.GivePointAward}:${givePointAwardByTransaction.object.identifier}`;
+                }
+                const givePointAwardTask = {
+                    identifier: taskIdentifier,
+                    project: givePointAwardByTransaction.project,
+                    name: factory.taskName.GivePointAward,
+                    status: factory.taskStatus.Ready,
+                    runsAt: now,
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: givePointAwardByTransaction
+                };
+                // 冗長なgivePointAwardタスク作成を回避(2023-09-01~)
+                yield repos.task.createIfNotExistByIdentifier(givePointAwardTask, { emitImmediately: true });
+            }
+        }
+    });
+}
 // const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
 function createReturnReserveTransactionTasks(order, simpleOrder) {
     var _a, _b;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.329.0-alpha.1",
-    "@cinerino/sdk": "3.166.0-alpha.4",
+    "@chevre/factory": "4.329.0-alpha.2",
+    "@cinerino/sdk": "3.166.0-alpha.5",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.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.23"
+  "version": "21.8.0-alpha.24"
 }