@chevre/domain 21.20.0-alpha.9 → 21.20.1

package/lib/chevre/service/notification.js

@@ -11,14 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.triggerWebhook = exports.report2developers = exports.sendEmailMessage = void 0;
 const sgMail = require("@sendgrid/mail");
-const createDebug = require("debug");
 const http_status_1 = require("http-status");
-const request = require("request");
+// import * as request from 'request';
 const util = require("util");
 const credentials_1 = require("../credentials");
 const settings_1 = require("../settings");
 const factory = require("../factory");
-const debug = createDebug('chevre-domain:service');
 /**
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
@@ -110,8 +108,7 @@ function sendEmailMessage(params) {
             throw error;
         }
         // アクション完了
-        debug('ending action...');
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
 exports.sendEmailMessage = sendEmailMessage;
@@ -182,31 +179,37 @@ ${content}`;
             }
         }
         else {
+            throw new factory.errors.NotImplemented('only useFetchAPI implemented');
             // LINE通知APIにPOST
-            const formData = Object.assign(Object.assign({ message: message }, (typeof imageThumbnail === 'string') ? { imageThumbnail } : undefined), (typeof imageFullsize === 'string') ? { imageFullsize } : undefined);
-            return new Promise((resolve, reject) => {
-                var _a;
-                request.post({
-                    url: LINE_NOTIFY_URL,
-                    auth: { bearer: repos.accessToken },
-                    form: formData,
-                    json: true,
-                    timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout
-                }, (error, response, body) => {
-                    if (error !== null) {
-                        reject(error);
-                    }
-                    else {
-                        switch (response.statusCode) {
-                            case http_status_1.OK:
-                                resolve();
-                                break;
-                            default:
-                                reject(new Error(body.message));
-                        }
-                    }
-                });
-            });
+            // const formData: any = {
+            //     message: message,
+            //     ...(typeof imageThumbnail === 'string') ? { imageThumbnail } : undefined,
+            //     ...(typeof imageFullsize === 'string') ? { imageFullsize } : undefined
+            // };
+            // return new Promise<void>((resolve, reject) => {
+            //     request.post(
+            //         {
+            //             url: LINE_NOTIFY_URL,
+            //             auth: { bearer: repos.accessToken },
+            //             form: formData,
+            //             json: true,
+            //             timeout: settings.webhook?.timeout
+            //         },
+            //         (error, response, body) => {
+            //             if (error !== null) {
+            //                 reject(error);
+            //             } else {
+            //                 switch (response.statusCode) {
+            //                     case OK:
+            //                         resolve();
+            //                         break;
+            //                     default:
+            //                         reject(new Error(body.message));
+            //                 }
+            //             }
+            //         }
+            //     );
+            // });
         }
     });
 }
@@ -295,57 +298,59 @@ function processInformAction(params) {
                     catch (err) {
                         if (err.name === 'TimeoutError') {
                             // tslint:disable-next-line:no-console
-                            console.error('report2developers: Timeout: It took more than 5 seconds to get the result!', err);
+                            console.error('processInformAction: Timeout: It took more than 5 seconds to get the result!', err);
                         }
                         else if (err.name === 'AbortError') {
                             // tslint:disable-next-line:no-console
-                            console.error('report2developers: Fetch aborted by user action (browser stop button, closing tab, etc.', err);
+                            console.error('processInformAction: Fetch aborted by user action (browser stop button, closing tab, etc.', err);
                         }
                         else if (err.name === 'TypeError') {
                             // tslint:disable-next-line:no-console
-                            console.error('report2developers: AbortSignal.timeout() method is not supported', err);
+                            console.error('processInformAction: AbortSignal.timeout() method is not supported', err);
                         }
                         else {
                             // A network error, or some other problem.
                             // tslint:disable-next-line:no-console
-                            console.error(`report2developers: Error: type: ${err.name}, message: ${err.message}`, err);
+                            console.error(`processInformAction: Error: type: ${err.name}, message: ${err.message}`, err);
                         }
                         throw err;
                     }
                 }
                 else {
-                    yield new Promise((resolve, reject) => {
-                        var _a;
-                        request.post({
-                            url: url,
-                            body: {
-                                data: params.object
-                            },
-                            json: true,
-                            timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout
-                        }, (error, response, body) => {
-                            if (error instanceof Error) {
-                                reject(error);
-                            }
-                            else {
-                                switch (response.statusCode) {
-                                    case http_status_1.OK:
-                                    case http_status_1.CREATED:
-                                    case http_status_1.ACCEPTED:
-                                    case http_status_1.NO_CONTENT:
-                                        result = {
-                                            statusCode: response.statusCode,
-                                            useFetchAPI: repos.useFetchAPI
-                                            // body: body
-                                        };
-                                        resolve();
-                                        break;
-                                    default:
-                                        reject(new Error(`statusCode: ${response.statusCode} body: ${body}`));
-                                }
-                            }
-                        });
-                    });
+                    throw new factory.errors.NotImplemented('only useFetchAPI implemented');
+                    // await new Promise<void>((resolve, reject) => {
+                    //     request.post(
+                    //         {
+                    //             url: url,
+                    //             body: {
+                    //                 data: params.object
+                    //             },
+                    //             json: true,
+                    //             timeout: settings.webhook?.timeout
+                    //         },
+                    //         (error, response, body) => {
+                    //             if (error instanceof Error) {
+                    //                 reject(error);
+                    //             } else {
+                    //                 switch (response.statusCode) {
+                    //                     case OK:
+                    //                     case CREATED:
+                    //                     case ACCEPTED:
+                    //                     case NO_CONTENT:
+                    //                         result = {
+                    //                             statusCode: response.statusCode,
+                    //                             useFetchAPI: repos.useFetchAPI
+                    //                             // body: body
+                    //                         };
+                    //                         resolve();
+                    //                         break;
+                    //                     default:
+                    //                         reject(new Error(`statusCode: ${response.statusCode} body: ${body}`));
+                    //                 }
+                    //             }
+                    //         }
+                    //     );
+                    // });
                 }
             }
         }
@@ -365,6 +370,6 @@ function processInformAction(params) {
                 throw error;
             }
         }
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }

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

@@ -0,0 +1,35 @@
+import * as factory from '../../factory';
+import type { MongoRepository as OrderInTransactionRepo } from '../../repo/orderInTransaction';
+import type { RedisRepository as OrderNumberRepo } from '../../repo/orderNumber';
+import type { MongoRepository as ProjectRepo } from '../../repo/project';
+import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
+interface IAcceptOfferOperationRepos {
+    orderInTransaction: OrderInTransactionRepo;
+    orderNumber: OrderNumberRepo;
+    project: ProjectRepo;
+    transaction: TransactionRepo;
+}
+type IAcceptOfferOperation<T> = (repos: IAcceptOfferOperationRepos) => Promise<T>;
+export type IAuthorizeActionWithInstrument = Pick<factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>, 'instrument'>;
+export declare function acceptOffer(params: {
+    project: {
+        id: string;
+    };
+    purpose: {
+        id: string;
+    };
+    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+}): IAcceptOfferOperation<void>;
+export declare function voidAcceptedOffer(params: {
+    /**
+     * 取消対象の興行オファー承認アクション
+     */
+    /**
+     * instrument.serialNumberからvoidする場合に指定
+     */
+    authorizeActionsWithInstrument: IAuthorizeActionWithInstrument[];
+    orderNumber: string;
+}): (repos: {
+    orderInTransaction: OrderInTransactionRepo;
+}) => Promise<void>;
+export {};

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

@@ -0,0 +1,67 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.voidAcceptedOffer = exports.acceptOffer = void 0;
+const createDebug = require("debug");
+const factory = require("../../factory");
+const placeOrderInProgress_1 = require("../transaction/placeOrderInProgress");
+const debug = createDebug('chevre-domain:service:offer');
+function acceptOffer(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const now = new Date();
+        const orderNumber = yield (0, placeOrderInProgress_1.publishOrderNumberIfNotExist)({
+            project: { id: params.project.id },
+            id: params.purpose.id,
+            object: { orderDate: now }
+        })(repos);
+        yield repos.orderInTransaction.acceptOffer({
+            orderNumber,
+            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            acceptedOffers: params.acceptedOffers
+        });
+    });
+}
+exports.acceptOffer = acceptOffer;
+function voidAcceptedOffer(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { orderNumber } = params;
+        // let reservationNumbers: string[] = [];
+        // authorizeActions.forEach((authorizeAction) => {
+        //     const reserveTransactionNumberByAction = authorizeAction.object.pendingTransaction?.transactionNumber;
+        //     if (typeof reserveTransactionNumberByAction === 'string') {
+        //         reservationNumbers.push(reserveTransactionNumberByAction);
+        //     }
+        // });
+        // reservationNumbers = [...new Set(reservationNumbers)];
+        // debug('removing acceptedOffers from PlaceOrder...', orderNumber, reservationNumbers);
+        // if (reservationNumbers.length > 0) {
+        //     const result = await repos.orderInTransaction.voidAcceptedOfferByReservationNumber({
+        //         orderNumber,
+        //         acceptedOffers: { reservationNumber: { $in: reservationNumbers } }
+        //     });
+        //     debug('acceptedOffers removed from PlaceOrder.', result);
+        // }
+        if (Array.isArray(params.authorizeActionsWithInstrument)) {
+            const serialNumbers = params.authorizeActionsWithInstrument
+                .filter(({ instrument }) => typeof instrument.transactionNumber === 'string')
+                .map(({ instrument }) => String(instrument.transactionNumber));
+            debug('removing acceptedOffers from PlaceOrder...', orderNumber, 'serialNumbers:', serialNumbers);
+            if (serialNumbers.length > 0) {
+                const result = yield repos.orderInTransaction.voidAcceptedOfferBySerialNumber({
+                    orderNumber,
+                    acceptedOffers: { serialNumber: { $in: serialNumbers } }
+                });
+                debug('acceptedOffers removed from PlaceOrder by serialNumbers.', result);
+            }
+        }
+    });
+}
+exports.voidAcceptedOffer = voidAcceptedOffer;

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -5,6 +5,8 @@ import type { MongoRepository as EventRepo } from '../../../repo/event';
 import type { MongoRepository as OfferRepo } from '../../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { MongoRepository as OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
+import type { RedisRepository as OrderNumberRepo } from '../../../repo/orderNumber';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PlaceRepo } from '../../../repo/place';
 import type { MongoRepository as PriceSpecificationRepo } from '../../../repo/priceSpecification';
@@ -27,6 +29,8 @@ interface IAuthorizeRepos {
     offerCatalog: OfferCatalogRepo;
     offerCatalogItem: OfferCatalogItemRepo;
     offerRateLimit: OfferRateLimitRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    orderNumber: OrderNumberRepo;
     paymentService: PaymentServiceRepo;
     place: PlaceRepo;
     priceSpecification: PriceSpecificationRepo;
@@ -69,5 +73,8 @@ declare function authorize(params: {
      * オファーID指定なしに座席をおさえる場合true
      */
     noOfferSpecified: boolean;
+    options: {
+        useCreateOrderOnOfferAccepted: boolean;
+    };
 }): IAuthorizeOperation<IAuthorizeOfferAction>;
 export { authorize };

package/lib/chevre/service/offer/event/authorize.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = void 0;
 const factory = require("../../../factory");
+const any_1 = require("../any");
 const defaultOffer_1 = require("./defaultOffer");
 const processStartReserve4chevre_1 = require("./processStartReserve4chevre");
 const searchEventTicketOffers_1 = require("./searchEventTicketOffers");
@@ -32,21 +33,16 @@ function authorize(params) {
             noOfferSpecified
         })(repos);
         let acceptedOffers4result = [];
-        let transactionNumber;
-        switch (bookingServiceIdentifire) {
-            case factory.service.webAPI.Identifier.COA:
-                break;
-            case factory.service.webAPI.Identifier.Chevre:
-                // Chevre予約の場合、まず取引番号発行
-                const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
-                transactionNumber = publishTransactionNumberResult.transactionNumber;
-                break;
-            default:
-        }
+        // Chevre予約の場合、まず取引番号発行
+        const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
         // 承認アクションを開始
-        const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)(Object.assign(Object.assign({ acceptedOffers: acceptedOffers, event: event, transaction: transaction }, (typeof transactionNumber === 'string')
-            ? { pendingTransaction: { typeOf: factory.assetTransactionType.Reserve, transactionNumber } }
-            : undefined), { broker: params.object.broker }));
+        const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
+            acceptedOffers: acceptedOffers,
+            event: event,
+            transaction: transaction,
+            pendingTransaction: { typeOf: factory.assetTransactionType.Reserve, transactionNumber },
+            broker: params.object.broker
+        });
         const action = yield repos.action.start(actionAttributes);
         try {
             switch (bookingServiceIdentifire) {
@@ -73,6 +69,16 @@ function authorize(params) {
                         stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
                     })(repos);
                     acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
+                    // add orderInTransaction(2024-01-15~)
+                    if (!noOfferSpecified) {
+                        if (params.options.useCreateOrderOnOfferAccepted) {
+                            yield (0, any_1.acceptOffer)({
+                                project: transaction.project,
+                                purpose: { id: transaction.id },
+                                acceptedOffers: acceptedOffers4result
+                            })(repos);
+                        }
+                    }
                     break;
                 default:
                     throw new factory.errors.Argument('Event', `Unknown booking service '${bookingServiceIdentifire}'`);
@@ -108,7 +114,7 @@ function authorize(params) {
 exports.authorize = authorize;
 function validateCreateRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
@@ -116,7 +122,11 @@ function validateCreateRequest(params) {
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        if (typeof ((_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id) !== 'string' || params.object.reservationFor.id.length === 0) {
+        // クライアント検証(2024-02-07~)
+        if (((_a = transaction.object.clientUser) === null || _a === void 0 ? void 0 : _a.client_id) !== params.store.id) {
+            throw new factory.errors.Forbidden('client not match that of the transaction');
+        }
+        if (typeof ((_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.id) !== 'string' || params.object.reservationFor.id.length === 0) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
         // イベント取得属性最適化(2023-01-23~)
@@ -124,7 +134,7 @@ function validateCreateRequest(params) {
         const event = yield repos.event.findMinimizedIndividualEventById({
             id: params.object.reservationFor.id
         });
-        let offeredThrough = (_b = event.offers) === null || _b === void 0 ? void 0 : _b.offeredThrough;
+        let offeredThrough = (_c = event.offers) === null || _c === void 0 ? void 0 : _c.offeredThrough;
         if (offeredThrough === undefined) {
             offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };
         }

package/lib/chevre/service/offer/event/cancel.d.ts

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
@@ -11,6 +12,7 @@ interface ICancelRepos {
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
+    orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
     transaction: TransactionRepo;

package/lib/chevre/service/offer/event/cancel.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cancel = void 0;
 const factory = require("../../../factory");
 const ReserveTransactionService = require("../../assetTransaction/reserve");
+const any_1 = require("../any");
 /**
  * イベントオファー承認取消(apiから実行)
  * 特定の承認アクションについて処理する
@@ -28,12 +29,23 @@ function cancel(params) {
         }
         // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
-        const action = yield repos.action.cancel({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         switch (action.instrument.identifier) {
             case factory.service.webAPI.Identifier.COA:
                 // 実質使用する予定なしなので廃止(2022-05-12~)
                 throw new factory.errors.NotImplemented(`booking service '${action.instrument.identifier}' not implemented`);
             default:
+                // add orderInTransaction(2024-01-15~)
+                // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
+                const orderNumberByTransaction = transaction.object.orderNumber;
+                if (typeof orderNumberByTransaction === 'string') {
+                    yield (0, any_1.voidAcceptedOffer)({
+                        // authorizeActions: [action],
+                        authorizeActionsWithInstrument: [action],
+                        orderNumber: orderNumberByTransaction
+                    })(repos);
+                }
                 const transactionNumber = (_a = action.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
                 if (typeof transactionNumber === 'string') {
                     // すでに取消済であったとしても、すべて取消処理(actionStatusに関係なく)

package/lib/chevre/service/offer/event/factory.d.ts

@@ -16,7 +16,7 @@ export declare function createReserveTransactionStartParams(params: {
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
-    pendingTransaction?: factory.action.authorize.offer.eventService.IChevrePendingTransaction | undefined;
+    pendingTransaction: factory.action.authorize.offer.eventService.IChevrePendingTransaction;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
 }): factory.action.authorize.offer.eventService.IAttributes<factory.service.webAPI.Identifier.Chevre>;

package/lib/chevre/service/offer/event/factory.js

@@ -5,6 +5,7 @@ const COA = require("@motionpicture/coa-service");
 const moment = require("moment");
 const util_1 = require("util");
 const factory = require("../../../factory");
+const settings_1 = require("../../../settings");
 function createReserveTransactionStartParams(params) {
     var _a, _b;
     const acceptedTicketOffersWithoutDetail = (Array.isArray(params.object.acceptedOffer))
@@ -89,17 +90,12 @@ function createAuthorizeSeatReservationActionAttributes(params) {
                 typeOf: 'WebAPI'
             }
         },
-        // ↓不要なので廃止(少なくともapiレスポンスにはsuperEventは含んでいない)(2022-08-19~)
-        // superEvent: event.superEvent,
         typeOf: event.typeOf
     };
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
-        object: Object.assign(Object.assign({ typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation, event: authorizeObjectEvent, 
-            // ↓不要なので廃止(2022-06-07~)
-            // reservationFor: { id: event.id },
-            acceptedOffer: acceptedOffers }, (params.pendingTransaction !== undefined) ? { pendingTransaction: params.pendingTransaction } : undefined), (params.broker !== undefined) ? { broker: params.broker } : undefined),
+        object: Object.assign({ typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation, event: authorizeObjectEvent, acceptedOffer: acceptedOffers, pendingTransaction: params.pendingTransaction }, (params.broker !== undefined) ? { broker: params.broker } : undefined),
         agent: {
             id: transaction.seller.id,
             typeOf: transaction.seller.typeOf,
@@ -110,11 +106,13 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         recipient: {
             typeOf: transaction.agent.typeOf,
             id: transaction.agent.id
-            // ↓不要なので廃止(2022-08-19~)
-            // ...(transaction.agent.identifier !== undefined) ? { identifier: transaction.agent.identifier } : undefined
         },
         purpose: { typeOf: transaction.typeOf, id: transaction.id },
-        instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre }
+        instrument: {
+            typeOf: 'WebAPI',
+            identifier: factory.service.webAPI.Identifier.Chevre,
+            transactionNumber: params.pendingTransaction.transactionNumber
+        }
     };
 }
 exports.createAuthorizeSeatReservationActionAttributes = createAuthorizeSeatReservationActionAttributes;
@@ -195,18 +193,8 @@ function responseBody2acceptedOffers4result(params) {
                     priceCurrency: priceSpecification.priceCurrency,
                     typeOf: priceSpecification.typeOf,
                     valueAddedTaxIncluded: priceSpecification.valueAddedTaxIncluded
-                }
-                // 不要なので廃止(2023-07-01~)
-                // priceCurrency: (typeof itemOffered.priceCurrency === 'string')
-                //     ? itemOffered.priceCurrency
-                //     : factory.priceCurrency.JPY,
-                // 不要なので廃止(2023-07-01~)
-                // seller: {
-                //     typeOf: params.seller.typeOf,
-                //     name: (typeof params.seller.name === 'string')
-                //         ? params.seller.name
-                //         : String(params.seller.name?.ja)
-                // }
+                },
+                serialNumber: params.responseBody.transactionNumber
             };
             return resultAcceptedOffer;
         });
@@ -250,7 +238,8 @@ function createReservation(params) {
             startDate: moment(event.startDate)
                 .toDate(),
             // 最適化(2022-05-31~)
-            superEvent: Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, kanaName: event.superEvent.kanaName, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined)
+            superEvent: Object.assign(Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined), (settings_1.USE_KANA_NAME_IN_ACCEPTED_OFFER) ? { kanaName: event.superEvent.kanaName } : undefined // オプション化
+            )
         };
         if (params.issuedThrough.typeOf !== factory.product.ProductType.EventService) {
             throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.EventService}`);

package/lib/chevre/service/offer/event/importFromCOA.js

@@ -46,10 +46,9 @@ function importFromCOA(params) {
         }
         catch (error) {
             let throwsError = true;
-            // "name": "COAServiceError",
-            // "code": 500,
-            // "status": "",
-            // "message": "ESOCKETTIMEDOUT",
+            if (error.name === 'AbortError') {
+                throwsError = false;
+            }
             if (error.name === 'COAServiceError') {
                 if (error.message === 'ESOCKETTIMEDOUT') {
                     throwsError = false;
@@ -115,10 +114,9 @@ function importCategoryCodesFromCOA(params) {
         }
         catch (error) {
             let throwsError = true;
-            // "name": "COAServiceError",
-            // "code": 500,
-            // "status": "",
-            // "message": "ESOCKETTIMEDOUT",
+            if (error.name === 'AbortError') {
+                throwsError = false;
+            }
             if (error.name === 'COAServiceError') {
                 if (error.message === 'ESOCKETTIMEDOUT') {
                     throwsError = false;

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
@@ -12,6 +13,7 @@ interface IVoidTransactionRepos {
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
+    orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
     transaction: TransactionRepo;