@chevre/domain 20.2.0-alpha.5 → 20.2.0-alpha.51

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onReservationUsed = void 0;
 /**
@@ -20,7 +19,6 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const informUseReservations = (_a = settings_1.settings.onReservationUsed) === null || _a === void 0 ? void 0 : _a.informAction;
 const INFORM_TASK_DELAY_IN_SECONDS = 30;
 /**
  * 予約使用
@@ -28,41 +26,39 @@ const INFORM_TASK_DELAY_IN_SECONDS = 30;
 function onReservationUsed(action, attendedReservation) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // const reservation = action.object[0];
         const tasks = [];
         const now = new Date();
+        // INFORM_USE_RESERVATION_URL廃止(2023-01-30~)
         // アクション通知タスク作成
-        if (Array.isArray(informUseReservations)) {
-            informUseReservations.filter((informUseReservation) => {
-                var _a;
-                return typeof ((_a = informUseReservation.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string'
-                    && informUseReservation.recipient.url.length > 0;
-            })
-                .forEach((informUseReservation) => {
-                var _a, _b;
-                const triggerWebhookTask = {
-                    project: action.project,
-                    name: factory.taskName.TriggerWebhook,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 3,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: {
-                        project: action.project,
-                        typeOf: factory.actionType.InformAction,
-                        agent: action.project,
-                        recipient: {
-                            typeOf: factory.personType.Person,
-                            id: String((_a = informUseReservation.recipient) === null || _a === void 0 ? void 0 : _a.url),
-                            url: String((_b = informUseReservation.recipient) === null || _b === void 0 ? void 0 : _b.url)
-                        },
-                        object: action
-                    }
-                };
-                tasks.push(triggerWebhookTask);
-            });
-        }
+        // if (Array.isArray(informUseReservations)) {
+        //     informUseReservations.filter((informUseReservation) => {
+        //         return typeof informUseReservation.recipient?.url === 'string'
+        //             && informUseReservation.recipient.url.length > 0;
+        //     })
+        //         .forEach((informUseReservation) => {
+        //             const triggerWebhookTask: factory.task.triggerWebhook.IAttributes = {
+        //                 project: action.project,
+        //                 name: factory.taskName.TriggerWebhook,
+        //                 status: factory.taskStatus.Ready,
+        //                 runsAt: now,
+        //                 remainingNumberOfTries: 3,
+        //                 numberOfTried: 0,
+        //                 executionResults: [],
+        //                 data: {
+        //                     project: action.project,
+        //                     typeOf: factory.actionType.InformAction,
+        //                     agent: action.project,
+        //                     recipient: {
+        //                         typeOf: factory.personType.Person,
+        //                         id: String(informUseReservation.recipient?.url),
+        //                         url: String(informUseReservation.recipient?.url)
+        //                     },
+        //                     object: action
+        //                 }
+        //             };
+        //             tasks.push(triggerWebhookTask);
+        //         });
+        // }
         // inform galobally
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
@@ -134,7 +130,8 @@ function onReservationUsed(action, attendedReservation) {
         // 冗長な作成を避ける
         yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
             project: attendedReservation.project,
-            reservationFor: { id: attendedReservation.reservationFor.id }
+            reservationFor: [{ id: attendedReservation.reservationFor.id }],
+            force: false
         })({ task: repos.task });
     });
 }

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

@@ -11,9 +11,6 @@ import { IUseReservationAction } from './potentialActions/onReservationUsed';
  * 予約使用
  */
 export declare function useReservation(params: {
-    project: {
-        id: string;
-    };
     agent: factory.action.consume.use.reservation.IAgent;
     object: {
         /**

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

@@ -15,7 +15,7 @@ exports.useReservation = void 0;
  */
 const factory = require("../../factory");
 const code_1 = require("../code");
-const factory_1 = require("./factory");
+// import { maskUnderName } from './factory';
 const onReservationUsed_1 = require("./potentialActions/onReservationUsed");
 function verifyToken4reservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -26,8 +26,18 @@ function verifyToken4reservation(params) {
         })({});
         switch (payload.typeOf) {
             case factory.order.OrderType.Order:
+                // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
+                const order = yield repos.order.findByOrderNumberAndReservationId({
+                    orderNumber: payload.orderNumber,
+                    reservationId: params.reservationId
+                });
                 // 注文検索
-                const order = yield repos.order.findByOrderNumber({ orderNumber: payload.orderNumber });
+                // const order: Pick<factory.order.IOrder, 'orderStatus' | 'acceptedOffers'> =
+                //     await repos.order.findByOrderNumber({
+                //         orderNumber: payload.orderNumber,
+                //         inclusion: ['orderStatus', 'acceptedOffers'],
+                //         exclusion: []
+                //     });
                 // ステータス検証
                 switch (order.orderStatus) {
                     case factory.orderStatus.OrderDelivered:
@@ -35,14 +45,17 @@ function verifyToken4reservation(params) {
                     default:
                         throw new factory.errors.Argument('token', `invalid orderStatus '${order.orderStatus}'`);
                 }
-                const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-                const reservationExistsInOrder = acceptedOffers.some((offer) => {
-                    return offer.itemOffered.typeOf === factory.reservationType.EventReservation
-                        && offer.itemOffered.id === params.reservationId;
-                });
-                if (!reservationExistsInOrder) {
-                    throw new factory.errors.NotFound('AcceptedOffer');
-                }
+                // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+                // const reservationExistsInOrder = acceptedOffers.some((offer) => {
+                //     return (
+                //         offer.itemOffered.typeOf === factory.reservationType.EventReservation
+                //         || offer.itemOffered.typeOf === factory.reservationType.BusReservation
+                //     )
+                //         && offer.itemOffered.id === params.reservationId;
+                // });
+                // if (!reservationExistsInOrder) {
+                //     throw new factory.errors.NotFound('AcceptedOffer');
+                // }
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
@@ -52,54 +65,67 @@ function verifyToken4reservation(params) {
 /**
  * 予約使用
  */
-// export function useReservation(actionAttributes: factory.action.consume.use.reservation.IAttributes) {
+// tslint:disable-next-line:max-func-body-length
 function useReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         const now = new Date();
+        const reservationId = params.object.id;
         // 予約検索
-        let reservation = yield repos.reservation.findById({ id: params.object.id });
+        // 取得属性最適化(2023-01-30~)
+        const reservation = yield repos.reservation.findById({
+            id: reservationId,
+            inclusion: ['id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
+        });
         // instrument?.tokenを検証
         const token = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.token;
         if (typeof token === 'string') {
             yield verifyToken4reservation({
-                project: { id: params.project.id },
+                project: { id: reservation.project.id },
                 agent: params.agent,
-                reservationId: params.object.id,
+                reservationId,
                 token
             })({ order: repos.order });
         }
         // UseActionを作成する
-        const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign({}, (typeof token === 'string') ? { token } : undefined), {
-                typeOf: factory.action.check.token.ObjectType.Ticket
-            }), 
+        const reservationAsObject = {
+            id: reservation.id,
+            issuedThrough: reservation.issuedThrough,
+            reservationFor: reservation.reservationFor,
+            reservationNumber: reservation.reservationNumber,
+            reservedTicket: reservation.reservedTicket,
+            typeOf: reservation.typeOf
+        };
+        const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign({}, (typeof token === 'string') ? { token } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }), 
+            // object最適化(2023-01-30~)
             // どの予約を
             // mask
-            object: [(0, factory_1.maskUnderName)(reservation)] }, (typeof ((_b = params.location) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
+            // object: [maskUnderName(reservation)],
+            object: [reservationAsObject] }, (typeof ((_b = params.location) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
             ? {
                 location: {
                     typeOf: factory.placeType.Place,
                     identifier: params.location.identifier
                 }
             }
-            : undefined
-        // purpose: params.purpose
-        );
+            : undefined);
         let action = yield repos.action.start(actionAttributes);
         // ひとまず予約数:1に限定する
         if (actionAttributes.object.length !== 1) {
             throw new factory.errors.Argument('object', 'number of using reservations must be 1');
         }
-        reservation = actionAttributes.object[0];
+        let attendedReservation;
         try {
-            reservation = (yield repos.reservation.attend({ id: reservation.id, now }));
-            // 使用日時がなければ追加
-            if (((_c = reservation.reservedTicket) === null || _c === void 0 ? void 0 : _c.dateUsed) === undefined) {
-                reservation = yield repos.reservation.updatePartiallyById({
-                    id: reservation.id,
-                    update: { 'reservedTicket.dateUsed': now }
-                });
-            }
+            // 使用日時と同時更新(2023-01-30~)
+            attendedReservation = (yield repos.reservation.attendIfNotAttended({ id: reservationId, now }));
+            // attendedReservation = <IEventReservation>await repos.reservation.attend({ id: reservationId, now });
+            // // 使用日時がなければ追加
+            // if (attendedReservation.reservedTicket?.dateUsed === undefined) {
+            //     attendedReservation = await repos.reservation.updatePartiallyById({
+            //         id: attendedReservation.id,
+            //         update: { 'reservedTicket.dateUsed': now }
+            //     });
+            // }
         }
         catch (error) {
             // actionにエラー結果を追加
@@ -114,7 +140,7 @@ function useReservation(params) {
         }
         // アクション完了
         action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} }));
-        yield (0, onReservationUsed_1.onReservationUsed)(action, reservation)({ task: repos.task });
+        yield (0, onReservationUsed_1.onReservationUsed)(action, attendedReservation)({ task: repos.task });
         return action;
     });
 }

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/returnPayTransaction.js

@@ -64,7 +64,11 @@ function returnPayTransaction(params) {
         if (typeof paymentServiceType !== 'string' || paymentServiceType.length === 0) {
             throw new factory.errors.ArgumentNull('object.issuedThrough.typeOf');
         }
-        const order = yield repos.order.findByOrderNumber({ orderNumber });
+        const order = yield repos.order.findByOrderNumber({
+            orderNumber,
+            inclusion: ['seller', 'project', 'dateReturned'],
+            exclusion: []
+        });
         const action = yield repos.action.start(refundActionAttributes);
         let refundTransaction;
         try {
@@ -213,8 +217,10 @@ function onRefund(refundActionAttributes) {
             });
         }
         // タスク保管
-        yield Promise.all(taskAttributes.map((taskAttribute) => __awaiter(this, void 0, void 0, function* () {
-            return repos.task.save(taskAttribute);
-        })));
+        // saveManyに変更(2023-02-01~)
+        yield repos.task.saveMany(taskAttributes);
+        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
+        //     return repos.task.save(taskAttribute);
+        // }));
     });
 }

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/moneyTransfer.js

@@ -386,6 +386,12 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                 agent: { id: project.id, typeOf: factory.organizationType.Project },
                 token: fromLocation
             })({ action: repos.action });
+            if (paymentCardOwnershipInfo.typeOf !== 'OwnershipInfo') {
+                throw new factory.errors.Argument('fromLocation', 'must be OwnershipInfo');
+            }
+            if (paymentCardOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+                throw new factory.errors.Argument('fromLocation', 'must be Permit');
+            }
             fromLocation = {
                 typeOf: paymentCardOwnershipInfo.typeOfGood.typeOf,
                 identifier: paymentCardOwnershipInfo.typeOfGood.identifier,
@@ -576,7 +582,9 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        yield Promise.all(taskAttributes.map((a) => __awaiter(this, void 0, void 0, function* () { return repos.task.save(a); })));
+        // saveManyに変更(2023-02-01~)
+        yield repos.task.saveMany(taskAttributes);
+        // await Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/transaction/orderProgramMembership/findPaymentCardPermit.d.ts

@@ -23,4 +23,4 @@ export declare function findPaymentCardPermit(params: {
 }): (repos: {
     ownershipInfo: OwnershipInfoRepo;
     product: ProductRepo;
-}) => Promise<factory.ownershipInfo.IPermit>;
+}) => Promise<factory.ownershipInfo.IPermitAsGood>;

package/lib/chevre/service/transaction/orderProgramMembership.js

@@ -218,7 +218,8 @@ function processAuthorizeProductOffer(params) {
             project: { id: params.project.id },
             itemOffered: { id: params.product.id },
             seller: { id: String(seller.id) },
-            onlyValid: true
+            onlyValid: true,
+            sort: false // ソート不要(2023-01-27~)
         })(repos);
         const acceptedProductOffer = offers.find((o) => o.identifier === acceptedOffer.identifier);
         if (acceptedProductOffer === undefined) {

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

@@ -36,9 +36,11 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        yield Promise.all(taskAttributes.map((taskAttribute) => __awaiter(this, void 0, void 0, function* () {
-            yield repos.task.save(taskAttribute);
-        })));
+        // saveManyに変更(2023-02-01~)
+        yield repos.task.saveMany(taskAttributes);
+        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
+        //     await repos.task.save(taskAttribute);
+        // }));
     });
 }
 exports.exportTasksById = exportTasksById;

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/service/transaction/placeOrderInProgress.js

@@ -68,13 +68,13 @@ exports.start = start;
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         // 確認番号を事前発行
         yield publishConfirmationNumberIfNotExist({
             id: params.id,
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        let transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.findById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.id
         });
@@ -121,7 +121,7 @@ function confirm(params) {
         });
         // ステータス変更
         try {
-            transaction = yield repos.transaction.confirm({
+            yield repos.transaction.confirm({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
                 authorizeActions: transaction.object.authorizeActions,
@@ -140,10 +140,10 @@ function confirm(params) {
             throw error;
         }
         // 万が一処理が想定通りでない場合orderNumberが存在しない
-        if (typeof ((_b = transaction.result) === null || _b === void 0 ? void 0 : _b.order.typeOf) !== 'string') {
-            throw new factory.errors.ServiceUnavailable('transaction.result not found');
-        }
-        return transaction.result;
+        // if (typeof transaction.result?.order.typeOf !== 'string') {
+        //     throw new factory.errors.ServiceUnavailable('transaction.result not found');
+        // }
+        return result;
     });
 }
 exports.confirm = confirm;