@chevre/domain 21.2.0-alpha.14 → 21.2.0-alpha.140

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

@@ -52,10 +52,18 @@ exports.voidPayTransaction = voidPayTransaction;
 function invalidatePaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
+        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.Argument('purpose.typeOf', `must be ${factory.transactionType.PlaceOrder}`);
+        }
         const transaction = yield repos.transaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         });
+        // 確定取引に対応(2023-05-03~)
+        if (transaction.status === factory.transactionStatusType.Confirmed) {
+            // no op
+            return;
+        }
         const paymentMethodIdByPaymentUrl = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
         const paymentMethodType = (_b = transaction.object.paymentMethods) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodIdByPaymentUrl === 'string' && paymentMethodIdByPaymentUrl.length > 0
@@ -70,12 +78,10 @@ function invalidatePaymentUrl(params) {
                         ? transaction.seller.name
                         : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja),
                     id: transaction.seller.id
-                    // project: transaction.seller.project
                 },
                 recipient: { typeOf: transaction.agent.typeOf, name: transaction.agent.name },
                 object: [{
                         typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
-                        // tslint:disable-next-line:max-line-length
                         id: (_e = (_d = transaction.object.paymentMethods) === null || _d === void 0 ? void 0 : _d.issuedThrough) === null || _e === void 0 ? void 0 : _e.id,
                         paymentMethod: {
                             additionalProperty: [],
@@ -96,17 +102,20 @@ exports.invalidatePaymentUrl = invalidatePaymentUrl;
  * apiもしくはタスクから決済承認を取り消す
  */
 function processVoidPayTransaction(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         let transaction;
         // アクションID指定の場合、進行中取引検証(2023-02-24~)
         if (typeof params.id === 'string') {
             transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
         }
         else {
-            transaction = yield repos.transaction.findById({
+            transaction = (yield repos.transaction.findById({
                 typeOf: params.purpose.typeOf,
-                id: params.purpose.id
-            });
+                id: params.purpose.id,
+                inclusion: ['_id', 'typeOf', 'status', 'result.order.paymentMethods']
+            }));
         }
         // 承認アクションを取得
         let authorizeActions;
@@ -122,7 +131,7 @@ function processVoidPayTransaction(params) {
             const authorizeActionsOnTransaction = yield repos.action.searchByPurpose({
                 typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
-                    typeOf: factory.transactionType.PlaceOrder,
+                    typeOf: transaction.typeOf,
                     id: transaction.id
                 }
             });
@@ -131,12 +140,37 @@ function processVoidPayTransaction(params) {
                 return ((_a = a.object) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
                     && ((_b = a.instrument) === null || _b === void 0 ? void 0 : _b.identifier) === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
             });
+            switch (transaction.status) {
+                case factory.transactionStatusType.InProgress:
+                    throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
+                // 確定取引に対応(2023-05-03~)
+                case factory.transactionStatusType.Confirmed:
+                    // アクションステータスを検証する
+                    authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                    if (transaction.typeOf === factory.transactionType.PlaceOrder) {
+                        const paymentMethodIds = (_b = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.paymentMethods.map((p) => {
+                            return p.paymentMethodId;
+                        });
+                        if (!Array.isArray(paymentMethodIds)) {
+                            throw new factory.errors.Argument('Transaction', `${transaction.id} must have result.order.paymentMethods`);
+                        }
+                        if (paymentMethodIds.length > 0) {
+                            authorizeActions = authorizeActions.filter((a) => {
+                                // paymentMethodIdが存在しない、あるいは、注文のpaymentMethodIdsに含まれなければ、アクション取消対象
+                                const paymentMethodIdByAction = a.object.paymentMethodId;
+                                const includedInOrder = typeof paymentMethodIdByAction === 'string'
+                                    && paymentMethodIds.includes(paymentMethodIdByAction);
+                                return !includedInOrder;
+                            });
+                        }
+                    }
+                    break;
+                default:
+                // no op
+            }
         }
         const errors = [];
         for (const action of authorizeActions) {
-            // 直列にゆっくり処理する場合↓
-            // tslint:disable-next-line:no-magic-numbers
-            // await new Promise((resolve) => setTimeout(() => { resolve(); }, 1000));
             // 失敗するケースがあっても、残りが少なくとも処理されるようにエラーハンドリング
             try {
                 // 取引が存在すれば中止
@@ -194,7 +228,7 @@ function publishPaymentUrl(params) {
             paymentUrl: result.paymentUrl,
             issuedThrough: { id: (typeof startParams.object.id === 'string') ? startParams.object.id : '' }
         };
-        yield repos.transaction.findByIdAndUpdate({
+        yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
             update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
         });
@@ -206,6 +240,7 @@ exports.publishPaymentUrl = publishPaymentUrl;
  * 決済承認
  */
 function authorize(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
@@ -217,6 +252,21 @@ function authorize(params) {
             const paymentMethodIdByTransaction = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
             if (params.object.paymentMethodId === paymentMethodIdByTransaction) {
                 transactionNumber = params.object.paymentMethodId;
+                // 既に承認済であれば何もしない(2023-05-15~)
+                const existingCompletedAuthorizeActions = yield repos.action.searchByPurpose({
+                    typeOf: factory.actionType.AuthorizeAction,
+                    purpose: { id: transaction.id, typeOf: transaction.typeOf },
+                    actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus },
+                    object: {
+                        paymentMethodId: { $eq: transactionNumber },
+                        typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment }
+                    },
+                    sort: { startDate: factory.sortType.Ascending }
+                });
+                const existingCompletedAuthorizeAction = existingCompletedAuthorizeActions.shift();
+                if (existingCompletedAuthorizeAction !== undefined) {
+                    return existingCompletedAuthorizeAction;
+                }
             }
             else {
                 // 取引にないpaymentMethodIdの指定はクライアントエラー
@@ -264,7 +314,11 @@ function authorize(params) {
                 transactionNumber: transactionNumber,
                 location: params.location
             });
-            payTransaction = yield PayTransactionService.start(startParams, params.useCheckMovieTicketBeforePay)(repos);
+            payTransaction = yield PayTransactionService.start(startParams, {
+                useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay,
+                useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet,
+                searchTrade4accountId: params.options.useSearchTrade4accountId
+            })(repos);
         }
         catch (error) {
             try {
@@ -275,13 +329,21 @@ function authorize(params) {
                 // no op
             }
             // 即時に決済取引を中止するか？(2023-02-03~)
-            if (params.useCancelPayTransactionOnFailed) {
-                yield processVoidPayTransaction({
-                    project: action.project,
-                    agent: { id: action.project.id },
-                    id: action.id,
-                    purpose: action.purpose
-                })(repos);
+            if (params.options.useCancelPayTransactionOnFailed) {
+                // abortエラーの場合は状態不明なので即時中止しない(2023-06-01~)
+                // {
+                //     "type": "aborted",
+                //     "message": "The user aborted a request.",
+                //     "name": "AbortError"
+                // }
+                if (error.name !== 'AbortError') {
+                    yield processVoidPayTransaction({
+                        project: action.project,
+                        agent: { id: action.project.id },
+                        id: action.id,
+                        purpose: action.purpose
+                    })(repos);
+                }
             }
             throw error;
         }

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

@@ -13,7 +13,7 @@ import { MongoRepository as TaskRepo } from '../../repo/task';
 /**
  * クレジットカード決済承認
  */
-declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
+declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, searchTrade4accountId: boolean): (repos: {
     person: PersonRepo;
     product: ProductRepo;
     project: ProjectRepo;

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

@@ -21,11 +21,11 @@ const factory = require("../../factory");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
 const person2username_1 = require("./any/person2username");
-const debug = createDebug('chevre-domain:service');
+const debug = createDebug('chevre-domain:service:payment');
 /**
  * クレジットカード決済承認
  */
-function authorize(params, paymentServiceId) {
+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 });
@@ -65,19 +65,25 @@ function authorize(params, paymentServiceId) {
         catch (error) {
             throw handleAuthorizeError(error);
         }
-        try {
-            const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
-            // ベストエフォートでクレジットカード詳細情報を取得
-            searchTradeResult = yield creditCardService.searchTrade({
-                shopId: shopId,
-                shopPass: shopPass,
-                orderId: orderId,
-                siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-                sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
-            });
-        }
-        catch (error) {
-            // no op
+        if (searchTrade4accountId) {
+            try {
+                const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+                // ベストエフォートでクレジットカード詳細情報を取得
+                const startSearchTradeDate = Date.now();
+                debug('searchTrade processing...orderId:', orderId, startSearchTradeDate);
+                searchTradeResult = yield creditCardService.searchTrade({
+                    shopId: shopId,
+                    shopPass: shopPass,
+                    orderId: orderId,
+                    siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
+                    sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+                });
+                debug('searchTrade processed. orderId:', orderId, 'execution time:', (Date.now() - startSearchTradeDate), 'ms');
+            }
+            catch (error) {
+                // no op
+                debug('searchTrade throwed an error. orderId:', orderId, error);
+            }
         }
         return {
             accountId: (searchTradeResult !== undefined) ? searchTradeResult.cardNo : '',
@@ -515,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');
@@ -528,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

@@ -6,16 +6,17 @@ interface ICheckResult {
     purchaseNumberAuthIn: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
     purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
 }
-/**
- * MovieTicket認証
- */
-declare function checkByIdentifier(params: {
+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;
-}): (repos: {
+}
+/**
+ * MovieTicket認証
+ */
+declare function checkByIdentifier(params: ICheckByIdentifierParams): (repos: {
     product: ProductRepo;
     project: ProjectRepo;
 }) => Promise<ICheckResult>;
-export { ICheckResult, checkByIdentifier };
+export { ICheckByIdentifierParams, ICheckResult, checkByIdentifier };

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

@@ -1,15 +1,15 @@
-/**
- * 決済取引サービス
- */
 import * as factory from '../../../factory';
+import { MongoRepository as ActionRepo } from '../../../repo/action';
 import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../../repo/project';
 import { MongoRepository as SellerRepo } from '../../../repo/seller';
-import { ICheckResult } from './checkByIdentifier';
-export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean): (repos: {
+export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean, useCheckByIdentifierIfNotYet: boolean): (repos: {
+    action: ActionRepo;
     event: EventRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
-}) => Promise<ICheckResult | undefined>;
+}) => Promise<{
+    accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
+}>;

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");
-// 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;
         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,39 +52,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 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') {
                 availableMovieTicketsCountByServiceType = Number(ykknKnshbtsmiNum);
             }
@@ -87,18 +86,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;
 }
 /**
  * 販売者が対象のフローデータ