@chevre/domain 21.2.0-alpha.76 → 21.2.0-alpha.78

package/lib/chevre/repo/assetTransaction.d.ts

@@ -75,6 +75,7 @@ export declare class MongoRepository {
     confirm<T extends factory.assetTransactionType>(params: {
         typeOf: T;
         id: string;
+        object?: Pick<factory.action.reserve.IReservationPackageAsObject, 'underName'>;
         result: factory.assetTransaction.IResult<T>;
         potentialActions: factory.assetTransaction.IPotentialActions<T>;
     }): Promise<void>;

package/lib/chevre/repo/assetTransaction.js

@@ -311,17 +311,15 @@ class MongoRepository {
      * 取引を確定する
      */
     confirm(params) {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf },
                 status: { $eq: factory.transactionStatusType.InProgress }
-            }, {
-                status: factory.transactionStatusType.Confirmed,
-                endDate: new Date(),
-                result: params.result,
-                potentialActions: params.potentialActions // resultを更新
-            }, {
+            }, Object.assign({ status: factory.transactionStatusType.Confirmed, endDate: new Date(), result: params.result, potentialActions: params.potentialActions }, (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.underName) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
+                ? { 'object.underName': (_c = params.object) === null || _c === void 0 ? void 0 : _c.underName }
+                : undefined), {
                 new: true,
                 projection: { _id: 1 }
             })

package/lib/chevre/repo/mongoose/schemas/reservation.d.ts

@@ -65,6 +65,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    underName?: any;
     issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
@@ -72,7 +73,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;
     checkinUrl?: string | undefined;
@@ -93,6 +93,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    underName?: any;
     issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
@@ -100,7 +101,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;
     checkinUrl?: string | undefined;
@@ -121,6 +121,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    underName?: any;
     issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
@@ -128,7 +129,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;
     checkinUrl?: string | undefined;

package/lib/chevre/repo/order.d.ts

@@ -86,7 +86,9 @@ export declare class MongoRepository {
     /**
      * 注文を検索する
      */
-    search(params: factory.order.ISearchConditions, projection?: any): Promise<factory.order.IOrder[]>;
+    search(params: factory.order.ISearchConditions, projection?: {
+        [key: string]: 0 | 1;
+    }): Promise<factory.order.IOrder[]>;
     /**
      * 注文の受入オファーIDリストを検索する
      */

package/lib/chevre/repo/order.js

@@ -896,8 +896,15 @@ class MongoRepository {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const projectionSpecified = projection !== undefined && projection !== null;
+            const positiveProjectionExists = (projectionSpecified)
+                ? Object.values(projection)
+                    .some((value) => value !== 0)
+                : false;
             const query = this.orderModel.find((conditions.length > 0) ? { $and: conditions } : {})
-                .select(Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+                .select((projectionSpecified && positiveProjectionExists)
+                ? projection
+                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)

package/lib/chevre/repo/task.d.ts

@@ -63,7 +63,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteMember").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteMember").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;

package/lib/chevre/service/assetTransaction/reserve/factory.d.ts

@@ -71,8 +71,11 @@ export declare function createReservation(params: {
 }): IObjectSubReservation;
 export declare function createPotentialActions(params: factory.assetTransaction.reserve.IConfirmParams & {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-    order?: factory.order.IOrder;
-}): factory.assetTransaction.reserve.IPotentialActions;
+    order?: Pick<factory.order.IOrder, 'orderNumber' | 'customer' | 'typeOf'>;
+}): {
+    potentialActions: factory.assetTransaction.reserve.IPotentialActions;
+    reservationPackage?: factory.action.reserve.IReservationPackageAsObject;
+};
 export declare function createPendingReservationAction(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
 }): factory.action.cancel.reservation.IAttributes[];

package/lib/chevre/service/assetTransaction/reserve/factory.js

@@ -448,6 +448,7 @@ function createPotentialActions(params) {
     // 予約アクション属性作成
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
     let reserveActionAttributes = [];
+    let reservationPackage;
     if (pendingReservations.length > 0) {
         // ReservationPackageに対応(2022-12-22~)
         let underName;
@@ -467,7 +468,7 @@ function createPotentialActions(params) {
                 underName
             }));
         });
-        const reservationPackage = Object.assign({ reservationFor, reservationNumber: transaction.object.reservationNumber, reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
+        reservationPackage = Object.assign({ reservationFor, reservationNumber: transaction.object.reservationNumber, reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
                 ? params.transaction.object.reservationStatus
                 : factory.reservationStatusType.ReservationPending, 
             // 不要なので廃止(2023-01-19~)
@@ -486,7 +487,10 @@ function createPotentialActions(params) {
             }];
     }
     return {
-        reserve: reserveActionAttributes
+        potentialActions: {
+            reserve: reserveActionAttributes
+        },
+        reservationPackage
     };
 }
 exports.createPotentialActions = createPotentialActions;
@@ -505,10 +509,6 @@ function createReservationUnderName(params) {
  */
 function ordre2reservationUnderName(params) {
     return {
-        // issuedBy: {
-        //     typeOf: params.order.seller.typeOf,
-        //     name: params.order.seller.name
-        // },
         underName: createReservationUnderName({ order: params.order })
     };
 }

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

@@ -698,6 +698,7 @@ function onReservationsCreated(params) {
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
@@ -716,17 +717,14 @@ function confirm(params) {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
         const order = yield fixOrderAsPurpose(params, transaction)(repos);
-        const potentialActions = (0, factory_1.createPotentialActions)(Object.assign(Object.assign({}, params), { transaction: transaction, order }));
+        const { potentialActions, reservationPackage } = (0, factory_1.createPotentialActions)(Object.assign(Object.assign({}, params), { transaction: transaction, order }));
         // 取引確定
         const result = {};
-        yield repos.assetTransaction.confirm({
-            typeOf: factory.assetTransactionType.Reserve,
-            id: transaction.id,
-            result: result,
-            potentialActions: (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING)
+        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Reserve, id: transaction.id, result: result, potentialActions: (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING)
                 ? { reserve: [] }
-                : potentialActions
-        });
+                : potentialActions }, (typeof ((_a = reservationPackage === null || reservationPackage === void 0 ? void 0 : reservationPackage.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+            ? { object: { underName: reservationPackage.underName } }
+            : undefined));
         if (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
             // sync対応(2023-01-13~)
             yield (0, confirmReservation_1.confirmReservation)(potentialActions.reserve)(repos);
@@ -750,7 +748,7 @@ function fixOrderAsPurpose(params, transaction) {
                 project: { id: { $eq: transaction.project.id } },
                 confirmationNumbers: [payPurposeConfirmationNumber],
                 orderNumbers: [payPurposeOrderNumber]
-            });
+            }, { customer: 1, orderNumber: 1, typeOf: 1 });
             order = orders.shift();
             if (order === undefined) {
                 throw new factory.errors.NotFound('Order as purpose');

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

@@ -1,6 +1,3 @@
-/**
- * 予約サービス
- */
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 export declare function checkInRerservation(params: {

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

@@ -1,4 +1,5 @@
 "use strict";
+// import * as factory from '../../factory';
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkInRerservation = void 0;
+// import { confirmReservation } from './confirmReservation';
 const onReservationCheckedIn_1 = require("./potentialActions/onReservationCheckedIn");
 function checkInRerservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -17,6 +19,28 @@ function checkInRerservation(params) {
         // 発券処理(Array対応)
         let checkedInReservationIds;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
+            //  confirmReservationが間に合わない可能性を考慮する(2023-05-30~)
+            // const reserveTransactions = await repos.assetTransaction.search<factory.assetTransactionType.Reserve>({
+            //     typeOf: factory.assetTransactionType.Reserve,
+            //     object: {
+            //         reservations: {
+            //             id: { $in: params.object.ids }
+            //         }
+            //     }
+            // });
+            // await Promise.all(reserveTransactions.map(async (reserveTransaction) => {
+            //     await confirmReservation([{
+            //         project: reserveTransaction.project,
+            //         typeOf: <factory.actionType.ReserveAction>factory.actionType.ReserveAction,
+            //         // result: {},
+            //         object: reservationPackage,
+            //         agent: reserveTransaction.project,
+            //         potentialActions: {
+            //             moneyTransfer: moneyTransferActions
+            //         },
+            //         purpose: { typeOf: transaction.typeOf, id: transaction.id }
+            //     }])(repos);
+            // }))
             yield repos.reservation.checkInIfNot({ id: { $in: params.object.ids }, now });
             checkedInReservationIds = params.object.ids;
         }

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

@@ -24,21 +24,30 @@ function confirmReservation(actionAttributesList) {
         let confirmedReservations = [];
         if (actionAttributesList.length > 0) {
             yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-                const reservation = actionAttributes.object;
+                var _a, _b;
+                const reservationPackage = actionAttributes.object;
                 const action = yield repos.action.start(actionAttributes);
                 try {
                     const reserveTransactions = yield repos.assetTransaction.search({
                         limit: 1,
                         page: 1,
                         typeOf: factory.assetTransactionType.Reserve,
-                        transactionNumber: { $eq: reservation.reservationNumber }
+                        transactionNumber: { $eq: reservationPackage.reservationNumber }
                     });
                     const reserveTransaction = reserveTransactions.shift();
                     if (reserveTransaction === undefined) {
                         throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
                     }
+                    let underName;
+                    // 予約取引に保管されたunderNameを使用する(2023-05-30~)
+                    if (typeof ((_a = reserveTransaction.object.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                        underName = reserveTransaction.object.underName;
+                    }
+                    else if (typeof ((_b = reservationPackage.underName) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') {
+                        underName = reservationPackage.underName;
+                    }
                     // ReservationPackageに対応(2022-12-22~)
-                    if (reservation.typeOf === factory.reservationType.ReservationPackage) {
+                    if (reservationPackage.typeOf === factory.reservationType.ReservationPackage) {
                         // Pendingの予約が存在しないバージョンに対応する(2023-05-29~)
                         if (reserveTransaction.object.disablePendingReservations === true) {
                             const reservationFor = reserveTransaction.object.reservationFor;
@@ -49,7 +58,7 @@ function confirmReservation(actionAttributesList) {
                                     yield repos.reservation.confirmByIdIfNotExist({
                                         reservation: subReservation,
                                         reservationFor,
-                                        underName: reservation.underName
+                                        underName
                                     });
                                 })));
                             }
@@ -57,15 +66,15 @@ function confirmReservation(actionAttributesList) {
                         else {
                             // 予約を確定状態に変更する
                             yield repos.reservation.confirmByReservationNumber({
-                                reservationNumber: reservation.reservationNumber,
-                                previousReservationStatus: reservation.reservationStatus,
-                                underName: reservation.underName
+                                reservationNumber: reservationPackage.reservationNumber,
+                                previousReservationStatus: reservationPackage.reservationStatus,
+                                underName
                             });
                         }
                     }
                     else {
                         // 廃止(2023-01-18)
-                        throw new factory.errors.Forbidden(`${reservation.typeOf} not acceptable`);
+                        throw new factory.errors.Forbidden(`${reservationPackage.typeOf} not acceptable`);
                         // 予約を確定状態に変更する
                         // await repos.reservation.confirm<factory.reservationType.EventReservation>({
                         //     id: reservation.id,

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

@@ -1,6 +1,3 @@
-/**
- * 予約サービス
- */
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as OrderRepo } from '../../repo/order';
@@ -11,6 +8,9 @@ import { IUseReservationAction } from './potentialActions/onReservationUsed';
  * 予約使用
  */
 export declare function useReservation(params: {
+    project: {
+        id: string;
+    };
     agent: factory.action.consume.use.reservation.IAgent;
     object: {
         /**
@@ -24,6 +24,7 @@ export declare function useReservation(params: {
     location?: {
         identifier?: string;
     };
+    verifyToken: boolean;
 }): (repos: {
     action: ActionRepo;
     order: OrderRepo;

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

@@ -10,51 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useReservation = void 0;
-/**
- * 予約サービス
- */
 const factory = require("../../factory");
-const code_1 = require("../code");
-// import { maskUnderName } from './factory';
 const onReservationUsed_1 = require("./potentialActions/onReservationUsed");
-function verifyToken4reservation(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const payload = yield (0, code_1.verifyToken)({
-            project: params.project,
-            agent: params.agent,
-            token: params.token
-        })({});
-        switch (payload.typeOf) {
-            case factory.order.OrderType.Order:
-                // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
-                const order = yield repos.order.findByOrderNumberAndReservationId({
-                    orderNumber: payload.orderNumber,
-                    reservationId: params.reservationId
-                });
-                // ステータス検証
-                switch (order.orderStatus) {
-                    case factory.orderStatus.OrderDelivered:
-                        break;
-                    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');
-                // }
-                break;
-            default:
-                throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
-        }
-    });
-}
+const verifyToken4reservation_1 = require("./verifyToken4reservation");
 /**
  * 予約使用
  */
@@ -64,22 +22,24 @@ function useReservation(params) {
         var _a, _b;
         const now = new Date();
         const reservationId = params.object.id;
+        const token = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.token;
+        if (params.verifyToken === true) {
+            // instrument?.tokenを検証
+            if (typeof token === 'string') {
+                yield (0, verifyToken4reservation_1.verifyToken4reservation)({
+                    project: { id: params.project.id },
+                    agent: params.agent,
+                    reservationId,
+                    token
+                })({ order: repos.order });
+            }
+        }
         // 予約検索
         // 取得属性最適化(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: reservation.project.id },
-                agent: params.agent,
-                reservationId,
-                token
-            })({ order: repos.order });
-        }
         // UseActionを作成する
         const reservationAsObject = {
             id: reservation.id,
@@ -92,8 +52,6 @@ function useReservation(params) {
         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: [maskUnderName(reservation)],
             object: [reservationAsObject] }, (typeof ((_b = params.location) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
             ? {
                 location: {
@@ -111,14 +69,6 @@ function useReservation(params) {
         try {
             // 使用日時と同時更新(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にエラー結果を追加

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

@@ -0,0 +1,15 @@
+import * as factory from '../../factory';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+/**
+ * 予約使用のためのチケットトークンを検証する
+ */
+export declare function verifyToken4reservation(params: {
+    project: {
+        id: string;
+    };
+    agent: factory.action.check.token.IAgent;
+    reservationId: string;
+    token: string;
+}): (repos: {
+    order: OrderRepo;
+}) => Promise<void>;

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

@@ -0,0 +1,56 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyToken4reservation = void 0;
+const factory = require("../../factory");
+const code_1 = require("../code");
+/**
+ * 予約使用のためのチケットトークンを検証する
+ */
+function verifyToken4reservation(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const payload = yield (0, code_1.verifyToken)({
+            project: params.project,
+            agent: params.agent,
+            token: params.token
+        })({});
+        switch (payload.typeOf) {
+            case factory.order.OrderType.Order:
+                // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
+                const order = yield repos.order.findByOrderNumberAndReservationId({
+                    orderNumber: payload.orderNumber,
+                    reservationId: params.reservationId
+                });
+                // ステータス検証
+                switch (order.orderStatus) {
+                    case factory.orderStatus.OrderDelivered:
+                        break;
+                    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');
+                // }
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
+        }
+    });
+}
+exports.verifyToken4reservation = verifyToken4reservation;

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

@@ -6,4 +6,5 @@ import { cancelPendingReservation, cancelReservation } from './reserve/cancelRes
 import { checkInRerservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { useReservation } from './reserve/useReservation';
-export { maskUnderName, cancelPendingReservation, cancelReservation, checkInRerservation, confirmReservation, useReservation };
+import { verifyToken4reservation } from './reserve/verifyToken4reservation';
+export { maskUnderName, cancelPendingReservation, cancelReservation, checkInRerservation, confirmReservation, useReservation, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useReservation = exports.confirmReservation = exports.checkInRerservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
+exports.verifyToken4reservation = exports.useReservation = exports.confirmReservation = exports.checkInRerservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
 /**
  * 予約サービス
  */
@@ -15,3 +15,5 @@ const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
 const useReservation_1 = require("./reserve/useReservation");
 Object.defineProperty(exports, "useReservation", { enumerable: true, get: function () { return useReservation_1.useReservation; } });
+const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");
+Object.defineProperty(exports, "verifyToken4reservation", { enumerable: true, get: function () { return verifyToken4reservation_1.verifyToken4reservation; } });

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

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.useReservation.IData): IOperation<void>;

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

@@ -0,0 +1,34 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.call = void 0;
+const action_1 = require("../../repo/action");
+const order_1 = require("../../repo/order");
+const reservation_1 = require("../../repo/reservation");
+const task_1 = require("../../repo/task");
+const reserve_1 = require("../reserve");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        yield (0, reserve_1.useReservation)(Object.assign(Object.assign({ project: data.project, agent: data.agent, object: data.object, 
+            // タスク作成前に検証済なので検証不要
+            verifyToken: false }, (typeof ((_a = data.instrument) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { instrument: data.instrument } : undefined), (typeof ((_b = data.location) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { location: data.location } : undefined))({
+            action: new action_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)
+        });
+    });
+}
+exports.call = call;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.15",
-    "@cinerino/sdk": "3.157.0-alpha.2",
+    "@chevre/factory": "4.313.0-alpha.17",
+    "@cinerino/sdk": "3.157.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.76"
+  "version": "21.2.0-alpha.78"
 }