@chevre/domain 25.2.0-alpha.16 → 25.2.0-alpha.17

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

@@ -84,7 +84,9 @@ function authorize(params) {
         if (typeof fixTransactionNumberResult.id === 'string') {
             return { id: fixTransactionNumberResult.id };
         }
-        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, invoiceByTicketToken, ticketToken } = fixTransactionNumberResult;
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, 
+        // invoiceByTicketToken,
+        ticketToken } = fixTransactionNumberResult;
         const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_2.createMovieTicket) : undefined;
         const { accountId } = await fixAccountIdIfPossible({
             object: params.object, project: { id: transaction.project.id }
@@ -196,10 +198,10 @@ function authorize(params) {
                 throw error;
             }
         }
-        const result = (0, factory_2.createAuthorizeResult)({
+        const result = (0, factory_2.payTransaction2actionResult)({
             payTransaction,
-            object: authorizeObjectIncludingPaymentMethodDetails,
-            invoiceByTicketToken
+            // object: authorizeObjectIncludingPaymentMethodDetails,
+            // invoiceByTicketToken
         });
         await repos.authorizePaymentMethodAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };

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

@@ -49,13 +49,13 @@ export declare function creatPayTransactionStartParams(params: {
     instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
 };
 export declare function createMovieTicket(params: factory.action.trade.pay.IMovieTicket): factory.action.trade.pay.IMovieTicket;
-export declare function createAuthorizeResult(params: {
-    object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
+/**
+ * 決済取引から決済承認アクション結果を生成する
+ */
+export declare function payTransaction2actionResult(params: {
     payTransaction: Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
-    /**
-     * 決済方法チケットの承認対象
-     */
-    invoiceByTicketToken?: IInvoiceByTicketToken;
+    object?: never;
+    invoiceByTicketToken?: never;
 }): factory.action.authorize.paymentMethod.any.IResult;
 /**
  * 通知対象としてのアクションを最適化

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.creatPublishPaymentUrlParams = creatPublishPaymentUrlParams;
 exports.creatPayTransactionStartParams = creatPayTransactionStartParams;
 exports.createMovieTicket = createMovieTicket;
-exports.createAuthorizeResult = createAuthorizeResult;
+exports.payTransaction2actionResult = payTransaction2actionResult;
 exports.optimizeAction4inform = optimizeAction4inform;
 const moment_1 = __importDefault(require("moment"));
 const util_1 = require("util");
@@ -193,8 +193,14 @@ function createMovieTicket(params) {
         serviceOutput
     };
 }
-function createAuthorizeResult(params) {
-    const payTransactionObject = params.payTransaction.object;
+/**
+ * 決済取引から決済承認アクション結果を生成する
+ */
+function payTransaction2actionResult(params) {
+    const { 
+    // object,
+    payTransaction } = params;
+    const payTransactionObject = payTransaction.object;
     const totalPaymentDue = payTransactionObject.paymentMethod?.totalPaymentDue;
     if (typeof totalPaymentDue?.typeOf !== 'string') {
         throw new factory_1.factory.errors.Internal('payTransaction.object.paymentMethod.totalPaymentDue undefined');
@@ -208,7 +214,8 @@ function createAuthorizeResult(params) {
         ? payTransactionObject.paymentMethod?.amount?.currency
         : undefined;
     const paymentMethodAsObject = {
-        typeOf: params.object.paymentMethod,
+        // typeOf: object.paymentMethod,
+        typeOf: payTransactionObject.paymentMethod.identifier,
         // CreditCardIFのカード通貨区分を追加(2023-08-15~)
         ...(payTransactionObject.typeOf === factory_1.factory.service.paymentService.PaymentServiceType.CreditCard
             && typeof paymentMethodAmountCurrencyByPayTransaction === 'string')
@@ -223,9 +230,11 @@ function createAuthorizeResult(params) {
         }
     }
     let invoiceOrderItems;
-    if (params.object.referencesOrder.typeOf === factory_1.factory.order.OrderType.Order) {
-        if (Array.isArray(params.object.referencesOrder.orderedItem)) {
-            invoiceOrderItems = params.object.referencesOrder.orderedItem;
+    // const referencesOrderByObject = object.referencesOrder;
+    const referencesOrderByObject = payTransactionObject.serviceOutput?.referencesOrder;
+    if (referencesOrderByObject?.typeOf === factory_1.factory.order.OrderType.Order) {
+        if (Array.isArray(referencesOrderByObject.orderedItem)) {
+            invoiceOrderItems = referencesOrderByObject.orderedItem;
         }
     }
     const referencesOrder = {
@@ -239,8 +248,6 @@ function createAuthorizeResult(params) {
             ? payTransactionObject.paymentMethod.accountId
             : '',
         issuedThrough,
-        // 完全廃止(paymentMethodAsObjectへ完全移行)(2023-08-16~)
-        // paymentMethod: params.object.paymentMethod,
         paymentMethodAsObject,
         paymentStatus,
         paymentMethodId: (typeof payTransactionObject.paymentMethodId === 'string')
@@ -248,22 +255,12 @@ function createAuthorizeResult(params) {
             : '',
         name: (typeof payTransactionObject.paymentMethod?.name === 'string')
             ? payTransactionObject.paymentMethod.name
-            : params.object.paymentMethod,
+            : payTransactionObject.paymentMethod.identifier,
         totalPaymentDue: totalPaymentDue,
-        additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [],
+        additionalProperty: (Array.isArray(payTransactionObject.paymentMethod.additionalProperty)) ? payTransactionObject.paymentMethod.additionalProperty : [],
         typeOf: factory_1.factory.action.authorize.paymentMethod.any.ResultType.Payment,
         referencesOrder // add(2025-11-23~)
     };
-    // eslint-disable-next-line no-warning-comments
-    // TODO 保留 resultにメンバーシップを追加(2024-08-13~)
-    // let resultAsPermit: factory.action.authorize.paymentMethod.any.IResultAsPermit | undefined;
-    // if (typeof params.permit?.identifier === 'string') {
-    //     resultAsPermit = {
-    //         typeOf: factory.permit.PermitType.Permit,
-    //         identifier: params.permit.identifier,
-    //         issuedThrough: { serviceType: params.permit.issuedThrough?.serviceType }
-    //     };
-    // }
     // Arrayに統一(2023-09-04~)
     // if (resultAsPermit !== undefined) {
     //     return [resultAsInvoice, resultAsPermit];

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.16"
+  "version": "25.2.0-alpha.17"
 }