@chevre/domain 21.2.0-alpha.15 → 21.2.0-alpha.151

package/lib/chevre/repo/categoryCode.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const categoryCode_1 = require("./mongoose/schemas/categoryCode");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 区分リポジトリ
  */
@@ -32,7 +33,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         // MongoDB検索条件
         const andConditions = [];
         // tslint:disable-next-line:no-single-line-block-comment
@@ -48,16 +49,13 @@ class MongoRepository {
                 }
             }
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.id !== undefined && params.id !== null) {
-            if (typeof params.id.$eq === 'string') {
-                andConditions.push({
-                    _id: {
-                        $eq: params.id.$eq
-                    }
-                });
-            }
+        const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const idIn = (_b = params.id) === null || _b === void 0 ? void 0 : _b.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -81,7 +79,7 @@ class MongoRepository {
                 });
             }
         }
-        const codeValueEq = (_a = params.codeValue) === null || _a === void 0 ? void 0 : _a.$eq;
+        const codeValueEq = (_c = params.codeValue) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof codeValueEq === 'string') {
             andConditions.push({
                 codeValue: {
@@ -90,7 +88,7 @@ class MongoRepository {
                 }
             });
         }
-        const codeValueIn = (_b = params.codeValue) === null || _b === void 0 ? void 0 : _b.$in;
+        const codeValueIn = (_d = params.codeValue) === null || _d === void 0 ? void 0 : _d.$in;
         if (Array.isArray(codeValueIn)) {
             andConditions.push({
                 codeValue: {
@@ -113,7 +111,7 @@ class MongoRepository {
                 }
             }
         }
-        const inCodeSetIdentifierIn = (_d = (_c = params.inCodeSet) === null || _c === void 0 ? void 0 : _c.identifier) === null || _d === void 0 ? void 0 : _d.$in;
+        const inCodeSetIdentifierIn = (_f = (_e = params.inCodeSet) === null || _e === void 0 ? void 0 : _e.identifier) === null || _f === void 0 ? void 0 : _f.$in;
         if (Array.isArray(inCodeSetIdentifierIn)) {
             andConditions.push({
                 'inCodeSet.identifier': {
@@ -122,7 +120,7 @@ class MongoRepository {
                 }
             });
         }
-        const paymentMethodTypeOfEq = (_f = (_e = params.paymentMethod) === null || _e === void 0 ? void 0 : _e.typeOf) === null || _f === void 0 ? void 0 : _f.$eq;
+        const paymentMethodTypeOfEq = (_h = (_g = params.paymentMethod) === null || _g === void 0 ? void 0 : _g.typeOf) === null || _h === void 0 ? void 0 : _h.$eq;
         if (typeof paymentMethodTypeOfEq === 'string') {
             andConditions.push({
                 'paymentMethod.typeOf': {
@@ -131,7 +129,7 @@ class MongoRepository {
                 }
             });
         }
-        const paymentMethodTypeOfIn = (_h = (_g = params.paymentMethod) === null || _g === void 0 ? void 0 : _g.typeOf) === null || _h === void 0 ? void 0 : _h.$in;
+        const paymentMethodTypeOfIn = (_k = (_j = params.paymentMethod) === null || _j === void 0 ? void 0 : _j.typeOf) === null || _k === void 0 ? void 0 : _k.$in;
         if (Array.isArray(paymentMethodTypeOfIn)) {
             andConditions.push({
                 'paymentMethod.typeOf': {
@@ -140,7 +138,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+        const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -155,21 +153,35 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.categoryCodeModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
     /**
      * 検索
      */
-    search(params) {
+    search(params, inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.categoryCodeModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            });
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const query = this.categoryCodeModel.find((conditions.length > 0) ? { $and: conditions } : {}, 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)
@@ -180,7 +192,7 @@ class MongoRepository {
             if (params.sort !== undefined) {
                 query.sort(params.sort);
             }
-            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/code.js

@@ -15,6 +15,7 @@ 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");
 /**
  * 承認コードリポジトリ
  */
@@ -177,7 +178,7 @@ class MongoRepository {
         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: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -200,7 +201,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.validFrom) !== undefined) {
                 query.sort({ validFrom: params.sort.validFrom });
             }
-            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/comment.d.ts

@@ -34,7 +34,10 @@ export declare class MongoRepository {
     /**
      * 検索
      */
-    search(params: factory.creativeWork.comment.ISearchConditions): Promise<factory.creativeWork.comment.IComment[]>;
+    search(params: factory.creativeWork.comment.ISearchConditions & {
+        inclusion: string[];
+        exclusion: string[];
+    }): Promise<factory.creativeWork.comment.IComment[]>;
     findById(params: {
         id: string;
     }): Promise<factory.creativeWork.comment.IComment>;

package/lib/chevre/repo/comment.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const comments_1 = require("./mongoose/schemas/comments");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * コメントリポジトリ
  */
@@ -42,12 +43,27 @@ class MongoRepository {
     search(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.commentModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            });
+            const query = this.commentModel.find((conditions.length > 0) ? { $and: conditions } : {})
+                .select(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)
@@ -58,7 +74,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.dateCreated) !== undefined) {
                 query.sort({ dateCreated: params.sort.dateCreated });
             }
-            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/confirmationNumber.d.ts

@@ -4,7 +4,6 @@ import { RedisClientType } from 'redis';
  */
 export declare class RedisRepository {
     private static readonly REDIS_KEY_PREFIX_NEW;
-    private static readonly REDIS_KEY_PREFIX;
     private readonly redisClient;
     constructor(redisClient: RedisClientType);
     private static alignDigits;

package/lib/chevre/repo/confirmationNumber.js

@@ -16,7 +16,6 @@ const util = require("util");
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
 const factory = require("../factory");
-const settings_1 = require("../settings");
 const CONFIRMATION_NUMBER_MIN_LENGH = 4;
 /**
  * 確認番号リポジトリ
@@ -34,19 +33,9 @@ class RedisRepository {
         return aligndNumber;
     }
     static createKey(params) {
-        const useNewKey = params.orderDate instanceof Date
-            && moment(params.orderDate)
-                .isSameOrAfter(settings_1.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM);
-        if (useNewKey) {
-            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX_NEW, moment(params.orderDate)
-                .tz('Asia/Tokyo')
-                .format('YYMM'));
-        }
-        else {
-            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, moment(params.orderDate)
-                .tz('Asia/Tokyo')
-                .format('YYMM'));
-        }
+        return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX_NEW, moment(params.orderDate)
+            .tz('Asia/Tokyo')
+            .format('YYMM'));
     }
     /**
      * 発行する
@@ -81,5 +70,4 @@ class RedisRepository {
     }
 }
 RedisRepository.REDIS_KEY_PREFIX_NEW = 'confirmationNumber';
-RedisRepository.REDIS_KEY_PREFIX = 'cinerino:confirmationNumber';
 exports.RedisRepository = RedisRepository;

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

@@ -34,9 +34,7 @@ export declare class MongoRepository {
     /**
      * コンテンツを保管する
      */
-    saveMovie(params: factory.creativeWork.movie.ICreativeWork): Promise<import("mongoose").LeanDocument<any> & Required<{
-        _id: unknown;
-    }>>;
+    saveMovie(params: factory.creativeWork.movie.ICreativeWork): Promise<any>;
     findMovieById(params: {
         id: string;
     }): Promise<factory.creativeWork.movie.ICreativeWork>;
@@ -44,7 +42,7 @@ export declare class MongoRepository {
     /**
      * コンテンツを検索する
      */
-    searchMovies(params: factory.creativeWork.movie.ISearchConditions): Promise<factory.creativeWork.movie.ICreativeWork[]>;
+    searchMovies(params: factory.creativeWork.movie.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<factory.creativeWork.movie.ICreativeWork[]>;
     /**
      * コンテンツを削除する
      */

package/lib/chevre/repo/creativeWork.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const creativeWork_1 = require("./mongoose/schemas/creativeWork");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * コンテンツリポジトリ
  */
@@ -32,7 +33,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // MongoDB検索条件
         const andConditions = [
             {
@@ -65,6 +66,14 @@ class MongoRepository {
                 }
             });
         }
+        const idEq = (_f = params.id) === null || _f === void 0 ? void 0 : _f.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const idIn = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
+        }
         if (typeof params.identifier === 'string') {
             if (params.identifier.length > 0) {
                 andConditions.push({
@@ -73,13 +82,13 @@ class MongoRepository {
             }
         }
         else {
-            const identifierEq = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$eq;
+            const identifierEq = (_h = params.identifier) === null || _h === void 0 ? void 0 : _h.$eq;
             if (typeof identifierEq === 'string') {
                 andConditions.push({
                     identifier: { $eq: identifierEq }
                 });
             }
-            const identifierIn = (_g = params.identifier) === null || _g === void 0 ? void 0 : _g.$in;
+            const identifierIn = (_j = params.identifier) === null || _j === void 0 ? void 0 : _j.$in;
             if (Array.isArray(identifierIn)) {
                 andConditions.push({
                     identifier: { $in: identifierIn }
@@ -155,7 +164,7 @@ class MongoRepository {
                 });
             }
         }
-        const additionalPropertyElemMatch = (_h = params.additionalProperty) === null || _h === void 0 ? void 0 : _h.$elemMatch;
+        const additionalPropertyElemMatch = (_k = params.additionalProperty) === null || _k === void 0 ? void 0 : _k.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -205,22 +214,36 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.creativeWorkModel.countDocuments({ $and: conditions })
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
     /**
      * コンテンツを検索する
      */
-    searchMovies(params) {
+    searchMovies(params, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.creativeWorkModel.find({ $and: conditions }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            });
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const query = this.creativeWorkModel.find({ $and: conditions }, 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)
@@ -231,7 +254,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.identifier) !== undefined) {
                 query.sort({ identifier: params.sort.identifier });
             }
-            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/customer.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const customer_1 = require("./mongoose/schemas/customer");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 顧客リポジトリ
  */
@@ -120,7 +121,7 @@ class MongoRepository {
             if (((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.branchCode) !== undefined) {
                 query.sort({ branchCode: conditions.sort.branchCode });
             }
-            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/emailMessage.d.ts

@@ -1,27 +1,3 @@
-/// <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';
 export type IEmailMessage = factory.creativeWork.message.email.ICreativeWork;
@@ -50,9 +26,7 @@ export declare class MongoRepository {
     private readonly emailMessageModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: ISearchConditions): any[];
-    save(params: IEmailMessage): Promise<import("mongoose").LeanDocument<any> & Required<{
-        _id: unknown;
-    }>>;
+    save(params: IEmailMessage): Promise<any>;
     findById(params: {
         id: string;
     }): Promise<IEmailMessage>;

package/lib/chevre/repo/emailMessage.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const emailMessages_1 = require("./mongoose/schemas/emailMessages");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * Eメールメッセージリポジトリ
  */
@@ -107,7 +108,7 @@ class MongoRepository {
             if (params.sort !== undefined) {
                 query.sort(params.sort);
             }
-            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/event.d.ts

@@ -169,12 +169,38 @@ export declare class MongoRepository {
     updateAggregationById<T extends factory.eventType>(params: {
         id: string;
     }, update: IUpdateAggregateReservationParams | IUpdateAggregateUseActionsParams): Promise<factory.event.IEvent<T>>;
-    bulkWrite(bulkWriteOps: any[]): Promise<BulkWriteOpResultObject>;
+    bulkWrite(bulkWriteOps: any[]): Promise<BulkWriteOpResultObject & {
+        mongoose?: {
+            validationErrors: import("mongoose").Error[];
+        } | undefined;
+    }>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;
     }): Promise<import("mongodb").UpdateResult>;
+    /**
+     * 既存施設コンテンツの最大バージョンを集計する
+     */
+    aggregateScreeningEventMaxVersion(params: {
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        workPerformed: {
+            identifier: {
+                $eq: string;
+            };
+        };
+        location: {
+            branchCode: {
+                $in: string[];
+            };
+        };
+    }): Promise<{
+        maxVersion: string;
+    }>;
     aggregateEvent(params: {
         project?: {
             id?: {