@chevre/domain 22.6.0-alpha.8 → 22.6.0

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

@@ -97,21 +97,24 @@ function aggregateOfferByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const availableOffers = yield (0, findEventOffers_1.findEventOffers)(params)(repos);
+        // 集計対象のオファーにフィルター(2024-11-09~)
+        const offersIncludedInAggregateReservation = availableOffers.filter(({ settings }) => (settings === null || settings === void 0 ? void 0 : settings.includedInAggregateReservation) === true);
         // オファーごとの予約集計
         const offersWithAggregateReservation = [];
-        for (const o of availableOffers) {
+        for (const o of offersIncludedInAggregateReservation) {
             const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByOffer({
                 aggregateDate: params.aggregateDate,
                 event: params.event,
                 screeningRoom: params.screeningRoom,
-                offer: o
+                offer: o,
+                availableOffers
             })(repos);
             offersWithAggregateReservation.push(Object.assign(Object.assign(Object.assign({ typeOf: o.typeOf, id: o.id, identifier: o.identifier, aggregateReservation: aggregateReservation }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined), (typeof ((_a = o.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? { category: o.category } : undefined));
         }
         return {
             typeOf: factory.offerType.AggregateOffer,
             aggregateDate: params.aggregateDate,
-            offerCount: availableOffers.length,
+            offerCount: offersIncludedInAggregateReservation.length,
             offers: offersWithAggregateReservation
         };
     });
@@ -119,39 +122,51 @@ function aggregateOfferByEvent(params) {
 function aggregateReservationByOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let reservationCount4offer;
-        let attendeeCount4offer;
-        let checkInCount4offer;
+        // let attendeeCount4offer: number | undefined;
+        // let checkInCount4offer: number | undefined;
         let reservationType = factory.reservationType.EventReservation;
         if (params.event.typeOf === factory.eventType.Event) {
             reservationType = factory.reservationType.BusReservation;
         }
-        reservationCount4offer = yield repos.reservation.count({
-            typeOf: reservationType,
-            reservationFor: { id: { $eq: params.event.id } },
-            reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-            reservedTicket: { ticketType: { ids: [params.offer.id] } }
-        });
-        attendeeCount4offer = yield repos.reservation.count({
-            typeOf: reservationType,
-            reservationFor: { id: { $eq: params.event.id } },
-            reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-            reservedTicket: { ticketType: { ids: [params.offer.id] } },
-            attended: true
-        });
-        checkInCount4offer = yield repos.reservation.count({
-            typeOf: reservationType,
-            reservationFor: { id: { $eq: params.event.id } },
-            reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-            reservedTicket: { ticketType: { ids: [params.offer.id] } },
-            checkedIn: true
-        });
+        const offerIdsWithSameCategory = params.availableOffers.filter(({ category }) => {
+            var _a;
+            return typeof (category === null || category === void 0 ? void 0 : category.codeValue) === 'string' && category.codeValue === ((_a = params.offer.category) === null || _a === void 0 ? void 0 : _a.codeValue);
+        })
+            .map(({ id }) => id);
+        if (offerIdsWithSameCategory.length > 0) {
+            reservationCount4offer = yield repos.reservation.count({
+                typeOf: reservationType,
+                reservationFor: { id: { $eq: params.event.id } },
+                reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
+                // オファーカテゴリーごとに集計する(2024-11-10~)
+                // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } }
+                reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } }
+            });
+            // attendeeCount4offer = await repos.reservation.count({
+            //     typeOf: reservationType,
+            //     reservationFor: { id: { $eq: params.event.id } },
+            //     reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
+            //     // オファーカテゴリーごとに集計する(2024-11-10~)
+            //     // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } },
+            //     reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } },
+            //     attended: true
+            // });
+            // checkInCount4offer = await repos.reservation.count({
+            //     typeOf: reservationType,
+            //     reservationFor: { id: { $eq: params.event.id } },
+            //     reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
+            //     // オファーカテゴリーごとに集計する(2024-11-10~)
+            //     // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } },
+            //     reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } },
+            //     checkedIn: true
+            // });
+        }
         const { maximumAttendeeCapacity, remainingAttendeeCapacity } = yield calculateCapacityByOffer(params)(repos);
         return Object.assign(Object.assign({ aggregateReservation: {
                 typeOf: 'AggregateReservation',
-                // aggregateDate: params.aggregateDate, // 最適化につき廃止(2024-03-26~)
-                reservationCount: reservationCount4offer,
-                attendeeCount: attendeeCount4offer,
-                checkInCount: checkInCount4offer
+                reservationCount: reservationCount4offer
+                // attendeeCount: attendeeCount4offer, // discontinue(2024-11-10~)
+                // checkInCount: checkInCount4offer // discontinue(2024-11-10~)
             } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined);
     });
 }

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

@@ -26,16 +26,22 @@ function aggregateScreeningEvent(params) {
     return (repos
     // settings: Settings
     ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d;
         // 集計対象イベント検索
-        const event = yield repos.event.projectEventFieldsById({ id: params.id }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered']);
+        const event = yield repos.event.projectEventFieldsById({ id: params.id }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.id', 'superEvent.location.id', 'offers.itemOffered']);
         // プロジェクト設定検索
         const project = yield repos.project.findById({
             id: event.project.id,
             inclusion: ['settings']
         });
-        const useAggregateOffer = ((_a = project.settings) === null || _a === void 0 ? void 0 : _a.useAggregateOffer) === true;
-        const useOfferRateLimit = ((_b = project.settings) === null || _b === void 0 ? void 0 : _b.useOfferRateLimit) === true;
+        const useOfferRateLimit = ((_a = project.settings) === null || _a === void 0 ? void 0 : _a.useOfferRateLimit) === true;
+        let useAggregateOffer = false;
+        if (event.typeOf === factory.eventType.ScreeningEvent) {
+            const eventSeriesIdsByProject = (_c = (_b = project.settings) === null || _b === void 0 ? void 0 : _b.useAggregateReservation) === null || _c === void 0 ? void 0 : _c.eventSeriesIds;
+            const eventSeriesIdIncluded = Array.isArray(eventSeriesIdsByProject) && eventSeriesIdsByProject.includes(event.superEvent.id);
+            const useAggregateOfferByProject = ((_d = project.settings) === null || _d === void 0 ? void 0 : _d.useAggregateOffer) === true;
+            useAggregateOffer = eventSeriesIdIncluded && useAggregateOfferByProject;
+        }
         let aggregatingEvents = [event];
         // dependent on project settings(2024-10-29~)
         if (useOfferRateLimit) {

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

@@ -92,6 +92,8 @@ function aggregateEntranceGateByEvent(params) {
         const places = [];
         if (Array.isArray(params.entranceGates) && params.entranceGates.length > 0) {
             const availableOffers = yield (0, findEventOffers_1.findEventOffers)(params)(repos);
+            // 集計対象のオファーにフィルター(2024-11-09~)
+            const offersIncludedInAggregateReservation = availableOffers.filter(({ settings }) => (settings === null || settings === void 0 ? void 0 : settings.includedInAggregateReservation) === true);
             // 念のため、identifierの存在する入場ゲートに絞る
             const entranceGates = params.entranceGates.filter((e) => {
                 return typeof e.identifier === 'string' && e.identifier.length > 0;
@@ -103,17 +105,23 @@ function aggregateEntranceGateByEvent(params) {
                     entranceGateIdentifier
                 });
                 debug('aggregateResult:', aggregateResult);
-                const offersOnEntranceGate = yield Promise.all(availableOffers.map((offer) => __awaiter(this, void 0, void 0, function* () {
-                    var _a, _b;
-                    // このオファーでの予約使用アクション数
-                    let useActionCount = (_a = aggregateResult.find((a) => a._id[0] === offer.id)) === null || _a === void 0 ? void 0 : _a.useActionCount;
-                    if (typeof useActionCount !== 'number') {
-                        useActionCount = 0;
-                    }
+                const offersOnEntranceGate = yield Promise.all(offersIncludedInAggregateReservation.map((offer) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    // オファーカテゴリーごとに集計する(2024-11-10~)
+                    const offerIdsWithSameCategory = availableOffers.filter(({ category }) => {
+                        var _a;
+                        return typeof (category === null || category === void 0 ? void 0 : category.codeValue) === 'string' && category.codeValue === ((_a = offer.category) === null || _a === void 0 ? void 0 : _a.codeValue);
+                    })
+                        .map(({ id }) => id);
+                    const useActionCount = aggregateResult.filter((a) => offerIdsWithSameCategory.includes(a._id[0]))
+                        .reduce((a, b) => a + ((typeof b.useActionCount === 'number') ? b.useActionCount : 0), 0);
+                    // let useActionCount: number | undefined = aggregateResult.find((a) => a._id[0] === offer.id)?.useActionCount;
+                    // if (typeof useActionCount !== 'number') {
+                    //     useActionCount = 0;
+                    // }
                     debug('useActionCount:', useActionCount, entranceGateIdentifier, offer.id);
-                    return Object.assign(Object.assign({ typeOf: offer.typeOf, id: offer.id, identifier: offer.identifier }, (typeof ((_b = offer.category) === null || _b === void 0 ? void 0 : _b.codeValue) === 'string') ? { category: offer.category } : undefined), { aggregateReservation: {
+                    return Object.assign(Object.assign({ typeOf: offer.typeOf, id: offer.id, identifier: offer.identifier }, (typeof ((_a = offer.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? { category: offer.category } : undefined), { aggregateReservation: {
                             typeOf: 'AggregateReservation',
-                            // aggregateDate: params.aggregateDate, // 最適化につき廃止(2024-03-26~)
                             useActionCount
                         } });
                 })));

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

@@ -8,6 +8,7 @@ import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
+import type { CredentialsRepo } from '../../repo/credentials';
 import type { EventRepo } from '../../repo/event';
 import type { OrderRepo } from '../../repo/order';
 import type { PaymentServiceRepo } from '../../repo/paymentService';
@@ -20,6 +21,7 @@ import * as MovieTicketPayment from '../payment/movieTicket';
 export interface IStartOperationRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
@@ -49,6 +51,7 @@ export type IExportTasksOperation<T> = (repos: {
 }) => Promise<T>;
 export type ICheckOperation<T> = (repos: {
     action: ActionRepo;
+    credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
@@ -111,7 +114,6 @@ export import IPaymentAgencyTransaction = CreditCardPayment.IPaymentAgencyTransa
  * 取引開始
  */
 export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, options: {
-    useCheckByIdentifierIfNotYet: boolean;
     pendingPaymentAgencyTransaction?: CreditCardPayment.IPaymentAgencyTransaction;
     /**
      * 実行者
@@ -129,6 +131,9 @@ export declare function start(params: factory.assetTransaction.pay.IStartParamsW
          */
         id?: string;
     };
+    checkedAction: {
+        id: string;
+    };
 }): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**
  * 取引確定

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

@@ -221,9 +221,12 @@ function start(params, options) {
                     : undefined))(repos, settings);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                transaction = yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.useCheckByIdentifierIfNotYet, {
+                transaction = yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), 
+                // options.useCheckByIdentifierIfNotYet,
+                {
                     executor: (typeof ((_d = options.executor) === null || _d === void 0 ? void 0 : _d.id) === 'string') ? { id: options.executor.id } : {},
-                    purpose: options.purpose
+                    purpose: options.purpose,
+                    checkedAction: options.checkedAction
                 })(repos, settings);
                 break;
             default:
@@ -400,9 +403,11 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId, optio
         // })(repos);
     });
 }
-function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options) {
+function processAuthorizeMovieTicket(params, transaction, paymentServiceId, 
+// useCheckByIdentifierIfNotYet: boolean,
+options) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const { accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options)(repos, settings);
+        const { accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, options)(repos, settings);
         // const payActionInObject: factory.assetTransaction.pay.IPayActionInObject = {
         //     actionStatus: payAction.actionStatus,
         //     id: payAction.id,

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

@@ -3,6 +3,7 @@ import type { ActionRepo } from '../../../repo/action';
 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 { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 type ICancelOperation<T> = (repos: {
@@ -10,6 +11,7 @@ type ICancelOperation<T> = (repos: {
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }, settings: Settings) => Promise<T>;

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

@@ -16,7 +16,9 @@ const cancelReservation_1 = require("../../reserve/cancelReservation");
  * 取引中止
  */
 function cancel(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         // まず取引状態変更
         const { id } = yield repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Reserve,
@@ -35,7 +37,7 @@ function cancel(params) {
                 id,
                 typeOf: factory.assetTransactionType.Reserve
             }
-        })(repos, settings);
+        })(repos);
     });
 }
 exports.cancel = cancel;

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

@@ -4,12 +4,14 @@ import type { ActionRepo } from '../../../repo/action';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderRepo } from '../../../repo/order';
 import type { ReservationRepo } from '../../../repo/reservation';
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 interface IConfirmRepo {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
 }
 type IConfirmOperation<T> = (repos: IConfirmRepo, settings: Settings) => Promise<T>;

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

@@ -17,7 +17,9 @@ const factory_1 = require("./confirm/factory");
  * 取引確定
  */
 function confirm(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
@@ -52,16 +54,14 @@ function confirm(params) {
             potentialActions }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string')
             ? { object: { underName } }
             : undefined));
-        if (settings.useAssetTransactionSyncProcessing) {
-            // sync対応(2023-01-13~)
-            yield (0, confirmReservation_1.confirmReservation)({
-                // optimize(2024-07-01~)
-                // actionAttributesList: potentialActions.reserve,
-                potentialReserveAction: { object: { reservationNumber: transaction.transactionNumber } },
-                useOnReservationConfirmed: true,
-                byTask: true
-            })(repos, settings);
-        }
+        // sync対応(2023-01-13~)
+        yield (0, confirmReservation_1.confirmReservation)({
+            // optimize(2024-07-01~)
+            // actionAttributesList: potentialActions.reserve,
+            potentialReserveAction: { object: { reservationNumber: transaction.transactionNumber } },
+            useOnReservationConfirmed: true,
+            byTask: true
+        })(repos);
     });
 }
 exports.confirm = confirm;

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

@@ -16,8 +16,10 @@ const factory = require("../../../factory");
  */
 function exportTasksById(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const { useAssetTransactionSyncProcessing } = settings;
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
+        // const { useAssetTransactionSyncProcessing } = settings;
         const transaction = yield repos.assetTransaction.findById({
             typeOf: factory.assetTransactionType.Reserve,
             id: params.id
@@ -28,47 +30,37 @@ function exportTasksById(params) {
         let cancelPendingReservationTask;
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
-                // potentialActions依存を完全廃止(2024-07-01~)
-                // if (potentialActions !== undefined) {
-                //     if (Array.isArray(potentialActions.reserve) && potentialActions.reserve.length > 0) {
-                //     }
+                // if (!useAssetTransactionSyncProcessing) {
+                //     const reserveTask: factory.task.reserve.IAttributes = {
+                //         project: transaction.project,
+                //         name: factory.taskName.Reserve,
+                //         status: factory.taskStatus.Ready,
+                //         runsAt: new Date(), // なるはやで実行
+                //         remainingNumberOfTries: 10,
+                //         numberOfTried: 0,
+                //         executionResults: [],
+                //         data: { object: { reservationNumber: transaction.transactionNumber } } // optimize(2024-07-01~)
+                //     };
+                //     taskAttributes.push(reserveTask);
                 // }
-                if (!useAssetTransactionSyncProcessing) {
-                    const reserveTask = {
-                        project: transaction.project,
-                        name: factory.taskName.Reserve,
-                        status: factory.taskStatus.Ready,
-                        runsAt: new Date(),
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: { object: { reservationNumber: transaction.transactionNumber } } // optimize(2024-07-01~)
-                    };
-                    taskAttributes.push(reserveTask);
-                }
                 break;
             case factory.transactionStatusType.Canceled:
                 // sync対応(2023-01-13~)
-                if (!useAssetTransactionSyncProcessing) {
-                    // const cancelActionAttributes4canceled = createCancelPendingReservationAction({ transaction });
-                    // if (cancelActionAttributes4canceled !== undefined) {
-                    // }
-                    cancelPendingReservationTask = {
-                        project: transaction.project,
-                        name: factory.taskName.CancelPendingReservation,
-                        status: factory.taskStatus.Ready,
-                        runsAt: new Date(),
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: {
-                            // optimize(2024-07-01~)
-                            // actionAttributes: [cancelActionAttributes4canceled],
-                            purpose: { id: transaction.id, typeOf: transaction.typeOf }
-                        }
-                    };
-                    taskAttributes.push(cancelPendingReservationTask);
-                }
+                // if (!useAssetTransactionSyncProcessing) {
+                //     cancelPendingReservationTask = {
+                //         project: transaction.project,
+                //         name: factory.taskName.CancelPendingReservation,
+                //         status: factory.taskStatus.Ready,
+                //         runsAt: new Date(), // なるはやで実行
+                //         remainingNumberOfTries: 10,
+                //         numberOfTried: 0,
+                //         executionResults: [],
+                //         data: {
+                //             purpose: { id: transaction.id, typeOf: transaction.typeOf }
+                //         }
+                //     };
+                //     taskAttributes.push(cancelPendingReservationTask);
+                // }
                 break;
             case factory.transactionStatusType.Expired:
                 // const cancelActionAttributes = createCancelPendingReservationAction({ transaction });

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

@@ -2,6 +2,10 @@ import * as factory from '../../../../../factory';
 import { IMinimizedIndividualEvent } from '../../../../../factory/event';
 import { IAcceptedAddOn } from './price';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
+/**
+ * 確定時予約のITicket
+ */
+type IReservedTicket = Pick<factory.reservation.ITicket, 'identifier' | 'issuedBy' | 'ticketType' | 'ticketedSeat' | 'typeOf'>;
 declare function createReservedTicket(params: {
     id: string;
     acceptedOffer: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail;
@@ -14,7 +18,7 @@ declare function createReservedTicket(params: {
     screeningRoomSections?: factory.place.screeningRoomSection.IPlace[];
     availableSeatOffers: factory.place.seat.IPlaceWithOffer[];
     ticketOffer: factory.product.ITicketOffer;
-}): factory.reservation.ITicket;
+}): IReservedTicket;
 declare function validateAppliesToMovieTicket(params: {
     availableOffer: factory.unitPriceOffer.IUnitPriceOffer;
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
@@ -30,7 +34,7 @@ declare function createAdditionalProperty(params: {
  */
 declare function createAdditionalTicketText(params: {
     acceptedOffer: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail;
-    reservedTicket: factory.reservation.ITicket;
+    reservedTicket: IReservedTicket;
 }): string | undefined;
 declare function createReservation(params: {
     project: {
@@ -39,7 +43,7 @@ declare function createReservation(params: {
     };
     id: string;
     reservationFor: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
-    reservedTicket: factory.reservation.ITicket;
+    reservedTicket: IReservedTicket;
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     additionalTicketText?: string;
     ticketOffer: factory.product.ITicketOffer;

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

@@ -82,7 +82,9 @@ function createReservedTicket(params) {
         reservationFor: params.reservationFor,
         ticketedSeat
     });
-    return Object.assign({ dateIssued: params.dateIssued, identifier: ticketIdentifier, issuedBy,
+    return Object.assign({ 
+        // dateIssued: params.dateIssued, // discontinue(2024-12-03~)
+        identifier: ticketIdentifier, issuedBy,
         ticketType, typeOf: 'Ticket' }, (ticketedSeat !== undefined) ? { ticketedSeat } : {});
 }
 exports.createReservedTicket = createReservedTicket;

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

@@ -13,6 +13,7 @@ import type { ProductRepo } from '../../../repo/product';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { ProjectRepo } from '../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
+import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 interface IStartOperationRepos {
@@ -29,6 +30,7 @@ interface IStartOperationRepos {
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
     seat: SeatRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }

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

@@ -28,7 +28,7 @@ const ONE_MONTH_IN_DAYS = 31;
  * 取引開始
  */
 function start(params, options) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const now = new Date();
         const reservationNumber = params.transactionNumber;
@@ -70,7 +70,7 @@ function start(params, options) {
             stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd,
             // acceptedOffers4transactionObject,
             objectSubReservations
-        })(repos, settings);
+        })(repos);
         return {
             transaction: { id },
             objectSubReservations,
@@ -154,7 +154,9 @@ function createObjectAttributes(params, options) {
  * 予約追加
  */
 function addReservations(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         const reservationNumber = params.transaction.transactionNumber;
         const { event, reservationFor, objectSubReservations } = params;
         let lockedOfferRateLimitKeys = [];
@@ -197,7 +199,7 @@ function addReservations(params) {
             transaction: {
                 transactionNumber: reservationNumber
             }
-        })(repos, settings);
+        })(repos);
     });
 }
 /**

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

@@ -11,10 +11,9 @@ import type { MovieTheaterRepo } from '../repo/place/movieTheater';
 import type { ScreeningRoomRepo } from '../repo/place/screeningRoom';
 import type { ProjectRepo } from '../repo/project';
 import type { SellerRepo } from '../repo/seller';
+import type { SettingRepo } from '../repo/setting';
 import type { TaskRepo } from '../repo/task';
 import * as factory from '../factory';
-import { Settings } from '../settings';
-import { createEvent } from './event/createEvent';
 interface IImportFromCOAParams {
     project: {
         id: string;
@@ -85,6 +84,7 @@ export declare function updateEvent4ttts(params: {
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     project: ProjectRepo;
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
-export { createEvent };
+}) => Promise<void>;
+export {};

package/lib/chevre/service/event.js

@@ -9,15 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEvent = exports.updateEvent4ttts = exports.createScreeningEventIdFromCOA = exports.minimizeSuperEvent = exports.importFromCOA = void 0;
+exports.updateEvent4ttts = exports.createScreeningEventIdFromCOA = exports.minimizeSuperEvent = exports.importFromCOA = void 0;
 const createDebug = require("debug");
 // @ts-ignore
 const difference = require("lodash.difference");
 // import { google } from 'googleapis';
 const moment = require("moment-timezone");
 const factory = require("../factory");
-const createEvent_1 = require("./event/createEvent");
-Object.defineProperty(exports, "createEvent", { enumerable: true, get: function () { return createEvent_1.createEvent; } });
+// import { Settings } from '../settings';
 const onEventChanged_1 = require("./offer/onEventChanged");
 const debug = createDebug('chevre-domain:service:event');
 /**
@@ -858,7 +857,9 @@ function createScreeningRoomFromCOA(project, seller, screenFromCOA) {
     };
 }
 function updateEvent4ttts(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         const actionAttributes = Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.actionType.UpdateAction, agent: params.agent, object: {
                 id: params.oldEventId,
                 typeOf: factory.eventType.ScreeningEvent
@@ -895,12 +896,9 @@ function updateEvent4ttts(params) {
             typeOf: factory.eventType.ScreeningEvent,
             isNew: false,
             useInform: true
-        })({
-            event: repos.event,
-            eventSeries: repos.eventSeries,
-            project: repos.project,
-            task: repos.task
-        }, settings);
+        })(repos
+        // settings
+        );
     });
 }
 exports.updateEvent4ttts = updateEvent4ttts;

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

@@ -16,6 +16,7 @@ import type { ProductRepo } from '../../../../repo/product';
 import type { ProductOfferRepo } from '../../../../repo/productOffer';
 import type { ProjectRepo } from '../../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
+import type { SettingRepo } from '../../../../repo/setting';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
 import type { TicketRepo } from '../../../../repo/ticket';
@@ -55,6 +56,7 @@ declare function processStartReserve4chevre(params: {
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
     seat: SeatRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     ticket: TicketRepo;
     assetTransaction: AssetTransactionRepo;