@chevre/domain 24.0.0-alpha.30 → 24.0.0-alpha.32

package/lib/chevre/repo/aggregateAction.js

@@ -187,7 +187,7 @@ class AggregateActionRepo {
                 'object.typeOf': {
                     $exists: true,
                     $in: [
-                        factory.reservationType.BusReservation,
+                        // factory.reservationType.BusReservation,
                         factory.reservationType.EventReservation,
                         factory.reservationType.ReservationPackage
                     ]

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

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
-type IDocType = (Omit<factory.reservation.IReservation<factory.reservationType.BusReservation>, 'id'> | Omit<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id'>) & {
+type IDocType = (Omit<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id'>) & {
     _id: string;
     bookingAgent?: any;
     previousReservationStatus?: factory.reservationStatusType;

package/lib/chevre/repo/order.js

@@ -949,7 +949,8 @@ class OrderRepo {
             typeOf: { $eq: factory.order.OrderType.Order },
             acceptedOffers: {
                 $elemMatch: {
-                    'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
+                    // 'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
+                    'itemOffered.typeOf': { $in: [factory.reservationType.EventReservation] },
                     'itemOffered.id': { $eq: params.reservationId }
                 }
             },

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

@@ -7,12 +7,10 @@ export interface IUpdatePartiallyParams {
 }
 export type ICancelResult = UpdateWriteOpResult;
 export type ICheckedInResult = UpdateWriteOpResult;
-export type ICreatingReservation<T extends factory.reservationType> = T extends factory.reservationType.BusReservation ? (Omit<factory.reservation.busReservation.IReservation, 'id'>) & {
-    _id: string;
-} : T extends factory.reservationType.EventReservation ? (Omit<factory.reservation.eventReservation.IReservation, 'id'>) & {
+export type ICreatingReservation<T extends factory.reservationType> = T extends factory.reservationType.EventReservation ? (Omit<factory.reservation.eventReservation.IReservation, 'id'>) & {
     _id: string;
 } : never;
-type IKeyOfProjection = keyof factory.reservation.IReservation<factory.reservationType.BusReservation | factory.reservationType.EventReservation> | 'reservedTicket.dateUsed' | 'reservationFor.id' | 'reservationFor.typeOf';
+type IKeyOfProjection = keyof factory.reservation.IReservation<factory.reservationType.EventReservation> | 'reservedTicket.dateUsed' | 'reservationFor.id' | 'reservationFor.typeOf';
 export type IAttendedReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id' | 'typeOf' | 'project' | 'modifiedTime'> & {
     reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
     reservedTicket: Pick<factory.reservation.ITicket, 'dateUsed'>;
@@ -23,7 +21,7 @@ export type IAttendedReservation = Pick<factory.reservation.IReservation<factory
 export declare class ReservationRepo {
     private readonly reservationModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.reservation.ISearchConditions<factory.reservationType>): FilterQuery<import("@chevre/factory/lib/reservation/busReservation").IReservation | import("@chevre/factory/lib/reservation/event").IReservation | import("@chevre/factory/lib/reservation/reservationPackage").IReservation>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.reservation.ISearchConditions<factory.reservationType>): FilterQuery<import("@chevre/factory/lib/reservation/event").IReservation | import("@chevre/factory/lib/reservation/reservationPackage").IReservation>[];
     /**
      * 汎用予約カウント
      */
@@ -126,23 +124,7 @@ export declare class ReservationRepo {
             $in: string[];
         };
     }): Promise<string[]>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<(Omit<import("@chevre/factory/lib/reservation/busReservation").IReservation, "id"> & {
-        _id: string;
-        bookingAgent?: any;
-        previousReservationStatus?: factory.reservationStatusType;
-    } & Required<{
-        _id: string;
-    }> & {
-        __v: number;
-    }) | (Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id"> & {
-        _id: string;
-        bookingAgent?: any;
-        previousReservationStatus?: factory.reservationStatusType;
-    } & Required<{
-        _id: string;
-    }> & {
-        __v: number;
-    }), "id"> & import("./mongoose/virtuals").IVirtuals, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<(Omit<import("@chevre/factory/lib/reservation/busReservation").IReservation, "id"> & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id"> & {
         _id: string;
         bookingAgent?: any;
         previousReservationStatus?: factory.reservationStatusType;
@@ -150,7 +132,7 @@ export declare class ReservationRepo {
         _id: string;
     }> & {
         __v: number;
-    }) | (Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id"> & {
+    }, "id"> & import("./mongoose/virtuals").IVirtuals, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id"> & {
         _id: string;
         bookingAgent?: any;
         previousReservationStatus?: factory.reservationStatusType;
@@ -158,7 +140,7 @@ export declare class ReservationRepo {
         _id: string;
     }> & {
         __v: number;
-    }), "id"> & import("./mongoose/virtuals").IVirtuals) | null>;
+    }, "id"> & import("./mongoose/virtuals").IVirtuals) | null>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/reservation.js

@@ -221,35 +221,41 @@ class ReservationRepo {
             });
         }
         switch (params.typeOf) {
-            case factory.reservationType.BusReservation:
-                const reservationForTypeOfEq = params.reservationFor?.typeOf;
-                if (typeof reservationForTypeOfEq === 'string') {
-                    andConditions.push({
-                        'reservationFor.typeOf': {
-                            $exists: true,
-                            $eq: reservationForTypeOfEq
-                        }
-                    });
-                }
-                const reservationForIdEq = params.reservationFor?.id?.$eq;
-                if (typeof reservationForIdEq === 'string') {
-                    andConditions.push({
-                        'reservationFor.id': {
-                            $exists: true,
-                            $eq: reservationForIdEq
-                        }
-                    });
-                }
-                const reservationForIdIn = params.reservationFor?.id?.$in;
-                if (Array.isArray(reservationForIdIn)) {
-                    andConditions.push({
-                        'reservationFor.id': {
-                            $exists: true,
-                            $in: reservationForIdIn
-                        }
-                    });
-                }
-                break;
+            // case factory.reservationType.BusReservation:
+            //     const reservationForTypeOfEq = params.reservationFor?.typeOf;
+            //     if (typeof reservationForTypeOfEq === 'string') {
+            //         andConditions.push(
+            //             {
+            //                 'reservationFor.typeOf': {
+            //                     $exists: true,
+            //                     $eq: reservationForTypeOfEq
+            //                 }
+            //             }
+            //         );
+            //     }
+            //     const reservationForIdEq = params.reservationFor?.id?.$eq;
+            //     if (typeof reservationForIdEq === 'string') {
+            //         andConditions.push(
+            //             {
+            //                 'reservationFor.id': {
+            //                     $exists: true,
+            //                     $eq: reservationForIdEq
+            //                 }
+            //             }
+            //         );
+            //     }
+            //     const reservationForIdIn = params.reservationFor?.id?.$in;
+            //     if (Array.isArray(reservationForIdIn)) {
+            //         andConditions.push(
+            //             {
+            //                 'reservationFor.id': {
+            //                     $exists: true,
+            //                     $in: reservationForIdIn
+            //                 }
+            //             }
+            //         );
+            //     }
+            //     break;
             case factory.reservationType.EventReservation:
                 if (typeof params.reservationFor?.id === 'string') {
                     andConditions.push({
@@ -876,25 +882,6 @@ class ReservationRepo {
             params.subReservation.forEach((subReservation) => {
                 let setOnInsert;
                 switch (subReservation.typeOf) {
-                    case factory.reservationType.BusReservation:
-                        setOnInsert = {
-                            ...subReservation,
-                            _id: subReservation.id,
-                            bookingTime: params.bookingTime,
-                            checkedIn: false,
-                            attended: false,
-                            issuedThrough: params.issuedThrough,
-                            project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                            reservationFor: params.reservationFor,
-                            reservationNumber: params.reservationNumber,
-                            reservationStatus: factory.reservationStatusType.ReservationConfirmed,
-                            modifiedTime,
-                            // providerを追加(2023-07-19~)
-                            provider: params.provider,
-                            ...(params.underName !== undefined) ? { underName: params.underName } : undefined,
-                            ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined
-                        };
-                        break;
                     case factory.reservationType.EventReservation:
                         setOnInsert = {
                             ...subReservation,

package/lib/chevre/repository.d.ts

@@ -91,7 +91,6 @@ import type { SettingRepo } from './repo/setting';
 import type { JWTSettingRepo } from './repo/setting/jwt';
 import type { StockHolderRepo } from './repo/stockHolder';
 import type { TaskRepo } from './repo/task';
-import type { TelemetryRepo } from './repo/telemetry';
 import type { TicketRepo } from './repo/ticket';
 import type { TransactionRepo } from './repo/transaction';
 import type { PlaceOrderRepo } from './repo/transaction/placeOrder';
@@ -509,10 +508,6 @@ export type Task = TaskRepo;
 export declare namespace Task {
     function createInstance(...params: ConstructorParameters<typeof TaskRepo>): Promise<TaskRepo>;
 }
-export type Telemetry = TelemetryRepo;
-export declare namespace Telemetry {
-    function createInstance(...params: ConstructorParameters<typeof TelemetryRepo>): Promise<TelemetryRepo>;
-}
 export type Ticket = TicketRepo;
 export declare namespace Ticket {
     function createInstance(...params: ConstructorParameters<typeof TicketRepo>): Promise<TicketRepo>;

package/lib/chevre/repository.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateAction = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedPaymentMethod = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = void 0;
+exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -1081,17 +1081,6 @@ var Task;
     }
     Task.createInstance = createInstance;
 })(Task || (exports.Task = Task = {}));
-var Telemetry;
-(function (Telemetry) {
-    let repo;
-    async function createInstance(...params) {
-        if (repo === undefined) {
-            repo = (await Promise.resolve().then(() => __importStar(require('./repo/telemetry')))).TelemetryRepo;
-        }
-        return new repo(...params);
-    }
-    Telemetry.createInstance = createInstance;
-})(Telemetry || (exports.Telemetry = Telemetry = {}));
 var Ticket;
 (function (Ticket) {
     let repo;

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

@@ -119,23 +119,7 @@ function createPotentialActions(params) {
             transaction.object.reservations.map((reservation) => {
                 // 最適化(2022-06-06~)
                 let cancelObject;
-                if (reservation.typeOf === factory.reservationType.BusReservation) {
-                    cancelObject = {
-                        typeOf: reservation.typeOf,
-                        id: reservation.id,
-                        issuedThrough: {
-                            typeOf: reservation.issuedThrough?.typeOf
-                        },
-                        reservationFor: {
-                            typeOf: reservation.reservationFor.typeOf,
-                            id: String(reservation.reservationFor.id)
-                        },
-                        reservationNumber: reservation.reservationNumber,
-                        // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
-                        reservationStatus: factory.reservationStatusType.ReservationConfirmed
-                    };
-                }
-                else if (reservation.typeOf === factory.reservationType.EventReservation) {
+                if (reservation.typeOf === factory.reservationType.EventReservation) {
                     cancelObject = {
                         typeOf: reservation.typeOf,
                         id: reservation.id,

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

@@ -393,46 +393,6 @@ function createReservation(params) {
         };
     }
     else {
-        return {
-            // project: params.project,
-            typeOf: factory.reservationType.BusReservation,
-            id: params.id,
-            // reservationPackage保管に移行(2023-06-06~)
-            // issuedThrough,
-            additionalProperty: params.additionalProperty,
-            // bookingTime: params.reserveDate,
-            // modifiedTime: params.reserveDate,
-            numSeats: 1,
-            price: price4reservation,
-            priceCurrency: factory.priceCurrency.JPY,
-            // reservationNumber: params.reservationNumber,
-            // statusは不要なので削除(2023-07-19~)
-            // reservationStatus: factory.reservationStatusType.ReservationPending,
-            reservedTicket: params.reservedTicket,
-            // underName: {
-            //     typeOf: params.agent.typeOf,
-            //     name: params.agent.name
-            // },
-            // checkedIn: false,
-            // attended: false,
-            ...(typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined,
-            ...(Array.isArray(params.subReservation))
-                ? {
-                    subReservation: params.subReservation.map((r) => {
-                        return {
-                            reservedTicket: {
-                                ticketedSeat: r.reservedTicket.ticketedSeat,
-                                typeOf: 'Ticket'
-                            }
-                        };
-                    })
-                }
-                : undefined,
-            // reservationPackage保管に移行(2023-06-06~)
-            // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
-            ...(typeof params.programMembershipUsed?.identifier === 'string')
-                ? { programMembershipUsed: params.programMembershipUsed }
-                : undefined
-        };
+        throw new factory.errors.NotImplemented(`reservationFor not implemented. typeOf:${params.reservationFor.typeOf}`);
     }
 }

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

@@ -144,16 +144,6 @@ function createIssuedThrough(params) {
         };
     }
     else {
-        const issuedThrough = {
-            typeOf: factory.product.ProductType.Transportation,
-            // 興行IDを追加(2022-09-08~)
-            id: eventOffers.itemOffered.id,
-            availableChannel,
-            // issuedThrough.serviceTypeを連携
-            ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
-        };
-        return {
-            issuedThrough
-        };
+        throw new factory.errors.NotImplemented(`reservationFor not implemented. typeOf:${params.reservationFor.typeOf}`);
     }
 }

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

@@ -499,11 +499,8 @@ function processLockOfferRateLimit(params) {
                         }
                     },
                     reservationFor: {
-                        startDate: (params.reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                            ? (0, moment_1.default)(params.reservationFor.startDate)
-                                .toDate()
-                            : (0, moment_1.default)(params.reservationFor.departureTime)
-                                .toDate()
+                        startDate: (0, moment_1.default)(params.reservationFor.startDate)
+                            .toDate()
                     },
                     reservationNumber: params.reservationNumber
                 };

package/lib/chevre/service/delivery/factory.js

@@ -55,7 +55,6 @@ function createOwnershipInfosFromOrder(params) {
         const ownedBy = createOwnedby(params);
         const itemOfferedType = itemOffered.typeOf;
         switch (itemOfferedType) {
-            case factory.reservationType.BusReservation:
             case factory.reservationType.EventReservation:
                 const excludeCOAReservation = acceptedOffer.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
                 if (excludeCOAReservation) {

package/lib/chevre/service/delivery/reservation/factory.js

@@ -39,10 +39,6 @@ function createReservationOwnershipInfo(params) {
         ownedThrough = (0, moment_timezone_1.default)(itemOffered.reservationFor.endDate)
             .toDate();
     }
-    else if (itemOffered.typeOf === factory.reservationType.BusReservation) {
-        ownedThrough = (0, moment_timezone_1.default)(itemOffered.reservationFor.arrivalTime)
-            .toDate();
-    }
     else {
         throw new factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`);
     }
@@ -63,15 +59,14 @@ function createReservationOwnershipInfo(params) {
             bookingService: bookingService,
             ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
         };
-    }
-    else if (itemOffered.typeOf === factory.reservationType.BusReservation) {
-        typeOfGood = {
-            typeOf: itemOffered.typeOf,
-            id: itemOffered.id,
-            reservationNumber: itemOffered.reservationNumber,
-            bookingService: bookingService,
-            ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
-        };
+        // } else if (itemOffered.typeOf === factory.reservationType.BusReservation) {
+        //     typeOfGood = {
+        //         typeOf: itemOffered.typeOf,
+        //         id: itemOffered.id,
+        //         reservationNumber: itemOffered.reservationNumber,
+        //         bookingService: bookingService,
+        //         ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
+        //     };
     }
     else {
         throw new factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`);

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

@@ -407,44 +407,6 @@ function createReservation(params) {
                 : undefined
         };
     }
-    else if (itemOffered.typeOf === factory.reservationType.BusReservation
-        && event.typeOf === factory.tripType.BusTrip) {
-        // const tripByEvent = event.offers?.itemOffered.serviceOutput?.reservationFor;
-        // if (typeof tripByEvent?.typeOf !== 'string') {
-        //     throw new factory.errors.NotFound('event.offers.itemOffered.serviceOutput.reservationFor');
-        // }
-        const reservationFor = {
-            typeOf: event.typeOf,
-            id: event.id,
-            arrivalBusStop: event.arrivalBusStop,
-            departureBusStop: event.departureBusStop,
-            name: event.name,
-            departureTime: (0, moment_1.default)(event.departureTime)
-                .toDate(),
-            arrivalTime: (0, moment_1.default)(event.arrivalTime)
-                .toDate(),
-            busName: event.busName,
-            busNumber: event.busNumber,
-            identifier: event.identifier
-        };
-        if (params.issuedThrough.typeOf !== factory.product.ProductType.Transportation) {
-            throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.Transportation}`);
-        }
-        reservationItem = {
-            typeOf: itemOffered.typeOf,
-            additionalProperty: itemOffered.additionalProperty,
-            additionalTicketText: itemOffered.additionalTicketText,
-            id: itemOffered.id,
-            issuedThrough: params.issuedThrough,
-            reservationNumber: params.reservationNumber,
-            reservationFor,
-            reservedTicket,
-            // 使用メンバーシップがあれば追加
-            ...(typeof itemOffered.programMembershipUsed?.typeOf === 'string')
-                ? { programMembershipUsed: itemOffered.programMembershipUsed }
-                : undefined
-        };
-    }
     else {
         throw new factory.errors.Argument('itemOffered');
     }

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

@@ -1,6 +1,5 @@
 import * as factory from '../../../../factory';
 import { Settings } from '../../../../settings';
-import type { ActionRepo } from '../../../../repo/action';
 import type { AdvanceBookingRequirementRepo } from '../../../../repo/advanceBookingRequirement';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
@@ -51,7 +50,6 @@ declare function processStartReserve4chevre(params: {
      */
     maxReservationGracePeriodInDays: number;
 }): (repos: {
-    action: ActionRepo;
     advanceBookingRequirement: AdvanceBookingRequirementRepo;
     authorization: AuthorizationRepo;
     stockHolder: StockHolderRepo;

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

@@ -1,6 +1,6 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AdvanceBookingRequirementRepo } from '../../../repo/advanceBookingRequirement';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
@@ -29,7 +29,8 @@ import type { TicketRepo } from '../../../repo/ticket';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
-    action: ActionRepo;
+    action?: never;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
     advanceBookingRequirement: AdvanceBookingRequirementRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
@@ -98,4 +99,4 @@ declare function authorize(params: {
 }, options: IAuthorizeOptions): IAuthorizeOperation<Pick<IAuthorizeOfferAction, 'id'> & {
     result: IAuthorizeOfferAction['result'];
 }>;
-export { authorize };
+export { IAuthorizeRepos, authorize };

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

@@ -63,7 +63,7 @@ function authorize(params, options) {
             event, transaction,
             instrument: { transactionNumber }
         });
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.authorizeOfferAction.start(actionAttributes);
         try {
             const processStartReserveResult = await (0, processStartReserve4chevre_1.processStartReserve4chevre)({
                 acceptedOffers, event,
@@ -92,7 +92,7 @@ function authorize(params, options) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.authorizeOfferAction.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -100,7 +100,7 @@ function authorize(params, options) {
             throw error;
         }
         const result = (0, factory_1.acceptedOffers2authorizeResult)({ acceptedOffers, acceptedOffers4result, noOfferSpecified, ticketOffers });
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        await repos.authorizeOfferAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id, result };
     };
 }
@@ -329,24 +329,24 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                 };
             }
             switch (typeOf) {
-                case factory.reservationType.BusReservation:
-                    const serviceOutputAsBusReservation = {
-                        typeOf,
-                        ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
-                        ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
-                        ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
-                        ...(Array.isArray(subReservation)) ? { subReservation } : undefined,
-                        ...(reservedTicket !== undefined) ? {
-                            reservedTicket: {
-                                typeOf: 'Ticket',
-                                // チケット識別子指定拡張(2024-04-15~)
-                                ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
-                                ...(typeof ticketedSeat?.typeOf === 'string') ? { ticketedSeat } : undefined
-                            }
-                        } : undefined
-                    };
-                    itemOfferedServiceOutput = serviceOutputAsBusReservation;
-                    break;
+                // case factory.reservationType.BusReservation:
+                //     const serviceOutputAsBusReservation: factory.assetTransaction.reserve.IBusReservatonAsItemOfferedServiceOutput = {
+                //         typeOf,
+                //         ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
+                //         ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
+                //         ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
+                //         ...(Array.isArray(subReservation)) ? { subReservation } : undefined,
+                //         ...(reservedTicket !== undefined) ? {
+                //             reservedTicket: {
+                //                 typeOf: 'Ticket',
+                //                 // チケット識別子指定拡張(2024-04-15~)
+                //                 ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
+                //                 ...(typeof ticketedSeat?.typeOf === 'string') ? { ticketedSeat } : undefined
+                //             }
+                //         } : undefined
+                //     };
+                //     itemOfferedServiceOutput = serviceOutputAsBusReservation;
+                //     break;
                 case factory.reservationType.EventReservation:
                     const serviceOutputAsEventReservation = {
                         typeOf,
@@ -366,6 +366,7 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                     itemOfferedServiceOutput = serviceOutputAsEventReservation;
                     break;
                 default:
+                    throw new factory.errors.NotImplemented(`serviceOutput not implemented. typeOf:${typeOf}`);
                 // no op
             }
         }

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

@@ -3,6 +3,7 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import type { ActionRepo } from '../../../repo/action';
 import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
@@ -14,6 +15,7 @@ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IVoidTransactionRepos {
     action: ActionRepo;
     acceptCOAOfferAction: AcceptCOAOfferActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;

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

@@ -2,6 +2,7 @@ import type * as COA from '@motionpicture/coa-service';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
@@ -11,7 +12,11 @@ import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IVoidTransactionByActionIdRepos {
+    /**
+     * CancelAction開始で使用される
+     */
     action: ActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;

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

@@ -50,13 +50,13 @@ function voidTransactionByActionId(params) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
         const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.purpose.id });
-        const action = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        const action = await repos.authorizeOfferAction.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
         // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
-        await repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
+        await repos.authorizeOfferAction.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
         // add orderInTransaction(2024-01-15~)
         // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
         // const orderNumberByTransaction = transaction.object.orderNumber;

package/lib/chevre/service/order/deleteOrder.js

@@ -119,7 +119,7 @@ function deleteReservationsByOrder(order) {
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: order.project.id } },
             acceptedOffers: {
-                itemOffered: { typeOf: { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] } }
+                itemOffered: { typeOf: { $in: [factory.reservationType.EventReservation] } }
             }
         });
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));