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

package/example/src/chevre/searchTasks.ts

@@ -0,0 +1,31 @@
+// tslint:disable:no-console
+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, { autoIndex: true });
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+
+    const tasks = await taskRepo.taskModel.find(
+        {
+            'project.id': { $eq: project.id },
+            name: { $eq: chevre.factory.taskName.SendOrder },
+            'data.object.orderNumber': {
+                $exists: true,
+                $eq: 'xxx'
+            }
+        }
+    )
+        .limit(1)
+        .exec();
+    console.log('tasks found', tasks);
+    console.log(tasks.length, 'tasks found');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -83,6 +83,12 @@ schema.index({ 'data.object.itemOffered.membershipFor.id': 1, runsAt: -1 }, {
         'data.object.itemOffered.membershipFor.id': { $exists: true }
     }
 });
+schema.index({ 'data.object.orderNumber': 1, runsAt: -1 }, {
+    name: 'searchByDataObjectOrderNumber',
+    partialFilterExpression: {
+        'data.object.orderNumber': { $exists: true }
+    }
+});
 schema.index({ 'data.object.transactionNumber': 1, runsAt: -1 }, {
     name: 'searchByDataObjectTransactionNumber',
     partialFilterExpression: {

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

@@ -35,6 +35,7 @@ export declare class MongoRepository {
      * 取引削除タスク冪等作成
      */
     createDeleteTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.DeleteTransaction>, options: IOptionOnCreate): Promise<void>;
+    createSendOrderTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.SendOrder>, options: IOptionOnCreate): Promise<void>;
     executeById(params: {
         id: string;
         executor: {

package/lib/chevre/repo/task.js

@@ -230,6 +230,27 @@ class MongoRepository {
             }
         });
     }
+    createSendOrderTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.orderNumber': {
+                    $exists: true,
+                    $eq: String(params.data.object.orderNumber)
+                }
+            }, { $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
+                });
+            }
+        });
+    }
     executeById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.taskModel.findOneAndUpdate({

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

@@ -21,9 +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;

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

@@ -262,71 +262,6 @@ function createConfirmRegisterServiceActionObjectByOrder(params) {
     });
 }
 exports.createConfirmRegisterServiceActionObjectByOrder = createConfirmRegisterServiceActionObjectByOrder;
-/**
- * 注文作成後のアクション
- */
-// export function onPlaceOrder(params: {
-//     object: factory.order.IOrder | IExternalOrder;
-//     potentialActions?: factory.action.trade.order.IPotentialActions;
-// }) {
-//     return async (repos: {
-//         task: TaskRepo;
-//     }) => {
-//         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 (potentialActions.sendOrder !== 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: potentialActions.sendOrder
-//                     data: {
-//                         project: potentialActions.sendOrder.project,
-//                         object: {
-//                             ...potentialActions.sendOrder.object,
-//                             confirmationNumber: params.object.confirmationNumber
-//                         },
-//                         ...(potentialActions.sendOrder.potentialActions !== undefined)
-//                             ? { potentialActions: potentialActions.sendOrder.potentialActions }
-//                             : undefined
-//                     }
-//                 };
-//                 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): 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
-//                         };
-//                     }));
-//             }
-//         }
-//         // タスク保管
-//         await repos.task.saveMany(taskAttributes, { emitImmediately: true });
-//     };
-// }
 function createOnPlaceOrderTasksByTransaction(params) {
     const potentialActions = params.potentialActions;
     const now = new Date();
@@ -335,29 +270,33 @@ function createOnPlaceOrderTasksByTransaction(params) {
     // tslint:disable-next-line:no-single-line-block-comment
     /* istanbul ignore else */
     if (potentialActions !== undefined) {
+        // 冗長なsendOrderタスク作成を回避(createSendOrderTransactionTaskIfNotExistへ移行)(2023-08-24~)
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
-        if (potentialActions.sendOrder !== undefined) {
-            const sendOrderTaskData = {
-                project: potentialActions.sendOrder.project,
-                object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber })
-                // 廃止(2023-08-21~)
-                // ...(potentialActions.sendOrder.potentialActions !== undefined)
-                //     ? { potentialActions: potentialActions.sendOrder.potentialActions }
-                //     : undefined
-            };
-            const sendOrderTask = {
-                project: potentialActions.sendOrder.project,
-                name: factory.taskName.SendOrder,
-                status: factory.taskStatus.Ready,
-                runsAt: now,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: sendOrderTaskData
-            };
-            taskAttributes.push(sendOrderTask);
-        }
+        // 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 */

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

@@ -24,7 +24,7 @@ const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         let tasks = [];
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
@@ -115,6 +115,16 @@ function onOrderStatusChanged(params) {
             default:
         }
         yield repos.task.saveMany(tasks, { emitImmediately: true });
+        switch (params.order.orderStatus) {
+            case factory.orderStatus.OrderProcessing:
+                // 冗長なsendOrderタスク作成を回避(2023-08-24~)
+                yield createSendOrderTransactionTaskIfNotExist({
+                    object: params.order,
+                    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;
+            default:
+        }
     });
 }
 exports.onOrderStatusChanged = onOrderStatusChanged;
@@ -285,6 +295,30 @@ function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {
         }
     });
 }
+function createSendOrderTransactionTaskIfNotExist(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const now = new Date();
+        const sendOrderByTransaction = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.sendOrder;
+        if (sendOrderByTransaction !== undefined) {
+            const sendOrderTaskData = {
+                project: sendOrderByTransaction.project,
+                object: Object.assign(Object.assign({}, sendOrderByTransaction.object), { confirmationNumber: params.object.confirmationNumber })
+            };
+            const sendOrderTask = {
+                project: sendOrderByTransaction.project,
+                name: factory.taskName.SendOrder,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: sendOrderTaskData
+            };
+            yield repos.task.createSendOrderTaskIfNotExist(sendOrderTask, { emitImmediately: true });
+        }
+    });
+}
 const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
 function createReturnReserveTransactionTasks(order, simpleOrder) {
     var _a, _b;

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

@@ -232,6 +232,7 @@ function placeOrder(params) {
                 });
             }
             else if (order.orderStatus === factory.orderStatus.OrderProcessing) {
+                // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
                 // OrderPaymentDueに対する処理をまず強制的に実行する(2023-08-24~)
                 yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
                     order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderPaymentDue }),
@@ -240,16 +241,18 @@ function placeOrder(params) {
                     registerActionInProgress: repos.registerActionInProgress,
                     task: repos.task
                 });
-                // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
-                // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpayOrderを実行する必要がある
-                yield (0, payOrder_1.payOrder)({
-                    project: { id: order.project.id },
-                    object: {
-                        confirmationNumber: order.confirmationNumber,
-                        orderNumber: order.orderNumber
-                    },
-                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
-                })(repos);
+                // paymentMethods.length: 0の場合を考慮(2023-08-24~)
+                if (order.paymentMethods.length === 0) {
+                    // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpayOrderを実行する必要がある
+                    yield (0, payOrder_1.payOrder)({
+                        project: { id: order.project.id },
+                        object: {
+                            confirmationNumber: order.confirmationNumber,
+                            orderNumber: order.orderNumber
+                        },
+                        useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                    })(repos);
+                }
             }
             else {
                 throw new factory.errors.NotImplemented(`placing an order on the status '${order.orderStatus}' not implemented`);

package/package.json

@@ -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.2"
+  "version": "21.8.0-alpha.3"
 }