@chevre/domain 21.2.0-alpha.98 → 21.2.0

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

@@ -10,29 +10,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateMovieTicket = void 0;
-/**
- * 決済取引サービス
- */
+const createDebug = require("debug");
 const factory = require("../../../factory");
 const checkByIdentifier_1 = require("./checkByIdentifier");
-function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBeforePay) {
+const debug = createDebug('chevre-domain:service:payment');
+function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         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');
@@ -56,11 +61,13 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         if (!useCheckMovieTicketBeforePay) {
             return { accountsReceivablesByServiceType: [] };
         }
-        const checkResult = yield (0, checkByIdentifier_1.checkByIdentifier)({
+        const checkResult = yield checkByIdentifierIfNotYet({
+            movieTicketIdentifier,
             movieTickets: movieTickets,
             seller: seller,
             screeningEvent: screeningEvent,
-            paymentServiceId
+            paymentServiceId,
+            useCheckByIdentifierIfNotYet
         })(repos);
         const accountsReceivablesByServiceType = [];
         // 券種ごとに枚数が足りているか
@@ -69,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') {
@@ -89,3 +96,37 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
     });
 }
 exports.validateMovieTicket = validateMovieTicket;
+function checkByIdentifierIfNotYet(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        let checkResult;
+        if (params.useCheckByIdentifierIfNotYet === true) {
+            // すでにCheckActionが存在すれば認証しない(2023-06-06~)
+            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 } } // 指定のイベントにおいて
+                        }
+                    }
+                }
+            }, ['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;
+        }
+        if (checkResult === undefined) {
+            debug('checkByIdentifier processing because movieTickets not checked yet...', checkResult);
+            checkResult = yield (0, checkByIdentifier_1.checkByIdentifier)(params)(repos);
+        }
+        return checkResult;
+    });
+}

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

@@ -49,7 +49,7 @@ interface IAuthorizeResult {
  * MovieTicket承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean): (repos: {
+declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean, useCheckByIdentifierIfNotYet: boolean): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     event: EventRepo;

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');
@@ -102,7 +102,7 @@ exports.checkMovieTicket = checkMovieTicket;
  * MovieTicket承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay) {
+function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let accountId;
@@ -110,7 +110,7 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
         let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
-            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
+            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet)(repos);
             accountsReceivablesByServiceType = validateMovieTicketResult.accountsReceivablesByServiceType;
             const paymentMethod = transaction.object.paymentMethod;
             const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
@@ -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>;

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

@@ -0,0 +1,29 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.call = void 0;
+const event_1 = require("../../repo/event");
+const project_1 = require("../../repo/project");
+const task_1 = require("../../repo/task");
+const offer_1 = require("../offer");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        yield (0, offer_1.onEventChanged)(data)({
+            event: new event_1.MongoRepository(settings.connection),
+            project: new project_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;

package/lib/chevre/service/task/onResourceUpdated.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.onResourceUpdated.IData): IOperation<void>;