@chevre/domain 21.18.0-alpha.4 → 21.18.0-alpha.6

package/example/src/chevre/searchOrderAcceptedOffers.ts

@@ -8,7 +8,7 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
-    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+    const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
 
     const searchConditions: chevre.factory.order.ISearchConditions = {
         // tslint:disable-next-line:no-magic-numbers
@@ -20,7 +20,7 @@ async function main() {
         acceptedOffers: { itemOffered: { typeOf: { $in: [chevre.factory.reservationType.EventReservation] } } }
         // ...(typeof req.seller?.id === 'string') ? { seller: { id: { $eq: req.seller.id } } } : undefined // req.seller.idを考慮
     };
-    const acceptedOffers = await orderRepo.searchAcceptedOffers(searchConditions, ['itemOffered', 'id']);
+    const acceptedOffers = await acceptedOfferRepo.searchAcceptedOffers(searchConditions, ['itemOffered', 'id']);
     // tslint:disable-next-line:no-null-keyword
     console.dir(acceptedOffers, { depth: 1 });
     const reservationIds = acceptedOffers.map((acceptedOffer) => {

package/example/src/chevre/searchOrders.ts

@@ -10,28 +10,34 @@ async function main() {
 
     const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
 
-    const orders = await orderRepo.search({
-        limit: 10,
-        project: { id: { $eq: project.id } },
-        acceptedOffers: {
-            // $size: 1
-            //     itemOffered: {
-            //         issuedThrough: { typeOf: { $eq: chevre.factory.product.ProductType.MembershipService } }
+    const orders = await orderRepo.search(
+        {
+            limit: 10,
+            project: { id: { $eq: project.id } },
+            acceptedOffers: {
+                // $size: 1
+                //     itemOffered: {
+                //         issuedThrough: { typeOf: { $eq: chevre.factory.product.ProductType.MembershipService } }
+                //     }
+            },
+            orderedItem: {
+                $size: 3
+            }
+            // paymentMethods: {
+            //     paymentMethod: { identifier: { $in: ['Cash'] } }
+            //     additionalProperty: {
+            //         $in: [
+            //             { name: 'orderId', value: '0102022031518442020' },
+            //             { name: 'orderId', value: '0102022031518423030' }
+            //         ]
             //     }
+            // }
         },
-        orderedItem: {
-            $size: 3
+        {
+            orderNumber: 1,
+            customer: 1
         }
-        // paymentMethods: {
-        //     paymentMethod: { identifier: { $in: ['Cash'] } }
-        //     additionalProperty: {
-        //         $in: [
-        //             { name: 'orderId', value: '0102022031518442020' },
-        //             { name: 'orderId', value: '0102022031518423030' }
-        //         ]
-        //     }
-        // }
-    });
+    );
     console.log('orders found', orders);
     console.log(orders.length, 'orders found');
 }

package/example/src/chevre/transaction/processReturnOrder.ts

@@ -23,6 +23,7 @@ async function main() {
             id: 'xxx'
         }
     })({
+        acceptedOffer: await chevre.repository.AcceptedOffer.createInstance(mongoose.connection),
         event: await chevre.repository.Event.createInstance(mongoose.connection),
         merchantReturnPolicy: await chevre.repository.MerchantReturnPolicy.createInstance(mongoose.connection),
         offer: await chevre.repository.Offer.createInstance(mongoose.connection),

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

@@ -0,0 +1,54 @@
+import type { Connection } from 'mongoose';
+import * as factory from '../factory';
+type IProjection4searchWithUnwoundAcceptedOffers = {
+    [key in keyof Omit<factory.order.IOrder, 'acceptedOffers'>]?: 1;
+} & {
+    _id?: 0 | 1;
+};
+/**
+ * 注文オファーリポジトリ
+ */
+export declare class MongoRepository {
+    private readonly orderModel;
+    constructor(connection: Connection);
+    /**
+     * 注文の受入オファーIDリストを検索する
+     */
+    searchAcceptedOfferIds(params: factory.order.ISearchConditions): Promise<(string)[]>;
+    /**
+     * オファー展開の注文検索
+     */
+    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffers): Promise<factory.order.IOrder[]>;
+    /**
+     * オファーのみ展開して検索する
+     */
+    searchAcceptedOffers(params: factory.order.ISearchConditions, inclusion?: (keyof factory.order.IAcceptedOffer<factory.order.IItemOffered>)[]): Promise<factory.order.IAcceptedOffer<factory.order.IItemOffered>[]>;
+    /**
+     * 注文に含まれる予約番号を検索する
+     */
+    searchReservationNumbersByOrderNumbers(params: {
+        orderNumber: {
+            $in: string[];
+        };
+    }): Promise<(string)[]>;
+    /**
+     * 注文に含まれるイベントIDを検索する
+     */
+    searchReservationForIdsByOrderNumbers(params: {
+        orderNumber: {
+            $in: string[];
+        };
+    }): Promise<string[]>;
+    /**
+     * 注文に含まれるacceptedOffersを検索する
+     */
+    searchAcceptedOffersByOrderNumbers(params: {
+        orderNumber: {
+            $in: string[];
+        };
+    }): Promise<{
+        id: string;
+        priceSpecification: factory.order.ITicketPriceSpecification;
+    }[]>;
+}
+export {};

package/lib/chevre/repo/acceptedOffer.js

@@ -0,0 +1,183 @@
+"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.MongoRepository = void 0;
+const order_1 = require("./mongoose/schemas/order");
+const order_2 = require("./order");
+const settings_1 = require("../settings");
+/**
+ * 注文オファーリポジトリ
+ */
+class MongoRepository {
+    constructor(connection) {
+        this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
+    }
+    /**
+     * 注文の受入オファーIDリストを検索する
+     */
+    searchAcceptedOfferIds(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = order_2.MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const query = this.orderModel.find((conditions.length > 0) ? { $and: conditions } : {})
+                .select({
+                'acceptedOffers.id': 1
+            });
+            const orders = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec()
+                .then((docs) => docs.map((doc) => {
+                return doc.toObject();
+            }));
+            const offerIds = orders.reduce((a, b) => {
+                const offerIdsByOrder = (Array.isArray(b.acceptedOffers))
+                    ? b.acceptedOffers.filter((offer) => typeof offer.id === 'string')
+                        .map((offer) => {
+                        return String(offer.id);
+                    })
+                    : [];
+                return [...a, ...offerIdsByOrder];
+            }, []);
+            return [...new Set(offerIds)];
+        });
+    }
+    /**
+     * オファー展開の注文検索
+     */
+    searchWithUnwoundAcceptedOffers(params, projection) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = order_2.MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const aggregate = this.orderModel.aggregate();
+            // pipelineの順序に注意
+            // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.orderDate) === 'number') {
+                aggregate.sort({ orderDate: params.sort.orderDate });
+            }
+            aggregate.unwind('$acceptedOffers');
+            conditions.forEach((c) => {
+                aggregate.match(c);
+            });
+            aggregate.project(Object.assign(Object.assign({}, projection), { acceptedOffers: ['$acceptedOffers'] }));
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.limit(params.limit * page)
+                    .skip(params.limit * (page - 1));
+            }
+            return aggregate
+                // .allowDiskUse(true) // false化(2023-11-30~)
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    /**
+     * オファーのみ展開して検索する
+     */
+    searchAcceptedOffers(params, inclusion) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = order_2.MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const aggregate = this.orderModel.aggregate();
+            // pipelineの順序に注意
+            // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.orderDate) === 'number') {
+                aggregate.sort({ orderDate: params.sort.orderDate });
+            }
+            aggregate.unwind('$acceptedOffers');
+            conditions.forEach((c) => {
+                aggregate.match(c);
+            });
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                const specifiedProjection = {
+                    _id: 0
+                };
+                inclusion.forEach((key) => {
+                    specifiedProjection[key] = `$acceptedOffers.${key}`;
+                });
+                aggregate.project(specifiedProjection);
+            }
+            else {
+                aggregate.project({
+                    _id: 0,
+                    itemOffered: '$acceptedOffers.itemOffered',
+                    priceSpecification: '$acceptedOffers.priceSpecification',
+                    typeOf: '$acceptedOffers.typeOf',
+                    id: '$acceptedOffers.id',
+                    offeredThrough: '$acceptedOffers.offeredThrough',
+                    name: '$acceptedOffers.name'
+                });
+            }
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.limit(params.limit * page)
+                    .skip(params.limit * (page - 1));
+            }
+            return aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    /**
+     * 注文に含まれる予約番号を検索する
+     */
+    searchReservationNumbersByOrderNumbers(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
+                return [];
+            }
+            return this.orderModel.distinct('acceptedOffers.itemOffered.reservationNumber', {
+                'acceptedOffers.itemOffered.reservationNumber': { $exists: true },
+                orderNumber: { $in: params.orderNumber.$in }
+            })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    /**
+     * 注文に含まれるイベントIDを検索する
+     */
+    searchReservationForIdsByOrderNumbers(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
+                return [];
+            }
+            return this.orderModel.distinct('acceptedOffers.itemOffered.reservationFor.id', {
+                'acceptedOffers.itemOffered.reservationFor.id': { $exists: true },
+                orderNumber: { $in: params.orderNumber.$in }
+            })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    /**
+     * 注文に含まれるacceptedOffersを検索する
+     */
+    searchAcceptedOffersByOrderNumbers(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
+                return [];
+            }
+            const aggregate = this.orderModel.aggregate();
+            aggregate.unwind('$acceptedOffers');
+            aggregate.match({ orderNumber: { $in: params.orderNumber.$in } });
+            aggregate.project({
+                _id: 0,
+                id: '$acceptedOffers.id',
+                priceSpecification: '$acceptedOffers.priceSpecification'
+            });
+            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+}
+exports.MongoRepository = MongoRepository;

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

@@ -24,12 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof factory.order.IOrder | '_id';
-type IProjection4searchWithUnwoundAcceptedOffers = {
-    [key in keyof Omit<factory.order.IOrder, 'acceptedOffers'>]?: 1;
-} & {
-    _id?: 0 | 1;
-};
+type IKeyOfProjection = keyof Omit<factory.order.IOrder, 'acceptedOffers'> | '_id';
 /**
  * 注文リポジトリ
  */
@@ -95,7 +90,7 @@ export declare class MongoRepository {
         id: string;
         inclusion: IKeyOfProjection[];
         exclusion: IKeyOfProjection[];
-    }): Promise<factory.order.IOrder>;
+    }): Promise<Omit<factory.order.IOrder, 'acceptedOffers'>>;
     /**
      * 注文番号から注文を取得する
      */
@@ -132,46 +127,7 @@ export declare class MongoRepository {
      */
     search(params: factory.order.ISearchConditions, projection?: {
         [key in IKeyOfProjection]?: 0 | 1;
-    }): Promise<factory.order.IOrder[]>;
-    /**
-     * 注文の受入オファーIDリストを検索する
-     */
-    searchAcceptedOfferIds(params: factory.order.ISearchConditions): Promise<(string)[]>;
-    /**
-     * オファー展開の注文検索
-     */
-    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffers): Promise<factory.order.IOrder[]>;
-    /**
-     * オファーのみ展開して検索する
-     */
-    searchAcceptedOffers(params: factory.order.ISearchConditions, inclusion?: (keyof factory.order.IAcceptedOffer<factory.order.IItemOffered>)[]): Promise<factory.order.IAcceptedOffer<factory.order.IItemOffered>[]>;
-    /**
-     * 注文に含まれる予約番号を検索する
-     */
-    searchReservationNumbersByOrderNumbers(params: {
-        orderNumber: {
-            $in: string[];
-        };
-    }): Promise<(string)[]>;
-    /**
-     * 注文に含まれるイベントIDを検索する
-     */
-    searchReservationForIdsByOrderNumbers(params: {
-        orderNumber: {
-            $in: string[];
-        };
-    }): Promise<string[]>;
-    /**
-     * 注文に含まれるacceptedOffersを検索する
-     */
-    searchAcceptedOffersByOrderNumbers(params: {
-        orderNumber: {
-            $in: string[];
-        };
-    }): Promise<{
-        id: string;
-        priceSpecification: factory.order.ITicketPriceSpecification;
-    }[]>;
+    }): Promise<Omit<factory.order.IOrder, 'acceptedOffers'>[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<any>;

package/lib/chevre/repo/order.js

@@ -825,17 +825,20 @@ class MongoRepository {
     }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let projection = {};
+            let projection = { _id: 1 };
             if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
                 params.inclusion.forEach((field) => {
-                    projection[field] = 1;
+                    if (String(field) !== 'acceptedOffers') {
+                        projection[field] = 1;
+                    }
                 });
             }
             else {
                 projection = {
                     __v: 0,
                     createdAt: 0,
-                    updatedAt: 0
+                    updatedAt: 0,
+                    acceptedOffers: 0
                 };
                 if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
                     params.exclusion.forEach((field) => {
@@ -859,7 +862,9 @@ class MongoRepository {
             let projection = {};
             if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
                 params.inclusion.forEach((field) => {
-                    projection[field] = 1;
+                    if (String(field) !== 'acceptedOffers') {
+                        projection[field] = 1;
+                    }
                 });
             }
             else {
@@ -933,15 +938,29 @@ 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;
+            let projectStage = {};
+            // const projectionSpecified = projection !== undefined && projection !== null;
+            // const positiveProjectionExists: boolean = (projectionSpecified)
+            //     ? Object.values(projection)
+            //         .some((value) => value !== 0)
+            //     : false;
+            const positiveProjectionFields = (projection !== undefined && projection !== null)
+                ? Object.keys(projection)
+                    .filter((key) => projection[key] !== 0
+                    && key !== 'acceptedOffers' // defaultで隠蔽(2023-12-06~)
+                )
+                : [];
+            if (Array.isArray(positiveProjectionFields) && positiveProjectionFields.length > 0) {
+                projectStage = {};
+                positiveProjectionFields.forEach((field) => {
+                    projectStage[field] = 1;
+                });
+            }
+            else {
+                projectStage = Object.assign({ __v: 0, createdAt: 0, updatedAt: 0, acceptedOffers: 0 }, projection);
+            }
             const query = this.orderModel.find((conditions.length > 0) ? { $and: conditions } : {})
-                .select((projectionSpecified && positiveProjectionExists)
-                ? projection
-                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+                .select(projectStage);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
@@ -959,165 +978,6 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
-    /**
-     * 注文の受入オファーIDリストを検索する
-     */
-    searchAcceptedOfferIds(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.orderModel.find((conditions.length > 0) ? { $and: conditions } : {})
-                .select({
-                'acceptedOffers.id': 1
-            });
-            const orders = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => {
-                return doc.toObject();
-            }));
-            const offerIds = orders.reduce((a, b) => {
-                const offerIdsByOrder = (Array.isArray(b.acceptedOffers))
-                    ? b.acceptedOffers.filter((offer) => typeof offer.id === 'string')
-                        .map((offer) => {
-                        return String(offer.id);
-                    })
-                    : [];
-                return [...a, ...offerIdsByOrder];
-            }, []);
-            return [...new Set(offerIds)];
-        });
-    }
-    /**
-     * オファー展開の注文検索
-     */
-    searchWithUnwoundAcceptedOffers(params, projection) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const aggregate = this.orderModel.aggregate();
-            // pipelineの順序に注意
-            // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.orderDate) === 'number') {
-                aggregate.sort({ orderDate: params.sort.orderDate });
-            }
-            aggregate.unwind('$acceptedOffers');
-            conditions.forEach((c) => {
-                aggregate.match(c);
-            });
-            aggregate.project(Object.assign(Object.assign({}, projection), { acceptedOffers: ['$acceptedOffers'] }));
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                aggregate.limit(params.limit * page)
-                    .skip(params.limit * (page - 1));
-            }
-            return aggregate
-                // .allowDiskUse(true) // false化(2023-11-30~)
-                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
-    /**
-     * オファーのみ展開して検索する
-     */
-    searchAcceptedOffers(params, inclusion) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const aggregate = this.orderModel.aggregate();
-            // pipelineの順序に注意
-            // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.orderDate) === 'number') {
-                aggregate.sort({ orderDate: params.sort.orderDate });
-            }
-            aggregate.unwind('$acceptedOffers');
-            conditions.forEach((c) => {
-                aggregate.match(c);
-            });
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                const specifiedProjection = {
-                    _id: 0
-                };
-                inclusion.forEach((key) => {
-                    specifiedProjection[key] = `$acceptedOffers.${key}`;
-                });
-                aggregate.project(specifiedProjection);
-            }
-            else {
-                aggregate.project({
-                    _id: 0,
-                    itemOffered: '$acceptedOffers.itemOffered',
-                    priceSpecification: '$acceptedOffers.priceSpecification',
-                    typeOf: '$acceptedOffers.typeOf',
-                    id: '$acceptedOffers.id',
-                    offeredThrough: '$acceptedOffers.offeredThrough',
-                    name: '$acceptedOffers.name'
-                });
-            }
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                aggregate.limit(params.limit * page)
-                    .skip(params.limit * (page - 1));
-            }
-            return aggregate
-                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
-    /**
-     * 注文に含まれる予約番号を検索する
-     */
-    searchReservationNumbersByOrderNumbers(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
-                return [];
-            }
-            return this.orderModel.distinct('acceptedOffers.itemOffered.reservationNumber', {
-                'acceptedOffers.itemOffered.reservationNumber': { $exists: true },
-                orderNumber: { $in: params.orderNumber.$in }
-            })
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
-    /**
-     * 注文に含まれるイベントIDを検索する
-     */
-    searchReservationForIdsByOrderNumbers(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
-                return [];
-            }
-            return this.orderModel.distinct('acceptedOffers.itemOffered.reservationFor.id', {
-                'acceptedOffers.itemOffered.reservationFor.id': { $exists: true },
-                orderNumber: { $in: params.orderNumber.$in }
-            })
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
-    /**
-     * 注文に含まれるacceptedOffersを検索する
-     */
-    searchAcceptedOffersByOrderNumbers(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
-                return [];
-            }
-            const aggregate = this.orderModel.aggregate();
-            aggregate.unwind('$acceptedOffers');
-            aggregate.match({ orderNumber: { $in: params.orderNumber.$in } });
-            aggregate.project({
-                _id: 0,
-                id: '$acceptedOffers.id',
-                priceSpecification: '$acceptedOffers.priceSpecification'
-            });
-            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
     getCursor(conditions, projection) {
         return this.orderModel.find(conditions, projection)
             .sort({ orderDate: factory.sortType.Descending })

package/lib/chevre/repository.d.ts

@@ -1,6 +1,7 @@
 /**
  * リポジトリ
  */
+import type { MongoRepository as AcceptedOfferRepo } from './repo/acceptedOffer';
 import type { MongoRepository as AccountRepo } from './repo/account';
 import type { MongoRepository as AccountingReportRepo } from './repo/accountingReport';
 import type { MongoRepository as AccountTitleRepo } from './repo/accountTitle';
@@ -51,6 +52,10 @@ import type { RedisRepository as ConfirmationNumberRepo } from './repo/confirmat
 import type { RedisRepository as OrderNumberRepo } from './repo/orderNumber';
 import type { GMORepository as CreditCardRepo } from './repo/paymentMethod/creditCard';
 import type { CognitoRepository as PersonRepo } from './repo/person';
+export type AcceptedOffer = AcceptedOfferRepo;
+export declare namespace AcceptedOffer {
+    function createInstance(...params: ConstructorParameters<typeof AcceptedOfferRepo>): Promise<AcceptedOfferRepo>;
+}
 export type Account = AccountRepo;
 export declare namespace Account {
     function createInstance(...params: ConstructorParameters<typeof AccountRepo>): Promise<AccountRepo>;

package/lib/chevre/repository.js

@@ -9,7 +9,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.rateLimit = void 0;
+var AcceptedOffer;
+(function (AcceptedOffer) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/acceptedOffer'))).MongoRepository;
+            }
+            return new repo(...params);
+        });
+    }
+    AcceptedOffer.createInstance = createInstance;
+})(AcceptedOffer = exports.AcceptedOffer || (exports.AcceptedOffer = {}));
 var Account;
 (function (Account) {
     let repo;

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const code_1 = require("../../repo/code");
@@ -26,6 +27,7 @@ const reserve_1 = require("../reserve");
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield onAuthorizationCreated(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             code: new code_1.MongoRepository(settings.connection),
@@ -38,6 +40,7 @@ function call(data) {
     });
 }
 exports.call = call;
+// tslint:disable-next-line:max-func-body-length
 function onAuthorizationCreated(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 発券対象予約ID
@@ -55,24 +58,31 @@ function onAuthorizationCreated(params) {
                 // 注文検索
                 const orderNumber = authorizationObject.orderNumber;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
-                    // 最適化(2023-01-28~)
-                    const order = yield repos.order.findByOrderNumber({
-                        orderNumber,
-                        project: { id: params.project.id },
-                        inclusion: ['acceptedOffers'],
-                        exclusion: []
+                    reservationNumbers = yield repos.acceptedOffer.searchReservationNumbersByOrderNumbers({
+                        orderNumber: { $in: [orderNumber] }
                     });
-                    const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-                    reservationNumbers = acceptedOffers
-                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
-                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-                        .map((o) => o.itemOffered.reservationNumber);
-                    reservationNumbers = [...new Set(reservationNumbers)];
-                    reservationForIds = acceptedOffers
-                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
-                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-                        .map((o) => String(o.itemOffered.reservationFor.id));
-                    reservationForIds = [...new Set(reservationForIds)];
+                    reservationForIds = yield repos.acceptedOffer.searchReservationForIdsByOrderNumbers({
+                        orderNumber: { $in: [orderNumber] }
+                    });
+                    // const order: Pick<factory.order.IOrder, 'acceptedOffers'> = await repos.order.findByOrderNumber(
+                    //     {
+                    //         orderNumber,
+                    //         project: { id: params.project.id },
+                    //         inclusion: ['acceptedOffers'],
+                    //         exclusion: []
+                    //     }
+                    // );
+                    // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+                    // reservationNumbers = acceptedOffers
+                    //     .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
+                    //         || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                    //     .map((o) => (<factory.order.IReservation>o.itemOffered).reservationNumber);
+                    // reservationNumbers = [...new Set(reservationNumbers)];
+                    // reservationForIds = acceptedOffers
+                    //     .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
+                    //         || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                    //     .map((o) => String((<factory.order.IReservation>o.itemOffered).reservationFor.id));
+                    // reservationForIds = [...new Set(reservationForIds)];
                 }
                 break;
             case 'OwnershipInfo':

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

@@ -412,8 +412,8 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                     orderNumbers: [String(fromLocation.orderNumber)],
                     confirmationNumbers: [String(fromLocation.confirmationNumber)]
                 }, {
-                    acceptedOffers: 0,
-                    orderedItem: 0
+                    identifier: 1,
+                    orderStatus: 1
                 });
                 const order = orders.shift();
                 if (order === undefined) {
@@ -467,8 +467,7 @@ function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
                     orderNumbers: [String(toLocation.orderNumber)],
                     confirmationNumbers: [String(toLocation.confirmationNumber)]
                 }, {
-                    acceptedOffers: 0,
-                    orderedItem: 0
+                    identifier: 1
                 });
                 const order = orders.shift();
                 if (order === undefined) {

package/lib/chevre/service/transaction/returnOrder.d.ts

@@ -1,4 +1,5 @@
 import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as EmailMessageRepo } from '../../repo/emailMessage';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as MerchantReturnPolicyRepo } from '../../repo/merchantReturnPolicy';
@@ -11,6 +12,7 @@ import type { MongoRepository as SellerRepo } from '../../repo/seller';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 export interface IStartOperationRepos {
+    acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;
     merchantReturnPolicy: MerchantReturnPolicyRepo;
     offer: OfferRepo;

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

@@ -181,15 +181,15 @@ function fixOrders(params) {
         if (orders.length !== params.object.order.length) {
             throw new factory.errors.NotFound('Order');
         }
-        const offerIds = yield repos.order.searchAcceptedOfferIds({
+        const offerIds = yield repos.acceptedOffer.searchAcceptedOfferIds({
             project: { id: { $eq: params.project.id } },
             confirmationNumbers: [params.object.order[0].confirmationNumber],
             orderNumbers: [params.object.order[0].orderNumber]
         });
-        const eventIds = yield repos.order.searchReservationForIdsByOrderNumbers({
+        const eventIds = yield repos.acceptedOffer.searchReservationForIdsByOrderNumbers({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
         });
-        const acceptedOffers = yield repos.order.searchAcceptedOffersByOrderNumbers({
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumbers({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
         });
         return { acceptedOffers, eventIds, offerIds, orders };
@@ -208,7 +208,7 @@ function checkUsedReservationExists(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let usedReservationExists = false;
         // 注文に含まれる予約の状態検証
-        const reservationNumbers = yield repos.order.searchReservationNumbersByOrderNumbers({
+        const reservationNumbers = yield repos.acceptedOffer.searchReservationNumbersByOrderNumbers({
             orderNumber: { $in: params.orders.map((order) => order.orderNumber) }
         });
         if (reservationNumbers.length > 0) {

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.18.0-alpha.4"
+  "version": "21.18.0-alpha.6"
 }