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

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

@@ -17,7 +17,7 @@ export type IPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, IKey
 };
 type IStartedPlaceOrderFields = 'expires' | 'id' | 'startDate' | 'status';
 export type IStartedPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, IStartedPlaceOrderFields>;
-type IFindParams = Pick<factory.transaction.placeOrder.ISearchConditions, 'agent' | 'ids' | 'limit' | 'object' | 'page' | 'project' | 'seller' | 'sort' | 'startFrom' | 'startThrough' | 'status' | 'statuses' | 'tasksExportAction'> & {};
+type IFindParams = Pick<factory.transaction.placeOrder.ISearchConditions, 'agent' | 'ids' | 'limit' | 'object' | 'page' | 'project' | 'seller' | 'sort' | 'startFrom' | 'startThrough' | 'status' | 'statuses'> & {};
 /**
  * 注文取引リポジトリ
  */
@@ -41,7 +41,6 @@ export declare class PlaceOrderRepo {
      * 取引期限変更
      */
     updateExpires(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
         expires: Date;
     }): Promise<void>;
@@ -58,14 +57,12 @@ export declare class PlaceOrderRepo {
      * 進行中の注文取引を取得する
      */
     findPlaceOrderInProgressById(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
     }, inclusion: IKeyOfProjection[]): Promise<ITransactionInProgress>;
     /**
      * 特定注文取引参照
      */
     findPlaceOrderById(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
     }, inclusion: IKeyOfProjection[]): Promise<IPlaceOrder>;
     /**
@@ -76,7 +73,6 @@ export declare class PlaceOrderRepo {
      * 取引を確定する
      */
     confirmPlaceOrder(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
         object: {
             orderDate: Date;
@@ -90,7 +86,6 @@ export declare class PlaceOrderRepo {
      * 取引を中止する
      */
     cancelPlaceOrder(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
     }): Promise<void>;
 }

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

@@ -110,14 +110,15 @@ class PlaceOrderRepo {
                 });
             }
         }
-        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 } });
-        }
+        // 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 } });
@@ -174,62 +175,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: {
@@ -241,7 +192,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`);
         }
     }
     /**
@@ -291,7 +242,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() }
@@ -300,7 +250,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;
     }
@@ -322,13 +272,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;
     }
@@ -341,7 +290,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)
@@ -351,18 +300,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();
@@ -380,7 +323,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~)
         }, {
@@ -399,7 +341,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) {
                 // すでに確定済の場合スルー
             }
@@ -414,12 +356,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
         });
     }
@@ -430,7 +372,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
         }, {
@@ -455,12 +396,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.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/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.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.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');
         }

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

@@ -63,7 +63,7 @@ function issueEventOfferTicket(params) {
     return async (repos) => {
         const { now, audience, eventId, eventOfferId, ticketedOffer, author, project, instrument } = params;
         // 取引は存在するか
-        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ typeOf: factory_1.factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: audience.id }, ['expires', 'typeOf', 'seller']);
         // イベントは存在するか
         const event = await repos.event.projectEventFieldsById({ id: eventId }, ['project', 'offers', 'identifier']);
         const { seller } = transaction;

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

@@ -22,7 +22,7 @@ function voidTransaction(params) {
             agent: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
+        const transaction = await repos.placeOrder.findPlaceOrderById({ id: params.purpose.id }, ['typeOf', 'status', 'object']);
         // 興行オファー承認アクション検索
         let authorizeActions = await repos.actions.authorizeOffer.findAuthorizeOfferActionsByPurpose({
             // typeOf: factory.actionType.AuthorizeAction,
@@ -115,10 +115,7 @@ function cancelAcceptActions(params) {
             agent: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const transaction = await repos.placeOrder.findPlaceOrderById({
-            typeOf: params.purpose.typeOf,
-            id: params.purpose.id
-        }, ['typeOf', 'status']);
+        const transaction = await repos.placeOrder.findPlaceOrderById({ id: params.purpose.id }, ['typeOf', 'status']);
         // 興行オファー承認アクション検索
         const completedAuthorizeActions = await repos.actions.authorizeOffer.findAuthorizeOfferActionsByPurpose({
             // typeOf: factory.actionType.AuthorizeAction,

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

@@ -19,10 +19,7 @@ function voidTransactionByActionId(params) {
             agent: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
-            id: params.purpose.id
-        }, ['typeOf']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: params.purpose.id }, ['typeOf']);
         // if (transaction.agent.id !== params.agent.id) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -12,7 +12,6 @@ function findCOAInfo(params) {
             project: { id: { $eq: params.project.id } },
             limit: 1,
             page: 1,
-            typeOf: factory_1.factory.eventType.ScreeningEvent,
             id: { $eq: params.id }
         }, ['coaInfo'])).shift();
         if (event === undefined) {
@@ -33,10 +32,7 @@ function acceptOffer(params) {
         if (typeof params.sameAs.id !== 'string' || params.sameAs.id === '') {
             throw new factory_1.factory.errors.ArgumentNull('sameAs.id');
         }
-        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
-            id: params.purpose.id
-        }, ['project', 'agent', 'typeOf']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: params.purpose.id }, ['project', 'agent', 'typeOf']);
         // // 注文ドキュメントを参照(2026-06-24~)
         // const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
         //     identifier: transaction.id,
@@ -118,10 +114,7 @@ function reAcceptOffer(params) {
         if (typeof params.potentialActions?.id !== 'string' || params.potentialActions.id === '') {
             throw new factory_1.factory.errors.ArgumentNull('potentialActions.id');
         }
-        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
-            id: params.purpose.id
-        }, ['project', 'agent', 'typeOf']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: params.purpose.id }, ['project', 'agent', 'typeOf']);
         // const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: transaction.id });
         // if (typeof orderNumber !== 'string') {
         //     // 事前に発行されているはず

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

@@ -14,10 +14,7 @@ const factory_2 = require("../../../factory");
  */
 function authorize(params) {
     return async (repos) => {
-        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
-            typeOf: factory_2.factory.transactionType.PlaceOrder,
-            id: params.transaction.id
-        }, ['agent', 'project', 'seller', 'typeOf', 'instrument']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: params.transaction.id }, ['agent', 'project', 'seller', 'typeOf', 'instrument']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory_2.factory.errors.Forbidden('Transaction not yours');
         }

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -14,10 +14,7 @@ const factory_2 = require("../../../factory");
  */
 function changeOffers(params) {
     return async (repos) => {
-        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
-            typeOf: factory_2.factory.transactionType.PlaceOrder,
-            id: params.transaction.id
-        }, ['typeOf', 'agent', 'project', 'seller']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: params.transaction.id }, ['typeOf', 'agent', 'project', 'seller']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory_2.factory.errors.Forbidden('Transaction not yours');
         }

package/lib/chevre/service/offer/onEventChanged.js

@@ -101,8 +101,7 @@ function createInformTasks(params, setting) {
         const informEvents = setting?.onResourceUpdated?.informResource;
         if (params.typeOf === factory_1.factory.eventType.ScreeningEvent) {
             const screeningEvents4inform = await repos.event.projectEventFields({
-                id: { $in: params.ids },
-                typeOf: params.typeOf
+                id: { $in: params.ids }
             }, [
                 'project', 'organizer', 'typeOf', 'name', 'doorTime', 'endDate',
                 'eventStatus', 'location', 'startDate', 'superEvent', 'offers', 'additionalProperty', 'identifier'
@@ -296,8 +295,7 @@ function syncEventEndDate2pendingReservations(params) {
             const events = await repos.event.projectEventFields({
                 limit: 1,
                 page: 1,
-                id: { $eq: eventId },
-                typeOf: params.typeOf
+                id: { $eq: eventId }
             }, ['endDate']);
             const endDate = events.shift()?.endDate;
             if (endDate instanceof Date) {

package/lib/chevre/service/offer.js

@@ -169,8 +169,7 @@ function findEventSeatOffersBySection(params) {
             page: 1,
             project: { id: { $eq: projectId } },
             organizer: { id: { $eq: sellerId } },
-            id: { $eq: eventId },
-            typeOf: factory_1.factory.eventType.ScreeningEvent
+            id: { $eq: eventId }
         }, ['startDate', 'offers.itemOffered', 'location', 'superEvent'])).shift();
         if (event === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.eventType.ScreeningEvent);

package/lib/chevre/service/payment/any/authorize.js

@@ -59,7 +59,7 @@ function authorize(params) {
         if (purpose.typeOf !== factory_1.factory.transactionType.PlaceOrder) {
             throw new factory_1.factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
         }
-        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['agent', 'expires', 'typeOf', 'project', 'seller']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: purpose.id }, ['agent', 'expires', 'typeOf', 'project', 'seller']);
         if (project.id !== transaction.project.id) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
         }

package/lib/chevre/service/payment/any/invalidatePaymentUrl.js

@@ -12,10 +12,7 @@ function invalidatePaymentUrl(params) {
         if (params.purpose.typeOf !== factory_1.factory.transactionType.PlaceOrder) {
             throw new factory_1.factory.errors.Argument('purpose.typeOf', `must be ${factory_1.factory.transactionType.PlaceOrder}`);
         }
-        const transaction = await repos.placeOrder.findPlaceOrderById({
-            typeOf: params.purpose.typeOf,
-            id: params.purpose.id
-        }, ['typeOf', 'status', 'object', 'project', 'seller', 'agent']);
+        const transaction = await repos.placeOrder.findPlaceOrderById({ id: params.purpose.id }, ['typeOf', 'status', 'object', 'project', 'seller', 'agent']);
         // const orderCancelled: boolean = params.purpose.result?.order?.orderStatus === factory.orderStatus.OrderCancelled;
         // if (transaction.status === factory.transactionStatusType.Confirmed) {
         //     if (!orderCancelled) {

package/lib/chevre/service/payment/any/processVoidPayTransaction.js

@@ -50,10 +50,10 @@ function processVoidPayTransaction(params) {
         let transaction;
         // アクションID指定の場合、進行中取引検証(2023-02-24~)
         if (typeof params.id === 'string') {
-            transaction = await repos.placeOrder.findPlaceOrderInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status']);
+            transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: params.purpose.id }, ['typeOf', 'status']);
         }
         else {
-            transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'result']);
+            transaction = await repos.placeOrder.findPlaceOrderById({ id: params.purpose.id }, ['typeOf', 'status', 'result']);
         }
         // 承認アクションを取得
         let authorizeActions;

package/lib/chevre/service/payment/any/publishPaymentUrl.js

@@ -48,7 +48,7 @@ function publishPaymentUrl(params) {
             throw new factory_1.factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
         }
         try {
-            const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['expires', 'seller', 'project']);
+            const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: purpose.id }, ['expires', 'seller', 'project']);
             if (project.id !== transaction.project.id) {
                 throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
             }

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -63,7 +63,7 @@ function confirm(params, options) {
             // status: { $in: [factory.transactionStatusType.Confirmed, factory.transactionStatusType.InProgress] },
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: factory_1.factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
+        const transaction = await repos.placeOrder.findPlaceOrderById({ id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
         // 注文ドキュメントから注文番号を参照(取引開始時に発行済の前提)(2026-06-26~)
         const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
             identifier: params.id,
@@ -169,7 +169,6 @@ function confirm(params, options) {
         // ステータス変更
         try {
             await repos.placeOrder.confirmPlaceOrder({
-                typeOf: transaction.typeOf,
                 id: transaction.id,
                 object: {
                     orderDate: params.result.order.orderDate,

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -12,10 +12,7 @@ const factory_2 = require("./exportTasks/factory");
  */
 function exportTasksById(params) {
     return async (repos) => {
-        const transaction = await repos.placeOrder.findPlaceOrderById({
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
-            id: params.id
-        }, ['endDate', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']);
+        const transaction = await repos.placeOrder.findPlaceOrderById({ id: params.id }, ['endDate', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']);
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
         if (typeof params.runsTasksAfterInSeconds === 'number') {

package/lib/chevre/service/transaction/placeOrder/updateAgent.js

@@ -8,10 +8,7 @@ const fixCustomer_1 = require("./updateAgent/fixCustomer");
  */
 function updateAgent(params) {
     return async (repos) => {
-        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
-            id: params.id
-        }, ['agent', 'object', 'typeOf', 'project']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ id: params.id }, ['agent', 'object', 'typeOf', 'project']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory_1.factory.errors.Forbidden('Transaction not yours');
         }

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -36,8 +36,7 @@ function preStart(params) {
         let events = [];
         if (eventIds.length > 0) {
             events = await repos.event.projectEventFields({
-                id: { $in: eventIds },
-                typeOf: factory_1.factory.eventType.ScreeningEvent
+                id: { $in: eventIds }
             }, ['startDate']);
         }
         let returnPolicies = [];

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "11.0.0-alpha.1",
+    "@chevre/factory": "11.0.0-alpha.2",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.3"
+  "version": "28.0.0-alpha.5"
 }