@chevre/domain 20.2.0-alpha.9 → 20.2.0

package/lib/chevre/service/assetTransaction/reserve/factory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPotentialActions = exports.createReservation = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
+exports.createPendingReservationAction = exports.createPotentialActions = exports.createReservation = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
 /**
  * 予約取引ファクトリー
  */
@@ -468,7 +468,10 @@ function createPotentialActions(params) {
                 underName
             }));
         });
-        const reservationPackage = Object.assign({ reservationFor, reservationNumber: pendingReservations[0].reservationNumber, reservationStatus: pendingReservations[0].reservationStatus, subReservation: pendingReservations, typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string') ? { underName } : undefined);
+        const reservationPackage = Object.assign({ reservationFor, reservationNumber: pendingReservations[0].reservationNumber, reservationStatus: pendingReservations[0].reservationStatus, 
+            // 不要なので廃止(2023-01-19~)
+            // subReservation: pendingReservations,
+            typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string') ? { underName } : undefined);
         reserveActionAttributes = [{
                 project: transaction.project,
                 typeOf: factory.actionType.ReserveAction,
@@ -550,3 +553,31 @@ function createMoneyTransferActions(params) {
     }
     return moneyTransfer;
 }
+function createPendingReservationAction(params) {
+    const transaction = params.transaction;
+    const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
+    let cancelActionAttributes = [];
+    if (pendingReservations.length > 0) {
+        const reservationFor = transaction.object.reservationFor;
+        if (reservationFor === undefined) {
+            throw new factory.errors.NotFound('transaction.object.reservationFor');
+        }
+        // ReservationPackageに対応(2022-12-23~)
+        const reservationPackage = {
+            typeOf: factory.reservationType.ReservationPackage,
+            reservationNumber: transaction.transactionNumber,
+            reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
+            reservationStatus: pendingReservations[0].reservationStatus
+        };
+        cancelActionAttributes = [{
+                project: transaction.project,
+                typeOf: factory.actionType.CancelAction,
+                purpose: { typeOf: transaction.typeOf, id: transaction.id },
+                agent: transaction.project,
+                object: reservationPackage,
+                potentialActions: {}
+            }];
+    }
+    return cancelActionAttributes;
+}
+exports.createPendingReservationAction = createPendingReservationAction;

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.d.ts

@@ -0,0 +1,16 @@
+import * as factory from '../../../factory';
+import { IMinimizedIndividualEvent } from '../../../factory/event';
+declare function validateStartRequest(params: {
+    object: factory.assetTransaction.reserve.IObjectWithoutDetail;
+    event: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
+    validateEventOfferPeriod?: boolean;
+    validateEvent?: boolean;
+    now: Date;
+    store?: {
+        /**
+         * 販売アプリケーションID
+         */
+        id?: string;
+    };
+}): void;
+export { validateStartRequest };

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateStartRequest = void 0;
+const moment = require("moment");
+const factory = require("../../../factory");
+function validateStartRequest(params) {
+    var _a;
+    const now = params.now;
+    const event = params.event;
+    if (params.validateEventOfferPeriod === true) {
+        if (typeof ((_a = params.store) === null || _a === void 0 ? void 0 : _a.id) !== 'string') {
+            throw new factory.errors.NotFound('store.id');
+        }
+        validateEventOfferPeriod({ event, now, availableAt: { id: params.store.id } });
+    }
+    if (params.validateEvent === true) {
+        validateEvent({ event, object: params.object });
+    }
+}
+exports.validateStartRequest = validateStartRequest;
+/**
+ * イベントのオファー有効期間を検証する
+ */
+function validateEventOfferPeriod(params) {
+    const acceptedDate = moment(params.now);
+    const eventOffers = params.event.offers;
+    // アプリケーションごとの設定を参照する(2022-11-19~)
+    const makesOfferOnApplication = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.seller.makesOffer.find((offer) => {
+        return Array.isArray(offer.availableAtOrFrom) && offer.availableAtOrFrom[0].id === params.availableAt.id;
+    });
+    if (makesOfferOnApplication === undefined) {
+        throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${params.availableAt.id}`);
+    }
+    const validFrom = makesOfferOnApplication.validFrom;
+    const validThrough = makesOfferOnApplication.validThrough;
+    // const validFrom = eventOffers?.validFrom;
+    // const validThrough = eventOffers?.validThrough;
+    if (validFrom !== undefined && validFrom !== null) {
+        if (acceptedDate.isBefore(moment(validFrom))) {
+            throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid from ${validFrom}`);
+        }
+    }
+    if (validThrough !== undefined && validThrough !== null) {
+        if (acceptedDate.isAfter(moment(validThrough))) {
+            throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
+        }
+    }
+}
+/**
+ * イベントの上限座席数を検証する
+ */
+function validateEvent(params) {
+    var _a, _b;
+    // const acceptedDate = moment(params.now);
+    const eventOffers = params.event.offers;
+    // const validFrom = eventOffers?.validFrom;
+    // const validThrough = eventOffers?.validThrough;
+    // if (validFrom !== undefined && validFrom !== null) {
+    //     if (acceptedDate.isBefore(moment(validFrom))) {
+    //         throw new factory.errors.Argument(
+    //             'reservationFor.id',
+    //             `Offer of ${params.event.id} is valid from ${validFrom}`
+    //         );
+    //     }
+    // }
+    // if (validThrough !== undefined && validThrough !== null) {
+    //     if (acceptedDate.isAfter(moment(validThrough))) {
+    //         throw new factory.errors.Argument(
+    //             'reservationFor.id',
+    //             `Offer of ${params.event.id} is valid through ${validThrough}`
+    //         );
+    //     }
+    // }
+    // イベントのmaxValueを検証
+    const maxValue = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.eligibleQuantity) === null || _a === void 0 ? void 0 : _a.maxValue;
+    if (typeof maxValue === 'number') {
+        const numAcceptedOffers = (_b = params.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.length;
+        if (typeof numAcceptedOffers === 'number' && numAcceptedOffers > 0) {
+            if (numAcceptedOffers > maxValue) {
+                throw new factory.errors.Argument('reservationFor.id', `Maximum number of offers exceeded`);
+            }
+        }
+    }
+}

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

@@ -1,7 +1,7 @@
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
-import { MongoRepository as EventRepo } from '../../repo/event';
+import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../repo/event';
 import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../repo/itemAvailability/screeningEvent';
 import { MongoRepository as OfferRepo } from '../../repo/offer';
 import { MongoRepository as OfferCatalogRepo } from '../../repo/offerCatalog';
@@ -54,16 +54,47 @@ export declare type ITaskAndTransactionOperation<T> = (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<T>;
-export declare type IConfirmOperation<T> = (repos: {
+interface IConfirmRepo {
+    action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
-}) => Promise<T>;
+    reservation: ReservationRepo;
+    task: TaskRepo;
+}
+export declare type IConfirmOperation<T> = (repos: IConfirmRepo) => Promise<T>;
+declare type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
+    /**
+     * 承認アクションを介した場合に検索済のイベント
+     */
+    preSearchedEvent?: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
+    /**
+     * 承認アクションを介した場合に検索済のオファーリスト
+     */
+    preSearchedTicketOffers?: factory.product.ITicketOffer[];
+    /**
+     * 承認アクションを介した場合に検索済の単価オファーリスト
+     */
+    preSearchedUnitPriceOffers?: factory.unitPriceOffer.IUnitPriceOffer[];
+    /**
+     * 販売アプリケーション
+     */
+    availableAtOrFrom?: {
+        id?: string;
+    };
+    /**
+     * イベントの販売期間を検証するかどうか
+     */
+    validateEventOfferPeriod: boolean;
+    /**
+     * イベントのオファー(最大予約座席数)を検証するかどうか
+     */
+    validateEvent: boolean;
+    validateAppliesToMovieTicket: boolean;
+};
 /**
  * 取引開始
  */
-export declare function start(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
-    validateAppliesToMovieTicket: boolean;
-}): IStartOperation<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>>;
+export declare function start(params: IStartParams): IStartOperation<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>>;
 /**
  * 取引確定
  */
@@ -81,3 +112,4 @@ export declare function cancel(params: {
 export declare function exportTasksById(params: {
     id: string;
 }): ITaskAndTransactionOperation<factory.task.ITask<factory.taskName>[]>;
+export {};

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

@@ -18,19 +18,42 @@ const pecorinoapi = require("../../pecorinoapi");
 const factory = require("../../factory");
 const OfferService = require("../offer");
 const cancelReservation_1 = require("../reserve/cancelReservation");
+const confirmReservation_1 = require("../reserve/confirmReservation");
 const settings_1 = require("../../settings");
 const factory_1 = require("./reserve/factory");
+const validateStartRequest_1 = require("./reserve/validateStartRequest");
 /**
  * 取引開始
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c, _d, _e;
+        const now = new Date();
         // 自動発行廃止(2022-05-17~)
         const reservationNumber = params.transactionNumber;
         if (typeof reservationNumber !== 'string' || reservationNumber.length === 0) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
+        // eventをfix
+        if (typeof ((_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id) !== 'string' || params.object.reservationFor.id.length === 0) {
+            throw new factory.errors.ArgumentNull('object.reservationFor.id');
+        }
+        let event;
+        if (typeof ((_b = params.preSearchedEvent) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') {
+            event = params.preSearchedEvent;
+        }
+        else {
+            event = yield repos.event.findMinimizedIndividualEventById({ id: params.object.reservationFor.id });
+        }
+        // validationを承認アクション開始前から移行(2023-01-27~)
+        (0, validateStartRequest_1.validateStartRequest)({
+            object: params.object,
+            event,
+            validateEventOfferPeriod: params.validateEventOfferPeriod,
+            validateEvent: params.validateEvent,
+            now,
+            store: { id: (_c = params.availableAtOrFrom) === null || _c === void 0 ? void 0 : _c.id }
+        });
         const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { reservationNumber: reservationNumber }));
         // 取引作成
         let transaction;
@@ -46,10 +69,14 @@ function start(params) {
             throw error;
         }
         // 指定があれば予約追加
-        if (typeof ((_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+        if (typeof ((_d = params.object.reservationFor) === null || _d === void 0 ? void 0 : _d.id) === 'string') {
             transaction = yield addReservations({
                 id: transaction.id,
                 object: params.object,
+                event,
+                preSearchedTicketOffers: params.preSearchedTicketOffers,
+                preSearchedUnitPriceOffers: params.preSearchedUnitPriceOffers,
+                availableAtOrFrom: { id: (_e = params.availableAtOrFrom) === null || _e === void 0 ? void 0 : _e.id },
                 validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
             })(repos);
         }
@@ -63,45 +90,58 @@ exports.start = start;
 function addReservations(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a;
         const now = new Date();
         let transaction = yield repos.assetTransaction.findById({ typeOf: factory.assetTransactionType.Reserve, id: params.id });
-        // イベント存在確認
-        if (typeof ((_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id) !== 'string' || params.object.reservationFor.id.length === 0) {
-            throw new factory.errors.ArgumentNull('object.reservationFor.id');
-        }
         const acceptedOffers = (Array.isArray(params.object.acceptedOffer)) ? params.object.acceptedOffer : [];
-        const event = yield repos.event.findById({ id: params.object.reservationFor.id }, {
-            // 予約データに不要な属性は取得しない
-            aggregateReservation: 0, aggregateOffer: 0, attendeeCount: 0,
-            checkInCount: 0, maximumAttendeeCapacity: 0, remainingAttendeeCapacity: 0
-        });
+        const event = params.event;
         if (event.typeOf !== factory.eventType.ScreeningEvent && event.typeOf !== factory.eventType.Event) {
             throw new factory.errors.Argument('object.reservationFor.id', `invalid event type ${event.typeOf}`);
         }
         if (event.typeOf === factory.eventType.ScreeningEvent || event.typeOf === factory.eventType.Event) {
             validateEvent({ now, event });
         }
-        // イベントオファー検索
-        const ticketOffers = yield OfferService.event.searchEventTicketOffers({ event: { id: event.id } })(repos);
-        let availableOffers = [];
-        // 興行設定があれば興行のカタログを参照する(2022-08-31~)
-        const eventOffers = event.offers;
-        if (typeof ((_b = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-            const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
-            if (typeof ((_c = eventService.hasOfferCatalog) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
-                availableOffers = yield repos.offer.findOffersByOfferCatalogId({
-                    offerCatalog: { id: eventService.hasOfferCatalog.id }
-                });
-            }
+        // 受け入れたオファーIDだけ取得する(2023-01-26~)
+        const acceptedOfferIds = [...new Set(acceptedOffers.map((o) => String(o.id)))];
+        let ticketOffers;
+        let availableOffers;
+        // 承認アクションを介した予約取引開始時の冗長なオファー検索処理について最適化(2023-01-27~)
+        if (Array.isArray(params.preSearchedTicketOffers) && Array.isArray(params.preSearchedUnitPriceOffers)) {
+            ticketOffers = params.preSearchedTicketOffers;
+            availableOffers = params.preSearchedUnitPriceOffers;
         }
         else {
-            throw new factory.errors.NotFound('event.offers.itemOffered.id');
+            // イベントオファー検索
+            const searchEventTicketOffersResult = yield OfferService.event.searchEventTicketOffers({
+                ids: acceptedOfferIds,
+                event: { id: event.id },
+                // 対応アプリケーション条件追加(2023-01-27~)
+                store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
+                sort: false,
+                validateOfferRateLimit: true
+            })(repos);
+            ticketOffers = searchEventTicketOffersResult.ticketOffers;
+            availableOffers = searchEventTicketOffersResult.unitPriceOffers;
         }
+        // 冗長なfindOffersByOfferCatalogId処理を削除(2023-01-26~)
+        // let availableOffers: factory.unitPriceOffer.IUnitPriceOffer[] = [];
+        // // 興行設定があれば興行のカタログを参照する(2022-08-31~)
+        // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>event.offers;
+        // if (typeof eventOffers?.itemOffered?.id === 'string') {
+        //     const eventService = <factory.product.IProduct>await repos.product.findById({ id: eventOffers.itemOffered.id });
+        //     if (typeof eventService.hasOfferCatalog?.id === 'string') {
+        //         availableOffers = await repos.offer.findOffersByOfferCatalogId({
+        //             offerCatalog: { id: eventService.hasOfferCatalog.id }
+        //         });
+        //     }
+        // } else {
+        //     throw new factory.errors.NotFound('event.offers.itemOffered.id');
+        // }
         const availableSeatOffers = yield searchAvailableSeatOffers({ acceptedOffers, event: { id: event.id } })(repos);
         // 仮予約作成
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createAcceptedOffers4transactionObject({
-            acceptedOffers, ticketOffers,
+            acceptedOffers,
+            ticketOffers,
             availableOffers, now,
             event, availableSeatOffers,
             transaction,
@@ -215,10 +255,10 @@ function createAcceptedOffers4transactionObject(params) {
         return { acceptedOffers4transactionObject, objectSubReservations };
     });
 }
-// tslint:disable-next-line:max-func-body-length
 function createReservations4transactionObject(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // 予約番号
         const reservationNumber = params.transaction.object.reservationNumber;
         if (typeof reservationNumber !== 'string') {
@@ -258,18 +298,22 @@ function createReservations4transactionObject(params) {
             const additionalProperty = (0, factory_1.createAdditionalProperty)({ acceptedOffer });
             // 座席指定であれば、座席タイプチャージを検索する
             const seatPriceComponent = [];
-            const seatSection = (_c = reservedTicket.ticketedSeat) === null || _c === void 0 ? void 0 : _c.seatSection;
-            const seatNumber = (_d = reservedTicket.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber;
-            if (typeof seatSection === 'string' && typeof seatNumber === 'string') {
-                const offersOnSeat = (_e = params.availableSeatOffers.find((o) => {
-                    var _a;
-                    return o.branchCode === seatNumber && ((_a = o.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode) === seatSection;
-                })) === null || _e === void 0 ? void 0 : _e.offers;
-                if (Array.isArray(offersOnSeat)) {
-                    const availableSeatOffer = offersOnSeat[0];
-                    const seatPriceSpecs = (_f = availableSeatOffer === null || availableSeatOffer === void 0 ? void 0 : availableSeatOffer.priceSpecification) === null || _f === void 0 ? void 0 : _f.priceComponent;
-                    if (Array.isArray(seatPriceSpecs)) {
-                        seatPriceComponent.push(...seatPriceSpecs);
+            // 区分加算料金を適用しないオプションを追加(2023-01-26~)
+            const ignoreCategoryCodeChargeSpec = ((_c = ticketType.settings) === null || _c === void 0 ? void 0 : _c.ignoreCategoryCodeChargeSpec) === true;
+            if (!ignoreCategoryCodeChargeSpec) {
+                const seatSection = (_d = reservedTicket.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatSection;
+                const seatNumber = (_e = reservedTicket.ticketedSeat) === null || _e === void 0 ? void 0 : _e.seatNumber;
+                if (typeof seatSection === 'string' && typeof seatNumber === 'string') {
+                    const offersOnSeat = (_f = params.availableSeatOffers.find((o) => {
+                        var _a;
+                        return o.branchCode === seatNumber && ((_a = o.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode) === seatSection;
+                    })) === null || _f === void 0 ? void 0 : _f.offers;
+                    if (Array.isArray(offersOnSeat)) {
+                        const availableSeatOffer = offersOnSeat[0];
+                        const seatPriceSpecs = (_g = availableSeatOffer === null || availableSeatOffer === void 0 ? void 0 : availableSeatOffer.priceSpecification) === null || _g === void 0 ? void 0 : _g.priceComponent;
+                        if (Array.isArray(seatPriceSpecs)) {
+                            seatPriceComponent.push(...seatPriceSpecs);
+                        }
                     }
                 }
             }
@@ -280,7 +324,7 @@ function createReservations4transactionObject(params) {
             if (Array.isArray(availableAddOns) && Array.isArray(acceptedAddOnParams)) {
                 acceptedAddOns = availableAddOns.filter((availableAddOn) => acceptedAddOnParams.some((acceptedAddOn) => availableAddOn.id === acceptedAddOn.id));
             }
-            const subReservation = (_h = (_g = acceptedOffer.itemOffered) === null || _g === void 0 ? void 0 : _g.serviceOutput) === null || _h === void 0 ? void 0 : _h.subReservation;
+            const subReservation = (_j = (_h = acceptedOffer.itemOffered) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.subReservation;
             const reservationId = `${reservationNumber}-${reservationIndex}`;
             reservations.push((0, factory_1.createReservation)({
                 project: params.transaction.project,
@@ -299,7 +343,7 @@ function createReservations4transactionObject(params) {
                 subReservation: subReservation,
                 programMembershipUsed,
                 availableOffer: ticketType,
-                appliesToMovieTicket: (_j = acceptedOffer.priceSpecification) === null || _j === void 0 ? void 0 : _j.appliesToMovieTicket,
+                appliesToMovieTicket: (_k = acceptedOffer.priceSpecification) === null || _k === void 0 ? void 0 : _k.appliesToMovieTicket,
                 validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
             }));
         }
@@ -537,7 +581,8 @@ function onReservationsCreated(params) {
         // 集計タスク
         yield OfferService.createAggregateScreeningEventIfNotExist({
             project: params.event.project,
-            reservationFor: { id: params.event.id }
+            reservationFor: [{ id: params.event.id }],
+            force: false
         })({ task: repos.task });
     });
 }
@@ -571,8 +616,14 @@ function confirm(params) {
             typeOf: factory.assetTransactionType.Reserve,
             id: transaction.id,
             result: result,
-            potentialActions: potentialActions
+            potentialActions: (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING)
+                ? { reserve: [] }
+                : potentialActions
         });
+        if (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
+            // sync対応(2023-01-13~)
+            yield (0, confirmReservation_1.confirmReservation)(potentialActions.reserve)(repos);
+        }
     });
 }
 exports.confirm = confirm;
@@ -614,34 +665,9 @@ function cancel(params) {
         });
         // 本来非同期でタスクが実行されるが、同期的に仮予約取消が実行されていないと、サービス利用側が困る可能性があるので、
         // 同期的にもcancelPendingReservationを実行しておく
-        try {
-            const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-            let cancelActionAttributes = [];
-            if (pendingReservations.length > 0) {
-                const reservationFor = transaction.object.reservationFor;
-                if (reservationFor === undefined) {
-                    throw new factory.errors.NotFound('transaction.object.reservationFor');
-                }
-                // ReservationPackageに対応(2022-12-23~)
-                const reservationPackage = {
-                    typeOf: factory.reservationType.ReservationPackage,
-                    reservationNumber: transaction.transactionNumber,
-                    reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
-                    reservationStatus: pendingReservations[0].reservationStatus
-                };
-                cancelActionAttributes = [{
-                        project: transaction.project,
-                        typeOf: factory.actionType.CancelAction,
-                        purpose: { typeOf: transaction.typeOf, id: transaction.id },
-                        agent: transaction.project,
-                        object: reservationPackage,
-                        potentialActions: {}
-                    }];
-                yield (0, cancelReservation_1.cancelPendingReservation)(cancelActionAttributes)(repos);
-            }
-        }
-        catch (error) {
-            // no op
+        const cancelActionAttributes = (0, factory_1.createPendingReservationAction)({ transaction });
+        if (cancelActionAttributes.length > 0) {
+            yield (0, cancelReservation_1.cancelPendingReservation)(cancelActionAttributes)(repos);
         }
     });
 }
@@ -704,29 +730,29 @@ function exportTasksById(params) {
                 }
                 break;
             case factory.transactionStatusType.Canceled:
-            case factory.transactionStatusType.Expired:
-                const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-                let cancelActionAttributes = [];
-                if (pendingReservations.length > 0) {
-                    const reservationFor = transaction.object.reservationFor;
-                    if (reservationFor === undefined) {
-                        throw new factory.errors.NotFound('transaction.object.reservationFor');
-                    }
-                    // ReservationPackageに対応(2022-12-23~)
-                    const reservationPackage = {
-                        typeOf: factory.reservationType.ReservationPackage,
-                        reservationNumber: transaction.transactionNumber,
-                        reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
-                        reservationStatus: pendingReservations[0].reservationStatus
-                    };
-                    cancelActionAttributes = [{
+                // sync対応(2023-01-13~)
+                if (!settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
+                    const cancelActionAttributes4canceled = (0, factory_1.createPendingReservationAction)({ transaction });
+                    if (cancelActionAttributes4canceled.length > 0) {
+                        const cancelPendingReservationTask = {
                             project: transaction.project,
-                            typeOf: factory.actionType.CancelAction,
-                            purpose: { typeOf: transaction.typeOf, id: transaction.id },
-                            agent: transaction.project,
-                            object: reservationPackage,
-                            potentialActions: {}
-                        }];
+                            name: factory.taskName.CancelPendingReservation,
+                            status: factory.taskStatus.Ready,
+                            runsAt: new Date(),
+                            remainingNumberOfTries: 10,
+                            numberOfTried: 0,
+                            executionResults: [],
+                            data: {
+                                actionAttributes: cancelActionAttributes4canceled
+                            }
+                        };
+                        taskAttributes.push(cancelPendingReservationTask);
+                    }
+                }
+                break;
+            case factory.transactionStatusType.Expired:
+                const cancelActionAttributes = (0, factory_1.createPendingReservationAction)({ transaction });
+                if (cancelActionAttributes.length > 0) {
                     const cancelPendingReservationTask = {
                         project: transaction.project,
                         name: factory.taskName.CancelPendingReservation,

package/lib/chevre/service/assetTransaction.d.ts

@@ -33,4 +33,4 @@ export declare function exportTasks<T extends factory.assetTransactionType>(para
     project: ProjectRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<(import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/deleteAssetTransaction").ITask | import("@chevre/factory/lib/task/deleteAuthorization").ITask | import("@chevre/factory/lib/task/deleteOrder").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteMember").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask)[] | undefined>;
+}) => Promise<(import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/deleteAssetTransaction").ITask | import("@chevre/factory/lib/task/deleteAuthorization").ITask | import("@chevre/factory/lib/task/deleteOrder").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/deleteMember").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask)[] | undefined>;

package/lib/chevre/service/code.d.ts

@@ -2,7 +2,6 @@ import { MongoRepository as ActionRepo } from '../repo/action';
 import { MongoRepository as AuthorizationRepo } from '../repo/code';
 import * as factory from '../factory';
 export declare type IToken = string;
-export declare type IData = any;
 export declare type ICode = string;
 /**
  * 承認を削除する
@@ -24,7 +23,7 @@ export declare function getToken(params: {
 }): (repos: {
     authorization: AuthorizationRepo;
 }) => Promise<IToken>;
-export declare function verifyToken<T>(params: {
+export declare function verifyToken(params: {
     project: {
         id: string;
     };
@@ -33,4 +32,4 @@ export declare function verifyToken<T>(params: {
     audience?: string[];
 }): (repos: {
     action?: ActionRepo;
-}) => Promise<T>;
+}) => Promise<factory.authorization.IObject>;

package/lib/chevre/service/delivery/factory.d.ts

@@ -4,5 +4,5 @@ export declare type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factor
  * 注文から所有権を作成する
  */
 export declare function createOwnershipInfosFromOrder(params: {
-    order: factory.order.IOrder;
+    order: Pick<factory.order.IOrder, 'acceptedOffers' | 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'>;
 }): IOwnershipInfo[];

package/lib/chevre/service/delivery/product/factory.js

@@ -5,6 +5,7 @@ const moment = require("moment");
 const factory = require("../../../factory");
 const MAX_OWNED_THROUGH = '3000-01-01T00:00:00Z';
 function createProductOwnershipInfo(params) {
+    var _a, _b;
     let ownershipInfo;
     let ownedThrough;
     // どういう期間でいくらのオファーなのか
@@ -48,9 +49,14 @@ function createProductOwnershipInfo(params) {
         throw new factory.errors.NotFound('Order.acceptedOffers.priceSpecification.referenceQuantity.value');
     }
     const itemOffered = params.acceptedOffer.itemOffered;
-    const typeOfGood = Object.assign(Object.assign({ project: itemOffered.project, identifier: itemOffered.identifier, issuedThrough: itemOffered.issuedThrough, typeOf: itemOffered.typeOf }, (itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined), (itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined
-    // ...(itemOffered.dateIssued !== undefined) ? { dateIssued: itemOffered.dateIssued } : undefined
-    );
+    // 最適化(2023-02-01~)
+    const issuedThrough = (typeof ((_a = itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+        ? Object.assign({ id: itemOffered.issuedThrough.id, typeOf: itemOffered.issuedThrough.typeOf }, (typeof ((_b = itemOffered.issuedThrough.serviceType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
+            ? { serviceType: itemOffered.issuedThrough.serviceType }
+            : undefined) : undefined;
+    const typeOfGood = Object.assign(Object.assign(Object.assign({ 
+        // project: itemOffered.project, // 最適化(2023-02-01~)
+        identifier: itemOffered.identifier, typeOf: itemOffered.typeOf }, (typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.typeOf) === 'string') ? { issuedThrough } : undefined), (itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined), (itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined);
     ownershipInfo = {
         project: params.project,
         typeOf: 'OwnershipInfo',

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

@@ -3,6 +3,7 @@ import { MongoRepository as CategoryCodeRepo } from '../repo/categoryCode';
 import { MongoRepository as EventRepo } from '../repo/event';
 import { MongoRepository as PlaceRepo } from '../repo/place';
 import { MongoRepository as ProjectRepo } from '../repo/project';
+import { MongoRepository as SellerRepo } from '../repo/seller';
 import { MongoRepository as TaskRepo } from '../repo/task';
 import * as factory from '../factory';
 /**
@@ -32,6 +33,7 @@ export declare function importFromCOA(params: {
     categoryCode: CategoryCodeRepo;
     event: EventRepo;
     place: PlaceRepo;
+    seller: SellerRepo;
 }) => Promise<void>;
 /**
  * COA情報からイベントIDを作成する
@@ -49,10 +51,6 @@ export declare function updateEvent4ttts(params: {
      * 旧イベントID
      */
     oldEventId: string;
-    /**
-     * 旧IDを使用しない場合、IDは自動発行される
-     */
-    useOldEventId: boolean;
     /**
      * イベント属性
      */