@chevre/domain 21.18.0-alpha.4 → 21.18.0-alpha.41

package/lib/chevre/repo/place.js

@@ -625,7 +625,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchScreeningRoomSections(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
             const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -722,17 +722,21 @@ class MongoRepository {
                 { $unwind: '$containsPlace' },
                 ...matchStages,
                 {
-                    $project: Object.assign({ _id: 0, typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name', containedInPlace: {
-                            typeOf: '$typeOf',
-                            branchCode: '$branchCode',
-                            name: '$name',
+                    $project: Object.assign(Object.assign({ _id: 0, typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name', additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.containedInPlace) === 1)
+                        ? {
                             containedInPlace: {
-                                id: '$containedInPlace.id',
-                                typeOf: '$containedInPlace.typeOf',
-                                branchCode: '$containedInPlace.branchCode',
-                                name: '$containedInPlace.name'
+                                typeOf: '$typeOf',
+                                branchCode: '$branchCode',
+                                name: '$name',
+                                containedInPlace: {
+                                    id: '$containedInPlace.id',
+                                    typeOf: '$containedInPlace.typeOf',
+                                    branchCode: '$containedInPlace.branchCode',
+                                    name: '$containedInPlace.name'
+                                }
                             }
-                        }, additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.seatCount) === 1)
+                        }
+                        : undefined), (((_q = searchConditions.$projection) === null || _q === void 0 ? void 0 : _q.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $cond: {

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

@@ -22,23 +22,49 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } 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'>;
 };
+type IUnsetKey = keyof Pick<factory.product.IProduct, 'additionalProperty' | 'availableChannel' | 'hasOfferCatalog' | 'serviceOutput' | 'serviceType'>;
 /**
  * プロダクトリポジトリ
  */
 export declare class MongoRepository {
     private readonly productModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.product.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.product.ISearchConditions): FilterQuery<factory.product.IProduct>[];
     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>;
@@ -52,22 +78,26 @@ 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[]>;
     /**
      * プロダクトを保管する
-     * 作成 or 更新
      */
-    save(params: {
+    saveProduct(params: {
         /**
          * idを指定すれば更新
          */
         id?: string;
-        attributes: factory.product.IProduct | factory.service.paymentService.IService;
+        $set: factory.product.IProduct;
+        $unset: {
+            [key in IUnsetKey]?: 1;
+        };
         /**
          * 指定プロジェクトの指定プロダクトタイプが存在しなければ作成する
          */
         createIfNotExist?: boolean;
-    }): Promise<factory.product.IProduct>;
+    }): Promise<{
+        id: string;
+    }>;
     deleteByHasOfferCatalog(params: {
         project: {
             id: string;
@@ -86,3 +116,4 @@ export declare class MongoRepository {
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }
+export {};

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,12 +179,63 @@ 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);
+            // 強制的にtypeOfを絞る
+            andConditions.push({
+                typeOf: {
+                    $in: [
+                        factory.service.paymentService.PaymentServiceType.CreditCard,
+                        factory.service.paymentService.PaymentServiceType.MovieTicket
+                    ]
+                }
+            });
             let projection = {};
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 inclusion.forEach((field) => {
@@ -233,18 +281,29 @@ class MongoRepository {
      */
     findAvailableChannel(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const paymentServices = yield this.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: params.project.id } },
-                typeOf: { $eq: params.typeOf },
-                id: { $eq: params.id }
-            }, [], []);
-            const paymentServiceSetting = paymentServices.shift();
-            if (paymentServiceSetting === undefined) {
+            let paymentService;
+            if (params.typeOf === factory.service.paymentService.PaymentServiceType.PaymentCard) {
+                paymentService = (yield this.searchProducts({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: { $eq: factory.product.ProductType.PaymentCard },
+                    id: { $eq: params.id }
+                }, ['availableChannel'], [])).shift();
+            }
+            else {
+                paymentService = (yield this.searchPaymentServices({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: { $eq: params.typeOf },
+                    id: { $eq: params.id }
+                }, ['availableChannel'], [])).shift();
+            }
+            if (paymentService === undefined) {
                 throw new factory.errors.NotFound('PaymentService');
             }
-            const availableChannel = paymentServiceSetting.availableChannel;
+            const availableChannel = paymentService.availableChannel;
             if (availableChannel === undefined) {
                 throw new factory.errors.NotFound('paymentService.availableChannel');
             }
@@ -315,60 +374,48 @@ class MongoRepository {
     }
     /**
      * プロダクトを保管する
-     * 作成 or 更新
      */
-    save(params) {
+    saveProduct(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
-            // Documentにidは不要なので念のため除外
-            if (params.attributes.id !== undefined && params.attributes.id !== null) {
-                delete params.attributes.id;
-            }
             if (typeof params.id === 'string') {
-                const _a = params.attributes, { id, productID, project } = _a, updateFields = __rest(_a, ["id", "productID", "project"]);
-                switch (updateFields.typeOf) {
+                // 上書き禁止属性を除外
+                const _a = params.$set, { id, productID, project, typeOf, offers } = _a, setFields = __rest(_a, ["id", "productID", "project", "typeOf", "offers"]);
+                switch (typeOf) {
                     case factory.product.ProductType.EventService:
                     case factory.product.ProductType.MembershipService:
                     case factory.product.ProductType.PaymentCard:
                     case factory.product.ProductType.Product:
                     case factory.product.ProductType.Transportation:
-                        // 上書き禁止属性を除外(2022-08-24~)
-                        const { offers } = updateFields, updateProductFields = __rest(updateFields, ["offers"]);
-                        doc = yield this.productModel.findOneAndUpdate({
-                            _id: { $eq: params.id },
-                            typeOf: { $eq: updateProductFields.typeOf }
-                        }, updateProductFields, { upsert: false, new: true })
-                            .exec();
-                        break;
-                    case factory.service.paymentService.PaymentServiceType.CreditCard:
-                    case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                        // 上書き禁止属性を除外(2022-08-24~)
-                        const { provider } = updateFields, updatePaymentServiceFields = __rest(updateFields, ["provider"]);
                         doc = yield this.productModel.findOneAndUpdate({
                             _id: { $eq: params.id },
-                            typeOf: { $eq: updatePaymentServiceFields.typeOf }
-                        }, updatePaymentServiceFields, { upsert: false, new: true })
+                            typeOf: { $eq: typeOf }
+                        }, {
+                            $set: setFields,
+                            $unset: params.$unset
+                        }, { upsert: false, new: true, projection: { _id: 1 } })
                             .exec();
                         break;
                     default:
-                        throw new factory.errors.NotImplemented(`${updateFields.typeOf} not implemented`);
-                }
-                if (doc === null) {
-                    throw new factory.errors.NotFound(this.productModel.modelName);
+                        throw new factory.errors.NotImplemented(`${typeOf} not implemented`);
                 }
             }
             else {
+                const _b = params.$set, { id } = _b, createParams = __rest(_b, ["id"]);
                 if (params.createIfNotExist === true) {
                     doc = yield this.productModel.findOneAndUpdate({
-                        'project.id': { $eq: params.attributes.project.id },
-                        typeOf: { $eq: params.attributes.typeOf }
-                    }, { $setOnInsert: params.attributes }, { new: true, upsert: true })
+                        'project.id': { $eq: createParams.project.id },
+                        typeOf: { $eq: createParams.typeOf }
+                    }, { $setOnInsert: createParams }, { new: true, upsert: true, projection: { _id: 1 } })
                         .exec();
                 }
                 else {
-                    doc = yield this.productModel.create(params.attributes);
+                    doc = yield this.productModel.create(createParams);
                 }
             }
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.productModel.modelName);
+            }
             return doc.toObject();
         });
     }

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

@@ -24,6 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
+type IKeyOfProjection<T extends factory.transactionType> = keyof factory.transaction.ITransaction<T> | '_id' | '__v' | 'createdAt' | 'updatedAt';
 interface IAggregationByStatus {
     transactionCount: number;
     avgDuration: number;
@@ -64,8 +65,8 @@ export declare class MongoRepository {
     findById<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
-        inclusion?: string[];
-        exclusion?: string[];
+        inclusion?: IKeyOfProjection<T>[];
+        exclusion?: IKeyOfProjection<T>[];
     }): Promise<factory.transaction.ITransaction<T>>;
     /**
      * 進行中の取引を取得する
@@ -187,8 +188,8 @@ export declare class MongoRepository {
      * 取引を検索する
      */
     search<T extends factory.transactionType>(params: factory.transaction.ISearchConditions<T> & {
-        inclusion: string[];
-        exclusion: string[];
+        inclusion: IKeyOfProjection<T>[];
+        exclusion: IKeyOfProjection<T>[];
     }): Promise<factory.transaction.ITransaction<T>[]>;
     /**
      * 特定の取引を更新する(汎用)

package/lib/chevre/repository.d.ts

@@ -1,6 +1,7 @@
 /**
  * リポジトリ
  */
+import type { MongoRepository as AcceptedOfferRepo } from './repo/acceptedOffer';
 import type { MongoRepository as AccountRepo } from './repo/account';
 import type { MongoRepository as AccountingReportRepo } from './repo/accountingReport';
 import type { MongoRepository as AccountTitleRepo } from './repo/accountTitle';
@@ -25,6 +26,7 @@ import type { MongoRepository as OfferCatalogItemRepo } from './repo/offerCatalo
 import type { MongoRepository as OfferItemConditionRepo } from './repo/offerItemCondition';
 import type { MongoRepository as OrderRepo } from './repo/order';
 import type { MongoRepository as OwnershipInfoRepo } from './repo/ownershipInfo';
+import type { MongoRepository as PaymentServiceRepo } from './repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from './repo/paymentServiceProvider';
 import type { MongoRepository as PermitRepo } from './repo/permit';
 import type { MongoRepository as PlaceRepo } from './repo/place';
@@ -46,11 +48,14 @@ import type { MongoRepository as TelemetryRepo } from './repo/telemetry';
 import type { MongoRepository as TransactionRepo } from './repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from './repo/transactionNumber';
 import type { MongoRepository as TripRepo } from './repo/trip';
-import type { RedisRepository as RegisterServiceActionInProgress } from './repo/action/registerServiceInProgress';
 import type { RedisRepository as ConfirmationNumberRepo } from './repo/confirmationNumber';
 import type { RedisRepository as OrderNumberRepo } from './repo/orderNumber';
 import type { GMORepository as CreditCardRepo } from './repo/paymentMethod/creditCard';
 import type { CognitoRepository as PersonRepo } from './repo/person';
+export type AcceptedOffer = AcceptedOfferRepo;
+export declare namespace AcceptedOffer {
+    function createInstance(...params: ConstructorParameters<typeof AcceptedOfferRepo>): Promise<AcceptedOfferRepo>;
+}
 export type Account = AccountRepo;
 export declare namespace Account {
     function createInstance(...params: ConstructorParameters<typeof AccountRepo>): Promise<AccountRepo>;
@@ -83,12 +88,6 @@ export type Aggregation = AggregationRepo;
 export declare namespace Aggregation {
     function createInstance(...params: ConstructorParameters<typeof AggregationRepo>): Promise<AggregationRepo>;
 }
-export declare namespace action {
-    type RegisterServiceInProgress = RegisterServiceActionInProgress;
-    namespace RegisterServiceInProgress {
-        function createInstance(...params: ConstructorParameters<typeof RegisterServiceActionInProgress>): Promise<RegisterServiceActionInProgress>;
-    }
-}
 export type AssetTransaction = AssetTransactionRepo;
 export declare namespace AssetTransaction {
     function createInstance(...params: ConstructorParameters<typeof AssetTransactionRepo>): Promise<AssetTransactionRepo>;
@@ -161,6 +160,10 @@ export type OwnershipInfo = OwnershipInfoRepo;
 export declare namespace OwnershipInfo {
     function createInstance(...params: ConstructorParameters<typeof OwnershipInfoRepo>): Promise<OwnershipInfoRepo>;
 }
+export type PaymentService = PaymentServiceRepo;
+export declare namespace PaymentService {
+    function createInstance(...params: ConstructorParameters<typeof PaymentServiceRepo>): Promise<PaymentServiceRepo>;
+}
 export type PaymentServiceProvider = PaymentServiceProviderRepo;
 export declare namespace PaymentServiceProvider {
     function createInstance(...params: ConstructorParameters<typeof PaymentServiceProviderRepo>): Promise<PaymentServiceProviderRepo>;

package/lib/chevre/repository.js

@@ -9,7 +9,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.rateLimit = void 0;
+var AcceptedOffer;
+(function (AcceptedOffer) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/acceptedOffer'))).MongoRepository;
+            }
+            return new repo(...params);
+        });
+    }
+    AcceptedOffer.createInstance = createInstance;
+})(AcceptedOffer = exports.AcceptedOffer || (exports.AcceptedOffer = {}));
 var Account;
 (function (Account) {
     let repo;
@@ -114,22 +128,6 @@ var Aggregation;
     }
     Aggregation.createInstance = createInstance;
 })(Aggregation = exports.Aggregation || (exports.Aggregation = {}));
-var action;
-(function (action) {
-    let RegisterServiceInProgress;
-    (function (RegisterServiceInProgress) {
-        let repo;
-        function createInstance(...params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (repo === undefined) {
-                    repo = (yield Promise.resolve().then(() => require('./repo/action/registerServiceInProgress'))).RedisRepository;
-                }
-                return new repo(...params);
-            });
-        }
-        RegisterServiceInProgress.createInstance = createInstance;
-    })(RegisterServiceInProgress = action.RegisterServiceInProgress || (action.RegisterServiceInProgress = {}));
-})(action = exports.action || (exports.action = {}));
 var AssetTransaction;
 (function (AssetTransaction) {
     let repo;
@@ -364,6 +362,19 @@ var OwnershipInfo;
     }
     OwnershipInfo.createInstance = createInstance;
 })(OwnershipInfo = exports.OwnershipInfo || (exports.OwnershipInfo = {}));
+var PaymentService;
+(function (PaymentService) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/paymentService'))).MongoRepository;
+            }
+            return new repo(...params);
+        });
+    }
+    PaymentService.createInstance = createInstance;
+})(PaymentService = exports.PaymentService || (exports.PaymentService = {}));
 var PaymentServiceProvider;
 (function (PaymentServiceProvider) {
     let repo;

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/potentialActions.d.ts

@@ -6,5 +6,7 @@ export type IUnitPriceSpecification = factory.unitPriceOffer.IUnitPriceOfferPric
 export declare function createPotentialActions(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>;
     potentialActions?: factory.assetTransaction.pay.IPotentialActionsParams;
-    order: factory.order.IOrder;
+    order: Pick<factory.order.IOrder, 'typeOf' | 'confirmationNumber' | 'orderNumber'> & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): factory.assetTransaction.IPotentialActions<factory.assetTransactionType.Pay>;

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

@@ -214,12 +214,12 @@ function reservationPriceComponent2invoicePriceComponent(component) {
     }
 }
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType) {
-    var _a, _b;
+    var _a;
     let ticketToken;
     let reservationNumber = '';
     let priceComponents4invoice = [];
     // Orderから対象予約を取得
-    const reservationOffer = (_a = order === null || order === void 0 ? void 0 : order.acceptedOffers) === null || _a === void 0 ? void 0 : _a.find((o) => {
+    const reservationOffer = order.acceptedOffers.find((o) => {
         var _a, _b, _c, _d;
         let mvtkUnitPriceSpec;
         // MovieTicket適用単価オファーからidentifierを取り出す
@@ -259,7 +259,7 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
             ticketToken = ticketTokenByReservationOffer;
         }
         reservationNumber = reservationOffer.itemOffered.reservationNumber;
-        const priceComponent = (_b = reservationOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent;
+        const priceComponent = (_a = reservationOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
         if (Array.isArray(priceComponent)) {
             priceComponents4invoice = priceComponent.map(reservationPriceComponent2invoicePriceComponent);
         }

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

@@ -3,6 +3,7 @@
  */
 import * as GMO from '@motionpicture/gmo-service';
 import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -38,6 +39,7 @@ export interface ICancelRepos {
 }
 export type ICancelOperation<T> = (repos: ICancelRepos) => Promise<T>;
 export interface IConfirmRepos {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;