@chevre/domain 24.0.0-alpha.2 → 24.0.0-alpha.21

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,55 @@
+import * as factory from '../../../../factory';
+import { Settings } from '../../../../settings';
+import type { AccountingReportRepo } from '../../../../repo/accountingReport';
+import type { ActionRepo } from '../../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../../repo/action/checkMovieTicket';
+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;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    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

@@ -2,6 +2,7 @@ import * as factory from '../../../../factory';
 import { Settings } from '../../../../settings';
 import type { AccountingReportRepo } from '../../../../repo/accountingReport';
 import type { ActionRepo } from '../../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../../repo/action/checkMovieTicket';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { CredentialsRepo } from '../../../../repo/credentials';
 import type { EventRepo } from '../../../../repo/event';
@@ -32,6 +33,7 @@ export declare function processAuthorizeMovieTicket(params: factory.assetTransac
 }): (repos: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
@@ -39,4 +41,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.d.ts

@@ -3,6 +3,7 @@ import { Settings } from '../../../settings';
 import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
@@ -18,6 +19,7 @@ export interface IStartOperationRepos {
     acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;

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/lib/chevre/service/notification/triggerWebhook.d.ts

@@ -2,13 +2,14 @@ import * as factory from '../../factory';
 import type { ActionRepo } from '../../repo/action';
 import type { PotentialActionRepo } from '../../repo/potentialAction';
 import type { SettingRepo } from '../../repo/setting';
+interface ITriggerWebhookRepos {
+    action: ActionRepo;
+    potentialAction: PotentialActionRepo;
+    setting: SettingRepo;
+}
 declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook> & {
     project: {
         id: string;
     };
-}): (repos: {
-    action: ActionRepo;
-    potentialAction: PotentialActionRepo;
-    setting: SettingRepo;
-}) => Promise<void>;
-export { triggerWebhook };
+}): (repos: ITriggerWebhookRepos) => Promise<void>;
+export { ITriggerWebhookRepos, triggerWebhook };

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -26,7 +26,7 @@ import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TicketRepo } from '../../../repo/ticket';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
     action: ActionRepo;
@@ -55,7 +55,7 @@ interface IAuthorizeRepos {
     setting: SettingRepo;
     task: TaskRepo;
     ticket: TicketRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;

package/lib/chevre/service/offer/event/authorize.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
 const factory = __importStar(require("../../../factory"));
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("../any");
 const defaultOffer_1 = require("./authorize/defaultOffer");
 const factory_1 = require("./authorize/factory");
@@ -52,7 +52,7 @@ function authorize(params, options) {
         })(repos);
         let acceptedOffers4result;
         const now = new Date();
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: params.project.id },
             id: transaction.id,
             object: { orderDate: now }
@@ -106,7 +106,7 @@ function authorize(params, options) {
 }
 function validateCreateRequest(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'expires', 'project', 'seller', 'typeOf', 'instrument']);

package/lib/chevre/service/offer/event/issueEventOfferTicket.d.ts

@@ -8,7 +8,7 @@ import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { TicketRepo } from '../../../repo/ticket';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 declare function issueEventOfferTicket(params: {
     now: Date;
     audience: Pick<factory.action.authorize.offer.eventService.IPurpose, 'id'>;
@@ -41,7 +41,7 @@ declare function issueEventOfferTicket(params: {
     memberProgram: MemberProgramRepo;
     productOffer: ProductOfferRepo;
     ticket: TicketRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<{
     ticketToken: string;
 }>;

package/lib/chevre/service/offer/event/issueEventOfferTicket.js

@@ -86,7 +86,7 @@ function issueEventOfferTicket(params) {
     return async (repos) => {
         const { now, audience, eventId, eventOfferId, ticketedOffer, author, project, instrument } = params;
         // 取引は存在するか
-        const transaction = await repos.transaction.projectFieldsInProgressById({ typeOf: factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ typeOf: factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
         // イベントは存在するか
         const event = await repos.event.projectEventFieldsById({ id: eventId }, ['project', 'offers', 'identifier']);
         // 取引番号発行

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.d.ts

@@ -8,7 +8,6 @@ import type { ReservationRepo } from '../../../../repo/reservation';
 import type { SettingRepo } from '../../../../repo/setting';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
-import type { TransactionRepo } from '../../../../repo/transaction';
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -18,7 +17,6 @@ interface IVoidTransactionRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
 }
 declare function processVoidTransaction4chevre(params: {
     action: factory.action.authorize.offer.eventService.IAction;

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processVoidTransaction4chevre = processVoidTransaction4chevre;
 const factory = __importStar(require("../../../../factory"));
+// import type { TransactionRepo } from '../../../../repo/transaction';
 const reserve_1 = require("../../../assetTransaction/reserve");
 function processVoidTransaction4chevre(params) {
     return async (repos, settings) => {

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -9,7 +9,7 @@ import type { ReservationRepo } from '../../../repo/reservation';
 import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -19,7 +19,7 @@ interface IVoidTransactionRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     /**
      * COAオファー承認取消の場合必須
      */

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -45,7 +45,7 @@ function voidTransaction(params) {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const transaction = await repos.transaction.projectFieldsById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
+        const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
         // 興行オファー承認アクション検索
         let authorizeActions = await repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
@@ -124,7 +124,7 @@ function cancelAcceptActions(params) {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const transaction = await repos.transaction.projectFieldsById({
+        const transaction = await repos.placeOrder.findPlaceOrderById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['typeOf', 'status']);

package/lib/chevre/service/offer/event/voidTransactionByActionId.d.ts

@@ -9,7 +9,7 @@ import type { ReservationRepo } from '../../../repo/reservation';
 import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IVoidTransactionByActionIdRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -19,7 +19,7 @@ interface IVoidTransactionByActionIdRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     /**
      * COAオファー承認取消の場合必須
      */
@@ -40,4 +40,4 @@ declare function voidTransactionByActionId(params: factory.task.IData<factory.ta
         id: string;
     };
 }): (repos: IVoidTransactionByActionIdRepos, settings: Settings) => Promise<void>;
-export { voidTransactionByActionId };
+export { IVoidTransactionByActionIdRepos, voidTransactionByActionId };