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

package/lib/chevre/service/notification.js

@@ -111,15 +111,11 @@ exports.sendEmailMessage = sendEmailMessage;
  * https://notify-bot.line.me/doc/ja/
  */
 function report2developers(subject, content, imageThumbnail, imageFullsize) {
-    return () => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         const LINE_NOTIFY_URL = credentials_1.credentials.lineNotify.url;
-        const LINE_NOTIFY_ACCESS_TOKEN = credentials_1.credentials.lineNotify.accessToken;
         if (LINE_NOTIFY_URL === undefined) {
             throw new Error('Environment variable LINE_NOTIFY_URL not set');
         }
-        if (LINE_NOTIFY_ACCESS_TOKEN === undefined) {
-            throw new Error('Environment variable LINE_NOTIFY_ACCESS_TOKEN not set');
-        }
         const message = `--------
 ${subject}
 --------
@@ -130,7 +126,7 @@ ${content}`;
             var _a;
             request.post({
                 url: LINE_NOTIFY_URL,
-                auth: { bearer: LINE_NOTIFY_ACCESS_TOKEN },
+                auth: { bearer: repos.accessToken },
                 form: formData,
                 json: true,
                 timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout
@@ -154,6 +150,45 @@ ${content}`;
 exports.report2developers = report2developers;
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
 function triggerWebhook(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // retryableにする(2023-05-12~)
+        let retry = true;
+        let numberOfTry = 0;
+        while (numberOfTry >= 0) {
+            try {
+                numberOfTry += 1;
+                if (numberOfTry > settings_1.TRIGGER_WEBHOOK_MAX_RETRY_COUNT) {
+                    retry = false;
+                }
+                // retryInterval
+                if (numberOfTry > 1) {
+                    yield sleep(settings_1.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS * (numberOfTry - 1));
+                }
+                yield processInformAction(params)(repos);
+                break;
+            }
+            catch (error) {
+                if (retry) {
+                    continue;
+                }
+                else {
+                    throw error;
+                }
+            }
+        }
+    });
+}
+exports.triggerWebhook = triggerWebhook;
+function sleep(waitTime) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve) => {
+            setTimeout(() => {
+                resolve();
+            }, waitTime);
+        });
+    });
+}
+function processInformAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // アクション開始
@@ -219,4 +254,3 @@ function triggerWebhook(params) {
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
-exports.triggerWebhook = triggerWebhook;

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

@@ -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/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/importFromCOA.js

@@ -20,7 +20,7 @@ function importFromCOA(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.CurrencyType } }
-        });
+        }, [], []);
         const defaultCurrencyType = currencyTypes.shift();
         // メンバーシップ区分検索
         const membershipTypes = yield repos.categoryCode.search({
@@ -28,7 +28,7 @@ function importFromCOA(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.MembershipType } }
-        });
+        }, [], []);
         const defaultMembershipType = membershipTypes.shift();
         try {
             const ticketResults = yield repos.masterService.ticket({ theaterCode: params.theaterCode });

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

@@ -5,6 +5,7 @@ import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/o
 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;
@@ -13,6 +14,7 @@ interface IVoidTransactionRepos {
     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/eventServiceByCOA.js

@@ -29,21 +29,19 @@ function authorize(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // イベント取得属性最適化(2023-01-23~)
-        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
-            id: params.object.event.id
-        });
+        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: params.object.event.id });
         const availablePaymentMethodTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
-        });
+        }, [], []);
         const seatingTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
-        });
+        }, [], []);
         const videoFormatTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
-        });
+        }, [], []);
         // COA仮予約後にリクエストが来る前提
         const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
             object: params.object,
@@ -183,15 +181,15 @@ function changeOffers(params) {
         const availablePaymentMethodTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
-        });
+        }, [], []);
         const seatingTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
-        });
+        }, [], []);
         const videoFormatTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
-        });
+        }, [], []);
         // COA仮予約後にリクエストが来る前提
         const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
             object: params.object,

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

@@ -32,7 +32,7 @@ function search(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             id: { $eq: params.itemOffered.id }
-        });
+        }, [], []);
         const product = searchProductsResult.shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
@@ -206,7 +206,7 @@ function fixProductAndOffers(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             id: { $eq: productId }
-        });
+        }, [], []);
         const product = searchProductsResult.shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');

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

@@ -47,19 +47,17 @@ export declare function searchEventSeatOffersWithPaging(params: {
     stockHolder: StockHolderRepo;
     place: PlaceRepo;
 }) => Promise<factory.place.seat.IPlaceWithOffer[]>;
-interface IChangedEvent {
-    id: string;
-    typeOf: factory.eventType;
-    project: {
-        id: string;
-    };
-}
 /**
  * イベント変更時処理
  */
 export declare function onEventChanged(params: {
-    event: IChangedEvent | IChangedEvent[];
+    id: string[];
+    typeOf: factory.eventType;
+    project: {
+        id: string;
+    };
     isNew: boolean;
+    useInform?: boolean;
 }): (repos: {
     event: EventRepo;
     project: ProjectRepo;
@@ -76,3 +74,13 @@ export declare function createAggregateScreeningEventIfNotExist(params: {
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
+export declare function createInformTasks(params: {
+    project: {
+        id: string;
+    };
+    ids: string[];
+    typeOf: factory.eventType;
+}): (repos: {
+    event: EventRepo;
+    task: TaskRepo;
+}) => Promise<void>;

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.addOffers2Seat = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
+exports.createInformTasks = 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");
@@ -20,6 +20,8 @@ const MoneyTransferOfferService = require("./offer/moneyTransfer");
 exports.moneyTransfer = MoneyTransferOfferService;
 const ProductOfferService = require("./offer/product");
 exports.product = ProductOfferService;
+const settings_1 = require("../settings");
+const informEvents = settings_1.settings.onEventChanged.informEvent;
 /**
  * 座席にオファー情報を付加する
  */
@@ -89,9 +91,11 @@ function searchEventSeatOffersWithPaging(params) {
                 } }));
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({
+                    project: { id: event.project.id },
                     eventId: params.event.id,
                     startDate: moment(event.startDate)
                         .toDate(),
+                    hasTicketedSeat: true,
                     offers: seats.map((s) => {
                         var _a;
                         return {
@@ -117,24 +121,33 @@ function searchEventSeatOffersWithPaging(params) {
     });
 }
 exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
+// type IChangedEvent = factory.task.onEventChanged.IChangedEvent;
 /**
  * イベント変更時処理
  */
 function onEventChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const changedEvents = (Array.isArray(params.event)) ? params.event : [params.event];
-        if (changedEvents.length > 0) {
+        // const changedEvents = (Array.isArray(params.event)) ? params.event : [params.event];
+        if (params.id.length > 0) {
             // ScreeningEventであれば集計タスク
-            if (changedEvents[0].typeOf === factory.eventType.ScreeningEvent) {
+            if (params.typeOf === factory.eventType.ScreeningEvent) {
                 yield createAggregateScreeningEventIfNotExist({
-                    project: { id: changedEvents[0].project.id },
-                    reservationFor: changedEvents.map((changedEvent) => {
-                        return { id: changedEvent.id };
+                    project: { id: params.project.id },
+                    reservationFor: params.id.map((id) => {
+                        return { id };
                     }),
                     // 新規作成の場合は強制的に集計
                     force: params.isNew
                 })(repos);
             }
+            // 通知タスク作成(2023-06-08~)
+            if (params.useInform === true) {
+                yield createInformTasks({
+                    project: { id: params.project.id },
+                    ids: params.id,
+                    typeOf: params.typeOf
+                })(repos);
+            }
         }
     });
 }
@@ -186,8 +199,58 @@ function createAggregateScreeningEventIfNotExist(params) {
             }
         }
         if (aggregateTasks.length > 0) {
-            yield repos.task.saveMany(aggregateTasks);
+            yield repos.task.saveMany(aggregateTasks, { emitImmediately: true });
         }
     });
 }
 exports.createAggregateScreeningEventIfNotExist = createAggregateScreeningEventIfNotExist;
+function createInformTasks(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const events4inform = yield repos.event.search({
+            id: { $in: params.ids },
+            typeOf: params.typeOf
+        }, {
+            aggregateEntranceGate: 0, aggregateOffer: 0, aggregateReservation: 0,
+            remainingAttendeeCapacity: 0, checkInCount: 0, attendeeCount: 0
+        });
+        if (events4inform.length > 0) {
+            const taskRunsAt = new Date();
+            const informTasks = [];
+            informEvents === null || informEvents === void 0 ? void 0 : informEvents.forEach((informEvent) => {
+                var _a;
+                const informUrl = String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.url);
+                events4inform.forEach((event4inform) => {
+                    var _a;
+                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                    delete event4inform._id;
+                    const informActionAttributes = {
+                        agent: event4inform.project,
+                        object: event4inform,
+                        project: event4inform.project,
+                        recipient: {
+                            id: '',
+                            name: String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.name),
+                            typeOf: factory.creativeWorkType.WebApplication,
+                            url: informUrl
+                        },
+                        typeOf: factory.actionType.InformAction
+                    };
+                    informTasks.push({
+                        project: event4inform.project,
+                        name: factory.taskName.TriggerWebhook,
+                        status: factory.taskStatus.Ready,
+                        runsAt: taskRunsAt,
+                        remainingNumberOfTries: 10,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: informActionAttributes
+                    });
+                });
+            });
+            if (informTasks.length > 0) {
+                yield repos.task.saveMany(informTasks, { emitImmediately: true });
+            }
+        }
+    });
+}
+exports.createInformTasks = createInformTasks;

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>[];