@chevre/domain 21.18.0-alpha.39 → 21.18.0-alpha.40

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

@@ -24,7 +24,25 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
-export type IProduct = factory.product.IProduct | factory.service.paymentService.IService;
+type IKeyOfProjection4product = keyof factory.product.IProduct | '_id';
+/**
+ * プロダクト検索条件
+ */
+type ISearchConditions4product = factory.product.ISearchConditions & {
+    typeOf?: {
+        $eq?: factory.product.ProductType;
+        $in?: factory.product.ProductType[];
+    };
+};
+/**
+ * 決済サービス検索条件
+ */
+type ISearchConditions4paymentService = factory.product.ISearchConditions & {
+    typeOf?: {
+        $eq?: factory.service.paymentService.PaymentServiceType;
+        $in?: factory.service.paymentService.PaymentServiceType[];
+    };
+};
 export type IPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'serviceOutput' | 'additionalProperty'> & {
     provider?: Pick<factory.service.paymentService.IProvider, 'credentials'>;
 };
@@ -38,8 +56,15 @@ export declare class MongoRepository {
     static CREATE_MONGO_CONDITIONS(params: factory.product.ISearchConditions): any[];
     findById(conditions: {
         id: string;
-    }, inclusion: string[], exclusion: string[]): Promise<IProduct>;
-    search(conditions: factory.product.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<IProduct[]>;
+    }, inclusion: string[], exclusion: string[]): Promise<factory.product.IProduct | factory.service.paymentService.IService>;
+    /**
+     * プロダクトを検索する
+     */
+    searchProducts(conditions: ISearchConditions4product, inclusion: IKeyOfProjection4product[], exclusion: IKeyOfProjection4product[]): Promise<factory.product.IProduct[]>;
+    /**
+     * 決済サービスを検索する
+     */
+    searchPaymentServices(conditions: ISearchConditions4paymentService, inclusion: string[], exclusion: string[]): Promise<factory.service.paymentService.IService[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;
@@ -53,7 +78,7 @@ export declare class MongoRepository {
         typeOf: factory.service.paymentService.PaymentServiceType;
         id: string;
     }): Promise<factory.product.IAvailableChannel>;
-    searchPaymentServicesByProvider(params: Pick<factory.product.ISearchConditions, 'limit' | 'page' | 'sort' | 'project' | 'provider' | 'typeOf'>): Promise<IPaymentServiceByProvider[]>;
+    searchPaymentServicesByProvider(params: Pick<ISearchConditions4paymentService, 'limit' | 'page' | 'sort' | 'project' | 'provider' | 'typeOf'>): Promise<IPaymentServiceByProvider[]>;
     /**
      * プロダクトを保管する
      */

package/lib/chevre/repo/product.js

@@ -151,10 +151,7 @@ class MongoRepository {
         }
         return andConditions;
     }
-    findById(conditions, 
-    // inclusion化(2023-07-20~)
-    // projection?: { [key: string]: number }
-    inclusion, exclusion) {
+    findById(conditions, inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             let projection = {};
             if (Array.isArray(inclusion) && inclusion.length > 0) {
@@ -182,9 +179,51 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    search(conditions, 
-    // projection?: { [key: string]: number }
-    inclusion, exclusion) {
+    /**
+     * プロダクトを検索する
+     */
+    searchProducts(conditions, inclusion, exclusion) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const andConditions = MongoRepository.CREATE_MONGO_CONDITIONS(conditions);
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const query = this.productModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
+            if (typeof conditions.limit === 'number' && conditions.limit > 0) {
+                const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
+                query.limit(conditions.limit)
+                    .skip(conditions.limit * (page - 1));
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.productID) !== undefined) {
+                query.sort({ productID: conditions.sort.productID });
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
+        });
+    }
+    /**
+     * 決済サービスを検索する
+     */
+    searchPaymentServices(conditions, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = MongoRepository.CREATE_MONGO_CONDITIONS(conditions);
@@ -233,7 +272,7 @@ class MongoRepository {
      */
     findAvailableChannel(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const paymentServices = yield this.search({
+            const paymentServices = yield this.searchPaymentServices({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },

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

@@ -186,7 +186,16 @@ function calculateOfferCount(params) {
         try {
             const eventOffers = params.event.offers;
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+                // const eventService = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
+                //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+                const eventService = (yield repos.product.searchProducts({
+                    limit: 1,
+                    page: 1,
+                    id: { $eq: eventOffers.itemOffered.id }
+                }, ['hasOfferCatalog'], [])).shift();
+                if (eventService === undefined) {
+                    throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+                }
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const catalogs = yield repos.offerCatalog.search({
                         limit: 1,

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

@@ -23,7 +23,16 @@ function findEventOffers(params) {
             // 興行設定があれば興行のカタログを参照する
             const eventOffers = params.event.offers;
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+                // const eventService = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
+                //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+                const eventService = (yield repos.product.searchProducts({
+                    limit: 1,
+                    page: 1,
+                    id: { $eq: eventOffers.itemOffered.id }
+                }, ['hasOfferCatalog'], [])).shift();
+                if (eventService === undefined) {
+                    throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+                }
                 const offerCatalogId = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id;
                 if (typeof offerCatalogId === 'string') {
                     // サブカタログIDを決定

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

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

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

@@ -186,7 +186,7 @@ function fixPaymentService(params) {
                 break;
             default:
                 const paymentServiceId = yield getPaymentServiceId(params)();
-                const paymentServices = yield repos.product.search({
+                const paymentServices = yield repos.product.searchPaymentServices({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },

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

@@ -85,7 +85,7 @@ function fixPaymentService(params) {
                 // FaceToFaceの場合プロダクトは存在しない
                 break;
             default:
-                const paymentServices = yield repos.product.search({
+                const paymentServices = yield repos.product.searchPaymentServices({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.payAction.project.id } },

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

@@ -44,7 +44,15 @@ function start(params) {
             throw new factory.errors.ArgumentNull('object.itemOffered.id');
         }
         // プロダクト確認
-        const product = yield repos.product.findById({ id: productId }, [], []);
+        // const product = await repos.product.findProductById({ id: productId }, [], []);
+        const product = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: productId }
+        }, [], [])).shift();
+        if (product === undefined) {
+            throw new factory.errors.NotFound('Product');
+        }
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
             throw new factory.errors.ArgumentNull('transactionNumber');
@@ -130,7 +138,15 @@ function createTransactionObject(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const product = yield repos.product.findById({ id: params.issuedThrough.id }, [], []);
+        // const product = await repos.product.findProductById({ id: params.issuedThrough.id }, [], []);
+        const product = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.issuedThrough.id }
+        }, [], [])).shift();
+        if (product === undefined) {
+            throw new factory.errors.NotFound('Product');
+        }
         const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

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

@@ -558,6 +558,7 @@ function validateAdvanceBookingRequirement(params) {
     }
 }
 function validateProgramMembershipUsed(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const now = new Date();
@@ -572,7 +573,27 @@ function validateProgramMembershipUsed(params) {
             if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {
                 throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
             }
-            const permitIssuedThrough = yield repos.product.findById({ id: issuedThroughId }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], []);
+            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) {
+                permitIssuedThrough = (yield repos.product.searchPaymentServices({
+                    limit: 1,
+                    page: 1,
+                    id: { $eq: issuedThroughId },
+                    typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard }
+                }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+            }
+            if (typeof (permitIssuedThrough === null || permitIssuedThrough === void 0 ? void 0 : permitIssuedThrough.typeOf) !== 'string') {
+                throw new factory.errors.NotFound(`Permit issuer service [${issuedThroughId}]`);
+            }
+            // permitIssuedThrough =
+            //     await repos.product.findById({ id: issuedThroughId }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], []);
             switch (permitIssuedThrough.typeOf) {
                 // 発行サービスがCreditCardのケースに対応(2023-09-01~)
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
@@ -637,7 +658,16 @@ function validateProgramMembershipUsed(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const product = yield repos.product.findById({ id: params.issuedThrough.id }, ['availableChannel'], []);
+        // const product = <Pick<factory.product.IProduct, 'availableChannel'>>
+        //     await repos.product.findProductById({ id: params.issuedThrough.id }, ['availableChannel'], []);
+        const product = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.issuedThrough.id }
+        }, ['availableChannel'], [])).shift();
+        if (product === undefined) {
+            throw new factory.errors.NotFound('Product');
+        }
         const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

package/lib/chevre/service/moneyTransfer.js

@@ -326,7 +326,17 @@ function getIssuedThroughIdByAction(params) {
 function createPermitServiceCredentials(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const paymentCardService = yield repos.product.findById({ id: params.issuedThrough.id }, ['availableChannel'], []);
+        // const paymentCardService = <Pick<factory.product.IProduct, 'availableChannel'>>
+        //     await repos.product.findProductById({ id: params.issuedThrough.id }, ['availableChannel'], []);
+        const paymentCardService = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.issuedThrough.id },
+            typeOf: { $eq: factory.product.ProductType.PaymentCard }
+        }, ['availableChannel'], [])).shift();
+        if (paymentCardService === undefined) {
+            throw new factory.errors.NotFound(factory.product.ProductType.PaymentCard);
+        }
         const permitServiceEndpoint = (_a = paymentCardService.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = paymentCardService.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = paymentCardService.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

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

@@ -18,9 +18,17 @@ function searchTicketOffersByItemOffered(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        let eventService;
+        // let eventService: Pick<factory.product.IProduct, 'hasOfferCatalog' | 'project'> | undefined;
         let catalogId;
-        eventService = yield repos.product.findById({ id: (_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id }, ['hasOfferCatalog', 'project'], []);
+        // const eventService = await repos.product.findProductById({ id: params.itemOffered?.id }, ['hasOfferCatalog', 'project'], []);
+        const eventService = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: String((_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id) }
+        }, ['hasOfferCatalog', 'project'], [])).shift();
+        if (eventService === undefined) {
+            throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+        }
         if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
             catalogId = eventService.hasOfferCatalog.id;
         }
@@ -370,7 +378,16 @@ function searchOfferAppliesToMovieTicket(params) {
         const eventOffers = event.offers;
         let catalogId;
         if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            // const eventService = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
+            //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            const eventService = (yield repos.product.searchProducts({
+                limit: 1,
+                page: 1,
+                id: { $eq: eventOffers.itemOffered.id }
+            }, ['hasOfferCatalog'], [])).shift();
+            if (eventService === undefined) {
+                throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+            }
             if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                 catalogId = eventService.hasOfferCatalog.id;
             }
@@ -417,7 +434,16 @@ function searchOfferCatalogItems(params) {
         const eventOffers = event.offers;
         let catalogId;
         if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            // const eventService = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
+            //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            const eventService = (yield repos.product.searchProducts({
+                limit: 1,
+                page: 1,
+                id: { $eq: eventOffers.itemOffered.id }
+            }, ['hasOfferCatalog'], [])).shift();
+            if (eventService === undefined) {
+                throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+            }
             if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                 catalogId = eventService.hasOfferCatalog.id;
             }
@@ -477,7 +503,16 @@ function searchOfferCatalogItemAvailability(params) {
         const eventOffers = event.offers;
         let catalogId;
         if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            // const eventService = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
+            //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            const eventService = (yield repos.product.searchProducts({
+                limit: 1,
+                page: 1,
+                id: { $eq: eventOffers.itemOffered.id }
+            }, ['hasOfferCatalog'], [])).shift();
+            if (eventService === undefined) {
+                throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+            }
             if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                 catalogId = eventService.hasOfferCatalog.id;
             }

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

@@ -20,7 +20,16 @@ function searchProductOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // プロダクト検索
-        const productWithOffers = yield repos.product.findById({ id: params.itemOffered.id }, ['hasOfferCatalog', 'project'], []);
+        // const productWithOffers = <Pick<factory.product.IProduct, 'hasOfferCatalog' | 'project'>>
+        //     await repos.product.findProductById({ id: params.itemOffered.id }, ['hasOfferCatalog', 'project'], []);
+        const productWithOffers = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.itemOffered.id }
+        }, ['hasOfferCatalog', 'project'], [])).shift();
+        if (productWithOffers === undefined) {
+            throw new factory.errors.NotFound('Product');
+        }
         const offerCatalogId = (_a = productWithOffers.hasOfferCatalog) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof offerCatalogId !== 'string') {
             return [];

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

@@ -26,7 +26,7 @@ function search(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const now = moment();
-        const searchProductsResult = yield repos.product.search({
+        const searchProductsResult = yield repos.product.searchProducts({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -178,7 +178,7 @@ function fixProductAndOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const productId = String((_b = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id);
-        const searchProductsResult = yield repos.product.search({
+        const searchProductsResult = yield repos.product.searchProducts({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

package/lib/chevre/service/payment/movieTicket/getCredentials.js

@@ -15,12 +15,11 @@ function getCredentials(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         // 決済サービスからcredentialsを取得する
-        const paymentServices = yield repos.product.search({
+        const paymentServices = yield repos.product.searchPaymentServices({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.seller.project.id } },
             typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
-            // serviceType: { codeValue: { $eq: params.paymentMethodType } },
             id: { $eq: params.paymentServiceId }
         }, [], []);
         const paymentService = paymentServices.shift();

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

@@ -79,8 +79,15 @@ function validatePaymentMethod(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // プロダクトから通貨区分を取得
-        const paymentCatdProduct = yield repos.product.findById({ id: paymentServiceId }, ['serviceOutput'], []);
-        const currency = (_e = (_d = paymentCatdProduct.serviceOutput) === null || _d === void 0 ? void 0 : _d.amount) === null || _e === void 0 ? void 0 : _e.currency;
+        // const paymentCatdProduct = <Pick<factory.product.IProduct, 'serviceOutput'>>
+        //     await repos.product.findProductById({ id: paymentServiceId }, ['serviceOutput'], []);
+        const paymentCatdProduct = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: paymentServiceId },
+            typeOf: { $eq: factory.product.ProductType.PaymentCard }
+        }, ['serviceOutput'], [])).shift();
+        const currency = (_e = (_d = paymentCatdProduct === null || paymentCatdProduct === void 0 ? void 0 : paymentCatdProduct.serviceOutput) === null || _d === void 0 ? void 0 : _d.amount) === null || _e === void 0 ? void 0 : _e.currency;
         if (typeof currency !== 'string') {
             throw new factory.errors.NotFound('product.serviceOutput.amount.currency');
         }

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

@@ -337,7 +337,7 @@ function deleteResourcesByOfferCatalog(params) {
             const action = yield repos.action.start(deleteActionAttributes);
             try {
                 // カタログからプロダクト検索
-                const productsWithCatalog = yield repos.product.search({
+                const productsWithCatalog = yield repos.product.searchProducts({
                     project: { id: { $eq: params.project.id } },
                     hasOfferCatalog: { id: { $eq: catalogId } }
                 }, ['_id'], []);

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

@@ -187,7 +187,7 @@ function createInformMovieTasks(params) {
 }
 function createInformProductTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const products4inform = yield repos.product.search({
+        const products4inform = yield repos.product.searchProducts({
             typeOf: { $eq: params.typeOf },
             id: { $in: params.ids }
         }, ['additionalProperty', 'description', 'name', 'productID', 'project', 'typeOf', 'serviceType'], []);

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.18.0-alpha.39"
+  "version": "21.18.0-alpha.40"
 }

package/example/src/chevre/transaction/findPaymentCardPermit.ts

@@ -1,29 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-import { findPaymentCardPermit } from '../../../../lib/chevre/service/transaction/orderProgramMembership/findPaymentCardPermit';
-
-const project = { id: String(process.env.PROJECT_ID) };
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-
-    const result = await findPaymentCardPermit({
-        project: { id: project.id },
-        customer: { id: 'a7909268-a584-425e-8212-d7d10f344093' },
-        now: new Date(),
-        accountType: 'Point'
-    })({
-        product: productRepo,
-        ownershipInfo: ownershipInfoRepo
-    });
-    console.log(result);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/lib/chevre/service/transaction/orderProgramMembership/findPaymentCardPermit.d.ts

@@ -1,26 +0,0 @@
-/**
- * findPaymentCardPermit
- */
-import type { MongoRepository as OwnershipInfoRepo } from '../../../repo/ownershipInfo';
-import type { MongoRepository as ProductRepo } from '../../../repo/product';
-import * as factory from '../../../factory';
-/**
- * 所有ペイメントカードを検索
- * 指定した通貨の所有ペイメントカードを検索する
- */
-export declare function findPaymentCardPermit(params: {
-    customer: {
-        id: string;
-    };
-    project: {
-        id: string;
-    };
-    now: Date;
-    /**
-     * 通貨区分
-     */
-    accountType: string;
-}): (repos: {
-    ownershipInfo: OwnershipInfoRepo;
-    product: ProductRepo;
-}) => Promise<factory.ownershipInfo.IPermitAsGood>;

package/lib/chevre/service/transaction/orderProgramMembership/findPaymentCardPermit.js

@@ -1,65 +0,0 @@
-"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.findPaymentCardPermit = void 0;
-const factory = require("../../../factory");
-/**
- * 所有ペイメントカードを検索
- * 指定した通貨の所有ペイメントカードを検索する
- */
-function findPaymentCardPermit(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const searchProductsResult = yield repos.product.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.project.id } },
-            typeOf: { $eq: factory.product.ProductType.PaymentCard }
-        }, [], []);
-        const accountProduct = searchProductsResult
-            .find((p) => { var _a, _b; return ((_b = (_a = p.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency) === params.accountType; });
-        if (accountProduct === undefined) {
-            throw new factory.errors.NotFound(`${params.accountType} PaymentCard Product`);
-        }
-        let accountOwnershipInfos = [];
-        try {
-            // 口座所有権を検索
-            const searchOwnershipInfosResult = yield repos.ownershipInfo.search({
-                // 最も古い所有ペイメントカードをデフォルトペイメントカードとして扱う使用なので、ソート条件は以下の通り
-                sort: { ownedFrom: factory.sortType.Ascending },
-                limit: 1,
-                page: 1,
-                // 詳細取得できていないが、必要ない
-                typeOfGood: {
-                    issuedThrough: {
-                        id: { $eq: String(accountProduct.id) },
-                        typeOf: { $eq: factory.product.ProductType.PaymentCard }
-                    }
-                },
-                ownedFrom: params.now,
-                ownedThrough: params.now,
-                ownedBy: { id: params.customer.id }
-            });
-            accountOwnershipInfos = searchOwnershipInfosResult;
-        }
-        catch (error) {
-            throw error;
-        }
-        // Openedしか存在しなくなったので、この処理は不要です
-        // accountOwnershipInfos = accountOwnershipInfos.filter(
-        //     (o) => o.typeOfGood.paymentAccount?.status === factory.accountStatusType.Opened
-        // );
-        if (accountOwnershipInfos.length === 0) {
-            throw new factory.errors.NotFound('OwnershipInfos of PaymentCard');
-        }
-        return accountOwnershipInfos[0].typeOfGood;
-    });
-}
-exports.findPaymentCardPermit = findPaymentCardPermit;