@chevre/domain 21.18.0-alpha.42 → 21.18.0-alpha.44

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

@@ -15,7 +15,9 @@ export declare class MongoRepository {
          * idを指定すれば更新
          */
         id?: string;
-        $set: factory.service.paymentService.IService;
+        $set: factory.service.paymentService.IService & {
+            provider?: never;
+        };
         $unset: {
             [key in IUnsetKey]?: 1;
         };

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

@@ -1,6 +1,20 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
-export type IAvailablePaymentServiceType = factory.service.paymentService.PaymentServiceType.CreditCard | factory.service.paymentService.PaymentServiceType.MovieTicket;
+type IAvailablePaymentServiceType = factory.service.paymentService.PaymentServiceType.CreditCard | factory.service.paymentService.PaymentServiceType.MovieTicket;
+/**
+ * 決済サービス検索条件
+ */
+type ISearchConditions4paymentService = factory.product.ISearchConditions & {
+    typeOf?: {
+        $eq?: factory.service.paymentService.PaymentServiceType;
+        $in?: factory.service.paymentService.PaymentServiceType[];
+    };
+};
+export type IPublicPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'serviceOutput' | 'additionalProperty'> & {
+    provider?: {
+        credentials?: Pick<factory.service.paymentService.IProviderCredentials, 'shopId' | 'paymentUrl' | 'tokenizationCode'>;
+    };
+};
 /**
  * 決済サービスプロバイダーリポジトリ
  */
@@ -27,8 +41,12 @@ export declare class MongoRepository {
             };
         };
     }): Promise<(Pick<factory.service.paymentService.IService, 'id' | 'name' | 'typeOf'> & {
-        provider: Pick<factory.service.paymentService.IProvider, 'id' | 'name' | 'credentials'>;
+        provider: Pick<factory.service.paymentService.IProvider, 'id' | 'credentials'>;
     })[]>;
+    /**
+     * 販売者の提供決済サービス(公開情報のみ)検索
+     */
+    searchPublicPaymentServicesByProvider(params: Pick<ISearchConditions4paymentService, 'limit' | 'page' | 'sort' | 'project' | 'provider' | 'typeOf'>): Promise<IPublicPaymentServiceByProvider[]>;
     create(params: factory.service.paymentService.IProvider & {
         project: {
             id: string;
@@ -68,3 +86,4 @@ export declare class MongoRepository {
         };
     }): Promise<import("mongodb").UpdateResult>;
 }
+export {};

package/lib/chevre/repo/paymentServiceProvider.js

@@ -53,7 +53,8 @@ class MongoRepository {
                         _id: 0,
                         provider: {
                             id: '$provider.id',
-                            name: '$provider.name',
+                            // name廃止(2023-12-21~)
+                            // name: '$provider.name',
                             credentials: '$provider.credentials'
                         },
                         id: { $toString: '$_id' },
@@ -71,6 +72,70 @@ class MongoRepository {
                 .exec();
         });
     }
+    /**
+     * 販売者の提供決済サービス(公開情報のみ)検索
+     */
+    searchPublicPaymentServicesByProvider(params) {
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [];
+            const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+            if (typeof projectIdEq === 'string') {
+                matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
+            }
+            const typeOfEq = (_c = params.typeOf) === null || _c === void 0 ? void 0 : _c.$eq;
+            if (typeof typeOfEq === 'string') {
+                matchStages.push({ $match: { typeOf: { $eq: typeOfEq } } });
+            }
+            const providerIdEq = (_e = (_d = params.provider) === null || _d === void 0 ? void 0 : _d.id) === null || _e === void 0 ? void 0 : _e.$eq;
+            if (typeof providerIdEq === 'string') {
+                matchStages.push({ $match: { 'provider.id': { $exists: true, $eq: providerIdEq } } });
+            }
+            const aggregate = this.productModel.aggregate([
+                ...(typeof ((_f = params.sort) === null || _f === void 0 ? void 0 : _f.productID) === 'number')
+                    ? [{ $sort: { productID: params.sort.productID } }]
+                    : [],
+                {
+                    $unwind: {
+                        path: '$provider'
+                    }
+                },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        typeOf: '$typeOf',
+                        productID: '$productID',
+                        description: '$description',
+                        name: '$name',
+                        additionalProperty: '$additionalProperty',
+                        serviceOutput: '$serviceOutput',
+                        serviceType: '$serviceType',
+                        id: { $toString: '$_id' },
+                        // ↓セキュアな情報を隠蔽するように
+                        provider: {
+                            credentials: {
+                                shopId: '$provider.credentials.shopId',
+                                tokenizationCode: '$provider.credentials.tokenizationCode',
+                                paymentUrl: {
+                                    expiresInSeconds: '$provider.credentials.paymentUrl.expiresInSeconds',
+                                    useCallback: '$provider.credentials.paymentUrl.useCallback',
+                                    useWebhook: '$provider.credentials.paymentUrl.useWebhook'
+                                }
+                            }
+                        }
+                    }
+                }
+            ]);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.limit(params.limit * page)
+                    .skip(params.limit * (page - 1));
+            }
+            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
     create(params) {
         return __awaiter(this, void 0, void 0, function* () {
             // 決済サービス存在確認
@@ -86,7 +151,8 @@ class MongoRepository {
             const creatingProvider = {
                 credentials: params.credentials,
                 id: params.id,
-                name: params.name,
+                // name廃止(2023-12-21~)
+                // name: params.name,
                 typeOf: params.typeOf
             };
             doc = yield this.productModel.findOneAndUpdate({
@@ -115,9 +181,7 @@ class MongoRepository {
                 'project.id': { $eq: params.project.id },
                 _id: { $eq: params.providesPaymentService.id },
                 'provider.id': { $eq: params.id }
-            }, Object.assign(Object.assign({ 'provider.$[seller].id': params.id }, (params.name !== undefined && params.name !== null)
-                ? { 'provider.$[seller].name': params.name }
-                : undefined), (params.credentials !== undefined && params.credentials !== null)
+            }, Object.assign({ 'provider.$[seller].id': params.id }, (params.credentials !== undefined && params.credentials !== null)
                 ? { 'provider.$[seller].credentials': params.credentials }
                 : undefined), {
                 new: true,

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

@@ -25,6 +25,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IKeyOfProjection4product = keyof factory.product.IProduct | '_id';
+type IKeyOfProjection4paymentService = keyof factory.service.paymentService.IService | '_id';
 /**
  * プロダクト検索条件
  */
@@ -43,9 +44,6 @@ type ISearchConditions4paymentService = factory.product.ISearchConditions & {
         $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'>;
-};
 type IUnsetKey = keyof Pick<factory.product.IProduct, 'additionalProperty' | 'availableChannel' | 'hasOfferCatalog' | 'serviceOutput' | 'serviceType'>;
 /**
  * プロダクトリポジトリ
@@ -61,7 +59,7 @@ export declare class MongoRepository {
     /**
      * 決済サービスを検索する
      */
-    searchPaymentServices(conditions: ISearchConditions4paymentService, inclusion: string[], exclusion: string[]): Promise<factory.service.paymentService.IService[]>;
+    searchPaymentServices(conditions: ISearchConditions4paymentService, inclusion: IKeyOfProjection4paymentService[], exclusion: IKeyOfProjection4paymentService[]): Promise<factory.service.paymentService.IService[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;
@@ -75,7 +73,6 @@ export declare class MongoRepository {
         typeOf: factory.service.paymentService.PaymentServiceType;
         id: string;
     }): Promise<factory.product.IAvailableChannel>;
-    searchPaymentServicesByProvider(params: Pick<ISearchConditions4paymentService, 'limit' | 'page' | 'sort' | 'project' | 'provider' | 'typeOf'>): Promise<IPaymentServiceByProvider[]>;
     /**
      * プロダクトを保管する
      */
@@ -84,7 +81,9 @@ export declare class MongoRepository {
          * idを指定すれば更新
          */
         id?: string;
-        $set: factory.product.IProduct;
+        $set: factory.product.IProduct & {
+            offers?: never;
+        };
         $unset: {
             [key in IUnsetKey]?: 1;
         };

package/lib/chevre/repo/product.js

@@ -261,7 +261,9 @@ class MongoRepository {
                 projection = {
                     __v: 0,
                     createdAt: 0,
-                    updatedAt: 0
+                    updatedAt: 0,
+                    offers: 0,
+                    provider: 0 // paymentServiceProviderRepoへの完全移行につき除外(2023-12-20~)
                 };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
                     exclusion.forEach((field) => {
@@ -325,68 +327,6 @@ class MongoRepository {
             return availableChannel;
         });
     }
-    searchPaymentServicesByProvider(params) {
-        var _a, _b, _c, _d, _e, _f;
-        return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [];
-            const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
-            if (typeof projectIdEq === 'string') {
-                matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
-            }
-            const typeOfEq = (_c = params.typeOf) === null || _c === void 0 ? void 0 : _c.$eq;
-            if (typeof typeOfEq === 'string') {
-                matchStages.push({ $match: { typeOf: { $eq: typeOfEq } } });
-            }
-            const providerIdEq = (_e = (_d = params.provider) === null || _d === void 0 ? void 0 : _d.id) === null || _e === void 0 ? void 0 : _e.$eq;
-            if (typeof providerIdEq === 'string') {
-                matchStages.push({ $match: { 'provider.id': { $exists: true, $eq: providerIdEq } } });
-            }
-            const aggregate = this.productModel.aggregate([
-                ...(typeof ((_f = params.sort) === null || _f === void 0 ? void 0 : _f.productID) === 'number')
-                    ? [{ $sort: { productID: params.sort.productID } }]
-                    : [],
-                {
-                    $unwind: {
-                        path: '$provider'
-                    }
-                },
-                ...matchStages,
-                {
-                    $project: {
-                        _id: 0,
-                        typeOf: '$typeOf',
-                        productID: '$productID',
-                        description: '$description',
-                        name: '$name',
-                        // provider: [ [Object] ],
-                        additionalProperty: '$additionalProperty',
-                        serviceOutput: '$serviceOutput',
-                        serviceType: '$serviceType',
-                        id: { $toString: '$_id' },
-                        // ↓セキュアな情報を隠蔽するように
-                        provider: {
-                            credentials: {
-                                shopId: '$provider.credentials.shopId',
-                                tokenizationCode: '$provider.credentials.tokenizationCode',
-                                paymentUrl: {
-                                    expiresInSeconds: '$provider.credentials.paymentUrl.expiresInSeconds',
-                                    useCallback: '$provider.credentials.paymentUrl.useCallback',
-                                    useWebhook: '$provider.credentials.paymentUrl.useWebhook'
-                                }
-                            }
-                        }
-                    }
-                }
-            ]);
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                aggregate.limit(params.limit * page)
-                    .skip(params.limit * (page - 1));
-            }
-            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
     /**
      * プロダクトを保管する
      */

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

@@ -58,6 +58,7 @@ export type ICheckOperation<T> = (repos: {
     action: ActionRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
 }) => Promise<T>;

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

@@ -78,9 +78,7 @@ exports.invalidatePaymentUrl = invalidatePaymentUrl;
 /**
  * 決済方法認証
  */
-function check(params
-// ): ICheckOperation<factory.action.check.paymentMethod.movieTicket.IAction> {
-) {
+function check(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         let action;

package/lib/chevre/service/assetTransaction/reserve.d.ts

@@ -9,6 +9,7 @@ import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as PlaceRepo } from '../../repo/place';
 import type { MongoRepository as PriceSpecificationRepo } from '../../repo/priceSpecification';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
+import type { MongoRepository as ProductOfferRepo } from '../../repo/productOffer';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { RedisRepository as OfferRateLimitRepo } from '../../repo/rateLimit/offer';
 import type { MongoRepository as ReservationRepo } from '../../repo/reservation';
@@ -22,6 +23,7 @@ export interface IStartOperationRepos {
     offerCatalogItem: OfferCatalogItemRepo;
     offerRateLimit: OfferRateLimitRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
     place: PlaceRepo;
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
@@ -38,6 +40,7 @@ export interface IAddReservationsOperationRepos {
     offerCatalogItem: OfferCatalogItemRepo;
     offerRateLimit: OfferRateLimitRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
     place: PlaceRepo;
     priceSpecification: PriceSpecificationRepo;
     reservation: ReservationRepo;

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

@@ -8,6 +8,7 @@ import type { MongoRepository as OfferCatalogItemRepo } from '../../../repo/offe
 import type { MongoRepository as PlaceRepo } from '../../../repo/place';
 import type { MongoRepository as PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { MongoRepository as ProductRepo } from '../../../repo/product';
+import type { MongoRepository as ProductOfferRepo } from '../../../repo/productOffer';
 import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
@@ -28,6 +29,7 @@ interface IAuthorizeRepos {
     place: PlaceRepo;
     priceSpecification: PriceSpecificationRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
     project: ProjectRepo;
     reservation: ReservationRepo;
     task: TaskRepo;

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

@@ -8,6 +8,7 @@ import type { MongoRepository as OfferCatalogItemRepo } from '../../../repo/offe
 import type { MongoRepository as PlaceRepo } from '../../../repo/place';
 import type { MongoRepository as PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { MongoRepository as ProductRepo } from '../../../repo/product';
+import type { MongoRepository as ProductOfferRepo } from '../../../repo/productOffer';
 import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
@@ -37,6 +38,7 @@ declare function processStartReserve4chevre(params: {
     offerCatalogItem: OfferCatalogItemRepo;
     offerRateLimit: OfferRateLimitRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
     place: PlaceRepo;
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;

package/lib/chevre/service/offer/product.d.ts

@@ -7,6 +7,7 @@ import type { MongoRepository as OfferCatalogRepo } from '../../repo/offerCatalo
 import type { RedisRepository as OrderNumberRepo } from '../../repo/orderNumber';
 import type { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
+import type { MongoRepository as ProductOfferRepo } from '../../repo/productOffer';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as ServiceOutputRepo } from '../../repo/serviceOutput';
 import type { RedisRepository as ServiceOutputIdentifierRepo } from '../../repo/serviceOutputIdentifier';
@@ -21,6 +22,7 @@ export interface IAuthorizeOperationRepos {
     orderNumber: OrderNumberRepo;
     ownershipInfo: OwnershipInfoRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
     project: ProjectRepo;
     serviceOutput: ServiceOutputRepo;
     serviceOutputIdentifier: ServiceOutputIdentifierRepo;
@@ -61,9 +63,10 @@ export declare function search(params: {
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
 }) => Promise<{
     offers: factory.product.ITicketOffer[];
-    product: factory.product.IProduct;
+    product: Omit<factory.product.IProduct, "offers">;
 }>;
 export type IAuthorizeOfferAction = factory.action.authorize.offer.product.IAction;
 /**

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

@@ -39,14 +39,20 @@ function search(params) {
         // 販売者指定の場合、検証
         if (product.typeOf === factory.product.ProductType.MembershipService
             || product.typeOf === factory.product.ProductType.PaymentCard) {
-            if (typeof ((_a = params.seller) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const productOffers = product.offers;
-                if (!Array.isArray(productOffers)) {
-                    return { offers: [], product };
-                }
+            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
+            if (typeof sellerId === 'string') {
+                // const productOffers = product.offers;
+                // if (!Array.isArray(productOffers)) {
+                //     return { offers: [], product };
+                // }
+                const productOffers = yield repos.productOffer.search({
+                    project: { id: { $eq: params.project.id } },
+                    itemOffered: { id: { $eq: params.itemOffered.id } },
+                    seller: { id: { $eq: sellerId } }
+                });
                 const hasValidOffer = productOffers.some((o) => {
-                    var _a, _b;
-                    return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === ((_b = params.seller) === null || _b === void 0 ? void 0 : _b.id)
+                    var _a;
+                    return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === sellerId
                         && o.validFrom !== undefined
                         && moment(o.validFrom)
                             .isSameOrBefore(now)
@@ -111,7 +117,7 @@ function authorize(params) {
             availableOffers,
             seller: transaction.seller,
             orderNumber
-        })();
+        })(repos);
         acceptedOffer = yield createServiceOutputIdentifier({ acceptedOffer, product })(repos);
         let requestBody;
         let responseBody;
@@ -278,7 +284,7 @@ function processVoidRegisterServiceTransaction(params) {
  * 受け入れらたオファーの内容を検証
  */
 function validateAcceptedOffers(params) {
-    return () => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         let acceptedOfferWithoutDetail = params.object;
         if (!Array.isArray(acceptedOfferWithoutDetail)) {
             acceptedOfferWithoutDetail = [acceptedOfferWithoutDetail];
@@ -293,10 +299,15 @@ function validateAcceptedOffers(params) {
             typeOf: params.seller.typeOf
         };
         // 販売者を検証
-        const productOffers = params.product.offers;
-        if (!Array.isArray(productOffers)) {
-            throw new factory.errors.Argument('Product', 'Product offers undefined');
-        }
+        // const productOffers = params.product.offers;
+        // if (!Array.isArray(productOffers)) {
+        //     throw new factory.errors.Argument('Product', 'Product offers undefined');
+        // }
+        const productOffers = yield repos.productOffer.search({
+            project: { id: { $eq: params.product.project.id } },
+            itemOffered: { id: { $eq: String(params.product.id) } },
+            seller: { id: { $eq: params.seller.id } }
+        });
         const hasValidOffer = productOffers.some((o) => {
             var _a;
             return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === params.seller.id;

package/lib/chevre/service/payment/movieTicket/checkByIdentifier.d.ts

@@ -1,4 +1,5 @@
-import { IMinimizedIndividualEvent } from '../../../repo/event';
+import type { IMinimizedIndividualEvent } from '../../../repo/event';
+import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { MongoRepository as ProductRepo } from '../../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import * as factory from '../../../factory';
@@ -16,6 +17,7 @@ interface ICheckByIdentifierParams {
  * MovieTicket認証
  */
 declare function checkByIdentifier(params: ICheckByIdentifierParams): (repos: {
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
 }) => Promise<ICheckResult>;

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

@@ -61,8 +61,8 @@ function checkByIdentifier(params) {
             skhnCd = `${eventCOAInfo.titleCode}${`00${eventCOAInfo.titleBranchNum}`.slice(DIGITS)}`;
         }
         const sellerCredentials = yield (0, getCredentials_1.getCredentials)({
-            paymentMethodType,
-            seller: params.seller,
+            // paymentMethodType,
+            seller: { id: String(params.seller.id), project: { id: params.seller.project.id } },
             paymentServiceId: params.paymentServiceId
         })(repos);
         purchaseNumberAuthIn = {

package/lib/chevre/service/payment/movieTicket/getCredentials.d.ts

@@ -1,11 +1,20 @@
-import type { MongoRepository as ProductRepo } from '../../../repo/product';
-import * as factory from '../../../factory';
+import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 declare function getCredentials(params: {
-    paymentMethodType: string;
-    seller: Pick<factory.seller.ISeller, 'id' | 'project'>;
+    seller: {
+        /**
+         * 販売者ID
+         */
+        id: string;
+        project: {
+            id: string;
+        };
+    };
+    /**
+     * 決済サービスID
+     */
     paymentServiceId: string;
 }): (repos: {
-    product: ProductRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
 }) => Promise<{
     kgygishCd: string;
     stCd: string;

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

@@ -13,25 +13,43 @@ exports.getCredentials = void 0;
 const factory = require("../../../factory");
 function getCredentials(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         // 決済サービスからcredentialsを取得する
-        const paymentServices = yield repos.product.searchPaymentServices({
+        // const paymentServices = await repos.product.searchPaymentServices(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: params.seller.project.id } },
+        //         typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
+        //         id: { $eq: params.paymentServiceId }
+        //     },
+        //     [],
+        //     []
+        // );
+        // const paymentService = paymentServices.shift();
+        // if (paymentService === undefined) {
+        //     throw new factory.errors.NotFound('PaymentService');
+        // }
+        // const provider = paymentService.provider?.find((p) => p.id === params.seller.id);
+        // if (provider === undefined) {
+        //     throw new factory.errors.NotFound('PaymentService provider');
+        // }
+        const paymentService = (yield repos.paymentServiceProvider.search({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.seller.project.id } },
-            typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
+            provider: { id: { $eq: params.seller.id } },
             id: { $eq: params.paymentServiceId }
-        }, [], []);
-        const paymentService = paymentServices.shift();
+        })).shift();
         if (paymentService === undefined) {
             throw new factory.errors.NotFound('PaymentService');
         }
-        const provider = (_a = paymentService.provider) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === params.seller.id);
+        const provider = paymentService.provider;
         if (provider === undefined) {
             throw new factory.errors.NotFound('PaymentService provider');
         }
-        const kgygishCd = (_b = provider.credentials) === null || _b === void 0 ? void 0 : _b.kgygishCd;
-        const stCd = (_c = provider.credentials) === null || _c === void 0 ? void 0 : _c.stCd;
+        const kgygishCd = (_a = provider.credentials) === null || _a === void 0 ? void 0 : _a.kgygishCd;
+        const stCd = (_b = provider.credentials) === null || _b === void 0 ? void 0 : _b.stCd;
         if (typeof kgygishCd !== 'string' || typeof stCd !== 'string') {
             throw new factory.errors.Argument('transaction', 'Provider credentials not enough');
         }

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as EventRepo } from '../../../repo/event';
+import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { MongoRepository as ProductRepo } from '../../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
@@ -8,6 +9,7 @@ export declare function validateMovieTicket(params: factory.assetTransaction.pay
     action: ActionRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
 }) => Promise<{

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

@@ -1,6 +1,7 @@
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
-import { MongoRepository as EventRepo } from '../../repo/event';
+import type { MongoRepository as EventRepo } from '../../repo/event';
+import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
@@ -11,6 +12,7 @@ interface ICheckOperationRepos {
     action: ActionRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
 }
@@ -20,6 +22,7 @@ interface IPayOperationRepos {
     accountingReport: AccountingReportRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     task: TaskRepo;
@@ -53,6 +56,7 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
     accountingReport: AccountingReportRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     task: TaskRepo;

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

@@ -23,7 +23,6 @@ const validation_1 = require("./movieTicket/validation");
 const errorHandler_1 = require("../../errorHandler");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
-// type ICheckMovieTicketAction = factory.action.check.paymentMethod.movieTicket.IAction;
 /**
  * MovieTicket認証
  */
@@ -314,8 +313,8 @@ function payActionParams2seatInfoSyncIn(params) {
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);
         const sellerCredentials = yield (0, getCredentials_1.getCredentials)({
-            paymentMethodType,
-            seller: { id: sellerId, project: { id: event.project.id, typeOf: factory.organizationType.Project } },
+            // paymentMethodType,
+            seller: { id: sellerId, project: { id: event.project.id } },
             paymentServiceId
         })(repos);
         const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({

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

@@ -64,11 +64,6 @@ function onResourceDeleted(params) {
                         project: { id: params.project.id },
                         ids: params.id
                     })(repos);
-                    // case factory.offerType.Offer:
-                    //     await deleteResourcesByOffer({
-                    //         project: { id: params.project.id },
-                    //         ids: params.id
-                    //     })(repos);
                     break;
                 case 'OfferCatalog':
                     yield deleteResourcesByOfferCatalog({
@@ -86,6 +81,8 @@ function onResourceDeleted(params) {
                 case factory.product.ProductType.EventService:
                 case factory.product.ProductType.Product:
                 case factory.product.ProductType.Transportation:
+                case factory.product.ProductType.MembershipService:
+                case factory.product.ProductType.PaymentCard:
                     yield deleteResourcesByProduct({
                         project: { id: params.project.id },
                         ids: params.id,

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.347.0-alpha.12",
-    "@cinerino/sdk": "5.4.0-alpha.7",
+    "@chevre/factory": "4.347.0-alpha.14",
+    "@cinerino/sdk": "5.5.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -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.42"
+  "version": "21.18.0-alpha.44"
 }