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

package/example/src/chevre/countDelayedTasks.ts

@@ -11,7 +11,7 @@ export async function main() {
     const count = await taskRepo.countDelayedTasks({
         delayInSeconds: 60,
         name: {
-            $nin: [chevre.factory.taskName.OrderProgramMembership]
+            $nin: [<any>'orderProgramMembership']
         }
     });
     console.log('count:', count);

package/example/src/chevre/createDeleteTransactionTasks.ts

@@ -0,0 +1,103 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+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(-365, 'days')
+        .toDate();
+    const startDateLt: Date = moment('2021-09-01T00:00:00Z')
+        .toDate();
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
+
+    const cursor = transactionRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
+            startDate: {
+                // $exists: true,
+                $lt: startDateLt
+            }
+            // endDate: {
+            //     $exists: true,
+            //     $lt: moment(now)
+            //         // tslint:disable-next-line:no-magic-numbers
+            //         .add(-365, 'days')
+            //         .toDate()
+            // }
+        },
+        {
+            _id: 1,
+            typeOf: 1,
+            project: 1,
+            startDate: 1,
+            endDate: 1,
+            object: 1
+        }
+    );
+    console.log('transactions found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const transaction: Pick<
+            chevre.factory.transaction.placeOrder.ITransaction,
+            'id' | 'project' | 'typeOf' | 'startDate' | 'endDate' | 'object'
+        > = doc.toObject();
+        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) {
+            updateCount += 1;
+            const deleteTransactionTask: chevre.factory.task.deleteTransaction.IAttributes = {
+                project: transaction.project,
+                name: chevre.factory.taskName.DeleteTransaction,
+                status: chevre.factory.taskStatus.Ready,
+                runsAt: now,
+                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, transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+            await taskRepo.saveMany([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/example/src/chevre/deleteRunsAtPassedCertainPeriod.ts

@@ -0,0 +1,28 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const TASK_STORAGE_PERIOD_IN_DAYS = 365;
+
+async function main() {
+    const now = new Date();
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+
+    const result = await taskRepo.deleteRunsAtPassedCertainPeriod({
+        runsAt: {
+            $lt: moment(now)
+                .add(-TASK_STORAGE_PERIOD_IN_DAYS, 'days')
+                .toDate()
+        }
+    });
+
+    console.log('deleted', result);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/deleteTasksByName.ts

@@ -12,7 +12,7 @@ async function main() {
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
     const result = await taskRepo.deleteByName({
-        name: chevre.factory.taskName.OrderProgramMembership,
+        name: <any>'orderProgramMembership',
         status: { $eq: chevre.factory.taskStatus.Ready }
         // runsAt: {
         //     $gte: moment('2023-05-20T00:00:00Z')

package/example/src/chevre/migrateAuthorizePaymentActionResult.ts

@@ -46,7 +46,7 @@ async function main() {
             'id' | 'project' | 'result' | 'typeOf' | 'startDate' | 'actionStatus'
         > = doc.toObject();
 
-        const oldPaymentMethodType = action.result?.paymentMethod;
+        const oldPaymentMethodType = (<any>action).result?.paymentMethod;
         const paymentMethodType = action.result?.paymentMethodAsObject?.typeOf;
         const alreadyMigrated = typeof paymentMethodType === 'string' && oldPaymentMethodType === paymentMethodType;
 

package/example/src/chevre/migrateOwnershipInfos2newUserPool.ts

@@ -3,9 +3,12 @@
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
-import { ISS_PREFIX, USERPOOL_ID_NEW } from './checkOrderMembershipTasks';
 import { migrateUser } from './migrateCognitoUser';
 
+// export const USERPOOL_ID_OLD = String(process.env.USERPOOL_ID_OLD);
+export const USERPOOL_ID_NEW = String(process.env.USERPOOL_ID_NEW);
+export const ISS_PREFIX = 'https://cognito-idp.ap-northeast-1.amazonaws.com/';
+
 const project = { id: String(process.env.PROJECT_ID) };
 const PRODUCT_TYPE = chevre.factory.product.ProductType.EventService;
 

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -18,10 +18,8 @@ async function main() {
             typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
             status: { $eq: chevre.factory.transactionStatusType.Confirmed },
             startDate: {
-                $lte: moment('2023-04-01T00:00:00Z')
+                $lte: moment('2023-08-16T07:26:00Z')
                     .toDate()
-                // $lte: moment('2023-08-16T07:26:00Z')
-                //     .toDate()
             },
             'object.authorizeActions': { $exists: true }
         },

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

@@ -63,7 +63,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;
@@ -108,7 +108,7 @@ export declare class MongoRepository {
         runsAt: {
             $lt: Date;
         };
-    }): Promise<void>;
+    }): Promise<import("mongodb").DeleteResult>;
     countDelayedTasks(params: {
         delayInSeconds: number;
         name: {

package/lib/chevre/repo/task.js

@@ -427,7 +427,7 @@ class MongoRepository {
      */
     deleteRunsAtPassedCertainPeriod(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.taskModel.deleteMany({
+            return this.taskModel.deleteMany({
                 runsAt: { $lt: params.runsAt.$lt },
                 status: { $in: [factory.taskStatus.Aborted, factory.taskStatus.Executed] }
             })

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 interface IAggregationByStatus {
@@ -193,6 +217,7 @@ export declare class MongoRepository {
         filter: any;
         $unset: any;
     }): Promise<import("mongodb").UpdateResult>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     aggregatePlaceOrder(params: {
         project?: {
             id?: {

package/lib/chevre/repo/transaction.js

@@ -776,6 +776,11 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.transactionModel.find(conditions, projection)
+            .sort({ startDate: factory.sortType.Descending })
+            .cursor();
+    }
     aggregatePlaceOrder(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

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

@@ -20,4 +20,18 @@ export declare function createConfirmReservationActionObject4COAByOrder(params:
 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>[];
+/**
+ * 注文配送後のアクション
+ */
+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 {};

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.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
+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");
@@ -262,3 +262,178 @@ 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();
+    // potentialActionsのためのタスクを生成
+    const taskAttributes = [];
+    // 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 = {
+                project: potentialActions.sendOrder.project,
+                name: factory.taskName.SendOrder,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: Object.assign({ project: potentialActions.sendOrder.project, object: Object.assign(Object.assign({}, 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) => {
+                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;
+/**
+ * 注文配送後のアクション
+ */
+function createOnOrderSentTasksByTransaction(params) {
+    const potentialActions = params.potentialActions;
+    const now = new Date();
+    const taskAttributes = [];
+    // tslint:disable-next-line:no-single-line-block-comment
+    /* istanbul ignore else */
+    if (potentialActions !== undefined) {
+        if (Array.isArray(potentialActions.registerService)) {
+            taskAttributes.push(...potentialActions.registerService.map((a) => {
+                return {
+                    project: a.project,
+                    name: factory.taskName.ConfirmRegisterService,
+                    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.moneyTransfer)) {
+            taskAttributes.push(...potentialActions.moneyTransfer.map((a) => {
+                return {
+                    project: a.project,
+                    name: factory.taskName.ConfirmMoneyTransfer,
+                    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);
+            });
+        }
+    }
+    return taskAttributes;
+}
+exports.createOnOrderSentTasksByTransaction = createOnOrderSentTasksByTransaction;

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

@@ -1,6 +1,7 @@
 import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import * as factory from '../../factory';
+import { IExternalOrder } from './onOrderStatusChanged/factory';
 type IPlaceOrderTransaction = factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
 type IReturnOrderTransaction = factory.transaction.ITransaction<factory.transactionType.ReturnOrder>;
 export declare function onOrderStatusChanged(params: {
@@ -11,5 +12,4 @@ export declare function onOrderStatusChanged(params: {
     registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
 }) => Promise<void>;
-export type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
-export {};
+export { IExternalOrder };

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;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let tasks = [];
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
@@ -41,7 +41,13 @@ function onOrderStatusChanged(params) {
         };
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderDelivered:
-                tasks = (0, factory_1.createInformTasks)(params.order);
+                tasks = [
+                    ...(0, factory_1.createInformTasks)(params.order),
+                    // 取引のpotentialActionsを適用(2023-08-17~)
+                    ...(0, factory_1.createOnOrderSentTasksByTransaction)({
+                        potentialActions: (_e = (_d = (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions) === null || _d === void 0 ? void 0 : _d.sendOrder) === null || _e === void 0 ? void 0 : _e.potentialActions
+                    })
+                ];
                 // プロダクト登録プロセスロック解除
                 try {
                     const placeOrderTransaction = params.placeOrderTransaction;
@@ -79,10 +85,10 @@ function onOrderStatusChanged(params) {
                     ...yield createConfirmReserveTransactionTasks(params.order, simpleOrder)(repos),
                     ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos),
                     // 取引のpotentialActionsを適用(2023-08-17~)
-                    ...createOnPlaceOrderTasksByTransaction({
+                    ...(0, factory_1.createOnPlaceOrderTasksByTransaction)({
                         object: params.order,
                         // potentialActions: params.potentialActions
-                        potentialActions: (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.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
                     })
                 ];
                 break;
@@ -370,113 +376,3 @@ function createReturnPayTransactionTasks(order, __, returnOrderTransaction) {
         return tasks;
     });
 }
-/**
- * 注文作成後のアクション
- */
-// 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();
-    // potentialActionsのためのタスクを生成
-    const taskAttributes = [];
-    // 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 = {
-                project: potentialActions.sendOrder.project,
-                name: factory.taskName.SendOrder,
-                status: factory.taskStatus.Ready,
-                runsAt: now,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: Object.assign({ project: potentialActions.sendOrder.project, object: Object.assign(Object.assign({}, 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) => {
-                return {
-                    project: a.project,
-                    name: factory.taskName.GivePointAward,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: a
-                };
-            }));
-        }
-    }
-    return taskAttributes;
-}