@chevre/domain 24.0.0-alpha.4 → 24.0.0-alpha.6

package/lib/chevre/repo/mongoose/schemas/transaction.js

@@ -163,6 +163,21 @@ const indexes = [
             }
         }
     ],
+    [
+        // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
+        {
+            typeOf: 1,
+            'object.orderNumber': 1
+        },
+        {
+            name: 'uniquePlacingOrderNumber',
+            unique: true,
+            partialFilterExpression: {
+                typeOf: factory.transactionType.PlaceOrder,
+                'object.orderNumber': { $exists: true }
+            }
+        }
+    ],
     [
         // ひとつの注文取引に対する確定返品取引はユニークなはず
         { 'object.order.orderNumber': 1 },

package/lib/chevre/repo/orderInTransaction.d.ts

@@ -28,6 +28,10 @@ export declare class OrderInTransactionRepo {
      * 注文を受注する
      */
     placeOrder(order: IPlacingOrder): Promise<void>;
+    /**
+     * 注文documentがなければ作成し、受け入れられたオファーを追加する
+     * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
+     */
     acceptOffer(params: Pick<IOrderInTransaction, 'acceptedOffers' | 'orderNumber' | 'project'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * serialNumberからオファーを除外する

package/lib/chevre/repo/orderInTransaction.js

@@ -66,6 +66,10 @@ class OrderInTransactionRepo {
         }, { $set: setFields }, {})
             .exec();
     }
+    /**
+     * 注文documentがなければ作成し、受け入れられたオファーを追加する
+     * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
+     */
     async acceptOffer(params) {
         if (!Array.isArray(params.acceptedOffers) || params.acceptedOffers.length === 0) {
             return;
@@ -78,7 +82,10 @@ class OrderInTransactionRepo {
         };
         return this.orderModel.updateOne({
             typeOf: { $eq: factory.transactionType.PlaceOrder },
-            orderNumber: { $eq: params.orderNumber }
+            orderNumber: { $eq: params.orderNumber },
+            // プロジェクトでもフィルター(注文番号重複バグがあったため)(2026-02-21~)
+            // 万が一異なるプロジェクトで同じ注文番号でオファーを受け入れようとしても、DBにインデックスによってDuplicateKey
+            'project.id': { $eq: params.project.id }
         }, {
             $setOnInsert: setOnInsert,
             $push: {
@@ -130,7 +137,10 @@ class OrderInTransactionRepo {
         const { customer, orderNumber, project } = params;
         const filter = {
             typeOf: { $eq: factory.transactionType.PlaceOrder },
-            orderNumber: { $eq: orderNumber }
+            orderNumber: { $eq: orderNumber },
+            // プロジェクトでもフィルター(注文番号重複バグがあったため)(2026-02-21~)
+            // 万が一異なるプロジェクトで同じ注文番号でオファーを受け入れようとしても、DBにインデックスによってDuplicateKey
+            'project.id': { $eq: project.id }
         };
         const setOnInsert = {
             typeOf: factory.transactionType.PlaceOrder,

package/lib/chevre/repo/orderNumber.js

@@ -34,11 +34,6 @@ const setting_1 = require("./mongoose/schemas/setting");
 const transactionNumber_2 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const ORDER_NUMBER_SEPARATOR = '-';
-const defaultVersioningForceProjects = [
-    'HMX',
-    'SMT',
-    'KOJ'
-];
 /**
  * 注文番号リポジトリ
  */
@@ -62,13 +57,16 @@ class OrderNumberRepo {
      * タイムスタンプから発行する
      */
     async publishByTimestamp(params) {
-        const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = await this.findSetting();
+        const { fpeSecret, version, validFrom, versioningForceProjects
+        // versioningExceptionProjects
+         } = await this.findSetting();
         const timestamp = (0, moment_timezone_1.default)(params.orderDate)
             .valueOf()
             .toString();
         const projectPrefix = params.project.alternateName
             .toUpperCase();
-        const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
+        // const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
+        const dataFeedIdentifier = timestamp; // reconsider increment scope(2026-02-21~)
         const dataFeedExpires = (0, moment_timezone_1.default)(params.orderDate)
             .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
             .toDate();
@@ -78,14 +76,10 @@ class OrderNumberRepo {
             expires: dataFeedExpires
         });
         let orderNumber;
-        let useVersioning = (validFrom instanceof Date && (0, moment_timezone_1.default)(validFrom)
+        const useVersioning = (validFrom instanceof Date && (0, moment_timezone_1.default)(validFrom)
             .isSameOrBefore(params.orderDate))
             // versioningForceProjectsであれば強制的にversioning(2026-02-05~)
             || versioningForceProjects.includes(projectPrefix);
-        // versioningExceptionProjectsであれば強制的にversioning不使用(2026-02-10~)
-        if (versioningExceptionProjects.includes(projectPrefix)) {
-            useVersioning = false;
-        }
         if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
             const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
             orderNumber = transactionFactory.generate(timestamp, incrReply);
@@ -138,11 +132,11 @@ class OrderNumberRepo {
             .exec();
         if (setting === null || setting.orderNumber === undefined) {
             return {
-                versioningForceProjects: [],
-                versioningExceptionProjects: []
+                versioningForceProjects: []
+                // versioningExceptionProjects: []
             };
         }
-        const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = setting.orderNumber;
+        const { fpeSecret, version, validFrom, versioningForceProjects } = setting.orderNumber;
         if (typeof fpeSecret !== 'string' || fpeSecret === '') {
             throw new factory.errors.NotFound('setting.orderNumber.secret');
         }
@@ -155,10 +149,9 @@ class OrderNumberRepo {
         return {
             fpeSecret, version, validFrom,
             versioningForceProjects: [
-                ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : [],
-                ...defaultVersioningForceProjects
-            ],
-            versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
+                ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : []
+            ]
+            // versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
         };
     }
 }

package/lib/chevre/service/assetTransaction/pay/start/factory.d.ts

@@ -2,11 +2,17 @@
  * 決済取引ファクトリー
  */
 import * as factory from '../../../../factory';
+import type { IPaymentAgencyTransaction } from '../../../payment/creditCard';
+/**
+ * 決済取引開始パラメータ生成
+ */
 export declare function createStartParams(params: factory.assetTransaction.pay.IStartParamsWithoutDetail & {
-    transactionNumber: string;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    amount: number;
-    paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'> | Pick<factory.product.IProduct, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'>;
+    paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'> | Pick<factory.product.IProduct, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'> | {
+        typeOf: factory.service.paymentService.PaymentServiceType.FaceToFace;
+        id?: never;
+        serviceType?: never;
+    };
     location?: factory.action.trade.pay.ILocation;
     informActions: {
         /**
@@ -20,3 +26,45 @@ export declare function createStartParams(params: factory.assetTransaction.pay.I
         id: string;
     };
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Pay>;
+/**
+ * クレジットカード決済用の追加オプションを生成する
+ */
+export declare function createAuthorizeCreditCardOptions(options: {
+    executor?: {
+        id?: string;
+    };
+    pendingPaymentAgencyTransaction?: IPaymentAgencyTransaction;
+}): {
+    pendingPaymentAgencyTransaction?: IPaymentAgencyTransaction | undefined;
+    executor: {
+        id: string;
+    } | {
+        id?: undefined;
+    };
+};
+/**
+ * ムビチケ決済用の追加オプションを生成する
+ */
+export declare function createAuthorizeMovieTicketOptions(options: {
+    executor?: {
+        id?: string;
+    };
+    purpose: {
+        id?: string;
+    };
+    checkedAction: {
+        id: string;
+    };
+}): {
+    executor: {
+        id: string;
+    } | {
+        id?: undefined;
+    };
+    purpose: {
+        id?: string;
+    };
+    checkedAction: {
+        id: string;
+    };
+};

package/lib/chevre/service/assetTransaction/pay/start/factory.js

@@ -24,11 +24,35 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartParams = createStartParams;
+exports.createAuthorizeCreditCardOptions = createAuthorizeCreditCardOptions;
+exports.createAuthorizeMovieTicketOptions = createAuthorizeMovieTicketOptions;
 /**
  * 決済取引ファクトリー
  */
 const factory = __importStar(require("../../../../factory"));
+function createServiceOutputAsPayTransactionObject(params) {
+    return {
+        serviceOutput: (params.object.serviceOutput?.typeOf === 'Invoice')
+            ? params.object.serviceOutput
+            : {
+                typeOf: 'Invoice',
+                referencesOrder: { typeOf: factory.order.OrderType.Order }
+            }
+    };
+}
+/**
+ * 決済取引開始パラメータ生成
+ */
 function createStartParams(params, options) {
+    // 金額をfix
+    const amount = params.object.paymentMethod?.amount;
+    if (typeof amount !== 'number') {
+        throw new factory.errors.ArgumentNull('object.paymentMethod.amount');
+    }
+    const transactionNumber = params.transactionNumber;
+    if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
+        throw new factory.errors.ArgumentNull('transactionNumber');
+    }
     const { instrument } = params;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
@@ -48,14 +72,14 @@ function createStartParams(params, options) {
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
                 currency: factory.priceCurrency.JPY,
-                value: params.amount
+                value: amount
             };
             break;
         case factory.service.paymentService.PaymentServiceType.CreditCard:
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
                 currency: factory.priceCurrency.JPY,
-                value: params.amount
+                value: amount
             };
             accountId = ''; // 強制的に空文字化(2024-06-14~)
             break;
@@ -109,7 +133,7 @@ function createStartParams(params, options) {
     const paymentMethodAmount = {
         typeOf: 'MonetaryAmount',
         currency: paymentMethodCurrency,
-        value: params.amount
+        value: amount
     };
     const paymentMethod = {
         additionalProperty: (Array.isArray(params.object.paymentMethod?.additionalProperty))
@@ -140,19 +164,14 @@ function createStartParams(params, options) {
             ? { paymentMethodId: params.transactionNumber } // 必要ないはずだが互換性維持対応(2024-06-14~)
             : undefined
     };
+    const { serviceOutput } = createServiceOutputAsPayTransactionObject(params);
     const object = {
         accountId: (typeof accountId === 'string') ? accountId : '',
         paymentMethodId: params.transactionNumber,
         typeOf: params.paymentServiceType,
         id: paymentServiceId,
-        // onPaymentStatusChanged: { informPayment: params.informActions }, // discontinue(2025-02-09~)
         paymentMethod,
-        serviceOutput: (params.object.serviceOutput?.typeOf === 'Invoice') // support serviceOutput(2025-11-24~)
-            ? params.object.serviceOutput
-            : {
-                typeOf: 'Invoice',
-                referencesOrder: { typeOf: factory.order.OrderType.Order }
-            },
+        serviceOutput, // support serviceOutput(2025-11-24~)
         ...(params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket)
             ? { checkedAction: { id: options.checkedAction.id } } // add checkedAction(2024-12-13~)
             : undefined
@@ -178,14 +197,32 @@ function createStartParams(params, options) {
         ...(potentialAction.length > 0) ? { potentialAction } : undefined // add potentialAction(2025-02-05~)
     };
 }
-// function createInformPaymentParams(params: {
-//     paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'potentialAction'>;
-// }): factory.product.IInformPayment[] {
-//     const informPaymentParams: factory.product.IInformPayment[] = [];
-//     // プロダクト設定を適用
-//     const informPaymentParamsByProduct = params.paymentService?.availableChannel?.onPaymentStatusChanged?.informPayment;
-//     if (Array.isArray(informPaymentParamsByProduct)) {
-//         informPaymentParams.push(...informPaymentParamsByProduct);
-//     }
-//     return informPaymentParams;
-// }
+/**
+ * 決済プロセッサに渡す実行者情報を生成する
+ */
+function createExecutor(options) {
+    return (typeof options.executor?.id === 'string')
+        ? { id: options.executor.id }
+        : {}; // タスク関連付け(2024-05-18~)
+}
+/**
+ * クレジットカード決済用の追加オプションを生成する
+ */
+function createAuthorizeCreditCardOptions(options) {
+    return {
+        executor: createExecutor(options),
+        ...(options.pendingPaymentAgencyTransaction !== undefined
+            ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
+            : {})
+    };
+}
+/**
+ * ムビチケ決済用の追加オプションを生成する
+ */
+function createAuthorizeMovieTicketOptions(options) {
+    return {
+        executor: createExecutor(options),
+        purpose: options.purpose,
+        checkedAction: options.checkedAction
+    };
+}

package/lib/chevre/service/assetTransaction/pay/start/preStart/fixPaymentService.d.ts

@@ -0,0 +1,10 @@
+import * as factory from '../../../../../factory';
+import type { PaymentServiceRepo } from '../../../../../repo/paymentService';
+import type { ProductRepo } from '../../../../../repo/product';
+export declare function fixPaymentService(params: factory.assetTransaction.pay.IStartParamsWithoutDetail): (repos: {
+    paymentService: PaymentServiceRepo;
+    product: ProductRepo;
+}) => Promise<{
+    paymentServiceType: factory.service.paymentService.PaymentServiceType;
+    paymentService?: Pick<factory.product.IProduct, "availableChannel" | "id" | "serviceOutput" | "serviceType" | "potentialAction"> | Pick<factory.service.paymentService.IService, "availableChannel" | "id" | "serviceOutput" | "serviceType" | "potentialAction"> | undefined;
+}>;

package/lib/chevre/service/assetTransaction/pay/start/preStart/fixPaymentService.js

@@ -0,0 +1,88 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixPaymentService = fixPaymentService;
+const factory = __importStar(require("../../../../../factory"));
+function getPaymentServiceId(params) {
+    let paymentServiceId = '';
+    const paymentServiceType = params.object?.typeOf;
+    if (typeof params.object.id === 'string' && params.object.id.length > 0) {
+        paymentServiceId = params.object.id;
+    }
+    else {
+        switch (paymentServiceType) {
+            case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                // 対面決済は特に何もしない
+                break;
+            case factory.service.paymentService.PaymentServiceType.PaymentCard:
+            case factory.service.paymentService.PaymentServiceType.CreditCard:
+            case factory.service.paymentService.PaymentServiceType.MovieTicket:
+                // リクエストでの指定を必須化(2022-04-12~)
+                throw new factory.errors.ArgumentNull('object.id');
+            default:
+                throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
+        }
+    }
+    return paymentServiceId;
+}
+function fixPaymentService(params) {
+    return async (repos) => {
+        const paymentServiceType = params.object?.typeOf;
+        let paymentService;
+        switch (paymentServiceType) {
+            case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                // no op
+                // FaceToFaceの場合プロダクトは存在しない
+                break;
+            // PaymentCardの場合、プロダクト検索
+            case factory.service.paymentService.PaymentServiceType.PaymentCard:
+                paymentService = (await repos.product.projectFields({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: { $eq: factory.product.ProductType.PaymentCard },
+                    id: { $eq: getPaymentServiceId(params) }
+                }, ['availableChannel', 'serviceOutput', 'serviceType', 'potentialAction']
+                // []
+                )).shift();
+                if (paymentService === undefined) {
+                    throw new factory.errors.NotFound('PaymentService');
+                }
+                break;
+            default:
+                paymentService = (await repos.paymentService.projectFields({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: { $eq: paymentServiceType },
+                    id: { $eq: getPaymentServiceId(params) }
+                }, ['availableChannel', 'serviceOutput', 'serviceType', 'potentialAction'])).shift();
+                if (paymentService === undefined) {
+                    throw new factory.errors.NotFound('PaymentService');
+                }
+        }
+        return { paymentServiceType, paymentService };
+    };
+}

package/lib/chevre/service/assetTransaction/pay/start/processAuthorize.d.ts

@@ -0,0 +1,53 @@
+import * as factory from '../../../../factory';
+import { Settings } from '../../../../settings';
+import type { AccountingReportRepo } from '../../../../repo/accountingReport';
+import type { ActionRepo } from '../../../../repo/action';
+import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
+import type { CredentialsRepo } from '../../../../repo/credentials';
+import type { EventRepo } from '../../../../repo/event';
+import type { PaymentServiceRepo } from '../../../../repo/paymentService';
+import type { PaymentServiceProviderRepo } from '../../../../repo/paymentServiceProvider';
+import type { ProductRepo } from '../../../../repo/product';
+import type { SellerPaymentAcceptedRepo } from '../../../../repo/sellerPaymentAccepted';
+import type { TaskRepo } from '../../../../repo/task';
+import { IPaymentAgencyTransaction } from '../../../payment/creditCard';
+export interface IProcessAuthorizeOperationRepos {
+    accountingReport: AccountingReportRepo;
+    action: ActionRepo;
+    credentials: CredentialsRepo;
+    event: EventRepo;
+    paymentAccepted: SellerPaymentAcceptedRepo;
+    paymentService: PaymentServiceRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
+    product: ProductRepo;
+    assetTransaction: AssetTransactionRepo;
+    task: TaskRepo;
+}
+export type IProcessAuthorizeOperation<T> = (repos: IProcessAuthorizeOperationRepos, settings: Settings) => Promise<T>;
+/**
+ * 開始した決済取引について、決済承認を実行する
+ */
+export declare function processAuthorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail & {
+    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
+}, options: {
+    pendingPaymentAgencyTransaction?: IPaymentAgencyTransaction;
+    /**
+     * 実行者
+     */
+    executor?: {
+        /**
+         * task ID
+         * taskによって実行されている場合値が存在する
+         */
+        id?: string;
+    };
+    purpose: {
+        /**
+         * placeOrder ID
+         */
+        id?: string;
+    };
+    checkedAction: {
+        id: string;
+    };
+}, transactionBeforeAuthorize: factory.assetTransaction.pay.ITransaction, paymentServiceType: factory.service.paymentService.PaymentServiceType, paymentService: Pick<factory.product.IProduct, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType' | 'potentialAction'> | Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType' | 'potentialAction'> | undefined): IProcessAuthorizeOperation<Pick<factory.assetTransaction.pay.ITransaction, 'id' | 'object'>>;

package/lib/chevre/service/assetTransaction/pay/start/processAuthorize.js

@@ -0,0 +1,56 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processAuthorize = processAuthorize;
+const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("./factory");
+const processAuthorizeAccount_1 = require("./processAuthorizeAccount");
+const processAuthorizeCreditCard_1 = require("./processAuthorizeCreditCard");
+const processAuthorizeMovieTicket_1 = require("./processAuthorizeMovieTicket");
+/**
+ * 開始した決済取引について、決済承認を実行する
+ */
+function processAuthorize(params, options, transactionBeforeAuthorize, paymentServiceType, paymentService) {
+    return async (repos, settings) => {
+        let transaction = transactionBeforeAuthorize;
+        switch (paymentServiceType) {
+            case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                // 対面決済は特に何もしない
+                break;
+            case factory.service.paymentService.PaymentServiceType.PaymentCard:
+                transaction = await (0, processAuthorizeAccount_1.processAuthorizeAccount)(params, transactionBeforeAuthorize, String(paymentService?.id))(repos);
+                break;
+            case factory.service.paymentService.PaymentServiceType.CreditCard:
+                await (0, processAuthorizeCreditCard_1.processAuthorizeCreditCard)(params, transactionBeforeAuthorize, String(paymentService?.id), (0, factory_1.createAuthorizeCreditCardOptions)(options))(repos, settings);
+                break;
+            case factory.service.paymentService.PaymentServiceType.MovieTicket:
+                await (0, processAuthorizeMovieTicket_1.processAuthorizeMovieTicket)(params, transactionBeforeAuthorize, String(paymentService?.id), (0, factory_1.createAuthorizeMovieTicketOptions)(options))(repos, settings);
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
+        }
+        return transaction;
+    };
+}

package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeMovieTicket.d.ts

@@ -39,4 +39,4 @@ export declare function processAuthorizeMovieTicket(params: factory.assetTransac
     paymentServiceProvider: PaymentServiceProviderRepo;
     assetTransaction: AssetTransactionRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<factory.assetTransaction.pay.ITransaction>;
+}, settings: Settings) => Promise<void>;

package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeMovieTicket.js

@@ -29,17 +29,7 @@ function processAuthorizeMovieTicket(params, transaction, paymentServiceId,
 // useCheckByIdentifierIfNotYet: boolean,
 options) {
     return async (repos, settings) => {
-        // const { accountsReceivablesByServiceType } = await MovieTicketPayment.authorize(
-        //     params, transaction, paymentServiceId, options
-        // )(repos, settings);
         await MovieTicketPayment.authorize(params, transaction, paymentServiceId, options)(repos, settings);
-        return transaction;
-        // discontinue(2024-12-17~)
-        // return saveAuthorizeResult({
-        //     id: transaction.id,
-        //     update: {
-        //         'object.accountsReceivablesByServiceType': accountsReceivablesByServiceType // 認証レスポンスより計上金額を保管(2023-05-15~)
-        //     }
-        // })(repos);
+        // return transaction;
     };
 }

package/lib/chevre/service/assetTransaction/pay/start.js

@@ -1,162 +1,38 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = start;
-const factory = __importStar(require("../../../factory"));
 const fixInformAction_1 = require("../fixInformAction");
+const fixPaymentService_1 = require("./start/preStart/fixPaymentService");
 const validateAcceptedPaymentMethodIfNeeded_1 = require("./start/preStart/validateAcceptedPaymentMethodIfNeeded");
 const validateSeller_1 = require("./start/preStart/validateSeller");
 const factory_1 = require("./start/factory");
-const processAuthorizeAccount_1 = require("./start/processAuthorizeAccount");
-const processAuthorizeCreditCard_1 = require("./start/processAuthorizeCreditCard");
-const processAuthorizeMovieTicket_1 = require("./start/processAuthorizeMovieTicket");
+const processAuthorize_1 = require("./start/processAuthorize");
 /**
  * 取引開始
  */
 function start(params, options) {
     return async (repos, settings) => {
-        // 金額をfix
-        const amount = params.object.paymentMethod?.amount;
-        if (typeof amount !== 'number') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.amount');
-        }
-        const transactionNumber = params.transactionNumber;
-        if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
-            throw new factory.errors.ArgumentNull('transactionNumber');
-        }
         await (0, validateSeller_1.validateSeller)(params)(repos);
         // リソースの対応決済方法検証(2025-12-02~)
         await (0, validateAcceptedPaymentMethodIfNeeded_1.validateAcceptedPaymentMethodIfNeeded)(params)(repos);
         // 決済サービス確認
-        const paymentServiceType = params.object?.typeOf;
-        const paymentService = await fixPaymentService(params)(repos);
+        const { paymentServiceType, paymentService } = await (0, fixPaymentService_1.fixPaymentService)(params)(repos);
         const informActions = await (0, fixInformAction_1.fixInformAction)({
             paymentService,
             project: { id: params.project.id }
         })(repos);
         // 取引開始
-        let transaction;
         const startParams = (0, factory_1.createStartParams)({
             ...params,
-            transactionNumber,
+            // transactionNumber,
             paymentServiceType,
-            amount,
+            // amount,
             paymentService,
             informActions
         }, { checkedAction: options.checkedAction } // 連携(2024-12-13~)
         );
-        transaction = await repos.assetTransaction.start(startParams);
-        switch (paymentServiceType) {
-            case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                // 対面決済は特に何もしない
-                break;
-            case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                transaction = await (0, processAuthorizeAccount_1.processAuthorizeAccount)(params, transaction, String(paymentService?.id))(repos);
-                break;
-            case factory.service.paymentService.PaymentServiceType.CreditCard:
-                // transaction =
-                await (0, processAuthorizeCreditCard_1.processAuthorizeCreditCard)(params, transaction, String(paymentService?.id), {
-                    executor: (typeof options.executor?.id === 'string') ? { id: options.executor.id } : {}, // タスク関連付け(2024-05-18~)
-                    ...(options.pendingPaymentAgencyTransaction !== undefined)
-                        ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
-                        : undefined
-                })(repos, settings);
-                break;
-            case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                transaction = await (0, processAuthorizeMovieTicket_1.processAuthorizeMovieTicket)(params, transaction, String(paymentService?.id), 
-                // options.useCheckByIdentifierIfNotYet,
-                {
-                    executor: (typeof options.executor?.id === 'string') ? { id: options.executor.id } : {},
-                    purpose: options.purpose,
-                    checkedAction: options.checkedAction
-                })(repos, settings);
-                break;
-            default:
-                throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
-        }
-        return transaction;
-    };
-}
-function getPaymentServiceId(params) {
-    let paymentServiceId = '';
-    const paymentServiceType = params.object?.typeOf;
-    if (typeof params.object.id === 'string' && params.object.id.length > 0) {
-        paymentServiceId = params.object.id;
-    }
-    else {
-        switch (paymentServiceType) {
-            case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                // 対面決済は特に何もしない
-                break;
-            case factory.service.paymentService.PaymentServiceType.PaymentCard:
-            case factory.service.paymentService.PaymentServiceType.CreditCard:
-            case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                // リクエストでの指定を必須化(2022-04-12~)
-                throw new factory.errors.ArgumentNull('object.id');
-            default:
-                throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
-        }
-    }
-    return paymentServiceId;
-}
-function fixPaymentService(params) {
-    return async (repos) => {
-        const paymentServiceType = params.object?.typeOf;
-        let paymentService;
-        switch (paymentServiceType) {
-            case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                // no op
-                // FaceToFaceの場合プロダクトは存在しない
-                break;
-            // PaymentCardの場合、プロダクト検索
-            case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                paymentService = (await repos.product.projectFields({
-                    limit: 1,
-                    page: 1,
-                    project: { id: { $eq: params.project.id } },
-                    typeOf: { $eq: factory.product.ProductType.PaymentCard },
-                    id: { $eq: getPaymentServiceId(params) }
-                }, ['availableChannel', 'serviceOutput', 'serviceType', 'potentialAction']
-                // []
-                )).shift();
-                if (paymentService === undefined) {
-                    throw new factory.errors.NotFound('PaymentService');
-                }
-                break;
-            default:
-                paymentService = (await repos.paymentService.projectFields({
-                    limit: 1,
-                    page: 1,
-                    project: { id: { $eq: params.project.id } },
-                    typeOf: { $eq: paymentServiceType },
-                    id: { $eq: getPaymentServiceId(params) }
-                }, ['availableChannel', 'serviceOutput', 'serviceType', 'potentialAction'])).shift();
-                if (paymentService === undefined) {
-                    throw new factory.errors.NotFound('PaymentService');
-                }
-        }
-        return paymentService;
+        const transactionBeforeAuthorize = await repos.assetTransaction.start(startParams);
+        // 決済代行等を利用して決済承認
+        return (0, processAuthorize_1.processAuthorize)(params, options, transactionBeforeAuthorize, paymentServiceType, paymentService)(repos, settings);
     };
 }

package/package.json

@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.4"
+  "version": "24.0.0-alpha.6"
 }