@chevre/domain 21.2.0-alpha.12 → 21.2.0-alpha.120

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

@@ -10,13 +10,12 @@ 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");
-// tslint:disable-next-line:max-func-body-length
-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;
@@ -33,6 +32,7 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         if (movieTicketIdentifiers.length !== 1) {
             throw new factory.errors.Argument('movieTickets', 'Number of movie ticket identifiers must be 1');
         }
+        const movieTicketIdentifier = movieTicketIdentifiers[0];
         // ムビチケ系統の決済方法タイプは動的
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodType !== 'string') {
@@ -47,39 +47,33 @@ 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');
         }
         // オプション追加(2023-03-06~)
         if (!useCheckMovieTicketBeforePay) {
-            return;
+            return { accountsReceivablesByServiceType: [] };
         }
-        const checkResult = yield (0, checkByIdentifier_1.checkByIdentifier)({
+        const checkResult = yield checkByIdentifierIfNotYet({
+            movieTicketIdentifier,
             movieTickets: movieTickets,
             seller: seller,
             screeningEvent: screeningEvent,
-            paymentServiceId
+            paymentServiceId,
+            useCheckByIdentifierIfNotYet
         })(repos);
-        // checkResult.movieTicketsへの依存排除(2023-03-24~)
-        // 要求に対して十分かどうか検証する
-        // const availableMovieTickets = checkResult.movieTickets.filter((t) => t.amount?.validThrough === undefined);
-        // 総数が足りているか(券種ごとに枚数検証を実行するので不要)
-        // if (availableMovieTickets.length < movieTickets.length) {
-        //     throw new factory.errors.Argument(
-        //         'movieTickets',
-        //         `${movieTickets.length - availableMovieTickets.length} movie tickets short`
-        //     );
-        // }
+        const accountsReceivablesByServiceType = [];
         // 券種ごとに枚数が足りているか
         const serviceTypes = [...new Set(movieTickets.map((t) => t.serviceType))];
         serviceTypes.forEach((serviceType) => {
-            var _a, _b, _c;
+            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 ykknKnshbtsmiNum = (_c = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === serviceType)) === null || _c === void 0 ? void 0 : _c.ykknKnshbtsmiNum;
+            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') {
                 availableMovieTicketsCountByServiceType = Number(ykknKnshbtsmiNum);
             }
@@ -87,18 +81,47 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
                 const shortNumber = requiredMovieTicketsCountByServiceType - availableMovieTicketsCountByServiceType;
                 throw new factory.errors.Argument('movieTickets', `${shortNumber} movie tickets by service type ${serviceType} short`);
             }
-            // const availableMovieTicketsByServiceType = availableMovieTickets.filter((t) => t.serviceType === serviceType);
-            // if (availableMovieTicketsByServiceType.length < requiredMovieTicketsCountByServiceType) {
-            //     const shortNumber = requiredMovieTicketsCountByServiceType - availableMovieTicketsByServiceType.length;
-            //     throw new factory.errors.Argument(
-            //         'movieTickets',
-            //         `${shortNumber} movie tickets by service type ${serviceType} short`
-            //     );
-            // }
+            // checkResultから計上金額を取得
+            const accountsReceivableByResponse = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.kijUnip;
+            accountsReceivablesByServiceType.push(Object.assign({ serviceType }, (typeof accountsReceivableByResponse === 'string')
+                ? { accountsReceivable: Number(accountsReceivableByResponse) }
+                : undefined));
         });
-        // checkはするが保管は保留(2023-03-09~)
-        return;
-        // return checkResult;
+        return { accountsReceivablesByServiceType };
     });
 }
 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

@@ -42,14 +42,14 @@ declare function checkMovieTicket(params: factory.action.check.paymentMethod.mov
 }>;
 interface IAuthorizeResult {
     accountId: string;
-    checkResult?: ICheckResult;
+    accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
     payAction: factory.action.trade.pay.IAction;
 }
 /**
  * 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,15 +102,16 @@ 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;
-        let checkResult;
         let payAction;
+        let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
-            checkResult = 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);
             const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
@@ -141,7 +142,7 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
         catch (error) {
             throw (0, errorHandler_1.handleMvtkReserveError)(error);
         }
-        return { accountId, checkResult, payAction };
+        return { accountId, payAction, accountsReceivablesByServiceType };
     });
 }
 exports.authorize = authorize;
@@ -301,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/product.js

@@ -77,10 +77,6 @@ function onRegistered(actionAttributes, __) {
             }
         }
         // タスク保管
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     return repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/lib/chevre/service/report/telemetry.d.ts

@@ -148,19 +148,15 @@ export interface ISellerFlowTransactionResult {
     /**
      * イベントまでの合計残り時間(ミリ秒)
      */
-    totalTimeLeftUntilEventInMilliseconds: number;
     /**
      * イベントまでの最大残り時間(ミリ秒)
      */
-    maxTimeLeftUntilEventInMilliseconds: number;
     /**
      * イベントまでの最小残り時間(ミリ秒)
      */
-    minTimeLeftUntilEventInMilliseconds: number;
     /**
      * イベントまでの平均残り時間(ミリ秒)
      */
-    averageTimeLeftUntilEventInMilliseconds: number;
     /**
      * 取引の合計金額(yen)
      */
@@ -180,15 +176,12 @@ export interface ISellerFlowTransactionResult {
     /**
      * アクション数合計値(成立取引)
      */
-    totalNumberOfActionsOnConfirmed: number;
     /**
      * 最大アクション数(成立取引)
      */
-    maxNumberOfActionsOnConfirmed: number;
     /**
      * 最小アクション数(成立取引)
      */
-    minNumberOfActionsOnConfirmed: number;
     /**
      * 注文アイテム数合計値
      */
@@ -205,10 +198,6 @@ export interface ISellerFlowTransactionResult {
      * 平均注文アイテム数
      */
     averageNumberOfOrderItems: number;
-    /**
-     * 平均アクション数(成立取引)
-     */
-    averageNumberOfActionsOnConfirmed: number;
 }
 /**
  * 販売者が対象のフローデータ

package/lib/chevre/service/report/telemetry.js

@@ -247,17 +247,12 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
         const maxRequiredTimeInMilliseconds = requiredTimesConfirmed.reduce((a, b) => Math.max(a, b), 0);
         const minRequiredTimeInMilliseconds = requiredTimesConfirmed.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? requiredTimesConfirmed[0] : 0);
         const averageRequiredTimeInMilliseconds = (numberOfTransactionsConfirmed > 0) ? totalRequiredTimeInMilliseconds / numberOfTransactionsConfirmed : 0;
-        // イベントまでの残り時間算出(イベント開始日時と成立日時の差)
-        const timesLeftUntilEvent = confirmedTransactions.map((transaction) => {
-            // 座席予約は必ず存在する
-            const seatReservation = transaction.object.authorizeActions.find((action) => action.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
-            return moment(seatReservation.object.event.startDate)
-                .diff(moment(transaction.endDate), 'milliseconds');
-        });
-        const totalTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => a + b, 0);
-        const maxTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => Math.max(a, b), 0);
-        const minTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? timesLeftUntilEvent[0] : 0);
-        const averageTimeLeftUntilEventInMilliseconds = (numberOfTransactionsConfirmed > 0) ? totalTimeLeftUntilEventInMilliseconds / numberOfTransactionsConfirmed : 0;
+        // const totalTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => a + b, 0);
+        // const maxTimeLeftUntilEventInMilliseconds = timesLeftUntilEvent.reduce((a, b) => Math.max(a, b), 0);
+        // const minTimeLeftUntilEventInMilliseconds =
+        //     timesLeftUntilEvent.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? timesLeftUntilEvent[0] : 0);
+        // const averageTimeLeftUntilEventInMilliseconds =
+        //     (numberOfTransactionsConfirmed > 0) ? totalTimeLeftUntilEventInMilliseconds / numberOfTransactionsConfirmed : 0;
         // 金額算出
         const amounts = confirmedTransactions.map((transaction) => transaction.result.order.price);
         const totalAmount = amounts.reduce((a, b) => a + b, 0);
@@ -265,11 +260,13 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
         const minAmount = amounts.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? amounts[0] : 0);
         const averageAmount = (numberOfTransactionsConfirmed > 0) ? totalAmount / numberOfTransactionsConfirmed : 0;
         // アクション数集計
-        const numbersOfActions = confirmedTransactions.map((t) => t.object.authorizeActions.length);
-        const totalNumberOfActions = numbersOfActions.reduce((a, b) => a + b, 0);
-        const maxNumberOfActions = numbersOfActions.reduce((a, b) => Math.max(a, b), 0);
-        const minNumberOfActions = numbersOfActions.reduce((a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? numbersOfActions[0] : 0);
-        const averageNumberOfActions = (numberOfTransactionsConfirmed > 0) ? totalNumberOfActions / numberOfTransactionsConfirmed : 0;
+        // const numbersOfActions = confirmedTransactions.map((t) => t.object.authorizeActions.length);
+        // const totalNumberOfActions = numbersOfActions.reduce((a, b) => a + b, 0);
+        // const maxNumberOfActions = numbersOfActions.reduce((a, b) => Math.max(a, b), 0);
+        // const minNumberOfActions = numbersOfActions.reduce(
+        //     (a, b) => Math.min(a, b), (numberOfTransactionsConfirmed > 0) ? numbersOfActions[0] : 0
+        // );
+        // const averageNumberOfActions = (numberOfTransactionsConfirmed > 0) ? totalNumberOfActions / numberOfTransactionsConfirmed : 0;
         // 期限切れ取引数
         const numberOfTransactionsExpired = expiredTransactions.length;
         const expiredTransactionIds = expiredTransactions.map((transaction) => transaction.id);
@@ -284,18 +281,18 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
                 maxRequiredTimeInMilliseconds: maxRequiredTimeInMilliseconds,
                 minRequiredTimeInMilliseconds: minRequiredTimeInMilliseconds,
                 averageRequiredTimeInMilliseconds: parseFloat(averageRequiredTimeInMilliseconds.toFixed(1)),
-                totalTimeLeftUntilEventInMilliseconds: totalTimeLeftUntilEventInMilliseconds,
-                maxTimeLeftUntilEventInMilliseconds: maxTimeLeftUntilEventInMilliseconds,
-                minTimeLeftUntilEventInMilliseconds: minTimeLeftUntilEventInMilliseconds,
-                averageTimeLeftUntilEventInMilliseconds: averageTimeLeftUntilEventInMilliseconds,
+                // totalTimeLeftUntilEventInMilliseconds: totalTimeLeftUntilEventInMilliseconds,
+                // maxTimeLeftUntilEventInMilliseconds: maxTimeLeftUntilEventInMilliseconds,
+                // minTimeLeftUntilEventInMilliseconds: minTimeLeftUntilEventInMilliseconds,
+                // averageTimeLeftUntilEventInMilliseconds: averageTimeLeftUntilEventInMilliseconds,
                 totalAmount: totalAmount,
                 maxAmount: maxAmount,
                 minAmount: minAmount,
                 averageAmount: parseFloat(averageAmount.toFixed(1)),
-                totalNumberOfActionsOnConfirmed: totalNumberOfActions,
-                maxNumberOfActionsOnConfirmed: maxNumberOfActions,
-                minNumberOfActionsOnConfirmed: minNumberOfActions,
-                averageNumberOfActionsOnConfirmed: parseFloat(averageNumberOfActions.toFixed(1)),
+                // totalNumberOfActionsOnConfirmed: totalNumberOfActions,
+                // maxNumberOfActionsOnConfirmed: maxNumberOfActions,
+                // minNumberOfActionsOnConfirmed: minNumberOfActions,
+                // averageNumberOfActionsOnConfirmed: parseFloat(averageNumberOfActions.toFixed(1)),
                 // tslint:disable-next-line:no-suspicious-comment
                 totalNumberOfOrderItems: 0,
                 // tslint:disable-next-line:no-suspicious-comment

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

@@ -5,11 +5,10 @@ import { RedisRepository as OfferRateLimitRepo } from '../../repo/rateLimit/offe
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { StockHolderRepository as StockHolderRepo } from '../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../repo/task';
-type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 /**
  * 進行中の予約をキャンセルする
  */
-declare function cancelPendingReservation(actionAttributesList: factory.action.cancel.reservation.IAttributes[]): (repos: {
+declare function cancelPendingReservation(actionAttributes: factory.action.cancel.reservation.IAttributes): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
@@ -29,7 +28,10 @@ declare function cancelReservation(actionAttributesList: factory.action.cancel.r
     assetTransaction: AssetTransactionRepo;
 }) => Promise<void>;
 declare function processUnlockOfferRateLimit(params: {
-    reservation: Pick<IObjectSubReservation, 'reservationNumber' | 'reservedTicket'>;
+    reservation: {
+        reservationNumber: string;
+        reservedTicket: factory.assetTransaction.reserve.IObjectSubReservationReservedTicket;
+    };
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
 }): (repos: {
     offerRateLimit: OfferRateLimitRepo;