@chevre/domain 21.15.0-alpha.6 → 21.15.0-alpha.7

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

@@ -24,6 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import { AnyExpression, Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+type IKeyOfProjection = keyof factory.categoryCode.ICategoryCode | '_id';
 /**
  * 区分リポジトリ
  */
@@ -31,21 +32,17 @@ export declare class MongoRepository {
     private readonly categoryCodeModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<factory.categoryCode.ICategoryCode>[];
-    static CREATE_AGGREGATE_PROJECTION(inclusion: string[], exclusion: (keyof factory.categoryCode.ICategoryCode)[]): {
+    static CREATE_AGGREGATE_PROJECTION(inclusion: string[], exclusion: IKeyOfProjection[]): {
         [field: string]: AnyExpression;
     };
-    count(params: factory.categoryCode.ISearchConditions): Promise<number>;
     /**
      * 集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions: factory.categoryCode.ISearchConditions, inclusion: (keyof factory.categoryCode.ICategoryCode)[], exclusion: (keyof factory.categoryCode.ICategoryCode)[]): Promise<factory.categoryCode.ICategoryCode[]>;
+    searchByAggregate(conditions: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
     /**
      * 検索
      */
-    search(params: factory.categoryCode.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<factory.categoryCode.ICategoryCode[]>;
-    findById(params: {
-        id: string;
-    }): Promise<factory.categoryCode.ICategoryCode>;
+    search(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
     save(params: {
         id?: string;
         attributes: factory.categoryCode.ICategoryCode;
@@ -70,3 +67,4 @@ export declare class MongoRepository {
     }): Promise<void>;
     getCursor(conditions: FilterQuery<factory.categoryCode.ICategoryCode>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }
+export {};

package/lib/chevre/repo/categoryCode.js

@@ -154,14 +154,14 @@ class MongoRepository {
     static CREATE_AGGREGATE_PROJECTION(inclusion, exclusion) {
         const projectStage = {
             _id: 0,
-            // id: { $toString: '$_id' },
+            id: { $toString: '$_id' },
             project: '$project',
             typeOf: '$typeOf',
             additionalProperty: '$additionalProperty',
             color: '$color',
             image: '$image',
             codeValue: '$codeValue',
-            // inCodeSet: '$inCodeSet',
+            inCodeSet: '$inCodeSet',
             name: '$name',
             paymentMethod: '$paymentMethod'
         };
@@ -178,14 +178,6 @@ class MongoRepository {
         }
         return projectStage;
     }
-    count(params) {
-        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: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
     /**
      * 集計検索(publicな属性検索が目的)
      */
@@ -253,20 +245,6 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
-    findById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.categoryCodeModel.findOne({ _id: params.id }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.categoryCodeModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let doc;

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

@@ -23,15 +23,16 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection } from 'mongoose';
+import { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+type IKeyOfProjection = keyof factory.creativeWork.movie.ICreativeWork | '_id';
 /**
  * コンテンツリポジトリ
  */
 export declare class MongoRepository {
     private readonly creativeWorkModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.movie.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.movie.ISearchConditions): FilterQuery<import("@chevre/factory/lib/creativeWork/movie").ICreativeWork>[];
     /**
      * コンテンツを保管する
      */
@@ -42,13 +43,10 @@ export declare class MongoRepository {
     upsertMoviesByIdentifier(params: {
         attributes: factory.creativeWork.movie.ICreativeWork;
     }[]): Promise<BulkWriteResult | void>;
-    findMovieById(params: {
-        id: string;
-    }): Promise<factory.creativeWork.movie.ICreativeWork>;
     /**
      * コンテンツを検索する
      */
-    searchMovies(params: factory.creativeWork.movie.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<factory.creativeWork.movie.ICreativeWork[]>;
+    searchMovies(params: factory.creativeWork.movie.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.creativeWork.movie.ICreativeWork[]>;
     /**
      * コンテンツを削除する
      */
@@ -60,9 +58,10 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: FilterQuery<factory.creativeWork.movie.ICreativeWork>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     unsetUnnecessaryFields(params: {
-        filter: any;
+        filter: FilterQuery<factory.creativeWork.movie.ICreativeWork>;
         $unset: any;
     }): Promise<import("mongodb").UpdateResult>;
 }
+export {};

package/lib/chevre/repo/creativeWork.js

@@ -21,6 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const mongoose_1 = require("mongoose");
 const creativeWork_1 = require("./mongoose/schemas/creativeWork");
 const factory = require("../factory");
 const settings_1 = require("../settings");
@@ -34,111 +35,65 @@ class MongoRepository {
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        // MongoDB検索条件
         const andConditions = [
-            {
-                typeOf: factory.creativeWorkType.Movie
-            }
+            { typeOf: { $eq: factory.creativeWorkType.Movie } }
         ];
         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
-                }
-            });
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
         const contentRatingEq = (_c = params.contentRating) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof contentRatingEq === 'string') {
-            andConditions.push({
-                contentRating: {
-                    $exists: true,
-                    $eq: contentRatingEq
-                }
-            });
+            andConditions.push({ contentRating: { $exists: true, $eq: contentRatingEq } });
         }
         const distributorCodeValueEq = (_e = (_d = params.distributor) === null || _d === void 0 ? void 0 : _d.codeValue) === null || _e === void 0 ? void 0 : _e.$eq;
         if (typeof distributorCodeValueEq === 'string') {
-            andConditions.push({
-                'distributor.codeValue': {
-                    $exists: true,
-                    $eq: distributorCodeValueEq
-                }
-            });
+            andConditions.push({ 'distributor.codeValue': { $exists: true, $eq: distributorCodeValueEq } });
         }
         const idEq = (_f = params.id) === null || _f === void 0 ? void 0 : _f.$eq;
         if (typeof idEq === 'string') {
-            andConditions.push({ _id: { $eq: idEq } });
+            // andConditions.push({ _id: { $eq: idEq } });
+            andConditions.push({ _id: { $eq: new mongoose_1.Types.ObjectId(idEq) } });
         }
         const idIn = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$in;
         if (Array.isArray(idIn)) {
-            andConditions.push({ _id: { $in: idIn } });
+            // andConditions.push({ _id: { $in: idIn } });
+            andConditions.push({ _id: { $in: idIn.map((id) => new mongoose_1.Types.ObjectId(id)) } });
         }
         if (typeof params.identifier === 'string') {
             if (params.identifier.length > 0) {
-                andConditions.push({
-                    identifier: { $regex: new RegExp(params.identifier) }
-                });
+                andConditions.push({ identifier: { $regex: new RegExp(params.identifier) } });
             }
         }
         else {
             const identifierEq = (_h = params.identifier) === null || _h === void 0 ? void 0 : _h.$eq;
             if (typeof identifierEq === 'string') {
-                andConditions.push({
-                    identifier: { $eq: identifierEq }
-                });
+                andConditions.push({ identifier: { $eq: identifierEq } });
             }
             const identifierIn = (_j = params.identifier) === null || _j === void 0 ? void 0 : _j.$in;
             if (Array.isArray(identifierIn)) {
-                andConditions.push({
-                    identifier: { $in: identifierIn }
-                });
+                andConditions.push({ identifier: { $in: identifierIn } });
             }
         }
         if (typeof params.name === 'string' && params.name.length > 0) {
             // 多言語名称対応(2022-07-11~)
             andConditions.push({
                 $or: [
-                    {
-                        name: {
-                            $exists: true,
-                            $regex: new RegExp(params.name)
-                        }
-                    },
-                    {
-                        'name.ja': {
-                            $exists: true,
-                            $regex: new RegExp(params.name)
-                        }
-                    },
-                    {
-                        'name.en': {
-                            $exists: true,
-                            $regex: new RegExp(params.name)
-                        }
-                    }
+                    { name: { $exists: true, $regex: new RegExp(params.name) } },
+                    { 'name.ja': { $exists: true, $regex: new RegExp(params.name) } },
+                    { 'name.en': { $exists: true, $regex: new RegExp(params.name) } }
                 ]
             });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.datePublishedFrom !== undefined) {
-            andConditions.push({
-                datePublished: {
-                    $exists: true,
-                    $gte: params.datePublishedFrom
-                }
-            });
+            andConditions.push({ datePublished: { $exists: true, $gte: params.datePublishedFrom } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.datePublishedThrough !== undefined) {
-            andConditions.push({
-                datePublished: {
-                    $exists: true,
-                    $lte: params.datePublishedThrough
-                }
-            });
+            andConditions.push({ datePublished: { $exists: true, $lte: params.datePublishedThrough } });
         }
         const offersAvailableFrom = (_k = params.offers) === null || _k === void 0 ? void 0 : _k.availableFrom;
         if (offersAvailableFrom instanceof Date) {
@@ -171,7 +126,7 @@ class MongoRepository {
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
-                doc = yield this.creativeWorkModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                doc = yield this.creativeWorkModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true })
                     .exec();
             }
             if (doc === null) {
@@ -216,20 +171,6 @@ class MongoRepository {
             }
         });
     }
-    findMovieById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.creativeWorkModel.findOne({ _id: params.id }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.creativeWorkModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
     /**
      * コンテンツを検索する
      */
@@ -276,7 +217,7 @@ class MongoRepository {
      */
     deleteMovie(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.creativeWorkModel.findOneAndRemove({ _id: params.id })
+            yield this.creativeWorkModel.findOneAndRemove({ _id: { $eq: params.id } })
                 .exec();
         });
     }

package/package.json

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