@chevre/domain 21.2.0-alpha.13 → 21.2.0-alpha.130

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

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

@@ -10,10 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createDeleteTasks = exports.createInformTasks = exports.getOrderWithToken = void 0;
+exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const jwt = require("jsonwebtoken");
-const moment = require("moment");
 const util_1 = require("util");
 const credentials_1 = require("../../../credentials");
 const factory = require("../../../factory");
@@ -26,32 +25,10 @@ function getOrderWithToken(params) {
         if (typeof credentials_1.credentials.hub.clientId !== 'string') {
             return params.order;
         }
-        // 冗長な個人情報をマスク(最低限の情報に)
-        // const customer4orderToken: factory.order.ISimpleCustomer =
-        //     (params.order.customer.typeOf === factory.organizationType.Organization)
-        //         ? {
-        //             id: params.order.customer.id,
-        //             name: '****',
-        //             // project: params.order.customer.project,
-        //             typeOf: params.order.customer.typeOf
-        //         }
-        //         : {
-        //             id: params.order.customer.id,
-        //             typeOf: params.order.customer.typeOf
-        //         };
-        // const seller4orderToken: Omit<factory.order.ISeller, 'name'> = {
-        //     id: params.order.seller.id,
-        //     typeOf: params.order.seller.typeOf
-        // };
         // 最適化(2023-01-31~)
         const order4token = {
             typeOf: params.order.typeOf,
-            // seller: seller4orderToken,
-            // customer: customer4orderToken,
             orderNumber: params.order.orderNumber
-            // price: params.order.price,
-            // priceCurrency: params.order.priceCurrency,
-            // orderDate: params.order.orderDate
         };
         const token = yield new Promise((resolve, reject) => {
             // 所有権を暗号化する
@@ -86,10 +63,13 @@ function createInformTasks(order) {
     let informTasks = [];
     if (Array.isArray(informOrder) && informOrder.length > 0) {
         const order4inform = creteOrder4inform(order);
-        let recipientId = order.customer.id;
-        if (order.orderStatus === factory.orderStatus.OrderReturned) {
-            if (typeof ((_a = order.returner) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                recipientId = order.returner.id;
+        let recipientId = '';
+        if (typeof order.orderStatus === 'string') {
+            recipientId = order.customer.id;
+            if (order.orderStatus === factory.orderStatus.OrderReturned) {
+                if (typeof ((_a = order.returner) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+                    recipientId = order.returner.id;
+                }
             }
         }
         informTasks = informOrder.map((informOrderParams) => {
@@ -98,7 +78,6 @@ function createInformTasks(order) {
                 agent: order.project,
                 object: order4inform,
                 project: order.project,
-                // purpose: params.transaction,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
@@ -123,62 +102,43 @@ function createInformTasks(order) {
 }
 exports.createInformTasks = createInformTasks;
 function creteOrder4inform(order) {
-    if (order.orderStatus === factory.orderStatus.OrderReturned) {
-        // 返品注文通知内容を最適化(2022-12-28~)
-        return Object.assign(Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: order.orderStatus }, (order.dateReturned !== undefined) ? { dateReturned: order.dateReturned } : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
-    }
-    else if (order.orderStatus === factory.orderStatus.OrderDelivered) {
-        // 配送済注文通知内容を最適化(2022-12-29~)
-        return Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: order.orderStatus }, (typeof order.id === 'string') ? { id: order.id } : undefined);
+    if (typeof order.orderStatus === 'string') {
+        if (order.orderStatus === factory.orderStatus.OrderReturned) {
+            // 返品注文通知内容を最適化(2022-12-28~)
+            return Object.assign(Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: order.orderStatus }, (order.dateReturned !== undefined) ? { dateReturned: order.dateReturned } : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
+        }
+        else if (order.orderStatus === factory.orderStatus.OrderDelivered) {
+            // 配送済注文通知内容を最適化(2022-12-29~)
+            return Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: order.orderStatus }, (typeof order.id === 'string') ? { id: order.id } : undefined);
+        }
+        else {
+            // 冗長な個人情報をmask
+            return Object.assign(Object.assign({ 
+                // whitelistで作成する(2022-07-19~)
+                project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: order.acceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
+                // mask
+                customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(order)), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
+                    // identifierは必要
+                    // 予約後を隠蔽(2022-12-24~)
+                    identifier: (Array.isArray(order.customer.identifier))
+                        ? order.customer.identifier.filter((p) => {
+                            return !reservedAgentIdentifireNames_1.RESERVED_AGENT_IDENTIFIER_NAMES.includes(p.name);
+                        })
+                        : [] }), 
+                // paymentMethodsに関してもmask(2022-05-30~)
+                paymentMethods: order.paymentMethods.map((p) => {
+                    return Object.assign(Object.assign({}, p), (typeof p.accountId === 'string' && p.accountId.length > 0)
+                        ? { accountId: ASTERISK_CHARACTER.repeat(p.accountId.length) }
+                        : undefined);
+                }) }, (typeof order.token === 'string')
+                ? { token: order.token }
+                : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
+        }
     }
     else {
-        // 冗長な個人情報をmask
-        return Object.assign(Object.assign({ 
-            // whitelistで作成する(2022-07-19~)
-            project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: order.acceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
-            // mask
-            customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(order)), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
-                // identifierは必要
-                // 予約後を隠蔽(2022-12-24~)
-                identifier: (Array.isArray(order.customer.identifier))
-                    ? order.customer.identifier.filter((p) => {
-                        return !reservedAgentIdentifireNames_1.RESERVED_AGENT_IDENTIFIER_NAMES.includes(p.name);
-                    })
-                    : [] }), 
-            // paymentMethodsに関してもmask(2022-05-30~)
-            paymentMethods: order.paymentMethods.map((p) => {
-                return Object.assign(Object.assign({}, p), (typeof p.accountId === 'string' && p.accountId.length > 0)
-                    ? { accountId: ASTERISK_CHARACTER.repeat(p.accountId.length) }
-                    : undefined);
-            }) }, (typeof order.token === 'string')
-            ? { token: order.token }
-            : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
+        return order;
     }
 }
-/**
- * 注文保管期間
- */
-const ORDER_STORAGE_PERIOD_IN_DAYS = (typeof process.env.ORDER_STORAGE_PERIOD_IN_DAYS === 'string')
-    ? Number(process.env.ORDER_STORAGE_PERIOD_IN_DAYS) :
-    // tslint:disable-next-line:no-magic-numbers
-    365;
-function createDeleteTasks(order) {
-    return [{
-            project: order.project,
-            name: factory.taskName.DeleteOrder,
-            status: factory.taskStatus.Ready,
-            runsAt: moment(order.orderDate)
-                .add(ORDER_STORAGE_PERIOD_IN_DAYS, 'days')
-                .toDate(),
-            remainingNumberOfTries: 10,
-            numberOfTried: 0,
-            executionResults: [],
-            data: {
-                object: order
-            }
-        }];
-}
-exports.createDeleteTasks = createDeleteTasks;
 function createConfirmReservationActionObject4ChevreByOrder(params) {
     const chevreReservationNumbers = (Array.isArray(params.order.acceptedOffers))
         ? params.order.acceptedOffers.filter((o) => {

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

@@ -72,8 +72,6 @@ function onOrderStatusChanged(params) {
                 tasks = [
                     // 注文作成時のみトークン付加
                     ...(0, factory_1.createInformTasks)(orderWithToken),
-                    // リソース削除タスク
-                    ...(0, factory_1.createDeleteTasks)(params.order),
                     ...yield createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
                     ...yield createConfirmReserveTransactionTasks(params.order, simpleOrder)(repos),
                     ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos)
@@ -89,7 +87,7 @@ function onOrderStatusChanged(params) {
                 break;
             default:
         }
-        yield repos.task.saveMany(tasks);
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
     });
 }
 exports.onOrderStatusChanged = onOrderStatusChanged;

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

@@ -0,0 +1,16 @@
+/**
+ * 注文変更時処理
+ */
+import { MongoRepository as TaskRepo } from '../../repo/task';
+import * as factory from '../../factory';
+export declare function onOrderUpdated(params: {
+    additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
+    name?: string;
+    orderNumber: string;
+    project: {
+        id: string;
+    };
+    updatedAt: Date;
+}): (repos: {
+    task: TaskRepo;
+}) => Promise<void>;

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

@@ -0,0 +1,22 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onOrderUpdated = void 0;
+const factory = require("../../factory");
+const factory_1 = require("./onOrderStatusChanged/factory");
+function onOrderUpdated(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let tasks = [];
+        tasks = (0, factory_1.createInformTasks)(Object.assign(Object.assign({ typeOf: factory.order.OrderType.Order, orderNumber: params.orderNumber, project: { id: params.project.id, typeOf: factory.organizationType.Project }, updatedAt: params.updatedAt }, (typeof params.name === 'string') ? { name: params.name } : undefined), (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined));
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
+    });
+}
+exports.onOrderUpdated = onOrderUpdated;

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

@@ -36,6 +36,7 @@ declare function placeOrder(params: {
         orderNumber: string;
     };
     potentialActions?: factory.action.trade.order.IPotentialActions;
+    useOnOrderStatusChanged: boolean;
 }): (repos: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;