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

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,20 +1,15 @@
 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;
-};
 declare function verifyTicketTokenAsNeeded(params: {
     project: {
         id: string;
     };
-    object: IObjectWithoutDetail;
+    object: Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'issuedThrough' | 'ticketToken'>;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     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,22 +13,21 @@ 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;
+        const { issuedThrough, ticketToken } = object;
         let permit;
-        switch (paymentServiceType) {
-            case factory.service.paymentService.PaymentServiceType.CreditCard:
-            case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
-                if (typeof ticketToken === 'string' && ticketToken !== '') {
-                    let authorizedObject;
-                    const ticket = (yield repos.ticket.search({
+        // メンバーシップチケットが指定された場合、メンバーシップコードへ変換する
+        if (typeof ticketToken === 'string' && ticketToken !== '') {
+            switch (paymentServiceType) {
+                case factory.service.paymentService.PaymentServiceType.CreditCard:
+                case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                    const ticket = (yield repos.ticket.projectFields({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: project.id } },
                         ticketToken: { $eq: ticketToken }
-                    })).shift();
+                    }, ['ticketToken'])).shift();
                     if (ticket === undefined) {
                         throw new factory.errors.NotFound('Ticket');
                     }
@@ -37,41 +36,34 @@ function verifyTicketTokenAsNeeded(params) {
                         project: { id: params.project.id },
                         code: ticket.ticketToken
                     });
-                    authorizedObject = validAuthorization.object;
+                    const authorizedObject = validAuthorization.object;
                     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 { typeOfGood } = authorizedObject;
                     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');
+                    // CreditCardの場合、発行サービスIDを検証
+                    if (typeOfGood.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                        if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
+                            throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
+                        }
                     }
                     permit = { identifier: typeOfGood.identifier };
-                }
-                break;
-            default:
-            // no op
+                    break;
+                default:
+                    // no op
+                    throw new factory.errors.NotImplemented(`ticketToken issued through ${paymentServiceType} not implemented`);
+            }
         }
         return { permit };
     });

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;
@@ -97,9 +95,11 @@ type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings, crede
 interface IPublishPaymentUrlRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    authorization: AuthorizationRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
+    ticket: TicketRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
@@ -117,7 +117,7 @@ declare function publishPaymentUrl(params: {
     agent: {
         id: string;
     };
-    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'ticketToken'>;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location: factory.action.trade.pay.ILocation;

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

@@ -228,16 +228,24 @@ exports.processVoidPayTransaction = processVoidPayTransaction;
 function publishPaymentUrl(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
-            throw new factory.errors.NotImplemented(`purpose.typeOf '${params.purpose.typeOf} not implemented'`);
+        const { paymentServiceType, purpose, project } = params;
+        if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
         }
         try {
-            const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['expires', 'seller', 'project']);
-            const paymentServiceType = params.paymentServiceType;
+            const transaction = yield repos.transaction.findInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['expires', 'seller', 'project']);
             // 取引番号生成
-            const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({
-                startDate: new Date()
-            });
+            let transactionNumber;
+            // support ticketToken(2024-08-21~)
+            const { permit } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({ project, object: params.object, paymentServiceType, purpose })(repos);
+            const paymentMethodIdByPermit = permit === null || permit === void 0 ? void 0 : permit.identifier;
+            if (typeof paymentMethodIdByPermit === 'string') {
+                transactionNumber = paymentMethodIdByPermit;
+            }
+            if (typeof transactionNumber !== 'string') {
+                const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+                transactionNumber = publishTransactionNumberResult.transactionNumber;
+            }
             let result;
             // URL発行
             const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment });

package/lib/chevre/service/payment/paymentCard.js

@@ -79,9 +79,7 @@ function validatePaymentMethod(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // プロダクトから通貨区分を取得
-        // const paymentCatdProduct = <Pick<factory.product.IProduct, 'serviceOutput'>>
-        //     await repos.product.findProductById({ id: paymentServiceId }, ['serviceOutput'], []);
-        const paymentCatdProduct = (yield repos.product.searchProducts({
+        const paymentCatdProduct = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: paymentServiceId },

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

@@ -67,22 +67,26 @@ function onAuthorizationCreated(params) {
                 }
                 break;
             case 'OwnershipInfo':
-                // 所有権検索
-                const ownershipInfoId = authorization.object.id;
-                if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
-                    const ownershipInfo = yield repos.ownershipInfo.findById({ id: ownershipInfoId });
-                    // 座席予約に対する所有権であれば発券
-                    if (ownershipInfo.typeOfGood.typeOf === factory.reservationType.EventReservation
-                        || ownershipInfo.typeOfGood.typeOf === factory.reservationType.BusReservation) {
-                        const reservationId = String(ownershipInfo.typeOfGood.id);
-                        reservationIds = [reservationId];
-                        const { reservationFor } = yield repos.reservation.projectFieldsById({
-                            id: reservationId,
-                            inclusion: ['reservationFor.id']
-                        });
-                        reservationForIds = [String(reservationFor.id)];
-                    }
-                }
+                // 所有権に対する承認はいったん廃止したので、所有権のケースは処理不要(2024-08-21~)
+                reservationIds = [];
+                // const ownershipInfoId = authorization.object.id;
+                // if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
+                //     const ownershipInfo = <Pick<factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>, 'id' | 'typeOfGood'>>
+                //         await repos.ownershipInfo.projectFieldsById({ id: ownershipInfoId }, ['typeOfGood']);
+                //     // 予約に対する所有権であれば発券
+                //     if (ownershipInfo.typeOfGood.typeOf === factory.reservationType.EventReservation
+                //         || ownershipInfo.typeOfGood.typeOf === factory.reservationType.BusReservation) {
+                //         const reservationId = String(ownershipInfo.typeOfGood.id);
+                //         reservationIds = [reservationId];
+                //         const { reservationFor } = <{ reservationFor: { id: string } }>await repos.reservation.projectFieldsById<
+                //             factory.reservationType.EventReservation | factory.reservationType.BusReservation
+                //         >({
+                //             id: reservationId,
+                //             inclusion: ['reservationFor.id']
+                //         });
+                //         reservationForIds = [String(reservationFor.id)];
+                //     }
+                // }
                 break;
             default:
             // no op

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

@@ -343,10 +343,10 @@ function deleteResourcesByOfferCatalog(params) {
             const action = yield repos.action.start(deleteActionAttributes);
             try {
                 // カタログからプロダクト検索
-                const productsWithCatalog = yield repos.product.searchProducts({
+                const productsWithCatalog = yield repos.product.projectFields({
                     project: { id: { $eq: params.project.id } },
                     hasOfferCatalog: { id: { $eq: catalogId } }
-                }, ['_id'], []);
+                }, ['id'], []);
                 let deleteEventResult;
                 let updateOfferResult;
                 if (productsWithCatalog.length > 0) {

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

@@ -29,7 +29,7 @@ function syncCategoryCode(params) {
         }
         else {
             for (const categoryCodeId of params.ids) {
-                const syncingCategoryCode = (yield repos.categoryCode.search({
+                const syncingCategoryCode = (yield repos.categoryCode.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },

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

@@ -275,7 +275,7 @@ function createInformMovieTasks(params) {
 }
 function createInformProductTasks(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const products4inform = yield repos.product.searchProducts({
+        const products4inform = yield repos.product.projectFields({
             typeOf: { $eq: params.typeOf },
             id: { $in: params.ids }
         }, ['additionalProperty', 'description', 'name', 'productID', 'project', 'typeOf', 'serviceType'], []);
@@ -322,7 +322,7 @@ function createInformProductTasks(params) {
 }
 function createInformCategoryCodeTasks(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const categoryCodes4inform = yield repos.categoryCode.search({
+        const categoryCodes4inform = yield repos.categoryCode.projectFields({
             id: { $in: params.ids },
             // ひとまずDistributorTypeのみ
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.DistributorType } }

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

@@ -13,9 +13,11 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const authorization_1 = require("../../repo/authorization");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const ticket_1 = require("../../repo/ticket");
 const transaction_1 = require("../../repo/transaction");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 const transactionProcess_1 = require("../../repo/transactionProcess");
@@ -38,9 +40,11 @@ function call(params) {
             yield (0, any_1.publishPaymentUrl)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+                authorization: new authorization_1.AuthorizationRepo(connection),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
+                ticket: new ticket_1.TicketRepo(connection),
                 transaction: new transaction_1.TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient)
             }, settings);

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

@@ -28,7 +28,7 @@ const CodeService = require("../code");
 function start(params) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         const { passport } = yield repos.passport.validatePassportTokenIfExist(params);
-        const sellers = yield repos.seller.search({
+        const sellers = yield repos.seller.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.seller.id }

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

@@ -1,8 +1,8 @@
 import type { MemberRepo } from '../../../../repo/member';
 import type { ProjectMakesOfferRepo } from '../../../../repo/projectMakesOffer';
-import type { SellerRepo } from '../../../../repo/seller';
+import type { ISellerWithId, SellerRepo } from '../../../../repo/seller';
 import * as factory from '../../../../factory';
-type ISeller = Pick<factory.seller.ISeller, 'id' | 'name' | 'project' | 'typeOf' | 'makesOffer' | 'additionalProperty'>;
+type ISeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'typeOf' | 'makesOffer' | 'additionalProperty'>;
 declare function validateStartRequest(params: {
     project: {
         id: string;

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.js

@@ -67,7 +67,7 @@ function validateStartRequest(params) {
         if (projectMakesOffer === undefined) {
             throw new factory.errors.Argument('project', 'project makes no offers');
         }
-        const seller = (yield repos.seller.search({
+        const seller = (yield repos.seller.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

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

@@ -7,7 +7,7 @@ import type { OfferItemConditionRepo } from '../../../repo/offerItemCondition';
 import type { OrderRepo } from '../../../repo/order';
 import type { ProjectRepo } from '../../../repo/project';
 import type { ReservationRepo } from '../../../repo/reservation';
-import type { SellerRepo } from '../../../repo/seller';
+import type { ISellerWithId, SellerRepo } from '../../../repo/seller';
 interface IPreStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;
@@ -20,7 +20,7 @@ interface IPreStartOperationRepos {
     seller: SellerRepo;
 }
 type IPreStartOperation<T> = (repos: IPreStartOperationRepos) => Promise<T>;
-type IFixedSeller = Pick<factory.seller.ISeller, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;
+type IFixedSeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;
 /**
  * 返品取引開始前処理
  */

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

@@ -36,7 +36,7 @@ function preStart(params) {
         const now = new Date();
         const { acceptedOffers, eventIds, offerIds, orders } = yield fixOrders(params)(repos);
         // sellerはorderから自動取得
-        const sellers = yield repos.seller.search({
+        const sellers = yield repos.seller.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: String(orders[0].seller.id) }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0-alpha.3",
-    "@cinerino/sdk": "10.5.0-alpha.0",
+    "@chevre/factory": "4.381.0-alpha.12",
+    "@cinerino/sdk": "10.7.0-alpha.3",
     "@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.2"
+  "version": "22.2.0-alpha.20"
 }

package/example/src/chevre/searchProducts.ts

@@ -1,28 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import { chevre } from '../../../lib/index';
-
-import * as  mongoose from 'mongoose';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-    const products = await productRepo.searchProducts(
-        {
-            project: { id: { $eq: project.id } }
-        },
-        // ['_id', 'typeOf'],
-        [],
-        []
-    );
-    console.log('products:', products);
-    console.log(products.length, 'products found');
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);