@chevre/domain 25.0.0-alpha.3 → 25.0.0-alpha.4

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

@@ -1,15 +1,23 @@
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
+import { IDocType } from './mongoose/schemas/emailMessages';
 import { factory } from '../factory';
-export type IEmailMessage = factory.creativeWork.message.email.ICreativeWork;
+export type IEmailMessage = IDocType & {
+    id: string;
+};
 export interface ISearchConditions {
     limit?: number;
     page?: number;
-    sort?: any;
+    sort?: {
+        identifier?: factory.sortType;
+    };
     project?: {
         id?: {
             $eq?: string;
         };
     };
+    id?: {
+        $eq?: string;
+    };
     identifier?: {
         $eq?: string;
     };
@@ -29,12 +37,9 @@ export interface ISearchConditions {
 export declare class EmailMessageRepo {
     private readonly emailMessageModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
     save(params: IEmailMessage): Promise<any>;
-    findById(params: {
-        id: string;
-    }): Promise<IEmailMessage>;
-    search(params: ISearchConditions): Promise<IEmailMessage[]>;
+    findEmailMessages(params: ISearchConditions): Promise<IEmailMessage[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/emailMessage.js

@@ -4,6 +4,17 @@ exports.EmailMessageRepo = void 0;
 const emailMessages_1 = require("./mongoose/schemas/emailMessages");
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
+const DEFAULT_PROJECTION = {
+    _id: 0,
+    id: { $toString: '$_id' },
+    project: 1,
+    typeOf: 1,
+    identifier: 1,
+    name: 1,
+    about: 1,
+    sender: 1,
+    text: 1,
+};
 /**
  * Eメールメッセージリポジトリ
  */
@@ -13,28 +24,24 @@ class EmailMessageRepo {
         this.emailMessageModel = connection.model(emailMessages_1.modelName, (0, emailMessages_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        // MongoDB検索条件
-        const andConditions = [{ typeOf: factory_1.factory.creativeWorkType.EmailMessage }]; // eslint-disable-line @typescript-eslint/no-explicit-any
+        const andConditions = [
+        // { typeOf: factory.creativeWorkType.EmailMessage }
+        ];
         const projectIdEq = params.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
-            andConditions.push({
-                'project.id': { $eq: projectIdEq }
-            });
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const idEq = params.id?.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
         }
         const identifierEq = params.identifier?.$eq;
         if (typeof identifierEq === 'string') {
-            andConditions.push({
-                identifier: { $eq: identifierEq }
-            });
+            andConditions.push({ identifier: { $eq: identifierEq } });
         }
         const aboutIdentifierEq = params.about?.identifier?.$eq;
         if (typeof aboutIdentifierEq === 'string') {
-            andConditions.push({
-                'about.identifier': {
-                    $exists: true,
-                    $eq: aboutIdentifierEq
-                }
-            });
+            andConditions.push({ 'about.identifier': { $exists: true, $eq: aboutIdentifierEq } });
         }
         return andConditions;
     }
@@ -45,7 +52,7 @@ class EmailMessageRepo {
         }
         else {
             // 上書き禁止属性を除外(2022-08-24~)
-            const { id, identifier, project, typeOf, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
+            const { id: _id, identifier: _identifier, project: _project, typeOf: _typeOf, ...updateFields } = params;
             doc = await this.emailMessageModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
                 .exec();
         }
@@ -54,37 +61,20 @@ class EmailMessageRepo {
         }
         return doc.toObject();
     }
-    async findById(params) {
-        const doc = await this.emailMessageModel.findOne({ _id: params.id }, {
-            __v: 0,
-            createdAt: 0,
-            updatedAt: 0
-        })
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.emailMessageModel.modelName);
-        }
-        return doc.toObject();
-    }
-    async search(params) {
+    async findEmailMessages(params) {
         const conditions = EmailMessageRepo.CREATE_MONGO_CONDITIONS(params);
-        const query = this.emailMessageModel.find({ $and: conditions }, {
-            __v: 0,
-            createdAt: 0,
-            updatedAt: 0
-        });
+        const query = this.emailMessageModel.find({ $and: conditions }, DEFAULT_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)
                 .skip(params.limit * (page - 1));
         }
-        /* istanbul ignore else */
         if (params.sort !== undefined) {
             query.sort(params.sort);
         }
         return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec()
-            .then((docs) => docs.map((doc) => doc.toObject()));
+            .lean()
+            .exec();
     }
     async deleteById(params) {
         await this.emailMessageModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })

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

@@ -1,7 +1,15 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-type IDocType = factory.creativeWork.message.email.ICreativeWork;
+type IDocType = Pick<factory.creativeWork.message.email.ICreativeWork, 'identifier' | 'name' | 'project' | 'sender' | 'text' | 'typeOf'> & {
+    about: Pick<factory.creativeWork.message.email.IAbout, 'name' | 'typeOf'> & {
+        /**
+         * 現時点でOnEventStatusChangedしかサポートしていない
+         * 2026-06-18
+         */
+        identifier: factory.creativeWork.message.email.AboutIdentifier.OnEventStatusChanged;
+    };
+};
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;

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

@@ -8,12 +8,9 @@ const settings_1 = require("../../../settings");
 const modelName = 'EmailMessage';
 exports.modelName = modelName;
 const schemaDefinition = {
-    project: mongoose_1.SchemaTypes.Mixed,
-    typeOf: {
-        type: String,
-        required: true
-    },
-    identifier: String,
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    typeOf: { type: String, required: true },
+    identifier: { type: String, required: true },
     name: mongoose_1.SchemaTypes.Mixed,
     about: mongoose_1.SchemaTypes.Mixed,
     sender: mongoose_1.SchemaTypes.Mixed,
@@ -54,25 +51,13 @@ function createSchema() {
     return schema;
 }
 const indexes = [
-    // [ // discontinue(2024-08-07~)
-    //     { createdAt: 1 },
-    //     { name: 'searchByCreatedAt' }
-    // ],
-    // [
-    //     { updatedAt: 1 },
-    //     { name: 'searchByUpdatedAt' }
-    // ],
     [
         { identifier: 1 },
-        {
-            name: 'searchByIdentifier'
-        }
+        { name: 'searchByIdentifier' }
     ],
     [
         { 'project.id': 1, identifier: 1 },
-        {
-            name: 'searchByProjectId'
-        }
+        { name: 'searchByProjectId' }
     ]
 ];
 exports.indexes = indexes;

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.3"
+  "version": "25.0.0-alpha.4"
 }