@chevre/domain 21.8.0-alpha.18 → 21.8.0-alpha.19

package/lib/chevre/repo/order.js

@@ -792,7 +792,12 @@ class MongoRepository {
                 'project.id': { $eq: params.project.id },
                 'paymentMethods.paymentMethodId': { $exists: true, $eq: params.invoice.paymentMethodId }
             }, {
-                $set: { 'paymentMethods.$[invoice].paymentMethod.identifier': params.invoice.paymentMethod.identifier }
+                $set: {
+                    'paymentMethods.$[invoice].paymentMethod.identifier': params.invoice.paymentMethod.identifier,
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO 互換性維持対応としてtypeOfも変更しているが、そのうち廃止(2023-08-30)
+                    'paymentMethods.$[invoice].typeOf': params.invoice.paymentMethod.identifier
+                }
             }, {
                 arrayFilters: [{ 'invoice.paymentMethodId': { $eq: params.invoice.paymentMethodId } }],
                 new: true,

package/lib/chevre/service/assetTransaction/pay.js

@@ -12,8 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.confirm = exports.start = exports.check = exports.invalidatePaymentUrl = exports.publishPaymentUrl = void 0;
 const moment = require("moment");
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
-const payment_1 = require("../payment");
 const CreditCardPayment = require("../payment/creditCard");
 const MovieTicketPayment = require("../payment/movieTicket");
 const PaymentCardPayment = require("../payment/paymentCard");
@@ -346,21 +344,9 @@ function confirm(params) {
             potentialActions: params.potentialActions,
             order
         });
-        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Pay, id: transaction.id, result: {}, 
-            // sync対応(2023-01-14~)
-            potentialActions: (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING)
-                ? { pay: [] }
-                : potentialActions }, (typeof overwritingPaymentMethodIdentifier === 'string')
+        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Pay, id: transaction.id, result: {}, potentialActions: potentialActions }, (typeof overwritingPaymentMethodIdentifier === 'string')
             ? { object: { paymentMethod: { identifier: overwritingPaymentMethodIdentifier } } }
             : undefined));
-        // sync対応(2023-01-14~)
-        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-            if (Array.isArray(potentialActions.pay)) {
-                for (const payAction of potentialActions.pay) {
-                    yield (0, payment_1.pay)(payAction)(repos);
-                }
-            }
-        }
     });
 }
 exports.confirm = confirm;
@@ -393,23 +379,11 @@ function fixOrderAsPurpose(params, transaction) {
  */
 function cancel(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.cancel({
+        yield repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Pay,
             id: params.id,
             transactionNumber: params.transactionNumber
         });
-        // sync対応(2023-01-14~)
-        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-            const payTransactionAsObject = {
-                project: transaction.project,
-                typeOf: transaction.typeOf,
-                id: transaction.id,
-                transactionNumber: transaction.transactionNumber,
-                object: transaction.object,
-                recipient: transaction.recipient
-            };
-            yield (0, payment_1.voidPayment)({ object: payTransactionAsObject })(repos);
-        }
     });
 }
 exports.cancel = cancel;
@@ -498,11 +472,7 @@ function exportTasksById(params) {
                 }
                 break;
             case factory.transactionStatusType.Canceled:
-                // sync対応(2023-01-14~)
-                if (!settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-                    taskAttributes.push(voidPaymentTasks);
-                }
-                taskAttributes.push(onAssetTransactionStatusChangedTask);
+                taskAttributes.push(voidPaymentTasks, onAssetTransactionStatusChangedTask);
                 break;
             case factory.transactionStatusType.Expired:
                 taskAttributes.push(voidPaymentTasks, onAssetTransactionStatusChangedTask);

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -26,6 +26,7 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const transaction = yield repos.transaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id,
@@ -46,8 +47,12 @@ function voidTransaction(params) {
                 throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
             // 確定取引に対応(2023-05-07~)
             case factory.transactionStatusType.Confirmed:
-                // アクションステータスを検証する
-                authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                // OrderCancelledを考慮(2023-08-30~)
+                const orderCancelled = ((_b = (_a = params.purpose.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.orderStatus) === factory.orderStatus.OrderCancelled;
+                if (!orderCancelled) {
+                    // 取り消すべきアクションに絞る
+                    authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                }
                 break;
             default:
             // no op

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

@@ -37,4 +37,10 @@ export declare function createOnOrderSentTasksByTransaction(params: {
 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/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 declare function createOnOrderCancelledTasksByTransaction(params: {
+    transaction?: factory.transaction.placeOrder.ITransaction;
+}): (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 {};

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.createOnOrderReturnedTasksByTransaction = exports.createOnOrderSentTasksByTransaction = exports.createOnPlaceOrderTasksByTransaction = exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
+exports.createOnOrderCancelledTasksByTransaction = 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");
@@ -442,3 +442,50 @@ function createOnOrderReturnedTasksByTransaction(params) {
     return taskAttributes;
 }
 exports.createOnOrderReturnedTasksByTransaction = createOnOrderReturnedTasksByTransaction;
+/**
+ * 注文中止時のアクション
+ */
+function createOnOrderCancelledTasksByTransaction(params) {
+    var _a;
+    const now = new Date();
+    const taskAttributes = [];
+    if (typeof ((_a = params.transaction) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+        const voidPaymentTaskAttributes = {
+            project: params.transaction.project,
+            name: factory.taskName.VoidPayTransaction,
+            status: factory.taskStatus.Ready,
+            runsAt: now,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: {
+                project: params.transaction.project,
+                purpose: {
+                    typeOf: params.transaction.typeOf,
+                    id: params.transaction.id,
+                    result: { order: { orderStatus: factory.orderStatus.OrderCancelled } }
+                }
+            }
+        };
+        const voidReserveTaskAttributes = {
+            project: params.transaction.project,
+            name: factory.taskName.VoidReserveTransaction,
+            status: factory.taskStatus.Ready,
+            runsAt: now,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: {
+                project: params.transaction.project,
+                purpose: {
+                    typeOf: params.transaction.typeOf,
+                    id: params.transaction.id,
+                    result: { order: { orderStatus: factory.orderStatus.OrderCancelled } }
+                }
+            }
+        };
+        taskAttributes.push(voidPaymentTaskAttributes, voidReserveTaskAttributes);
+    }
+    return taskAttributes;
+}
+exports.createOnOrderCancelledTasksByTransaction = createOnOrderCancelledTasksByTransaction;

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

@@ -118,8 +118,10 @@ function onOrderStatusChanged(params) {
                 break;
             // OrderCancelled追加(2023-08-30~)
             case factory.orderStatus.OrderCancelled:
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO 注文取引中止時と同様の処理か
+                // 注文取引中止時と同様の処理か
+                tasks = [
+                    ...(0, factory_1.createOnOrderCancelledTasksByTransaction)({ transaction: params.placeOrderTransaction })
+                ];
                 break;
             default:
         }

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

@@ -104,7 +104,7 @@ exports.invalidatePaymentUrl = invalidatePaymentUrl;
 function processVoidPayTransaction(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;
         let transaction;
         // アクションID指定の場合、進行中取引検証(2023-02-24~)
         if (typeof params.id === 'string') {
@@ -145,23 +145,27 @@ function processVoidPayTransaction(params) {
                     throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
                 // 確定取引に対応(2023-05-03~)
                 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;
+                    // OrderCancelledを考慮(2023-08-30~)
+                    const orderCancelled = ((_b = (_a = params.purpose.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.orderStatus) === factory.orderStatus.OrderCancelled;
+                    if (!orderCancelled) {
+                        // 取り消すべきアクションに絞る
+                        authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                        if (transaction.typeOf === factory.transactionType.PlaceOrder) {
+                            const paymentMethodIds = (_d = (_c = transaction.result) === null || _c === void 0 ? void 0 : _c.order) === null || _d === void 0 ? void 0 : _d.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;
@@ -339,7 +343,7 @@ function authorize(params) {
                 if (error.name !== 'AbortError') {
                     yield processVoidPayTransaction({
                         project: action.project,
-                        agent: { id: action.project.id },
+                        // agent: { id: action.project.id },
                         id: action.id,
                         purpose: action.purpose
                     })(repos);

package/lib/chevre/settings.d.ts

@@ -36,7 +36,6 @@ export type ISettings = factory.project.ISettings & {
 };
 export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
-export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
 export declare const USE_ADVANCE_BOOKING_REQUIREMENT: boolean;
 export declare const USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT: boolean;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_CUSTOM_SENDER_EMAIL = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_CUSTOM_SENDER_EMAIL = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -60,7 +60,6 @@ exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = (typeof process.env.TRANSA
 exports.DEFAULT_SENDER_EMAIL = process.env.DEFAULT_SENDER_EMAIL;
 exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
 exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
-exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM)
     : moment('2023-08-31T15:00:00Z');

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.327.0-alpha.8",
+    "@chevre/factory": "4.327.0-alpha.9",
     "@cinerino/sdk": "3.165.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.18"
+  "version": "21.8.0-alpha.19"
 }