@chevre/domain 22.2.0-alpha.21 → 22.2.0-alpha.23

package/lib/chevre/repo/transaction.js

@@ -15,6 +15,23 @@ const transaction_1 = require("../eventEmitter/transaction");
 const factory = require("../factory");
 const settings_1 = require("../settings");
 const transaction_2 = require("./mongoose/schemas/transaction");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'status',
+    'typeOf',
+    'agent',
+    'recipient',
+    'seller',
+    'error',
+    'result',
+    'object',
+    'expires',
+    'startDate',
+    'endDate',
+    'tasksExportAction',
+    'potentialActions',
+    'instrument'
+];
 /**
  * 取引リポジトリ
  */
@@ -263,8 +280,6 @@ class TransactionRepo {
                 throw new factory.errors.NotImplemented(`${typeOf} not implemented`);
             }
             // reimplemnt with insertMany(2024-05-30~)
-            // const transaction = await this.transactionModel.create<AnyKeys<factory.transaction.ITransaction<T>>>(creatingTransaction)
-            //     .then((doc: HydratedDocument<factory.transaction.ITransaction<T>>) => doc.toObject());
             const result = yield this.transactionModel.insertMany(creatingTransaction, { rawResult: true });
             const id = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
             if (typeof id !== 'string') {
@@ -278,59 +293,73 @@ class TransactionRepo {
     /**
      * 特定取引検索
      */
-    findById(params, inclusion // make required(2024-05-31~)
-    // exclusion?: IKeyOfProjection<T>[] // discontinue(2024-06-17~)
+    projectFieldsById(params, inclusion // make required(2024-05-31~)
     ) {
         return __awaiter(this, void 0, void 0, function* () {
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = positiveProjectionFields.filter((key) => inclusion.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
-                // if (Array.isArray(exclusion) && exclusion.length > 0) { // discontinue(2024-06-17~)
-                //     exclusion.forEach((field) => {
-                //         projection[field] = 0;
-                //     });
-                // }
+                throw new factory.errors.NotImplemented('inclusion must be specified'); // 2024-08-26~
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // let projection: { [key in (IKeyOfProjection<T> | '__v' | 'createdAt' | 'updatedAt')]?: AnyExpression } = {};
+            // if (Array.isArray(inclusion) && inclusion.length > 0) {
+            //     inclusion.forEach((field) => {
+            //         projection[field] = 1;
+            //     });
+            // } else {
+            //     projection = {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0
+            //     };
+            // }
             const doc = yield this.transactionModel.findOne({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf }
-            })
-                .select(projection)
+            }, projection)
+                .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
             }
-            return doc.toObject();
+            return doc;
         });
     }
     /**
      * 進行中の取引を取得する
      */
-    findInProgressById(params, inclusion // make required(2024-05-29~)
+    projectFieldsInProgressById(params, inclusion // make required(2024-05-29~)
     ) {
         return __awaiter(this, void 0, void 0, function* () {
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = positiveProjectionFields.filter((key) => inclusion.includes(key));
             }
             else {
-                // minimize(2024-05-29~)
-                projection = Object.assign({ __v: 0, createdAt: 0, updatedAt: 0, tasksExportAction: 0 }, {
-                    tasksExportedAt: 0,
-                    tasksExportationStatus: 0
-                });
+                throw new factory.errors.NotImplemented('inclusion must be specified'); // 2024-08-26~
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // let projection: { [key in (IKeyOfProjection<T> | '__v' | 'createdAt' | 'updatedAt')]?: ProjectionElementType } = {};
+            // if (Array.isArray(inclusion) && inclusion.length > 0) {
+            //     inclusion.forEach((field) => {
+            //         projection[field] = 1;
+            //     });
+            // } else {
+            //     // minimize(2024-05-29~)
+            //     projection = {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0,
+            //         tasksExportAction: 0,
+            //         ...{
+            //             tasksExportedAt: 0,
+            //             tasksExportationStatus: 0
+            //         }
+            //     };
+            // }
             const filter = {
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf },
@@ -339,11 +368,12 @@ class TransactionRepo {
                 expires: { $gt: new Date() }
             };
             const doc = yield this.transactionModel.findOne(filter, projection)
+                .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
             }
-            return doc.toObject();
+            return doc;
         });
     }
     /**
@@ -356,11 +386,12 @@ class TransactionRepo {
                 typeOf: { $eq: factory.transactionType.PlaceOrder },
                 status: { $eq: factory.transactionStatusType.InProgress }
             }, { 'object.paymentMethods': 1 })
+                .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
             }
-            return doc.toObject().object.paymentMethods;
+            return doc.object.paymentMethods;
         });
     }
     /**
@@ -373,11 +404,12 @@ class TransactionRepo {
                 typeOf: { $eq: factory.transactionType.PlaceOrder },
                 status: { $eq: factory.transactionStatusType.InProgress }
             }, { 'object.orderNumber': 1 })
+                .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
             }
-            return doc.toObject().object.orderNumber;
+            return doc.object.orderNumber;
         });
     }
     /**
@@ -390,11 +422,12 @@ class TransactionRepo {
                 typeOf: { $eq: factory.transactionType.PlaceOrder },
                 status: { $in: params.status.$in }
             }, { 'object.confirmationNumber': 1 })
+                .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
             }
-            return doc.toObject().object.confirmationNumber;
+            return doc.object.confirmationNumber;
         });
     }
     /**
@@ -412,6 +445,7 @@ class TransactionRepo {
             }, {
                 projection: { _id: 1 }
             })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
@@ -434,6 +468,7 @@ class TransactionRepo {
             }, {
                 projection: { _id: 1 }
             })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
@@ -456,6 +491,7 @@ class TransactionRepo {
             }, {
                 projection: { _id: 1 }
             })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
@@ -481,10 +517,11 @@ class TransactionRepo {
                 new: true,
                 projection: { _id: 1 }
             })
+                .lean()
                 .exec();
             // NotFoundであれば取引状態確認
             if (doc === null) {
-                const { status } = yield this.findById({ typeOf: params.typeOf, id: params.id }, ['status']);
+                const { status } = yield this.projectFieldsById({ typeOf: params.typeOf, id: params.id }, ['status']);
                 if (status === factory.transactionStatusType.Confirmed) {
                     // すでに確定済の場合スルー
                 }
@@ -529,14 +566,19 @@ class TransactionRepo {
                 'tasksExportAction.agent': { name: params.tasksExportAction.agent.name },
                 'tasksExportAction.startDate': new Date()
                 // tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting // discontinue(2024-06-20~)
-            }, { new: true })
-                .select({
-                _id: 1,
-                typeOf: 1
+            }, {
+                new: true,
+                projection: {
+                    // _id: 1,
+                    _id: 0,
+                    id: { $toString: '$_id' },
+                    typeOf: 1
+                }
             })
+                .lean() // 2024-08-26~
                 .exec()
                 // tslint:disable-next-line:no-null-keyword
-                .then((doc) => (doc === null) ? null : doc.toObject());
+                .then((doc) => (doc === null) ? null : doc);
         });
     }
     reexportTasksByExportAction(params) {
@@ -697,10 +739,11 @@ class TransactionRepo {
                 new: true,
                 projection: { _id: 1 }
             })
+                .lean()
                 .exec();
             // NotFoundであれば取引状態確認
             if (doc === null) {
-                const { status } = yield this.findById(params, ['status']);
+                const { status } = yield this.projectFieldsById(params, ['status']);
                 if (status === factory.transactionStatusType.Canceled) {
                     // すでに中止済の場合スルー
                 }
@@ -732,28 +775,28 @@ class TransactionRepo {
     /**
      * 取引を検索する
      */
-    search(params) {
+    projectFields(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            const { inclusion } = params;
             const conditions = TransactionRepo.CREATE_MONGO_CONDITIONS(params);
-            let projection = {};
-            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
-                params.inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
-            }
-            else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
-                // if (Array.isArray(params.exclusion) && params.exclusion.length > 0) { // discontinue(2024-06-17~)
-                //     params.exclusion.forEach((field) => {
-                //         projection[field] = 0;
-                //     });
-                // }
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = positiveProjectionFields.filter((key) => inclusion.includes(key));
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // let projection: { [key in (IKeyOfProjection<T> | '__v' | 'createdAt' | 'updatedAt')]?: AnyExpression } = {};
+            // if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+            //     params.inclusion.forEach((field) => {
+            //         projection[field] = 1;
+            //     });
+            // } else {
+            //     projection = {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0
+            //     };
+            // }
             const query = this.transactionModel.find((conditions.length > 0) ? { $and: conditions } : {})
                 .select(projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
@@ -769,8 +812,8 @@ class TransactionRepo {
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-26~
+                .exec();
         });
     }
     /**
@@ -785,21 +828,7 @@ class TransactionRepo {
                 // new: true,
                 projection: { _id: 1 }
             })
-                .exec()
-                .then((doc) => {
-                if (doc === null) {
-                    throw new factory.errors.ArgumentNull(this.transactionModel.modelName);
-                }
-            });
-        });
-    }
-    findByIdAndUpdate4migrate(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findOneAndUpdate({
-                _id: { $eq: params.id }
-            }, params.update, {
-                projection: { _id: 1 }
-            })
+                .lean()
                 .exec()
                 .then((doc) => {
                 if (doc === null) {

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

@@ -34,7 +34,7 @@ export declare function startAndConfirm(params: factory.assetTransaction.cancelR
     seller: {
         id?: string;
     };
-}): IStartOperation<factory.assetTransaction.cancelReservation.ITransaction>;
+}): IStartOperation<Pick<factory.assetTransaction.cancelReservation.ITransaction, 'id'>>;
 /**
  * 取引タスク出力
  */

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

@@ -4,7 +4,7 @@ declare function createReserveTransactionStartParams(params: {
     project: {
         id: string;
     };
-    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
+    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer[];
     event: {
         id: string;
     };
@@ -26,13 +26,13 @@ declare function acceptedOffers2amount(params: {
     acceptedOffers: IResultAcceptedOffer[];
 }): number;
 declare function acceptedOffers2authorizeResult(params: {
-    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
+    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer[];
     acceptedOffers4result: IResultAcceptedOffer[];
     noOfferSpecified: boolean;
     ticketOffers: factory.product.ITicketOffer[];
 }): factory.action.authorize.offer.eventService.IResult;
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
-type IResultAcceptedOffer = factory.action.authorize.offer.eventService.IResultAcceptedOffer;
+export type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IReservation>;
 declare function responseBody2acceptedOffers4result(params: {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
     reservationFor: factory.assetTransaction.reserve.IReservationFor;

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

@@ -17,8 +17,9 @@ import type { OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
 import type { TicketRepo } from '../../../../repo/ticket';
+import { IResultAcceptedOffer } from './factory';
 declare function processStartReserve4chevre(params: {
-    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
+    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer[];
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id'>;
     broker?: factory.reservation.IBroker<factory.reservationType>;
     transactionNumber: string;
@@ -57,6 +58,6 @@ declare function processStartReserve4chevre(params: {
 }, credentials: {
     jwt: JWTCredentials;
 }) => Promise<{
-    acceptedOffers4result: factory.action.authorize.offer.eventService.IResultAcceptedOffer[];
+    acceptedOffers4result: IResultAcceptedOffer[];
 }>;
 export { processStartReserve4chevre };

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

@@ -48,7 +48,7 @@ type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, credentials: {
     jwt: JWTCredentials;
 }) => Promise<T>;
 type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
-type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail<factory.service.webAPI.Identifier.Chevre>;
+type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail;
 interface IAuthorizeOptions {
     /**
      * オファーID指定なしに座席をおさえる場合true

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

@@ -74,7 +74,7 @@ exports.authorize = authorize;
 function validateCreateRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'expires', 'project', 'seller', 'typeOf', 'instrument']);

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

@@ -29,7 +29,7 @@ function voidTransaction(params) {
             return;
         }
         const cancelAction = Object.assign({ startTime: new Date(), agent: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
-        const transaction = yield repos.transaction.findById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
+        const transaction = yield repos.transaction.projectFieldsById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
         // 興行オファー承認アクション検索
         let authorizeActions = yield repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
@@ -102,7 +102,7 @@ function cancelAcceptActions(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const cancelAction = Object.assign({ startTime: new Date(), agent: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
-        const transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.projectFieldsById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['typeOf', 'status']);

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

@@ -25,7 +25,7 @@ function voidTransactionByActionId(params) {
             throw new factory.errors.ArgumentNull('id');
         }
         const cancelAction = Object.assign({ startTime: new Date(), agent: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['typeOf']);

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer/authorize.d.ts

@@ -10,12 +10,12 @@ export interface IAppliesToSurfrock {
     };
 }
 export declare function createAcceptedOffersWithoutDetails(params: {
-    object: factory.action.authorize.offer.eventService.IObjectWithoutDetail<WebAPIIdentifier.COA>;
+    object: factory.action.accept.coaOffer.IObjectWithoutDetail4COA;
     coaInfo: Pick<factory.event.screeningEvent.ICOAInfo, 'dateJouei' | 'screenCode' | 'theaterCode' | 'timeBegin' | 'timeEnd' | 'titleBranchNum' | 'titleCode'>;
 }): (repos: {
     reserveService: COA.service.Reserve;
 }) => Promise<IAcceptedOfferWithoutDetail[]>;
-type IAcceptedOfferBeforeAuthorize4COA = factory.action.authorize.offer.eventService.IAcceptedOfferBeforeAuthorize4COA;
+type IAcceptedOfferBeforeAuthorize4COA = factory.action.accept.coaOffer.IAcceptedOfferBeforeAuthorize4COA;
 export declare function validateOffers(coaInfo: Pick<factory.event.screeningEvent.ICOAInfo, 'dateJouei' | 'screenCode' | 'theaterCode' | 'timeBegin' | 'timeEnd' | 'titleBranchNum' | 'titleCode'>, offers: IAcceptedOfferWithoutDetail[], appliesToSurfrock: IAppliesToSurfrock, flgMember: COA.factory.reserve.FlgMember): (repos: {
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer/factory.d.ts

@@ -1,14 +1,14 @@
 import * as factory from '../../../../factory';
-type IAcceptedOfferWithoutDetail = factory.action.authorize.offer.eventService.IAcceptedOfferWithoutDetail<factory.service.webAPI.Identifier.COA> & {
+type IAcceptedOfferWithoutDetail = factory.action.accept.coaOffer.IAcceptedOfferWithoutDetail4COA & {
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
-    ticketInfo: factory.action.authorize.offer.eventService.ICOATicketInfo & {
+    ticketInfo: factory.action.accept.coaOffer.ICOATicketInfo & {
         spseatAdd1: number;
         spseatAdd2: number;
         spseatKbn: string;
     };
 };
 declare function createUpdTmpReserveSeatArgs(params: {
-    object: factory.action.authorize.offer.eventService.IObjectWithoutDetail<factory.service.webAPI.Identifier.COA>;
+    object: factory.action.accept.coaOffer.IObjectWithoutDetail4COA;
     coaInfo: Pick<factory.event.screeningEvent.ICOAInfo, 'dateJouei' | 'screenCode' | 'theaterCode' | 'timeBegin' | 'timeEnd' | 'titleBranchNum' | 'titleCode'>;
 }): factory.action.accept.coaOffer.IUpdTmpReserveSeatArgs;
 declare function processUpdTmpReserveSeatResult2recipe(params: {

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

@@ -42,7 +42,7 @@ function acceptOffer(params) {
         if (typeof params.sameAs.id !== 'string' || params.sameAs.id === '') {
             throw new factory.errors.ArgumentNull('sameAs.id');
         }
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
@@ -121,7 +121,7 @@ function reAcceptOffer(params) {
         if (typeof ((_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.id) !== 'string' || params.potentialActions.id === '') {
             throw new factory.errors.ArgumentNull('potentialActions.id');
         }
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);

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

@@ -6,8 +6,10 @@ import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
 import type { TransactionRepo } from '../../../repo/transaction';
+import { IRequestBody, IResponseBody } from './factory';
 import { IAcceptedOfferBeforeAuthorize4COA } from './validateAcceptedOffers';
 import * as factory from '../../../factory';
+export { IRequestBody, IResponseBody };
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 export type IAuthorizeActionResult = factory.action.authorize.offer.eventService.IResult;
 export interface IAuthorizeRepos {
@@ -51,8 +53,8 @@ export declare function authorize(params: {
         id: string;
     };
     result: {
-        requestBody: factory.action.authorize.offer.eventService.IRequestBody<WebAPIIdentifier.COA>;
-        responseBody: factory.action.authorize.offer.eventService.IResponseBody<WebAPIIdentifier.COA>;
+        requestBody: IRequestBody;
+        responseBody: IResponseBody;
     };
     options: {};
 }): IAuthorizeOperation<IAuthorizeOfferAction>;

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

@@ -23,7 +23,7 @@ function authorize(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'project', 'seller', 'typeOf', 'instrument']);

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

@@ -23,7 +23,7 @@ function changeOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['typeOf', 'agent', 'project', 'seller']);

package/lib/chevre/service/offer/eventServiceByCOA/factory.d.ts

@@ -1,12 +1,15 @@
+import type * as COAService from '@motionpicture/coa-service';
 import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
-export type IAcceptedOffer4COA = factory.action.authorize.offer.eventService.IAcceptedOffer4COA;
+export type IAcceptedOffer4COA = factory.action.accept.coaOffer.IAcceptedOffer4COA;
+export type IRequestBody = COAService.factory.reserve.IUpdTmpReserveSeatArgs;
+export type IResponseBody = COAService.factory.reserve.IUpdTmpReserveSeatResult;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptAction: {
         id: string;
     };
-    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4COA[];
+    acceptedOffers: factory.action.accept.coaOffer.IAcceptedOffer4COA[];
     event: {
         id: string;
         typeOf: factory.eventType.ScreeningEvent;
@@ -21,13 +24,13 @@ export declare function offers2resultPrice(offers: IAcceptedOffer4COA[]): {
     price: number;
     eligibleMonetaryAmount: factory.offer.IEligibleMonetaryAmount[];
 };
-type IResultAcceptedOffer = factory.action.authorize.offer.eventService.IResultAcceptedOffer;
+type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IReservation>;
 /**
  * COA仮予約結果から注文アイテムを生成する
  */
 export declare function responseBody2acceptedOffers4result(params: {
-    responseBody: factory.action.authorize.offer.eventService.IResponseBody<factory.service.webAPI.Identifier.COA>;
-    acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer4COA[];
+    responseBody: IResponseBody;
+    acceptedOffer: factory.action.accept.coaOffer.IAcceptedOffer4COA[];
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'coaInfo' | 'doorTime' | 'endDate' | 'id' | 'location' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier' | 'name'>;
     seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
     bookingTime: Date;

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.d.ts

@@ -1,7 +1,7 @@
 import * as factory from '../../../factory';
 import type { OfferRepo } from '../../../repo/offer';
 import { IAcceptedOffer4COA } from './factory';
-export type IAcceptedOfferBeforeAuthorize4COA = factory.action.authorize.offer.eventService.IAcceptedOfferBeforeAuthorize4COA;
+export type IAcceptedOfferBeforeAuthorize4COA = factory.action.accept.coaOffer.IAcceptedOfferBeforeAuthorize4COA;
 /**
  * 受け入れらたオファーの内容を検証
  */

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

@@ -16,7 +16,7 @@ const MoneyTransferAssetTransactionService = require("../../assetTransaction/mon
 const any_1 = require("../any");
 function authorize(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['seller', 'project', 'agent', 'typeOf']);

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

@@ -16,7 +16,7 @@ function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let transaction;
         if (params.agent !== undefined && params.agent !== null && typeof params.agent.id === 'string') {
-            transaction = (yield repos.transaction.findInProgressById({
+            transaction = (yield repos.transaction.projectFieldsInProgressById({
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
             }, ['typeOf']));

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

@@ -89,7 +89,7 @@ function authorize(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const transaction = yield repos.transaction.findInProgressById({
+        const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'project', 'seller', 'typeOf', 'expires']);
@@ -189,7 +189,7 @@ function fixProductAndOffers(params) {
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.projectFieldsById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['agent', 'status', 'typeOf']);

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

@@ -13,7 +13,7 @@ exports.findPlaceOrderTransaction = void 0;
 const factory = require("../../factory");
 function findPlaceOrderTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const placeOrderTransactions = yield repos.transaction.search({
+        const placeOrderTransactions = yield repos.transaction.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },