@chevre/domain 21.25.0-alpha.2 → 21.25.0-alpha.4

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

@@ -1,5 +1,4 @@
 import * as factory from '../../../factory';
-export type IAuthorizeAnyPaymentResult = factory.action.authorize.paymentMethod.any.IResult;
 /**
  * 注文を生成する
  */
@@ -9,7 +8,8 @@ export declare function createOrder(params: {
     orderDate: Date;
     orderStatus: factory.orderStatus;
     isGift: boolean;
-    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
-}): factory.transaction.placeOrder.IOrderAsResult & {
-    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-};
+    authorizePaymentActions: factory.action.authorize.paymentMethod.any.IAction[];
+    eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[];
+    productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[];
+    moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[];
+}): factory.transaction.placeOrder.IOrderAsResult;

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

@@ -11,23 +11,30 @@ function createOrder(params) {
     const seller = createSeller({ transaction: params.transaction });
     const customer = createCustomer({ transaction: params.transaction });
     // 予約がある場合
-    const { reservationAcceptedOffers, reservationOrderItems } = (0, acceptedOffers_1.createReservationAcceptedOffers)(params);
+    // const { reservationAcceptedOffers, reservationOrderItems } = createReservationAcceptedOffers(params);
+    const { reservationOrderItems } = (0, acceptedOffers_1.createReservationAcceptedOffers)(params);
     // 通貨転送がある場合
-    const { moneyTransferAcceptedOffers, moneyTransferOrderItems } = (0, acceptedOffers_1.createMoneyTransferAcceptedOffers)(Object.assign(Object.assign({}, params), { seller: seller }));
+    // const { moneyTransferAcceptedOffers, moneyTransferOrderItems } = createMoneyTransferAcceptedOffers({ ...params, seller: seller });
+    const { moneyTransferOrderItems } = (0, acceptedOffers_1.createMoneyTransferAcceptedOffers)(params);
     // プロダクトがある場合
-    const { productAcceptedOffers, productOrderItems } = (0, acceptedOffers_1.createProductItems)(params);
-    const acceptedOffers = [
-        ...reservationAcceptedOffers,
-        ...moneyTransferAcceptedOffers,
-        ...productAcceptedOffers
-    ];
+    // const { productAcceptedOffers, productOrderItems } = createProductItems(params);
+    const { productOrderItems } = (0, acceptedOffers_1.createProductItems)(params);
+    // const acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[] = [
+    //     ...reservationAcceptedOffers,
+    //     ...moneyTransferAcceptedOffers,
+    //     ...productAcceptedOffers
+    // ];
     const orderedItems = [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
     // 決済方法をセット
-    const { paymentMethods, price } = createPaymentMethods({ transaction: params.transaction, authorizeActions: params.authorizeActions });
+    const { paymentMethods, price } = createPaymentMethods({
+        authorizePaymentActions: params.authorizePaymentActions
+    });
     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;
-    return Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.order.OrderType.Order, seller: seller, customer: customer, price: price, priceCurrency: factory.priceCurrency.JPY, paymentMethods: paymentMethods, discounts: discounts, confirmationNumber: '', orderNumber: params.orderNumber, orderedItem: orderedItems, acceptedOffers: acceptedOffers, url: '', orderStatus: params.orderStatus, orderDate: params.orderDate, identifier: [], isGift: params.isGift }, (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined);
+    return Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.order.OrderType.Order, seller: seller, customer: customer, price: price, priceCurrency: factory.priceCurrency.JPY, paymentMethods: paymentMethods, discounts: discounts, confirmationNumber: '', orderNumber: params.orderNumber, orderedItem: orderedItems, 
+        // acceptedOffers: acceptedOffers,
+        url: '', orderStatus: params.orderStatus, orderDate: params.orderDate, identifier: [], isGift: params.isGift }, (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined);
 }
 exports.createOrder = createOrder;
 function createSeller(params) {
@@ -62,16 +69,8 @@ function createCustomer(params) {
 function createPaymentMethods(params) {
     const paymentMethods = [];
     let price = 0;
-    const authorizePaymentActions = params.authorizeActions
-        .filter((a) => {
-        var _a;
-        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 (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
-    });
     // 決済方法をセット
-    authorizePaymentActions.forEach((a) => {
+    params.authorizePaymentActions.forEach((a) => {
         var _a, _b, _c, _d;
         // const result = (<factory.action.authorize.paymentMethod.any.IResult>a.result);
         const resultAsInvoice = (Array.isArray(a.result))
@@ -101,7 +100,7 @@ function createPaymentMethods(params) {
         });
     });
     // 決済方法から注文金額の計算
-    price += authorizePaymentActions
+    price += params.authorizePaymentActions
         .reduce((a, b) => {
         var _a, _b;
         const resultAsInvoice = (Array.isArray(b.result))

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

@@ -1,5 +1,22 @@
 import * as factory from '../../../../factory';
+type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any.IAction;
 /**
- * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
+ * 興行オファー承認に対して決済承認条件が整っているかどうか検証する
+ * 決済方法区分ごとに検証
  */
-export declare function validateMovieTicket(paymentMethodType: string, transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[]): void;
+export declare function validateMovieTicket(
+/**
+ * 決済方法区分
+ */
+paymentMethodType: string, transaction: {
+    id: string;
+}, 
+/**
+ * 決済承認アクション
+ */
+authorizePaymentActions: IAuthorizePaymentAction[], 
+/**
+ * 受け入れられた興行オファー
+ */
+eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[]): void;
+export {};

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

@@ -6,27 +6,42 @@ exports.validateMovieTicket = void 0;
  */
 const createDebug = require("debug");
 const factory = require("../../../../factory");
-const debug = createDebug('cinerino-domain:service:validateMovieTicket');
+const debug = createDebug('chevre-domain:service:validateMovieTicket');
 /**
- * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
+ * 興行オファー承認に対して決済承認条件が整っているかどうか検証する
+ * 決済方法区分ごとに検証
  */
-function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
-    const authorizeMovieTicketActions = authorizeActions.filter((a) => {
-        var _a, _b;
+// tslint:disable-next-line:max-func-body-length
+function validateMovieTicket(
+/**
+ * 決済方法区分
+ */
+paymentMethodType, transaction, 
+/**
+ * 決済承認アクション
+ */
+authorizePaymentActions, 
+/**
+ * 受け入れられた興行オファー
+ */
+eventReservationAcceptedOffers) {
+    const authorizeMovieTicketActions = authorizePaymentActions.filter((a) => {
+        var _a;
         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 (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
+            ? a.result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : undefined;
+        return (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
+            && ((_a = resultAsInvoice.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.typeOf) === paymentMethodType;
     });
-    const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
+    // const seatReservationAuthorizeActions = (<IAuthorizeSeatReservationOffer[]>authorizeActions).filter(
+    //     (a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation
+    // );
     // 予約によって必要とされるMovieTicket
     const requiredMovieTickets = authorizeSeatReservationActions2requiredMovieTickets({
         paymentMethodType,
-        seatReservationAuthorizeActions
+        // seatReservationAuthorizeActions
+        acceptedOffers: eventReservationAcceptedOffers
     });
     debug(requiredMovieTickets.length, 'movie tickets required', 'transaction:', transaction.id);
     const authorizedMovieTickets = [];
@@ -105,76 +120,71 @@ function validateAppliesToMovieTicketIdentifiers(params) {
         }
     });
 }
-// tslint:disable-next-line:max-func-body-length
+/**
+ * 予約オファーリストから必要なmovieTicketsを生成する
+ */
 function authorizeSeatReservationActions2requiredMovieTickets(params) {
     const paymentMethodType = params.paymentMethodType;
-    const seatReservationAuthorizeActions = params.seatReservationAuthorizeActions;
+    // const seatReservationAuthorizeActions = params.seatReservationAuthorizeActions;
     // ムビチケオファーを受け付けた座席予約を検索する
     const requiredMovieTickets = [];
     // tslint:disable-next-line:max-func-body-length
-    seatReservationAuthorizeActions.forEach((action) => {
-        var _a;
-        const event = action.object.event;
-        // ↓実際ありえないフロー
-        if (event === undefined || event === null) {
-            throw new factory.errors.ServiceUnavailable('Authorized event undefined');
-        }
-        // a.objectではなくa.resultを使用する(2022-06-04~)
-        // 予約の複数適用決済カードに対応する(2022-07-28~)
-        const acceptedOffers = (_a = action.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
-        if (Array.isArray(acceptedOffers)) {
-            acceptedOffers.forEach((offer) => {
-                var _a, _b, _c, _d, _e;
-                let offeredTicketedSeat;
-                const acceptedTicketedSeatByItemOffered = (_b = (_a = offer.itemOffered) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat;
-                if (typeof (acceptedTicketedSeatByItemOffered === null || acceptedTicketedSeatByItemOffered === void 0 ? void 0 : acceptedTicketedSeatByItemOffered.typeOf) === 'string') {
-                    offeredTicketedSeat = acceptedTicketedSeatByItemOffered;
+    // seatReservationAuthorizeActions.forEach((action) => {
+    //     const acceptedOffers = action.result?.acceptedOffers;
+    // });
+    if (Array.isArray(params.acceptedOffers)) {
+        params.acceptedOffers.forEach((offer) => {
+            var _a, _b, _c, _d;
+            let offeredTicketedSeat;
+            const acceptedTicketedSeatByItemOffered = (_b = (_a = offer.itemOffered) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat;
+            if (typeof (acceptedTicketedSeatByItemOffered === null || acceptedTicketedSeatByItemOffered === void 0 ? void 0 : acceptedTicketedSeatByItemOffered.typeOf) === 'string') {
+                offeredTicketedSeat = acceptedTicketedSeatByItemOffered;
+            }
+            if (typeof (offeredTicketedSeat === null || offeredTicketedSeat === void 0 ? void 0 : offeredTicketedSeat.typeOf) === 'string') {
+                const ticketedSeat4MovieTicket = offeredTicketedSeat;
+                const eventOfferedThroughIdentifier = (_c = offer.offeredThrough) === null || _c === void 0 ? void 0 : _c.identifier;
+                if (typeof eventOfferedThroughIdentifier !== 'string') {
+                    throw new factory.errors.NotFound('offer.offeredThrough.identifier', `offer.offeredThrough.identifier undefined [serialNumber:${offer.serialNumber}]`);
+                }
+                // シンプルに単価仕様のappliesToMovieTicketを参照してrequiredMovieTicketsを作成する(2022-07-28~)
+                const unitPriceSpec = (_d = offer.priceSpecification) === null || _d === void 0 ? void 0 : _d.priceComponent.find((component) => {
+                    return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification
+                        && (!Array.isArray(component.appliesToAddOn));
+                });
+                if (unitPriceSpec === undefined) {
+                    throw new factory.errors.NotFound('UnitPriceSpecification of acceptedOffer');
+                }
+                if (offer.itemOffered.reservationFor.typeOf !== factory.eventType.ScreeningEvent) {
+                    throw new factory.errors.NotImplemented(`offer.itemOffered.reservationFor.typeOf not imelemented [${offer.itemOffered.reservationFor.typeOf}]`);
                 }
-                if (typeof (offeredTicketedSeat === null || offeredTicketedSeat === void 0 ? void 0 : offeredTicketedSeat.typeOf) === 'string') {
-                    const ticketedSeat4MovieTicket = offeredTicketedSeat;
-                    // Chevre or COAでrequiredMovieTicketsの取り出し方が異なる
-                    const eventOfferedThroughIdentifier = (_d = (_c = event.offers) === null || _c === void 0 ? void 0 : _c.offeredThrough) === null || _d === void 0 ? void 0 : _d.identifier;
-                    // シンプルに単価仕様のappliesToMovieTicketを参照してrequiredMovieTicketsを作成する(2022-07-28~)
-                    const unitPriceSpec = (_e = offer.priceSpecification) === null || _e === void 0 ? void 0 : _e.priceComponent.find((component) => {
-                        return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification
-                            && (!Array.isArray(component.appliesToAddOn));
+                const reservationFor4movieTicket = {
+                    typeOf: offer.itemOffered.reservationFor.typeOf,
+                    id: offer.itemOffered.reservationFor.id
+                    // offers: { offeredThrough: { identifier: eventOfferedThroughIdentifier } }
+                };
+                // 指定された決済方法の適用決済カードリスト
+                let appliesToMovieTickets4paymentMethod = [];
+                const appliesToMovieTickets4reservation = unitPriceSpec.appliesToMovieTicket;
+                if (Array.isArray(appliesToMovieTickets4reservation)) {
+                    appliesToMovieTickets4paymentMethod = appliesToMovieTickets4reservation.filter((a) => {
+                        return a.serviceOutput.typeOf === paymentMethodType;
                     });
-                    if (unitPriceSpec === undefined) {
-                        throw new factory.errors.NotFound('UnitPriceSpecification of acceptedOffer');
-                    }
-                    // 指定された決済方法の適用決済カードリスト
-                    let appliesToMovieTickets4paymentMethod = [];
-                    const appliesToMovieTickets4reservation = unitPriceSpec.appliesToMovieTicket;
-                    if (Array.isArray(appliesToMovieTickets4reservation)) {
-                        appliesToMovieTickets4paymentMethod = appliesToMovieTickets4reservation.filter((a) => {
-                            return a.serviceOutput.typeOf === paymentMethodType;
-                        });
-                        // Array以外への考慮自体を廃止(2023-09-01~)
-                        // } else if (typeof appliesToMovieTickets4reservation?.identifier === 'string') {
-                        //     // Arrayでない場合を廃止(2022-08-01~)
-                        //     throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
-                    }
-                    if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
-                        appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {
-                            requiredMovieTickets.push({
-                                // project: action.project,
-                                typeOf: paymentMethodType,
-                                identifier: String(appliesToMovieTicket.identifier),
-                                serviceType: appliesToMovieTicket.serviceType,
-                                serviceOutput: {
-                                    reservationFor: {
-                                        typeOf: event.typeOf,
-                                        id: event.id,
-                                        offers: { offeredThrough: { identifier: eventOfferedThroughIdentifier } }
-                                    },
-                                    reservedTicket: { ticketedSeat: ticketedSeat4MovieTicket }
-                                }
-                            });
+                }
+                if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
+                    appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {
+                        requiredMovieTickets.push({
+                            typeOf: paymentMethodType,
+                            identifier: String(appliesToMovieTicket.identifier),
+                            serviceType: appliesToMovieTicket.serviceType,
+                            serviceOutput: {
+                                reservationFor: reservationFor4movieTicket,
+                                reservedTicket: { ticketedSeat: ticketedSeat4MovieTicket }
+                            }
                         });
-                    }
+                    });
                 }
-            });
-        }
-    });
+            }
+        });
+    }
     return requiredMovieTickets;
 }

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

@@ -1,22 +1,20 @@
 import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
-export type IAuthorizeAnyPaymentResult = factory.action.authorize.paymentMethod.any.IResult;
-export type IAuthorizeSeatReservationOffer = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
-export type IAuthorizeSeatReservationOfferResult = factory.action.authorize.offer.eventService.IResult<factory.service.webAPI.Identifier>;
-export type IAuthorizeOfferAction = factory.action.authorize.offer.product.IAction | factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier> | factory.action.authorize.offer.moneyTransfer.IAction;
-export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
+export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
+export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
+export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
+export type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any.IAction;
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[]): void;
+export declare function validateTransaction(transaction: factory.transaction.placeOrder.ITransaction, authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: IAuthorizeEventServiceOffer[], authorizeMoneyTansferActions: IAuthorizeMoneyTransferOffer[], authorizeProductOfferActions: IAuthorizeProductOffer[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[]): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 export declare function validateNumItems(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult & {
-        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    };
+    order: factory.transaction.placeOrder.IOrderAsResult;
     result: {
         order: PlaceOrderFactory.IResultOrderParams;
     };
+    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
 }): void;
 export declare function validateOrderedItem(params: {
     order: factory.transaction.placeOrder.IOrderAsResult;
@@ -31,7 +29,6 @@ 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>>[];
+    authorizeEventServiceOfferActions: IAuthorizeEventServiceOffer[];
 }): void;