@chevre/domain 21.2.0-alpha.99 → 21.2.0

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

@@ -12,17 +12,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAccountingReportIfNotExist = void 0;
 const moment = require("moment-timezone");
 const factory = require("../../factory");
-const order_1 = require("../../factory/order");
+// import { createMaskedCustomer } from '../../factory/order';
 function createAccountingReportIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const order4report = createOrder4report(params);
-        const accountingReport = createAccountingReport(order4report);
+        const accountingReport = createAccountingReport({
+            mainEntity: order4report,
+            project: { id: params.project.id }
+        });
         // 経理レポートを保管
         yield repos.accountingReport.createIfNotExist(accountingReport);
     });
 }
 exports.createAccountingReportIfNotExist = createAccountingReportIfNotExist;
+// 最適化(2023-06-30~)
 function createOrder4report(params) {
+    var _a;
     const numItems = (Array.isArray(params.acceptedOffers)) ? params.acceptedOffers.length : 0;
     // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
     const acceptedOffers = (Array.isArray(params.acceptedOffers))
@@ -53,26 +58,35 @@ function createOrder4report(params) {
             }
         })
         : [];
-    return Object.assign(Object.assign(Object.assign({}, params), { 
-        // mask
-        customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(params)), { additionalProperty: (Array.isArray(params.customer.additionalProperty))
-                ? params.customer.additionalProperty
-                : [], identifier: (Array.isArray(params.customer.identifier))
-                ? params.customer.identifier
-                : [] }), orderDate: moment(params.orderDate)
+    const customer = {
+        // ...createMaskedCustomer(params),
+        id: params.customer.id,
+        typeOf: params.customer.typeOf,
+        additionalProperty: (Array.isArray(params.customer.additionalProperty))
+            ? params.customer.additionalProperty
+            : [],
+        identifier: (Array.isArray(params.customer.identifier))
+            ? params.customer.identifier
+            : []
+    };
+    return Object.assign({ 
+        // ...params,
+        confirmationNumber: params.confirmationNumber, id: params.id, orderNumber: params.orderNumber, orderedItem: params.orderedItem, paymentMethods: params.paymentMethods, price: params.price, priceCurrency: params.priceCurrency, seller: params.seller, typeOf: params.typeOf, customer, orderDate: moment(params.orderDate)
             .toDate(), acceptedOffers,
-        numItems }), (params.dateReturned !== null && params.dateReturned !== undefined)
-        ? {
-            dateReturned: moment(params.dateReturned)
-                .toDate()
-        }
-        : undefined);
+        numItems }, (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined
+    // ...(params.dateReturned !== null && params.dateReturned !== undefined)
+    //     ? {
+    //         dateReturned: moment(params.dateReturned)
+    //             .toDate()
+    //     }
+    //     : undefined
+    );
 }
 function createAccountingReport(params) {
     return {
-        project: params.project,
+        project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: 'Report',
         hasPart: [],
-        mainEntity: params
+        mainEntity: params.mainEntity
     };
 }

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -117,7 +117,7 @@ function creteOrder4inform(order) {
                 // whitelistで作成する(2022-07-19~)
                 project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: order.acceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
                 // mask
-                customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(order)), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
+                customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(order, { noProfile: false })), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
                     // identifierは必要
                     // 予約後を隠蔽(2022-12-24~)
                     identifier: (Array.isArray(order.customer.identifier))

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

@@ -24,11 +24,11 @@ const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let tasks = [];
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,
             seller: params.order.seller,
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             // IOrderへ移行(2022-11-17~)
             // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,

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

@@ -105,12 +105,12 @@ function placeOrderWithoutTransaction(params) {
         //     orderNumber: params.object.orderNumber
         // })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
             // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             // IOrderへ移行(2022-11-17~)
             // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
@@ -168,11 +168,11 @@ function placeOrder(params) {
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
         })({ transaction: repos.transaction });
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,

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

@@ -44,7 +44,7 @@ function returnOrder(params) {
         const simpleOrder = {
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: (0, order_1.createMaskedCustomer)(order),
+            customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,

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

@@ -40,11 +40,11 @@ function sendOrder(params) {
             if (order.confirmationNumber !== confirmationNumber) {
                 throw new factory.errors.NotFound('Order');
             }
-            const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
+            const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
             const simpleOrder = {
                 typeOf: order.typeOf,
                 seller: order.seller,
-                customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+                customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
                 orderNumber: order.orderNumber,
                 price: order.price,
                 priceCurrency: order.priceCurrency,
@@ -57,7 +57,7 @@ function sendOrder(params) {
                 // sendEmailMessage: undefined
                 },
                 project: order.project,
-                recipient: order.customer,
+                recipient: { id: order.customer.id, typeOf: order.customer.typeOf },
                 typeOf: factory.actionType.SendAction
             };
             const action = yield repos.action.start(sendOrderActionAttributes);

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

@@ -56,12 +56,11 @@ function optimizeAction4report(action) {
                 endDate: action.endDate,
                 id: action.id,
                 object: optimizedPayActionObject,
-                project: action.project,
+                // 最適化(2023-06-30~)
+                // project: action.project,
                 purpose: action.purpose,
                 startDate: action.startDate,
                 typeOf: action.typeOf
-                // 不要なので廃止(2022-05-19~)
-                // ...(maskedRecipient !== undefined) ? { recipient: <factory.action.trade.pay.IRecipient>maskedRecipient } : undefined
             };
             optimizedAction = optimizedPayAction;
             break;
@@ -78,12 +77,11 @@ function optimizeAction4report(action) {
                 endDate: action.endDate,
                 id: action.id,
                 object: optimizedRefundActionObject,
-                project: action.project,
+                // 最適化(2023-06-30~)
+                // project: action.project,
                 purpose: action.purpose,
                 startDate: action.startDate,
                 typeOf: action.typeOf
-                // 不要なので廃止(2022-05-19~)
-                // ...(maskedRecipient !== undefined) ? { recipient: maskedRecipient } : undefined
             };
             optimizedAction = optimizedRefundAction;
             break;

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

@@ -21,7 +21,7 @@ const onPaymentStatusChanged_1 = require("./onPaymentStatusChanged");
  */
 function onRefund(refundAction) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const aciton4inform = (0, factory_1.optimizeAction4inform)(refundAction);
         const potentialActions = refundAction.potentialActions;
         const now = new Date();
@@ -33,49 +33,53 @@ function onRefund(refundAction) {
         }
         const informPayment = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.informPayment;
         // 手数料決済があれば処理
-        const refundFee = (_a = refundAction.object[0]) === null || _a === void 0 ? void 0 : _a.refundFee;
-        if (typeof refundFee === 'number' && refundFee > 0) {
-            const payObject = refundAction.object.map((o) => {
-                return {
-                    typeOf: o.typeOf,
-                    id: o.id,
-                    paymentMethod: {
-                        accountId: o.paymentMethod.accountId,
-                        additionalProperty: o.paymentMethod.additionalProperty,
-                        name: o.paymentMethod.name,
-                        paymentMethodId: o.paymentMethod.paymentMethodId,
-                        totalPaymentDue: {
-                            typeOf: 'MonetaryAmount',
-                            currency: factory.priceCurrency.JPY,
-                            value: refundFee
-                        },
-                        typeOf: o.paymentMethod.typeOf
+        // CreditCardIFのみ(2023-06-29~)
+        const paymentServiceType = (_a = refundAction.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
+        if (paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
+            const refundFee = (_b = refundAction.object[0]) === null || _b === void 0 ? void 0 : _b.refundFee;
+            if (typeof refundFee === 'number' && refundFee > 0) {
+                const payObject = refundAction.object.map((o) => {
+                    return {
+                        typeOf: o.typeOf,
+                        id: o.id,
+                        paymentMethod: {
+                            accountId: o.paymentMethod.accountId,
+                            additionalProperty: o.paymentMethod.additionalProperty,
+                            name: o.paymentMethod.name,
+                            paymentMethodId: o.paymentMethod.paymentMethodId,
+                            totalPaymentDue: {
+                                typeOf: 'MonetaryAmount',
+                                currency: factory.priceCurrency.JPY,
+                                value: refundFee
+                            },
+                            typeOf: o.paymentMethod.typeOf
+                        }
+                    };
+                });
+                const payAction = {
+                    project: refundAction.project,
+                    typeOf: factory.actionType.PayAction,
+                    object: payObject,
+                    agent: refundAction.recipient,
+                    recipient: refundAction.agent,
+                    purpose: refundAction.purpose,
+                    potentialActions: {
+                        add2report: true,
+                        informPayment: (Array.isArray(informPayment)) ? informPayment : []
                     }
                 };
-            });
-            const payAction = {
-                project: refundAction.project,
-                typeOf: factory.actionType.PayAction,
-                object: payObject,
-                agent: refundAction.recipient,
-                recipient: refundAction.agent,
-                purpose: refundAction.purpose,
-                potentialActions: {
-                    add2report: true,
-                    informPayment: (Array.isArray(informPayment)) ? informPayment : []
-                }
-            };
-            const payTask = {
-                project: refundAction.project,
-                name: factory.taskName.Pay,
-                status: factory.taskStatus.Ready,
-                runsAt: now,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: payAction
-            };
-            taskAttributes.push(payTask);
+                const payTask = {
+                    project: refundAction.project,
+                    name: factory.taskName.Pay,
+                    status: factory.taskStatus.Ready,
+                    runsAt: now,
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: payAction
+                };
+                taskAttributes.push(payTask);
+            }
         }
         if (Array.isArray(informPayment)) {
             taskAttributes.push(...informPayment.map((a) => {

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

@@ -521,7 +521,7 @@ 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) });
+        const seller = yield repos.seller.findById({ id: String(params.seller.id) }, ['paymentAccepted', 'project'], []);
         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');
@@ -534,7 +534,7 @@ function getGMOInfoFromSeller(params) {
             typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard },
             // serviceType: { codeValue: { $eq: params.paymentMethodType } },
             id: { $eq: params.paymentServiceId }
-        });
+        }, [], []);
         const paymentService = paymentServices.shift();
         if (paymentService === undefined) {
             throw new factory.errors.NotFound('PaymentService');

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

@@ -8,7 +8,7 @@ interface ICheckResult {
 }
 interface ICheckByIdentifierParams {
     movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
-    seller: factory.seller.ISeller;
+    seller: Pick<factory.seller.ISeller, 'id' | 'project'>;
     screeningEvent: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     paymentServiceId: string;
 }

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

@@ -6,7 +6,7 @@ export declare function createSeatInfoSyncIn(params: {
     movieTickets: factory.action.trade.pay.IMovieTicket[];
     event: factory.event.screeningEvent.IEvent;
     purpose: factory.action.trade.pay.IPurpose;
-    seller: factory.seller.ISeller;
+    seller: Pick<factory.seller.ISeller, 'paymentAccepted'>;
     credentials: {
         kgygishCd: string;
         stCd: string;

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

@@ -2,7 +2,7 @@ import { MongoRepository as ProductRepo } from '../../../repo/product';
 import * as factory from '../../../factory';
 declare function getCredentials(params: {
     paymentMethodType: string;
-    seller: factory.seller.ISeller;
+    seller: Pick<factory.seller.ISeller, 'id' | 'project'>;
     paymentServiceId: string;
 }): (repos: {
     product: ProductRepo;

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

@@ -22,7 +22,7 @@ function getCredentials(params) {
             typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
             // serviceType: { codeValue: { $eq: params.paymentMethodType } },
             id: { $eq: params.paymentServiceId }
-        });
+        }, [], []);
         const paymentService = paymentServices.shift();
         if (paymentService === undefined) {
             throw new factory.errors.NotFound('PaymentService');

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

@@ -20,19 +20,24 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         var _a, _b, _c, _d;
         const movieTickets = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.movieTickets;
         if (!Array.isArray(movieTickets)) {
-            throw new factory.errors.Argument('object.paymentMethod.movieTickets must be an array');
+            throw new factory.errors.Argument('movieTickets', 'object.paymentMethod.movieTickets must be an array');
         }
         // イベント1つのみ許可
-        const eventIds = [...new Set(movieTickets === null || movieTickets === void 0 ? void 0 : movieTickets.map((t) => t.serviceOutput.reservationFor.id))];
+        const eventIds = [...new Set(movieTickets.map((t) => t.serviceOutput.reservationFor.id))];
         if (eventIds.length !== 1) {
             throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
         }
-        // ムビチケ購入管理番号は1つのみ許可
-        const movieTicketIdentifiers = [...new Set(movieTickets === null || movieTickets === void 0 ? void 0 : movieTickets.map((t) => t.identifier))];
+        // 決済カードidentifierは1つのみ許可
+        const movieTicketIdentifiers = [...new Set(movieTickets.map((t) => t.identifier))];
         if (movieTicketIdentifiers.length !== 1) {
             throw new factory.errors.Argument('movieTickets', 'Number of movie ticket identifiers must be 1');
         }
         const movieTicketIdentifier = movieTicketIdentifiers[0];
+        // 決済カードaccessCodeは1つのみ許可(2023-06-23~)
+        const accessCodes = [...new Set(movieTickets.map((t) => t.accessCode))];
+        if (accessCodes.length !== 1) {
+            throw new factory.errors.Argument('movieTickets', 'Number of movie ticket accessCodes must be 1');
+        }
         // ムビチケ系統の決済方法タイプは動的
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodType !== 'string') {
@@ -47,7 +52,7 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId });
+        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted', 'project'], []);
         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');
@@ -71,7 +76,7 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
             var _a, _b;
             const requiredMovieTicketsCountByServiceType = movieTickets.filter((t) => t.serviceType === serviceType).length;
             let availableMovieTicketsCountByServiceType = 0;
-            const ykknInfos = (_b = (_a = checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find((knyknrNoInfoOut) => knyknrNoInfoOut.knyknrNo === movieTicketIdentifiers[0])) === null || _b === void 0 ? void 0 : _b.ykknInfo;
+            const ykknInfos = (_b = (_a = checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find((knyknrNoInfoOut) => knyknrNoInfoOut.knyknrNo === movieTicketIdentifier)) === null || _b === void 0 ? void 0 : _b.ykknInfo;
             const ykknInfoOfServiceType = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === serviceType);
             const ykknKnshbtsmiNum = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.ykknKnshbtsmiNum;
             if (typeof ykknKnshbtsmiNum === 'string') {
@@ -97,24 +102,26 @@ function checkByIdentifierIfNotYet(params) {
         let checkResult;
         if (params.useCheckByIdentifierIfNotYet === true) {
             // すでにCheckActionが存在すれば認証しない(2023-06-06~)
-            debug('searching alreadyCheckedActions...movieTicketIdentifier:', params.movieTicketIdentifier, 'screeningEvent.id:', params.screeningEvent.id, new Date());
+            debug('searching alreadyCheckedActions...movieTicketIdentifier:', params.movieTicketIdentifier, 'screeningEvent.id:', params.screeningEvent.id);
             const alreadyCheckedAction = yield repos.action.search({
                 limit: 1,
                 page: 1,
+                sort: { startDate: factory.sortType.Descending },
                 typeOf: { $eq: factory.actionType.CheckAction },
                 actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
                 object: {
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
+                    id: { $eq: params.paymentServiceId },
                     movieTickets: {
                         identifier: { $eq: params.movieTicketIdentifier },
                         serviceOutput: {
-                            reservationFor: { id: { $eq: params.screeningEvent.id } }
+                            reservationFor: { id: { $eq: params.screeningEvent.id } } // 指定のイベントにおいて
                         }
                     }
                 }
             }, ['result'], []);
+            debug('alreadyCheckedAction found', alreadyCheckedAction, 'movieTicketIdentifier:', params.movieTicketIdentifier, 'screeningEvent.id:', params.screeningEvent.id);
             checkResult = (_a = alreadyCheckedAction.shift()) === null || _a === void 0 ? void 0 : _a.result;
-            debug('checkResult found', checkResult, 'movieTicketIdentifier:', params.movieTicketIdentifier, 'screeningEvent.id:', params.screeningEvent.id, new Date());
         }
         if (checkResult === undefined) {
             debug('checkByIdentifier processing because movieTickets not checked yet...', checkResult);

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

@@ -58,7 +58,7 @@ 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 });
+            const seller = yield repos.seller.findById({ id: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.seller.id }, ['paymentAccepted', 'project'], []);
             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 +302,7 @@ 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) });
+        const seller = yield repos.seller.findById({ id: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) }, ['paymentAccepted', 'project'], []);
         // 全購入管理番号の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/reserve/cancelReservation.js

@@ -98,6 +98,7 @@ function cancelPengindIfNotYet(params, now) {
                                 yield processUnlockSeat({
                                     reservation: {
                                         id: cancelingSubReservation.id,
+                                        project: { id: reserveTransaction.project.id },
                                         reservedTicket: cancelingSubReservation.reservedTicket,
                                         subReservation: cancelingSubReservation.subReservation,
                                         reservationFor: {
@@ -204,6 +205,7 @@ function cancelReservation(actionAttributesList) {
                                 yield processUnlockSeat({
                                     reservation: {
                                         id: cancelingSubReservation.id,
+                                        project: { id: reserveTransaction.project.id },
                                         reservedTicket: cancelingSubReservation.reservedTicket,
                                         subReservation: cancelingSubReservation.subReservation,
                                         reservationFor: {
@@ -255,6 +257,7 @@ function cancelReservation(actionAttributesList) {
                             yield processUnlockSeat({
                                 reservation: {
                                     id: reservation.id,
+                                    project: { id: reservation.project.id },
                                     reservedTicket: reservation.reservedTicket,
                                     subReservation: reservation.subReservation,
                                     reservationFor: {
@@ -344,13 +347,16 @@ function processUnlockSeat(params) {
             .toDate();
         // 予約IDでロックされていれば解除
         let lockKey = {
+            project: reservation.project,
             eventId: reservation.reservationFor.id,
             startDate: eventStartDate,
+            hasTicketedSeat: false,
             offer: {
                 itemOffered: { serviceOutput: { id: reservation.id } },
                 seatNumber: '',
                 seatSection: ''
-            }
+            },
+            holder: params.expectedHolder
         };
         let holder = yield repos.stockHolder.getHolder(lockKey);
         if (holder === params.expectedHolder) {
@@ -360,12 +366,15 @@ function processUnlockSeat(params) {
         const ticketedSeat = reservation.reservedTicket.ticketedSeat;
         if (ticketedSeat !== undefined) {
             lockKey = {
+                project: reservation.project,
                 eventId: reservation.reservationFor.id,
                 startDate: eventStartDate,
+                hasTicketedSeat: true,
                 offer: {
                     seatNumber: ticketedSeat.seatNumber,
                     seatSection: ticketedSeat.seatSection
-                }
+                },
+                holder: params.expectedHolder
             };
             holder = yield repos.stockHolder.getHolder(lockKey);
             if (holder === params.expectedHolder) {
@@ -381,12 +390,15 @@ function processUnlockSeat(params) {
                 const seatNumber4sub = (_d = (_c = subReservation.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber;
                 if (typeof seatSection4sub === 'string' && typeof seatNumber4sub === 'string') {
                     const lockKey4sub = {
+                        project: reservation.project,
                         eventId: reservation.reservationFor.id,
                         startDate: eventStartDate,
+                        hasTicketedSeat: true,
                         offer: {
                             seatNumber: seatNumber4sub,
                             seatSection: seatSection4sub
-                        }
+                        },
+                        holder: params.expectedHolder
                     };
                     const holder4sub = yield repos.stockHolder.getHolder(lockKey4sub);
                     if (holder4sub === params.expectedHolder) {

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

@@ -97,17 +97,25 @@ 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') {
-                            yield Promise.all(subReservations.map((subReservation) => __awaiter(this, void 0, void 0, function* () {
-                                yield repos.reservation.confirmByIdIfNotExist({
-                                    reservation: subReservation,
-                                    reservationFor,
-                                    underName,
-                                    broker: reserveTransaction.object.broker,
-                                    issuedThrough: reserveTransaction.object.issuedThrough
-                                });
-                            })));
+                        if (Array.isArray(subReservations) && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string') {
+                            // confirmManyに変更(2023-06-13~)
+                            const confirmManyIfNotExistResult = yield repos.reservation.confirmManyIfNotExist({
+                                subReservation: subReservations,
+                                reservationFor,
+                                underName,
+                                broker: reserveTransaction.object.broker,
+                                issuedThrough: reserveTransaction.object.issuedThrough
+                            });
+                            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 {

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

@@ -32,7 +32,7 @@ function call(data) {
         }
         yield AggregationService.event.aggregateScreeningEvent(data)({
             event: new event_1.MongoRepository(settings.connection),
-            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient),
+            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
             offer: new offer_1.MongoRepository(settings.connection),
             offerCatalog: new offerCatalog_1.MongoRepository(settings.connection),
             offerRateLimit: new offer_2.RedisRepository(settings.redisClient),

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

@@ -30,7 +30,7 @@ function call(data) {
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient);
+        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection);
         const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
         // アクション数は予約番号単位で1しかありえないはず(2023-06-05~)
         if (data.actionAttributes.length !== 1) {

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

@@ -30,7 +30,7 @@ function call(data) {
         const reservationRepo = new reservation_1.MongoRepository(settings.connection);
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const transactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient);
+        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection);
         const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
         yield ReserveService.cancelReservation(data.actionAttributes)({
             action: actionRepo,

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

@@ -16,6 +16,7 @@ const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
+const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
 const TransactionService = require("../transaction");
 /**
@@ -30,6 +31,7 @@ function call(data) {
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });

package/lib/chevre/service/task/onEventChanged.d.ts

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.onEventChanged.IData): IOperation<void>;