@chevre/domain 21.30.0-alpha.9 → 21.30.0

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.d.ts

@@ -2,6 +2,7 @@ import type { MongoRepository as TaskRepo } from '../../../../repo/task';
 import * as factory from '../../../../factory';
 declare function createSendEmailMessageTaskIfNotExist(params: {
     potentialActions?: factory.action.transfer.send.order.IPotentialActions;
+    order: Pick<factory.order.IOrder, 'customer' | 'orderDate' | 'orderNumber' | 'price' | 'priceCurrency' | 'project' | 'typeOf'>;
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -19,19 +19,40 @@ function createSendEmailMessageTaskIfNotExist(params) {
         const now = new Date();
         if (Array.isArray(sendEmailMessageActions)) {
             yield Promise.all(sendEmailMessageActions.map((sendEmailMessageAction, index) => __awaiter(this, void 0, void 0, function* () {
-                const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', sendEmailMessageAction.project.id, factory.taskName.SendEmailMessage, sendEmailMessageAction.purpose.typeOf, sendEmailMessageAction.purpose.orderNumber, factory.orderStatus.OrderProcessing, index);
+                const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', 
+                // sendEmailMessageAction.project.id,
+                params.order.project.id, factory.taskName.SendEmailMessage, 
+                // sendEmailMessageAction.purpose.typeOf,
+                // sendEmailMessageAction.purpose.orderNumber,
+                params.order.typeOf, params.order.orderNumber, factory.orderStatus.OrderProcessing, index);
+                // const actionAttributes: factory.task.sendEmailMessage.IData['actionAttributes'] = sendEmailMessageAction;
+                const simpleOrder = {
+                    typeOf: params.order.typeOf,
+                    orderNumber: params.order.orderNumber,
+                    price: params.order.price,
+                    priceCurrency: params.order.priceCurrency,
+                    orderDate: params.order.orderDate
+                };
+                const actionAttributes = {
+                    project: params.order.project,
+                    typeOf: factory.actionType.SendAction,
+                    object: sendEmailMessageAction.object,
+                    agent: params.order.project,
+                    recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
+                    potentialActions: {},
+                    purpose: simpleOrder
+                };
                 const sendEmailMessageTask = {
                     identifier: taskIdentifier,
-                    project: sendEmailMessageAction.project,
+                    // project: sendEmailMessageAction.project,
+                    project: params.order.project,
                     name: factory.taskName.SendEmailMessage,
                     status: factory.taskStatus.Ready,
                     runsAt: now,
                     remainingNumberOfTries: 10,
                     numberOfTried: 0,
                     executionResults: [],
-                    data: {
-                        actionAttributes: sendEmailMessageAction
-                    }
+                    data: { actionAttributes }
                 };
                 yield repos.task.createIfNotExistByIdentifier(sendEmailMessageTask, { emitImmediately: true });
             })));

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

@@ -70,7 +70,10 @@ function onOrderProcessing(params) {
                 // })(repos);
                 // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
                 if (settings_1.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING) {
-                    yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({ potentialActions: sendOrderPotentialActions })(repos);
+                    yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
+                        potentialActions: sendOrderPotentialActions,
+                        order: params.order
+                    })(repos);
                 }
                 break;
             default:

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

@@ -155,7 +155,9 @@ function sendOrder(params) {
                             orderNumber: order.orderNumber,
                             project: order.project,
                             typeOf: order.typeOf,
-                            orderStatus: factory.orderStatus.OrderDelivered
+                            orderStatus: factory.orderStatus.OrderDelivered,
+                            price: order.price,
+                            priceCurrency: order.priceCurrency
                         },
                         placeOrderTransaction
                     })({

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

@@ -5,12 +5,14 @@ import * as factory from '../../factory';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import type { AuthorizationRepo } from '../../repo/code';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
+import type { TicketRepo } from '../../repo/ticket';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
 import type { TransactionProcessRepository } from '../../repo/transactionProcess';
@@ -56,12 +58,14 @@ interface IAuthorizeRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    authorization: AuthorizationRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     task: TaskRepo;
+    ticket: TicketRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
     transactionProcess: TransactionProcessRepository;

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

@@ -333,7 +333,7 @@ function authorize(params) {
         const { accountId } = yield fixAccountIdIfPossible({
             object: params.object,
             project: { id: transaction.project.id }
-        })({ action: repos.action });
+        })(repos);
         const authorizeObject = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
         // 承認アクションを開始する
         const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
@@ -446,6 +446,9 @@ function fixAccountIdIfPossible(params) {
                 agent: { id: params.project.id, typeOf: factory.organizationType.Project },
                 token: fromLocation
             })(repos);
+            if (Array.isArray(paymentCardOwnershipInfo)) {
+                throw new factory.errors.NotImplemented('fromLocation as an array not implemented');
+            }
             if (paymentCardOwnershipInfo.typeOf !== 'OwnershipInfo') {
                 throw new factory.errors.Argument('fromLocation', 'must be OwnershipInfo');
             }

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

@@ -69,7 +69,7 @@ function checkByIdentifier(params) {
         })(repos);
         purchaseNumberAuthIn = {
             kgygishCd: sellerCredentials.kgygishCd,
-            jhshbtsCd: surfrock.service.auth.factory.InformationTypeCode.All,
+            jhshbtsCd: surfrock.factory.service.auth.purchaseNumberAuth.InformationTypeCode.All,
             knyknrNoInfoIn: knyknrNoInfoIn,
             skhnCd: skhnCd,
             stCd: sellerCredentials.stCd,

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

@@ -11,4 +11,4 @@ export declare function createSeatInfoSyncIn(params: {
         kgygishCd: string;
         stCd: string;
     };
-}): surfrock.service.seat.factory.ISeatInfoSyncIn;
+}): surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn;

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

@@ -50,8 +50,8 @@ function createSeatInfoSyncIn(params) {
     // }
     return {
         kgygishCd: kgygishCd,
-        yykDvcTyp: surfrock.service.seat.factory.ReserveDeviceType.EntertainerSitePC,
-        trkshFlg: surfrock.service.seat.factory.DeleteFlag.False,
+        yykDvcTyp: surfrock.factory.service.seat.seatInfoSync.ReserveDeviceType.EntertainerSitePC,
+        trkshFlg: surfrock.factory.service.seat.seatInfoSync.DeleteFlag.False,
         kgygishSstmZskyykNo: params.paymentMethodId,
         // 興行会社ユーザー座席予約番号
         kgygishUsrZskyykNo: (typeof ((_c = params.purpose) === null || _c === void 0 ? void 0 : _c.confirmationNumber) === 'string')

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

@@ -350,9 +350,9 @@ function payActionParams2seatInfoSyncIn(params) {
  * MovieTicket着券取消
  */
 function refundMovieTicket(params) {
-    // tslint:disable-next-line:max-func-body-length
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const paymentMethodId = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.paymentMethodId;
         const paymentServiceId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.id;
         const availableChannel = yield repos.paymentService.findAvailableChannel({
@@ -368,66 +368,118 @@ function refundMovieTicket(params) {
             state: ''
         });
         const movieTicketSeatService = new surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: credentials_1.credentials.movieticketReserve.timeout });
-        // アクション開始
-        let action = yield repos.action.start(Object.assign(Object.assign({}, params), (typeof ((_f = params.sameAs) === null || _f === void 0 ? void 0 : _f.id) === 'string')
-            ? {
-                sameAs: {
-                    id: params.sameAs.id,
-                    typeOf: 'Task'
-                }
-            }
-            : undefined));
+        let seatInfoSyncCancelIn;
         let seatInfoSyncIn;
-        let seatInfoSyncResult;
-        let seatInfoSyncResultAsError;
-        try {
+        const useSeatInfoSyncCancel = ((_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.useSeatInfoSyncCancel) === true;
+        if (useSeatInfoSyncCancel) {
+            seatInfoSyncCancelIn = yield createSeatInfoSyncCancelInOnRefund({
+                project: { id: params.project.id },
+                paymentMethodId
+            })({ action: repos.action });
+        }
+        else {
             seatInfoSyncIn = yield createSeatInfoSyncInOnRefund({
                 project: { id: params.project.id },
                 paymentMethodId
             })({ action: repos.action });
-            seatInfoSyncResult = yield movieTicketSeatService.seatInfoSync(seatInfoSyncIn);
         }
-        catch (error) {
-            let throwsError = true;
-            // 「存在しない興行会社システム座席予約番号が入力されました」の場合、取消済なのでok
-            if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
-                if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.NotFound) {
-                    seatInfoSyncResult = error;
-                    throwsError = false;
-                }
-                // ReservationResult 19の内容が不明だがリトライする意味はおそらくないパターン
-                if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.ReservationResult19) {
-                    seatInfoSyncResult = error;
-                    throwsError = false;
+        // アクション開始
+        // instrumentをセット(2024-04-30~)
+        const instrument = Object.assign(Object.assign({ typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket }, (seatInfoSyncIn !== undefined) ? { seatInfoSyncIn } : undefined), (seatInfoSyncCancelIn !== undefined) ? { seatInfoSyncCancelIn } : undefined);
+        let action = yield repos.action.start(Object.assign(Object.assign(Object.assign({}, params), (typeof ((_g = params.sameAs) === null || _g === void 0 ? void 0 : _g.id) === 'string')
+            ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } }
+            : undefined), { instrument }));
+        let seatInfoSyncCancelResult;
+        let seatInfoSyncResult;
+        let seatInfoSyncResultAsError;
+        if (useSeatInfoSyncCancel) {
+            try {
+                if (seatInfoSyncCancelIn === undefined) {
+                    throw new factory.errors.ServiceUnavailable('seatInfoSyncCancelIn must be set');
                 }
-                // surfrock: bookingNoが存在しないケースをハンドル(2024-03-13~)
-                const expectedMessage4surfrockNotFound = JSON.stringify({ message: `bookingNo:"${paymentMethodId}" が見つかりません。` });
-                if (error.code === http_status_1.BAD_REQUEST && error.message === expectedMessage4surfrockNotFound) {
-                    seatInfoSyncResult = error;
-                    throwsError = false;
+                seatInfoSyncCancelResult = yield movieTicketSeatService.seatInfoSyncCancel(seatInfoSyncCancelIn);
+            }
+            catch (error) {
+                let throwsError = true;
+                if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
+                    if (error.code === http_status_1.BAD_REQUEST) {
+                        if (Array.isArray(error.errors) && error.errors.length > 0) {
+                            const mvtkReserveServiceError = error.errors[0];
+                            // 興行会社システム座席予約番号存在無の場合、取消済なのでok
+                            if (mvtkReserveServiceError.status === surfrock.factory.ResultStatus.Success) {
+                                const cnclResult = (_h = mvtkReserveServiceError.rawResult) === null || _h === void 0 ? void 0 : _h.cnclResult;
+                                if (cnclResult === surfrock.service.seat.factory.seatInfoSyncCancel.CancelResult.CancelResult02) {
+                                    seatInfoSyncCancelResult = error;
+                                    throwsError = false;
+                                }
+                            }
+                        }
+                    }
                 }
-                // 着券取消可能期間超過を認識した上でのあえての返金の場合(注文からしばらく経って返品など)(2024-03-19~)
-                if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.CancellationPeriodPassed) {
-                    if (params.purpose.typeOf === factory.actionType.ReturnAction) {
-                        // seatInfoSyncResult = error;
-                        seatInfoSyncResultAsError = error;
-                        throwsError = false;
+                if (throwsError) {
+                    let message = String(error.message);
+                    // エラー通知先で情報を読み取りやすくするために、messageに情報付加
+                    message += `決済ID:${paymentMethodId}`;
+                    try {
+                        const actionError = Object.assign(Object.assign({}, error), { message: message, name: error.name });
+                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                    }
+                    catch (__) {
+                        // 失敗したら仕方ない
                     }
+                    error = (0, errorHandler_1.handleMvtkReserveError)(Object.assign(Object.assign({}, error), { message: message }));
+                    throw error;
                 }
             }
-            if (throwsError) {
-                let message = String(error.message);
-                // エラー通知先で情報を読み取りやすくするために、messageに情報付加
-                message += `決済ID:${paymentMethodId}`;
-                try {
-                    const actionError = Object.assign(Object.assign({}, error), { message: message, name: error.name });
-                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+        }
+        else {
+            try {
+                if (seatInfoSyncIn === undefined) {
+                    throw new factory.errors.ServiceUnavailable('seatInfoSyncIn must be set');
                 }
-                catch (__) {
-                    // 失敗したら仕方ない
+                seatInfoSyncResult = yield movieTicketSeatService.seatInfoSync(seatInfoSyncIn);
+            }
+            catch (error) {
+                let throwsError = true;
+                // 「存在しない興行会社システム座席予約番号が入力されました」の場合、取消済なのでok
+                if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.NotFound) {
+                        seatInfoSyncResult = error;
+                        throwsError = false;
+                    }
+                    // ReservationResult 19の内容が不明だがリトライする意味はおそらくないパターン
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.ReservationResult19) {
+                        seatInfoSyncResult = error;
+                        throwsError = false;
+                    }
+                    // surfrock: bookingNoが存在しないケースをハンドル(2024-03-13~)
+                    const expectedMessage4surfrockNotFound = JSON.stringify({ message: `bookingNo:"${paymentMethodId}" が見つかりません。` });
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === expectedMessage4surfrockNotFound) {
+                        seatInfoSyncResult = error;
+                        throwsError = false;
+                    }
+                    // 着券取消可能期間超過を認識した上でのあえての返金の場合(注文からしばらく経って返品など)(2024-03-19~)
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.CancellationPeriodPassed) {
+                        if (params.purpose.typeOf === factory.actionType.ReturnAction) {
+                            seatInfoSyncResultAsError = error;
+                            throwsError = false;
+                        }
+                    }
+                }
+                if (throwsError) {
+                    let message = String(error.message);
+                    // エラー通知先で情報を読み取りやすくするために、messageに情報付加
+                    message += `決済ID:${paymentMethodId}`;
+                    try {
+                        const actionError = Object.assign(Object.assign({}, error), { message: message, name: error.name });
+                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                    }
+                    catch (__) {
+                        // 失敗したら仕方ない
+                    }
+                    error = (0, errorHandler_1.handleMvtkReserveError)(Object.assign(Object.assign({}, error), { message: message }));
+                    throw error;
                 }
-                error = (0, errorHandler_1.handleMvtkReserveError)(Object.assign(Object.assign({}, error), { message: message }));
-                throw error;
             }
         }
         // アクションとしてはFailedだが後続処理を実行するケースに対応(2024-03-21~)
@@ -435,11 +487,10 @@ function refundMovieTicket(params) {
             action = (yield repos.action.giveUpWithObject({ typeOf: action.typeOf, id: action.id, error: seatInfoSyncResultAsError }));
         }
         else {
-            const actionResult = Object.assign(Object.assign({}, (seatInfoSyncIn !== undefined) ? { seatInfoSyncIn } : undefined), (seatInfoSyncResult !== undefined) ? { seatInfoSyncResult } : undefined);
+            const actionResult = Object.assign(Object.assign({}, (seatInfoSyncResult !== undefined) ? { seatInfoSyncResult } : undefined), (seatInfoSyncCancelResult !== undefined) ? { seatInfoSyncCancelResult } : undefined);
             action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
         }
         yield (0, onRefund_1.onRefund)(action)(repos);
-        // return action;
     });
 }
 exports.refundMovieTicket = refundMovieTicket;
@@ -468,9 +519,43 @@ function createSeatInfoSyncInOnRefund(params) {
         }
         let seatInfoSyncIn;
         // 着券時のseatInfoSyncInに対してtrkshFlgだけ変更してリクエストする
-        // instrument参照に統一(2022-05-02~)
-        seatInfoSyncIn = Object.assign(Object.assign({}, seatInfoSyncInOnPay), { trkshFlg: surfrock.service.seat.factory.DeleteFlag.True // 取消フラグ
+        seatInfoSyncIn = Object.assign(Object.assign({}, seatInfoSyncInOnPay), { trkshFlg: surfrock.factory.service.seat.seatInfoSync.DeleteFlag.True // 取消フラグ
          });
         return seatInfoSyncIn;
     });
 }
+function createSeatInfoSyncCancelInOnRefund(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        // 本アクションに対応するPayActionを取り出す
+        // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
+        const payAction = yield repos.action.findPayAction({
+            project: { id: params.project.id },
+            paymentMethodId: params.paymentMethodId,
+            actionStatus: {
+                $in: [
+                    factory.actionStatusType.ActiveActionStatus,
+                    factory.actionStatusType.CompletedActionStatus,
+                    factory.actionStatusType.FailedActionStatus
+                ]
+            }
+        });
+        if (payAction === undefined) {
+            throw new factory.errors.NotFound('PayAction');
+        }
+        const seatInfoSyncInOnPay = (_a = payAction.instrument) === null || _a === void 0 ? void 0 : _a.seatInfoSyncIn;
+        if (seatInfoSyncInOnPay === undefined) {
+            throw new factory.errors.NotFound('PayAction.instrument?.seatInfoSyncIn');
+        }
+        let seatInfoSyncCancelIn;
+        seatInfoSyncCancelIn = {
+            kgygishCd: seatInfoSyncInOnPay.kgygishCd,
+            kgysystmzskyykNo: seatInfoSyncInOnPay.kgygishSstmZskyykNo,
+            kgysystmzskyykNoIkktsCnclFlg: '1',
+            jyuTyp: surfrock.service.seat.factory.seatInfoSyncCancel.JyuTyp.JyuTyp05,
+            jyuTypRmk: ''
+            // knyknrNoInfoIn: [],
+        };
+        return seatInfoSyncCancelIn;
+    });
+}

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { MongoRepository as AuthorizationRepo } from '../../repo/code';
+import type { AuthorizationRepo } from '../../repo/code';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as ReservationRepo } from '../../repo/reservation';
 type AvailableReservationType = factory.reservationType.BusReservation | factory.reservationType.EventReservation;

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

@@ -21,13 +21,13 @@ function findByCode(params) {
             throw new factory.errors.ArgumentNull('code');
         }
         const reservationId = String(params.id);
-        const authorizationObject = yield repos.authorization.findValidObjectByCode({
+        const authorization = yield repos.authorization.findValidOneByCode({
             project: { id: params.project.id },
             code: params.code
         });
-        switch (authorizationObject.typeOf) {
+        switch (authorization.object.typeOf) {
             case factory.order.OrderType.Order:
-                const { orderNumber } = authorizationObject;
+                const { orderNumber } = authorization.object;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
                     // reservationIdを含む注文の存在を確認するだけでよい
                     yield repos.order.findByOrderNumberAndReservationId({
@@ -39,7 +39,7 @@ function findByCode(params) {
                 }
                 break;
             default:
-                throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorizationObject.typeOf} not implemented`);
+                throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorization.object.typeOf} not implemented`);
         }
         const reservationFromRepo = yield repos.reservation.findById({
             id: reservationId,

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

@@ -21,50 +21,36 @@ const debug = createDebug('chevre-domain:service:reserve:useReservation');
 // tslint:disable-next-line:max-func-body-length
 function useReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const now = new Date();
         const reservationId = params.object.id;
         const ticketToken = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.ticketToken;
         const token = (_b = params === null || params === void 0 ? void 0 : params.instrument) === null || _b === void 0 ? void 0 : _b.token;
-        // タスク作成前に検証済なので検証不要
-        // if (params.verifyToken === true) {
-        //     // instrument?.tokenを検証
-        //     if (typeof token === 'string') {
-        //         await verifyToken4reservation({
-        //             project: { id: params.project.id },
-        //             agent: params.agent,
-        //             reservationId,
-        //             token
-        //         })({ order: repos.order });
-        //     }
-        // }
+        // if (params.verifyToken === true) {} // タスク作成前に検証済なので検証不要
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
         yield reserveIfNotYet({ object: params.object })(repos);
         // 予約検索
-        // 取得属性最適化(2023-01-30~)
         const reservation = yield repos.reservation.findById({
             id: reservationId,
             inclusion: ['_id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
         });
         // UseActionを作成する
+        // optimize(2024-05-07~)
+        // const reservationAsObject: IReservationAsUseObject = {
+        //     id: reservation.id, issuedThrough: reservation.issuedThrough, reservationFor: reservation.reservationFor,
+        //     reservationNumber: reservation.reservationNumber, reservedTicket: reservation.reservedTicket, typeOf: reservation.typeOf
+        // };
+        const { reservedTicket } = reservation;
         const reservationAsObject = {
             id: reservation.id,
-            issuedThrough: reservation.issuedThrough,
-            reservationFor: reservation.reservationFor,
             reservationNumber: reservation.reservationNumber,
-            reservedTicket: reservation.reservedTicket,
-            typeOf: reservation.typeOf
+            typeOf: reservation.typeOf,
+            issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
+            reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
+            reservedTicket: Object.assign(Object.assign({ typeOf: reservedTicket.typeOf, ticketType: Object.assign({ identifier: reservedTicket.ticketType.identifier, typeOf: reservedTicket.ticketType.typeOf }, (typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined) }, (typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined), (typeof ((_c = reservedTicket.ticketedSeat) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined)
         };
-        const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign(Object.assign({}, (typeof token === 'string') ? { token } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }), 
-            // object最適化(2023-01-30~)
-            // どの予約を
-            object: [reservationAsObject] }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
-            ? {
-                location: {
-                    typeOf: factory.placeType.Place,
-                    identifier: params.location.identifier
-                }
-            }
+        const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign(Object.assign({}, (typeof token === 'string') ? { token } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }), object: [reservationAsObject] }, (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.identifier) === 'string')
+            ? { location: { typeOf: factory.placeType.Place, identifier: params.location.identifier } }
             : undefined);
         const action = yield repos.action.start(actionAttributes);
         // ひとまず予約数:1に限定する
@@ -85,10 +71,8 @@ function useReservation(params) {
             }
             throw error;
         }
-        // アクション完了
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
         yield (0, onReservationUsed_1.onReservationUsed)(attendedReservation)({ task: repos.task });
-        // return action;
     });
 }
 exports.useReservation = useReservation;

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

@@ -1,6 +1,7 @@
 import * as factory from '../../factory';
-import type { MongoRepository as AuthorizationRepo } from '../../repo/code';
+import type { AuthorizationRepo } from '../../repo/code';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
+import type { TicketRepo } from '../../repo/ticket';
 /**
  * 予約使用のためのチケットトークンを検証する
  */
@@ -26,4 +27,5 @@ export declare function verifyToken4reservation(params: {
 }): (repos: {
     authorization: AuthorizationRepo;
     order: OrderRepo;
+    ticket: TicketRepo;
 }) => Promise<void>;

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

@@ -25,13 +25,14 @@ function verifyToken4reservation(params) {
                 project: params.project,
                 agent: params.agent,
                 token
-            })({});
+            })(repos);
         }
         else if (typeof ticketToken === 'string' && ticketToken.length > 0) {
-            payload = yield repos.authorization.findValidObjectByCode({
+            const findValidOneByCodeResult = yield repos.authorization.findValidOneByCode({
                 project: { id: params.project.id },
                 code: ticketToken
             });
+            payload = findValidOneByCodeResult.object;
         }
         else {
             throw new factory.errors.ArgumentNull('ticket.token or ticket.ticketToken');

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

@@ -14,12 +14,14 @@ const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const code_1 = require("../../repo/code");
 const event_1 = require("../../repo/event");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
+const ticket_1 = require("../../repo/ticket");
 const transaction_1 = require("../../repo/transaction");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 const transactionProcess_1 = require("../../repo/transactionProcess");
@@ -44,12 +46,14 @@ function call(params) {
                 accountingReport: new accountingReport_1.MongoRepository(settings.connection),
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+                authorization: new code_1.AuthorizationRepo(settings.connection),
                 event: new event_1.MongoRepository(settings.connection),
                 paymentAccepted: new sellerPaymentAccepted_1.MongoRepository(settings.connection),
                 paymentService: new paymentService_1.MongoRepository(settings.connection),
                 paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),
                 product: new product_1.MongoRepository(settings.connection),
                 task: new task_1.MongoRepository(settings.connection),
+                ticket: new ticket_1.TicketRepo(settings.connection),
                 transaction: new transaction_1.MongoRepository(settings.connection),
                 transactionNumber: new transactionNumber_1.RedisRepository(settings.redisClient),
                 transactionProcess: transactionProcessRepo

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

@@ -15,6 +15,7 @@ const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
+const message_1 = require("../../repo/message");
 const note_1 = require("../../repo/note");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
@@ -33,6 +34,7 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
+            message: new message_1.MessageRepo(settings.connection),
             note: new note_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),

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

@@ -30,7 +30,7 @@ function call(data) {
             acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
-            code: new code_1.MongoRepository(settings.connection),
+            code: new code_1.AuthorizationRepo(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
@@ -49,14 +49,14 @@ function onAuthorizationCreated(params) {
         let reservationNumbers = [];
         // 発券対象イベントID
         let reservationForIds = [];
-        const authorizationObject = yield repos.code.findValidObjectByCode({
+        const authorization = yield repos.code.findValidOneByCode({
             code: params.code,
             project: { id: params.project.id }
         });
-        switch (authorizationObject.typeOf) {
+        switch (authorization.object.typeOf) {
             case factory.order.OrderType.Order:
                 // 注文検索
-                const orderNumber = authorizationObject.orderNumber;
+                const orderNumber = authorization.object.orderNumber;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
                     reservationNumbers = yield repos.acceptedOffer.distinctValues({
                         orderNumber: { $in: [orderNumber] }
@@ -68,7 +68,7 @@ function onAuthorizationCreated(params) {
                 break;
             case 'OwnershipInfo':
                 // 所有権検索
-                const ownershipInfoId = authorizationObject.id;
+                const ownershipInfoId = authorization.object.id;
                 if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
                     const ownershipInfo = yield repos.ownershipInfo.findById({ id: ownershipInfoId });
                     // 座席予約に対する所有権であれば発券