@chevre/domain 21.7.0-alpha.9 → 21.8.0-alpha.0

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({
@@ -427,7 +451,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 {
@@ -98,7 +122,6 @@ export declare class MongoRepository {
     confirm<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
-        authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
         result: factory.transaction.IResult<T>;
         potentialActions: factory.transaction.IPotentialActions<T>;
     }): Promise<void>;
@@ -194,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

@@ -438,7 +438,7 @@ class MongoRepository {
             }, {
                 status: factory.transactionStatusType.Confirmed,
                 endDate: new Date(),
-                'object.authorizeActions': params.authorizeActions,
+                // 'object.authorizeActions': params.authorizeActions,
                 result: params.result,
                 potentialActions: params.potentialActions // resultを更新
             }, {
@@ -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/notification.js

@@ -24,8 +24,9 @@ const debug = createDebug('chevre-domain:service');
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
  */
 function sendEmailMessage(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const project = yield repos.project.findById({
             id: params.project.id,
             inclusion: ['_id', 'settings'],
@@ -45,6 +46,15 @@ function sendEmailMessage(params) {
             }
             sgMail.setApiKey(apiKey);
             const emailMessage = params.object;
+            const emailMessageFrom = {
+                name: emailMessage.sender.name,
+                email: emailMessage.sender.email
+            };
+            // プロジェクト設定対応(2023-08-21~)
+            const senderEmailByProjectSettings = (_d = (_c = (_b = project.settings) === null || _b === void 0 ? void 0 : _b.sendEmailMessage) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email;
+            if (typeof senderEmailByProjectSettings === 'string' && senderEmailByProjectSettings.length > 0) {
+                emailMessageFrom.email = senderEmailByProjectSettings;
+            }
             let subject;
             // 互換性維持対応として、String型に対応
             if (typeof emailMessage.about === 'string') {
@@ -52,7 +62,7 @@ function sendEmailMessage(params) {
                     subject = String(emailMessage.about);
                 }
             }
-            else if (typeof ((_b = emailMessage.about) === null || _b === void 0 ? void 0 : _b.name) === 'string') {
+            else if (typeof ((_e = emailMessage.about) === null || _e === void 0 ? void 0 : _e.name) === 'string') {
                 if (emailMessage.about.name.length > 0) {
                     subject = emailMessage.about.name;
                 }
@@ -69,10 +79,7 @@ function sendEmailMessage(params) {
                         name: emailMessage.toRecipient.name,
                         email: emailMessage.toRecipient.email
                     }];
-            const msg = Object.assign(Object.assign(Object.assign({ to: emailDatas, from: {
-                    name: emailMessage.sender.name,
-                    email: emailMessage.sender.email
-                } }, (typeof subject === 'string') ? { subject } : undefined), (String(emailMessage.text).length > 0) ? { text: String(emailMessage.text) } : undefined), { 
+            const msg = Object.assign(Object.assign(Object.assign({ to: emailDatas, from: emailMessageFrom }, (typeof subject === 'string') ? { subject } : undefined), (String(emailMessage.text).length > 0) ? { text: String(emailMessage.text) } : undefined), { 
                 // html: '<strong>and easy to do anywhere, even with Node.js</strong>',
                 // categories: ['Transactional', 'My category'],
                 // 送信予定を追加することもできるが、タスクの実行予定日時でコントロールする想定

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

@@ -20,4 +20,24 @@ 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 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.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");
@@ -262,3 +262,244 @@ 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 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);
+        }
+        // ポイント付与
+        // 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;
+/**
+ * 注文返品後のアクション
+ */
+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.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,4 +12,4 @@ export declare function onOrderStatusChanged(params: {
     registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
 }) => Promise<void>;
-export {};
+export { IExternalOrder };