@chevre/domain 23.1.0-alpha.8 → 23.1.0

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

@@ -17,26 +17,30 @@ const verifyTicketTokenAsNeeded_1 = require("../verifyTicketTokenAsNeeded");
  */
 function fixTransactionNumberOnPublishPaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
         const { paymentServiceType, transaction, object } = params;
         // 取引番号生成
         let transactionNumber;
+        let ticketToken;
         // support ticketToken(2024-08-21~)
-        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+        const { verifyPaymentMethodTicketResult } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
             project: { id: transaction.project.id },
             object,
             paymentServiceType,
             purpose: { id: transaction.id }
         })(repos);
-        if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) {
-            const paymentMethodIdByPermit = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.identifier;
-            if (typeof paymentMethodIdByPermit === 'string') {
-                transactionNumber = paymentMethodIdByPermit;
-            }
+        if (((_a = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.permit.PermitType.Permit) {
+            throw new factory.errors.Argument('ticketToken', `typeOfGood.typeOf ${(_b = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _b === void 0 ? void 0 : _b.typeOf} discontinued`);
+            // const paymentMethodIdByPermit = permitOrInvoice?.identifier;
+            // if (typeof paymentMethodIdByPermit === 'string') {
+            //     transactionNumber = paymentMethodIdByPermit;
+            // }
         }
-        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === 'Invoice') {
+        else if (((_c = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _c === void 0 ? void 0 : _c.typeOf) === 'Invoice') {
             // support Invoice ticket(2025-11-09~)
-            if (typeof (permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId) === 'string') {
-                transactionNumber = permitOrInvoice.paymentMethodId;
+            if (typeof ((_d = verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _d === void 0 ? void 0 : _d.paymentMethodId) === 'string') {
+                transactionNumber = verifyPaymentMethodTicketResult.invoiceByTicketToken.paymentMethodId;
+                ticketToken = verifyPaymentMethodTicketResult.ticketToken;
             }
         }
         if (typeof transactionNumber !== 'string') {
@@ -44,8 +48,8 @@ function fixTransactionNumberOnPublishPaymentUrl(params) {
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
         return {
-            transactionNumber
-            // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
+            transactionNumber,
+            ticketToken
         };
     });
 }

package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.d.ts

@@ -1,7 +1,7 @@
 import * as factory from '../../../factory';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { TicketRepo } from '../../../repo/ticket';
-type IPermitOrInvoice = Pick<factory.ownershipInfo.IPermitAsGood, 'identifier' | 'typeOf'> | Pick<factory.invoice.IInvoice, 'paymentMethodId' | 'typeOf'>;
+import type { IInvoiceByTicketToken } from './factory';
 declare function verifyTicketTokenAsNeeded(params: {
     project: {
         id: string;
@@ -13,6 +13,9 @@ declare function verifyTicketTokenAsNeeded(params: {
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
 }) => Promise<{
-    permitOrInvoice?: IPermitOrInvoice;
+    verifyPaymentMethodTicketResult?: {
+        invoiceByTicketToken: IInvoiceByTicketToken;
+        ticketToken: string;
+    };
 }>;
-export { IPermitOrInvoice, verifyTicketTokenAsNeeded };
+export { verifyTicketTokenAsNeeded };

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

@@ -18,14 +18,14 @@ function verifyTicketTokenAsNeeded(params) {
         var _a;
         const { paymentServiceType, object, project } = params;
         const { issuedThrough, ticketToken } = object;
-        let permitOrInvoice;
+        let verifyPaymentMethodTicketResult;
         // メンバーシップチケットが指定された場合、メンバーシップコードへ変換する
         if (typeof ticketToken === 'string' && ticketToken !== '') {
             switch (paymentServiceType) {
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
                 case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                    const ticket = (yield repos.ticket.projectFields({
+                    const ticket = (yield repos.ticket.findTickets({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: project.id } },
@@ -47,26 +47,9 @@ function verifyTicketTokenAsNeeded(params) {
                     }
                     if (authorizedObject.typeOf === 'OwnershipInfo') {
                         const { typeOfGood } = authorizedObject;
-                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit || typeOfGood.typeOf === 'Invoice') {
+                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit) {
                             // discontinue(2025-11-14~)
                             throw new factory.errors.Argument('ticketToken', `typeOfGood.typeOf ${typeOfGood.typeOf} discontinued`);
-                            // if (typeOfGood.issuedThrough?.typeOf !== paymentServiceType) {
-                            //     throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
-                            // }
-                            // // FaceToFace以外の場合、発行サービスIDを検証
-                            // if (typeOfGood.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                            //     if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
-                            //         throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
-                            //     }
-                            // }
-                            // if (typeOfGood.typeOf === factory.permit.PermitType.Permit) {
-                            //     permitOrInvoice = { identifier: typeOfGood.identifier, typeOf: factory.permit.PermitType.Permit };
-                            // } else if (typeOfGood.typeOf === 'Invoice') {
-                            //     //  support paymentServiceType.MovieTicket(2024-11-23~)
-                            //     permitOrInvoice = { paymentMethodId: typeOfGood.paymentMethodId, typeOf: 'Invoice' };
-                            // } else {
-                            //     throw new factory.errors.Argument('ticketToken', 'must be Permit or Invoice');
-                            // }
                         }
                         else if (typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
                             || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket
@@ -81,7 +64,10 @@ function verifyTicketTokenAsNeeded(params) {
                                     throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
                                 }
                             }
-                            permitOrInvoice = { paymentMethodId: typeOfGood.serviceOutput.paymentMethodId, typeOf: 'Invoice' };
+                            verifyPaymentMethodTicketResult = {
+                                invoiceByTicketToken: { paymentMethodId: typeOfGood.serviceOutput.paymentMethodId, typeOf: 'Invoice' },
+                                ticketToken
+                            };
                         }
                         else {
                             throw new factory.errors.Argument('ticketToken', `invalid typeOfGood.typeOf ${typeOfGood.typeOf}`);
@@ -96,6 +82,6 @@ function verifyTicketTokenAsNeeded(params) {
                     throw new factory.errors.NotImplemented(`ticketToken issued through ${paymentServiceType} not implemented`);
             }
         }
-        return { permitOrInvoice };
+        return { verifyPaymentMethodTicketResult };
     });
 }

package/lib/chevre/service/payment/any.d.ts

@@ -7,6 +7,7 @@ import type { AuthorizationRepo } from '../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../repo/confirmationNumber';
 import type { CredentialsRepo } from '../../repo/credentials';
 import type { EventRepo } from '../../repo/event';
+import type { EventSeriesRepo } from '../../repo/eventSeries';
 import type { OrderNumberRepo } from '../../repo/orderNumber';
 import type { PaymentServiceRepo } from '../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
@@ -85,6 +86,7 @@ interface IAuthorizeRepos {
     confirmationNumber: ConfirmationNumberRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
+    eventSeries: EventSeriesRepo;
     orderNumber: OrderNumberRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
@@ -102,6 +104,8 @@ interface IPublishPaymentUrlRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
+    event: EventRepo;
+    eventSeries: EventSeriesRepo;
     orderNumber: OrderNumberRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
@@ -125,7 +129,7 @@ declare function publishPaymentUrl(params: {
     agent: {
         id: string;
     };
-    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'referencesOrder'>;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location: factory.action.trade.pay.ILocation;

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

@@ -323,7 +323,7 @@ function processVoidPayTransaction(params) {
 function publishPaymentUrl(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
@@ -340,7 +340,7 @@ function publishPaymentUrl(params) {
                 object: { orderDate: new Date() }
             })(repos);
             // 取引番号生成
-            const { transactionNumber } = yield (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
+            const { transactionNumber, ticketToken } = yield (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
                 object: params.object,
                 transaction,
                 paymentServiceType
@@ -361,9 +361,13 @@ function publishPaymentUrl(params) {
             // }
             let result;
             // URL発行
-            const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment });
-            const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined));
-            const taskId = (_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id;
+            const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment, 
+                // support referencesOrder(2025-11-24~)
+                referencesOrder: (((_a = params.object.referencesOrder) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.order.OrderType.Order)
+                    ? params.object.referencesOrder
+                    : { typeOf: factory.order.OrderType.Order } });
+            const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined));
+            const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
             result = yield PayTransactionService.publishPaymentUrl(startParams, {
                 purposeAsTransaction: { id: transaction.id },
                 executor: (typeof taskId === 'string') ? { id: taskId } : {} // タスク関連付け(2024-05-22~)
@@ -416,7 +420,7 @@ function minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPay
 function authorize(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
@@ -439,7 +443,7 @@ function authorize(params) {
         if (typeof fixTransactionNumberResult.id === 'string') {
             return { id: fixTransactionNumberResult.id };
         }
-        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard } = fixTransactionNumberResult;
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, invoiceByTicketToken, ticketToken } = fixTransactionNumberResult;
         // let transactionNumber: string | undefined;
         // let pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction | undefined;
         // let creditCard: factory.action.authorize.paymentMethod.any.ICreditCard | undefined = params.object.creditCard;
@@ -497,10 +501,14 @@ function authorize(params) {
         const { accountId } = yield fixAccountIdIfPossible({
             object: params.object, project: { id: transaction.project.id }
         })();
-        const authorizeObjectIncludingPaymentMethodDetails = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
+        const authorizeObjectIncludingPaymentMethodDetails = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment, 
+            // support referencesOrder(2025-11-24~)
+            referencesOrder: (((_a = params.object.referencesOrder) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.order.OrderType.Order)
+                ? params.object.referencesOrder
+                : { typeOf: factory.order.OrderType.Order } }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
         const { authorizeObject } = minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPaymentMethodDetails);
         // 承認アクションを開始する
-        const taskId = (_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id;
+        const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
         const uniqueActionIdentifier = util.format(`%s:%s:%s`, factory.actionType.AuthorizeAction, factory.action.authorize.paymentMethod.any.ResultType.Payment, authorizeObject.paymentMethodId);
         const actionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.AuthorizeAction, object: authorizeObject, agent: {
                 typeOf: transaction.agent.typeOf,
@@ -514,7 +522,7 @@ function authorize(params) {
                 id: transaction.seller.id,
                 name: (typeof transaction.seller.name === 'string')
                     ? transaction.seller.name
-                    : String((_b = transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
+                    : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja)
             }, purpose: { typeOf: transaction.typeOf, id: transaction.id }, identifier: uniqueActionIdentifier }, (typeof taskId === 'string') ? { sameAs: { id: taskId, typeOf: 'Task' } } : undefined // タスク関連付け(2024-04-22~)
         );
         const action = yield repos.action.start(actionAttributes);
@@ -530,7 +538,8 @@ function authorize(params) {
                 // confirmationNumber required(2025-02-12~)
                 // orderNumber required(2025-02-14~)
                 order: { confirmationNumber, orderNumber },
-                action: { id: action.id, typeOf: action.typeOf }
+                action: { id: action.id, typeOf: action.typeOf },
+                ticketToken
             });
             payTransaction = yield PayTransactionService.start(startParams, Object.assign({ 
                 // useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet,
@@ -570,8 +579,8 @@ function authorize(params) {
         }
         const result = (0, factory_1.createAuthorizeResult)({
             payTransaction,
-            object: authorizeObjectIncludingPaymentMethodDetails
-            // ...(permitOrInvoice?.typeOf === factory.permit.PermitType.Permit) ? { permit: permitOrInvoice } : undefined
+            object: authorizeObjectIncludingPaymentMethodDetails,
+            invoiceByTicketToken
         });
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };

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

@@ -15,11 +15,6 @@ function createPayOrderAction(params) {
         confirmationNumber: params.order.confirmationNumber,
         orderNumber: params.order.orderNumber
     };
-    // const instrument: factory.action.trade.pay.IInstrument = {
-    //     id: params.transaction.id,
-    //     transactionNumber: params.transaction.transactionNumber,
-    //     typeOf: params.transaction.typeOf
-    // };
     const instrument = [
         {
             id: params.transaction.id,

package/lib/chevre/service/payment/movieTicket/authorize.js

@@ -48,11 +48,6 @@ function authorize(params, transaction, paymentServiceId, options) {
                     }, typeOf: paymentMethodType }, (typeof accountId === 'string') ? { accountId } : undefined),
                 movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets
             };
-            // const instrument: factory.action.trade.pay.IInstrument = {
-            //     id: transaction.id,
-            //     transactionNumber: transaction.transactionNumber,
-            //     typeOf: transaction.typeOf
-            // };
             const instrument = [
                 {
                     id: transaction.id,

package/lib/chevre/service/task/authorizePayment.js

@@ -18,6 +18,7 @@ const authorization_1 = require("../../repo/authorization");
 const confirmationNumber_1 = require("../../repo/confirmationNumber");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
+const eventSeries_1 = require("../../repo/eventSeries");
 const orderNumber_1 = require("../../repo/orderNumber");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -63,6 +64,7 @@ function call(params) {
                     expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
                 }),
                 event: new event_1.EventRepo(connection),
+                eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),

package/lib/chevre/service/task/publishPaymentUrl.js

@@ -14,6 +14,8 @@ const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
+const event_1 = require("../../repo/event");
+const eventSeries_1 = require("../../repo/eventSeries");
 const orderNumber_1 = require("../../repo/orderNumber");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -43,6 +45,8 @@ function call(params) {
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
+                event: new event_1.EventRepo(connection),
+                eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),

package/lib/chevre/service/transaction/placeOrder/confirm/publishCode.js

@@ -21,7 +21,7 @@ function publishCode(params) {
         const issuedBy = { id: params.object.seller.id, typeOf: factory.organizationType.Corporation };
         let authorizations;
         try {
-            authorizations = yield repos.authorization.publish([{
+            authorizations = yield repos.authorization.issueAuthorization([{
                     project: { id: params.project.id, typeOf: factory.organizationType.Project },
                     object: authorizationObject,
                     validFrom: params.validFrom,

package/lib/chevre/service/transaction/placeOrder/confirm/validation/factory.d.ts

@@ -0,0 +1,9 @@
+import * as factory from '../../../../../factory';
+export type IAcceptPayAction = Pick<factory.action.accept.pay.IAction, 'object' | 'result' | 'endDate'>;
+export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
+export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
+export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
+export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate' | 'instrument'> & {
+    object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf'>;
+};
+export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'object'>;

package/lib/chevre/service/transaction/placeOrder/confirm/validation/factory.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validateInvoiceReferencesOrder.d.ts

@@ -0,0 +1,8 @@
+import * as factory from '../../../../../factory';
+import { IAuthorizePaymentAction } from './factory';
+declare function validateInvoiceReferencesOrder(authorizePaymentActions: IAuthorizePaymentAction[], 
+/**
+ * 受け入れられた興行オファー
+ */
+eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[]): void;
+export { validateInvoiceReferencesOrder };

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validateInvoiceReferencesOrder.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateInvoiceReferencesOrder = validateInvoiceReferencesOrder;
+const createDebug = require("debug");
+const factory = require("../../../../../factory");
+const debug = createDebug('chevre-domain:service:transaction');
+function validateInvoiceReferencesOrder(authorizePaymentActions, 
+/**
+ * 受け入れられた興行オファー
+ */
+eventReservationAcceptedOffers) {
+    // 興行オファーに含まれるイベントIDリスト
+    let eventIdsMustBe = [];
+    if (Array.isArray(eventReservationAcceptedOffers)) {
+        eventReservationAcceptedOffers.forEach((offer) => {
+            eventIdsMustBe.push(offer.itemOffered.reservationFor.id);
+        });
+    }
+    eventIdsMustBe = [...new Set(eventIdsMustBe)];
+    debug('validateInvoiceReferencesOrder: eventIdsMustBe: ', JSON.stringify(eventIdsMustBe));
+    // 全決済承認について、承認ごとに検証
+    authorizePaymentActions.forEach((authorizePaymentAction) => {
+        var _a, _b, _c, _d;
+        const paymentMethodId = (_a = authorizePaymentAction.result) === null || _a === void 0 ? void 0 : _a[0].paymentMethodId;
+        const paymentServiceType = (_b = authorizePaymentAction.result) === null || _b === void 0 ? void 0 : _b[0].issuedThrough.typeOf;
+        if (paymentServiceType !== factory.service.paymentService.PaymentServiceType.CreditCard) {
+            // クレジットカードIF以外は検証不要
+            return;
+        }
+        const orderedItemsByInvoice = (_d = (_c = authorizePaymentAction.result) === null || _c === void 0 ? void 0 : _c[0].referencesOrder) === null || _d === void 0 ? void 0 : _d.orderedItem;
+        if (!Array.isArray(orderedItemsByInvoice)) {
+            // 決済承認時に注文アイテムの指定がなければ検証不要
+            return;
+        }
+        // 請求の関連注文アイテムが定義されていれば(空配列であったとしても)、イベントIDの一致検証が必要
+        // 請求の関連イベントIDリスト
+        const eventIdsByInvoice = orderedItemsByInvoice.map((orderedItem) => orderedItem.orderedItem.serviceOutput.reservationFor.id);
+        debug('validateInvoiceReferencesOrder: eventIdsByInvoice: ', JSON.stringify(eventIdsByInvoice), paymentServiceType, paymentMethodId);
+        const eventIdsMatched = eventIdsMustBe.length === eventIdsByInvoice.length
+            && eventIdsMustBe.every((eventIdMustExist) => eventIdsByInvoice.includes(eventIdMustExist));
+        if (!eventIdsMatched) {
+            throw new factory.errors.Argument('id', `referencesOrder.orderedItem not matched. ${paymentMethodId}`);
+        }
+    });
+}

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validatePrice.d.ts

@@ -0,0 +1,3 @@
+import { IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer } from './factory';
+declare function validatePrice(authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[]): void;
+export { validatePrice };

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validatePrice.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validatePrice = validatePrice;
+const factory = require("../../../../../factory");
+function validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions) {
+    let priceByAgent = 0;
+    let priceBySeller = 0;
+    // 決済承認を確認
+    authorizePaymentActions.forEach(({ result }) => {
+        var _a;
+        const resultAsInvoice = (Array.isArray(result))
+            // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            ? result[0]
+            : undefined;
+        const jpyAmount = (((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === factory.priceCurrency.JPY)
+            ? resultAsInvoice.totalPaymentDue.value
+            : 0;
+        priceByAgent += jpyAmount;
+    });
+    // 販売者が提供するアイテムの発生金額
+    [
+        ...authorizeEventServiceOfferActions,
+        ...authorizeProductOfferActions,
+        ...authorizeMoneyTansferActions
+    ].forEach(({ id, result }) => {
+        const priceByAction = result === null || result === void 0 ? void 0 : result.price;
+        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. [${id}]`);
+        }
+    });
+    if (priceByAgent !== priceBySeller) {
+        throw new factory.errors.Argument('id', `prices are not matched. [${priceByAgent},${priceBySeller}]`);
+    }
+}

package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts

@@ -1,13 +1,7 @@
 import * as factory from '../../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../../factory/transaction';
-export type IAcceptPayAction = Pick<factory.action.accept.pay.IAction, 'object' | 'result' | 'endDate'>;
-export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
-export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
-export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
-export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate' | 'instrument'> & {
-    object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf'>;
-};
-export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
+import { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction } from './validation/factory';
+export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction };
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */

package/lib/chevre/service/transaction/placeOrder/confirm/validation.js

@@ -11,7 +11,9 @@ exports.validateEventOffers = validateEventOffers;
 const createDebug = require("debug");
 const util_1 = require("util");
 const factory = require("../../../../factory");
+const validateInvoiceReferencesOrder_1 = require("./validation/validateInvoiceReferencesOrder");
 const validateMovieTicket_1 = require("./validation/validateMovieTicket");
+const validatePrice_1 = require("./validation/validatePrice");
 const debug = createDebug('chevre-domain:service:transaction');
 /**
  * 取引が確定可能な状態かどうかをチェックする
@@ -19,7 +21,9 @@ const debug = createDebug('chevre-domain:service:transaction');
 function validateTransaction(transaction, acceptPayActions, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, eventReservationAcceptedOffers, payTransactions, customer) {
     // validateProfile(transaction);
     validateProfile({ customer });
-    validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions);
+    (0, validatePrice_1.validatePrice)(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions);
+    // 請求のreferencesOrder検証(2025-11-23~)
+    (0, validateInvoiceReferencesOrder_1.validateInvoiceReferencesOrder)(authorizePaymentActions, eventReservationAcceptedOffers);
     // 利用可能な通貨単位に対して取引検証
     validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOfferActions);
     // 利用可能なMovieTicketIF決済方法タイプに対して動的にコーディング
@@ -119,40 +123,6 @@ function validateProfile(params) {
         throw new factory.errors.Argument('Transaction', 'customer name required');
     }
 }
-function validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions) {
-    let priceByAgent = 0;
-    let priceBySeller = 0;
-    // 決済承認を確認
-    authorizePaymentActions.forEach(({ result }) => {
-        var _a;
-        const resultAsInvoice = (Array.isArray(result))
-            // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
-            ? result[0]
-            : undefined;
-        const jpyAmount = (((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === factory.priceCurrency.JPY)
-            ? resultAsInvoice.totalPaymentDue.value
-            : 0;
-        priceByAgent += jpyAmount;
-    });
-    // 販売者が提供するアイテムの発生金額
-    [
-        ...authorizeEventServiceOfferActions,
-        ...authorizeProductOfferActions,
-        ...authorizeMoneyTansferActions
-    ].forEach(({ id, result }) => {
-        const priceByAction = result === null || result === void 0 ? void 0 : result.price;
-        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. [${id}]`);
-        }
-    });
-    if (priceByAgent !== priceBySeller) {
-        throw new factory.errors.Argument('id', `prices are not matched. [${priceByAgent},${priceBySeller}]`);
-    }
-}
 function validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActions) {
     var _a;
     // 決済URLが発行されている場合、検証

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.2.0-alpha.11",
-    "@cinerino/sdk": "12.7.0-alpha.4",
+    "@chevre/factory": "5.4.0-alpha.3",
+    "@cinerino/sdk": "12.12.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.1.0-alpha.8"
+  "version": "23.1.0"
 }

package/example/src/chevre/checkReplaceActions.ts

@@ -1,65 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const CONSOLE_CLIENT_ID = 'xxx';
-// const project = { id: String(process.env.PROJECT_ID) };
-type IAction = chevre.factory.action.IAction<chevre.factory.action.IAttributes<chevre.factory.actionType, any, any>>;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-
-    const cursor = actionRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.actionType.ReplaceAction },
-            'object.typeOf': { $exists: true, $eq: chevre.factory.eventType.ScreeningEventSeries },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-60, 'days')
-                    .toDate()
-            }
-        },
-        {
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const action = <IAction>doc.toObject();
-        // const size = JSON.stringify(action).length;
-        // // console.log(JSON.stringify(action).length);
-        // if (action.typeOf !== chevre.factory.actionType.InformAction
-        //     && action.typeOf !== chevre.factory.actionType.AuthorizeAction
-        //     && action.typeOf !== chevre.factory.actionType.CheckAction
-        //     && size > 2000) {
-        //     console.log(action.typeOf, action.object?.typeOf);
-        //     console.log(size);
-        // }
-
-        const eventCount = (Array.isArray(action.object))
-            ? action.object.filter(({ typeOf }) => typeOf === chevre.factory.eventType.ScreeningEventSeries)
-                .length
-            : 0;
-        if (action.instrument?.id !== CONSOLE_CLIENT_ID) {
-            console.log(eventCount, 'events created', action.project.id, action.startDate, action.instrument?.id, i);
-            // tslint:disable-next-line:no-magic-numbers
-            if (eventCount > 20) {
-                throw new Error('eventCount too large');
-            }
-        }
-    });
-
-    console.log(i, 'actions checked');
-}
-
-main()
-    .then()
-    .catch(console.error);