@chevre/domain 23.1.0-alpha.19 → 23.1.0-alpha.20

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

@@ -14,7 +14,7 @@ interface IAcceptAction2ticketResult {
  * 決済承認前の決済採用アクションを参照する
  */
 declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
-    object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod'>;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod' | 'referencesOrder'>;
     prePublishedPaymentMethodId: string;
     transaction: Pick<ITransactionInProgress<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'typeOf' | 'project' | 'seller'>;
 }): (repos: {

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

@@ -189,16 +189,13 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
     });
 }
 /**
- * 注文取引に保管された決済情報を承認しようとしている決済の整合性を検証する
+ * 決済採用と決済承認の整合性を検証する
  */
 function validatePaymentMethodByTransaction(params) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const paymentServiceIdByObject = params.object.issuedThrough.id;
     const amountByObject = params.object.amount;
     const paymentMethodTypeByObject = params.object.paymentMethod;
-    // const paymentServiceIdByTransaction = params.paymentMethodByTransaction.issuedThrough.id;
-    // const amountByTransaction = params.paymentMethodByTransaction.paymentMethod?.amount;
-    // const paymentMethodTypeByTransaction = params.paymentMethodByTransaction.paymentMethod?.identifier;
     const paymentServiceIdByTransaction = params.acceptObject.object.id;
     const amountByTransaction = (_a = params.acceptObject.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
     const paymentMethodTypeByTransaction = (_b = params.acceptObject.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
@@ -214,4 +211,22 @@ function validatePaymentMethodByTransaction(params) {
     if (paymentMethodTypeByObject !== paymentMethodTypeByTransaction) {
         throw new factory.errors.Argument('object.paymentMethod', 'paymentMethod must match the target of the paymentUrl');
     }
+    // 注文アイテム検証(2025-11-25)
+    let eventIdsMustBe = [];
+    let eventIdsByAuthorizeAction = [];
+    const orderedItemsByAcceptAction = (_c = params.acceptObject.object.serviceOutput) === null || _c === void 0 ? void 0 : _c.referencesOrder.orderedItem;
+    const orderedItemsByAuthorizeAction = (_d = params.object.referencesOrder) === null || _d === void 0 ? void 0 : _d.orderedItem;
+    if (Array.isArray(orderedItemsByAcceptAction)) {
+        eventIdsMustBe = orderedItemsByAcceptAction.map((orderedItem) => orderedItem.orderedItem.serviceOutput.reservationFor.id);
+    }
+    if (Array.isArray(orderedItemsByAuthorizeAction)) {
+        eventIdsByAuthorizeAction =
+            orderedItemsByAuthorizeAction.map((orderedItem) => orderedItem.orderedItem.serviceOutput.reservationFor.id);
+    }
+    debug('validatePaymentMethodByTransaction: eventIdsMustBe,eventIdsByAuthorizeAction:', JSON.stringify(eventIdsMustBe), JSON.stringify(eventIdsByAuthorizeAction));
+    const eventIdsMatched = eventIdsMustBe.length === eventIdsByAuthorizeAction.length
+        && eventIdsMustBe.every((eventIdMustExist) => eventIdsByAuthorizeAction.includes(eventIdMustExist));
+    if (!eventIdsMatched) {
+        throw new factory.errors.Argument('id', `referencesOrder.orderedItem between authorze and accept not matched.`);
+    }
 }

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

@@ -44,7 +44,7 @@ export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
     payTransaction: Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
     /**
-     * 決済方法チケットの承認対象が必要(請求の関連注文情報の含むため)
+     * 決済方法チケットの承認対象
      */
     invoiceByTicketToken?: IInvoiceByTicketToken;
 }): factory.action.authorize.paymentMethod.any.IResult;

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

@@ -140,8 +140,7 @@ function createMovieTicket(params) {
     };
 }
 function createAuthorizeResult(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    const { invoiceByTicketToken } = params;
+    var _a, _b, _c, _d, _e, _f;
     const payTransactionObject = params.payTransaction.object;
     const totalPaymentDue = (_a = payTransactionObject.paymentMethod) === null || _a === void 0 ? void 0 : _a.totalPaymentDue;
     if (typeof (totalPaymentDue === null || totalPaymentDue === void 0 ? void 0 : totalPaymentDue.typeOf) !== 'string') {
@@ -167,15 +166,15 @@ function createAuthorizeResult(params) {
         }
     }
     let invoiceOrderItems;
-    if (typeof (invoiceByTicketToken === null || invoiceByTicketToken === void 0 ? void 0 : invoiceByTicketToken.paymentMethodId) === 'string') {
-        if (Array.isArray((_e = invoiceByTicketToken.referencesOrder) === null || _e === void 0 ? void 0 : _e.orderedItem)) {
-            invoiceOrderItems = invoiceByTicketToken.referencesOrder.orderedItem;
+    if (params.object.referencesOrder.typeOf === factory.order.OrderType.Order) {
+        if (Array.isArray(params.object.referencesOrder.orderedItem)) {
+            invoiceOrderItems = params.object.referencesOrder.orderedItem;
         }
     }
     const referencesOrder = Object.assign({ typeOf: factory.order.OrderType.Order }, (Array.isArray(invoiceOrderItems) && invoiceOrderItems.length > 0) ? { orderedItem: invoiceOrderItems } : undefined);
     // Array対応(2023-09-02~)
     const resultAsInvoice = {
-        accountId: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.accountId) === 'string')
+        accountId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.accountId) === 'string')
             ? payTransactionObject.paymentMethod.accountId
             : '',
         issuedThrough,
@@ -186,7 +185,7 @@ function createAuthorizeResult(params) {
         paymentMethodId: (typeof payTransactionObject.paymentMethodId === 'string')
             ? payTransactionObject.paymentMethodId
             : '',
-        name: (typeof ((_g = payTransactionObject.paymentMethod) === null || _g === void 0 ? void 0 : _g.name) === 'string')
+        name: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.name) === 'string')
             ? payTransactionObject.paymentMethod.name
             : params.object.paymentMethod,
         totalPaymentDue: totalPaymentDue,

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.3.0-alpha.3",
+    "@chevre/factory": "5.3.0-alpha.4",
     "@cinerino/sdk": "12.9.0-alpha.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -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.19"
+  "version": "23.1.0-alpha.20"
 }