@chevre/domain 20.2.0-alpha.9 → 20.3.0-alpha.0

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

@@ -30,34 +30,31 @@ function getOrderWithToken(params) {
             return params.order;
         }
         // 冗長な個人情報をマスク(最低限の情報に)
-        const customer4orderToken = (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 = {
-            id: params.order.seller.id,
-            // 最適化(2022-11-15~)
-            // project: params.order.seller.project,
-            typeOf: params.order.seller.typeOf
-        };
+        // 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 = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
-            seller: seller4orderToken,
-            customer: customer4orderToken,
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: params.order.confirmationNumber,
-            orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
-            orderDate: params.order.orderDate
+            // 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) => {
             // 所有権を暗号化する

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

@@ -21,7 +21,7 @@ function returnOrder(params) {
             ? params.object.dateReturned
             : new Date();
         const returner = params.agent;
-        let order = yield repos.order.findByOrderNumber({ orderNumber });
+        let order = yield repos.order.findByOrderNumber({ orderNumber, inclusion: [], exclusion: [] });
         // プロジェクト条件検証
         if (order.project.id !== params.project.id) {
             throw new factory.errors.NotFound('Order');
@@ -202,8 +202,10 @@ function onReturn(returnActionAttributes) {
             }
         }
         // タスク保管
-        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/order/sendOrder.js

@@ -31,7 +31,7 @@ function sendOrder(params) {
                 orderNumber
             })({ transaction: repos.transaction });
             // 注文取得
-            let order = yield repos.order.findByOrderNumber({ orderNumber });
+            let order = yield repos.order.findByOrderNumber({ orderNumber, inclusion: [], exclusion: [] });
             // プロジェクト条件検証
             if (order.project.id !== params.project.id) {
                 throw new factory.errors.NotFound('Order');
@@ -100,7 +100,9 @@ function sendOrder(params) {
             let throwsError = true;
             // すでにOrderReturnedだった場合、OrderDelivered->OrderReturnedの処理自体は成功しているので、後処理を続行する
             const currentOrder = yield repos.order.findByOrderNumber({
-                orderNumber: params.object.orderNumber
+                orderNumber: params.object.orderNumber,
+                inclusion: ['orderStatus'],
+                exclusion: []
             });
             if ((currentOrder === null || currentOrder === void 0 ? void 0 : currentOrder.orderStatus) === factory.orderStatus.OrderReturned) {
                 throwsError = false;

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 {
@@ -103,5 +108,9 @@ declare function authorize(params: {
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location?: factory.action.trade.pay.ILocation;
+    /**
+     * アクション失敗時に即時に決済取引を中止するかどうか
+     */
+    useCancelPayTransactionOnFailed: boolean;
 }): IAuthorizeOperation<IAuthorizePaymentAction>;
 export { onPaymentStatusChanged, authorize, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };

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

@@ -189,7 +189,7 @@ function publishPaymentUrl(params) {
         };
         yield repos.transaction.findByIdAndUpdate({
             id: transaction.id,
-            update: { 'object.paymentMethods': paymentMethodByPaymentUrl }
+            update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
         });
         return result;
     });
@@ -268,6 +268,15 @@ function authorize(params) {
             catch (__) {
                 // no op
             }
+            // 即時に決済取引を中止するか？(2023-02-03~)
+            if (params.useCancelPayTransactionOnFailed) {
+                yield processVoidPayTransaction({
+                    project: action.project,
+                    agent: { id: action.project.id },
+                    id: action.id,
+                    purpose: action.purpose
+                })(repos);
+            }
             throw error;
         }
         // アクションを完了
@@ -288,6 +297,12 @@ function validateFromLocation(params) {
                 agent: { id: params.project.id, typeOf: factory.organizationType.Project },
                 token: fromLocation
             })(repos);
+            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');
+            }
             accountId = paymentCardOwnershipInfo.typeOfGood.identifier;
         }
         return { accountId };

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

@@ -77,8 +77,10 @@ function onRegistered(actionAttributes, __) {
             }
         }
         // タスク保管
-        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/report/telemetry.js

@@ -181,7 +181,7 @@ function createSellerFlow(measuredFrom, measuredThrough, sellerId) {
         const actionsOnExpiredTransactions = yield repos.action.search({
             typeOf: { $eq: factory.actionType.AuthorizeAction },
             purpose: { id: { $in: expiredTransactionIds } }
-        });
+        }, [], []);
         debug(actionsOnExpiredTransactions.length, 'actionsOnExpiredTransactions found.');
         const numbersOfActionsOnExpired = expiredTransactionIds.map((transactionId) => {
             return actionsOnExpiredTransactions.filter((action) => action.purpose.id === transactionId).length;

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

@@ -17,11 +17,11 @@ function checkInRerservation(params) {
         // 発券処理(Array対応)
         let checkedInReservationIds;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
-            yield repos.reservation.checkIn({ id: { $in: params.object.ids }, now });
+            yield repos.reservation.checkInIfNot({ id: { $in: params.object.ids }, now });
             checkedInReservationIds = params.object.ids;
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
-            yield repos.reservation.checkIn({ reservationNumber: { $in: params.object.reservationNumbers }, now });
+            yield repos.reservation.checkInIfNot({ reservationNumber: { $in: params.object.reservationNumbers }, now });
             // 予約番号リストを予約IDリストに変換
             checkedInReservationIds = yield repos.reservation.searchIdsByReservationNumber({
                 reservationNumber: { $in: params.object.reservationNumbers }

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/potentialActions/onReservationCanceled.js

@@ -96,7 +96,8 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
             // 冗長な作成を避ける
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project,
-                reservationFor: { id: canceledReservations[0].reservationFor.id }
+                reservationFor: [{ id: canceledReservations[0].reservationFor.id }],
+                force: false
             })({ task: repos.task });
         }
     });

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

@@ -116,7 +116,8 @@ function onReservationCheckedIn(params) {
             yield Promise.all(reservationForIds.map((reservationForId) => __awaiter(this, void 0, void 0, function* () {
                 yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                     project: { id: params.project.id },
-                    reservationFor: { id: reservationForId }
+                    reservationFor: [{ id: reservationForId }],
+                    force: false
                 })({ task: repos.task });
             })));
         }

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

@@ -98,7 +98,8 @@ function onReservationConfirmed(confirmedReservations) {
         if (Array.isArray(confirmedReservations) && confirmedReservations.length > 0) {
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project: confirmedReservations[0].project,
-                reservationFor: { id: confirmedReservations[0].reservationFor.id }
+                reservationFor: [{ id: confirmedReservations[0].reservationFor.id }],
+                force: false
             })({ task: repos.task });
             const now = new Date();
             const taskAttributes = [];

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,15 +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.typeOf === factory.reservationType.BusReservation)
-                        && 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`);
@@ -53,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にエラー結果を追加
@@ -115,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>;