@chevre/domain 24.1.0-alpha.5 → 24.1.0-alpha.51

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

@@ -8,9 +8,7 @@ export interface IUpdatePartiallyParams {
 export type ICancelResult = UpdateWriteOpResult;
 export type ICheckedInResult = UpdateWriteOpResult;
 type ISavingReservedTicket = Omit<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'> & {
-    ticketType: {
-        id?: string;
-    };
+    ticketType?: never;
 };
 /**
  * ドキュメントとして保管する予約
@@ -22,7 +20,7 @@ export type ICreatingReservation = Omit<factory.reservation.eventReservation.IRe
 /**
  * 廃止予定の予約属性
  */
-export type IDeprecatedField = 'price' | 'underName';
+export type IDeprecatedField = 'price' | 'underName' | 'priceCurrency' | 'issuedThrough' | 'numSeats';
 export type IKeyOfProjection = Exclude<keyof factory.reservation.eventReservation.IReservation, IDeprecatedField> | 'reservedTicket.dateUsed' | 'reservationFor.id' | 'reservationFor.typeOf';
 export type IAttendedReservation = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'typeOf' | 'project' | 'modifiedTime'> & {
     reservationFor: Pick<factory.reservation.eventReservation.IReservationForMinimized, 'id' | 'typeOf'>;
@@ -37,6 +35,18 @@ export type IReservationAsFindResult = Omit<factory.reservation.eventReservation
      * 実データとしてはまだ存在しているが型から廃止(2026-03-26~)
      */
     underName?: never;
+    /**
+     * discontinue(2026-05-10~)
+     */
+    priceCurrency?: never;
+    /**
+     * discontinue(2026-05-10~)
+     */
+    issuedThrough?: never;
+    /**
+     * discontinue(2026-05-11~)
+     */
+    numSeats?: never;
 };
 /**
  * 予約リポジトリ
@@ -63,7 +73,6 @@ export declare class ReservationRepo {
         };
         provider: factory.reservation.IProvider;
         subReservation: factory.assetTransaction.reserve.IObjectSubReservation[];
-        issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
         reservationFor: factory.assetTransaction.reserve.IReservationFor;
         reservationNumber: string;
         underName?: factory.reservation.IUnderName;
@@ -145,16 +154,20 @@ export declare class ReservationRepo {
     }): Promise<string[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/reservation/event").IReservation, "id"> & {
         _id: string;
-        bookingAgent?: any;
         previousReservationStatus?: factory.reservationStatusType;
+        price?: never;
+        priceCurrency?: never;
+        issuedThrough?: never;
     } & Required<{
         _id: string;
     }> & {
         __v: number;
     }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/reservation/event").IReservation, "id"> & {
         _id: string;
-        bookingAgent?: any;
         previousReservationStatus?: factory.reservationStatusType;
+        price?: never;
+        priceCurrency?: never;
+        issuedThrough?: never;
     } & Required<{
         _id: string;
     }> & {

package/lib/chevre/repo/reservation.js

@@ -19,7 +19,7 @@ class ReservationRepo {
      * 汎用予約カウント
      */
     async count(params) {
-        const conditions = (0, createMongoConditions_1.CREATE_MONGO_CONDITIONS)(params);
+        const conditions = (0, createMongoConditions_1.createMongoConditions)(params);
         return this.reservationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
             .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
@@ -28,7 +28,7 @@ class ReservationRepo {
      * 予約検索
      */
     async findReservations(params, inclusion) {
-        const conditions = (0, createMongoConditions_1.CREATE_MONGO_CONDITIONS)(params);
+        const conditions = (0, createMongoConditions_1.createMongoConditions)(params);
         let projection;
         if (inclusion !== undefined && inclusion !== null) {
             projection = {
@@ -114,15 +114,19 @@ class ReservationRepo {
         const bulkWriteOps = [];
         if (Array.isArray(params.subReservation)) {
             params.subReservation.forEach((subReservation) => {
-                const { price: _discontinuePrice, reservedTicket, ...subReservationWithoutPrice } = subReservation;
-                const { ticketType, ...reservedTicketWithoutTicketType } = reservedTicket;
-                // 予約ドキュメントのticketTypeを最小化(2026-04-03~)
-                const savingReservedTicket = {
-                    ...reservedTicketWithoutTicketType,
-                    ticketType: {
-                        ...((typeof ticketType.id === 'string') && { id: ticketType.id })
-                    }
-                };
+                const { price: _discontinuePrice, reservedTicket, priceCurrency: _discontinuePriceCurrency, // discontinue priceCurrency
+                numSeats: _numSeats, // discontinue(2026-05-11~)
+                ...subReservationWithoutPrice } = subReservation;
+                const { ticketType: _ticketType, ...reservedTicketWithoutTicketType } = reservedTicket;
+                // discontinue ticketType(2026-05-09~)
+                const savingReservedTicket = reservedTicketWithoutTicketType;
+                // // 予約ドキュメントのticketTypeを最小化(2026-04-03~)
+                // const savingReservedTicket: ISavingReservedTicket = {
+                //     ...reservedTicketWithoutTicketType,
+                //     ticketType: {
+                //         ...((typeof ticketType.id === 'string') && { id: ticketType.id })
+                //     }
+                // };
                 // reservationFor最小化(2026-04-06~)
                 const { minimizedReservationFor } = (0, minimizeReservationFor_1.minimizeReservationFor)(params.reservationFor);
                 const setOnInsert = {
@@ -132,7 +136,7 @@ class ReservationRepo {
                     bookingTime: params.bookingTime,
                     checkedIn: false,
                     attended: false,
-                    issuedThrough: params.issuedThrough,
+                    // issuedThrough: params.issuedThrough, // discontinue issuedThrough
                     project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                     reservationFor: minimizedReservationFor,
                     reservationNumber: params.reservationNumber,

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

@@ -59,23 +59,9 @@ export declare class RoleRepo {
     } & {
         __v: number;
     }) | null>;
-    addMember(params: Pick<IRole, 'member' | 'memberOf' | 'roleName'>): Promise<(import("mongoose").FlattenMaps<{
-        typeOf: import("@chevre/factory/lib/chevre/role").RoleType;
-        memberOf: {
-            typeOf: factory.organizationType.Corporation | factory.organizationType.Project;
-        };
-        member: {
-            typeOf: import("@chevre/factory/lib/chevre/role/organizationRole").IMemberType;
-        };
-        roleName: import("@chevre/factory/lib/chevre/role/organizationRole").RoleName;
-        permissions: string[];
-    }> & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | null>;
     create(params: Pick<IRole, 'member' | 'memberOf' | 'permissions' | 'roleName'>): Promise<{
         id: string;
     }>;
+    deleteByRoleName(params: Pick<IRole, 'roleName'>): Promise<import("mongodb").DeleteResult>;
 }
 export {};

package/lib/chevre/repo/role.js

@@ -139,20 +139,6 @@ class RoleRepo {
             .lean()
             .exec();
     }
-    async addMember(params) {
-        const { roleName, member, memberOf } = params;
-        return this.roleModel.findOneAndUpdate({
-            roleName: { $eq: roleName },
-            'member.typeOf': { $ne: member.typeOf }
-        }, {
-            $set: { member, memberOf }
-        }, {
-            new: true,
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec();
-    }
     async create(params) {
         const { member, memberOf, permissions, roleName } = params;
         const creatingRole = {
@@ -167,5 +153,12 @@ class RoleRepo {
         const savedId = insertedId;
         return { id: savedId };
     }
+    async deleteByRoleName(params) {
+        const { roleName } = params;
+        return this.roleModel.deleteOne({
+            roleName: { $eq: roleName }
+        })
+            .exec();
+    }
 }
 exports.RoleRepo = RoleRepo;

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

@@ -0,0 +1,27 @@
+import type { Connection } from 'mongoose';
+import { IIntegrationSettings, ISendGridSettings, IHubSettings } from '../mongoose/schemas/setting';
+interface IDBOptions {
+    connection: Connection;
+}
+/**
+ * 外部連携設定リポジトリ
+ */
+export declare class IntegrationSettingRepo {
+    private readonly settingModel;
+    private readonly defaultOptions;
+    private static cachedSettings;
+    private static cacheExpiry;
+    private static readonly CACHE_TTL_MS;
+    constructor(options: IDBOptions);
+    /**
+     * 設定全体をDBまたはキャッシュから取得する
+     */
+    private getAllSettings;
+    /**
+     * 設定名称から設定を参照する
+     */
+    getByKey<T extends keyof IIntegrationSettings>(key: T): Promise<IIntegrationSettings[T]>;
+    addSendGridSettings(params: ISendGridSettings): Promise<import("mongoose").UpdateWriteOpResult>;
+    addHubSettings(params: IHubSettings): Promise<import("mongoose").UpdateWriteOpResult>;
+}
+export {};

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

@@ -0,0 +1,102 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IntegrationSettingRepo = void 0;
+const debug_1 = __importDefault(require("debug"));
+const factory_1 = require("../../factory");
+const setting_1 = require("../mongoose/schemas/setting");
+const debug = (0, debug_1.default)('chevre-domain:repo:integrationSetting');
+const defaultOptions = {
+    abortedTasksWithoutReport: [
+        factory_1.factory.taskName.ImportEventCapacitiesFromCOA,
+        factory_1.factory.taskName.ImportEventsFromCOA,
+        factory_1.factory.taskName.ImportOffersFromCOA,
+    ],
+    numTryConfirmReserveTransaction: 10,
+    deliverOrderLimit: 10,
+    coa: {
+        timeoutReserve: 20000,
+        timeoutMaster: 30000
+    },
+    gmo: {
+        timeout: 4000,
+        timeoutBackground: 6000
+    },
+    movieticketReserve: {
+        timeoutPay: 5000,
+        timeoutRefund: 5000,
+        timeoutCheck: 4000,
+        minIntervalBetweenPayAndRefund: 10000,
+        credentialsExpireInSeconds: 600
+    },
+    useExperimentalFeature: false
+};
+/**
+ * 外部連携設定リポジトリ
+ */
+class IntegrationSettingRepo {
+    settingModel;
+    defaultOptions;
+    // static にすることで、クラスが何回 new されてもメモリ上で1つだけ保持される
+    static cachedSettings;
+    static cacheExpiry = 0;
+    static CACHE_TTL_MS = 10 * 60 * 1000; // 10分
+    constructor(options) {
+        const { connection } = options;
+        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+        this.defaultOptions = defaultOptions;
+    }
+    /**
+     * 設定全体をDBまたはキャッシュから取得する
+     */
+    async getAllSettings() {
+        const now = Date.now();
+        // static プロパティにアクセスするため、クラス名（IntegrationSettingRepo）経由で参照
+        if (IntegrationSettingRepo.cachedSettings !== undefined && now < IntegrationSettingRepo.cacheExpiry) {
+            debug('cache exist!', JSON.stringify(IntegrationSettingRepo.cachedSettings));
+            return IntegrationSettingRepo.cachedSettings;
+        }
+        const settingDoc = await this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
+            _id: 0,
+            integration: 1
+        })
+            .lean()
+            .exec();
+        // キャッシュを更新
+        if (settingDoc?.integration !== undefined) {
+            // console.log('docuemnt exist!');
+            IntegrationSettingRepo.cachedSettings = settingDoc.integration;
+        }
+        else {
+            IntegrationSettingRepo.cachedSettings = this.defaultOptions;
+        }
+        IntegrationSettingRepo.cacheExpiry = now + IntegrationSettingRepo.CACHE_TTL_MS;
+        return IntegrationSettingRepo.cachedSettings;
+    }
+    /**
+     * 設定名称から設定を参照する
+     */
+    async getByKey(key) {
+        const settings = await this.getAllSettings();
+        return settings[key];
+    }
+    async addSendGridSettings(params) {
+        return this.settingModel.updateOne({ 'project.id': { $eq: '*' } }, {
+            $set: {
+                'integration.sendGrid': params
+            }
+        })
+            .exec();
+    }
+    async addHubSettings(params) {
+        return this.settingModel.updateOne({ 'project.id': { $eq: '*' } }, {
+            $set: {
+                'integration.hub': params
+            }
+        })
+            .exec();
+    }
+}
+exports.IntegrationSettingRepo = IntegrationSettingRepo;

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

@@ -136,11 +136,11 @@ export declare class TransactionRepo {
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
+        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
+        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
@@ -156,10 +156,10 @@ export declare class TransactionRepo {
         startDate: Date;
         endDate?: Date | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
         recipient?: undefined;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
+        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
@@ -174,11 +174,11 @@ export declare class TransactionRepo {
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
+        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
+        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
@@ -194,10 +194,10 @@ export declare class TransactionRepo {
         startDate: Date;
         endDate?: Date | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
         recipient?: undefined;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
+        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

package/lib/chevre/repository.d.ts

@@ -79,6 +79,7 @@ import type { SellerPaymentAcceptedRepo } from './repo/sellerPaymentAccepted';
 import type { SellerReturnPolicyRepo } from './repo/sellerReturnPolicy';
 import type { ServiceAvailableHourRepo } from './repo/service/availableHour';
 import type { SettingRepo } from './repo/setting';
+import type { IntegrationSettingRepo } from './repo/setting/integration';
 import type { JWTSettingRepo } from './repo/setting/jwt';
 import type { StockHolderRepo } from './repo/stockHolder';
 import type { TaskRepo } from './repo/task';
@@ -437,6 +438,10 @@ export declare namespace Setting {
     function createInstance(...params: ConstructorParameters<typeof SettingRepo>): Promise<SettingRepo>;
 }
 export declare namespace setting {
+    type Integration = IntegrationSettingRepo;
+    namespace Integration {
+        function createInstance(...params: ConstructorParameters<typeof IntegrationSettingRepo>): Promise<IntegrationSettingRepo>;
+    }
     type JWT = JWTSettingRepo;
     namespace JWT {
         function createInstance(...params: ConstructorParameters<typeof JWTSettingRepo>): Promise<JWTSettingRepo>;

package/lib/chevre/repository.js

@@ -911,6 +911,17 @@ var Setting;
 })(Setting || (exports.Setting = Setting = {}));
 var setting;
 (function (setting) {
+    let Integration;
+    (function (Integration) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await import('./repo/setting/integration.js')).IntegrationSettingRepo;
+            }
+            return new repo(...params);
+        }
+        Integration.createInstance = createInstance;
+    })(Integration = setting.Integration || (setting.Integration = {}));
     let JWT;
     (function (JWT) {
         let repo;

package/lib/chevre/service/aggregation/event/aggregateOffers.js

@@ -150,7 +150,12 @@ function aggregateReservationByOffer(params) {
                         }
                     }
                 });
-                console.log('aggregateReservationByOffer: reservationCount4offer:', reservationCount4offer, 'aggregateSeatingType:', aggregateSeatingType, 'offer.id:', params.offer.id, 'offer.category:', params.offer.category?.codeValue);
+                // console.log(
+                //     'aggregateReservationByOffer: reservationCount4offer:', reservationCount4offer,
+                //     'aggregateSeatingType:', aggregateSeatingType,
+                //     'offer.id:', params.offer.id,
+                //     'offer.category:', params.offer.category?.codeValue
+                // );
             }
         }
         const { maximumAttendeeCapacity, remainingAttendeeCapacity } = await calculateCapacityByOffer(params)(repos);

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -10,7 +10,6 @@ exports.aggregateScreeningEvent = aggregateScreeningEvent;
 const debug_1 = __importDefault(require("debug"));
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const findEventOffers_1 = require("./findEventOffers");
 const debug = (0, debug_1.default)('chevre-domain:service:aggregation');
 /**

package/lib/chevre/service/assetTransaction/cancelReservation/factory.js

@@ -69,10 +69,11 @@ function createPotentialActions(params) {
     const reservationForByReserveTransaction = transaction.object.transaction?.object.reservationFor;
     if (reservationForByReserveTransaction !== undefined && typeof reservationNumber === 'string') {
         const cancelObject = {
-            reservationFor: {
-                typeOf: reservationForByReserveTransaction.typeOf,
-                id: String(reservationForByReserveTransaction.id)
-            },
+            // discontinue reservationFor(2026-05-09~)
+            // reservationFor: {
+            //     typeOf: reservationForByReserveTransaction.typeOf,
+            //     id: String(reservationForByReserveTransaction.id)
+            // },
             reservationNumber,
             // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
             reservationStatus: factory_1.factory.reservationStatusType.ReservationConfirmed,
@@ -100,13 +101,15 @@ function createPotentialActions(params) {
                     cancelObject = {
                         typeOf: reservation.typeOf,
                         id: reservation.id,
-                        issuedThrough: {
-                            typeOf: reservation.issuedThrough?.typeOf
-                        },
-                        reservationFor: {
-                            typeOf: reservation.reservationFor.typeOf,
-                            id: String(reservation.reservationFor.id)
-                        },
+                        // discontinue issuedThrough(2026-05-08~)
+                        // issuedThrough: {
+                        //     typeOf: reservation.issuedThrough?.typeOf
+                        // },
+                        // discontinue reservationFor(2026-05-09~)
+                        // reservationFor: {
+                        //     typeOf: reservation.reservationFor.typeOf,
+                        //     id: String(reservation.reservationFor.id)
+                        // },
                         reservationNumber: reservation.reservationNumber,
                         // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
                         reservationStatus: factory_1.factory.reservationStatusType.ReservationConfirmed

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

@@ -18,7 +18,7 @@ export declare function validateStartParams(params: IStartParams): (repos: {
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{
     reserveTransaction: import("@chevre/factory/lib/chevre/assetTransaction/reserve").ITransaction | undefined;
-    reservations: (Pick<import("@chevre/factory/lib/chevre/reservation/event").IReservation, "id" | "typeOf" | "issuedThrough" | "reservationNumber"> & {
+    reservations: (Pick<import("@chevre/factory/lib/chevre/reservation/event").IReservation, "id" | "typeOf" | "reservationNumber"> & {
         reservationFor: Pick<factory.reservation.eventReservation.IReservationForMinimized, "id" | "typeOf">;
     })[] | undefined;
 }>;

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

@@ -43,7 +43,7 @@ function validateStartParams(params) {
                 const reservation = await repos.reservation.findReservationById({
                     id: params.object.reservation.id,
                     inclusion: [
-                        'issuedThrough', 'typeOf', 'reservationNumber', 'reservationFor.id', 'reservationFor.typeOf', 'provider', 'reservationStatus'
+                        'typeOf', 'reservationNumber', 'reservationFor.id', 'reservationFor.typeOf', 'provider', 'reservationStatus'
                     ]
                 });
                 // 販売者検証(2023-08-01~)

package/lib/chevre/service/assetTransaction/pay/check.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';

package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
 import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { EventRepo } from '../../../repo/event';

package/lib/chevre/service/assetTransaction/pay/searchGMOTrade.d.ts

@@ -2,7 +2,7 @@
  * 決済取引サービス
  */
 import type { GMO } from '@motionpicture/gmo-service';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';

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

@@ -1,5 +1,5 @@
 import { factory } from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../../repo/setting/integration';
 import type { AccountingReportRepo } from '../../../../repo/accountingReport';
 import type { PayActionRepo } from '../../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../../repo/action/refund';

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

@@ -1,5 +1,5 @@
 import { factory } from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../../repo/setting/integration';
 import type { AuthorizeInvoiceActionRepo } from '../../../../repo/action/authorizeInvoice';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { PaymentServiceRepo } from '../../../../repo/paymentService';

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

@@ -1,5 +1,5 @@
 import { factory } from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../../repo/setting/integration';
 import type { AccountingReportRepo } from '../../../../repo/accountingReport';
 import type { PayActionRepo } from '../../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../../repo/action/refund';

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

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';

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

@@ -1,4 +1,4 @@
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { ActionRepo } from '../../../repo/action';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';

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

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { ActionRepo } from '../../../repo/action';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';

package/lib/chevre/service/assetTransaction/reserve/start/factory/createReservation.js

@@ -328,27 +328,17 @@ function createReservation(params) {
     const price4reservation = (0, price_1.createPrice)(params);
     if (params.reservationFor.typeOf === factory_1.factory.eventType.ScreeningEvent) {
         return {
-            // project: params.project, // 廃止(2024-04-08~)
             typeOf: factory_1.factory.reservationType.EventReservation,
             id: params.id,
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
             additionalProperty: params.additionalProperty,
-            // bookingTime: params.reserveDate, // 廃止(2024-04-08~)
-            // modifiedTime: params.reserveDate, // 廃止(2024-04-08~)
             numSeats: 1,
             price: price4reservation,
             priceCurrency: factory_1.factory.priceCurrency.JPY,
-            // reservationNumber: params.reservationNumber, // 廃止(2024-04-08~)
             // statusは不要なので削除(2023-07-19~)
             // reservationStatus: factory.reservationStatusType.ReservationPending,
             reservedTicket: params.reservedTicket,
-            // underName: { // 廃止(2024-04-08~)
-            //     typeOf: params.agent.typeOf,
-            //     name: params.agent.name
-            // },
-            // checkedIn: false, // 廃止(2024-04-08~)
-            // attended: false, // 廃止(2024-04-08~)
             ...(typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined,
             ...(Array.isArray(params.subReservation))
                 ? {
@@ -362,8 +352,6 @@ function createReservation(params) {
                     })
                 }
                 : undefined,
-            // reservationPackage保管に移行(2023-06-06~)
-            // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
             ...(typeof params.programMembershipUsed?.identifier === 'string')
                 ? { programMembershipUsed: params.programMembershipUsed }
                 : undefined

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

@@ -14,4 +14,4 @@ export declare function createPrice(params: {
     seatPriceComponent: factory.place.seat.IPriceComponent[];
     acceptedAddOns: IAcceptedAddOn[];
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
-}): factory.reservation.eventReservation.IPrice;
+}): factory.assetTransaction.reserve.IPrice;

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

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+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';

package/lib/chevre/service/delivery/factory.d.ts

@@ -5,7 +5,12 @@ export type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factory.owners
  */
 export declare function createOwnershipInfosFromOrder(params: {
     order: Pick<factory.order.IOrder, 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'> & {
-        acceptedOffers: factory.order.IAcceptedOffer[];
+        acceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+            /**
+             * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+             */
+            priceSpecification?: factory.order.ITicketPriceSpecification;
+        })[];
     };
     offerIndexBase: number;
 }): IOwnershipInfo[];