@chevre/domain 21.23.0 → 21.24.1

package/example/src/chevre/findReservationByCode.ts

@@ -9,20 +9,37 @@ mongoose.Model.on('index', (...args) => {
     console.error('******** index event emitted. ********\n', args);
 });
 
+const CODE = '068cb0ba-8529-4a2b-8cf5-890d5af9c536';
+const RESERVATION_ID = '589701779538948-0';
+// const RESERVATION_ID = '589701779538948-1';
+
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
     const authorizationRepo = await chevre.repository.Code.createInstance(mongoose.connection);
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
     const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
 
+    await (await chevre.service.reserve.createService()).verifyToken4reservation({
+        project: { id: project.id },
+        agent: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        reservationId: RESERVATION_ID,
+        ticket: {
+            ticketToken: CODE
+        }
+    })({
+        authorization: authorizationRepo,
+        order: orderRepo
+    });
+    console.log('verified.');
+
     const result = await (await chevre.service.reserve.createService()).findByCode({
         project: { id: project.id },
-        code: '068cb0ba-8529-4a2b-8cf5-890d5af9c536',
-        id: '589701779538948-0'
+        code: CODE,
+        id: RESERVATION_ID
     })({
-        acceptedOffer: acceptedOfferRepo,
         authorization: authorizationRepo,
+        order: orderRepo,
         reservation: reservationRepo
     });
     // tslint:disable-next-line:no-null-keyword

package/example/src/chevre/migrateProjectMakesOffer.ts

@@ -8,8 +8,8 @@ enum ROLE_NAME {
     Customer = 'customer',
     POS = 'pos'
 }
-const CLIENT_ID = '5glmsqlnlmbri3bgruddoe78lb';
-const CUSTOMER_TYPE = 'POS';
+const CLIENT_ID = '5an0cmki8v29vdmk627kdo1r0p';
+const CUSTOMER_TYPE = 'Enduser';
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -51,13 +51,17 @@ async function main() {
             console.log(
                 'updating project...',
                 iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, iamMember.member.name, i);
-            await makesOfferRepo.updateOne({
-                availableAtOrFrom: { id: iamMember.member.id },
-                eligibleCustomerType: [{
-                    codeValue: CUSTOMER_TYPE
-                }],
-                offeredBy: { id: iamMember.project.id }
-            });
+            try {
+                await makesOfferRepo.updateOne({
+                    availableAtOrFrom: { id: iamMember.member.id },
+                    eligibleCustomerType: [{
+                        codeValue: CUSTOMER_TYPE
+                    }],
+                    offeredBy: { id: iamMember.project.id }
+                });
+            } catch (error) {
+                console.error(error);
+            }
             updateCount += 1;
             console.log(
                 'updated.',

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

@@ -1,9 +1,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-import { modelName } from './mongoose/schemas/authorization';
 export type IObject = factory.authorization.IObject;
 export type ICode = string;
-export { modelName };
 /**
  * 承認コードリポジトリ
  */
@@ -24,16 +22,14 @@ export declare class MongoRepository {
         expiresInSeconds: number;
     }[]): Promise<factory.authorization.IAuthorization[]>;
     /**
-     * コードでデータを検索する
+     * コードで承認対象を検索する
      */
-    findOne(params: {
+    findValidObjectByCode(params: {
         project: {
             id: string;
-            typeOf: factory.organizationType.Project;
         };
         code: ICode;
     }): Promise<IObject>;
-    count(params: factory.authorization.ISearchConditions): Promise<number>;
     search(params: factory.authorization.ISearchConditions): Promise<factory.authorization.IAuthorization[]>;
     /**
      * 有効期限を一定期間過ぎた承認を削除する

package/lib/chevre/repo/code.js

@@ -9,12 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoRepository = exports.modelName = void 0;
+exports.MongoRepository = void 0;
 const moment = require("moment");
 const uuid = require("uuid");
 const factory = require("../factory");
 const authorization_1 = require("./mongoose/schemas/authorization");
-Object.defineProperty(exports, "modelName", { enumerable: true, get: function () { return authorization_1.modelName; } });
 const settings_1 = require("../settings");
 /**
  * 承認コードリポジトリ
@@ -55,20 +54,14 @@ class MongoRepository {
             /* istanbul ignore else */
             if (Array.isArray(object.ids)) {
                 andConditions.push({
-                    'object.id': {
-                        $exists: true,
-                        $in: object.ids
-                    }
+                    'object.id': { $exists: true, $in: object.ids }
                 });
             }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (Array.isArray(object.typeOfs)) {
                 andConditions.push({
-                    'object.typeOf': {
-                        $exists: true,
-                        $in: object.typeOfs
-                    }
+                    'object.typeOf': { $exists: true, $in: object.typeOfs }
                 });
             }
             // tslint:disable-next-line:no-single-line-block-comment
@@ -78,20 +71,14 @@ class MongoRepository {
                 /* istanbul ignore else */
                 if (Array.isArray(object.typeOfGood.ids)) {
                     andConditions.push({
-                        'object.typeOfGood.id': {
-                            $exists: true,
-                            $in: object.typeOfGood.ids
-                        }
+                        'object.typeOfGood.id': { $exists: true, $in: object.typeOfGood.ids }
                     });
                 }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (Array.isArray(object.typeOfGood.typeOfs)) {
                     andConditions.push({
-                        'object.typeOfGood.typeOf': {
-                            $exists: true,
-                            $in: object.typeOfGood.typeOfs
-                        }
+                        'object.typeOfGood.typeOf': { $exists: true, $in: object.typeOfGood.typeOfs }
                     });
                 }
             }
@@ -102,7 +89,7 @@ class MongoRepository {
         //     });
         // }
         if (params.validFrom instanceof Date) {
-            andConditions.push({ validUntil: { $exists: true, $gte: params.validFrom } });
+            andConditions.push({ validUntil: { $gte: params.validFrom } });
         }
         if (params.validThrough instanceof Date) {
             andConditions.push({ validFrom: { $lte: params.validThrough } });
@@ -114,47 +101,40 @@ class MongoRepository {
      */
     publish(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const saveParams = params.map((p) => {
+            const saveParams = params.map(({ project, object, validFrom, expiresInSeconds }) => {
                 const code = uuid.v4();
-                return {
-                    project: p.project,
-                    code: code,
-                    object: p.object,
-                    validFrom: p.validFrom,
-                    expiresInSeconds: p.expiresInSeconds
-                };
+                return { project, code, object, validFrom, expiresInSeconds };
             });
             return this.save(saveParams);
         });
     }
     /**
-     * コードでデータを検索する
+     * コードで承認対象を検索する
      */
-    findOne(params) {
+    findValidObjectByCode(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const now = new Date();
             const doc = yield this.authorizationModel.findOne({
                 'project.id': { $eq: params.project.id },
                 code: { $eq: String(params.code) },
                 validFrom: { $lte: now },
-                validUntil: { $exists: true, $gte: now }
-            })
+                validUntil: { $gte: now }
+            }, { object: 1, _id: 0 })
+                // projection的にleanで十分
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.authorizationModel.modelName);
             }
-            const authorization = doc.toObject();
-            return authorization.object;
-        });
-    }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            return this.authorizationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
+            return doc.object;
         });
     }
+    // public async count(params: factory.authorization.ISearchConditions): Promise<number> {
+    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+    //     return this.authorizationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
+    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec();
+    // }
     search(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -199,18 +179,11 @@ class MongoRepository {
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.length > 0) {
-                const docs = params.map((p) => {
-                    const validUntil = moment(p.validFrom)
-                        .add(p.expiresInSeconds, 'seconds')
+                const docs = params.map(({ project, code, object, validFrom, expiresInSeconds }) => {
+                    const validUntil = moment(validFrom)
+                        .add(expiresInSeconds, 'seconds')
                         .toDate();
-                    return {
-                        project: p.project,
-                        typeOf: 'Authorization',
-                        code: p.code,
-                        object: p.object,
-                        validFrom: p.validFrom,
-                        validUntil: validUntil
-                    };
+                    return { project, typeOf: 'Authorization', code, object, validFrom, validUntil };
                 });
                 const result = yield this.authorizationModel.insertMany(docs, { ordered: false, rawResult: true });
                 if (result.insertedCount !== docs.length) {

package/lib/chevre/repo/mongoose/schemas/authorization.js

@@ -7,7 +7,10 @@ const settings_1 = require("../../../settings");
 const modelName = 'Authorization';
 exports.modelName = modelName;
 const schemaDefinition = {
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     typeOf: {
         type: String,
         required: true
@@ -21,7 +24,10 @@ const schemaDefinition = {
         type: Date,
         required: true
     },
-    validUntil: Date
+    validUntil: {
+        type: Date,
+        required: true
+    }
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -84,12 +90,7 @@ const indexes = [
     ],
     [
         { validUntil: 1, validFrom: 1 },
-        {
-            name: 'searchByValidUntil',
-            partialFilterExpression: {
-                validUntil: { $exists: true }
-            }
-        }
+        { name: 'searchByValidUntil-v2' }
     ],
     [
         { 'object.typeOf': 1, validFrom: 1 },

package/lib/chevre/repo/order.js

@@ -936,11 +936,13 @@ class MongoRepository {
                 } }, (typeof ((_a = params.seller) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                 ? { 'seller.id': { $exists: true, $eq: params.seller.id } }
                 : undefined), projection)
+                // projection的にleanで十分
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);
             }
-            return doc.toObject();
+            return doc;
         });
     }
     /**

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

@@ -54,8 +54,8 @@ export declare class MongoRepository {
     }): Promise<factory.reservation.IReservation<factory.reservationType.EventReservation>[]>;
     findById<T extends factory.reservationType>(params: {
         id: string;
-        inclusion?: string[];
-        exclusion?: string[];
+        inclusion?: IKeyOfProjection[];
+        exclusion?: IKeyOfProjection[];
     }): Promise<factory.reservation.IReservation<T>>;
     confirmManyIfNotExist(params: {
         provider: factory.reservation.IProvider;
@@ -115,7 +115,7 @@ export declare class MongoRepository {
     updatePartiallyById(params: {
         id: string;
         update: IUpdatePartiallyParams;
-    }): Promise<Pick<factory.reservation.eventReservation.IReservation, 'id'>>;
+    }): Promise<void>;
     deleteByIds(params: {
         project: {
             id: string;

package/lib/chevre/repo/reservation.js

@@ -878,29 +878,6 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    // public async confirmByReservationNumber(params: {
-    //     reservationNumber: string;
-    //     previousReservationStatus: factory.reservationStatusType;
-    //     underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
-    //     broker?: factory.reservation.IBroker<factory.reservationType>;
-    //     issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
-    // }): Promise<void> {
-    //     const conditions = {
-    //         reservationNumber: { $eq: String(params.reservationNumber) },
-    //         reservationStatus: { $eq: params.previousReservationStatus }
-    //     };
-    //     const update = {
-    //         // previousReservationStatusを保管(2023-01-19~)
-    //         previousReservationStatus: params.previousReservationStatus,
-    //         reservationStatus: factory.reservationStatusType.ReservationConfirmed,
-    //         modifiedTime: new Date(),
-    //         ...(params.underName !== undefined) ? { underName: params.underName } : undefined,
-    //         ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
-    //         ...(typeof params.issuedThrough?.typeOf === 'string') ? { issuedThrough: params.issuedThrough } : undefined
-    //     };
-    //     await this.reservationModel.updateMany(conditions, update)
-    //         .exec();
-    // }
     confirmManyIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const modifiedTime = new Date();
@@ -1101,7 +1078,6 @@ class MongoRepository {
                 if (doc === null) {
                     throw new factory.errors.ArgumentNull(this.reservationModel.modelName);
                 }
-                return doc.toObject();
             });
         });
     }

package/lib/chevre/service/code.js

@@ -21,22 +21,19 @@ const credentials_1 = require("../credentials");
  */
 function getToken(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const now = new Date();
-        const authorizations = yield repos.authorization.search({
-            limit: 1,
-            project: { id: { $eq: params.project.id } },
-            code: { $eq: String(params.code) },
-            validFrom: now,
-            validThrough: now
-        });
-        const authorization = authorizations.shift();
-        if (authorization === undefined) {
-            throw new factory.errors.NotFound('Authorization');
+        if (typeof params.project.id !== 'string' || params.project.id.length === 0) {
+            throw new factory.errors.ArgumentNull('project.id');
+        }
+        if (typeof params.code !== 'string' || params.code.length === 0) {
+            throw new factory.errors.ArgumentNull('code');
         }
-        const data = authorization.object;
+        const authorizationObject = yield repos.authorization.findValidObjectByCode({
+            project: { id: params.project.id },
+            code: params.code
+        });
         return new Promise((resolve, reject) => {
             // 所有権を暗号化する
-            jwt.sign(data, credentials_1.credentials.jwt.secret, 
+            jwt.sign(authorizationObject, credentials_1.credentials.jwt.secret, 
             // params.secret,
             {
                 issuer: credentials_1.credentials.jwt.issuer,

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

@@ -1,11 +1,15 @@
 import * as factory from '../../factory';
-import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AuthorizationRepo } from '../../repo/code';
+import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as ReservationRepo } from '../../repo/reservation';
 type AvailableReservationType = factory.reservationType.BusReservation | factory.reservationType.EventReservation;
 type IReservationResult = Pick<factory.reservation.IReservation<AvailableReservationType>, 'id' | 'additionalTicketText' | 'reservationStatus'> & {
     reservedTicket: {
-        ticketType: Pick<factory.reservation.ITicketType<AvailableReservationType>, 'identifier' | 'name'>;
+        ticketType: Pick<factory.reservation.ITicketType<AvailableReservationType>, 'identifier'> & {
+            name: {
+                ja?: string;
+            };
+        };
     };
 };
 declare function findByCode(params: {
@@ -20,9 +24,12 @@ declare function findByCode(params: {
      * 注文コード
      */
     code: string;
+    seller?: {
+        id?: string;
+    };
 }): (repos: {
-    acceptedOffer: AcceptedOfferRepo;
     authorization: AuthorizationRepo;
+    order: OrderRepo;
     reservation: ReservationRepo;
 }) => Promise<{
     reservation: IReservationResult;

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

@@ -13,78 +13,49 @@ exports.findByCode = void 0;
 const factory = require("../../factory");
 function findByCode(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         if (typeof params.id !== 'string' || params.id.length === 0) {
             throw new factory.errors.ArgumentNull('id');
         }
         if (typeof params.code !== 'string' || params.code.length === 0) {
             throw new factory.errors.ArgumentNull('code');
         }
-        const now = new Date();
-        const authorization = (yield repos.authorization.search({
-            limit: 1,
-            project: { id: { $eq: params.project.id } },
-            code: { $eq: params.code },
-            validFrom: now,
-            validThrough: now
-        })).shift();
-        if (authorization === undefined) {
-            throw new factory.errors.NotFound('Authorization');
-        }
-        let reservationIdInOrder;
-        let reservationTypeInOrder;
-        let offeredThroughIdentifier = factory.service.webAPI.Identifier.Chevre;
-        const data = authorization.object;
-        switch (data.typeOf) {
+        const reservationId = String(params.id);
+        const authorizationObject = yield repos.authorization.findValidObjectByCode({
+            project: { id: params.project.id },
+            code: params.code
+        });
+        switch (authorizationObject.typeOf) {
             case factory.order.OrderType.Order:
-                const { orderNumber } = data;
-                const acceptedOffer = (yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                    limit: 1,
-                    page: 1,
-                    project: { id: { $eq: params.project.id } },
-                    orderNumber: { $eq: String(orderNumber) },
-                    acceptedOffers: { itemOffered: { id: { $eq: String(params.id) } } }
-                }, ['itemOffered', 'offeredThrough'])).shift();
-                const itemOfferedTypeOf = acceptedOffer === null || acceptedOffer === void 0 ? void 0 : acceptedOffer.itemOffered.typeOf;
-                if (itemOfferedTypeOf === factory.reservationType.BusReservation
-                    || itemOfferedTypeOf === factory.reservationType.EventReservation) {
-                    reservationIdInOrder = acceptedOffer === null || acceptedOffer === void 0 ? void 0 : acceptedOffer.itemOffered.id;
-                    reservationTypeInOrder = itemOfferedTypeOf;
-                    offeredThroughIdentifier = (_a = acceptedOffer === null || acceptedOffer === void 0 ? void 0 : acceptedOffer.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier;
+                const { orderNumber } = authorizationObject;
+                if (typeof orderNumber === 'string' && orderNumber.length > 0) {
+                    // reservationIdを含む注文の存在を確認するだけでよい
+                    yield repos.order.findByOrderNumberAndReservationId({
+                        project: { id: params.project.id },
+                        orderNumber,
+                        reservationId,
+                        seller: params.seller
+                    });
                 }
                 break;
             default:
-                throw new factory.errors.NotImplemented(`authorization object typeOf: ${data.typeOf} not implemented`);
+                throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorizationObject.typeOf} not implemented`);
         }
-        let reservation;
-        if (typeof reservationIdInOrder === 'string' && typeof reservationTypeInOrder === 'string') {
-            switch (offeredThroughIdentifier) {
-                // COA対応
-                case factory.service.webAPI.Identifier.COA:
-                    throw new factory.errors.NotImplemented(`offeredThroughIdentifier: ${offeredThroughIdentifier} not implemented`);
-                default:
-                    const reservationFromRepo = (yield repos.reservation.search({
-                        project: { id: { $eq: params.project.id } },
-                        typeOf: reservationTypeInOrder,
-                        id: { $eq: reservationIdInOrder }
-                    }, { id: 1, additionalTicketText: 1, reservationStatus: 1, reservedTicket: 1 })).shift();
-                    if (reservationFromRepo !== undefined) {
-                        const { id, additionalTicketText, reservationStatus, reservedTicket } = reservationFromRepo;
-                        reservation = {
-                            id, additionalTicketText, reservationStatus,
-                            reservedTicket: {
-                                ticketType: {
-                                    identifier: reservedTicket === null || reservedTicket === void 0 ? void 0 : reservedTicket.ticketType.identifier,
-                                    name: { ja: (_b = reservedTicket === null || reservedTicket === void 0 ? void 0 : reservedTicket.ticketType.name) === null || _b === void 0 ? void 0 : _b.ja }
-                                }
-                            }
-                        };
-                    }
+        const reservationFromRepo = yield repos.reservation.findById({
+            id: reservationId,
+            inclusion: ['id', 'additionalTicketText', 'reservationStatus', 'reservedTicket'],
+            exclusion: []
+        });
+        const { id, additionalTicketText, reservationStatus, reservedTicket } = reservationFromRepo;
+        const reservation = {
+            id, additionalTicketText, reservationStatus,
+            reservedTicket: {
+                ticketType: {
+                    identifier: reservedTicket.ticketType.identifier,
+                    name: { ja: (_a = reservedTicket.ticketType.name) === null || _a === void 0 ? void 0 : _a.ja }
+                }
             }
-        }
-        if (reservation === undefined) {
-            throw new factory.errors.NotFound('Reservation');
-        }
+        };
         return { reservation };
     });
 }

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

@@ -18,13 +18,10 @@ export declare function useReservation(params: {
          */
         id: string;
     };
-    instrument?: {
-        token?: string;
-    };
+    instrument?: Pick<factory.action.consume.use.reservation.IInstrument, 'ticketToken' | 'token'>;
     location?: {
         identifier?: string;
     };
-    verifyToken: boolean;
 }): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -14,7 +14,6 @@ const createDebug = require("debug");
 const factory = require("../../factory");
 const confirmReservation_1 = require("./confirmReservation");
 const onReservationUsed_1 = require("./potentialActions/onReservationUsed");
-const verifyToken4reservation_1 = require("./verifyToken4reservation");
 const debug = createDebug('chevre-domain:service:reserve:useReservation');
 /**
  * 予約使用
@@ -22,21 +21,23 @@ const debug = createDebug('chevre-domain:service:reserve:useReservation');
 // tslint:disable-next-line:max-func-body-length
 function useReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         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 });
-            }
-        }
+        const ticketToken = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.ticketToken;
+        const token = (_b = params === null || params === void 0 ? void 0 : params.instrument) === null || _b === void 0 ? void 0 : _b.token;
+        // タスク作成前に検証済なので検証不要
+        // if (params.verifyToken === true) {
+        //     // instrument?.tokenを検証
+        //     if (typeof token === 'string') {
+        //         await verifyToken4reservation({
+        //             project: { id: params.project.id },
+        //             agent: params.agent,
+        //             reservationId,
+        //             token
+        //         })({ order: repos.order });
+        //     }
+        // }
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
         yield reserveIfNotYet({ object: params.object })(repos);
         // 予約検索
@@ -54,10 +55,10 @@ function useReservation(params) {
             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 }), 
+        const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign(Object.assign({}, (typeof token === 'string') ? { token } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }), 
             // object最適化(2023-01-30~)
             // どの予約を
-            object: [reservationAsObject] }, (typeof ((_b = params.location) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
+            object: [reservationAsObject] }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
             ? {
                 location: {
                     typeOf: factory.placeType.Place,

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

@@ -1,4 +1,5 @@
 import * as factory from '../../factory';
+import type { MongoRepository as AuthorizationRepo } from '../../repo/code';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 /**
  * 予約使用のためのチケットトークンを検証する
@@ -12,7 +13,17 @@ export declare function verifyToken4reservation(params: {
     };
     agent: factory.action.check.token.IAgent;
     reservationId: string;
-    token: string;
+    ticket: {
+        /**
+         * JWT
+         */
+        token?: string;
+        /**
+         * 承認コード
+         */
+        ticketToken?: string;
+    };
 }): (repos: {
+    authorization: AuthorizationRepo;
     order: OrderRepo;
 }) => Promise<void>;

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

@@ -17,17 +17,35 @@ 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
-        })({});
+        // JWTと承認コードの両方に対応する(2024-02-28~)
+        const { token, ticketToken } = params.ticket;
+        let payload;
+        if (typeof token === 'string' && token.length > 0) {
+            payload = yield (0, code_1.verifyToken)({
+                project: params.project,
+                agent: params.agent,
+                token
+            })({});
+        }
+        else if (typeof ticketToken === 'string' && ticketToken.length > 0) {
+            payload = yield repos.authorization.findValidObjectByCode({
+                project: { id: params.project.id },
+                code: ticketToken
+            });
+        }
+        else {
+            throw new factory.errors.ArgumentNull('ticket.token or ticket.ticketToken');
+        }
         switch (payload.typeOf) {
             case factory.order.OrderType.Order:
+                const { orderNumber } = payload;
+                if (typeof orderNumber !== 'string' || orderNumber.length === 0) {
+                    throw new factory.errors.NotFound('payload.orderNumber');
+                }
                 // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
                 const order = yield repos.order.findByOrderNumberAndReservationId({
                     project: { id: params.project.id },
-                    orderNumber: payload.orderNumber,
+                    orderNumber,
                     reservationId: params.reservationId,
                     seller: params.seller
                 });

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

@@ -7,6 +7,5 @@ import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { findByCode } from './reserve/findByCode';
 import { searchByOrder } from './reserve/searchByOrder';
-import { useReservation } from './reserve/useReservation';
 import { verifyToken4reservation } from './reserve/verifyToken4reservation';
-export { maskUnderName, cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, searchByOrder, useReservation, verifyToken4reservation };
+export { maskUnderName, cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, searchByOrder, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken4reservation = exports.useReservation = exports.searchByOrder = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
+exports.verifyToken4reservation = exports.searchByOrder = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
 /**
  * 予約サービス
  */
@@ -17,7 +17,6 @@ const findByCode_1 = require("./reserve/findByCode");
 Object.defineProperty(exports, "findByCode", { enumerable: true, get: function () { return findByCode_1.findByCode; } });
 const searchByOrder_1 = require("./reserve/searchByOrder");
 Object.defineProperty(exports, "searchByOrder", { enumerable: true, get: function () { return searchByOrder_1.searchByOrder; } });
-const useReservation_1 = require("./reserve/useReservation");
-Object.defineProperty(exports, "useReservation", { enumerable: true, get: function () { return useReservation_1.useReservation; } });
+// import { useReservation } from './reserve/useReservation';
 const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");
 Object.defineProperty(exports, "verifyToken4reservation", { enumerable: true, get: function () { return verifyToken4reservation_1.verifyToken4reservation; } });

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

@@ -49,9 +49,9 @@ function onAuthorizationCreated(params) {
         let reservationNumbers = [];
         // 発券対象イベントID
         let reservationForIds = [];
-        const authorizationObject = yield repos.code.findOne({
+        const authorizationObject = yield repos.code.findValidObjectByCode({
             code: params.code,
-            project: { id: params.project.id, typeOf: factory.organizationType.Project }
+            project: { id: params.project.id }
         });
         switch (authorizationObject.typeOf) {
             case factory.order.OrderType.Order:

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

@@ -15,16 +15,14 @@ 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 reserve_1 = require("../reserve");
+const useReservation_1 = require("../reserve/useReservation");
 /**
  * タスク実行関数
  */
 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))({
+        yield (0, useReservation_1.useReservation)(Object.assign(Object.assign({ project: data.project, agent: data.agent, object: data.object }, (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),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.357.0",
+    "@chevre/factory": "4.358.0",
     "@cinerino/sdk": "5.12.0",
     "@motionpicture/coa-service": "9.3.0-alpha.5",
     "@motionpicture/gmo-service": "5.3.0-alpha.4",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.23.0"
+  "version": "21.24.1"
 }