@chevre/domain 22.2.0-alpha.0 → 22.2.0-alpha.10

package/example/src/chevre/{projectReservationFieldsById.ts → projectOwnershipInfoFieldsById.ts}

@@ -8,12 +8,12 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
-    const result = await reservationRepo.projectFieldsById(
+    const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
+    const result = await ownershipInfoRepo.projectFieldsById(
         {
-            id: '948926445022844-0',
-            inclusion: ['reservationStatus', 'reservationFor.id']
+            id: 'd9080760-1bdb-49cf-86eb-50f98fab0010'
         }
+        // ['id', 'typeOfGood']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });

package/lib/chevre/repo/authorization.d.ts

@@ -36,7 +36,9 @@ export declare class AuthorizationRepo {
         };
         id: string;
     }): Promise<Pick<IFindValidOneResult, 'object'>>;
-    search(params: factory.authorization.ISearchConditions): Promise<factory.authorization.IAuthorization[]>;
+    projectFields(params: factory.authorization.ISearchConditions): Promise<(factory.authorization.IAuthorization & {
+        id: string;
+    })[]>;
     /**
      * 有効期限を一定期間過ぎた承認を削除する
      */

package/lib/chevre/repo/authorization.js

@@ -114,14 +114,17 @@ class AuthorizationRepo {
                 code: { $eq: String(params.code) },
                 validFrom: { $lte: now },
                 validUntil: { $gte: now }
-            }, { object: 1, _id: 1, typeOf: 1, audience: 1, issuedBy: 1 })
-                // projection的にleanで十分
-                // .lean<Pick<factory.authorization.IAuthorization, 'object'>>()
+            }, {
+                _id: 0,
+                id: { $toString: '$_id' },
+                object: 1, typeOf: 1, audience: 1, issuedBy: 1
+            })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.authorizationModel.modelName);
             }
-            const { id, object, typeOf, audience, issuedBy } = doc.toObject();
+            const { id, object, typeOf, audience, issuedBy } = doc;
             return Object.assign(Object.assign({ id, object, typeOf }, (typeof (issuedBy === null || issuedBy === void 0 ? void 0 : issuedBy.id) === 'string') ? { issuedBy } : undefined), (typeof (audience === null || audience === void 0 ? void 0 : audience.id) === 'string') ? { audience } : undefined);
         });
     }
@@ -145,14 +148,22 @@ class AuthorizationRepo {
             return doc;
         });
     }
-    search(params) {
+    projectFields(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = AuthorizationRepo.CREATE_MONGO_CONDITIONS(params);
             const query = this.authorizationModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-            // __v: 0,
-            // createdAt: 0,
-            // updatedAt: 0
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                code: 1,
+                object: 1,
+                validFrom: 1,
+                validUntil: 1,
+                audience: 1,
+                author: 1,
+                issuedBy: 1
             });
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
@@ -165,8 +176,8 @@ class AuthorizationRepo {
                 query.sort({ validFrom: params.sort.validFrom });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean()
+                .exec();
         });
     }
     /**

package/lib/chevre/repo/categoryCode.d.ts

@@ -45,13 +45,17 @@ export declare class CategoryCodeRepo {
     /**
      * 検索
      */
-    search(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
+    search(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<(factory.categoryCode.ICategoryCode & {
+        id: string;
+    })[]>;
     save(params: {
         id?: string;
         attributes: factory.categoryCode.ICategoryCode & {
             $unset?: IUnset;
         };
-    }): Promise<factory.categoryCode.ICategoryCode>;
+    }): Promise<factory.categoryCode.ICategoryCode & {
+        id: string;
+    }>;
     saveManyByCodeValue(params: {
         attributes: factory.categoryCode.ICategoryCode;
         upsert?: boolean;

package/lib/chevre/repo/ownershipInfo.d.ts

@@ -24,7 +24,9 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
-export type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>;
+export type IOwnershipInfoWithId = factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+    id: string;
+};
 /**
  * 所有権リポジトリ
  */
@@ -35,14 +37,16 @@ export declare class OwnershipInfoRepo {
     /**
      * なければ作成する
      */
-    createIfNotExistByIdentifier(ownershipInfo: IOwnershipInfo): Promise<IOwnershipInfo>;
-    findById(params: {
+    createIfNotExistByIdentifier(ownershipInfo: Omit<IOwnershipInfoWithId, 'id'>): Promise<{
         id: string;
-    }, projection?: any): Promise<IOwnershipInfo>;
+    }>;
+    projectFieldsById(params: {
+        id: string;
+    }, inclusion?: (keyof IOwnershipInfoWithId)[]): Promise<IOwnershipInfoWithId>;
     /**
      * 所有権を検索する
      */
-    search(params: factory.ownershipInfo.ISearchConditions, projection?: any): Promise<IOwnershipInfo[]>;
+    search(params: factory.ownershipInfo.ISearchConditions, projection?: any): Promise<IOwnershipInfoWithId[]>;
     /**
      * 識別子から所有期限を変更する
      * 存在しない場合undefinedを返す
@@ -53,7 +57,7 @@ export declare class OwnershipInfoRepo {
         };
         identifier: string;
         ownedThrough: Date;
-    }): Promise<IOwnershipInfo | undefined>;
+    }): Promise<IOwnershipInfoWithId | undefined>;
     /**
      * 所有者の所有権を全て削除する
      */

package/lib/chevre/repo/ownershipInfo.js

@@ -233,11 +233,14 @@ class OwnershipInfoRepo {
                     new: true,
                     upsert: true,
                     projection: {
-                        __v: 0,
-                        createdAt: 0,
-                        updatedAt: 0
+                        _id: 0,
+                        id: { $toString: '$_id' }
+                        // __v: 0,
+                        // createdAt: 0,
+                        // updatedAt: 0
                     }
                 })
+                    .lean()
                     .exec();
             }
             catch (error) {
@@ -254,26 +257,50 @@ class OwnershipInfoRepo {
             if (duplicate) {
                 // 重複の場合、再度取得
                 doc = yield this.ownershipInfoModel.findOne({ identifier: { $eq: ownershipInfo.identifier } }, {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                    // __v: 0,
+                    // createdAt: 0,
+                    // updatedAt: 0
                 })
+                    .lean()
                     .exec();
             }
             if (doc === undefined || doc === null) {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
-            return doc.toObject();
+            return { id: doc.id };
+            // return <IOwnershipInfo>doc.toObject();
         });
     }
-    findById(params, projection) {
+    projectFieldsById(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.ownershipInfoModel.findById(params.id, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            let projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                identifier: 1,
+                ownedBy: 1,
+                acquiredFrom: 1,
+                ownedFrom: 1,
+                ownedThrough: 1,
+                typeOfGood: 1
+            };
+            const positiveProjectionFields = (Array.isArray(inclusion))
+                ? inclusion.filter((key) => key !== 'id' && String(key) !== '_id')
+                : undefined;
+            if (Array.isArray(positiveProjectionFields)) {
+                projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            }
+            const doc = yield this.ownershipInfoModel.findOne({ _id: { $eq: params.id } }, projection)
+                .lean() // lean(2024-08-15~)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
-            return doc.toObject();
+            return doc;
+            // return doc.toObject();
         });
     }
     /**

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/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/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);
             // チケット作成
@@ -271,61 +272,94 @@ function validateAdvanceBookingRequirement(params) {
     }
 }
 function validateProgramMembershipUsed(params) {
-    // tslint:disable-next-line:max-func-body-length
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        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;
         if (typeof requestedProgramMembershipUsed === 'string') {
-            throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'must be object');
+            throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'must be permit');
+        }
+        if ((requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.typeOf) === 'Ticket') {
+            throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'must be permit');
         }
         const programMembershipUsedIdentifier = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.identifier;
-        const issuedThroughId = (_c = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _c === void 0 ? void 0 : _c.id;
-        if (typeof programMembershipUsedIdentifier === 'string' && programMembershipUsedIdentifier.length > 0) {
-            if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {
-                throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
-            }
+        const issuedThroughTypeOf = (_c = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _c === void 0 ? void 0 : _c.typeOf;
+        if (typeof programMembershipUsedIdentifier === 'string') {
             let permitIssuedThrough;
             // まずメンバーシップを検索して、存在しなければCreditCardを検索(どちらが発行元サービスか不明なので)
-            permitIssuedThrough = (yield repos.product.searchProducts({
-                limit: 1,
-                page: 1,
-                id: { $eq: issuedThroughId },
-                typeOf: { $eq: factory.product.ProductType.MembershipService }
-            }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
-            if (permitIssuedThrough === undefined) {
+            if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
+                const issuedThroughId = (_d = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _d === void 0 ? void 0 : _d.id;
+                if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
+                    throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
+                }
+                permitIssuedThrough = (yield repos.product.searchProducts({
+                    limit: 1,
+                    page: 1,
+                    id: { $eq: issuedThroughId },
+                    typeOf: { $eq: factory.product.ProductType.MembershipService }
+                }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+                if (permitIssuedThrough === undefined) {
+                    throw new factory.errors.NotFound(factory.product.ProductType.MembershipService);
+                }
+            }
+            else if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                const issuedThroughId = (_e = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _e === void 0 ? void 0 : _e.id;
+                if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
+                    throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
+                }
                 permitIssuedThrough = (yield repos.paymentService.searchPaymentServices({
                     limit: 1,
                     page: 1,
                     id: { $eq: issuedThroughId },
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard }
                 }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+                if (permitIssuedThrough === undefined) {
+                    throw new factory.errors.NotFound(factory.service.paymentService.PaymentServiceType.CreditCard);
+                }
+            }
+            else if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                // プロダクトは存在しないので特に検証なし
+                permitIssuedThrough = {
+                    typeOf: factory.service.paymentService.PaymentServiceType.FaceToFace
+                };
             }
-            if (typeof (permitIssuedThrough === null || permitIssuedThrough === void 0 ? void 0 : permitIssuedThrough.typeOf) !== 'string') {
-                throw new factory.errors.NotFound(`Permit issuer service [${issuedThroughId}]`);
+            else {
+                throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
             }
-            // permitIssuedThrough =
-            //     await repos.product.findById({ id: issuedThroughId }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], []);
             switch (permitIssuedThrough.typeOf) {
+                case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                    // 適用メンバーシップ条件有のオファーであれば、問答無用に受け入れる
+                    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,
+                            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 = {
-                            project: permitIssuedThrough.project,
                             typeOf: factory.permit.PermitType.Permit,
                             identifier: programMembershipUsedIdentifier,
                             issuedThrough: {
                                 id: permitIssuedThrough.id,
-                                serviceType: issuedThroughServiceType,
+                                serviceType: { codeValue: issuedThroughServiceType.codeValue },
                                 typeOf: permitIssuedThrough.typeOf
                             }
                         };
@@ -336,7 +370,7 @@ function validateProgramMembershipUsed(params) {
                     break;
                 case factory.product.ProductType.MembershipService:
                     // requestedProgramMembershipUsedの発行サービスIDから外部連携設定を取得する
-                    const permitService = yield createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
+                    const permitService = yield createPermitService({ issuedThrough: { id: permitIssuedThrough.id } })(repos);
                     // メンバーシップの存在確認
                     const serviceOutput = yield permitService.findByIdentifier({
                         project: { id: params.project.id },
@@ -354,12 +388,17 @@ function validateProgramMembershipUsed(params) {
                             .isBefore(moment(now))) {
                         throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
                     }
-                    programMembershipUsed = {
-                        project: serviceOutput.project,
-                        typeOf: serviceOutput.typeOf,
-                        identifier: serviceOutput.identifier,
-                        issuedThrough: serviceOutput.issuedThrough
-                    };
+                    if (((_h = permitIssuedThrough.serviceType) === null || _h === void 0 ? void 0 : _h.typeOf) === 'CategoryCode') {
+                        programMembershipUsed = {
+                            typeOf: serviceOutput.typeOf,
+                            identifier: programMembershipUsedIdentifier,
+                            issuedThrough: {
+                                id: permitIssuedThrough.id,
+                                serviceType: { codeValue: permitIssuedThrough.serviceType.codeValue },
+                                typeOf: permitIssuedThrough.typeOf
+                            }
+                        };
+                    }
                     break;
                 default:
                     throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', `${permitIssuedThrough.typeOf} not implemented`);

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,15 +195,23 @@ 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 (typeof (programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) !== 'string' || programMembershipUsed.typeOf.length === 0) {
+        if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) !== factory.permit.PermitType.Permit) {
             throw new factory.errors.Argument('programMembershipUsed', 'programMembership required');
         }
+        const { identifier, issuedThrough } = programMembershipUsed;
+        if (typeof identifier !== 'string' || identifier === '') {
+            throw new factory.errors.Argument('programMembershipUsed', 'programMembership.identifier required');
+        }
         // programMembershipUsed.issuedThrough.serviceTypeで検証する
-        const isEligible = eligibleMembershipType.some((membershipType) => { var _a, _b; return membershipType.codeValue === ((_b = (_a = programMembershipUsed.issuedThrough) === null || _a === void 0 ? void 0 : _a.serviceType) === null || _b === void 0 ? void 0 : _b.codeValue); });
+        const isEligible = eligibleMembershipType.some((membershipType) => 
+        // FaceToFaceについては問答無用に受け入れる(2024-08-14~)
+        issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace
+            || membershipType.codeValue === issuedThrough.serviceType.codeValue);
         if (!isEligible) {
             throw new factory.errors.Argument('programMembershipUsed', `${programMembershipUsed.identifier} is not eligible for the offer ${params.availableOffer.id}`);
         }

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

@@ -137,15 +137,31 @@ 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.permit.PermitType.Permit) {
+            // メンバーシップコードに対してユニークに集計
+            if (!permitIdentifiers.includes(itemOffered.programMembershipUsed.identifier)) {
+                permitIdentifiers.push(itemOffered.programMembershipUsed.identifier);
+                programMembershipUsed.push(itemOffered.programMembershipUsed);
+            }
+        }
+    });
+    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 +169,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 +181,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

@@ -0,0 +1,24 @@
+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 { TicketRepo } from '../../../../../repo/ticket';
+/**
+ * チケット化された適用メンバーシップをPermitに変換する
+ */
+declare function requestedProgramMembershipUsed2permit(params: {
+    project: {
+        id: string;
+    };
+    programMembershipUsed?: factory.assetTransaction.reserve.IAcceptedProgramMembershipUsed;
+    placeOrder: {
+        id: string;
+    };
+}): (repos: {
+    action: ActionRepo;
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
+}, credentials: {
+    jwt: JWTCredentials;
+}) => Promise<factory.assetTransaction.reserve.IPermitIssuedThroughFaceToFace | factory.assetTransaction.reserve.IPermitIssuedThroughMembershipService | undefined>;
+export { requestedProgramMembershipUsed2permit };

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

@@ -0,0 +1,127 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requestedProgramMembershipUsed2permit = void 0;
+const factory = require("../../../../../factory");
+const CodeService = require("../../../../code");
+/**
+ * チケット化された適用メンバーシップをPermitに変換する
+ */
+function requestedProgramMembershipUsed2permit(params) {
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
+    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        let programMembershipUsedAsPermit;
+        const { programMembershipUsed, placeOrder } = params;
+        // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
+        if (typeof programMembershipUsed === 'string') {
+            const { authorizedObject } = yield CodeService.verifyToken({
+                project: { id: params.project.id },
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                token: String(programMembershipUsed)
+            })(repos, credentials);
+            const permitOwnershipInfo = authorizedObject;
+            if (Array.isArray(permitOwnershipInfo)) {
+                throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');
+            }
+            if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
+                throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
+            }
+            const typeOfGood = permitOwnershipInfo.typeOfGood;
+            if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+                throw new factory.errors.Argument('programMembershipUsed', 'must be Permit');
+            }
+            const issuedThroughTypeOf = (_a = typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf;
+            if (issuedThroughTypeOf !== factory.product.ProductType.MembershipService) {
+                throw new factory.errors.Argument('programMembershipUsed', 'must be issued through MembershipService');
+            }
+            if (typeof ((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) !== 'string') {
+                throw new factory.errors.NotFound('itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
+            }
+            if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
+                programMembershipUsedAsPermit = {
+                    identifier: typeOfGood.identifier,
+                    issuedThrough: { id: typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                    typeOf: factory.permit.PermitType.Permit
+                };
+            }
+            else {
+                throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
+            }
+        }
+        else if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) === 'Ticket') {
+            const { ticketToken } = programMembershipUsed;
+            if (typeof ticketToken === 'string') {
+                const ticket = (yield repos.ticket.search({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    ticketToken: { $eq: ticketToken }
+                })).shift();
+                if (ticket === undefined) {
+                    throw new factory.errors.NotFound('Ticket');
+                }
+                // 承認を参照
+                const { audience, object } = yield repos.authorization.findValidOneByCode({
+                    project: { id: params.project.id },
+                    code: ticket.ticketToken
+                });
+                if (object.typeOf !== 'OwnershipInfo') {
+                    throw new factory.errors.Argument('programMembershipUsed', 'invalid authorization');
+                }
+                // const ownershipInfoId = object.id;
+                // const permitOwnershipInfo = (await repos.ownershipInfo.search({
+                //     limit: 1,
+                //     page: 1,
+                //     project: { id: { $eq: params.project.id } },
+                //     ids: [ownershipInfoId],
+                //     ownedFrom: now,
+                //     ownedThrough: now
+                // })).shift();
+                // if (permitOwnershipInfo === undefined) {
+                //     throw new factory.errors.NotFound('OwnershipInfo');
+                // }
+                // audience検証
+                if ((audience === null || audience === void 0 ? void 0 : audience.typeOf) !== factory.transactionType.PlaceOrder || audience.id !== placeOrder.id) {
+                    throw new factory.errors.Argument('programMembershipUsed', 'audience not matched with placeOrder');
+                }
+                const permitOwnershipInfo = object;
+                if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+                    throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
+                }
+                const issuedThroughTypeOf = (_c = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _c === void 0 ? void 0 : _c.typeOf;
+                if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                    programMembershipUsedAsPermit = {
+                        identifier: permitOwnershipInfo.typeOfGood.identifier,
+                        issuedThrough: { typeOf: issuedThroughTypeOf },
+                        typeOf: factory.permit.PermitType.Permit
+                    };
+                }
+                else if (issuedThroughTypeOf === factory.product.ProductType.MembershipService
+                    || issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                    if (typeof ((_d = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _d === void 0 ? void 0 : _d.id) !== 'string') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
+                    }
+                    programMembershipUsedAsPermit = {
+                        identifier: permitOwnershipInfo.typeOfGood.identifier,
+                        issuedThrough: { id: permitOwnershipInfo.typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                        typeOf: factory.permit.PermitType.Permit
+                    };
+                }
+                else {
+                    throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
+                }
+            }
+        }
+        return programMembershipUsedAsPermit;
+    });
+}
+exports.requestedProgramMembershipUsed2permit = requestedProgramMembershipUsed2permit;

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

@@ -12,8 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processStartReserve4chevre = void 0;
 const factory = require("../../../../factory");
 const ReserveTransactionService = require("../../../assetTransaction/reserve");
-const CodeService = require("../../../code");
 const factory_1 = require("./factory");
+const requestedProgramMembershipUsed2permit_1 = require("./processStartReserve4chevre/requestedProgramMembershipUsed2permit");
 function processStartReserve4chevre(params, options) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         const { event, transaction, transactionNumber } = params;
@@ -23,7 +23,7 @@ function processStartReserve4chevre(params, options) {
             // object: <IObjectWithDetail>action.object,
             acceptedOffers: params.acceptedOffers, event: { id: event.id }, transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));
-        const startParamObject = yield validateObjectWithoutDetail(startParams)(repos, credentials);
+        const startParamObject = yield validateObjectWithoutDetail(startParams, { id: params.transaction.id })(repos, credentials);
         const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, 
             // discontinue preSearchedEvent(2024-07-17~)
             // preSearchedEvent: event,
@@ -44,41 +44,21 @@ function processStartReserve4chevre(params, options) {
     });
 }
 exports.processStartReserve4chevre = processStartReserve4chevre;
-function validateObjectWithoutDetail(params) {
+function validateObjectWithoutDetail(params, placeOrder) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const objectWithoutDetail = params.object;
         if (Array.isArray(objectWithoutDetail.acceptedOffer)) {
             const validatedAcceptedOffersWithoutDetail = [];
             for (let acceptedOffer of objectWithoutDetail.acceptedOffer) {
-                let programMembershipUsed = (_b = (_a = acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed;
-                // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
-                if (typeof programMembershipUsed === 'string' && programMembershipUsed.length > 0) {
-                    const { authorizedObject } = yield CodeService.verifyToken({
-                        project: params.project,
-                        agent: params.project,
-                        token: String(programMembershipUsed)
-                    })(repos, credentials);
-                    const permitOwnershipInfo = authorizedObject;
-                    if (Array.isArray(permitOwnershipInfo)) {
-                        throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');
-                    }
-                    if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
-                        throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
-                    }
-                    if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-                        throw new factory.errors.Argument('programMembershipUsed', 'must be Permit');
-                    }
-                    const typeOfGood = permitOwnershipInfo.typeOfGood;
-                    const issuedThroughId = (_c = typeOfGood.issuedThrough) === null || _c === void 0 ? void 0 : _c.id;
-                    if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {
-                        throw new factory.errors.NotFound('itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
-                    }
-                    programMembershipUsed = {
-                        identifier: String(typeOfGood.identifier),
-                        issuedThrough: { id: issuedThroughId }
-                    };
-                    acceptedOffer = Object.assign(Object.assign({}, acceptedOffer), { itemOffered: Object.assign(Object.assign({}, acceptedOffer.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_d = acceptedOffer.itemOffered) === null || _d === void 0 ? void 0 : _d.serviceOutput), { typeOf: factory.reservationType.EventReservation, programMembershipUsed }) }) });
+                const programMembershipUsedAsPermit = yield (0, requestedProgramMembershipUsed2permit_1.requestedProgramMembershipUsed2permit)({
+                    project: { id: params.project.id },
+                    programMembershipUsed: (_b = (_a = acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed,
+                    placeOrder: { id: placeOrder.id }
+                })(repos, credentials);
+                // 適用メンバーシップがあればacceptedOfferを強制的に上書き
+                if (programMembershipUsedAsPermit !== undefined) {
+                    acceptedOffer = Object.assign(Object.assign({}, acceptedOffer), { itemOffered: Object.assign(Object.assign({}, acceptedOffer.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_c = acceptedOffer.itemOffered) === null || _c === void 0 ? void 0 : _c.serviceOutput), { typeOf: factory.reservationType.EventReservation, programMembershipUsed: programMembershipUsedAsPermit }) }) });
                 }
                 validatedAcceptedOffersWithoutDetail.push(acceptedOffer);
             }

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

@@ -4,6 +4,8 @@ declare function coaTicket2offer(params: {
     theaterCode: string;
     ticketResult: COA.factory.master.ITicketResult;
     defaultCurrencyType?: factory.categoryCode.ICategoryCode;
-    defaultMembershipType?: factory.categoryCode.ICategoryCode;
+    defaultMembershipType?: factory.categoryCode.ICategoryCode & {
+        id: string;
+    };
 }): factory.aggregateOffer.ISubOffer;
 export { coaTicket2offer };

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

@@ -86,7 +86,8 @@ function sendOrder(params) {
                 typeOf: factory.actionType.SendAction
             };
             const action = yield repos.action.start(sendOrderActionAttributes);
-            let ownershipInfos = [];
+            let creatingOwnershipInfos = [];
+            let createdOwnershipInfos = [];
             let allOffersDelivered = false;
             let acceptedOffers;
             // 所有権生成を最小化(2024-03-01~)
@@ -111,12 +112,15 @@ function sendOrder(params) {
                 debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
                 // 所有権作成
                 if (createOwnerships) {
-                    ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+                    creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
                         order: Object.assign(Object.assign({}, order), { acceptedOffers }),
                         offerIndexBase
                     });
-                    ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
-                        return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
+                    createdOwnershipInfos = yield Promise.all(creatingOwnershipInfos.map((creatingOwnershipInfo) => __awaiter(this, void 0, void 0, function* () {
+                        const { id } = yield repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
+                        return Object.assign({ id }, (typeof creatingOwnershipInfo.identifier === 'string')
+                            ? { identifier: creatingOwnershipInfo.identifier }
+                            : undefined);
                     })));
                 }
                 // const deliveredCount = limit * page;
@@ -140,7 +144,7 @@ function sendOrder(params) {
                 }
                 throw error;
             }
-            const result = ownershipInfos;
+            const result = createdOwnershipInfos;
             yield repos.action.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
             debug('allOffersDelivered?:', allOffersDelivered, order.orderNumber);
             if (params.useOnOrderStatusChanged) {

package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.d.ts

@@ -1,6 +1,5 @@
 import * as factory from '../../../factory';
 import type { AuthorizationRepo } from '../../../repo/authorization';
-import type { OwnershipInfoRepo } from '../../../repo/ownershipInfo';
 import type { TicketRepo } from '../../../repo/ticket';
 type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
     ticketToken?: string;
@@ -14,7 +13,6 @@ declare function verifyTicketTokenAsNeeded(params: {
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
 }): (repos: {
     authorization: AuthorizationRepo;
-    ownershipInfo: OwnershipInfoRepo;
     ticket: TicketRepo;
 }) => Promise<{
     permit: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'> | undefined;

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

@@ -13,7 +13,7 @@ exports.verifyTicketTokenAsNeeded = void 0;
 const factory = require("../../../factory");
 function verifyTicketTokenAsNeeded(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { paymentServiceType, object, project } = params;
         const { ticketToken } = object;
         let permit;
@@ -41,32 +41,29 @@ function verifyTicketTokenAsNeeded(params) {
                     if (authorizedObject.typeOf !== 'OwnershipInfo') {
                         throw new factory.errors.Argument('ticketToken', 'must be OwnershipInfo');
                     }
-                    const ownershipInfoId = authorizedObject.id;
-                    const permitOwnershipInfo = (yield repos.ownershipInfo.search({
-                        limit: 1,
-                        page: 1,
-                        project: { id: { $eq: params.project.id } },
-                        ids: [ownershipInfoId]
-                    })).shift();
-                    if (permitOwnershipInfo === undefined) {
-                        throw new factory.errors.NotFound('OwnershipInfo');
+                    // audience検証
+                    if (((_a = validAuthorization.audience) === null || _a === void 0 ? void 0 : _a.typeOf) !== factory.transactionType.PlaceOrder
+                        || validAuthorization.audience.id !== params.purpose.id) {
+                        throw new factory.errors.Argument('ticketToken', 'audience not matched with placeOrder');
                     }
-                    const { ownedBy, typeOfGood } = permitOwnershipInfo;
+                    const permitOwnershipInfo = authorizedObject;
+                    // const ownershipInfoId = authorizedObject.id;
+                    // const permitOwnershipInfo = (await repos.ownershipInfo.search({
+                    //     limit: 1,
+                    //     page: 1,
+                    //     project: { id: { $eq: params.project.id } },
+                    //     ids: [ownershipInfoId]
+                    // })).shift();
+                    // if (permitOwnershipInfo === undefined) {
+                    //     throw new factory.errors.NotFound('OwnershipInfo');
+                    // }
+                    const { typeOfGood } = permitOwnershipInfo;
                     if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
                         throw new factory.errors.Argument('ticketToken', 'must be Permit');
                     }
-                    if (((_a = typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) !== paymentServiceType) {
+                    if (((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) !== paymentServiceType) {
                         throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
                     }
-                    if (!Array.isArray(ownedBy)) {
-                        throw new factory.errors.Argument('ticketToken', 'ownershipInfo.ownedBy must be Array');
-                    }
-                    if (ownedBy[0].typeOf !== factory.transactionType.PlaceOrder) {
-                        throw new factory.errors.Argument('ticketToken', 'ownershipInfo.ownedBy.typeOf must be PlaceOrder');
-                    }
-                    if (ownedBy[0].id !== params.purpose.id) {
-                        throw new factory.errors.Argument('ticketToken', 'ownershipInfo.ownedBy.id not matched');
-                    }
                     permit = { identifier: typeOfGood.identifier };
                 }
                 break;

package/lib/chevre/service/payment/any.d.ts

@@ -10,7 +10,6 @@ import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../repo/confirmationNumber';
 import type { EventRepo } from '../../repo/event';
-import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { PaymentServiceRepo } from '../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { ProductRepo } from '../../repo/product';
@@ -80,7 +79,6 @@ interface IAuthorizeRepos {
     authorization: AuthorizationRepo;
     confirmationNumber: ConfirmationNumberRepo;
     event: EventRepo;
-    ownershipInfo: OwnershipInfoRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

package/lib/chevre/service/report/ownershipInfo.d.ts

@@ -21,5 +21,7 @@ export interface IOwnershipInfoReport {
     };
 }
 export declare function ownershipInfo2report(params: {
-    ownershipInfo: factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>;
+    ownershipInfo: factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+        id: string;
+    };
 }): IOwnershipInfoReport;

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

@@ -17,7 +17,6 @@ const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const confirmationNumber_1 = require("../../repo/confirmationNumber");
 const event_1 = require("../../repo/event");
-const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
@@ -55,7 +54,6 @@ function call(params) {
                 authorization: new authorization_1.AuthorizationRepo(connection),
                 confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo(redisClient),
                 event: new event_1.EventRepo(connection),
-                ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),

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

@@ -70,7 +70,7 @@ function onAuthorizationCreated(params) {
                 // 所有権検索
                 const ownershipInfoId = authorization.object.id;
                 if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
-                    const ownershipInfo = yield repos.ownershipInfo.findById({ id: ownershipInfoId });
+                    const ownershipInfo = yield repos.ownershipInfo.projectFieldsById({ id: ownershipInfoId }, ['typeOfGood']);
                     // 座席予約に対する所有権であれば発券
                     if (ownershipInfo.typeOfGood.typeOf === factory.reservationType.EventReservation
                         || ownershipInfo.typeOfGood.typeOf === factory.reservationType.BusReservation) {

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

@@ -368,6 +368,7 @@ function processMoneyTransferTransaction(params) {
         return pendingTransaction;
     });
 }
+// tslint:disable-next-line:max-func-body-length
 function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
@@ -389,10 +390,13 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
             if (paymentCardOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
                 throw new factory.errors.Argument('fromLocation', 'must be Permit');
             }
+            if (((_a = paymentCardOwnershipInfo.typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) !== factory.product.ProductType.PaymentCard) {
+                throw new factory.errors.Argument('fromLocation', 'must be issued through PaymentCard');
+            }
             fromLocation = {
                 typeOf: paymentCardOwnershipInfo.typeOfGood.typeOf,
                 identifier: paymentCardOwnershipInfo.typeOfGood.identifier,
-                issuedThrough: { id: String((_a = paymentCardOwnershipInfo.typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.id) }
+                issuedThrough: { id: paymentCardOwnershipInfo.typeOfGood.issuedThrough.id }
             };
         }
         else {

package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts

@@ -41,7 +41,7 @@ export declare function validatePaymentMethods(params: {
  * 興行オファー適用条件確認
  */
 export declare function validateEventOffers(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: Pick<factory.transaction.placeOrder.IOrderAsResult, 'price'>;
     paymentMethods: factory.order.IReferencedInvoice[];
     authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'instrument' | 'object' | 'result'>[];
 }): void;

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

@@ -350,11 +350,12 @@ exports.validatePaymentMethods = validatePaymentMethods;
 // tslint:disable-next-line:max-func-body-length
 function validateEventOffers(params) {
     var _a, _b;
-    const firstCreditCardPaymentMethodIdentifier = (_b = (_a = params.paymentMethods.find((referenceInvoice) => {
+    const { paymentMethods } = params;
+    const firstCreditCardPaymentMethodIdentifier = (_b = (_a = paymentMethods.find((referenceInvoice) => {
         return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
     })) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
-    const numCreditCardOrFaceToFacePaymentMethod = params.paymentMethods.filter((referenceInvoice) => {
+    const numCreditCardOrFaceToFacePaymentMethod = paymentMethods.filter((referenceInvoice) => {
         return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
     }).length;
@@ -411,5 +412,38 @@ function validateEventOffers(params) {
             });
         }
     });
+    // check programMembershipUsed(2024-08-15~)
+    const programMembershipRequired = params.authorizeEventServiceOfferActions.reduce((a, b) => {
+        var _a, _b;
+        const programMembershipUsedfromResult = (_b = (_a = b.result) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput.programMembershipUsed;
+        if (Array.isArray(programMembershipUsedfromResult)) {
+            a.push(...programMembershipUsedfromResult);
+        }
+        return a;
+    }, []);
+    const satisfyProgramMembershipRequirement = programMembershipRequired.every(({ identifier, issuedThrough }) => {
+        let satisfyThisRequirement = false;
+        switch (issuedThrough.typeOf) {
+            case factory.product.ProductType.MembershipService:
+                // 検証の必要なし
+                satisfyThisRequirement = true;
+                break;
+            case factory.service.paymentService.PaymentServiceType.CreditCard:
+                satisfyThisRequirement = paymentMethods.some((paymentMethod) => paymentMethod.paymentMethodId === identifier
+                    && paymentMethod.issuedThrough.id === issuedThrough.id
+                    && paymentMethod.issuedThrough.typeOf === issuedThrough.typeOf);
+                break;
+            case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                satisfyThisRequirement = paymentMethods.some((paymentMethod) => paymentMethod.paymentMethodId === identifier
+                    && paymentMethod.issuedThrough.typeOf === issuedThrough.typeOf);
+                break;
+            default:
+            // no op
+        }
+        return satisfyThisRequirement;
+    });
+    if (!satisfyProgramMembershipRequirement) {
+        throw new factory.errors.Argument('Transaction', `programMembershipUsed requirement not satisfied`);
+    }
 }
 exports.validateEventOffers = validateEventOffers;

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

@@ -293,7 +293,7 @@ function createResult(params, options) {
         price
     });
     (0, validation_1.validateEventOffers)({
-        order: orderAsResult,
+        order: { price },
         paymentMethods,
         authorizeEventServiceOfferActions: params.authorizeEventServiceOfferActions
     });

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0-alpha.1",
-    "@cinerino/sdk": "10.5.0-alpha.0",
+    "@chevre/factory": "4.381.0-alpha.7",
+    "@cinerino/sdk": "10.5.0-alpha.2",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.2.0-alpha.0"
+  "version": "22.2.0-alpha.10"
 }