@chevre/domain 21.2.0-alpha.13 → 21.2.0-alpha.131

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

@@ -27,7 +27,7 @@ declare const modelName = "Trip";
 /**
  * トリップスキーマ
  */
-declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").ResolveSchemaOptions<{
+declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
     id: true;
     read: string;
@@ -51,8 +51,16 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
         minimize: false;
         versionKey: false;
     };
-}>, {
+}, {
     typeOf: string;
     project?: any;
-}>;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    typeOf: string;
+    project?: any;
+}>> & Omit<import("mongoose").FlatRecord<{
+    typeOf: string;
+    project?: any;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+}, never>>;
 export { modelName, schema };

package/lib/chevre/repo/offer.js

@@ -25,6 +25,7 @@ const uniqid = require("uniqid");
 const factory = require("../factory");
 const offer_1 = require("./mongoose/schemas/offer");
 const offerCatalog_1 = require("./mongoose/schemas/offerCatalog");
+const settings_1 = require("../settings");
 /**
  * オファーリポジトリ
  */
@@ -409,7 +410,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_OFFER_MONGO_CONDITIONS(params);
             return this.offerModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -434,7 +435,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price']) !== undefined) {
                 query.sort({ 'priceSpecification.price': params.sort['priceSpecification.price'] });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

package/lib/chevre/repo/offerCatalog.js

@@ -178,33 +178,6 @@ class MongoRepository {
                 .exec();
         });
     }
-    // public async findById(params: {
-    //     id: string;
-    // }): Promise<factory.offerCatalog.IOfferCatalog> {
-    //     const doc = await this.offerCatalogModel.findOne(
-    //         {
-    //             _id: params.id
-    //         },
-    //         {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0
-    //         }
-    //     )
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
-    //     }
-    //     return doc.toObject();
-    // }
-    // public async count(
-    //     params: factory.offerCatalog.ISearchConditions
-    // ): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.offerCatalogModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-    //         .setOptions({ maxTimeMS: 10000 })
-    //         .exec();
-    // }
     search(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -0,0 +1,22 @@
+import { Connection } from 'mongoose';
+import * as factory from '../factory';
+interface IProjection {
+    [key: string]: 0 | 1;
+}
+/**
+ * アイテムコンディションリポジトリ
+ */
+export declare class MongoRepository {
+    private readonly offerItemConditionModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: factory.offerItemCondition.ISearchConditions): any[];
+    findById(params: {
+        id: string;
+    }): Promise<factory.offerItemCondition.IOfferItemCondition>;
+    search(params: factory.offerItemCondition.ISearchConditions, projection?: IProjection): Promise<factory.offerItemCondition.IOfferItemCondition[]>;
+    save(params: factory.offerItemCondition.IOfferItemCondition): Promise<factory.offerItemCondition.IOfferItemCondition>;
+    deleteById(params: {
+        id: string;
+    }): Promise<void>;
+}
+export {};

package/lib/chevre/repo/offerItemCondition.js

@@ -0,0 +1,121 @@
+"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());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongoRepository = void 0;
+const factory = require("../factory");
+const offerItemCondition_1 = require("./mongoose/schemas/offerItemCondition");
+const settings_1 = require("../settings");
+/**
+ * アイテムコンディションリポジトリ
+ */
+class MongoRepository {
+    constructor(connection) {
+        this.offerItemConditionModel = connection.model(offerItemCondition_1.modelName, offerItemCondition_1.schema);
+    }
+    static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f;
+        const andConditions = [];
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const idIn = (_d = params.id) === null || _d === void 0 ? void 0 : _d.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
+        }
+        const identifierEq = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({ identifier: { $eq: identifierEq } });
+        }
+        const identifierIn = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$in;
+        if (Array.isArray(identifierIn)) {
+            andConditions.push({ identifier: { $in: identifierIn } });
+        }
+        return andConditions;
+    }
+    findById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.offerItemConditionModel.findOne({ _id: params.id }, {
+                __v: 0,
+                createdAt: 0,
+                updatedAt: 0
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.offerItemConditionModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    search(params, projection) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const positiveProjectionExists = (projection !== undefined && projection !== null)
+                ? Object.values(projection)
+                    .some((value) => value !== 0)
+                : false;
+            const query = this.offerItemConditionModel.find((conditions.length > 0) ? { $and: conditions } : {}, (positiveProjectionExists)
+                ? projection
+                : Object.assign(Object.assign({}, projection), { __v: 0, createdAt: 0, updatedAt: 0 }));
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
+            }
+            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.identifier) !== undefined) {
+                query.sort({ identifier: params.sort.identifier });
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
+        });
+    }
+    save(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let doc;
+            if (params.id === '') {
+                doc = yield this.offerItemConditionModel.create(params);
+            }
+            else {
+                const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
+                doc = yield this.offerItemConditionModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                    .exec();
+            }
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.offerItemConditionModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    deleteById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.offerItemConditionModel.findOneAndRemove({ _id: params.id })
+                .exec();
+        });
+    }
+}
+exports.MongoRepository = MongoRepository;

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 /**
@@ -34,7 +58,9 @@ export declare class MongoRepository {
         additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
         name?: string;
         orderNumber: string;
-    }): Promise<void>;
+    }): Promise<{
+        updatedAt: Date;
+    }>;
     findById(params: {
         id: string;
         inclusion: string[];
@@ -62,7 +88,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リストを検索する
      */
@@ -70,7 +98,11 @@ export declare class MongoRepository {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffer(params: factory.order.ISearchConditions, projection?: any): Promise<factory.order.IOrder[]>;
+    searchWithUnwoundAcceptedOffer(params: factory.order.ISearchConditions, projection?: {
+        [key: string]: any;
+    }): Promise<Omit<factory.order.IOrder[], 'acceptedOffers'> & {
+        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered> | factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    }>;
     /**
      * 特典口座情報が未保管であれば保管する
      */
@@ -86,4 +118,24 @@ export declare class MongoRepository {
             $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;
+    }[]>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

package/lib/chevre/repo/order.js

@@ -14,6 +14,7 @@ const factory = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
 const errorHandler_1 = require("../errorHandler");
 const order_2 = require("../factory/order");
+const settings_1 = require("../settings");
 /**
  * 注文リポジトリ
  */
@@ -779,14 +780,17 @@ class MongoRepository {
             const doc = yield this.orderModel.findOneAndUpdate({ orderNumber: { $eq: params.orderNumber } }, {
                 $set: Object.assign(Object.assign({}, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), (typeof params.name === 'string') ? { name: params.name } : undefined)
             }, {
+                new: true,
                 projection: {
-                    _id: 1
+                    _id: 1,
+                    updatedAt: 1
                 }
             })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);
             }
+            return { updatedAt: doc.updatedAt };
         });
     }
     findById(params) {
@@ -885,7 +889,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.orderModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -896,8 +900,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)
@@ -910,7 +921,7 @@ class MongoRepository {
             }
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
@@ -925,7 +936,7 @@ class MongoRepository {
                 .select({
                 'acceptedOffers.id': 1
             });
-            const orders = yield query.setOptions({ maxTimeMS: 10000 })
+            const orders = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => {
                 return doc.toObject();
@@ -975,7 +986,7 @@ class MongoRepository {
                     .skip(params.limit * (page - 1));
             }
             return aggregate.allowDiskUse(true)
-                .option({ maxTimeMS: 10000 })
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -1002,13 +1013,54 @@ class MongoRepository {
             if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
                 return [];
             }
-            const reservationNumbers = yield this.orderModel.distinct('acceptedOffers.itemOffered.reservationNumber', {
-                orderNumber: params.orderNumber.$in
+            return this.orderModel.distinct('acceptedOffers.itemOffered.reservationNumber', {
+                'acceptedOffers.itemOffered.reservationNumber': { $exists: true },
+                orderNumber: { $in: params.orderNumber.$in }
             })
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
-            return [...new Set(reservationNumbers)];
         });
     }
+    /**
+     * 注文に含まれるイベント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 })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/ownershipInfo.js

@@ -14,6 +14,7 @@ const uuid = require("uuid");
 const ownershipInfo_1 = require("./mongoose/schemas/ownershipInfo");
 const errorHandler_1 = require("../errorHandler");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 所有権リポジトリ
  */
@@ -276,12 +277,6 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    // public async count(params: factory.ownershipInfo.ISearchConditions): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.ownershipInfoModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-    //         .setOptions({ maxTimeMS: 10000 })
-    //         .exec();
-    // }
     /**
      * 所有権を検索する
      */
@@ -300,7 +295,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.ownedFrom) !== undefined) {
                 query.sort({ ownedFrom: params.sort.ownedFrom });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

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

@@ -37,7 +37,7 @@ export declare class MongoRepository {
     /**
      * 施設を保管する
      */
-    saveMovieTheater(params: factory.place.movieTheater.IPlace): Promise<factory.place.movieTheater.IPlace>;
+    saveMovieTheater(params: factory.place.movieTheater.IPlaceWithoutScreeningRoom): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom>;
     saveMovieTheaterByBranchCode4coa(params: factory.place.movieTheater.IPlace): Promise<factory.place.movieTheater.IPlace>;
     findMovieTheaterByBranchCode(params: {
         project: {
@@ -58,12 +58,22 @@ export declare class MongoRepository {
      */
     findById(params: {
         id: string;
-    }, projection?: any): Promise<factory.place.movieTheater.IPlace>;
+    }, inclusion: string[], exclusion: string[]): Promise<factory.place.movieTheater.IPlace>;
     deleteMovieTheaterById(params: {
         id: string;
     }): Promise<void>;
-    createScreeningRoom(screeningRoom: factory.place.screeningRoom.IPlace): Promise<void>;
-    updateScreeningRoom(screeningRoom: factory.place.screeningRoom.IPlace, $unset: any): Promise<void>;
+    createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>): Promise<{
+        /**
+         * 施設ID
+         */
+        id: string;
+    }>;
+    updateScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>, $unset: any): Promise<{
+        /**
+         * 施設ID
+         */
+        id: string;
+    }>;
     deleteScreeningRoom(screeningRoom: {
         project: {
             id: string;
@@ -78,7 +88,12 @@ export declare class MongoRepository {
              */
             branchCode: string;
         };
-    }): Promise<void>;
+    }): Promise<{
+        /**
+         * 施設ID
+         */
+        id: string;
+    }>;
     createScreeningRoomSection(screeningRoomSection: IScreeningRoomSectionWithoutContainsPlace): Promise<void>;
     updateScreeningRoomSection(screeningRoomSection: factory.place.screeningRoomSection.IPlace, $unset: any): Promise<void>;
     searchScreeningRoomSections(searchConditions: factory.place.screeningRoomSection.ISearchConditions & {