@chevre/domain 21.17.0-alpha.10 → 21.17.0-alpha.12

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

@@ -32,16 +32,18 @@ function voidTransaction(params) {
             id: params.purpose.id,
             inclusion: ['_id', 'typeOf', 'status']
         });
-        // 座席仮予約アクション検索
+        // 興行オファー承認アクション検索
         let authorizeActions = yield repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
-            }
-        })
-            .then((actions) => actions
-            .filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation));
+            },
+            object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } }
+        });
+        // .then((actions) => actions
+        //     .filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation)
+        // );
         switch (transaction.status) {
             case factory.transactionStatusType.InProgress:
                 throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);

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

@@ -133,13 +133,10 @@ function processVoidPayTransaction(params) {
                 purpose: {
                     typeOf: transaction.typeOf,
                     id: transaction.id
-                }
-            });
-            authorizeActions = authorizeActionsOnTransaction.filter((a) => {
-                var _a, _b;
-                return ((_a = a.object) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
-                    && ((_b = a.instrument) === null || _b === void 0 ? void 0 : _b.identifier) === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
+                },
+                object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } }
             });
+            authorizeActions = authorizeActionsOnTransaction.filter((a) => { var _a; return ((_a = a.instrument) === null || _a === void 0 ? void 0 : _a.identifier) === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre; });
             switch (transaction.status) {
                 case factory.transactionStatusType.InProgress:
                     throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);

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

@@ -14,7 +14,6 @@ const factory = require("../../../factory");
 function createMoneyTransferActions(params) {
     const moneyTransferActions = [];
     const authorizeMoneyTransferActions = params.authorizeActions
-        .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.offerType.Offer)
         .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });
     authorizeMoneyTransferActions.forEach((a) => {

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

@@ -16,7 +16,6 @@ function createMoneyTransferActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const moneyTransferActions = [];
         const authorizeMoneyTransferActions = params.authorizeActions
-            .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
             .filter((a) => a.object.typeOf === factory.offerType.Offer)
             .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });
         const moneyTransferPurpose = {

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.js

@@ -17,7 +17,6 @@ function createRegisterServiceActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const registerServiceActions = [];
         const authorizeProductOfferActions = params.authorizeActions
-            .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
             .filter((a) => Array.isArray(a.object)
             && a.object.length > 0
             && a.object[0].typeOf === factory.offerType.Offer

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -8,8 +8,7 @@ function createReservationAcceptedOffers(params) {
     const orderedItems = [];
     // 座席予約に対する承認アクション取り出す
     const seatReservationAuthorizeActions = params.authorizeActions
-        .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
-        && a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
+        .filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
     const eventIds = [];
     seatReservationAuthorizeActions.forEach((authorizeSeatReservationAction) => {
         var _a;
@@ -86,7 +85,6 @@ function createProductItems(params) {
     const acceptedOffers = [];
     const orderedItems = [];
     const authorizePaymentCardOfferActions = params.authorizeActions
-        .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => Array.isArray(a.object)
         && a.object.length > 0
         && a.object[0].typeOf === factory.offerType.Offer
@@ -118,7 +116,6 @@ exports.createProductItems = createProductItems;
 function createMoneyTransferAcceptedOffers(params) {
     // 通貨転送承認アクション
     const authorizeMoneyTansferActions = params.authorizeActions
-        .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.offerType.Offer)
         .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });
     const acceptedOffers = [];

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -69,8 +69,7 @@ function createPaymentMethods(params) {
         const resultAsInvoice = (Array.isArray(a.result))
             ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             : a.result;
-        return a.actionStatus === factory.actionStatusType.CompletedActionStatus
-            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
+        return (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
     });
     // 決済方法をセット
     authorizePaymentActions.forEach((a) => {

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.js

@@ -16,15 +16,13 @@ function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
         const resultAsInvoice = (Array.isArray(a.result))
             ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             : a.result;
-        return a.actionStatus === factory.actionStatusType.CompletedActionStatus
-            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
+        return (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
             && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket
             // 決済方法区分は必ず存在するはず(2023-08-15~)
             && ((_b = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.paymentMethodAsObject) === null || _b === void 0 ? void 0 : _b.typeOf) === paymentMethodType;
         // && a.result?.paymentMethod === paymentMethodType
     });
-    const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
-        && a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
+    const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
     // 予約によって必要とされるMovieTicket
     const requiredMovieTickets = authorizeSeatReservationActions2requiredMovieTickets({
         paymentMethodType,

package/lib/chevre/service/transaction/placeOrderInProgress/validation.js

@@ -43,12 +43,10 @@ function findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions) {
         const resultAsInvoice = (Array.isArray(a.result))
             ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             : a.result;
-        return a.actionStatus === factory.actionStatusType.CompletedActionStatus
-            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
+        return (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
             && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket;
     });
-    const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
-        && a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
+    const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
     // MovieTicketオファーを受け付けた予約承認から抽出
     const requiredMovieTicketPaymentMethodTypes = [];
     seatReservationAuthorizeActions.forEach((action) => {
@@ -100,8 +98,7 @@ function validatePrice(transaction, authorizeActions) {
         const resultAsInvoice = (Array.isArray(a.result))
             ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             : a.result;
-        return a.actionStatus === factory.actionStatusType.CompletedActionStatus
-            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
+        return (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
     }).forEach((authorizePaymentAction) => {
         var _a, _b;
         const resultAsInvoice = (Array.isArray(authorizePaymentAction.result))
@@ -113,21 +110,19 @@ function validatePrice(transaction, authorizeActions) {
         priceByAgent += jpyAmount;
     });
     // 販売者が提供するアイテムの発生金額
-    authorizeActions.filter((authorizeAction) => authorizeAction.actionStatus === factory.actionStatusType.CompletedActionStatus
-        && authorizeAction.agent.id === transaction.seller.id)
+    authorizeActions.filter((authorizeAction) => authorizeAction.agent.id === transaction.seller.id)
         .forEach((authorizeAction) => {
         var _a;
         const priceByAction = (_a = authorizeAction.result) === null || _a === void 0 ? void 0 : _a.price;
-        if (typeof priceByAction === 'number' && priceByAction > 0) {
+        if (typeof priceByAction === 'number' && priceByAction >= 0) {
             priceBySeller += priceByAction;
         }
         else {
             // price未確定(オファー未指定)のオファー承認アクションが存在すれば確定不可能(2023-11-27~)
-            throw new factory.errors.Argument('id', 'some actions with no offer specified');
+            throw new factory.errors.Argument('id', `some actions with no offer specified. [${authorizeAction.id}]`);
         }
     });
     // priceBySeller += authorizeActions
-    //     .filter((authorizeAction) => authorizeAction.actionStatus === factory.actionStatusType.CompletedActionStatus)
     //     .filter((authorizeAction) => authorizeAction.agent.id === transaction.seller.id)
     //     .reduce((a, b) => a + (<IAuthorizeActionResultBySeller>b.result).price, 0);
     // debug('priceByAgent priceBySeller:', priceByAgent, priceBySeller);
@@ -149,8 +144,7 @@ function validatePaymentUrl(transaction, authorizeActions) {
             const resultAsInvoice = (Array.isArray(a.result))
                 ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
                 : a.result;
-            return a.actionStatus === factory.actionStatusType.CompletedActionStatus
-                && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
+            return (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
         });
         // 決済承認を確認
         const authorizePaymentAction4paymentUrlExists = authorizePaymentActions.some((a) => {
@@ -175,16 +169,14 @@ function validateMonetaryAmount(authorizeActions) {
         const resultAsInvoice = (Array.isArray(a.result))
             ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             : a.result;
-        return a.actionStatus === factory.actionStatusType.CompletedActionStatus
-            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
+        return (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
             // JPY以外の通貨に対して承認可能なのはPaymentServiceType.PaymentCardのみ
             && resultAsInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.PaymentCard
             && ((_b = resultAsInvoice.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) !== factory.priceCurrency.JPY;
     });
     const requiredMonetaryAmountByCurrencyType = [];
     authorizeActions
-        .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
-        && a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation)
+        .filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation)
         .forEach((a) => {
         const amount = a.result.amount;
         if (Array.isArray(amount)) {
@@ -277,7 +269,6 @@ function validateEventOffers(params) {
             || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
     }).length;
     const seatReservationAuthorizeActions = params.authorizeActions
-        .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
     seatReservationAuthorizeActions.forEach((a) => {
         // オファーIDごとにオファー適用条件を確認

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

@@ -93,14 +93,14 @@ function confirm(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // 取引に対する全ての承認アクションをマージ
-        const authorizeActions = yield searchAuthorizeActions(params)(repos);
+        const completedAuthorizeActions = yield searchAuthorizeActions(params)(repos);
         // 注文番号を発行
         const orderNumber = yield publishOrderNumberIfNotExist({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        const result = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions }));
+        const result = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions: completedAuthorizeActions }));
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -118,7 +118,7 @@ function confirm(params) {
             potentialActions: params.potentialActions,
             transaction: transaction,
             emailMessage: emailMessageOnOrderSent,
-            authorizeActions
+            authorizeActions: completedAuthorizeActions
         });
         // ステータス変更
         try {

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.17.0-alpha.10"
+  "version": "21.17.0-alpha.12"
 }