@chevre/domain 21.2.0-alpha.44 → 21.2.0-alpha.46

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

@@ -2,8 +2,8 @@
 import { EventEmitter } from 'events';
 import * as factory from '../factory';
 interface IListenArgsOnTaskStatusChanged {
-    id?: string;
-    name: factory.taskName;
+    id: string;
+    name?: factory.taskName;
     status: factory.taskStatus;
 }
 type IOnTaskStatusChangedListener = (listenArgs: IListenArgsOnTaskStatusChanged) => void;

package/lib/chevre/repo/task.js

@@ -163,12 +163,18 @@ class MongoRepository {
                     return { id: objectId.toHexString() };
                 });
                 if (emitImmediately) {
-                    taskAttributes.forEach((savedTask) => {
+                    savedTasks.forEach((savedTask) => {
                         task_2.taskEventEmitter.emitTaskStatusChanged({
-                            name: savedTask.name,
+                            id: savedTask.id,
                             status: factory.taskStatus.Ready
                         });
                     });
+                    // taskAttributes.forEach((savedTask) => {
+                    //     taskEventEmitter.emitTaskStatusChanged({
+                    //         name: savedTask.name,
+                    //         status: factory.taskStatus.Ready
+                    //     });
+                    // });
                 }
                 // return result.ops;
                 return savedTasks;

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

@@ -102,7 +102,9 @@ exports.invalidatePaymentUrl = invalidatePaymentUrl;
  * apiもしくはタスクから決済承認を取り消す
  */
 function processVoidPayTransaction(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         let transaction;
         // アクションID指定の場合、進行中取引検証(2023-02-24~)
         if (typeof params.id === 'string') {
@@ -112,7 +114,7 @@ function processVoidPayTransaction(params) {
             transaction = (yield repos.transaction.findById({
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id,
-                inclusion: ['_id', 'typeOf', 'status']
+                inclusion: ['_id', 'typeOf', 'status', 'result.order.paymentMethods']
             }));
         }
         // 承認アクションを取得
@@ -145,6 +147,23 @@ function processVoidPayTransaction(params) {
                 case factory.transactionStatusType.Confirmed:
                     // アクションステータスを検証する
                     authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                    if (transaction.typeOf === factory.transactionType.PlaceOrder) {
+                        const paymentMethodIds = (_b = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.paymentMethods.map((p) => {
+                            return p.paymentMethodId;
+                        });
+                        if (!Array.isArray(paymentMethodIds)) {
+                            throw new factory.errors.Argument('Transaction', `${transaction.id} must have result.order.paymentMethods`);
+                        }
+                        if (paymentMethodIds.length > 0) {
+                            authorizeActions = authorizeActions.filter((a) => {
+                                // paymentMethodIdが存在しない、あるいは、注文のpaymentMethodIdsに含まれなければ、アクション取消対象
+                                const paymentMethodIdByAction = a.object.paymentMethodId;
+                                const includedInOrder = typeof paymentMethodIdByAction === 'string'
+                                    && paymentMethodIds.includes(paymentMethodIdByAction);
+                                return !includedInOrder;
+                            });
+                        }
+                    }
                     break;
                 default:
                 // no op

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.44"
+  "version": "21.2.0-alpha.46"
 }