@chevre/domain 21.4.0-alpha.8 → 21.4.0

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

@@ -67,7 +67,8 @@ function authorize(params) {
                         unitPriceOffers,
                         validateEvent: params.validateEvent === true,
                         validateEventOfferPeriod: params.validateEventOfferPeriod === true,
-                        disablePendingReservations: params.disablePendingReservations,
+                        // 完全廃止(2023-07-19~)
+                        // disablePendingReservations: params.disablePendingReservations,
                         useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber,
                         stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
                     })(repos);
@@ -165,7 +166,10 @@ function processStartReserve4chevre(params) {
         // requestBody = startParams;
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos);
         // 予約取引開始
-        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, disablePendingReservations: params.disablePendingReservations, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);
+        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, 
+            // 完全廃止(2023-07-19~)
+            // disablePendingReservations: params.disablePendingReservations,
+            useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);
         responseBody = startReserveTransactionResult.transaction;
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({

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

@@ -18,7 +18,7 @@ function searchTicketOffersByItemOffered(params) {
         var _a, _b, _c, _d;
         let catalogId;
         if (typeof ((_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const eventService = yield repos.product.findById({ id: (_b = params.itemOffered) === null || _b === void 0 ? void 0 : _b.id });
+            const eventService = yield repos.product.findById({ id: (_b = params.itemOffered) === null || _b === void 0 ? void 0 : _b.id }, ['hasOfferCatalog'], []);
             if (typeof ((_c = eventService.hasOfferCatalog) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
                 catalogId = eventService.hasOfferCatalog.id;
             }

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

@@ -18,7 +18,7 @@ function searchProductOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         // プロダクト検索
-        const productWithOffers = yield repos.product.findById({ id: params.itemOffered.id });
+        const productWithOffers = yield repos.product.findById({ id: params.itemOffered.id }, ['hasOfferCatalog'], []);
         const offerCatalogId = (_a = productWithOffers.hasOfferCatalog) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof offerCatalogId !== 'string') {
             return [];

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

@@ -14,6 +14,7 @@ const order_1 = require("../../factory/order");
 const factory_1 = require("../delivery/factory");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+// tslint:disable-next-line:max-func-body-length
 function returnOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const orderNumber = params.object.orderNumber;
@@ -21,7 +22,12 @@ function returnOrder(params) {
             ? params.object.dateReturned
             : new Date();
         const returner = params.agent;
-        let order = yield repos.order.findByOrderNumber({ orderNumber, inclusion: [], exclusion: [] });
+        let order = yield repos.order.findByOrderNumber({
+            orderNumber,
+            project: { id: params.project.id },
+            inclusion: [],
+            exclusion: []
+        });
         // プロジェクト条件検証
         if (order.project.id !== params.project.id) {
             throw new factory.errors.NotFound('Order');
@@ -59,6 +65,7 @@ function returnOrder(params) {
             returnedOwnershipInfos = yield processReturnOrder(order, dateReturned)({ ownershipInfo: repos.ownershipInfo });
             // 注文ステータス変更
             order = yield repos.order.returnOrder({
+                project: { id: order.project.id },
                 orderNumber,
                 dateReturned,
                 returner

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

@@ -31,7 +31,12 @@ function sendOrder(params) {
                 orderNumber
             })({ transaction: repos.transaction });
             // 注文取得
-            let order = yield repos.order.findByOrderNumber({ orderNumber, inclusion: [], exclusion: [] });
+            let order = yield repos.order.findByOrderNumber({
+                orderNumber,
+                project: { id: params.project.id },
+                inclusion: [],
+                exclusion: []
+            });
             // プロジェクト条件検証
             if (order.project.id !== params.project.id) {
                 throw new factory.errors.NotFound('Order');
@@ -69,6 +74,7 @@ function sendOrder(params) {
                     return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
                 })));
                 order = yield repos.order.changeStatus({
+                    project: { id: order.project.id },
                     orderNumber,
                     orderStatus: factory.orderStatus.OrderDelivered,
                     previousOrderStatus: factory.orderStatus.OrderProcessing
@@ -98,6 +104,7 @@ function sendOrder(params) {
             // すでにOrderReturnedだった場合、OrderDelivered->OrderReturnedの処理自体は成功しているので、後処理を続行する
             const currentOrder = yield repos.order.findByOrderNumber({
                 orderNumber: params.object.orderNumber,
+                project: { id: params.project.id },
                 inclusion: ['orderStatus'],
                 exclusion: []
             });

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

@@ -28,7 +28,11 @@ const debug = createDebug('chevre-domain:service:payment');
 function authorize(params, paymentServiceId, searchTrade4accountId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        const project = yield repos.project.findById({ id: params.project.id });
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['settings'],
+            exclusion: []
+        });
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
         if (typeof paymentMethodType !== 'string') {
@@ -521,7 +525,15 @@ function processChangeTransaction(params) {
 function getGMOInfoFromSeller(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        const seller = yield repos.seller.findById({ id: String(params.seller.id) }, ['paymentAccepted', 'project'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: String(params.seller.id) }
+        }, ['paymentAccepted', 'project'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentAccepted = (_a = seller.paymentAccepted) === null || _a === void 0 ? void 0 : _a.some((a) => a.paymentMethodType === params.paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('transaction', 'payment not accepted');

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

@@ -52,7 +52,15 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted', 'project'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: sellerId }
+        }, ['paymentAccepted', 'project'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', 'payment not accepted');

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

@@ -27,6 +27,7 @@ const onRefund_1 = require("./any/onRefund");
 /**
  * MovieTicket認証
  */
+// tslint:disable-next-line:max-func-body-length
 function checkMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
@@ -58,7 +59,15 @@ function checkMovieTicket(params) {
                 id: eventIds[0]
             });
             // ショップ情報取得
-            const seller = yield repos.seller.findById({ id: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.seller.id }, ['paymentAccepted', 'project'], []);
+            const sellers = yield repos.seller.search({
+                limit: 1,
+                page: 1,
+                id: { $eq: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.seller.id }
+            }, ['paymentAccepted', 'project'], []);
+            const seller = sellers.shift();
+            if (seller === undefined) {
+                throw new factory.errors.NotFound(factory.organizationType.Corporation);
+            }
             const paymentAccepted = (_f = seller.paymentAccepted) === null || _f === void 0 ? void 0 : _f.some((a) => a.paymentMethodType === paymentMethodType);
             if (paymentAccepted !== true) {
                 throw new factory.errors.Argument('transactionId', 'payment not accepted');
@@ -302,7 +311,15 @@ function payActionParams2seatInfoSyncIn(params) {
         // イベント取得属性最適化(2023-01-23~)
         // const event = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: eventIds[0] });
         const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
-        const seller = yield repos.seller.findById({ id: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) }, ['paymentAccepted', 'project'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) }
+        }, ['paymentAccepted', 'project'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);
         const sellerCredentials = yield (0, getCredentials_1.getCredentials)({ paymentMethodType, seller, paymentServiceId })(repos);

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

@@ -23,7 +23,11 @@ const accountTransactionIdentifier_1 = require("../../factory/accountTransaction
 function authorize(params, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const project = yield repos.project.findById({ id: params.project.id });
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['_id', 'typeOf'],
+            exclusion: []
+        });
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string') {
             throw new factory.errors.ArgumentNull('transactionNumber');
@@ -75,9 +79,7 @@ function validatePaymentMethod(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
         }
         // プロダクトから通貨区分を取得
-        const paymentCatdProduct = yield repos.product.findById({
-            id: paymentServiceId
-        });
+        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;
         if (typeof currency !== 'string') {
             throw new factory.errors.NotFound('product.serviceOutput.amount.currency');

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

@@ -23,22 +23,15 @@ function cancelPendingReservation(actionAttributes) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const now = new Date();
-        let canceledReservations = [];
+        const canceledReservations = [];
         const { reserveTransaction } = yield cancelPengindIfNotYet(actionAttributes, now)(repos);
         if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
             if (reserveTransaction.object.disablePendingReservations === true) {
                 // Pendingが存在しない場合は検索しても無駄(2023-06-05~)
             }
             else {
-                canceledReservations = yield repos.reservation.search({
-                    reservationNumber: { $eq: actionAttributes.object.reservationNumber },
-                    typeOf: factory.reservationType.EventReservation
-                });
-                canceledReservations = canceledReservations.map((r) => {
-                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    delete r._id;
-                    return r;
-                });
+                // 完全廃止(2023-07-19~)
+                throw new factory.errors.NotImplemented('disablePendingReservations must be true');
             }
         }
         yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, false, {
@@ -48,7 +41,7 @@ function cancelPendingReservation(actionAttributes) {
     });
 }
 exports.cancelPendingReservation = cancelPendingReservation;
-function cancelPengindIfNotYet(params, now) {
+function cancelPengindIfNotYet(params, __) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const actionAttributes = params;
@@ -83,7 +76,7 @@ function cancelPengindIfNotYet(params, now) {
             // アクション開始
             const action = yield repos.action.start(actionAttributes);
             const actionObject = actionAttributes.object;
-            let cancelResult;
+            // let cancelResult: ICancelResult | undefined;
             try {
                 if (reserveTransaction !== undefined) {
                     const reservationFor = reserveTransaction.object.reservationFor;
@@ -126,12 +119,8 @@ function cancelPengindIfNotYet(params, now) {
                             // disablePendingReservationsの場合は処理不要(2023-06-05~)
                         }
                         else {
-                            // 予約番号単位でキャンセル状態に変更する
-                            cancelResult = yield repos.reservation.cancelByReservationNumber({
-                                reservationNumber: actionObject.reservationNumber,
-                                previousReservationStatus: actionObject.reservationStatus,
-                                modifiedTime: now
-                            });
+                            // 完全廃止(2023-07-19~)
+                            throw new factory.errors.NotImplemented('disablePendingReservations must be true');
                         }
                     }
                     else {
@@ -152,17 +141,15 @@ function cancelPengindIfNotYet(params, now) {
                 throw error;
             }
             // アクション完了
-            const actionResult = Object.assign({}, (cancelResult !== undefined) ? {
-                cancelResult: {
-                    // n: cancelResult.n,
-                    // nModified: cancelResult.nModified,
-                    // ok: cancelResult.ok,
-                    matchedCount: cancelResult.matchedCount,
-                    modifiedCount: cancelResult.modifiedCount
-                }
-            } : undefined
+            const actionResult = {
+            // ...(cancelResult !== undefined) ? {
+            //     cancelResult: {
+            //         matchedCount: cancelResult.matchedCount,
+            //         modifiedCount: cancelResult.modifiedCount
+            //     }
+            // } : undefined
             // canceledReservationId: canceledReservation?.id
-            );
+            };
             yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
         return { reserveTransaction };

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

@@ -51,7 +51,7 @@ exports.confirmReservation = confirmReservation;
 function reserveIfNotYet(params, options) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const reservationPackage = params.object;
         // 冪等性を担保(2023-05-31~)
         debug('searching completed reserveAction... byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
@@ -97,50 +97,34 @@ function reserveIfNotYet(params, options) {
                     if (reserveTransaction.object.disablePendingReservations === true) {
                         const reservationFor = reserveTransaction.object.reservationFor;
                         const subReservations = reserveTransaction.object.subReservation;
-                        if (Array.isArray(subReservations) && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string') {
+                        const issuedThrough = reserveTransaction.object.issuedThrough;
+                        if (Array.isArray(subReservations)
+                            && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string'
+                            && typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.typeOf) === 'string') {
                             // confirmManyに変更(2023-06-13~)
                             const confirmManyIfNotExistResult = yield repos.reservation.confirmManyIfNotExist({
+                                provider: (typeof ((_b = reserveTransaction.object.provider) === null || _b === void 0 ? void 0 : _b.id) === 'string')
+                                    ? reserveTransaction.object.provider
+                                    : { id: reserveTransaction.agent.id, typeOf: factory.organizationType.Corporation },
                                 subReservation: subReservations,
+                                issuedThrough,
                                 reservationFor,
                                 underName,
-                                broker: reserveTransaction.object.broker,
-                                issuedThrough: reserveTransaction.object.issuedThrough
+                                broker: reserveTransaction.object.broker
                             });
                             debug('confirmManyIfNotExistResult:', confirmManyIfNotExistResult, 'reservationNumber:', reservationPackage.reservationNumber);
-                            // await Promise.all(subReservations.map(async (subReservation) => {
-                            //     await repos.reservation.confirmByIdIfNotExist({
-                            //         reservation: subReservation,
-                            //         reservationFor,
-                            //         underName,
-                            //         broker: reserveTransaction.object.broker,
-                            //         issuedThrough: reserveTransaction.object.issuedThrough
-                            //     });
-                            // }));
                         }
                     }
                     else {
-                        // 予約を確定状態に変更する
-                        yield repos.reservation.confirmByReservationNumber({
-                            reservationNumber: reservationPackage.reservationNumber,
-                            previousReservationStatus: reservationPackage.reservationStatus,
-                            underName,
-                            broker: reserveTransaction.object.broker,
-                            issuedThrough: reserveTransaction.object.issuedThrough
-                        });
+                        // 旧予約取引に対して本処理が走る可能性がなくはないが、
+                        // それらについては実質Confirmedの予約はすでに存在するはずなので、何もしない
+                        // 完全廃止(2023-07-19~)
+                        // throw new factory.errors.NotImplemented('disablePendingReservations must be true');
                     }
                 }
                 else {
                     // 廃止(2023-01-18)
                     throw new factory.errors.Forbidden(`${reservationPackage.typeOf} not acceptable`);
-                    // 予約を確定状態に変更する
-                    // await repos.reservation.confirm<factory.reservationType.EventReservation>({
-                    //     id: reservation.id,
-                    //     previousReservationStatus: reservation.reservationStatus,
-                    //     underName: reservation.underName
-                    // });
-                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    // delete (<any>reservation)._id;
-                    // confirmedReservations.push(reservation);
                 }
             }
             catch (error) {

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

@@ -7,6 +7,9 @@ export declare function verifyToken4reservation(params: {
     project: {
         id: string;
     };
+    seller?: {
+        id?: string;
+    };
     agent: factory.action.check.token.IAgent;
     reservationId: string;
     token: string;

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

@@ -26,8 +26,10 @@ function verifyToken4reservation(params) {
             case factory.order.OrderType.Order:
                 // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
                 const order = yield repos.order.findByOrderNumberAndReservationId({
+                    project: { id: params.project.id },
                     orderNumber: payload.orderNumber,
-                    reservationId: params.reservationId
+                    reservationId: params.reservationId,
+                    seller: params.seller
                 });
                 // ステータス検証
                 switch (order.orderStatus) {

package/lib/chevre/service/task/{syncScreeningRooms.d.ts → createEvent.d.ts}

@@ -4,4 +4,4 @@ export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.syncScreeningRooms.IData): IOperation<void>;
+export declare function call(data: factory.task.createEvent.IData): IOperation<void>;

package/lib/chevre/service/task/{syncScreeningRooms.js → createEvent.js}

@@ -10,14 +10,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const action_1 = require("../../repo/action");
+const event_1 = require("../../repo/event");
 const place_1 = require("../../repo/place");
+const task_1 = require("../../repo/task");
+const EventService = require("../event");
 /**
  * タスク実行関数
  */
 function call(data) {
-    return (connectionSettings) => __awaiter(this, void 0, void 0, function* () {
-        const placeRepo = new place_1.MongoRepository(connectionSettings.connection);
-        yield placeRepo.syncScreeningRooms({ id: data.id });
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        yield EventService.createEvent(data)({
+            action: new action_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
+            place: new place_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
+        });
     });
 }
 exports.call = call;

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

@@ -56,6 +56,7 @@ function onAuthorizationCreated(params) {
                     // 最適化(2023-01-28~)
                     const order = yield repos.order.findByOrderNumber({
                         orderNumber,
+                        project: { id: params.project.id },
                         inclusion: ['acceptedOffers'],
                         exclusion: []
                     });

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

@@ -68,6 +68,7 @@ function returnPayTransaction(params) {
         }
         const order = yield repos.order.findByOrderNumber({
             orderNumber,
+            project: { id: returnOrderTransaction.project.id },
             inclusion: ['seller', 'project', 'dateReturned'],
             exclusion: []
         });

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

@@ -28,7 +28,15 @@ const CodeService = require("../code");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const seller = yield repos.seller.findById({ id: params.seller.id }, ['name', 'typeOf'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.seller.id }
+        }, ['name', 'typeOf'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const passport = yield (0, validation_1.validateWaiterPassport)(params);
         // 金額をfix
         const amount = params.object.amount;

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

@@ -34,7 +34,11 @@ function findCreditCard(params) {
         //     throw new factory.errors.NotFound('CreditCard');
         // }
         var _a;
-        const project = yield repos.project.findById({ id: params.project.id });
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['settings'],
+            exclusion: []
+        });
         // const userPoolId: string = params.iss;
         // checkUseMyCreditCards(project);
         let memberId = params.customer.id;
@@ -112,7 +116,7 @@ function getCreditCardPaymentServiceChannel(params) {
             throw new factory.errors.NotFound('PaymentService');
         }
         // IDで検索いないとavailableChannelを取得できない
-        const paymentService = yield repos.product.findById({ id: String(paymentServiceSetting.id) });
+        const paymentService = yield repos.product.findById({ id: String(paymentServiceSetting.id) }, ['availableChannel'], []);
         const availableChannel = paymentService === null || paymentService === void 0 ? void 0 : paymentService.availableChannel;
         if (typeof (availableChannel === null || availableChannel === void 0 ? void 0 : availableChannel.serviceUrl) !== 'string') {
             throw new factory.errors.NotFound('paymentService.availableChannel.serviceUrl');

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

@@ -29,12 +29,15 @@ exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const seller = yield repos.seller.findById({ id: params.seller.id }, ['name', 'project', 'typeOf', 'makesOffer'], []
-        // {
-        //     hasMerchantReturnPolicy: 0,
-        //     paymentAccepted: 0
-        // }
-        );
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.seller.id }
+        }, ['name', 'project', 'typeOf', 'makesOffer'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         let makesOfferFromClient;
         // 販売者オファー検証(2022-10-14~)
         if (params.validateSeller === true) {

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

@@ -29,9 +29,15 @@ function start(params) {
         const now = new Date();
         const { acceptedOffers, eventIds, offerIds, orders } = yield fixOrders(params)(repos);
         // sellerはorderから自動取得
-        const seller = yield repos.seller.findById({ id: String(orders[0].seller.id) }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf'], []
-        // { additionalProperty: 0, paymentAccepted: 0 }
-        );
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: String(orders[0].seller.id) }
+        }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         yield validateOrder({ orders })(repos);
         let offers = [];
         if (offerIds.length > 0) {

package/lib/chevre/settings.d.ts

@@ -39,8 +39,6 @@ export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
-export declare const USE_NEW_STOCK_HOLDER_REPO_FROM: moment.Moment;
-export declare const USE_NEW_STOCK_HOLDER_REPO_IDS: string[];
 export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
 export declare const MONGO_MAX_TIME_MS: number;
 /**

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_NEW_STOCK_HOLDER_REPO_IDS = exports.USE_NEW_STOCK_HOLDER_REPO_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -65,12 +65,12 @@ exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TR
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM)
     : moment('2023-08-31T15:00:00Z');
-exports.USE_NEW_STOCK_HOLDER_REPO_FROM = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_FROM === 'string')
-    ? moment(process.env.USE_NEW_STOCK_HOLDER_REPO_FROM)
-    : moment('2024-11-30T15:00:00Z');
-exports.USE_NEW_STOCK_HOLDER_REPO_IDS = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_IDS === 'string')
-    ? process.env.USE_NEW_STOCK_HOLDER_REPO_IDS.split(' ')
-    : [];
+// export const USE_NEW_STOCK_HOLDER_REPO_FROM: moment.Moment = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_FROM === 'string')
+//     ? moment(process.env.USE_NEW_STOCK_HOLDER_REPO_FROM)
+//     : moment('2024-11-30T15:00:00Z');
+// export const USE_NEW_STOCK_HOLDER_REPO_IDS: string[] = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_IDS === 'string')
+//     ? process.env.USE_NEW_STOCK_HOLDER_REPO_IDS.split(' ')
+//     : [];
 exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
     ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
     : 0;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.315.0-alpha.1",
-    "@cinerino/sdk": "3.160.0-alpha.3",
+    "@chevre/factory": "4.316.0",
+    "@cinerino/sdk": "3.162.0-alpha.6",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.4.0-alpha.8"
+  "version": "21.4.0"
 }

package/example/src/chevre/findByOrderNumberAndReservationId.ts

@@ -1,20 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const orderRepo = new chevre.repository.Order(mongoose.connection);
-
-    const order = await orderRepo.findByOrderNumberAndReservationId({
-        orderNumber: 'CIN9-4783801-1618274',
-        reservationId: '139787058570943-0'
-    });
-    console.log('order found', order);
-}
-
-main()
-    .then()
-    .catch(console.error);