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

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
@@ -28,10 +31,6 @@ function returnOrder(params) {
             inclusion: [],
             exclusion: []
         });
-        // プロジェクト条件検証
-        if (order.project.id !== params.project.id) {
-            throw new factory.errors.NotFound('Order');
-        }
         // 返品取引検索
         const returnOrderTransactions = yield repos.transaction.search({
             limit: 1,
@@ -61,7 +60,14 @@ function returnOrder(params) {
             orderDate: order.orderDate,
             dateReturned
         };
-        const returnOrderActionAttributes = Object.assign({ agent: returner, object: simpleOrder, project: order.project, recipient: order.seller, typeOf: factory.actionType.ReturnAction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined);
+        const returnOrderActionAttributes = {
+            agent: returner,
+            object: simpleOrder,
+            project: order.project,
+            recipient: order.seller,
+            typeOf: factory.actionType.ReturnAction
+            // ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined
+        };
         let returnedOwnershipInfos = [];
         // アクション開始
         const action = yield repos.action.start(returnOrderActionAttributes);
@@ -88,14 +94,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 +129,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/lib/chevre/service/order/sendOrder.d.ts

@@ -25,7 +25,6 @@ declare function sendOrder(params: {
         confirmationNumber: string;
         orderNumber: string;
     };
-    potentialActions?: factory.action.transfer.send.order.IPotentialActions;
     useOnOrderStatusChanged: boolean;
 }): ISendOperation<void>;
 export { sendOrder };

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

@@ -22,6 +22,9 @@ function sendOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
+        if (typeof params.useOnOrderStatusChanged !== 'boolean') {
+            throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+        }
         try {
             const orderNumber = params.object.orderNumber;
             const confirmationNumber = params.object.confirmationNumber;
@@ -96,7 +99,7 @@ function sendOrder(params) {
             }
             const result = ownershipInfos;
             yield repos.action.complete({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
-            if (params.useOnOrderStatusChanged || params.useOnOrderStatusChanged === undefined) {
+            if (params.useOnOrderStatusChanged) {
                 yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
                     registerActionInProgress: repos.registerActionInProgress,
                     task: repos.task
@@ -119,73 +122,8 @@ function sendOrder(params) {
                 throw error;
             }
         }
-        yield onSend(params)({ task: repos.task });
+        // onOrderStatusChangedへ移行(2023-08-17~)
+        // await onSend(params)({ task: repos.task });
     });
 }
 exports.sendOrder = sendOrder;
-/**
- * 注文配送後のアクション
- */
-function onSend(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        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);
-                });
-            }
-        }
-        // タスク保管
-        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
-}

package/lib/chevre/service/payment/any/factory.js

@@ -105,9 +105,10 @@ function createAuthorizeResult(params) {
         // 廃止(2023-08-07~)
         // amount: params.object.amount,
         issuedThrough,
-        paymentMethod: params.object.paymentMethod,
+        // 完全廃止(paymentMethodAsObjectへ完全移行)(2023-08-16~)
+        // paymentMethod: params.object.paymentMethod,
         paymentMethodAsObject,
-        paymentStatus: factory.paymentStatusType.PaymentDue,
+        paymentStatus: factory.paymentStatusType.PaymentAutomaticallyApplied,
         paymentMethodId: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.paymentMethodId) === 'string')
             ? payTransactionObject.paymentMethod.paymentMethodId
             : '',

package/lib/chevre/service/task/confirmPayTransaction.js

@@ -10,8 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
@@ -19,12 +21,17 @@ const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const seller_1 = require("../../repo/seller");
 const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
 const PayTransactionService = require("../assetTransaction/pay");
+const payOrder_1 = require("../order/payOrder");
 /**
  * タスク実行関数
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
+        if (settings.redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
         const actionRepo = new action_1.MongoRepository(settings.connection);
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const orderRepo = new order_1.MongoRepository(settings.connection);
@@ -34,6 +41,8 @@ function call(data) {
         const projectRepo = new project_1.MongoRepository(settings.connection);
         const sellerRepo = new seller_1.MongoRepository(settings.connection);
         const taskRepo = new task_1.MongoRepository(settings.connection);
+        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
+        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
         // アクション開始
         const action = yield actionRepo.start(data);
         try {
@@ -76,6 +85,53 @@ function call(data) {
         // アクション完了
         const actionResult = {};
         yield actionRepo.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        // processOrder連携(2023-08-23~)
+        yield onConfirmed(data)({
+            assetTransaction: assetTransactionRepo,
+            order: orderRepo,
+            registerActionInProgress: registerServiceInProgressRepo,
+            task: taskRepo,
+            transaction: transactionRepo
+        });
     });
 }
 exports.call = call;
+function onConfirmed(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.processOrder === true) {
+            // 注文のpaymentMethodIdを取得
+            const order = yield repos.order.findByOrderNumber({
+                orderNumber: params.purpose.orderNumber,
+                project: { id: params.project.id },
+                inclusion: ['paymentMethods'],
+                exclusion: []
+            });
+            // PayTransactionのステータス検証
+            let allPayTransactionConfirmed = false;
+            const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
+                .map((invoice) => invoice.paymentMethodId);
+            if (paymentMethodIds.length > 0) {
+                const referencedPayTransactions = yield repos.assetTransaction.search({
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: factory.assetTransactionType.Pay,
+                    transactionNumber: { $in: paymentMethodIds }
+                }, ['status']);
+                allPayTransactionConfirmed =
+                    referencedPayTransactions.every((payTransation) => payTransation.status === factory.transactionStatusType.Confirmed);
+            }
+            else {
+                allPayTransactionConfirmed = true;
+            }
+            if (allPayTransactionConfirmed) {
+                yield (0, payOrder_1.payOrder)({
+                    project: { id: params.project.id },
+                    object: {
+                        confirmationNumber: params.purpose.confirmationNumber,
+                        orderNumber: params.purpose.orderNumber
+                    },
+                    useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
+                })(repos);
+            }
+        }
+    });
+}

package/lib/chevre/service/task/confirmRegisterServiceTransaction.d.ts

@@ -12,6 +12,6 @@ export declare function confirmRegisterServiceTransaction(params: factory.action
     assetTransaction: AssetTransactionRepo;
     task: TaskRepo;
 }) => Promise<void>;
-export declare function onRegistered(actionAttributes: factory.action.interact.confirm.registerService.IAttributes): (repos: {
+export declare function onRegistered(__: factory.action.interact.confirm.registerService.IAttributes): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/task/confirmRegisterServiceTransaction.js

@@ -85,15 +85,15 @@ function confirmRegisterServiceTransaction(params) {
     });
 }
 exports.confirmRegisterServiceTransaction = confirmRegisterServiceTransaction;
-function onRegistered(actionAttributes) {
+function onRegistered(__) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const taskAttributes = [];
         // 次のメンバーシップ注文タスクを作成
-        const orderProgramMembershipTasks = (_a = actionAttributes.potentialActions) === null || _a === void 0 ? void 0 : _a.orderProgramMembership;
-        if (Array.isArray(orderProgramMembershipTasks)) {
-            taskAttributes.push(...orderProgramMembershipTasks);
-        }
+        // 廃止(2023-08-18~)
+        // const orderProgramMembershipTasks = actionAttributes.potentialActions?.orderProgramMembership;
+        // if (Array.isArray(orderProgramMembershipTasks)) {
+        //     taskAttributes.push(...orderProgramMembershipTasks);
+        // }
         // タスク保管
         yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });

package/lib/chevre/service/transaction/moneyTransfer/factory.js

@@ -14,12 +14,8 @@ function createStartParams(params, passport, seller, amount, fromLocation, toLoc
             id: String(seller.id),
             name: seller.name,
             typeOf: seller.typeOf
-            // ↓最適化(2022-05-24~)
-            // ...{ project: seller.project }
         },
-        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, 
-            // authorizeActions: [],
-            pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
+        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
                 ? { identifier: params.object.pendingTransaction.identifier }
                 : undefined) }, (passport !== undefined) ? { passport } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined),
         expires: params.expires

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -537,7 +537,6 @@ function confirm(params) {
         yield repos.transaction.confirm({
             typeOf: factory.transactionType.MoneyTransfer,
             id: transaction.id,
-            authorizeActions: [],
             result: {},
             potentialActions: potentialActions
         });

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -130,6 +130,17 @@ function createTasks(params) {
                 throw new factory.errors.NotFound('Transaction Result');
             }
             const orderActionAttributes = potentialActions.order;
+            const placeOrderTaskData = {
+                project: orderActionAttributes.project,
+                object: {
+                    confirmationNumber: orderFromTransaction.confirmationNumber,
+                    orderNumber: orderActionAttributes.object.orderNumber
+                }
+                // 廃止(2023-08-21~)
+                // ...(orderActionAttributes.potentialActions !== undefined)
+                //     ? { potentialActions: orderActionAttributes.potentialActions }
+                //     : undefined
+            };
             const placeOrderTaskAttributes = {
                 project: transaction.project,
                 name: factory.taskName.PlaceOrder,
@@ -138,12 +149,7 @@ function createTasks(params) {
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
                 executionResults: [],
-                data: Object.assign({ project: orderActionAttributes.project, object: {
-                        confirmationNumber: orderFromTransaction.confirmationNumber,
-                        orderNumber: orderActionAttributes.object.orderNumber
-                    } }, (orderActionAttributes.potentialActions !== undefined)
-                    ? { potentialActions: orderActionAttributes.potentialActions }
-                    : undefined)
+                data: placeOrderTaskData
             };
             taskAttributes.push(placeOrderTaskAttributes);
             break;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.d.ts

@@ -4,3 +4,7 @@ export declare function createRegisterServiceActions(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
     authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.action.interact.confirm.registerService.IAttributes[]>;
+/**
+ * ssktsへの互換性対応として
+ * 次回メンバーシップ注文タスクを作成する
+ */