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

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/factory.d.ts

@@ -8,7 +8,7 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptAction: {
         id: 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'>;
     /**
      * 仮予約済のCOA予約取引
      */

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/order/onAssetTransactionStatusChanged/onPayTransactionCanceled.js

@@ -36,7 +36,7 @@ function cancelOrderIfExist(params) {
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },
-                typeOf: factory_1.factory.transactionType.PlaceOrder,
+                // typeOf: factory.transactionType.PlaceOrder,
                 statuses: [factory_1.factory.transactionStatusType.Confirmed],
                 // resultではなくobjectで参照するように変更(2026-06-16~)
                 object: {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js

@@ -83,7 +83,7 @@ function createOnAuthorizationCreatedTask(order) {
         const placeOrderTransaction = (await repos.placeOrder.findPlaceOrderTransactions({
             limit: 1,
             page: 1,
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
+            // typeOf: factory.transactionType.PlaceOrder,
             object: { orderNumber: { $eq: order.orderNumber } },
             inclusion: ['result']
         })).shift();

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js

@@ -11,7 +11,7 @@ function createPlacingOrderFromExistingTransaction(params) {
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
+            // typeOf: factory.transactionType.PlaceOrder,
             statuses: [factory_1.factory.transactionStatusType.Confirmed],
             // resultではなくobjectで参照するように変更(2026-06-16~)
             object: {

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/factory.d.ts

@@ -8,7 +8,7 @@ export declare function creatPublishPaymentUrlParams(params: {
     accountId?: string;
     object: Pick<factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'referencesOrder'>;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'expires' | 'seller' | 'project'>;
     transactionNumber: string;
     location?: factory.action.trade.pay.ILocation;
     identifier?: string;
@@ -26,7 +26,7 @@ export declare function creatPayTransactionStartParams(params: {
     accountId?: string;
     object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'expires' | 'seller' | 'project'>;
     transactionNumber: string;
     location?: factory.action.trade.pay.ILocation;
     order: {

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/task/importEventsFromCOA.js

@@ -39,6 +39,7 @@ const update_1 = require("../../repo/action/update");
 const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
 const adminEvent_1 = require("../../repo/adminEvent");
+const adminEventSeries_1 = require("../../repo/adminEventSeries");
 const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const movieTheater_1 = require("../../repo/place/movieTheater");
@@ -78,6 +79,7 @@ function call(params) {
             categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
             creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
             adminEvent: new adminEvent_1.AdminEventRepo(connection),
+            adminEventSeries: new adminEventSeries_1.AdminEventSeriesRepo(connection),
             event: new event_1.EventRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),
             movieTheater: new movieTheater_1.MovieTheaterRepo(connection),

package/lib/chevre/service/task/onResourceDeleted.js

@@ -13,7 +13,7 @@ const note_1 = require("../../repo/note");
 const offerCatalog_1 = require("../../repo/offerCatalog");
 const offerCatalogItem_1 = require("../../repo/offerCatalogItem");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
-const hasPOS_1 = require("../../repo/place/hasPOS");
+const pos_1 = require("../../repo/place/pos");
 const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const product_1 = require("../../repo/product");
@@ -42,7 +42,7 @@ function call(params) {
             adminEvent: new adminEvent_1.AdminEventRepo(connection),
             eventOffer: new eventOffer_1.EventOfferRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),
-            hasPOS: new hasPOS_1.HasPOSRepo(connection, { id: '' }), // 先の処理で明示的に指定される
+            pos: new pos_1.POSRepo(connection, { id: '' }), // 先の処理で明示的に指定される
             member: new member_1.MemberRepo(connection),
             movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
             note: new note_1.NoteRepo(connection),

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import type { HasPOSRepo } from '../../../repo/place/hasPOS';
+import type { POSRepo } from '../../../repo/place/pos';
 import type { MovieTheaterRepo } from '../../../repo/place/movieTheater';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
@@ -13,7 +13,7 @@ export declare function createInformHasPOSTasks(params: {
     ids: string[];
     typeOf: factory.placeType.MovieTheater;
 }): (repos: {
-    hasPOS: HasPOSRepo;
+    pos: POSRepo;
     movieTheater: MovieTheaterRepo;
     setting: SettingRepo;
     task: TaskRepo;

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.js

@@ -25,12 +25,11 @@ function createInformHasPOSTasks(params) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.MovieTheater);
         }
         // 施設のhasPOSを全て連携する
-        repos.hasPOS.operator.id = movieTheater.id;
-        const hasPOS = await repos.hasPOS.search({
-            project: { id: { $eq: params.project.id } }
+        repos.pos.operator.id = movieTheater.id;
+        const hasPOS = await repos.pos.findPOS({
+            projectId: params.project.id
         });
         const movieTheaters4inform = [{
-                // hasPOS: (Array.isArray(movieTheater.hasPOS)) ? movieTheater.hasPOS : [],
                 hasPOS: (Array.isArray(hasPOS)) ? hasPOS : [],
                 id: movieTheater.id,
                 typeOf: factory_1.factory.placeType.MovieTheater

package/lib/chevre/service/task/onResourceUpdated.js

@@ -15,7 +15,7 @@ const offerCatalog_1 = require("../../repo/offerCatalog");
 const offerCatalogItem_1 = require("../../repo/offerCatalogItem");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const entranceGate_1 = require("../../repo/place/entranceGate");
-const hasPOS_1 = require("../../repo/place/hasPOS");
+const pos_1 = require("../../repo/place/pos");
 const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const product_1 = require("../../repo/product");
@@ -39,7 +39,7 @@ function call(params) {
             entranceGate: new entranceGate_1.EntranceGateRepo(connection, { id: '' }), // 先の処理で明示的に指定される
             event: new event_1.EventRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),
-            hasPOS: new hasPOS_1.HasPOSRepo(connection, { id: '' }), // 先の処理で明示的に指定される
+            pos: new pos_1.POSRepo(connection, { id: '' }), // 先の処理で明示的に指定される
             member: new member_1.MemberRepo(connection),
             movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
             note: new note_1.NoteRepo(connection),

package/lib/chevre/service/task/syncResourcesFromCOA.js

@@ -12,6 +12,7 @@ const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
 const credentials_1 = require("../../repo/credentials");
 const adminEvent_1 = require("../../repo/adminEvent");
+const adminEventSeries_1 = require("../../repo/adminEventSeries");
 const eventSeries_1 = require("../../repo/eventSeries");
 const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
@@ -71,7 +72,7 @@ function call(params) {
                     },
                     categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
                     creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
-                    eventSeries: new eventSeries_1.EventSeriesRepo(connection),
+                    adminEventSeries: new adminEventSeries_1.AdminEventSeriesRepo(connection),
                     movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
                     masterService
                 });
@@ -88,6 +89,7 @@ function call(params) {
                     categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
                     creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
                     adminEvent: new adminEvent_1.AdminEventRepo(connection),
+                    adminEventSeries: new adminEventSeries_1.AdminEventSeriesRepo(connection),
                     eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                     movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
                     screeningRoom: new screeningRoom_1.ScreeningRoomRepo(connection),

package/lib/chevre/service/transaction/deleteTransaction.js

@@ -36,7 +36,7 @@ function deleteTransactionById(params) {
         if (params.object.typeOf === factory_1.factory.transactionType.PlaceOrder) {
             transaction = (await repos.placeOrder.findPlaceOrderTransactions({
                 ids: [deletingTransactionId],
-                typeOf: params.object.typeOf,
+                // typeOf: params.object.typeOf,
                 inclusion: ['typeOf', 'project', 'status']
             })).shift();
         }

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/exportTasks/factory.d.ts

@@ -6,10 +6,10 @@ type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceO
  * 取引削除タスクを分離(2026-08-02~)
  */
 export declare function createImmediateTasks(params: {
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
     taskRunsAt: Date;
 }): IPlaceOrderPotentialTask[];
 export declare function createScheduledTasks(params: {
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'status' | 'typeOf'>;
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'endDate' | 'id' | 'object' | 'project' | 'status' | 'typeOf'>;
 }, setting: Pick<ISetting, 'storage'> | null): factory.task.deleteTransaction.IAttributes;
 export {};

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/start.js

@@ -34,7 +34,7 @@ function start(params, options) {
                 // in case already locked
                 const alreadyStartedTransaction = (await repos.placeOrder.findPlaceOrderTransactions({
                     limit: 1, page: 1,
-                    typeOf: factory_1.factory.transactionType.PlaceOrder,
+                    // typeOf: factory.transactionType.PlaceOrder,
                     project: { id: { $eq: startParams.project.id } },
                     status: { $in: [factory_1.factory.transactionStatusType.InProgress] },
                     agent: { identifiers: [{ name: factory_2.AGENT_IDENTIFIER_NAME_PASSPORT, value: passport.identifier }] },

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/potentialActions.js

@@ -4,9 +4,7 @@ exports.createPotentialActions = createPotentialActions;
 const factory_1 = require("../../../factory");
 const returnPaymentMethod_1 = require("./potentialActions/returnPaymentMethod");
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
-async function createPotentialActions(params, 
-// settings: Settings
-setting) {
+async function createPotentialActions(params, setting) {
     const emailMessages = [];
     const returnOrderActions = await Promise.all(params.orders.map(async (order) => {
         let returnOrderParams = params.potentialActions?.returnOrder;

package/lib/chevre/service/transaction/returnOrder/preStart.d.ts

@@ -23,10 +23,22 @@ interface IPreStartOperationRepos {
 }
 type IPreStartOperation<T> = (repos: IPreStartOperationRepos) => Promise<T>;
 type IFixedSeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;
+/**
+ * 注文返品開始パラメータ
+ */
+export interface IStartParamsWithoutDetail {
+    project: Pick<factory.project.IProject, 'id' | 'typeOf'>;
+    expiresInSeconds: number;
+    agent: factory.transaction.returnOrder.IAgent;
+    object: {
+        order: [factory.transaction.returnOrder.IReturnableOrder];
+        reason: factory.transaction.returnOrder.Reason;
+    };
+}
 /**
  * 返品取引開始前処理
  */
-declare function preStart(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IPreStartOperation<{
+declare function preStart(params: IStartParamsWithoutDetail): IPreStartOperation<{
     transactionObject: factory.transaction.returnOrder.IObject;
     seller: IFixedSeller;
     expiresInSeconds: number;

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/lib/chevre/service/transaction/returnOrder.d.ts

@@ -13,7 +13,7 @@ import type { SellerReturnPolicyRepo } from '../../repo/sellerReturnPolicy';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { IStartedTransaction, ReturnOrderInProgressRepo } from '../../repo/transaction/returnOrderInProgress';
-import { preStart } from './returnOrder/preStart';
+import { preStart, IStartParamsWithoutDetail } from './returnOrder/preStart';
 interface IStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;
@@ -31,7 +31,7 @@ type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 /**
  * 返品取引開始
  */
-declare function start(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
+declare function start(params: IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
 interface IConfirmRepos {
     acceptedOffer: AcceptedOfferRepo;
     message: MessageRepo;
@@ -43,7 +43,18 @@ interface IConfirmRepos {
 /**
  * 取引確定
  */
-declare function confirm(params: factory.transaction.returnOrder.IConfirmParams & {
+declare function confirm(params: {
+    /**
+     * 取引ID
+     */
+    id: string;
+    agent: {
+        id: string;
+    };
+    /**
+     * 取引確定後アクション
+     */
+    potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     object: {
         order: {
             dateReturned: Date;

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

@@ -16,16 +16,11 @@ Object.defineProperty(exports, "preStart", { enumerable: true, get: function ()
  */
 function start(params) {
     return async (repos) => {
-        const { transactionObject, expiresInSeconds, seller } = await (0, preStart_1.preStart)(params)(repos);
+        const { transactionObject, expiresInSeconds, seller: _seller } = await (0, preStart_1.preStart)(params)(repos);
         const returnOrderAttributes = {
             project: params.project,
             typeOf: factory_1.factory.transactionType.ReturnOrder,
             agent: params.agent,
-            seller: {
-                id: String(seller.id),
-                typeOf: seller.typeOf,
-                name: seller.name
-            },
             object: transactionObject,
             expiresInSeconds
         };

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

@@ -44,4 +44,4 @@ export declare function exportOneTransactionTasksIfExists(params: {
         endDate?: factory.sortType;
         startDate?: factory.sortType;
     };
-}): IExportTasksOperation<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | undefined>;
+}): IExportTasksOperation<Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf'> | undefined>;

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": "10.5.0-alpha.8",
+    "@chevre/factory": "11.0.0-alpha.3",
     "@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.1"
+  "version": "28.0.0-alpha.10"
 }