@chevre/domain 20.2.0-alpha.3 → 20.2.0-alpha.30

package/lib/chevre/service/offer.js

@@ -67,34 +67,42 @@ function addOffers2Seat(params) {
  */
 function searchEventSeatOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         let offers = [];
-        const screeningEvent = yield repos.event.findById({
+        // イベント取得属性最適化(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 = screeningEvent.offers;
+        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: screeningEvent.project.id } },
+                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: screeningEvent.project.id } },
-                branchCode: { $in: (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$in },
+                project: { id: { $eq: event.project.id } },
+                branchCode: { $in: (_g = params.branchCode) === null || _g === void 0 ? void 0 : _g.$in },
                 containedInPlace: {
                     branchCode: {
-                        $in: (_e = (_d = params.containedInPlace) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$in
+                        $in: (_j = (_h = params.containedInPlace) === null || _h === void 0 ? void 0 : _h.branchCode) === null || _j === void 0 ? void 0 : _j.$in
                     },
                     containedInPlace: {
-                        branchCode: { $eq: screeningEvent.location.branchCode },
+                        branchCode: { $eq: roomBranchCode },
                         containedInPlace: {
-                            branchCode: { $eq: screeningEvent.superEvent.location.branchCode }
+                            branchCode: { $eq: movieTheaterBranchCode }
                         }
                     }
                 },
@@ -114,7 +122,7 @@ function searchEventSeatOffers(params) {
                 offers = seats.map((seat, index) => {
                     var _a;
                     return addOffers2Seat({
-                        project: screeningEvent.project,
+                        project: event.project,
                         seat: seat,
                         seatSection: (_a = seat.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode,
                         unavailableOffers: [],
@@ -133,33 +141,41 @@ exports.searchEventSeatOffers = searchEventSeatOffers;
  */
 function searchEventSeatOffersWithPaging(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let offers = [];
-        const screeningEvent = yield repos.event.findById({
+        // イベント取得属性最適化(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 = screeningEvent.offers;
+        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: screeningEvent.project.id } },
+                project: { id: { $eq: event.project.id } },
                 typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
                 appliesToCategoryCode: {
                     inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
                 }
             });
-            const seats = yield repos.place.searchSeats(Object.assign(Object.assign({}, params), { project: { id: { $eq: screeningEvent.project.id } }, containedInPlace: {
+            // 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: {
                     branchCode: {
-                        $eq: (typeof ((_d = (_c = params.containedInPlace) === null || _c === void 0 ? void 0 : _c.branchCode) === null || _d === void 0 ? void 0 : _d.$eq) === 'string')
-                            ? (_f = (_e = params.containedInPlace) === null || _e === void 0 ? void 0 : _e.branchCode) === null || _f === void 0 ? void 0 : _f.$eq
+                        $eq: (typeof ((_h = (_g = params.containedInPlace) === null || _g === void 0 ? void 0 : _g.branchCode) === null || _h === void 0 ? void 0 : _h.$eq) === 'string')
+                            ? (_k = (_j = params.containedInPlace) === null || _j === void 0 ? void 0 : _j.branchCode) === null || _k === void 0 ? void 0 : _k.$eq
                             : undefined
                     },
                     containedInPlace: {
-                        branchCode: { $eq: screeningEvent.location.branchCode },
+                        branchCode: { $eq: roomBranchCode },
                         containedInPlace: {
-                            branchCode: { $eq: screeningEvent.superEvent.location.branchCode }
+                            branchCode: { $eq: movieTheaterBranchCode }
                         }
                     }
                 } }));
@@ -177,7 +193,7 @@ function searchEventSeatOffersWithPaging(params) {
                 offers = seats.map((seat, index) => {
                     var _a;
                     return addOffers2Seat({
-                        project: screeningEvent.project,
+                        project: event.project,
                         seat: seat,
                         seatSection: (_a = seat.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode,
                         unavailableOffers: [],

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

@@ -184,7 +184,8 @@ function createConfirmReservationActionObject4ChevreByOrder(params) {
     const chevreReservationNumbers = (Array.isArray(params.order.acceptedOffers))
         ? params.order.acceptedOffers.filter((o) => {
             var _a;
-            return o.itemOffered.typeOf === factory.reservationType.EventReservation
+            return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+                || o.itemOffered.typeOf === factory.reservationType.BusReservation)
                 && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.Chevre;
         })
             .map((o) => {

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

@@ -271,7 +271,8 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
         // 注文アイテムから返却アクションを作成する
         const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
         for (const acceptedOffer of acceptedOffers) {
-            if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation) {
+            if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation
+                || acceptedOffer.itemOffered.typeOf === factory.reservationType.BusReservation) {
                 const reservation = acceptedOffer.itemOffered;
                 const reservationNumber = reservation.reservationNumber;
                 // 予約番号ごとに返却アクションを作成する

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

@@ -41,6 +41,22 @@ function createOrder(params) {
                         : undefined) });
                 return Object.assign(Object.assign({}, o), { itemOffered });
             }
+            else if (o.itemOffered.typeOf === factory.reservationType.BusReservation) {
+                let itemOffered = o.itemOffered;
+                const reservationFor = itemOffered.reservationFor;
+                itemOffered = Object.assign(Object.assign({}, itemOffered), { reservationFor: Object.assign(Object.assign(Object.assign({}, reservationFor), (reservationFor.arrivalTime !== undefined)
+                        ? {
+                            arrivalTime: moment(reservationFor.arrivalTime)
+                                .toDate()
+                        }
+                        : undefined), (reservationFor.departureTime !== undefined)
+                        ? {
+                            departureTime: moment(reservationFor.departureTime)
+                                .toDate()
+                        }
+                        : undefined) });
+                return Object.assign(Object.assign({}, o), { itemOffered });
+            }
             else {
                 return o;
             }

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

@@ -47,7 +47,12 @@ declare function invalidatePaymentUrl(params: factory.task.IData<factory.taskNam
  */
 declare function processVoidPayTransaction(params: factory.task.IData<factory.taskName.VoidPayTransaction>): (repos: {
     action: ActionRepo;
+    accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
+    product: ProductRepo;
+    project: ProjectRepo;
+    seller: SellerRepo;
+    task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
 interface IAuthorizeRepos {

package/lib/chevre/service/payment/movieTicket.d.ts

@@ -1,6 +1,6 @@
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import { MongoRepository as ActionRepo } from '../../repo/action';
-import { MongoRepository as EventRepo } from '../../repo/event';
+import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as ProductRepo } from '../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { MongoRepository as SellerRepo } from '../../repo/seller';
@@ -50,7 +50,7 @@ declare function checkMovieTicket(params: factory.action.check.paymentMethod.mov
 declare function checkByIdentifier(params: {
     movieTickets: IMovieTicket[];
     seller: factory.seller.ISeller;
-    screeningEvent: factory.event.IEvent<factory.eventType.ScreeningEvent>;
+    screeningEvent: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     paymentServiceId: string;
 }): (repos: {
     product: ProductRepo;

package/lib/chevre/service/payment/movieTicket.js

@@ -53,7 +53,11 @@ function checkMovieTicket(params) {
             }
             // イベント情報取得
             let screeningEvent;
-            screeningEvent = yield repos.event.findById({
+            // イベント取得属性最適化(2023-01-23~)
+            // screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({
+            //     id: eventIds[0]
+            // });
+            screeningEvent = yield repos.event.findMinimizedIndividualEventById({
                 id: eventIds[0]
             });
             // ショップ情報取得
@@ -432,7 +436,9 @@ function payActionParams2seatInfoSyncIn(params) {
         if (eventIds.length !== 1) {
             throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
         }
-        const event = yield repos.event.findById({ id: eventIds[0] });
+        // イベント取得属性最適化(2023-01-23~)
+        // const event = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: eventIds[0] });
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
         const seller = yield repos.seller.findById({ id: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) });
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);

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

@@ -37,17 +37,14 @@ function confirmReservation(actionAttributesList) {
                         });
                     }
                     else {
+                        // 廃止(2023-01-18)
+                        throw new factory.errors.Forbidden(`${reservation.typeOf} not acceptable`);
                         // 予約を確定状態に変更する
-                        // reservation = await repos.reservation.confirm<factory.reservationType.EventReservation>({
-                        yield repos.reservation.confirm({
-                            // 更新属性をwhitelist化(2022-06-13~)
-                            // ...actionAttributes.object,
-                            id: reservation.id,
-                            previousReservationStatus: reservation.reservationStatus,
-                            underName: reservation.underName
-                            // issuedThroughは予約取引開始時に確定しているので更新不要(2022-12-21~)
-                            // reservedTicket: reservation.reservedTicket
-                        });
+                        // await repos.reservation.confirm<factory.reservationType.EventReservation>({
+                        //     id: reservation.id,
+                        //     previousReservationStatus: reservation.reservationStatus,
+                        //     underName: reservation.underName
+                        // });
                         // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                         // delete (<any>reservation)._id;
                         // confirmedReservations.push(reservation);

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

@@ -37,7 +37,8 @@ function verifyToken4reservation(params) {
                 }
                 const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
                 const reservationExistsInOrder = acceptedOffers.some((offer) => {
-                    return offer.itemOffered.typeOf === factory.reservationType.EventReservation
+                    return (offer.itemOffered.typeOf === factory.reservationType.EventReservation
+                        || offer.itemOffered.typeOf === factory.reservationType.BusReservation)
                         && offer.itemOffered.id === params.reservationId;
                 });
                 if (!reservationExistsInOrder) {

package/lib/chevre/service/task/confirmPayTransaction.js

@@ -10,9 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
+const product_1 = require("../../repo/product");
+const project_1 = require("../../repo/project");
+const seller_1 = require("../../repo/seller");
+const task_1 = require("../../repo/task");
 const PayTransactionService = require("../assetTransaction/pay");
 /**
  * タスク実行関数
@@ -22,6 +28,12 @@ function call(data) {
         const actionRepo = new action_1.MongoRepository(settings.connection);
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const orderRepo = new order_1.MongoRepository(settings.connection);
+        const accountingReportRepo = new accountingReport_1.MongoRepository(settings.connection);
+        const eventRepo = new event_1.MongoRepository(settings.connection);
+        const productRepo = new product_1.MongoRepository(settings.connection);
+        const projectRepo = new project_1.MongoRepository(settings.connection);
+        const sellerRepo = new seller_1.MongoRepository(settings.connection);
+        const taskRepo = new task_1.MongoRepository(settings.connection);
         // アクション開始
         const action = yield actionRepo.start(data);
         try {
@@ -38,8 +50,15 @@ function call(data) {
                         }
                     }
                 })({
+                    action: actionRepo,
+                    accountingReport: accountingReportRepo,
                     assetTransaction: assetTransactionRepo,
-                    order: orderRepo
+                    event: eventRepo,
+                    order: orderRepo,
+                    product: productRepo,
+                    project: projectRepo,
+                    seller: sellerRepo,
+                    task: taskRepo
                 });
             }
         }

package/lib/chevre/service/task/confirmReserveTransaction.d.ts

@@ -3,6 +3,8 @@ import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as OrderRepo } from '../../repo/order';
+import { MongoRepository as ReservationRepo } from '../../repo/reservation';
+import { MongoRepository as TaskRepo } from '../../repo/task';
 /**
  * タスク実行関数
  */
@@ -14,4 +16,6 @@ export declare function confirmReserveTransaction(params: factory.action.interac
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
+    reservation: ReservationRepo;
+    task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/task/confirmReserveTransaction.js

@@ -15,6 +15,8 @@ const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
+const reservation_1 = require("../../repo/reservation");
+const task_1 = require("../../repo/task");
 const ReserveTransactionService = require("../assetTransaction/reserve");
 const credentials_1 = require("../../credentials");
 const coaAuthClient = new COA.auth.RefreshToken({
@@ -29,7 +31,9 @@ function call(data) {
         yield confirmReserveTransaction(data)({
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
-            order: new order_1.MongoRepository(settings.connection)
+            order: new order_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
         });
     });
 }
@@ -44,9 +48,6 @@ function confirmReserveTransaction(params) {
         const action = yield repos.action.start(confirmActionAttributes);
         try {
             let object = confirmActionAttributes.object;
-            // if (params.instrument === undefined) {
-            //     params.instrument = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };
-            // }
             switch (params.instrument.identifier) {
                 case factory.service.webAPI.Identifier.COA:
                     // COA本予約
@@ -72,7 +73,6 @@ function confirmReserveTransaction(params) {
                     object = object;
                     yield ReserveTransactionService.confirm({
                         transactionNumber: object.transactionNumber,
-                        // object: object.object,
                         potentialActions: object.potentialActions
                     })(repos);
             }

package/lib/chevre/service/task/importEventsFromCOA.js

@@ -14,6 +14,7 @@ const action_1 = require("../../repo/action");
 const categoryCode_1 = require("../../repo/categoryCode");
 const event_1 = require("../../repo/event");
 const place_1 = require("../../repo/place");
+const seller_1 = require("../../repo/seller");
 const EventService = require("../event");
 /**
  * タスク実行関数
@@ -24,7 +25,8 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             categoryCode: new categoryCode_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
-            place: new place_1.MongoRepository(settings.connection)
+            place: new place_1.MongoRepository(settings.connection),
+            seller: new seller_1.MongoRepository(settings.connection)
         });
     });
 }

package/lib/chevre/service/task.js

@@ -113,16 +113,13 @@ function abort(params) {
 exports.abort = abort;
 function notifyAbortedTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let abortedTasks = yield repos.task.search({
-            statuses: [factory.taskStatus.Aborted],
-            dateAborted: {
-                $gte: params.dateAbortedGte
-            }
-        });
+        const abortedTasks = yield repos.task.search(Object.assign({ statuses: [factory.taskStatus.Aborted], dateAborted: { $gte: params.dateAbortedGte } }, (settings_1.ABORTED_TASKS_WITHOUT_REPORT.length > 0)
+            ? { name: { $nin: settings_1.ABORTED_TASKS_WITHOUT_REPORT } }
+            : undefined));
         // 中止を報告しないタスク以外にフィルター
-        abortedTasks = abortedTasks.filter((task) => {
-            return !settings_1.ABORTED_TASKS_WITHOUT_REPORT.includes(task.name);
-        });
+        // abortedTasks = abortedTasks.filter((task) => {
+        //     return !ABORTED_TASKS_WITHOUT_REPORT.includes(task.name);
+        // });
         if (abortedTasks.length > 0) {
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -35,37 +35,52 @@ function createReservationAcceptedOffers(params) {
 }
 exports.createReservationAcceptedOffers = createReservationAcceptedOffers;
 function reservationOffers2orderedItem(params) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const reservationFor = params.reservationFor;
     const issuedThrough = params.issuedThrough;
-    if (reservationFor.typeOf !== factory.eventType.ScreeningEvent) {
-        throw new factory.errors.NotImplemented(`reservationFor.typeOf '${reservationFor.typeOf}' not implemented`);
-    }
-    const reservationFor4orderedItem = {
-        location: {
-            branchCode: (_a = reservationFor.location) === null || _a === void 0 ? void 0 : _a.branchCode,
-            name: (_b = reservationFor.location) === null || _b === void 0 ? void 0 : _b.name,
+    if (reservationFor.typeOf === factory.eventType.ScreeningEvent
+        && issuedThrough.typeOf === factory.product.ProductType.EventService) {
+        const reservationFor4orderedItem = {
+            location: {
+                branchCode: (_a = reservationFor.location) === null || _a === void 0 ? void 0 : _a.branchCode,
+                name: (_b = reservationFor.location) === null || _b === void 0 ? void 0 : _b.name,
+                // 不要なので廃止(2022-12-19~)
+                // project: reservationFor.location?.project,
+                typeOf: (_c = reservationFor.location) === null || _c === void 0 ? void 0 : _c.typeOf
+            },
             // 不要なので廃止(2022-12-19~)
-            // project: reservationFor.location?.project,
-            typeOf: (_c = reservationFor.location) === null || _c === void 0 ? void 0 : _c.typeOf
-        },
-        // 不要なので廃止(2022-12-19~)
-        // project: reservationFor.project,
-        typeOf: reservationFor.typeOf,
-        id: reservationFor.id,
-        name: reservationFor.name,
-        startDate: reservationFor.startDate,
-        endDate: reservationFor.endDate
-    };
-    if (issuedThrough.typeOf !== factory.product.ProductType.EventService) {
-        throw new factory.errors.NotImplemented(`issuedThrough.typeOf '${issuedThrough.typeOf}' not implemented`);
+            // project: reservationFor.project,
+            typeOf: reservationFor.typeOf,
+            id: reservationFor.id,
+            name: reservationFor.name,
+            startDate: reservationFor.startDate,
+            endDate: reservationFor.endDate
+        };
+        return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf }, (typeof ((_d = issuedThrough.serviceType) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
+            ? { serviceType: issuedThrough.serviceType }
+            : undefined), { serviceOutput: {
+                typeOf: factory.reservationType.EventReservation,
+                reservationFor: reservationFor4orderedItem
+            } });
+    }
+    else if (reservationFor.typeOf === factory.tripType.BusTrip
+        && issuedThrough.typeOf === factory.product.ProductType.Transportation) {
+        const reservationFor4orderedItem = {
+            typeOf: reservationFor.typeOf,
+            id: reservationFor.id,
+            departureTime: reservationFor.departureTime,
+            arrivalTime: reservationFor.arrivalTime
+        };
+        return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf }, (typeof ((_e = issuedThrough.serviceType) === null || _e === void 0 ? void 0 : _e.typeOf) === 'string')
+            ? { serviceType: issuedThrough.serviceType }
+            : undefined), { serviceOutput: {
+                typeOf: factory.reservationType.ReservationPackage,
+                reservationFor: reservationFor4orderedItem
+            } });
+    }
+    else {
+        throw new factory.errors.ServiceUnavailable('unexpected params on reservationOffers2orderedItem');
     }
-    return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf }, (typeof ((_d = issuedThrough.serviceType) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
-        ? { serviceType: issuedThrough.serviceType }
-        : undefined), { serviceOutput: {
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: reservationFor4orderedItem
-        } });
 }
 function createProductItems(params) {
     const acceptedOffers = [];

package/lib/chevre/settings.d.ts

@@ -23,6 +23,8 @@ export declare type ISettings = factory.project.ISettings & {
     maxNumCreditCardPaymentMethod?: number;
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
+export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
+export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 /**
  * グローバル設定
  */

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
+exports.settings = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(',')
@@ -43,9 +43,14 @@ exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = 365;
 /**
  * 取引保管期間(Canceled)
  */
-exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = 7;
+exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = (typeof process.env.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS === 'string')
+    ? Number(process.env.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS)
+    // tslint:disable-next-line:no-magic-numbers
+    : 7;
 exports.DEFAULT_SENDER_EMAIL = process.env.DEFAULT_SENDER_EMAIL;
 exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = String(process.env.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD);
+exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
+exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 /**
  * グローバル設定
  */

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.281.0-alpha.2",
-    "@cinerino/sdk": "3.135.0-alpha.6",
+    "@chevre/factory": "4.283.0",
+    "@cinerino/sdk": "3.136.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.3"
+  "version": "20.2.0-alpha.30"
 }

package/example/src/chevre/aggregateReservationOnProject.ts

@@ -1,32 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: <string>process.env.PROJECT_ID };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    // const now = new Date();
-    await chevre.service.aggregation.project.aggregate({
-        project: { id: project.id },
-        reservationFor: {
-            startFrom: moment('2022-01-01T00:00:00+09:00')
-                .toDate(),
-            startThrough: moment('2022-01-31T23:59:59+09:00')
-                .toDate(),
-        }
-    })({
-        project: new chevre.repository.Project(mongoose.connection),
-        reservation: new chevre.repository.Reservation(mongoose.connection),
-        task: new chevre.repository.Task(mongoose.connection)
-    });
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);