@chevre/domain 21.2.0-alpha.12 → 21.2.0-alpha.120

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

@@ -23,7 +23,7 @@ function createOrder(params) {
     ];
     const orderedItems = [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
     // 決済方法をセット
-    const { paymentMethods, price } = createPaymentMethods({ transaction: params.transaction });
+    const { paymentMethods, price } = createPaymentMethods({ transaction: params.transaction, authorizeActions: params.authorizeActions });
     const discounts = [];
     const name = (typeof params.transaction.object.name === 'string') ? params.transaction.object.name : undefined;
     const broker = (typeof ((_a = params.transaction.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.transaction.object.broker : undefined;
@@ -62,7 +62,7 @@ function createCustomer(params) {
 function createPaymentMethods(params) {
     const paymentMethods = [];
     let price = 0;
-    const authorizePaymentActions = params.transaction.object.authorizeActions
+    const authorizePaymentActions = params.authorizeActions
         .filter((a) => {
         var _a;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.d.ts

@@ -2,4 +2,4 @@ import * as factory from '../../../../factory';
 /**
  * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
  */
-export declare function validateMovieTicket(paymentMethodType: string, transaction: factory.transaction.placeOrder.ITransaction): void;
+export declare function validateMovieTicket(paymentMethodType: string, transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[]): void;

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

@@ -10,8 +10,8 @@ const debug = createDebug('cinerino-domain:service:validateMovieTicket');
 /**
  * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
  */
-function validateMovieTicket(paymentMethodType, transaction) {
-    const authorizeActions = transaction.object.authorizeActions;
+function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMovieTicketActions = authorizeActions.filter((a) => {
         var _a, _b, _c;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus

package/lib/chevre/service/transaction/placeOrderInProgress/validation.d.ts

@@ -7,7 +7,7 @@ export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecifica
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: factory.transaction.placeOrder.ITransaction): void;
+export declare function validateTransaction(transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[]): void;
 export type IConfirmationNumberGenerator = (order: factory.order.IOrder) => string;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 export type IResultOrderParams = factory.transaction.placeOrder.IResultOrderParams & {
@@ -46,4 +46,5 @@ export declare function validatePaymentMethods(params: {
 export declare function validateEventOffers(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
     order: factory.order.IOrder;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): void;

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

@@ -13,18 +13,18 @@ const debug = createDebug('cinerino-domain:service');
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction) {
+function validateTransaction(transaction, authorizeActions) {
     validateProfile(transaction);
-    validatePrice(transaction);
+    validatePrice(transaction, authorizeActions);
     // 利用可能な通貨単位に対して取引検証
-    validateMonetaryAmount(transaction);
+    validateMonetaryAmount(authorizeActions);
     // 利用可能なMovieTicketIF決済方法タイプに対して動的にコーディング
     // 検証すべきMovieTicketIF決済方法タイプのリストは、決済承認アクションのresult.issuedThrough.typeOf: MovieTicketで抽出できるのでは？
-    const movieTicketPaymentMethodTypes = findMovieTicketPaymentMethodTypesFromTransaction(transaction);
+    const movieTicketPaymentMethodTypes = findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions);
     if (Array.isArray(movieTicketPaymentMethodTypes) && movieTicketPaymentMethodTypes.length > 0) {
         movieTicketPaymentMethodTypes.forEach((paymentMethodType) => {
             try {
-                (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, transaction);
+                (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, transaction, authorizeActions);
             }
             catch (error) {
                 // 検証結果をlog(2022-06-04~)
@@ -35,11 +35,13 @@ function validateTransaction(transaction) {
         });
     }
     // 決済URLが発行されている場合、検証
-    validatePaymentUrl(transaction);
+    validatePaymentUrl(transaction, authorizeActions);
 }
 exports.validateTransaction = validateTransaction;
-function findMovieTicketPaymentMethodTypesFromTransaction(transaction) {
-    const authorizeActions = transaction.object.authorizeActions;
+function findMovieTicketPaymentMethodTypesFromTransaction(
+// transaction: factory.transaction.placeOrder.ITransaction,
+authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMovieTicketPaymentActions = authorizeActions.filter((a) => {
         var _a, _b;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
@@ -86,8 +88,8 @@ function validateProfile(transaction) {
         throw new factory.errors.Argument('Transaction', 'Customer Profile Required');
     }
 }
-function validatePrice(transaction) {
-    const authorizeActions = transaction.object.authorizeActions;
+function validatePrice(transaction, authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     let priceByAgent = 0;
     let priceBySeller = 0;
     // 決済承認を確認
@@ -110,9 +112,9 @@ function validatePrice(transaction) {
         throw new factory.errors.Argument('Transaction', 'Transaction cannot be confirmed because prices are not matched');
     }
 }
-function validatePaymentUrl(transaction) {
+function validatePaymentUrl(transaction, authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     var _a, _b;
-    const authorizeActions = transaction.object.authorizeActions;
     // 決済URLが発行されている場合、検証
     const paymentMethodId = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
     const paymentUrl = (_b = transaction.object.paymentMethods) === null || _b === void 0 ? void 0 : _b.paymentUrl;
@@ -135,10 +137,10 @@ function validatePaymentUrl(transaction) {
 /**
  * JPY以外の通貨について取引を検証する
  */
-function validateMonetaryAmount(transaction
-// currencies: string[]
-) {
-    const authorizeActions = transaction.object.authorizeActions;
+function validateMonetaryAmount(
+// transaction: factory.transaction.placeOrder.ITransaction,
+authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMonetaryAmountActions = authorizeActions
         .filter((a) => {
         var _a, _b;
@@ -216,7 +218,11 @@ exports.validatePaymentMethods = validatePaymentMethods;
  * イベントオファー適用条件確認
  */
 function validateEventOffers(params) {
-    const seatReservationAuthorizeActions = params.transaction.object.authorizeActions
+    // const seatReservationAuthorizeActions = <IAuthorizeSeatReservationOffer[]>
+    //     params.transaction.object.authorizeActions
+    //         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
+    //         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
+    const seatReservationAuthorizeActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     seatReservationAuthorizeActions.forEach((a) => {

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

@@ -1,6 +1,3 @@
-/**
- * 進行中注文取引サービス
- */
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { RedisRepository as ConfirmationNumberRepo } from '../../repo/confirmationNumber';

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

@@ -13,6 +13,7 @@ exports.voidAward = exports.authorizeAward = exports.publishOrderNumberIfNotExis
 /**
  * 進行中注文取引サービス
  */
+const moment = require("moment");
 const factory = require("../../factory");
 const factory_1 = require("./placeOrderInProgress/factory");
 const potentialActions_1 = require("./placeOrderInProgress/potentialActions");
@@ -28,10 +29,12 @@ exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const seller = yield repos.seller.findById({ id: params.seller.id }, {
-            hasMerchantReturnPolicy: 0,
-            paymentAccepted: 0
-        });
+        const seller = yield repos.seller.findById({ id: params.seller.id }, ['name', 'project', 'typeOf', 'makesOffer'], []
+        // {
+        //     hasMerchantReturnPolicy: 0,
+        //     paymentAccepted: 0
+        // }
+        );
         let makesOfferFromClient;
         // 販売者オファー検証(2022-10-14~)
         if (params.validateSeller === true) {
@@ -95,14 +98,15 @@ function confirm(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // 取引に対する全ての承認アクションをマージ
-        transaction.object.authorizeActions = yield searchAuthorizeActions(params)(repos);
+        const authorizeActions = yield searchAuthorizeActions(params)(repos);
+        // transaction.object.authorizeActions = authorizeActions;
         // 注文番号を発行
         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 }));
+        const result = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions }));
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -119,14 +123,16 @@ function confirm(params) {
             order: result.order,
             potentialActions: params.potentialActions,
             transaction: transaction,
-            emailMessage: emailMessageOnOrderSent
+            emailMessage: emailMessageOnOrderSent,
+            authorizeActions
         });
         // ステータス変更
         try {
             yield repos.transaction.confirm({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
-                authorizeActions: transaction.object.authorizeActions,
+                // 保管有無を設定化(2023-05-16~)
+                authorizeActions: [],
                 result: result,
                 potentialActions: potentialActions
             });
@@ -214,18 +220,20 @@ exports.publishOrderNumberIfNotExist = publishOrderNumberIfNotExist;
 function createResult(params) {
     const transaction = params.transaction;
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction);
+    (0, validation_1.validateTransaction)(transaction, params.authorizeActions);
     // 注文作成
     const order = (0, result_1.createOrder)({
         orderNumber: params.orderNumber,
         transaction: transaction,
         orderDate: params.result.order.orderDate,
         orderStatus: factory.orderStatus.OrderProcessing,
-        isGift: false
+        isGift: false,
+        authorizeActions: params.authorizeActions
     });
     (0, validation_1.validateEventOffers)({
         transaction: transaction,
-        order: order
+        order: order,
+        authorizeActions: params.authorizeActions
     });
     // 注文アイテム数制限確認
     (0, validation_1.validateNumItems)({
@@ -252,10 +260,15 @@ function searchAuthorizeActions(params) {
             purpose: {
                 typeOf: factory.transactionType.PlaceOrder,
                 id: params.id
-            }
+            },
+            // Completedに絞る(2023-05-16~)
+            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
         });
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
-        authorizeActions = authorizeActions.filter((a) => (a.endDate !== undefined && a.endDate < params.result.order.orderDate));
+        authorizeActions = authorizeActions.filter((a) => {
+            return (a.endDate instanceof Date) && moment(a.endDate)
+                .isBefore(moment(params.result.order.orderDate));
+        });
         return authorizeActions;
     });
 }
@@ -311,7 +324,7 @@ function authorizeAward(params) {
         if (Array.isArray(givePointAwardParams)) {
             const pointAwardIdentifiers = givePointAwardParams.map((g) => { var _a; return String((_a = g.object) === null || _a === void 0 ? void 0 : _a.identifier); });
             // 取引にインセンティブ付与アクションパラメータを保管する
-            yield repos.transaction.findByIdAndUpdate({
+            yield repos.transaction.findByIdAndUpdateInProgress({
                 id: transaction.id,
                 update: {
                     $set: {
@@ -339,7 +352,7 @@ function voidAward(params) {
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        yield repos.transaction.findByIdAndUpdate({
+        yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
             update: {
                 $unset: {

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

@@ -36,7 +36,16 @@ function createTasks(params) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: transaction
+            object: {
+                endDate: transaction.endDate,
+                id: transaction.id,
+                object: {
+                    order: transaction.object.order
+                },
+                project: transaction.project,
+                startDate: transaction.startDate,
+                typeOf: transaction.typeOf
+            }
         }
     };
     taskAttributes.push(deleteTransactionTask);

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -133,31 +133,39 @@ exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
 function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
-        const returnFeesMovieTicket = params.transaction.object.returnPolicy.returnFeesMovieTicket;
+        const returnFeesMovieTicketByTransaction = params.transaction.object.returnPolicy.returnFeesMovieTicket;
         return Promise.all(params.order.paymentMethods
             .filter((paymentMethod) => {
             return paymentMethod.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket;
         })
-            // 決済カード着券取消有無設定があれば適用
+            // 決済カード着券取消有無設定を適用
             .filter((paymentMethod) => {
-            var _a;
+            // デフォルトで実行する
+            let returnPaymentMethod = true;
             const movieTicketIdentifier = paymentMethod.accountId;
-            const returnFeesMovieTicketSetting = (_a = returnFeesMovieTicket === null || returnFeesMovieTicket === void 0 ? void 0 : returnFeesMovieTicket.find((r) => r.identifier === String(movieTicketIdentifier))) === null || _a === void 0 ? void 0 : _a.returnFees;
+            const returnFeesMovieTicketSettingsByIdentifier = returnFeesMovieTicketByTransaction === null || returnFeesMovieTicketByTransaction === void 0 ? void 0 : returnFeesMovieTicketByTransaction.filter((r) => {
+                var _a;
+                return r.identifier === String(movieTicketIdentifier)
+                    && ((_a = r.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === paymentMethod.typeOf;
+            });
             // 設定がなければスルー
-            if (typeof returnFeesMovieTicketSetting !== 'string') {
-                return true;
-            }
-            // 設定があれば適用
-            switch (returnFeesMovieTicketSetting) {
-                case factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn:
-                    // 取消実行する
-                    return true;
-                case factory.merchantReturnPolicy.ReturnFeesEnumeration.ReturnFeesCustomerResponsibility:
-                    // 取消実行しない
-                    return false;
-                default:
-                    throw new factory.errors.NotImplemented(`returnFees ${returnFeesMovieTicketSetting} not implemented`);
+            if (Array.isArray(returnFeesMovieTicketSettingsByIdentifier) && returnFeesMovieTicketSettingsByIdentifier.length > 0) {
+                returnFeesMovieTicketSettingsByIdentifier.forEach((returnFeesMovieTicketSetting) => {
+                    const returnFeesEnumeration = returnFeesMovieTicketSetting.returnFees;
+                    switch (returnFeesEnumeration) {
+                        case factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn:
+                            break;
+                        // ひとつでも「取消を実行しない」に設定されていれば、実行しない
+                        case factory.merchantReturnPolicy.ReturnFeesEnumeration.ReturnFeesCustomerResponsibility:
+                            // 取消実行しない
+                            returnPaymentMethod = false;
+                            break;
+                        default:
+                            throw new factory.errors.NotImplemented(`returnFees ${returnFeesEnumeration} not implemented`);
+                    }
+                });
             }
+            return returnPaymentMethod;
         })
             .map((p) => __awaiter(this, void 0, void 0, function* () {
             const potentialActionsOnRefund = yield createReturnPaymentMethodPotentialActions({

package/lib/chevre/service/transaction/returnOrder.d.ts

@@ -1,15 +1,19 @@
 import * as factory from '../../factory';
 import { MongoRepository as EmailMessageRepo } from '../../repo/emailMessage';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as MerchantReturnPolicyRepo } from '../../repo/merchantReturnPolicy';
 import { MongoRepository as OfferRepo } from '../../repo/offer';
+import { MongoRepository as OfferItemConditionRepo } from '../../repo/offerItemCondition';
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as SellerRepo } from '../../repo/seller';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
 export interface IStartOperationRepos {
+    event: EventRepo;
     merchantReturnPolicy: MerchantReturnPolicyRepo;
     offer: OfferRepo;
+    offerItemCondition: OfferItemConditionRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
     seller: SellerRepo;