@chevre/domain 21.2.0-alpha.1 → 21.2.0-alpha.100

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

@@ -2,7 +2,6 @@ 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 { RedisRepository as ScreeningEventAvailabilityRepo } from '../../../repo/itemAvailability/screeningEvent';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
 import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
@@ -11,6 +10,7 @@ import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../../repo/project';
 import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import { MongoRepository as ReservationRepo } from '../../../repo/reservation';
+import { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
 import { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 import { RedisRepository as TransactionNumberRepo } from '../../../repo/transactionNumber';
@@ -19,7 +19,7 @@ interface IAuthorizeRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
     offerRateLimit: OfferRateLimitRepo;
@@ -57,5 +57,8 @@ declare function authorize(params: {
          */
         id: string;
     };
+    disablePendingReservations: boolean;
+    useHoldStockByTransactionNumber: boolean;
+    stockHoldUntilDaysAfterEventEnd: number;
 }): IAuthorizeOperation<IAuthorizeOfferAction>;
 export { authorize };

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

@@ -66,7 +66,10 @@ function authorize(params) {
                         ticketOffers,
                         unitPriceOffers,
                         validateEvent: params.validateEvent === true,
-                        validateEventOfferPeriod: params.validateEventOfferPeriod === true
+                        validateEventOfferPeriod: params.validateEventOfferPeriod === true,
+                        disablePendingReservations: params.disablePendingReservations,
+                        useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber,
+                        stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
                     })(repos);
                     // requestBody = processStartReserveResult.requestBody;
                     // responseBody = processStartReserveResult.responseBody;
@@ -162,9 +165,12 @@ function processStartReserve4chevre(params) {
         // requestBody = startParams;
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos);
         // 予約取引開始
-        responseBody = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true }))(repos);
+        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, disablePendingReservations: params.disablePendingReservations, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);
+        responseBody = startReserveTransactionResult.transaction;
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
+            issuedThrough: startReserveTransactionResult.issuedThrough,
+            objectSubReservations: startReserveTransactionResult.objectSubReservations,
             responseBody: responseBody,
             event: event,
             project: transaction.project,

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

@@ -1,15 +1,15 @@
 import * as factory from '../../../factory';
 import { MongoRepository as ActionRepo } from '../../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
-import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../../repo/itemAvailability/screeningEvent';
 import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import { MongoRepository as ReservationRepo } from '../../../repo/reservation';
+import { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
 import { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 interface ICancelRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;

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

@@ -23,8 +23,11 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
 export declare function acceptedOffers2amount(params: {
     acceptedOffers: IResultAcceptedOffer[];
 }): number;
+type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;
 export declare function responseBody2acceptedOffers4result(params: {
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
+    objectSubReservations: IObjectSubReservation[];
     responseBody: factory.assetTransaction.reserve.ITransaction;
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     project: {

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

@@ -154,10 +154,15 @@ exports.acceptedOffers2amount = acceptedOffers2amount;
 function responseBody2acceptedOffers4result(params) {
     let acceptedOffers4result = [];
     // 予約取引からacceptedOffers4resultを生成する
-    if (Array.isArray(params.responseBody.object.subReservation)) {
-        acceptedOffers4result = params.responseBody.object.subReservation.map((itemOffered) => {
+    if (Array.isArray(params.objectSubReservations)) {
+        acceptedOffers4result = params.objectSubReservations.map((itemOffered) => {
             var _a;
-            const reservation = createReservation({ project: params.project, itemOffered, event: params.event });
+            const reservation = createReservation({
+                project: params.project,
+                itemOffered,
+                event: params.event,
+                issuedThrough: params.issuedThrough
+            });
             // appliesToMovieTicketがArrayでないケースは廃止(2022-09-12~)
             const priceSpecification = itemOffered.price;
             const priceComponent = priceSpecification.priceComponent.map((c) => {
@@ -244,7 +249,10 @@ function createReservation(params) {
             // 最適化(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)
         };
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        if (params.issuedThrough.typeOf !== factory.product.ProductType.EventService) {
+            throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.EventService}`);
+        }
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
@@ -269,7 +277,10 @@ function createReservation(params) {
             busNumber: tripByEvent.busNumber,
             identifier: tripByEvent.identifier
         };
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        if (params.issuedThrough.typeOf !== factory.product.ProductType.Transportation) {
+            throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.Transportation}`);
+        }
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_d = itemOffered.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);

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

@@ -1,18 +1,20 @@
 import * as factory from '../../../factory';
 import { MongoRepository as ActionRepo } from '../../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
-import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../../repo/itemAvailability/screeningEvent';
 import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import { MongoRepository as ReservationRepo } from '../../../repo/reservation';
+import { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
+import { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
+    transaction: TransactionRepo;
 }
 /**
  * イベントオファー承認取消(タスクから実行)

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

@@ -26,8 +26,13 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const transaction = yield repos.transaction.findById({
+            typeOf: params.purpose.typeOf,
+            id: params.purpose.id,
+            inclusion: ['_id', 'typeOf', 'status']
+        });
         // 座席仮予約アクション検索
-        const authorizeActions = yield repos.action.searchByPurpose({
+        let authorizeActions = yield repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -36,6 +41,17 @@ function voidTransaction(params) {
         })
             .then((actions) => actions
             .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation));
+        switch (transaction.status) {
+            case factory.transactionStatusType.InProgress:
+                throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
+            // 確定取引に対応(2023-05-07~)
+            case factory.transactionStatusType.Confirmed:
+                // アクションステータスを検証する
+                authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                break;
+            default:
+            // no op
+        }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
             switch (action.instrument.identifier) {

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

@@ -1,8 +1,8 @@
 import { MongoRepository as EventRepo } from '../repo/event';
-import { RedisRepository as EventAvailabilityRepo } from '../repo/itemAvailability/screeningEvent';
 import { MongoRepository as PlaceRepo } from '../repo/place';
 import { MongoRepository as PriceSpecificationRepo } from '../repo/priceSpecification';
 import { MongoRepository as ProjectRepo } from '../repo/project';
+import { StockHolderRepository as StockHolderRepo } from '../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../repo/task';
 import * as factory from '../factory';
 import * as EventOfferService from './offer/event';
@@ -11,35 +11,22 @@ import * as MoneyTransferOfferService from './offer/moneyTransfer';
 import * as ProductOfferService from './offer/product';
 export { EventOfferService as event, EventServiceByCOAOfferService as eventServiceByCOA, MoneyTransferOfferService as moneyTransfer, ProductOfferService as product };
 /**
- * イベントに対する座席オファーを座席コードとセクションコード指定で検索する
+ * 座席にオファー情報を付加する
  */
-export declare function searchEventSeatOffers(params: {
-    branchCode?: {
-        $in?: string[];
-    };
-    containedInPlace?: {
-        branchCode?: {
-            $in?: string[];
-        };
-    };
-    event: {
-        id: string;
-    };
-    $projection?: {
-        [key: string]: number;
-    };
-}): (repos: {
-    event: EventRepo;
-    priceSpecification: PriceSpecificationRepo;
-    eventAvailability: EventAvailabilityRepo;
-    place: PlaceRepo;
-}) => Promise<factory.place.seat.IPlaceWithOffer[]>;
+export declare function addOffers2Seat(params: {
+    seat: factory.place.seat.IPlace;
+    availability: factory.itemAvailability;
+    /**
+     * 座席区分加算料金
+     */
+    priceSpecs: factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.CategoryCodeChargeSpecification>[];
+}): factory.place.seat.IPlaceWithOffer;
 /**
  * イベントに対する座席オファーを検索する
  */
 export declare function searchEventSeatOffersWithPaging(params: {
-    limit?: number;
-    page?: number;
+    limit: number;
+    page: number;
     branchCode?: {
         $eq?: string;
     };
@@ -57,7 +44,7 @@ export declare function searchEventSeatOffersWithPaging(params: {
 }): (repos: {
     event: EventRepo;
     priceSpecification: PriceSpecificationRepo;
-    eventAvailability: EventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     place: PlaceRepo;
 }) => Promise<factory.place.seat.IPlaceWithOffer[]>;
 interface IChangedEvent {

package/lib/chevre/service/offer.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAggregateScreeningEventIfNotExist = exports.onEventChanged = exports.searchEventSeatOffersWithPaging = exports.searchEventSeatOffers = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
+exports.createAggregateScreeningEventIfNotExist = exports.onEventChanged = exports.searchEventSeatOffersWithPaging = exports.addOffers2Seat = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
 const moment = require("moment");
 const factory = require("../factory");
 const EventOfferService = require("./offer/event");
@@ -24,121 +24,33 @@ exports.product = ProductOfferService;
  * 座席にオファー情報を付加する
  */
 function addOffers2Seat(params) {
-    const seatNumber = params.seat.branchCode;
-    const unavailableOffer = params.unavailableOffers.find((o) => o.seatSection === params.seatSection && o.seatNumber === seatNumber);
-    const priceComponent = [];
     // 座席タイプが指定されていれば、適用される価格仕様を構成要素に追加
     const seatingTypes = (Array.isArray(params.seat.seatingType))
         ? params.seat.seatingType
-        : (typeof params.seat.seatingType === 'string' && params.seat.seatingType.length > 0) ? [params.seat.seatingType]
-            : [];
-    priceComponent.push(...params.priceSpecs.filter((s) => {
+        : (typeof params.seat.seatingType === 'string' && params.seat.seatingType.length > 0) ? [params.seat.seatingType] : [];
+    const priceComponent = params.priceSpecs.filter((s) => {
         // 適用カテゴリーコードに座席タイプが含まれる価格仕様を検索
         return (Array.isArray(s.appliesToCategoryCode))
             && s.appliesToCategoryCode.some((categoryCode) => {
-                return seatingTypes.includes(categoryCode.codeValue)
-                    // tslint:disable-next-line:max-line-length
-                    && categoryCode.inCodeSet.identifier === factory.categoryCode.CategorySetIdentifier.SeatingType;
+                return seatingTypes.includes(categoryCode.codeValue);
+                // && categoryCode.inCodeSet.identifier === factory.categoryCode.CategorySetIdentifier.SeatingType;
             });
-    }));
-    // 最適化(2022-11-15~)
+    });
     const priceSpecification = {
         typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
-        // priceCurrency: factory.priceCurrency.JPY,
-        // valueAddedTaxIncluded: true,
-        priceComponent: priceComponent
+        priceComponent
     };
-    let availability = (unavailableOffer !== undefined)
-        ? factory.itemAvailability.OutOfStock
-        : factory.itemAvailability.InStock;
-    if (params.availability !== undefined) {
+    let availability = factory.itemAvailability.InStock;
+    if (typeof params.availability === 'string') {
         availability = params.availability;
     }
     return Object.assign(Object.assign({}, params.seat), { offers: [{
-                // 最適化(2022-11-15~)
-                // project: params.project,
                 typeOf: factory.offerType.Offer,
-                // priceCurrency: factory.priceCurrency.JPY,
-                availability: availability,
-                priceSpecification: priceSpecification
+                availability,
+                priceSpecification
             }] });
 }
-/**
- * イベントに対する座席オファーを座席コードとセクションコード指定で検索する
- */
-function searchEventSeatOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        let offers = [];
-        // イベント取得属性最適化(2023-01-23~)
-        // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>({
-        //     id: params.event.id
-        // });
-        const event = yield repos.event.findMinimizedIndividualEventById({
-            id: params.event.id
-        });
-        // 座席指定利用可能かどうか
-        const eventOffers = event.offers;
-        const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
-        if (reservedSeatsAvailable) {
-            // 座席タイプ価格仕様を検索
-            const priceSpecs = yield repos.priceSpecification.search({
-                project: { id: { $eq: event.project.id } },
-                typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                appliesToCategoryCode: {
-                    inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
-                }
-            });
-            // const roomBranchCode = event.location.branchCode;
-            // const movieTheaterBranchCode = event.superEvent.location.branchCode;
-            const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
-            const seats = yield repos.place.searchSeats({
-                project: { id: { $eq: event.project.id } },
-                branchCode: { $in: (_g = params.branchCode) === null || _g === void 0 ? void 0 : _g.$in },
-                containedInPlace: {
-                    branchCode: {
-                        $in: (_j = (_h = params.containedInPlace) === null || _h === void 0 ? void 0 : _h.branchCode) === null || _j === void 0 ? void 0 : _j.$in
-                    },
-                    containedInPlace: {
-                        branchCode: { $eq: roomBranchCode },
-                        containedInPlace: {
-                            branchCode: { $eq: movieTheaterBranchCode }
-                        }
-                    }
-                },
-                $projection: params.$projection
-            });
-            if (seats.length > 0) {
-                const availabilities = yield repos.eventAvailability.searchAvailability({
-                    eventId: params.event.id,
-                    startDate: moment(event.startDate)
-                        .toDate(),
-                    offers: seats.map((s) => {
-                        var _a;
-                        return {
-                            seatNumber: s.branchCode,
-                            seatSection: (_a = s.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode
-                        };
-                    })
-                });
-                offers = seats.map((seat, index) => {
-                    var _a;
-                    return addOffers2Seat({
-                        project: event.project,
-                        seat: seat,
-                        seatSection: (_a = seat.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode,
-                        unavailableOffers: [],
-                        availability: availabilities[index].availability,
-                        priceSpecs: priceSpecs
-                    });
-                });
-            }
-        }
-        return offers;
-    });
-}
-exports.searchEventSeatOffers = searchEventSeatOffers;
+exports.addOffers2Seat = addOffers2Seat;
 /**
  * イベントに対する座席オファーを検索する
  */
@@ -147,12 +59,7 @@ function searchEventSeatOffersWithPaging(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let offers = [];
         // イベント取得属性最適化(2023-01-23~)
-        // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>({
-        //     id: params.event.id
-        // });
-        const event = yield repos.event.findMinimizedIndividualEventById({
-            id: params.event.id
-        });
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
         // 座席指定利用可能かどうか
         const eventOffers = event.offers;
         const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
@@ -165,8 +72,6 @@ function searchEventSeatOffersWithPaging(params) {
                     inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
                 }
             });
-            // const roomBranchCode = event.location.branchCode;
-            // const movieTheaterBranchCode = event.superEvent.location.branchCode;
             const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
             const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
             const seats = yield repos.place.searchSeats(Object.assign(Object.assign({}, params), { project: { id: { $eq: event.project.id } }, containedInPlace: {
@@ -183,7 +88,7 @@ function searchEventSeatOffersWithPaging(params) {
                     }
                 } }));
             if (seats.length > 0) {
-                const availabilities = yield repos.eventAvailability.searchAvailability({
+                const availabilities = yield repos.stockHolder.searchHolders({
                     eventId: params.event.id,
                     startDate: moment(event.startDate)
                         .toDate(),
@@ -196,14 +101,14 @@ function searchEventSeatOffersWithPaging(params) {
                     })
                 });
                 offers = seats.map((seat, index) => {
-                    var _a;
                     return addOffers2Seat({
-                        project: event.project,
-                        seat: seat,
-                        seatSection: (_a = seat.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode,
-                        unavailableOffers: [],
-                        availability: availabilities[index].availability,
-                        priceSpecs: priceSpecs
+                        seat,
+                        // unavailableOffers: [],
+                        // availability: availabilities[index].availability,
+                        availability: (typeof availabilities[index] === 'string')
+                            ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                            : factory.itemAvailability.InStock,
+                        priceSpecs
                     });
                 });
             }
@@ -281,7 +186,7 @@ function createAggregateScreeningEventIfNotExist(params) {
             }
         }
         if (aggregateTasks.length > 0) {
-            yield repos.task.saveMany(aggregateTasks);
+            yield repos.task.saveMany(aggregateTasks, { emitImmediately: true });
         }
     });
 }

package/lib/chevre/service/order/deleteOrder.d.ts

@@ -7,7 +7,9 @@ import * as factory from '../../factory';
  * 注文に関わるリソースを削除する
  * 冪等性を確保すること
  */
-declare function deleteOrder(params: factory.task.IData<factory.taskName.DeleteOrder>): (repos: {
+declare function deleteOrder(params: {
+    object: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'confirmationNumber' | 'orderDate' | 'orderNumber'>;
+}): (repos: {
     accountingReport: AccountingReportRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;

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

@@ -18,7 +18,14 @@ const factory = require("../../factory");
  */
 function deleteOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const order = params.object;
+        const orders = yield repos.order.search({
+            orderNumbers: [params.object.orderNumber]
+        });
+        const order = orders.shift();
+        if (order === undefined) {
+            // すでに削除済
+            return;
+        }
         // 注文アイテムの予約を削除
         yield deleteReservationsByOrder(order)(repos);
         // 所有権削除
@@ -63,13 +70,6 @@ function deleteOwnershipInfosByOrder(order) {
                 // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
                 ownedThrough: { $lt: now }
             });
-            // await repos.ownershipInfo.ownershipInfoModel.deleteMany({
-            //     'project.id': { $eq: order.project.id },
-            //     identifier: { $in: ownershipIdentifiers },
-            //     // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
-            //     ownedThrough: { $exists: true, $lt: now }
-            // })
-            //     .exec();
         }
     });
 }

package/lib/chevre/service/order/onOrderStatusChanged/factory.d.ts

@@ -6,8 +6,11 @@ export declare function getOrderWithToken(params: {
     order: factory.order.IOrder;
     expiresIn: number;
 }): Promise<factory.order.IOrder | IOrderWithToken>;
-export declare function createInformTasks(order: factory.order.IOrder | IOrderWithToken): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
-export declare function createDeleteTasks(order: factory.order.IOrder): factory.task.IAttributes<factory.taskName.DeleteOrder>[];
+export type IUpdatedOrder4inform = Pick<factory.order.IOrder, 'typeOf' | 'orderNumber' | 'name' | 'additionalProperty' | 'project'> & {
+    orderStatus?: undefined;
+    updatedAt: Date;
+};
+export declare function createInformTasks(order: factory.order.IOrder | IOrderWithToken | IUpdatedOrder4inform): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 export declare function createConfirmReservationActionObject4ChevreByOrder(params: {
     order: factory.order.IOrder;
 }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>[];