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

package/lib/chevre/repo/ticket.js

@@ -13,6 +13,13 @@ exports.TicketRepo = void 0;
 const factory = require("../factory");
 const settings_1 = require("../settings");
 const ticket_1 = require("./mongoose/schemas/ticket");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'typeOf',
+    'ticketToken',
+    'dateIssued',
+    'issuedBy'
+];
 /**
  * チケットリポジトリ
  */
@@ -41,6 +48,7 @@ class TicketRepo {
      * 承認コードからチケットを発行する
      */
     issueByTicketToken(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { ticketToken, project, issuedBy } = params;
             const ticketIssuedBy = (typeof (issuedBy === null || issuedBy === void 0 ? void 0 : issuedBy.id) === 'string' && issuedBy.typeOf === factory.organizationType.Corporation)
@@ -53,19 +61,24 @@ class TicketRepo {
                 ticketToken,
                 typeOf: 'Ticket'
             };
-            const doc = yield this.ticketModel.create(creatingTicket);
-            return { id: doc.id };
+            const result = yield this.ticketModel.insertMany(creatingTicket, { rawResult: true });
+            const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+            if (typeof insertedId !== 'string') {
+                throw new factory.errors.Internal(`ticket not saved unexpectedly. result:${JSON.stringify(result)}`);
+            }
+            return { id: insertedId };
         });
     }
-    search(params) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = TicketRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.ticketModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-            // __v: 0,
-            // createdAt: 0,
-            // updatedAt: 0
-            });
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.ticketModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
@@ -75,8 +88,8 @@ class TicketRepo {
                 query.sort({ dateIssued: params.sort.dateIssued });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-20~
+                .exec();
         });
     }
 }

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

@@ -74,7 +74,7 @@ function createStartParams(params) {
     else if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
         const creditCardPaymentServiceOutput = (_l = params.paymentService) === null || _l === void 0 ? void 0 : _l.serviceOutput;
         const invoiceAsServiceOutput = (Array.isArray(creditCardPaymentServiceOutput))
-            ? creditCardPaymentServiceOutput.find((output) => output.typeOf === 'Invoice')
+            ? creditCardPaymentServiceOutput.find((output) => (output === null || output === void 0 ? void 0 : output.typeOf) === 'Invoice')
             : creditCardPaymentServiceOutput;
         // カード通貨区分が存在すれば適用
         if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {

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

@@ -24,7 +24,7 @@ function createStartParams(params) {
     if (((_g = params.paymentService) === null || _g === void 0 ? void 0 : _g.typeOf) === factory.service.paymentService.PaymentServiceType.CreditCard) {
         // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
         const invoiceAsServiceOutput = (Array.isArray(params.paymentService.serviceOutput))
-            ? params.paymentService.serviceOutput.find((output) => output.typeOf === 'Invoice')
+            ? params.paymentService.serviceOutput.find((output) => (output === null || output === void 0 ? void 0 : output.typeOf) === 'Invoice')
             : params.paymentService.serviceOutput;
         let paymentServiceOutputAmountCurrency;
         if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {

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

@@ -53,6 +53,7 @@ function createSubReservations(params) {
             });
             const programMembershipUsed = yield validateProgramMembershipUsed({
                 acceptedOffer,
+                availableOffer: ticketType,
                 project: { id: params.event.project.id }
             })(repos);
             // チケット作成
@@ -273,7 +274,7 @@ function validateAdvanceBookingRequirement(params) {
 function validateProgramMembershipUsed(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const now = new Date();
         let programMembershipUsed;
         const requestedProgramMembershipUsed = (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed;
@@ -293,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);
                 }
@@ -308,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);
                 }
@@ -329,32 +330,36 @@ function validateProgramMembershipUsed(params) {
             }
             switch (permitIssuedThrough.typeOf) {
                 case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                    // 問答無用に受け入れる
-                    programMembershipUsed = {
-                        typeOf: factory.permit.PermitType.Permit,
-                        identifier: programMembershipUsedIdentifier,
-                        issuedThrough: {
-                            typeOf: permitIssuedThrough.typeOf
-                        }
-                    };
+                    // 適用メンバーシップ条件有のオファーであれば、問答無用に受け入れる
+                    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.programMembership.ProgramMembershipType.ProgramMembership,
+                            identifier: programMembershipUsedIdentifier,
+                            issuedThrough: {
+                                serviceType: { codeValue: eligibleMembershipType },
+                                typeOf: permitIssuedThrough.typeOf
+                            }
+                        };
+                    }
                     break;
                 // 発行サービスがCreditCardのケースに対応(2023-09-01~)
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
                     // 決済サービスのserviceOutputにPermitが存在すれば、設定されたメンバーシップ区分のPermitをprogramMembershipUsedとして適用する
                     let issuedThroughServiceType;
                     if (Array.isArray(permitIssuedThrough.serviceOutput)) {
-                        const serviceOutputAsPermit = permitIssuedThrough.serviceOutput.find((output) => output.typeOf === factory.permit.PermitType.Permit);
+                        const serviceOutputAsPermit = permitIssuedThrough.serviceOutput.find((output) => (output === null || output === void 0 ? void 0 : output.typeOf) === factory.permit.PermitType.Permit);
                         if ((serviceOutputAsPermit === null || serviceOutputAsPermit === void 0 ? void 0 : serviceOutputAsPermit.typeOf) === factory.permit.PermitType.Permit) {
                             issuedThroughServiceType = serviceOutputAsPermit.issuedThrough.serviceType;
                         }
                     }
-                    if ((issuedThroughServiceType === null || issuedThroughServiceType === void 0 ? void 0 : issuedThroughServiceType.typeOf) === 'CategoryCode') {
+                    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,
-                                serviceType: issuedThroughServiceType,
+                                serviceType: { codeValue: issuedThroughServiceType.codeValue },
                                 typeOf: permitIssuedThrough.typeOf
                             }
                         };
@@ -383,13 +388,13 @@ function validateProgramMembershipUsed(params) {
                             .isBefore(moment(now))) {
                         throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
                     }
-                    if (((_f = permitIssuedThrough.serviceType) === null || _f === void 0 ? void 0 : _f.typeOf) === 'CategoryCode') {
+                    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,
-                                serviceType: permitIssuedThrough.serviceType,
+                                serviceType: { codeValue: permitIssuedThrough.serviceType.codeValue },
                                 typeOf: permitIssuedThrough.typeOf
                             }
                         };
@@ -405,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;

package/lib/chevre/service/code.js

@@ -39,22 +39,26 @@ function getToken(params) {
         if (typeof params.issuer !== 'string' || params.issuer.length === 0) {
             throw new factory.errors.ArgumentNull('issuer');
         }
-        let subject = authorization.id;
-        let typ = `${credentials.jwt.payloadTypPrefix}:${authorization.typeOf}`;
+        let subject;
+        let typ;
         let jti;
-        if (params.useJti) {
-            const { id } = yield repos.ticket.issueByTicketToken(Object.assign({ project: { id: params.project.id }, ticketToken: params.code }, (typeof ((_a = authorization.issuedBy) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { issuedBy: authorization.issuedBy } : undefined));
-            jti = id;
-            // ロール承認の場合、subjectはメンバーID,typはメンバータイプ
-            if (authorization.object.typeOf === factory.iam.RoleType.OrganizationRole) {
-                subject = authorization.object.member.id;
-                typ = `${credentials.jwt.payloadTypPrefix}:${authorization.object.member.typeOf}`;
-            }
-            else {
-                // useJtiの場合、subject,typはagent(2024-05-09~)
-                subject = params.agent.id;
-                typ = `${credentials.jwt.payloadTypPrefix}:${params.agent.typeOf}`;
-            }
+        // let subject: string = authorization.id;
+        // let typ: string = `${credentials.jwt.payloadTypPrefix}:${authorization.typeOf}`;
+        // jti必須化(2024-08-22~)
+        // let jti: string | undefined;
+        // if (params.useJti) {
+        // }
+        const { id } = yield repos.ticket.issueByTicketToken(Object.assign({ project: { id: params.project.id }, ticketToken: params.code }, (typeof ((_a = authorization.issuedBy) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { issuedBy: authorization.issuedBy } : undefined));
+        jti = id;
+        // ロール承認の場合、subjectはメンバーID,typはメンバータイプ
+        if (authorization.object.typeOf === factory.iam.RoleType.OrganizationRole) {
+            subject = authorization.object.member.id;
+            typ = `${credentials.jwt.payloadTypPrefix}:${authorization.object.member.typeOf}`;
+        }
+        else {
+            // useJtiの場合、subject,typはagent(2024-05-09~)
+            subject = params.agent.id;
+            typ = `${credentials.jwt.payloadTypPrefix}:${params.agent.typeOf}`;
         }
         const payload = {
             // sub: authorization.id, // 拡張(2024-05-01~)
@@ -110,12 +114,12 @@ function payload2authorizeObject(params) {
             // }
             if (typeof payload.jti === 'string') {
                 // jtiに対応(2024-05-08~)
-                const ticket = (yield repos.ticket.search({
+                const ticket = (yield repos.ticket.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },
                     id: { $eq: payload.jti }
-                })).shift();
+                }, ['ticketToken'])).shift();
                 if (ticket === undefined) {
                     throw new factory.errors.NotFound('Ticket');
                 }

package/lib/chevre/service/event.js

@@ -162,12 +162,12 @@ function processUpdateMovieTheater(params) {
         let processTime;
         try {
             // 同ブランチコードの販売者を検索する
-            const sellersWithSameBranchCode = yield repos.seller.search({
+            const sellersWithSameBranchCode = yield repos.seller.projectFields({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },
                 branchCode: { $eq: params.locationBranchCode }
-            }, ['_id'], []);
+            }, ['id'], []);
             const sellerWithSameBranchCode = sellersWithSameBranchCode.shift();
             if (typeof (sellerWithSameBranchCode === null || sellerWithSameBranchCode === void 0 ? void 0 : sellerWithSameBranchCode.id) !== 'string') {
                 throw new factory.errors.NotFound('Seller', `Seller with branchCode '${params.locationBranchCode}' not found`);
@@ -236,7 +236,7 @@ function saveScreeningEventSeries(params) {
             kubunClass: '043'
         });
         debug('kubunNames found.');
-        const availablePaymentMethodTypes = yield repos.categoryCode.search({
+        const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, ['additionalProperty', 'codeValue'], []);

package/lib/chevre/service/moneyTransfer.js

@@ -24,7 +24,7 @@ function authorize(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'settings', 'typeOf'],
+            inclusion: ['settings', 'typeOf'],
             exclusion: []
         });
         const transaction = yield repos.assetTransaction.findById({
@@ -329,9 +329,7 @@ function getIssuedThroughIdByAction(params) {
 function createPermitServiceCredentials(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        // const paymentCardService = <Pick<factory.product.IProduct, 'availableChannel'>>
-        //     await repos.product.findProductById({ id: params.issuedThrough.id }, ['availableChannel'], []);
-        const paymentCardService = (yield repos.product.searchProducts({
+        const paymentCardService = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id },

package/lib/chevre/service/notification.js

@@ -30,7 +30,7 @@ function sendEmailMessage(params) {
         var _a, _b, _c, _d, _e;
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'settings'],
+            inclusion: ['settings'],
             exclusion: []
         });
         const action = yield repos.action.start(createSendEmailMessageActionAttributes(params));

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

@@ -137,15 +137,45 @@ function acceptedOffers2amount(params) {
     return amount;
 }
 exports.acceptedOffers2amount = acceptedOffers2amount;
+function acceptedOffers2programMembershipUsed(params) {
+    const programMembershipUsed = [];
+    const permitIdentifiers = [];
+    params.acceptedOffers.forEach(({ itemOffered }) => {
+        var _a;
+        if (((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.programMembership.ProgramMembershipType.ProgramMembership) {
+            // メンバーシップコードに対してユニークに集計
+            if (!permitIdentifiers.includes(itemOffered.programMembershipUsed.identifier)) {
+                permitIdentifiers.push(itemOffered.programMembershipUsed.identifier);
+                const issuedThroughTypeOf = itemOffered.programMembershipUsed.issuedThrough.typeOf;
+                if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                    programMembershipUsed.push({
+                        typeOf: factory.permit.PermitType.Permit,
+                        identifier: itemOffered.programMembershipUsed.identifier,
+                        issuedThrough: { typeOf: issuedThroughTypeOf }
+                    });
+                }
+                else {
+                    programMembershipUsed.push({
+                        typeOf: factory.permit.PermitType.Permit,
+                        identifier: itemOffered.programMembershipUsed.identifier,
+                        issuedThrough: { typeOf: issuedThroughTypeOf, id: itemOffered.programMembershipUsed.issuedThrough.id }
+                    });
+                }
+            }
+        }
+    });
+    return programMembershipUsed;
+}
 function acceptedOffers2authorizeResult(params) {
     const { acceptedOffers, acceptedOffers4result, noOfferSpecified, ticketOffers } = params;
-    // const priceCurrency = acceptedOffers[0]?.priceSpecification?.priceCurrency;
     const priceCurrency = factory.priceCurrency.JPY; // fix(2024-07-03~)
     // redefine as typeOf: AggregateOffer(2024-06-18~)
     let offers;
     let price;
+    let programMembershipUsed = [];
     if (!noOfferSpecified) {
         price = acceptedOffers2amount({ acceptedOffers: acceptedOffers4result }); // オファー指定の場合のみ金額計算(2023-11-27~)
+        programMembershipUsed = acceptedOffers2programMembershipUsed({ acceptedOffers: acceptedOffers4result });
         // オファーIDごとに集計
         const offerIds = [...new Set(acceptedOffers.map((o) => o.id))];
         offers = offerIds.map((offerId) => {
@@ -153,10 +183,6 @@ function acceptedOffers2authorizeResult(params) {
             if (acceptedOffer === undefined) {
                 throw new factory.errors.Internal(`acceptedOffer not found [id:${offerId}]`);
             }
-            // const acceptedOffer = acceptedOffers.find(({ id }) => id === offerId);
-            // if (acceptedOffer === undefined) {
-            //     throw new factory.errors.Internal(`acceptedOffer not found [id:${offerId}]`);
-            // }
             const amountOfThisGood = acceptedOffers.filter(({ id }) => id === offerId).length;
             const { acceptedPaymentMethod, priceSpecification } = acceptedOffer;
             const unitPriceSpec = priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification
@@ -169,7 +195,9 @@ function acceptedOffers2authorizeResult(params) {
             return Object.assign({ id: offerId, includesObject: { amountOfThisGood }, typeOf: factory.offerType.Offer, priceSpecification: Object.assign(Object.assign({}, (eligibleQuantity !== undefined) ? { eligibleQuantity } : undefined), (eligibleTransactionVolume !== undefined) ? { eligibleTransactionVolume } : undefined) }, (acceptedPaymentMethod !== undefined) ? { acceptedPaymentMethod } : undefined);
         });
     }
-    return Object.assign(Object.assign({ typeOf: factory.offerType.AggregateOffer, priceCurrency, amount: [] }, (typeof price === 'number') ? { price } : undefined), (Array.isArray(offers)) ? { offers } : undefined);
+    return Object.assign(Object.assign({ typeOf: factory.offerType.AggregateOffer, priceCurrency, amount: [], itemOffered: {
+            serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
+        } }, (typeof price === 'number') ? { price } : undefined), (Array.isArray(offers)) ? { offers } : undefined);
 }
 exports.acceptedOffers2authorizeResult = acceptedOffers2authorizeResult;
 function responseBody2acceptedOffers4result(params) {

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

@@ -2,7 +2,6 @@ import * as factory from '../../../../../factory';
 import type { JWTCredentials } from '../../../../../credentials/jwt';
 import type { ActionRepo } from '../../../../../repo/action';
 import type { AuthorizationRepo } from '../../../../../repo/authorization';
-import type { OwnershipInfoRepo } from '../../../../../repo/ownershipInfo';
 import type { TicketRepo } from '../../../../../repo/ticket';
 /**
  * チケット化された適用メンバーシップをPermitに変換する
@@ -18,7 +17,6 @@ declare function requestedProgramMembershipUsed2permit(params: {
 }): (repos: {
     action: ActionRepo;
     authorization: AuthorizationRepo;
-    ownershipInfo: OwnershipInfoRepo;
     ticket: TicketRepo;
 }, credentials: {
     jwt: JWTCredentials;