@chevre/domain 22.2.0-alpha.8 → 22.2.0

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/aggregation/event/aggregateScreeningEvent.js

@@ -165,7 +165,7 @@ function calculateOfferCount(params) {
         try {
             const eventOffers = params.event.offers;
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = (yield repos.product.searchProducts({
+                const eventService = (yield repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: eventOffers.itemOffered.id }

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

@@ -23,7 +23,7 @@ function findEventOffers(params) {
             // 興行設定があれば興行のカタログを参照する
             const eventOffers = params.event.offers;
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = (yield repos.product.searchProducts({
+                const eventService = (yield repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: eventOffers.itemOffered.id }

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

@@ -23,7 +23,7 @@ function aggregate(params) {
         // 集計対象プロジェクト検索
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'typeOf'],
+            inclusion: ['typeOf'],
             exclusion: []
         });
         // 予約集計

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/assetTransaction/cancelReservation.js

@@ -85,7 +85,7 @@ function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'typeOf'],
+            inclusion: ['typeOf'],
             exclusion: []
         });
         const { reserveTransaction, reservations } = yield validateStartParams(params)(repos);
@@ -141,7 +141,7 @@ function startAndConfirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'typeOf'],
+            inclusion: ['typeOf'],
             exclusion: []
         });
         const { reserveTransaction, reservations } = yield validateStartParams(params)(repos);

package/lib/chevre/service/assetTransaction/moneyTransfer.js

@@ -28,7 +28,7 @@ function start(params) {
         var _a;
         const issuedThroughId = fixIssuedThroughId(params);
         // location.issuedThroughIdからプロダクトをfixする
-        const products = yield repos.product.searchProducts({
+        const products = yield repos.product.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

package/lib/chevre/service/assetTransaction/pay/factory.d.ts

@@ -6,6 +6,6 @@ export declare function createStartParams(params: factory.assetTransaction.pay.I
     transactionNumber: string;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     amount: number;
-    paymentService?: factory.service.paymentService.IService | factory.product.IProduct;
+    paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'> | Pick<factory.product.IProduct, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'>;
     location?: factory.action.trade.pay.ILocation;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Pay>;

package/lib/chevre/service/assetTransaction/pay.js

@@ -268,7 +268,7 @@ function fixPaymentService(params) {
                 break;
             // PaymentCardの場合、プロダクト検索
             case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                paymentService = (yield repos.product.searchProducts({
+                paymentService = (yield repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },
@@ -280,13 +280,13 @@ function fixPaymentService(params) {
                 }
                 break;
             default:
-                paymentService = (yield repos.paymentService.searchPaymentServices({
+                paymentService = (yield repos.paymentService.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },
                     typeOf: { $eq: paymentServiceType },
                     id: { $eq: getPaymentServiceId(params) }
-                }, [], [])).shift();
+                }, ['availableChannel', 'serviceOutput', 'serviceType'], [])).shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
                 }

package/lib/chevre/service/assetTransaction/refund/factory.d.ts

@@ -6,5 +6,5 @@ export declare function createStartParams(params: factory.assetTransaction.refun
     transactionNumber: string;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     payAction: factory.action.trade.pay.IAction;
-    paymentService?: factory.product.IProduct | factory.service.paymentService.IService;
+    paymentService?: factory.product.IProduct | Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'typeOf' | 'serviceOutput'>;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Refund>;

package/lib/chevre/service/assetTransaction/refund.js

@@ -86,7 +86,7 @@ function fixPaymentService(params) {
                 break;
             // PaymentCardの場合、プロダクト検索
             case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                paymentService = (yield repos.product.searchProducts({
+                paymentService = (yield repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.payAction.project.id } },
@@ -98,13 +98,13 @@ function fixPaymentService(params) {
                 }
                 break;
             default:
-                paymentService = (yield repos.paymentService.searchPaymentServices({
+                paymentService = (yield repos.paymentService.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.payAction.project.id } },
                     typeOf: { $eq: params.paymentServiceType },
                     id: { $eq: paymentServiceId }
-                }, [], [])).shift();
+                }, ['availableChannel', 'serviceOutput', 'typeOf'], [])).shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
                 }

package/lib/chevre/service/assetTransaction/registerService.js

@@ -27,7 +27,7 @@ function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'typeOf'],
+            inclusion: ['typeOf'],
             exclusion: []
         });
         // objectはオファー
@@ -44,8 +44,7 @@ function start(params) {
             throw new factory.errors.ArgumentNull('object.itemOffered.id');
         }
         // プロダクト確認
-        // const product = await repos.product.findProductById({ id: productId }, [], []);
-        const product = (yield repos.product.searchProducts({
+        const product = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: productId }
@@ -138,12 +137,11 @@ function createTransactionObject(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        // const product = await repos.product.findProductById({ id: params.issuedThrough.id }, [], []);
-        const product = (yield repos.product.searchProducts({
+        const product = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }
-        }, [], [])).shift();
+        }, ['availableChannel'], [])).shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }

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

@@ -294,12 +294,12 @@ function validateProgramMembershipUsed(params) {
                 if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
                     throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
                 }
-                permitIssuedThrough = (yield repos.product.searchProducts({
+                permitIssuedThrough = (yield repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: issuedThroughId },
                     typeOf: { $eq: factory.product.ProductType.MembershipService }
-                }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+                }, ['typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
                 if (permitIssuedThrough === undefined) {
                     throw new factory.errors.NotFound(factory.product.ProductType.MembershipService);
                 }
@@ -309,12 +309,12 @@ function validateProgramMembershipUsed(params) {
                 if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
                     throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
                 }
-                permitIssuedThrough = (yield repos.paymentService.searchPaymentServices({
+                permitIssuedThrough = (yield repos.paymentService.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: issuedThroughId },
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard }
-                }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+                }, ['typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
                 if (permitIssuedThrough === undefined) {
                     throw new factory.errors.NotFound(factory.service.paymentService.PaymentServiceType.CreditCard);
                 }
@@ -331,10 +331,10 @@ function validateProgramMembershipUsed(params) {
             switch (permitIssuedThrough.typeOf) {
                 case factory.service.paymentService.PaymentServiceType.FaceToFace:
                     // 適用メンバーシップ条件有のオファーであれば、問答無用に受け入れる
-                    const eligibleMembershipType = (_g = (_f = params.availableOffer.eligibleMembershipType) === null || _f === void 0 ? void 0 : _f.shift()) === null || _g === void 0 ? void 0 : _g.codeValue;
+                    const eligibleMembershipType = (_g = (_f = params.availableOffer.eligibleMembershipType) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.codeValue;
                     if (typeof eligibleMembershipType === 'string') {
                         programMembershipUsed = {
-                            typeOf: factory.permit.PermitType.Permit,
+                            typeOf: factory.programMembership.ProgramMembershipType.ProgramMembership,
                             identifier: programMembershipUsedIdentifier,
                             issuedThrough: {
                                 serviceType: { codeValue: eligibleMembershipType },
@@ -355,7 +355,7 @@ function validateProgramMembershipUsed(params) {
                     }
                     if (typeof (issuedThroughServiceType === null || issuedThroughServiceType === void 0 ? void 0 : issuedThroughServiceType.codeValue) === 'string') {
                         programMembershipUsed = {
-                            typeOf: factory.permit.PermitType.Permit,
+                            typeOf: factory.programMembership.ProgramMembershipType.ProgramMembership,
                             identifier: programMembershipUsedIdentifier,
                             issuedThrough: {
                                 id: permitIssuedThrough.id,
@@ -390,7 +390,7 @@ function validateProgramMembershipUsed(params) {
                     }
                     if (((_h = permitIssuedThrough.serviceType) === null || _h === void 0 ? void 0 : _h.typeOf) === 'CategoryCode') {
                         programMembershipUsed = {
-                            typeOf: serviceOutput.typeOf,
+                            typeOf: factory.programMembership.ProgramMembershipType.ProgramMembership,
                             identifier: programMembershipUsedIdentifier,
                             issuedThrough: {
                                 id: permitIssuedThrough.id,
@@ -410,9 +410,7 @@ function validateProgramMembershipUsed(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        // const product = <Pick<factory.product.IProduct, 'availableChannel'>>
-        //     await repos.product.findProductById({ id: params.issuedThrough.id }, ['availableChannel'], []);
-        const product = (yield repos.product.searchProducts({
+        const product = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }

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

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createReservation = exports.createAdditionalTicketText = exports.createAdditionalProperty = void 0;
+const createDebug = require("debug");
 const moment = require("moment");
 const util = require("util");
 const factory = require("../../../../../factory");
 const price_1 = require("./price");
+const debug = createDebug('chevre-domain:service:assetTransaction');
 function createTicketIdentifier(params) {
     var _a, _b, _c, _d;
     // チケット識別子の規定値を作成
@@ -193,11 +195,12 @@ function validateEligibleSubReservation(params) {
     }
 }
 function validateEligibleMembershipType(params) {
+    debug('validateEligibleMembershipType: validating...', JSON.stringify(params.programMembershipUsed), JSON.stringify(params.availableOffer.eligibleMembershipType));
     const programMembershipUsed = params.programMembershipUsed;
     // 使用メンバーシップがeligibleMembershipに含まれればよい
     const eligibleMembershipType = params.availableOffer.eligibleMembershipType;
     if (Array.isArray(eligibleMembershipType)) {
-        if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) !== factory.permit.PermitType.Permit) {
+        if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) !== factory.programMembership.ProgramMembershipType.ProgramMembership) {
             throw new factory.errors.Argument('programMembershipUsed', 'programMembership required');
         }
         const { identifier, issuedThrough } = programMembershipUsed;

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

@@ -405,9 +405,7 @@ function getAcceptedSeatNumbersAndSeatSections(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        // const product = <Pick<factory.product.IProduct, 'availableChannel'>>
-        //     await repos.product.findProductById({ id: params.issuedThrough.id }, ['availableChannel'], []);
-        const product = (yield repos.product.searchProducts({
+        const product = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }

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

@@ -35,10 +35,6 @@ declare function getToken(params: {
      * jtw.payload.aud
      */
     audience: string;
-    /**
-     * payload.jtiを使用するかどうか
-     */
-    useJti: boolean;
 }): (repos: {
     authorization: AuthorizationRepo;
     ticket: TicketRepo;