@chevre/domain 28.0.0-alpha.1 → 28.0.0-alpha.11

package/lib/chevre/repo/transaction/placeOrder.js

@@ -21,9 +21,9 @@ const AVAILABLE_PROJECT_FIELDS = [
     'endDate',
     'instrument',
     'result',
-    'potentialActions',
+    // 'potentialActions', // discontinue(2026-09-14~)
     // 'recipient',
-    'error',
+    // 'error', // discontinue(2026-09-14~)
     'tasksExportAction',
 ];
 /**
@@ -35,17 +35,17 @@ class PlaceOrderRepo {
         this.transactionModel = connection.model(transaction_2.modelName, (0, transaction_2.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        if (params.typeOf !== factory_1.factory.transactionType.PlaceOrder) {
-            throw new factory_1.factory.errors.Argument('typeOf', `must be ${factory_1.factory.transactionType.PlaceOrder}`);
-        }
+        // if (params.typeOf !== factory.transactionType.PlaceOrder) {
+        //     throw new factory.errors.Argument('typeOf', `must be ${factory.transactionType.PlaceOrder}`);
+        // }
         const andConditions = [];
         const projectIdEq = params.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        if (typeof params.typeOf === 'string') {
-            andConditions.push({ typeOf: { $eq: params.typeOf } });
-        }
+        // if (typeof params.typeOf === 'string') {
+        //     andConditions.push({ typeOf: { $eq: params.typeOf } });
+        // }
         if (params.startFrom !== undefined) {
             andConditions.push({
                 startDate: { $gte: params.startFrom }
@@ -56,22 +56,22 @@ class PlaceOrderRepo {
                 startDate: { $lte: params.startThrough }
             });
         }
-        if (params.endFrom !== undefined) {
-            andConditions.push({
-                endDate: {
-                    $exists: true,
-                    $gte: params.endFrom
-                }
-            });
-        }
-        if (params.endThrough !== undefined) {
-            andConditions.push({
-                endDate: {
-                    $exists: true,
-                    $lt: params.endThrough
-                }
-            });
-        }
+        // if (params.endFrom !== undefined) {
+        //     andConditions.push({
+        //         endDate: {
+        //             $exists: true,
+        //             $gte: params.endFrom
+        //         }
+        //     });
+        // }
+        // if (params.endThrough !== undefined) {
+        //     andConditions.push({
+        //         endDate: {
+        //             $exists: true,
+        //             $lt: params.endThrough
+        //         }
+        //     });
+        // }
         if (Array.isArray(params.ids)) {
             andConditions.push({
                 _id: { $in: params.ids }
@@ -84,56 +84,23 @@ class PlaceOrderRepo {
         if (Array.isArray(statusIn)) {
             andConditions.push({ status: { $in: statusIn } });
         }
-        if (params.agent !== undefined) {
-            if (params.agent.typeOf !== undefined) {
-                andConditions.push({
-                    'agent.typeOf': {
-                        $exists: true,
-                        $eq: params.agent.typeOf
-                    }
-                });
-            }
-            if (Array.isArray(params.agent.ids)) {
-                andConditions.push({
-                    'agent.id': {
-                        $exists: true,
-                        $in: params.agent.ids
-                    }
-                });
-            }
-            if (Array.isArray(params.agent.identifiers)) {
-                andConditions.push({
-                    'agent.identifier': {
-                        $exists: true,
-                        $in: params.agent.identifiers
-                    }
-                });
-            }
-        }
-        const tasksExportActionStatusIn = params.tasksExportAction?.actionStatus?.$in;
-        if (Array.isArray(tasksExportActionStatusIn)) {
-            andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $in: tasksExportActionStatusIn } });
-        }
-        const tasksExportActionStatusEq = params.tasksExportAction?.actionStatus?.$eq;
-        if (typeof tasksExportActionStatusEq === 'string') {
-            andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $eq: tasksExportActionStatusEq } });
+        const agentIdentifierIn = params.agent?.identifiers;
+        if (Array.isArray(agentIdentifierIn)) {
+            andConditions.push({ 'agent.identifier': { $exists: true, $in: agentIdentifierIn } });
         }
+        // discontinue(2026-09-11~)
+        // const tasksExportActionStatusIn = params.tasksExportAction?.actionStatus?.$in;
+        // if (Array.isArray(tasksExportActionStatusIn)) {
+        //     andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $in: tasksExportActionStatusIn } });
+        // }
+        // const tasksExportActionStatusEq = params.tasksExportAction?.actionStatus?.$eq;
+        // if (typeof tasksExportActionStatusEq === 'string') {
+        //     andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $eq: tasksExportActionStatusEq } });
+        // }
         const sellerIdIn = params.seller?.ids;
         if (Array.isArray(sellerIdIn)) {
             andConditions.push({ 'seller.id': { $exists: true, $in: sellerIdIn } });
         }
-        // result.orderは完全に廃止したので検索条件としても廃止(2026-06-26~)
-        // const resultOrderNumberIn = params.result?.order?.orderNumbers;
-        // if (Array.isArray(resultOrderNumberIn)) {
-        //     andConditions.push({ 'result.order.orderNumber': { $exists: true, $in: resultOrderNumberIn } });
-        // }
-        // result.orderは完全に廃止したので検索条件としても廃止(2026-06-26~)
-        // const resultOrderConfirmationNumberEq = params.result?.order?.confirmationNumber?.$eq;
-        // if (typeof resultOrderConfirmationNumberEq === 'string') {
-        //     andConditions.push({
-        //         'result.order.confirmationNumber': { $exists: true, $eq: resultOrderConfirmationNumberEq }
-        //     });
-        // }
         const objectOrderNumberEq = params.object?.orderNumber?.$eq;
         if (typeof objectOrderNumberEq === 'string') {
             andConditions.push({ 'object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });
@@ -186,62 +153,12 @@ class PlaceOrderRepo {
             .lean()
             .exec();
     }
-    // /**
-    //  * 取引の注文番号を検索する
-    //  */
-    // public async findInProgressOrderNumberById(params: {
-    //     id: string;
-    // }): Promise<string | undefined> {
-    //     const doc = await this.transactionModel.findOne(
-    //         {
-    //             _id: { $eq: params.id },
-    //             typeOf: { $eq: factory.transactionType.PlaceOrder },
-    //             status: { $eq: factory.transactionStatusType.InProgress }
-    //         },
-    //         { 'object.orderNumber': 1 }
-    //     )
-    //         .lean<{ object: Pick<factory.transaction.placeOrder.IObject, 'orderNumber'> }>() // 2024-08-26~
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound(
-    //             this.transactionModel.modelName,
-    //             `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`
-    //         );
-    //     }
-    //     return doc.object.orderNumber;
-    // }
-    // /**
-    //  * 取引の確認番号を検索する
-    //  */
-    // public async findInProgressConfirmationNumberById(params: {
-    //     id: string;
-    //     status: { $in: factory.transactionStatusType[] };
-    // }): Promise<string | undefined> {
-    //     const doc = await this.transactionModel.findOne(
-    //         {
-    //             _id: { $eq: params.id },
-    //             typeOf: { $eq: factory.transactionType.PlaceOrder },
-    //             status: { $in: params.status.$in }
-    //         },
-    //         { 'object.confirmationNumber': 1 }
-    //     )
-    //         .lean<{ object: Pick<factory.transaction.placeOrder.IObject, 'confirmationNumber'> }>() // 2024-08-26~
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound(
-    //             this.transactionModel.modelName,
-    //             `${factory.transactionType.PlaceOrder} ${params.status.$in.join(' or ')} not found`
-    //         );
-    //     }
-    //     return doc.object.confirmationNumber;
-    // }
     /**
      * 取引期限変更
      */
     async updateExpires(params) {
         const doc = await this.transactionModel.findOneAndUpdate({
             _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf },
             status: { $eq: factory_1.factory.transactionStatusType.InProgress }
         }, {
             $set: {
@@ -253,7 +170,7 @@ class PlaceOrderRepo {
             .lean()
             .exec();
         if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory_1.factory.transactionStatusType.InProgress} not found`);
+            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${factory_1.factory.transactionType.PlaceOrder} ${factory_1.factory.transactionStatusType.InProgress} not found`);
         }
     }
     /**
@@ -303,7 +220,6 @@ class PlaceOrderRepo {
         };
         const filter = {
             _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf },
             status: { $eq: factory_1.factory.transactionStatusType.InProgress },
             // expiresを条件に追加(2023-05-12~),
             expires: { $gt: new Date() }
@@ -312,7 +228,7 @@ class PlaceOrderRepo {
             .lean()
             .exec();
         if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory_1.factory.transactionStatusType.InProgress} not found`);
+            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${factory_1.factory.transactionType.PlaceOrder} ${factory_1.factory.transactionStatusType.InProgress} not found`);
         }
         return doc;
     }
@@ -334,13 +250,12 @@ class PlaceOrderRepo {
             ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
         };
         const doc = await this.transactionModel.findOne({
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf }
+            _id: { $eq: params.id }
         }, projection)
             .lean() // 2024-08-26~
             .exec();
         if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} not found`);
+            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${factory_1.factory.transactionType.PlaceOrder} not found`);
         }
         return doc;
     }
@@ -353,7 +268,7 @@ class PlaceOrderRepo {
         // const tasksExportationStatus = factory.transactionTasksExportationStatus.Unexported; // discontinue(2024-06-20~)
         const startDate = new Date();
         let expires;
-        const { typeOf } = params;
+        const typeOf = factory_1.factory.transactionType.PlaceOrder;
         // expiresInSecondsの指定があれば優先して適用する(2022-11-25~)
         if (typeof params.expiresInSeconds === 'number' && params.expiresInSeconds > 0) {
             expires = (0, moment_1.default)(startDate)
@@ -363,18 +278,12 @@ class PlaceOrderRepo {
         else {
             throw new factory_1.factory.errors.ArgumentNull('expiresInSeconds');
         }
-        let creatingTransaction;
-        if (typeOf === factory_1.factory.transactionType.PlaceOrder) {
-            const { agent, project, object, seller, instrument } = params;
-            creatingTransaction = {
-                status, startDate, expires, typeOf, tasksExportAction,
-                agent, project, seller, object,
-                ...(typeof instrument?.id === 'string') ? { instrument } : undefined
-            };
-        }
-        else {
-            throw new factory_1.factory.errors.NotImplemented(`${typeOf} not implemented`);
-        }
+        const { agent, project, object, seller, instrument } = params;
+        const creatingTransaction = {
+            status, startDate, expires, typeOf, tasksExportAction,
+            agent, project, seller, object,
+            ...(typeof instrument?.id === 'string') ? { instrument } : undefined
+        };
         // reimplemnt with insertMany(2024-05-30~)
         const result = await this.transactionModel.insertMany(creatingTransaction, { rawResult: true });
         const id = result.insertedIds?.[0]?.toHexString();
@@ -392,7 +301,6 @@ class PlaceOrderRepo {
         const endDate = new Date();
         const doc = await this.transactionModel.findOneAndUpdate({
             _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf },
             status: { $eq: factory_1.factory.transactionStatusType.InProgress },
             expires: { $gt: endDate } // add expires(2025-02-27~)
         }, {
@@ -402,7 +310,7 @@ class PlaceOrderRepo {
             'object.orderNumber': params.object.orderNumber, // add(2026-06-27~)
             'object.confirmationNumber': params.object.confirmationNumber, // add(2026-07-08~)
             result: params.result, // resultを更新
-            ...((params.potentialActions !== undefined) && { potentialActions: params.potentialActions }) // support undefined(2026-07-17~)
+            // ...((params.potentialActions !== undefined) && { potentialActions: params.potentialActions }) // support undefined(2026-07-17~)
         }, {
             new: true,
             projection: { _id: 1 }
@@ -411,7 +319,7 @@ class PlaceOrderRepo {
             .exec();
         // NotFoundであれば取引状態確認
         if (doc === null) {
-            const { expires, status } = await this.findPlaceOrderById({ typeOf: params.typeOf, id: params.id }, ['expires', 'status']);
+            const { expires, status } = await this.findPlaceOrderById({ id: params.id }, ['expires', 'status']);
             if (status === factory_1.factory.transactionStatusType.Confirmed) {
                 // すでに確定済の場合スルー
             }
@@ -426,12 +334,12 @@ class PlaceOrderRepo {
                     .isSameOrBefore((0, moment_1.default)(endDate))) {
                     throw new factory_1.factory.errors.Argument('Transaction id', 'potentially expired');
                 }
-                throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory_1.factory.transactionStatusType.InProgress} not found`);
+                throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${factory_1.factory.transactionType.PlaceOrder} ${factory_1.factory.transactionStatusType.InProgress} not found`);
             }
         }
         transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
             id: params.id,
-            typeOf: params.typeOf,
+            typeOf: factory_1.factory.transactionType.PlaceOrder,
             status: factory_1.factory.transactionStatusType.Confirmed
         });
     }
@@ -442,7 +350,6 @@ class PlaceOrderRepo {
         const endDate = new Date();
         // 進行中ステータスの取引を中止する
         const doc = await this.transactionModel.findOneAndUpdate({
-            typeOf: params.typeOf,
             _id: params.id,
             status: factory_1.factory.transactionStatusType.InProgress
         }, {
@@ -467,12 +374,12 @@ class PlaceOrderRepo {
                 throw new factory_1.factory.errors.Argument('Transaction id', 'Confirmed transaction unable to cancel');
             }
             else {
-                throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory_1.factory.transactionStatusType.InProgress} not found`);
+                throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${factory_1.factory.transactionType.PlaceOrder} ${factory_1.factory.transactionStatusType.InProgress} not found`);
             }
         }
         transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
             id: params.id,
-            typeOf: params.typeOf,
+            typeOf: factory_1.factory.transactionType.PlaceOrder,
             status: factory_1.factory.transactionStatusType.Canceled
         });
     }

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

@@ -15,7 +15,7 @@ export declare class ReturnOrderInProgressRepo {
     /**
      * 取引を開始する
      */
-    startReturnOrder(params: factory.transaction.returnOrder.IStartParams): Promise<IStartedTransaction>;
+    startReturnOrder(params: Pick<factory.transaction.returnOrder.IStartParams, 'agent' | 'expiresInSeconds' | 'object' | 'project' | 'typeOf'>): Promise<IStartedTransaction>;
     findReturnOrderById(params: {
         id: string;
     }): Promise<IReturnOrderAsFindResult>;

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

@@ -26,7 +26,7 @@ export declare class TransactionRepo {
             endDate?: factory.sortType;
             startDate?: factory.sortType;
         };
-    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | null>;
+    }): Promise<Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf'> | null>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

package/lib/chevre/repo/transaction.js

@@ -30,7 +30,6 @@ class TransactionRepo {
             throw new factory_1.factory.errors.Argument('endDate.$lt', 'must be Date');
         }
         const query = this.transactionModel.findOneAndUpdate({
-            // ...(Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined,
             status: {
                 ...(typeof statusEq === 'string')
                     ? { $eq: statusEq }

package/lib/chevre/repository.d.ts

@@ -28,6 +28,7 @@ import type { AdminAssetTransactionRepo } from './repo/adminAssetTransaction';
 import type { AdminCheckMovieTicketActionRepo } from './repo/adminCheckMovieTicketAction';
 import type { AdminAsyncActionRepo } from './repo/adminAsyncAction';
 import type { AdminEventRepo } from './repo/adminEvent';
+import type { AdminEventSeriesRepo } from './repo/adminEventSeries';
 import type { AdminPendingReservationRepo } from './repo/adminPendingReservation';
 import type { AdminScheduledTaskRepo } from './repo/adminScheduledTask';
 import type { AdminTaskRepo } from './repo/adminTask';
@@ -79,7 +80,7 @@ import type { PaymentServiceChannelRepo } from './repo/paymentServiceChannel';
 import type { PaymentServiceProviderRepo } from './repo/paymentServiceProvider';
 import type { PendingReservationRepo } from './repo/pendingReservation';
 import type { EntranceGateRepo } from './repo/place/entranceGate';
-import type { HasPOSRepo } from './repo/place/hasPOS';
+import type { POSRepo } from './repo/place/pos';
 import type { MovieTheaterRepo } from './repo/place/movieTheater';
 import type { ScreeningRoomRepo } from './repo/place/screeningRoom';
 import type { SeatRepo } from './repo/place/seat';
@@ -226,6 +227,10 @@ export type AdminEvent = AdminEventRepo;
 export declare namespace AdminEvent {
     function createInstance(...params: ConstructorParameters<typeof AdminEventRepo>): Promise<AdminEventRepo>;
 }
+export type AdminEventSeries = AdminEventSeriesRepo;
+export declare namespace AdminEventSeries {
+    function createInstance(...params: ConstructorParameters<typeof AdminEventSeriesRepo>): Promise<AdminEventSeriesRepo>;
+}
 export type AdminPendingReservation = AdminPendingReservationRepo;
 export declare namespace AdminPendingReservation {
     function createInstance(...params: ConstructorParameters<typeof AdminPendingReservationRepo>): Promise<AdminPendingReservationRepo>;
@@ -448,12 +453,12 @@ export declare namespace place {
     namespace EntranceGate {
         function createInstance(...params: ConstructorParameters<typeof EntranceGateRepo>): Promise<EntranceGateRepo>;
     }
-    type HasPOS = HasPOSRepo;
+    type POS = POSRepo;
     /**
-     * 施設PointOfSalesリポジトリ
+     * 施設のPOSリポジトリ
      */
-    namespace HasPOS {
-        function createInstance(...params: ConstructorParameters<typeof HasPOSRepo>): Promise<HasPOSRepo>;
+    namespace POS {
+        function createInstance(...params: ConstructorParameters<typeof POSRepo>): Promise<POSRepo>;
     }
     type MovieTheater = MovieTheaterRepo;
     /**

package/lib/chevre/repository.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateEvent = exports.AggregateAssetTransaction = exports.AggregateTransaction = exports.AggregateTask = exports.AggregateScheduledTask = exports.AggregateUseAction = exports.AggregateCheckMovieTicketAction = exports.AggregateAction = exports.AdminTransaction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminPendingReservation = exports.AdminEvent = exports.AdminAsyncAction = exports.AdminAssetTransaction = exports.AdminCheckMovieTicketAction = exports.AdminAction = exports.AdminAcceptedOffer = exports.AdminAccountingReport = exports.AdditionalProperty = exports.action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.TaskDelayed = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = void 0;
+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.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateEvent = exports.AggregateAssetTransaction = exports.AggregateTransaction = exports.AggregateTask = exports.AggregateScheduledTask = exports.AggregateUseAction = exports.AggregateCheckMovieTicketAction = exports.AggregateAction = exports.AdminTransaction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminPendingReservation = exports.AdminEventSeries = exports.AdminEvent = exports.AdminAsyncAction = exports.AdminAssetTransaction = exports.AdminCheckMovieTicketAction = exports.AdminAction = exports.AdminAcceptedOffer = exports.AdminAccountingReport = exports.AdditionalProperty = exports.action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
+exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.TaskDelayed = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -291,6 +291,17 @@ var AdminEvent;
     }
     AdminEvent.createInstance = createInstance;
 })(AdminEvent || (exports.AdminEvent = AdminEvent = {}));
+var AdminEventSeries;
+(function (AdminEventSeries) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/adminEventSeries.js')).AdminEventSeriesRepo;
+        }
+        return new repo(...params);
+    }
+    AdminEventSeries.createInstance = createInstance;
+})(AdminEventSeries || (exports.AdminEventSeries = AdminEventSeries = {}));
 var AdminPendingReservation;
 (function (AdminPendingReservation) {
     let repo;
@@ -894,19 +905,19 @@ var place;
         EntranceGate.createInstance = createInstance;
     })(EntranceGate = place.EntranceGate || (place.EntranceGate = {}));
     /**
-     * 施設PointOfSalesリポジトリ
+     * 施設のPOSリポジトリ
      */
-    let HasPOS;
-    (function (HasPOS) {
+    let POS;
+    (function (POS) {
         let repo;
         async function createInstance(...params) {
             if (repo === undefined) {
-                repo = (await import('./repo/place/hasPOS.js')).HasPOSRepo;
+                repo = (await import('./repo/place/pos.js')).POSRepo;
             }
             return new repo(...params);
         }
-        HasPOS.createInstance = createInstance;
-    })(HasPOS = place.HasPOS || (place.HasPOS = {}));
+        POS.createInstance = createInstance;
+    })(POS = place.POS || (place.POS = {}));
     /**
      * 施設リポジトリ
      */

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

@@ -22,8 +22,7 @@ function aggregateOffers(params) {
         const eventCapacity = (await repos.event.projectEventFields({
             limit: 1,
             page: 1,
-            id: { $eq: params.id },
-            typeOf: params.typeOf
+            id: { $eq: params.id }
         }, ['maximumAttendeeCapacity', 'remainingAttendeeCapacity'])).shift();
         debug('processing aggregateOffersByEvent...', eventCapacity);
         await aggregateOffersByEvent({

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

@@ -53,7 +53,6 @@ function aggregateScreeningEvent(params) {
                         limit: 100,
                         page: 1,
                         project: { id: { $eq: event.project.id } },
-                        typeOf: event.typeOf,
                         eventStatuses: [factory_1.factory.eventStatusType.EventScheduled],
                         startFrom: startFrom,
                         startThrough: startThrough,

package/lib/chevre/service/aggregation/system.js

@@ -137,8 +137,7 @@ function aggregatePlaceOrder(params) {
             const aggregateResult = await repos.aggregateTransaction.aggregatePlaceOrder({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
-                startThrough,
-                typeOf: factory_1.factory.transactionType.PlaceOrder
+                startThrough
             });
             debug('aggregatePlaceOrder:result', aggregateResult, aggregateResult.statuses[0]?.aggregation, startFrom);
             const aggregateResultsByClientId = [];
@@ -148,7 +147,6 @@ function aggregatePlaceOrder(params) {
                         project: { id: { $ne: params.excludedProjectId } },
                         startFrom,
                         startThrough,
-                        typeOf: factory_1.factory.transactionType.PlaceOrder,
                         clientId
                     });
                     debug('aggregateResultByClientId', aggregateResultByClientId, aggregateResultByClientId.statuses[0]?.aggregation, clientId, startFrom);

package/lib/chevre/service/assetTransaction/pay/start/preStart/validateAcceptedPaymentMethodIfNeeded.js

@@ -81,8 +81,7 @@ function validateAcceptedPaymentMethodIfNeeded(params
             const eventSeriesIds = (await repos.event.projectEventFields({
                 limit: checkingEventIds.length,
                 page: 1,
-                id: { $in: checkingEventIds },
-                typeOf: factory_1.factory.eventType.ScreeningEvent
+                id: { $in: checkingEventIds }
             }, ['superEvent'])).map((event) => event.superEvent.id);
             if (eventSeriesIds.length !== checkingEventIds.length) {
                 throw new factory_1.factory.errors.NotFound(factory_1.factory.eventType.ScreeningEvent);

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

@@ -1,7 +1,7 @@
 import type { COA } from '@motionpicture/coa-service';
 import type { CategoryCodeRepo } from '../../repo/categoryCode';
 import type { CreativeWorkRepo } from '../../repo/creativeWork';
-import type { EventSeriesRepo } from '../../repo/eventSeries';
+import type { AdminEventSeriesRepo } from '../../repo/adminEventSeries';
 import { factory } from '../../factory';
 type IMovieTheater = Pick<factory.place.movieTheater.IPlace, 'id' | 'typeOf' | 'branchCode' | 'name' | 'kanaName'>;
 /**
@@ -46,7 +46,7 @@ declare function saveScreeningEventSeries(params: {
 }): (repos: {
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
-    eventSeries: EventSeriesRepo;
+    adminEventSeries: AdminEventSeriesRepo;
     masterService: COA.service.Master;
 }) => Promise<{
     screeningEventSerieses: factory.eventSeries.IEvent[];

package/lib/chevre/service/event/saveScreeningEventSeries.js

@@ -121,7 +121,7 @@ function saveScreeningEventSeries(params, options) {
                 });
             }
             debug('saving', saveParams.length, 'ScreeningEventSeries...');
-            await repos.eventSeries.upsertManyEventSeriesById4sskts(saveParams);
+            await repos.adminEventSeries.upsertManyEventSeriesById4sskts(saveParams);
             debug('saved', saveParams.length, 'ScreeningEventSeries');
             savedEventsCount = saveParams.length;
             // コンテンツ永続化(2023-10-23~)

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

@@ -2,6 +2,7 @@ import type { COA } from '@motionpicture/coa-service';
 import type { CategoryCodeRepo } from '../../repo/categoryCode';
 import type { CreativeWorkRepo } from '../../repo/creativeWork';
 import type { AdminEventRepo } from '../../repo/adminEvent';
+import type { AdminEventSeriesRepo } from '../../repo/adminEventSeries';
 import type { EventSeriesRepo } from '../../repo/eventSeries';
 import { factory } from '../../factory';
 type IMovieTheater = Pick<factory.place.movieTheater.IPlace, 'id' | 'typeOf' | 'branchCode' | 'name' | 'kanaName'>;
@@ -29,6 +30,7 @@ declare function saveScreeningEvents(params: {
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
     adminEvent: AdminEventRepo;
+    adminEventSeries: AdminEventSeriesRepo;
     eventSeries: EventSeriesRepo;
     masterService: COA.service.Master;
 }) => Promise<factory.event.screeningEvent.IEvent[]>;

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

@@ -6,6 +6,7 @@ import type { UpdateActionRepo } from '../repo/action/update';
 import type { CategoryCodeRepo } from '../repo/categoryCode';
 import type { CreativeWorkRepo } from '../repo/creativeWork';
 import type { AdminEventRepo } from '../repo/adminEvent';
+import type { AdminEventSeriesRepo } from '../repo/adminEventSeries';
 import type { EventRepo } from '../repo/event';
 import type { EventSeriesRepo } from '../repo/eventSeries';
 import type { MovieTheaterRepo } from '../repo/place/movieTheater';
@@ -24,6 +25,7 @@ declare function importFromCOA(params: IImportFromCOAParams): (repos: {
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
     adminEvent: AdminEventRepo;
+    adminEventSeries: AdminEventSeriesRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     movieTheater: MovieTheaterRepo;

package/lib/chevre/service/event.js

@@ -153,7 +153,6 @@ function cancelDeletedEvents(params) {
         // COAから削除されたイベントをキャンセル済ステータスへ変更
         const ids = await repos.event.searchEventIds({
             project: { id: { $eq: params.project.id } },
-            typeOf: factory_1.factory.eventType.ScreeningEvent,
             superEvent: {
                 locationBranchCodes: [params.locationBranchCode]
             },

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

@@ -8,7 +8,7 @@ declare function createReserveTransactionStartParams(params: {
         id: string;
     };
     broker?: factory.reservation.IBroker;
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'expires' | 'seller'>;
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
 declare function createAuthorizeSeatReservationActionAttributes(params: {
@@ -18,7 +18,7 @@ declare function createAuthorizeSeatReservationActionAttributes(params: {
          */
         transactionNumber: string;
     };
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
 }): factory.action.authorize.offer.eventService.IAttributes;
 declare function acceptedOffers2amount(params: {
     acceptedOffers: Pick<IResultAcceptedOffer, 'priceSpecification' | 'id'>[];

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

@@ -31,7 +31,7 @@ declare function processStartReserve4chevre(params: {
     };
     broker?: factory.reservation.IBroker;
     transactionNumber: string;
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'project' | 'seller' | 'typeOf'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'agent' | 'expires' | 'id' | 'project' | 'seller' | 'typeOf'>;
     availableAtOrFrom: {
         id: string;
     };

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

@@ -121,10 +121,7 @@ function minimizeItemOffered(itemOffered, options) {
 }
 function validateCreateRequest(params) {
     return async (repos) => {
-        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
-            id: params.transaction.id
-        }, ['agent', 'expires', 'project', 'seller', 'typeOf', 'instrument']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: params.transaction.id }, ['agent', 'expires', 'project', 'seller', 'typeOf', 'instrument']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory_1.factory.errors.Forbidden('Transaction not yours');
         }