@chevre/domain 28.1.0-alpha.3 → 28.1.0-alpha.5

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

@@ -16,7 +16,7 @@ const schemaDefinition = {
     typeOf: { type: String, required: true },
     itemListElement: [mongoose_1.SchemaTypes.Mixed],
     itemOffered: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    // additionalProperty: [SchemaTypes.Mixed], // TODO discontinue(2026-10-31~)
+    // additionalProperty: [SchemaTypes.Mixed], // discontinue(2026-10-31~)
     dateSynced: Date // 追加(2023-09-13~)
 };
 const schemaOptions = {

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -2,19 +2,10 @@ import type { Algorithm } from 'jsonwebtoken';
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { factory } from '../../../factory';
 import { IVirtuals } from '../virtuals';
-interface IOnOrderStatusChanged {
-    /**
-     * AggService通知先
-     */
-    informOrder?: factory.project.IInformParams[];
-}
-interface IOnReservationStatusChanged {
-    /**
-     * AggService通知先
-     */
-    informReservation?: factory.project.IInformParams[];
-}
-interface IOnTaskStatusChanged {
+/**
+ * @deprecated integration.aggへ移行済(2026-11-03~)
+ */
+export interface IOnTaskStatusChanged {
     /**
      * AggService通知先
      */
@@ -28,9 +19,6 @@ interface IOnTaskStatusChanged {
      */
     informTaskStatuses?: factory.taskStatus[];
 }
-interface IOnEventChanged {
-    informEvent2agg?: factory.project.IInformParams[];
-}
 export interface IStorageSettings {
     deleteTransactionTaskExpiresInDays: number;
     /**
@@ -69,10 +57,6 @@ interface ITriggerWebhookSettings {
     headerIdentifier?: string;
     retryCountMax?: number;
     retryIntervalInMS?: number;
-    /**
-     * support(2026-10-30~)
-     */
-    googleTargetAudience?: string;
 }
 export interface IWaiterSettings {
     disabled?: boolean;
@@ -193,7 +177,28 @@ interface IHubOnTaskStatusChanged {
 export interface IHubSettings {
     onOrderStatusChanged: IHubOnOrderStatusChanged;
     onReservationStatusChanged: IHubOnReservationStatusChanged;
+    /**
+     * 編集系リソースとタスクの通知設定
+     */
     onTaskStatusChanged: IHubOnTaskStatusChanged;
+    /**
+     * support(2026-10-30~)
+     */
+    googleTargetAudience?: string;
+}
+export interface IAggSettings {
+    /**
+     * AggService通知先
+     */
+    informActions?: factory.project.IInformParams[];
+    /**
+     * 分析連携するtaskNameリスト
+     */
+    informTaskNames?: factory.taskName[];
+    /**
+     * 分析連携するtaskStatusリスト
+     */
+    informTaskStatuses?: factory.taskStatus[];
 }
 export interface IIntegrationSettings {
     abortedTasksWithoutReport: string[];
@@ -212,6 +217,11 @@ export interface IIntegrationSettings {
      * 2026-06-02~
      */
     hub?: IHubSettings;
+    /**
+     * 集計サービスへの連携設定
+     * 2026-11-02~
+     */
+    agg?: IAggSettings;
     useExperimentalFeature: boolean;
 }
 /**
@@ -258,13 +268,6 @@ export interface IMemberSetting {
 export interface ISetting {
     defaultSenderEmail?: string;
     jwt?: IJWTSetting;
-    onEventChanged?: IOnEventChanged;
-    onOrderStatusChanged: IOnOrderStatusChanged;
-    onReservationStatusChanged?: IOnReservationStatusChanged;
-    onTaskStatusChanged?: IOnTaskStatusChanged;
-    onResourceUpdated?: {
-        informResource?: factory.project.IInformParams[];
-    };
     orderNumber?: IOrderNumberSetting;
     project: {
         id: string;

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

@@ -11,11 +11,14 @@ const schemaDefinition = {
     defaultSenderEmail: String,
     jwt: mongoose_1.SchemaTypes.Mixed,
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    onEventChanged: mongoose_1.SchemaTypes.Mixed,
-    onOrderStatusChanged: mongoose_1.SchemaTypes.Mixed,
-    onReservationStatusChanged: mongoose_1.SchemaTypes.Mixed,
-    onTaskStatusChanged: mongoose_1.SchemaTypes.Mixed,
-    onResourceUpdated: mongoose_1.SchemaTypes.Mixed,
+    // discontinue(2026-11-02~)
+    ...{
+        onEventChanged: mongoose_1.SchemaTypes.Mixed,
+        onOrderStatusChanged: mongoose_1.SchemaTypes.Mixed,
+        onReservationStatusChanged: mongoose_1.SchemaTypes.Mixed,
+        onTaskStatusChanged: mongoose_1.SchemaTypes.Mixed,
+    },
+    // onResourceUpdated: SchemaTypes.Mixed, // discontinue(2026-11-02~)
     // onTransactionStatusChanged: SchemaTypes.Mixed, // discontinue(2026-06-29~)
     orderNumber: mongoose_1.SchemaTypes.Mixed,
     quota: mongoose_1.SchemaTypes.Mixed,

package/lib/chevre/repo/setting/integration.d.ts

@@ -3,6 +3,7 @@ import { IIntegrationSettings, ISendGridSettings, IHubSettings } from '../mongoo
 interface IDBOptions {
     connection: Connection;
 }
+export { IIntegrationSettings };
 /**
  * 外部連携設定リポジトリ
  */
@@ -23,5 +24,5 @@ export declare class IntegrationSettingRepo {
     getByKey<T extends keyof IIntegrationSettings>(key: T): Promise<IIntegrationSettings[T]>;
     addSendGridSettings(params: ISendGridSettings): Promise<import("mongoose").UpdateWriteOpResult>;
     addHubSettings(params: IHubSettings): Promise<import("mongoose").UpdateWriteOpResult>;
+    migrateAggSettings(): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
 }
-export {};

package/lib/chevre/repo/setting/integration.js

@@ -98,5 +98,36 @@ class IntegrationSettingRepo {
         })
             .exec();
     }
+    async migrateAggSettings() {
+        const oldSetting = await this.settingModel.findOne({ 'project.id': { $eq: '*' } }, { onTaskStatusChanged: 1 })
+            .lean()
+            .exec();
+        if (oldSetting?.onTaskStatusChanged !== undefined) {
+            const { informTask, informTaskNames, informTaskStatuses } = oldSetting.onTaskStatusChanged;
+            const aggSettings = {
+                informActions: informTask,
+                informTaskNames,
+                informTaskStatuses
+            };
+            console.dir(aggSettings, { depth: null });
+            const updateResult = await this.settingModel.updateOne({ 'project.id': { $eq: '*' } }, {
+                $set: { 'integration.agg': aggSettings }
+            })
+                .exec();
+            // const unsetResult = await this.settingModel.updateOne(
+            //     { 'project.id': { $eq: '*' } },
+            //     {
+            //         $unset: {
+            //             onEventChanged: 1,
+            //             onOrderStatusChanged: 1,
+            //             onReservationStatusChanged: 1,
+            //             onTaskStatusChanged: 1,
+            //         }
+            //     }
+            // )
+            //     .exec();
+            return updateResult;
+        }
+    }
 }
 exports.IntegrationSettingRepo = IntegrationSettingRepo;

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

@@ -1,7 +1,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import { ISetting, IStorageSettings } from './mongoose/schemas/setting';
 type IKeyOfProjection = Exclude<keyof ISetting, 'jwt' | 'project' | 'waiter' | 'integration'>;
-type IGlobalSetting = Pick<ISetting, 'defaultSenderEmail' | 'onEventChanged' | 'onOrderStatusChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'onTaskStatusChanged' | 'orderNumber' | 'quota' | 'serviceOutputIdentifier' | 'storage' | 'transactionNumber' | 'triggerWebhook' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
+type IGlobalSetting = Pick<ISetting, 'defaultSenderEmail' | 'orderNumber' | 'quota' | 'serviceOutputIdentifier' | 'storage' | 'transactionNumber' | 'triggerWebhook' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
 export { IGlobalSetting as ISetting };
 /**
  * 設定リポジトリ

package/lib/chevre/service/assetTransaction/reserve/cancel.d.ts

@@ -1,9 +1,8 @@
-import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { CancelActionRepo } from '../../../repo/action/cancel';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { ReservationRepo } from '../../../repo/reservation';
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 type ICancelOperation<T> = (repos: {
@@ -13,10 +12,10 @@ type ICancelOperation<T> = (repos: {
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
-}, settings: Settings) => Promise<T>;
+}) => Promise<T>;
 /**
  * 取引中止
  */

package/lib/chevre/service/assetTransaction/reserve/cancel.js

@@ -7,9 +7,7 @@ const cancelReservation_1 = require("../../reserve/cancelReservation");
  * 取引中止
  */
 function cancel(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         // まず取引状態変更
         const { id } = await repos.assetTransaction.cancel({
             typeOf: factory_1.factory.assetTransactionType.Reserve,

package/lib/chevre/service/assetTransaction/reserve/confirm.d.ts

@@ -1,11 +1,10 @@
 import { factory } from '../../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { ReserveActionRepo } from '../../../repo/action/reserve';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { OrderRepo } from '../../../repo/order';
 import type { ReservationRepo } from '../../../repo/reservation';
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { TaskRepo } from '../../../repo/task';
 interface IConfirmRepo {
     actions: {
@@ -15,10 +14,10 @@ interface IConfirmRepo {
     code: AuthorizationRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
 }
-type IConfirmOperation<T> = (repos: IConfirmRepo, settings: Settings) => Promise<T>;
+type IConfirmOperation<T> = (repos: IConfirmRepo) => Promise<T>;
 /**
  * 取引確定
  */

package/lib/chevre/service/assetTransaction/reserve/confirm.js

@@ -8,9 +8,7 @@ const factory_2 = require("./confirm/factory");
  * 取引確定
  */
 function confirm(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {

package/lib/chevre/service/assetTransaction/reserve/start.d.ts

@@ -1,5 +1,4 @@
 import { factory } from '../../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { EventRepo } from '../../../repo/event';
@@ -17,6 +16,7 @@ import type { PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../repo/product';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TicketRepo } from '../../../repo/ticket';
@@ -38,11 +38,12 @@ interface IStartOperationRepos {
     priceSpecification: PriceSpecificationRepo;
     seat: SeatRepo;
     setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     ticket: TicketRepo;
     assetTransaction: AssetTransactionRepo;
 }
-type IStartOperation<T> = (repos: IStartOperationRepos, settings: Settings) => Promise<T>;
+type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
     /**

package/lib/chevre/service/notification/triggerWebhook/processInformAction.d.ts

@@ -2,18 +2,21 @@ import { factory } from '../../../factory';
 import type { InformActionRepo } from '../../../repo/action/inform';
 import type { PotentialActionRepo } from '../../../repo/potentialAction';
 import type { ISetting, SettingRepo } from '../../../repo/setting';
+import type { IIntegrationSettings, IntegrationSettingRepo } from '../../../repo/setting/integration';
 interface ITriggerWebhookRepos {
     actions: {
         inform: InformActionRepo;
     };
     potentialAction: PotentialActionRepo;
     setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
 }
 declare function processInformAction(params: (factory.task.triggerWebhook.IData | factory.task.informHub.IData) & {
     project: {
         id: string;
     };
 }, settings: Pick<ISetting, 'triggerWebhook'>, options: {
+    integrationSettings?: IIntegrationSettings['hub'];
     useIAP: boolean;
 }): (repos: {
     actions: {

package/lib/chevre/service/notification/triggerWebhook/processInformAction.js

@@ -97,11 +97,12 @@ function signRequest(params) {
         .update(payload)
         .digest('hex');
 }
-async function makeRequestHeaders(action, settings, requestBody, options) {
+async function makeRequestHeaders(params, options) {
+    const { action, settings, integrationSettings, requestBody } = params;
     const { useIAP } = options;
     const secretKey = settings?.triggerWebhook?.secretKey;
     const headerIdentifier = settings?.triggerWebhook?.headerIdentifier;
-    const googleTargetAudience = settings?.triggerWebhook?.googleTargetAudience;
+    const googleTargetAudience = integrationSettings?.googleTargetAudience;
     const timestamp = action.startDate.valueOf();
     // sign request(2024-10-28~)
     let signature;
@@ -149,7 +150,7 @@ function processInformAction(params, settings, options) {
                         ? { identifier }
                         : undefined
                 });
-                const headers = await makeRequestHeaders(action, settings, requestBody, options);
+                const headers = await makeRequestHeaders({ action, settings, integrationSettings: options.integrationSettings, requestBody }, options);
                 const res = await fetch(urlTemplate, {
                     method: 'POST',
                     headers,

package/lib/chevre/service/notification/triggerWebhook.js

@@ -54,6 +54,7 @@ function triggerWebhook(params) {
 function informHub(params) {
     return async (repos) => {
         const { setting, retryCountMax, retryIntervalInMS } = await findSettings()(repos);
+        const hubSettings = await repos.integrationSetting.getByKey('hub');
         // retryableにする(2023-05-12~)
         let retry = true;
         let numberOfTry = 0;
@@ -67,7 +68,7 @@ function informHub(params) {
                 if (numberOfTry > 1) {
                     await sleep(retryIntervalInMS * (numberOfTry - 1));
                 }
-                await (0, processInformAction_1.processInformAction)(params, setting, { useIAP: true })(repos);
+                await (0, processInformAction_1.processInformAction)(params, setting, { integrationSettings: hubSettings, useIAP: true })(repos);
                 break;
             }
             catch (error) {

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

@@ -1,5 +1,4 @@
 import { factory } from '../../../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../../../repo/setting/integration';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { EventRepo, IMinimizedIndividualEvent } from '../../../../repo/event';
@@ -17,6 +16,7 @@ import type { PriceSpecificationRepo } from '../../../../repo/priceSpecification
 import type { ProductRepo } from '../../../../repo/product';
 import type { OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../../repo/setting/integration';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
 import type { TicketRepo } from '../../../../repo/ticket';
@@ -64,10 +64,11 @@ declare function processStartReserve4chevre(params: {
     priceSpecification: PriceSpecificationRepo;
     seat: SeatRepo;
     setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     ticket: TicketRepo;
     assetTransaction: AssetTransactionRepo;
-}, settings: Settings) => Promise<{
+}) => Promise<{
     acceptedOffers4result: IResultAcceptedOffer[];
 }>;
 export { processStartReserve4chevre };

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

@@ -39,11 +39,7 @@ const ReserveTransactionService = __importStar(require("../../../assetTransactio
 const factory_2 = require("./factory");
 const requestedProgramMembershipUsed2permit_1 = require("./processStartReserve4chevre/requestedProgramMembershipUsed2permit");
 function processStartReserve4chevre(params, options) {
-    return async (repos, settings
-    // credentials: {
-    //     jwt: JWTCredentials;
-    // }
-    ) => {
+    return async (repos) => {
         const { event, transaction, transactionNumber } = params;
         // 予約取引開始
         const startParams = (0, factory_2.createReserveTransactionStartParams)({
@@ -76,7 +72,7 @@ function processStartReserve4chevre(params, options) {
             ]
             // useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, // discontinue(2024-07-02~)
             // stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
-        }, options)(repos, settings);
+        }, options)(repos);
         // 予約取引結果から注文オファーを生成する
         const acceptedOffers4result = (0, factory_2.responseBody2acceptedOffers4result)({
             issuedThrough: startReserveTransactionResult.issuedThrough,

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

@@ -1,5 +1,4 @@
 import { factory } from '../../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
@@ -19,6 +18,7 @@ import type { PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../repo/product';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TicketRepo } from '../../../repo/ticket';
@@ -45,12 +45,13 @@ interface IAuthorizeRepos {
     product: ProductRepo;
     seat: SeatRepo;
     setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     ticket: TicketRepo;
     placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;
 }
-type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;
+type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
 type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;
 type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail;
 interface IAuthorizeOptions {

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

@@ -11,7 +11,7 @@ const searchOffersByIds_1 = require("./searchOffersByIds");
  * 興行オファー承認
  */
 function authorize(params, options) {
-    return async (repos, settings) => {
+    return async (repos) => {
         const { noOfferSpecified } = options;
         const { transaction, event } = await validateCreateRequest(params)(repos);
         const { acceptedOffers, ticketOffers, unitPriceOffers } = await validateAcceptedOffers({
@@ -47,7 +47,7 @@ function authorize(params, options) {
                 orderNumber,
                 instrument: params.instrument,
                 ...(typeof params.object.broker?.typeOf === 'string') ? { broker: params.object.broker } : undefined
-            }, options)(repos, settings);
+            }, options)(repos);
             acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
             if (!noOfferSpecified) {
                 const minimizedAcceptedOffers = acceptedOffers4result.map((acceptOffer4result, offerIndex) => {

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

@@ -1,11 +1,10 @@
 import { factory } from '../../../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../../../repo/setting/integration';
 import type { CancelActionRepo } from '../../../../repo/action/cancel';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { OrderInTransactionRepo } from '../../../../repo/orderInTransaction';
 import type { OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
 import type { ReservationRepo } from '../../../../repo/reservation';
-import type { SettingRepo } from '../../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../../repo/setting/integration';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
 interface IVoidTransactionRepos {
@@ -17,10 +16,10 @@ interface IVoidTransactionRepos {
     offerRateLimit: OfferRateLimitRepo;
     orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
 }
 declare function processVoidTransaction4chevre(params: {
     action: factory.action.authorize.offer.eventService.IAction;
-}): (repos: IVoidTransactionRepos, settings: Settings) => Promise<void>;
+}): (repos: IVoidTransactionRepos) => Promise<void>;
 export { processVoidTransaction4chevre };

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

@@ -4,7 +4,7 @@ exports.processVoidTransaction4chevre = processVoidTransaction4chevre;
 const factory_1 = require("../../../../factory");
 const reserve_1 = require("../../../assetTransaction/reserve");
 function processVoidTransaction4chevre(params) {
-    return async (repos, settings) => {
+    return async (repos) => {
         const transactionNumber = params.action.instrument.transactionNumber;
         if (typeof transactionNumber === 'string') {
             // 取引が存在すれば中止
@@ -16,7 +16,7 @@ function processVoidTransaction4chevre(params) {
                 transactionNumber: { $eq: transactionNumber }
             }, ['_id']);
             if (assetTransactions.length > 0) {
-                await (0, reserve_1.cancel)({ transactionNumber })(repos, settings);
+                await (0, reserve_1.cancel)({ transactionNumber })(repos);
             }
         }
     };

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

@@ -1,6 +1,5 @@
 import type { COA } from '@motionpicture/coa-service';
 import { factory } from '../../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { CancelActionRepo } from '../../../repo/action/cancel';
 import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
@@ -8,7 +7,7 @@ import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { ReservationRepo } from '../../../repo/reservation';
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -26,7 +25,7 @@ interface IVoidTransactionRepos {
     offerRateLimit: OfferRateLimitRepo;
     orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
     /**
@@ -48,5 +47,5 @@ declare function voidTransaction(params: factory.task.voidReserveTransaction.IDa
          */
         id: string;
     };
-}): (repos: IVoidTransactionRepos, settings: Settings) => Promise<void>;
+}): (repos: IVoidTransactionRepos) => Promise<void>;
 export { IVoidTransactionRepos, voidTransaction };

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

@@ -11,10 +11,10 @@ const voidTransactionByActionId_1 = require("./voidTransactionByActionId");
  * 取引中の承認アクション全てについて処理する or 特定の承認アクションについて処理する
  */
 function voidTransaction(params) {
-    return async (repos, settings) => {
+    return async (repos) => {
         // support void by action ID(2024-05-26~)
         if (typeof params.id === 'string') {
-            await (0, voidTransactionByActionId_1.voidTransactionByActionId)(params)(repos, settings);
+            await (0, voidTransactionByActionId_1.voidTransactionByActionId)(params)(repos);
             return;
         }
         const cancelAction = {
@@ -98,7 +98,7 @@ function voidTransaction(params) {
                     await (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
                         // action: <factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.Chevre>>action
                         action
-                    })(repos, settings);
+                    })(repos);
             }
         }));
         // acceptActionについても取り消す(2024-05-27~)

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

@@ -1,6 +1,5 @@
 import type { COA } from '@motionpicture/coa-service';
 import { factory } from '../../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { CancelActionRepo } from '../../../repo/action/cancel';
 import { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
@@ -8,7 +7,7 @@ import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { ReservationRepo } from '../../../repo/reservation';
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -26,7 +25,7 @@ interface IVoidTransactionByActionIdRepos {
     offerRateLimit: OfferRateLimitRepo;
     orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
     /**
@@ -48,5 +47,5 @@ declare function voidTransactionByActionId(params: factory.task.voidReserveTrans
          */
         id: string;
     };
-}): (repos: IVoidTransactionByActionIdRepos, settings: Settings) => Promise<void>;
+}): (repos: IVoidTransactionByActionIdRepos) => Promise<void>;
 export { IVoidTransactionByActionIdRepos, voidTransactionByActionId };

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

@@ -10,7 +10,7 @@ const processVoidTransaction4coa_1 = require("./voidTransaction/processVoidTrans
  * 特定の承認アクションについて処理する
  */
 function voidTransactionByActionId(params) {
-    return async (repos, settings) => {
+    return async (repos) => {
         if (typeof params.id !== 'string' || params.id === '') {
             throw new factory_1.factory.errors.ArgumentNull('id');
         }
@@ -51,7 +51,7 @@ function voidTransactionByActionId(params) {
             default:
                 await (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
                     action
-                })(repos, settings);
+                })(repos);
             // const transactionNumber = action.object.pendingTransaction?.transactionNumber;
             // if (typeof transactionNumber === 'string') {
             //     // すでに取消済であったとしても、すべて取消処理(actionStatusに関係なく)

package/lib/chevre/service/offer/onEventChanged.d.ts

@@ -5,6 +5,7 @@ import type { PendingReservationRepo } from '../../repo/pendingReservation';
 import type { ProjectRepo } from '../../repo/project';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
+import { IntegrationSettingRepo } from '../../repo/setting/integration';
 import { factory } from '../../factory';
 /**
  * イベント変更時処理
@@ -13,6 +14,7 @@ declare function onEventChanged(params: factory.task.onEventChanged.IData): (rep
     adminEvent: AdminEventRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
+    integrationSetting: IntegrationSettingRepo;
     pendingReservation?: PendingReservationRepo;
     project: ProjectRepo;
     setting: SettingRepo;