@chevre/domain 21.7.0-alpha.13 → 21.7.0-alpha.15

package/example/src/chevre/createDeleteTransactionTasks.ts

@@ -4,6 +4,8 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
+const ONE_YEAR_IN_DAYS = 365;
+
 // tslint:disable-next-line:max-func-body-length
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
@@ -11,9 +13,9 @@ async function main() {
     const now = new Date();
     const endDateLt: Date = moment(now)
         // tslint:disable-next-line:no-magic-numbers
-        .add(-365, 'days')
+        .add(-ONE_YEAR_IN_DAYS, 'days')
         .toDate();
-    const startDateLt: Date = moment('2021-09-01T00:00:00Z')
+    const startDateLt: Date = moment('2022-01-01T00:00:00Z')
         .toDate();
 
     const taskRepo = new chevre.repository.Task(mongoose.connection);
@@ -23,7 +25,6 @@ async function main() {
         {
             typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
             startDate: {
-                // $exists: true,
                 $lt: startDateLt
             }
             // endDate: {
@@ -58,12 +59,16 @@ async function main() {
         const isEndDateBefore = transaction.endDate !== undefined && moment(transaction.endDate)
             .isBefore(endDateLt);
         if (isEndDateBefore) {
+            const runsAt: Date = moment(transaction.endDate)
+                .add(ONE_YEAR_IN_DAYS, 'days')
+                .toDate();
+
             updateCount += 1;
             const deleteTransactionTask: chevre.factory.task.deleteTransaction.IAttributes = {
                 project: transaction.project,
                 name: chevre.factory.taskName.DeleteTransaction,
                 status: chevre.factory.taskStatus.Ready,
-                runsAt: now,
+                runsAt,
                 remainingNumberOfTries: 3,
                 numberOfTried: 0,
                 executionResults: [],

package/example/src/chevre/createDeleteTransactionTasksIfNotExist.ts

@@ -0,0 +1,98 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const ONE_YEAR_IN_DAYS = 365;
+type IDeletingTransaction = Pick<
+    chevre.factory.transaction.placeOrder.ITransaction,
+    'id' | 'project' | 'typeOf' | 'startDate' | 'endDate' | 'object'
+>;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const now = new Date();
+    const endDateLt: Date = moment(now)
+        // tslint:disable-next-line:no-magic-numbers
+        .add(-ONE_YEAR_IN_DAYS, 'days')
+        .toDate();
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
+
+    const deletingTransactions = <IDeletingTransaction[]>await transactionRepo.search<chevre.factory.transactionType.PlaceOrder>(
+        {
+            limit: 100,
+            page: 1,
+            sort: { startDate: chevre.factory.sortType.Ascending },
+            typeOf: chevre.factory.transactionType.PlaceOrder,
+            statuses: [
+                chevre.factory.transactionStatusType.Canceled,
+                chevre.factory.transactionStatusType.Confirmed,
+                chevre.factory.transactionStatusType.Expired
+            ],
+            endThrough: endDateLt,
+            inclusion: ['_id', 'project', 'typeOf', 'startDate', 'endDate', 'object'],
+            exclusion: []
+        }
+    );
+
+    let i = 0;
+    let updateCount = 0;
+    for (const deletingTransaction of deletingTransactions) {
+        i += 1;
+        const transaction: IDeletingTransaction = deletingTransaction;
+        console.log('checking...', transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+
+        const isEndDateBefore = transaction.endDate !== undefined && moment(transaction.endDate)
+            .isBefore(endDateLt);
+        if (isEndDateBefore) {
+            const runsAt: Date = moment(transaction.endDate)
+                .add(ONE_YEAR_IN_DAYS, 'days')
+                .toDate();
+
+            updateCount += 1;
+            const deleteTransactionTask: chevre.factory.task.deleteTransaction.IAttributes = {
+                project: transaction.project,
+                name: chevre.factory.taskName.DeleteTransaction,
+                status: chevre.factory.taskStatus.Ready,
+                runsAt,
+                remainingNumberOfTries: 3,
+                numberOfTried: 0,
+                executionResults: [],
+                data: {
+                    object: {
+                        specifyingMethod: chevre.factory.task.deleteTransaction.SpecifyingMethod.Id,
+                        endDate: transaction.endDate,
+                        id: transaction.id,
+                        object: {
+                            ...(typeof transaction.object.confirmationNumber === 'string')
+                                ? { confirmationNumber: transaction.object.confirmationNumber }
+                                : undefined,
+                            ...(typeof transaction.object.orderNumber === 'string')
+                                ? { orderNumber: transaction.object.orderNumber }
+                                : undefined
+                        },
+                        project: transaction.project,
+                        startDate: transaction.startDate,
+                        typeOf: transaction.typeOf
+                    }
+                }
+            };
+            console.log(
+                'saving task...',
+                deleteTransactionTask.runsAt, transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+            await taskRepo.createDeleteTransactionTaskIfNotExist(deleteTransactionTask, { emitImmediately: false });
+            console.log('task saved', transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+        }
+    }
+
+    console.log(i, 'transactions checked');
+    console.log(updateCount, 'transactions updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

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

package/lib/chevre/repo/task.js

@@ -206,6 +206,30 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * 取引削除タスク冪等作成
+     */
+    createDeleteTransactionTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.data.object.specifyingMethod !== factory.task.deleteTransaction.SpecifyingMethod.Id) {
+                throw new factory.errors.NotImplemented(`only ${factory.task.deleteTransaction.SpecifyingMethod.Id} implemented`);
+            }
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.id': { $exists: true, $eq: params.data.object.id }
+            }, { $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

@@ -34,4 +34,10 @@ export declare function createOnPlaceOrderTasksByTransaction(params: {
 export declare function createOnOrderSentTasksByTransaction(params: {
     potentialActions?: factory.action.transfer.send.order.IPotentialActions;
 }): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+/**
+ * 注文返品後のアクション
+ */
+export declare function createOnOrderReturnedTasksByTransaction(params: {
+    potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export {};

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.createOnOrderSentTasksByTransaction = exports.createOnPlaceOrderTasksByTransaction = exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
+exports.createOnOrderReturnedTasksByTransaction = exports.createOnOrderSentTasksByTransaction = exports.createOnPlaceOrderTasksByTransaction = 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");
@@ -437,3 +437,63 @@ function createOnOrderSentTasksByTransaction(params) {
     return taskAttributes;
 }
 exports.createOnOrderSentTasksByTransaction = createOnOrderSentTasksByTransaction;
+/**
+ * 注文返品後のアクション
+ */
+function createOnOrderReturnedTasksByTransaction(params) {
+    const now = new Date();
+    const taskAttributes = [];
+    const potentialActions = params.potentialActions;
+    // 入金返却タスク
+    const returnMoneyTransferAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.returnMoneyTransfer;
+    if (Array.isArray(returnMoneyTransferAttributes)) {
+        taskAttributes.push(...returnMoneyTransferAttributes.map((a) => {
+            return {
+                project: a.project,
+                name: factory.taskName.ReturnMoneyTransfer,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: a
+            };
+        }));
+    }
+    // ポイント特典返却タスク
+    const returnPointAwardAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.returnPointAward;
+    if (Array.isArray(returnPointAwardAttributes)) {
+        taskAttributes.push(...returnPointAwardAttributes.map((a) => {
+            return {
+                project: a.project,
+                name: factory.taskName.ReturnPointAward,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: a
+            };
+        }));
+    }
+    const sendEmailMessageAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.sendEmailMessage;
+    if (Array.isArray(sendEmailMessageAttributes)) {
+        sendEmailMessageAttributes.forEach((s) => {
+            const sendEmailMessageTask = {
+                project: s.project,
+                name: factory.taskName.SendEmailMessage,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                remainingNumberOfTries: 3,
+                numberOfTried: 0,
+                executionResults: [],
+                data: {
+                    actionAttributes: s
+                }
+            };
+            taskAttributes.push(sendEmailMessageTask);
+        });
+    }
+    return taskAttributes;
+}
+exports.createOnOrderReturnedTasksByTransaction = createOnOrderReturnedTasksByTransaction;

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

@@ -23,7 +23,7 @@ const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTE
 const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         let tasks = [];
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
@@ -93,11 +93,16 @@ function onOrderStatusChanged(params) {
                 ];
                 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) => {
+                    return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
+                })) === null || _m === void 0 ? void 0 : _m.potentialActions;
                 tasks = [
                     ...(0, factory_1.createInformTasks)(params.order),
-                    ...yield createReturnReserveTransactionTasks(params.order, simpleOrder)(repos),
+                    ...createReturnReserveTransactionTasks(params.order, simpleOrder),
                     // 決済取引返却タスクを作成(2022-06-09~)
-                    ...yield createReturnPayTransactionTasks(params.order, simpleOrder, params.returnOrderTransaction)(repos)
+                    ...createReturnPayTransactionTasks(params.order, simpleOrder, params.returnOrderTransaction),
+                    // 取引のpotentialActionsを適用(2023-08-19~)
+                    ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ potentialActions: potentialActionsByTransaction })
                 ];
                 break;
             default:
@@ -267,112 +272,108 @@ function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {
 }
 const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
 function createReturnReserveTransactionTasks(order, simpleOrder) {
-    return (__) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const taskRunsAt = moment(order.dateReturned)
-            .toDate();
-        const taskRunsAt4coa = moment(order.dateReturned)
-            .add(RETURN_COA_TASK_DELAY_IN_SECONDS, 'seconds')
-            .toDate();
-        const tasks = [];
-        const returnActionRecipient = {
-            typeOf: order.seller.typeOf,
-            id: order.seller.id,
-            name: order.seller.name
-        };
-        const reservationNumbers = [];
-        // 注文アイテムから返却アクションを作成する
-        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-        for (const acceptedOffer of acceptedOffers) {
-            if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation
-                || acceptedOffer.itemOffered.typeOf === factory.reservationType.BusReservation) {
-                const reservation = acceptedOffer.itemOffered;
-                const reservationNumber = reservation.reservationNumber;
-                // 予約番号ごとに返却アクションを作成する
-                if (!reservationNumbers.includes(reservationNumber)) {
-                    let returnReserveTransactionAction;
-                    switch ((_a = acceptedOffer.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) {
-                        case factory.service.webAPI.Identifier.COA:
-                            const superEventLocationBranchCode = (_b = reservation.reservationFor) === null || _b === void 0 ? void 0 : _b.superEvent.location.branchCode;
-                            const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-                            const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
-                            let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-                            // COAでは数字のみ受け付けるので数字以外を除去
-                            telNum = telNum.replace(/[^\d]/g, '');
-                            returnReserveTransactionAction = {
-                                project: order.project,
-                                typeOf: factory.actionType.ReturnAction,
-                                object: {
-                                    theaterCode: superEventLocationBranchCode,
-                                    reserveNum: reservationNumber,
-                                    telNum: telNum,
-                                    typeOf: 'COAReserveTransaction'
-                                },
-                                agent: order.project,
-                                // potentialActions: {},
-                                purpose: simpleOrder,
-                                instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA },
-                                recipient: returnActionRecipient
-                            };
-                            break;
-                        default:
-                            returnReserveTransactionAction = {
-                                project: order.project,
-                                typeOf: factory.actionType.ReturnAction,
-                                object: {
-                                    typeOf: factory.assetTransactionType.Reserve,
-                                    transactionNumber: reservationNumber
-                                },
-                                agent: order.project,
-                                // potentialActions: {},
-                                purpose: simpleOrder,
-                                instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre },
-                                recipient: returnActionRecipient
-                            };
-                    }
-                    tasks.push({
-                        project: order.project,
-                        name: factory.taskName.ReturnReserveTransaction,
-                        status: factory.taskStatus.Ready,
-                        runsAt: (returnReserveTransactionAction.object.typeOf === 'COAReserveTransaction')
-                            ? taskRunsAt4coa
-                            : taskRunsAt,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: returnReserveTransactionAction
-                    });
-                    reservationNumbers.push(reservationNumber);
+    var _a, _b;
+    const taskRunsAt = moment(order.dateReturned)
+        .toDate();
+    const taskRunsAt4coa = moment(order.dateReturned)
+        .add(RETURN_COA_TASK_DELAY_IN_SECONDS, 'seconds')
+        .toDate();
+    const tasks = [];
+    const returnActionRecipient = {
+        typeOf: order.seller.typeOf,
+        id: order.seller.id,
+        name: order.seller.name
+    };
+    const reservationNumbers = [];
+    // 注文アイテムから返却アクションを作成する
+    const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+    for (const acceptedOffer of acceptedOffers) {
+        if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation
+            || acceptedOffer.itemOffered.typeOf === factory.reservationType.BusReservation) {
+            const reservation = acceptedOffer.itemOffered;
+            const reservationNumber = reservation.reservationNumber;
+            // 予約番号ごとに返却アクションを作成する
+            if (!reservationNumbers.includes(reservationNumber)) {
+                let returnReserveTransactionAction;
+                switch ((_a = acceptedOffer.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) {
+                    case factory.service.webAPI.Identifier.COA:
+                        const superEventLocationBranchCode = (_b = reservation.reservationFor) === null || _b === void 0 ? void 0 : _b.superEvent.location.branchCode;
+                        const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
+                        const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
+                        let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
+                        // COAでは数字のみ受け付けるので数字以外を除去
+                        telNum = telNum.replace(/[^\d]/g, '');
+                        returnReserveTransactionAction = {
+                            project: order.project,
+                            typeOf: factory.actionType.ReturnAction,
+                            object: {
+                                theaterCode: superEventLocationBranchCode,
+                                reserveNum: reservationNumber,
+                                telNum: telNum,
+                                typeOf: 'COAReserveTransaction'
+                            },
+                            agent: order.project,
+                            // potentialActions: {},
+                            purpose: simpleOrder,
+                            instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA },
+                            recipient: returnActionRecipient
+                        };
+                        break;
+                    default:
+                        returnReserveTransactionAction = {
+                            project: order.project,
+                            typeOf: factory.actionType.ReturnAction,
+                            object: {
+                                typeOf: factory.assetTransactionType.Reserve,
+                                transactionNumber: reservationNumber
+                            },
+                            agent: order.project,
+                            // potentialActions: {},
+                            purpose: simpleOrder,
+                            instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre },
+                            recipient: returnActionRecipient
+                        };
                 }
-            }
-        }
-        return tasks;
-    });
-}
-const RETURN_PAY_TASK_DELAY_IN_SECONDS = 0;
-function createReturnPayTransactionTasks(order, __, returnOrderTransaction) {
-    return (__1) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const taskRunsAt = moment(order.dateReturned)
-            .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
-            .toDate();
-        const tasks = [];
-        const returnOrderPotentialActions = (_b = (_a = returnOrderTransaction === null || returnOrderTransaction === void 0 ? void 0 : returnOrderTransaction.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)) === null || _b === void 0 ? void 0 : _b.potentialActions;
-        const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions === null || returnOrderPotentialActions === void 0 ? void 0 : returnOrderPotentialActions.returnPaymentMethod;
-        if (Array.isArray(returnPayActionsByReturnOrderTransaction)) {
-            tasks.push(...returnPayActionsByReturnOrderTransaction.map((a) => {
-                return {
-                    project: a.project,
-                    name: factory.taskName.ReturnPayTransaction,
+                tasks.push({
+                    project: order.project,
+                    name: factory.taskName.ReturnReserveTransaction,
                     status: factory.taskStatus.Ready,
-                    runsAt: taskRunsAt,
+                    runsAt: (returnReserveTransactionAction.object.typeOf === 'COAReserveTransaction')
+                        ? taskRunsAt4coa
+                        : taskRunsAt,
                     remainingNumberOfTries: 10,
                     numberOfTried: 0,
                     executionResults: [],
-                    data: a
-                };
-            }));
+                    data: returnReserveTransactionAction
+                });
+                reservationNumbers.push(reservationNumber);
+            }
         }
-        return tasks;
-    });
+    }
+    return tasks;
+}
+const RETURN_PAY_TASK_DELAY_IN_SECONDS = 0;
+function createReturnPayTransactionTasks(order, __, returnOrderTransaction) {
+    var _a, _b;
+    const taskRunsAt = moment(order.dateReturned)
+        .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
+        .toDate();
+    const tasks = [];
+    const returnOrderPotentialActions = (_b = (_a = returnOrderTransaction === null || returnOrderTransaction === void 0 ? void 0 : returnOrderTransaction.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)) === null || _b === void 0 ? void 0 : _b.potentialActions;
+    const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions === null || returnOrderPotentialActions === void 0 ? void 0 : returnOrderPotentialActions.returnPaymentMethod;
+    if (Array.isArray(returnPayActionsByReturnOrderTransaction)) {
+        tasks.push(...returnPayActionsByReturnOrderTransaction.map((a) => {
+            return {
+                project: a.project,
+                name: factory.taskName.ReturnPayTransaction,
+                status: factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: a
+            };
+        }));
+    }
+    return tasks;
 }

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

@@ -14,9 +14,12 @@ const order_1 = require("../../factory/order");
 const factory_1 = require("../delivery/factory");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
-// tslint:disable-next-line:max-func-body-length
 function returnOrder(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (typeof params.useOnOrderStatusChanged !== 'boolean') {
+            throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+        }
         const orderNumber = params.object.orderNumber;
         const dateReturned = (params.object.dateReturned instanceof Date)
             ? params.object.dateReturned
@@ -88,14 +91,15 @@ function returnOrder(params) {
         }
         const result = returnedOwnershipInfos;
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
-        if (params.useOnOrderStatusChanged || params.useOnOrderStatusChanged === undefined) {
+        if (params.useOnOrderStatusChanged) {
             yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, returnOrderTransaction })({
                 registerActionInProgress: repos.registerServiceInProgress,
                 task: repos.task
             });
         }
         // 潜在アクション
-        yield onReturn(returnOrderActionAttributes)({ task: repos.task });
+        // onOrderStatusChangedへ移行(2023-08-19~)
+        // await onReturn(returnOrderActionAttributes)({ task: repos.task });
     });
 }
 exports.returnOrder = returnOrder;
@@ -122,98 +126,9 @@ function processReturnOrder(order, dateReturned) {
                         return ownershipInfoByDB;
                     }
                 });
-                // const ownershipInfoReturned: IOwnershipInfo = await repos.ownershipInfo.ownershipInfoModel.findOneAndUpdate(
-                //     {
-                //         'project.id': { $eq: order.project.id },
-                //         identifier: String(ownershipInfo.identifier)
-                //     },
-                //     { ownedThrough: dateReturned },
-                //     { new: true }
-                // )
-                //     .select({ __v: 0, createdAt: 0, updatedAt: 0 })
-                //     .exec()
-                //     .then((doc) => {
-                //         // 存在しない場合はいったん保留
-                //         if (doc === null) {
-                //             return ownershipInfo;
-                //         } else {
-                //             return doc.toObject();
-                //         }
-                //     });
                 returnedOwnershipInfos.push(ownershipInfoReturned);
             })));
         }
         return returnedOwnershipInfos;
     });
 }
-/**
- * 返品アクション後の処理
- * 注文返品後に何をすべきかは返品アクションのpotentialActionsとして定義されているはずなので、それらをタスクとして登録します。
- */
-function onReturn(returnActionAttributes) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const now = new Date();
-        const taskAttributes = [];
-        const potentialActions = returnActionAttributes.potentialActions;
-        // 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.returnMoneyTransfer)) {
-                taskAttributes.push(...potentialActions.returnMoneyTransfer.map((a) => {
-                    return {
-                        project: a.project,
-                        name: factory.taskName.ReturnMoneyTransfer,
-                        status: factory.taskStatus.Ready,
-                        runsAt: now,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: a
-                    };
-                }));
-            }
-            // ポイントインセンティブ返却タスク
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (Array.isArray(potentialActions.returnPointAward)) {
-                taskAttributes.push(...potentialActions.returnPointAward.map((a) => {
-                    return {
-                        project: a.project,
-                        name: factory.taskName.ReturnPointAward,
-                        status: factory.taskStatus.Ready,
-                        runsAt: now,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: a
-                    };
-                }));
-            }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (Array.isArray(potentialActions.sendEmailMessage)) {
-                potentialActions.sendEmailMessage.forEach((s) => {
-                    const sendEmailMessageTask = {
-                        project: s.project,
-                        name: factory.taskName.SendEmailMessage,
-                        status: factory.taskStatus.Ready,
-                        runsAt: now,
-                        remainingNumberOfTries: 3,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: {
-                            actionAttributes: s
-                        }
-                    };
-                    taskAttributes.push(sendEmailMessageTask);
-                });
-            }
-        }
-        // タスク保管
-        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
-}

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.7.0-alpha.13"
+  "version": "21.7.0-alpha.15"
 }

package/example/src/chevre/transaction/callOrderMembershipServiceTask.ts

@@ -1,65 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-import * as redis from 'redis';
-
-import { chevre } from '../../../../lib/index';
-
-import { call } from '../../../../lib/chevre/service/task/orderProgramMembership';
-
-const project = { id: String(process.env.PROJECT_ID) };
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const redisClient = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
-        socket: {
-            port: Number(<string>process.env.REDIS_PORT),
-            host: <string>process.env.REDIS_HOST
-        },
-        password: <string>process.env.REDIS_KEY
-    });
-    await redisClient.connect();
-
-    const result = await call(
-        {
-            agent: {
-                typeOf: chevre.factory.personType.Person,
-                id: 'b2bc2b6d-aea2-41fc-9f6e-e4ec89c11d2e',
-                identifier: [
-                    {
-                        name: 'iss',
-                        value: String(process.env.ISS)
-                    }
-                ]
-            },
-            object: {
-                seller: {
-                    id: '5d0abf30ac3fb200198ebb2c'
-                },
-                typeOf: chevre.factory.offerType.Offer,
-                itemOffered: {
-                    typeOf: chevre.factory.permit.PermitType.Permit,
-                    name: '[development]会員ポイントプログラム',
-                    issuedThrough: {
-                        id: '5afff104d51e59232c7b481b',
-                        typeOf: chevre.factory.product.ProductType.MembershipService
-                    }
-                },
-                id: '7k9f3ht34',
-                identifier: 'AnnualPlan'
-            },
-            project: {
-                typeOf: chevre.factory.organizationType.Project,
-                id: project.id
-            },
-            typeOf: chevre.factory.actionType.OrderAction
-        }
-    )({
-        connection: mongoose.connection,
-        redisClient
-    });
-    console.log(result);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/example/src/chevre/transaction/orderMembershipService.ts

@@ -1,105 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-import * as redis from 'redis';
-
-import { chevre } from '../../../../lib/index';
-
-import { orderProgramMembership } from '../../../../lib/chevre/service/transaction/orderProgramMembership';
-
-const project = { id: String(process.env.PROJECT_ID) };
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const redisClient = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
-        socket: {
-            port: Number(<string>process.env.REDIS_PORT),
-            host: <string>process.env.REDIS_HOST
-        },
-        password: <string>process.env.REDIS_KEY
-    });
-    await redisClient.connect();
-
-    const personRepo = new chevre.repository.Person({ userPoolId: chevre.settings.settings.userPoolIdNew });
-    const actionRepo = new chevre.repository.Action(mongoose.connection);
-    const accountRepo = new chevre.repository.Account(mongoose.connection);
-    const accountingReportRepo = new chevre.repository.AccountingReport(mongoose.connection);
-    const assetTransactionRepo = new chevre.repository.AssetTransaction(mongoose.connection);
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-    const offerRepo = new chevre.repository.Offer(mongoose.connection);
-    const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
-    const productRepo = new chevre.repository.Product(mongoose.connection);
-    const projectRepo = new chevre.repository.Project(mongoose.connection);
-    const ownershipInfoRepo = new chevre.repository.OwnershipInfo(mongoose.connection);
-    const sellerRepo = new chevre.repository.Seller(mongoose.connection);
-    const serviceOutputRepo = new chevre.repository.ServiceOutput(mongoose.connection);
-    const taskRepo = new chevre.repository.Task(mongoose.connection);
-    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
-    const confirmationNumberRepo = new chevre.repository.ConfirmationNumber(redisClient);
-    const orderNumberRepo = new chevre.repository.OrderNumber(redisClient);
-    const registerServiceInProgressRepo = new chevre.repository.action.RegisterServiceInProgress(redisClient);
-    const transactionNumberRepo = new chevre.repository.TransactionNumber(redisClient);
-    const serviceOutputIdentifierRepo = new chevre.repository.ServiceOutputIdentifier(redisClient);
-
-    const result = await orderProgramMembership(
-        {
-            agent: {
-                typeOf: chevre.factory.personType.Person,
-                id: 'b2bc2b6d-aea2-41fc-9f6e-e4ec89c11d2e',
-                identifier: [
-                    {
-                        name: 'iss',
-                        value: String(process.env.ISS)
-                    }
-                ]
-            },
-            object: {
-                seller: {
-                    id: '5d0abf30ac3fb200198ebb2c'
-                },
-                typeOf: chevre.factory.offerType.Offer,
-                itemOffered: {
-                    typeOf: chevre.factory.permit.PermitType.Permit,
-                    name: '[development]会員ポイントプログラム',
-                    issuedThrough: {
-                        id: '5afff104d51e59232c7b481b',
-                        typeOf: chevre.factory.product.ProductType.MembershipService
-                    }
-                },
-                id: '7k9f3ht34',
-                identifier: 'AnnualPlan'
-            },
-            project: {
-                typeOf: chevre.factory.organizationType.Project,
-                id: project.id
-            },
-            typeOf: chevre.factory.actionType.OrderAction
-        },
-        'CreditCard'
-    )({
-        account: accountRepo,
-        accountingReport: accountingReportRepo,
-        action: actionRepo,
-        assetTransaction: assetTransactionRepo,
-        confirmationNumber: confirmationNumberRepo,
-        event: eventRepo,
-        offer: offerRepo,
-        offerCatalog: offerCatalogRepo,
-        orderNumber: orderNumberRepo,
-        ownershipInfo: ownershipInfoRepo,
-        person: personRepo,
-        product: productRepo,
-        project: projectRepo,
-        registerActionInProgress: registerServiceInProgressRepo,
-        seller: sellerRepo,
-        serviceOutput: serviceOutputRepo,
-        serviceOutputIdentifier: serviceOutputIdentifierRepo,
-        task: taskRepo,
-        transaction: transactionRepo,
-        transactionNumber: transactionNumberRepo
-    });
-    console.log(result);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);