@chevre/domain 21.18.0-alpha.8 → 21.18.0-alpha.9

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

@@ -1,4 +1,3 @@
-import type { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
@@ -7,7 +6,6 @@ import * as factory from '../../factory';
 declare function onAssetTransactionStatusChanged(params: factory.task.IData<factory.taskName.OnAssetTransactionStatusChanged>): (repos: {
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
-    registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
@@ -20,7 +18,6 @@ declare function paymentDue2Processing(params: {
     useOnOrderStatusChanged: boolean;
 }): (repos: {
     order: OrderRepo;
-    registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;

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

@@ -166,12 +166,11 @@ function paymentDue2Processing(params) {
             }
         }
         if (params.useOnOrderStatusChanged) {
-            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
+            yield (0, onOrderStatusChanged_1.onOrderProcessing)({
                 order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
                  }),
                 placeOrderTransaction
             })({
-                registerActionInProgress: repos.registerActionInProgress,
                 task: repos.task
             });
         }

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

@@ -1,11 +1,9 @@
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 type IPlaceOrderTransaction = factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
-type IReturnOrderTransaction = factory.transaction.ITransaction<factory.transactionType.ReturnOrder>;
 declare function onOrderCancelled(params: {
     order: factory.order.IOrder;
     placeOrderTransaction?: IPlaceOrderTransaction;
-    returnOrderTransaction?: IReturnOrderTransaction;
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -18,7 +18,6 @@ const factory = require("../../../factory");
 const factory_1 = require("./onOrderCancelled/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderCancelled(params) {
-    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];

package/lib/chevre/service/order/onOrderStatusChanged/{factory.d.ts → onOrderDelivered/factory.d.ts}

@@ -1,30 +1,12 @@
-import * as factory from '../../../factory';
-type IOrderWithToken = factory.order.IOrder & {
-    token: string;
+import * as factory from '../../../../factory';
+type IDeliveredOrder = factory.order.IOrder & {
+    orderStatus: factory.orderStatus.OrderDelivered;
 };
-export declare function getOrderWithToken(params: {
-    order: factory.order.IOrder;
-    expiresIn: number;
-}): Promise<factory.order.IOrder | IOrderWithToken>;
-export type IUpdatedOrder4inform = Pick<factory.order.IOrder, 'typeOf' | 'orderNumber' | 'name' | 'additionalProperty' | 'project'> & {
-    orderStatus?: undefined;
-    updatedAt: Date;
-};
-export declare function createInformTasks(order: factory.order.IOrder | IOrderWithToken | IUpdatedOrder4inform): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
-export declare function createConfirmReservationActionObject4ChevreByOrder(params: {
-    order: factory.order.IOrder;
-}): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>[];
-export declare function createConfirmReservationActionObject4COAByOrder(params: {
-    order: factory.order.IOrder;
-}): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.COA>[];
-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'>;
+declare function createInformTasks(order: IDeliveredOrder): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 /**
  * 注文配送後のアクション
  */
-export declare function createOnOrderSentTasksByTransaction(params: {
+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/onAssetTransactionStatusChanged").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/onOrderPaymentCompleted").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 {};
+export { createInformTasks, createOnOrderSentTasksByTransaction };

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

@@ -0,0 +1,111 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createOnOrderSentTasksByTransaction = exports.createInformTasks = void 0;
+const factory = require("../../../../factory");
+const settings_1 = require("../../../../settings");
+const informOrder = (_a = settings_1.settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+function createInformTasks(order) {
+    const taskRunsAt = new Date();
+    let informTasks = [];
+    if (Array.isArray(informOrder) && informOrder.length > 0) {
+        const order4inform = creteOrder4inform(order);
+        let recipientId = '';
+        recipientId = order.customer.id;
+        informTasks = informOrder.map((informOrderParams) => {
+            var _a, _b;
+            const informActionAttributes = {
+                agent: order.project,
+                object: order4inform,
+                project: order.project,
+                recipient: {
+                    url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
+                    id: recipientId,
+                    name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
+                    typeOf: factory.creativeWorkType.WebApplication
+                },
+                typeOf: factory.actionType.InformAction
+            };
+            return {
+                project: order.project,
+                name: factory.taskName.TriggerWebhook,
+                status: factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: informActionAttributes
+            };
+        });
+    }
+    return informTasks;
+}
+exports.createInformTasks = createInformTasks;
+function creteOrder4inform(order) {
+    // 配送済注文通知内容を最適化(2022-12-29~)
+    return Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: order.orderStatus }, (typeof order.id === 'string') ? { id: order.id } : undefined);
+}
+/**
+ * 注文配送後のアクション
+ */
+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/onOrderDelivered.d.ts

@@ -0,0 +1,14 @@
+import type { RedisRepository as RegisterServiceInProgressRepo } from '../../../repo/action/registerServiceInProgress';
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+type IPlaceOrderTransaction = factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+declare function onOrderDelivered(params: {
+    order: Omit<factory.order.IOrder, 'orderStatus'> & {
+        orderStatus: factory.orderStatus.OrderDelivered;
+    };
+    placeOrderTransaction?: IPlaceOrderTransaction;
+}): (repos: {
+    registerActionInProgress: RegisterServiceInProgressRepo;
+    task: TaskRepo;
+}) => Promise<void>;
+export { onOrderDelivered };

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

@@ -0,0 +1,83 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onOrderDelivered = void 0;
+/**
+ * 注文ステータス変更時処理
+ */
+const createDebug = require("debug");
+const factory = require("../../../factory");
+const product_1 = require("../../offer/product");
+const factory_1 = require("./onOrderDelivered/factory");
+const debug = createDebug('chevre-domain:service:order');
+function onOrderDelivered(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e;
+        debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
+        let tasks = [];
+        // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
+        // const simpleOrder: factory.order.ISimpleOrder = {
+        //     typeOf: params.order.typeOf,
+        //     seller: {
+        //         id: params.order.seller.id,
+        //         typeOf: params.order.seller.typeOf,
+        //         name: params.order.seller.name
+        //     },
+        //     customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
+        //     orderNumber: params.order.orderNumber,
+        //     price: params.order.price,
+        //     priceCurrency: params.order.priceCurrency,
+        //     orderDate: params.order.orderDate
+        // };
+        switch (params.order.orderStatus) {
+            case factory.orderStatus.OrderDelivered:
+                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;
+                    if (typeof (placeOrderTransaction === null || placeOrderTransaction === void 0 ? void 0 : placeOrderTransaction.id) === 'string') {
+                        // プロダクト登録プロセスロック解除(orderからproductIdを抽出する)
+                        if (Array.isArray(params.order.acceptedOffers)) {
+                            const productIds4unlock = params.order.acceptedOffers
+                                .filter((o) => {
+                                var _a;
+                                return o.itemOffered.typeOf === factory.permit.PermitType.Permit
+                                    && typeof ((_a = o.itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.id) === 'string'
+                                    && o.itemOffered.issuedThrough.id.length > 0;
+                            })
+                                .map((o) => { var _a; return String((_a = o.itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.id); });
+                            yield Promise.all(productIds4unlock.map((productId) => __awaiter(this, void 0, void 0, function* () {
+                                yield (0, product_1.processUnlockRegisterMembershipService)({
+                                    agent: { id: String(params.order.customer.id) },
+                                    product: { id: productId },
+                                    purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id }
+                                })(repos);
+                            })));
+                        }
+                    }
+                }
+                catch (error) {
+                    throw error;
+                }
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
+        }
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
+    });
+}
+exports.onOrderDelivered = onOrderDelivered;

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

@@ -0,0 +1,10 @@
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+declare function onOrderPaymentDue(params: {
+    order: Omit<factory.order.IOrder, 'orderStatus'> & {
+        orderStatus: factory.orderStatus.OrderPaymentDue;
+    };
+}): (repos: {
+    task: TaskRepo;
+}) => Promise<void>;
+export { onOrderPaymentDue };

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

@@ -0,0 +1,103 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onOrderPaymentDue = void 0;
+/**
+ * 注文決済時処理
+ */
+const createDebug = require("debug");
+const factory = require("../../../factory");
+const order_1 = require("../../../factory/order");
+const debug = createDebug('chevre-domain:service:order');
+function onOrderPaymentDue(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
+        let tasks = [];
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
+        const simpleOrder = {
+            typeOf: params.order.typeOf,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
+            orderNumber: params.order.orderNumber,
+            price: params.order.price,
+            priceCurrency: params.order.priceCurrency,
+            orderDate: params.order.orderDate
+        };
+        switch (params.order.orderStatus) {
+            // OrderPaymentDueを追加(2023-08-23~)
+            case factory.orderStatus.OrderPaymentDue:
+                tasks = [
+                    ...yield createConfirmPayTransactionTasks(params.order, simpleOrder)(repos)
+                ];
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
+        }
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
+    });
+}
+exports.onOrderPaymentDue = onOrderPaymentDue;
+function createConfirmPayTransactionTasks(order, simpleOrder) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const taskRunsAt = new Date();
+        const tasks = [];
+        yield Promise.all(order.paymentMethods.map((invoice) => __awaiter(this, void 0, void 0, function* () {
+            // PaymentAutomaticallyAppliedであれば、自動決済処理を実行(2023-08-24~)
+            if (invoice.paymentStatus !== factory.paymentStatusType.PaymentAutomaticallyApplied) {
+                return;
+            }
+            // 冗長なタスク作成を回避
+            const existingTasks = yield repos.task.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: order.project.id } },
+                name: factory.taskName.ConfirmPayTransaction,
+                data: {
+                    object: { transactionNumber: { $eq: invoice.paymentMethodId } },
+                    purpose: { orderNumber: { $eq: order.orderNumber } }
+                }
+            }, {
+                data: 0, executionResults: 0, name: 0, numberOfTried: 0,
+                remainingNumberOfTries: 0, runsAt: 0, status: 0
+            });
+            if (existingTasks.length === 0) {
+                const data = {
+                    project: order.project,
+                    typeOf: factory.actionType.ConfirmAction,
+                    object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
+                    agent: order.project,
+                    purpose: Object.assign(Object.assign({}, simpleOrder), { confirmationNumber: order.confirmationNumber }),
+                    instrument: {
+                        typeOf: 'WebAPI',
+                        identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre
+                    },
+                    processOrder: order.orderStatus === factory.orderStatus.OrderPaymentDue,
+                    useOnOrderStatusChanged: true
+                };
+                tasks.push({
+                    project: order.project,
+                    name: factory.taskName.ConfirmPayTransaction,
+                    status: factory.taskStatus.Ready,
+                    runsAt: taskRunsAt,
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data
+                });
+            }
+        })));
+        return tasks;
+    });
+}

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

@@ -0,0 +1,23 @@
+import * as factory from '../../../../factory';
+type IProcessingOrder = factory.order.IOrder & {
+    orderStatus: factory.orderStatus.OrderProcessing;
+};
+type IOrderWithToken = IProcessingOrder & {
+    token?: string;
+};
+declare function getOrderWithToken(params: {
+    order: IProcessingOrder;
+    expiresIn: number;
+}): Promise<IOrderWithToken>;
+declare function createInformTasks(order: IOrderWithToken): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+declare function createConfirmReservationActionObject4ChevreByOrder(params: {
+    order: factory.order.IOrder;
+}): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>[];
+declare function createConfirmReservationActionObject4COAByOrder(params: {
+    order: factory.order.IOrder;
+}): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.COA>[];
+declare function createConfirmRegisterServiceActionObjectByOrder(params: {
+    order: factory.order.IOrder;
+}): factory.action.interact.confirm.registerService.IObject[];
+type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
+export { IExternalOrder, getOrderWithToken, createInformTasks, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder, createConfirmRegisterServiceActionObjectByOrder };