@chevre/domain 26.0.0-alpha.23 → 26.0.0-alpha.24

package/lib/chevre/repo/authorization.js

@@ -69,21 +69,21 @@ class AuthorizationRepo {
                     'object.typeOf': { $exists: true, $in: object.typeOfs }
                 });
             }
-            /* istanbul ignore else */
-            if (object.typeOfGood !== undefined) {
-                /* istanbul ignore else */
-                if (Array.isArray(object.typeOfGood.ids)) {
-                    andConditions.push({
-                        'object.typeOfGood.id': { $exists: true, $in: object.typeOfGood.ids }
-                    });
-                }
-                /* istanbul ignore else */
-                if (Array.isArray(object.typeOfGood.typeOfs)) {
-                    andConditions.push({
-                        'object.typeOfGood.typeOf': { $exists: true, $in: object.typeOfGood.typeOfs }
-                    });
-                }
-            }
+            // /* istanbul ignore else */
+            // if (object.typeOfGood !== undefined) {
+            //     /* istanbul ignore else */
+            //     if (Array.isArray(object.typeOfGood.ids)) {
+            //         andConditions.push({
+            //             'object.typeOfGood.id': { $exists: true, $in: object.typeOfGood.ids }
+            //         });
+            //     }
+            //     /* istanbul ignore else */
+            //     if (Array.isArray(object.typeOfGood.typeOfs)) {
+            //         andConditions.push({
+            //             'object.typeOfGood.typeOf': { $exists: true, $in: object.typeOfGood.typeOfs }
+            //         });
+            //     }
+            // }
         }
         if (params.validFrom instanceof Date) {
             andConditions.push({ validUntil: { $gte: params.validFrom } });

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

@@ -59,6 +59,13 @@ const schemaOptions = {
     }
 };
 const indexes = [
+    [
+        { startDate: 1 },
+        {
+            name: 'ttlByStartDate', // support ttl index(2026-08-09~)
+            expireAfterSeconds: 17280000 // 200 days
+        }
+    ],
     [
         { 'project.id': 1, startDate: -1 },
         {

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

@@ -56,6 +56,13 @@ const schemaOptions = {
     }
 };
 const indexes = [
+    [
+        { dateCreated: 1 },
+        {
+            name: 'ttlByDateCreated', // support ttl index(2026-08-09~)
+            expireAfterSeconds: 17280000 // 200 days
+        }
+    ],
     [
         { dateCreated: -1 },
         { name: 'searchByDateCreated' }

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

@@ -36,8 +36,15 @@ const schemaOptions = {
 const indexes = [
     [
         { aggregateStart: 1 },
-        { name: 'searchByAggregateStart' }
+        {
+            name: 'ttlByAggregateStart', // support ttl index(2026-08-09~)
+            expireAfterSeconds: 15552000 // 180 days
+        }
     ],
+    // [
+    //     { aggregateStart: 1 },
+    //     { name: 'searchByAggregateStart' }
+    // ],
     [
         { typeOf: 1, aggregateStart: 1 },
         { name: 'searchByTypeOf' }

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

@@ -54,6 +54,16 @@ const schemaOptions = {
     }
 };
 const indexes = [
+    [
+        { endDate: 1 },
+        {
+            name: 'ttlByEndDate', // support ttl index(2026-08-09~)
+            expireAfterSeconds: 17280000, // 200 days
+            partialFilterExpression: {
+                endDate: { $exists: true }
+            }
+        }
+    ],
     [
         { transactionNumber: 1 },
         {

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

@@ -58,6 +58,13 @@ const schemaOptions = {
     }
 };
 const indexes = [
+    [
+        { validUntil: 1 },
+        {
+            name: 'ttlByValidUntil', // support ttl index(2026-08-09~)
+            expireAfterSeconds: 86400 // 1 days
+        }
+    ],
     [
         // コードはユニークなはず
         { code: 1 },
@@ -113,24 +120,24 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'object.typeOfGood.typeOf': 1, validFrom: 1 },
-        {
-            name: 'searchByObjectTypeOfGoodTypeOf',
-            partialFilterExpression: {
-                'object.typeOfGood.typeOf': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'object.typeOfGood.id': 1, validFrom: 1 },
-        {
-            name: 'searchByObjectTypeOfGoodId',
-            partialFilterExpression: {
-                'object.typeOfGood.id': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { 'object.typeOfGood.typeOf': 1, validFrom: 1 },
+    //     {
+    //         name: 'searchByObjectTypeOfGoodTypeOf',
+    //         partialFilterExpression: {
+    //             'object.typeOfGood.typeOf': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'object.typeOfGood.id': 1, validFrom: 1 },
+    //     {
+    //         name: 'searchByObjectTypeOfGoodId',
+    //         partialFilterExpression: {
+    //             'object.typeOfGood.id': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'audience.id': 1, validFrom: 1 },
         {

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

@@ -68,8 +68,15 @@ const schemaOptions = {
 const indexes = [
     [
         { datePublished: 1 },
-        { name: 'searchByDatePublished' }
+        {
+            name: 'ttlByDatePublished', // support ttl index(2026-08-09~)
+            expireAfterSeconds: 604800 // 7 days
+        }
     ],
+    // [
+    //     { datePublished: 1 },
+    //     { name: 'searchByDatePublished' }
+    // ],
     [
         { identifier: 1, datePublished: 1 },
         { name: 'searchByIdentifier' }

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

@@ -57,156 +57,11 @@ const indexes = [
     ],
     [
         { 'project.id': 1, ownedFrom: -1 },
-        {
-            name: 'searchByProjectId-v20220721'
-        }
-    ],
-    [
-        { typeOf: 1, ownedFrom: -1 },
-        { name: 'searchByTypeOf-v2' }
-    ],
-    // [
-    //     { identifier: 1, ownedFrom: -1 },
-    //     {
-    //         name: 'searchByIdentifier-v2',
-    //         partialFilterExpression: {
-    //             identifier: { $exists: true }
-    //         }
-    //     }
-    // ],
-    [
-        { identifier: 1, ownedFrom: -1 },
-        { name: 'identifier' }
+        { name: 'searchByProjectId-v20220721' }
     ],
-    [
-        { 'acquiredFrom.id': 1, ownedFrom: -1 },
-        {
-            name: 'searchByAcquiredFromId-v2',
-            partialFilterExpression: {
-                'acquiredFrom.id': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'ownedBy.typeOf': 1, ownedFrom: -1 },
-        {
-            name: 'searchByOwnedByTypeOf',
-            partialFilterExpression: {
-                'ownedBy.typeOf': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'ownedBy.id': 1, ownedFrom: -1 },
-        {
-            name: 'searchByOwnedById',
-            partialFilterExpression: {
-                'ownedBy.id': { $exists: true }
-            }
-        }
-    ],
-    // [
-    //     { 'ownedBy.memberOf.membershipNumber': 1, ownedFrom: -1 },
-    //     {
-    //         name: 'searchByOwnedByMemberOfMembershipNumber',
-    //         partialFilterExpression: {
-    //             'ownedBy.memberOf.membershipNumber': { $exists: true }
-    //         }
-    //     }
-    // ],
-    // [
-    //     { ownedThrough: -1, ownedFrom: -1 },
-    //     {
-    //         name: 'searchByOwnedThrough-v2',
-    //         partialFilterExpression: {
-    //             ownedThrough: { $exists: true }
-    //         }
-    //     }
-    // ],
     [
         { ownedThrough: 1, ownedFrom: -1 },
         { name: 'ownedThrough' }
-    ],
-    [
-        { 'typeOfGood.typeOf': 1, ownedFrom: -1 },
-        {
-            name: 'searchByTypeOfGoodTypeOf-v2',
-            partialFilterExpression: {
-                'typeOfGood.typeOf': { $exists: true }
-            }
-        }
-    ],
-    // [
-    //     { 'typeOfGood.reservedTicket.ticketToken': 1, ownedFrom: -1 },
-    //     {
-    //         name: 'searchByTypeOfGoofReservedTicketToken',
-    //         partialFilterExpression: {
-    //             'typeOfGood.reservedTicket.ticketToken': { $exists: true }
-    //         }
-    //     }
-    // ],
-    [
-        { 'typeOfGood.id': 1, ownedFrom: -1 },
-        {
-            name: 'searchByTypeOfGoodId',
-            partialFilterExpression: {
-                'typeOfGood.id': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'typeOfGood.identifier': 1, ownedFrom: -1 },
-        {
-            name: 'searchByTypeOfGoodIdentifier',
-            partialFilterExpression: {
-                'typeOfGood.identifier': { $exists: true }
-            }
-        }
-    ],
-    // [
-    //     { 'typeOfGood.membershipFor.id': 1, ownedFrom: -1 },
-    //     {
-    //         name: 'searchByTypeOfGoodMembershipForId',
-    //         partialFilterExpression: {
-    //             'typeOfGood.membershipFor.id': { $exists: true }
-    //         }
-    //     }
-    // ],
-    [
-        { 'typeOfGood.issuedThrough.id': 1, ownedFrom: -1 },
-        {
-            name: 'searchByTypeOfGoodIssuedThroughId',
-            partialFilterExpression: {
-                'typeOfGood.issuedThrough.id': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'typeOfGood.issuedThrough.typeOf': 1, ownedFrom: -1 },
-        {
-            name: 'searchByTypeOfGoodIssuedThroughTypeOf',
-            partialFilterExpression: {
-                'typeOfGood.issuedThrough.typeOf': { $exists: true }
-            }
-        }
-    ],
-    // [
-    //     { 'typeOfGood.accountNumber': 1, ownedFrom: -1 },
-    //     {
-    //         name: 'searchByTypeOfGoodAccountNumber',
-    //         partialFilterExpression: {
-    //             'typeOfGood.accountNumber': { $exists: true }
-    //         }
-    //     }
-    // ],
-    [
-        { 'typeOfGood.reservationNumber': 1, ownedFrom: -1 },
-        {
-            name: 'searchByTypeOfGoodReservationNumber',
-            partialFilterExpression: {
-                'typeOfGood.reservationNumber': { $exists: true }
-            }
-        }
     ]
 ];
 exports.indexes = indexes;

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

@@ -41,8 +41,15 @@ const schemaOptions = {
 const indexes = [
     [
         { dateIssued: 1 },
-        { name: 'searchByDateIssued' }
+        {
+            name: 'ttlByDateIssued', // support ttl index(2026-08-09~)
+            expireAfterSeconds: 604800 // 7 days
+        }
     ],
+    // [
+    //     { dateIssued: 1 },
+    //     { name: 'searchByDateIssued' }
+    // ],
     [
         { 'project.id': 1, dateIssued: 1 },
         { name: 'searchByProjectId' }

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

@@ -1,29 +1,27 @@
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import { IDocType } from './mongoose/schemas/ownershipInfo';
 import { factory } from '../factory';
-export type IOwnershipInfoWithId = factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+type IOwnershipInfoWithId = factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
     id: string;
 };
+type IFindParams = factory.ownershipInfo.ISearchConditions;
 /**
  * 所有権リポジトリ
  */
 export declare class OwnershipInfoRepo {
     private readonly ownershipInfoModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.ownershipInfo.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'ownedFromGte' | 'ownedFromLte' | 'project'>): FilterQuery<IDocType>[];
     /**
      * なければ作成する
      */
     createIfNotExistByIdentifier(ownershipInfo: Omit<IOwnershipInfoWithId, 'id'>): Promise<{
         id: string;
     }>;
-    projectFieldsById(params: {
-        id: string;
-    }, inclusion?: (keyof IOwnershipInfoWithId)[]): Promise<IOwnershipInfoWithId>;
     /**
      * 所有権を検索する
      */
-    projectFields(params: factory.ownershipInfo.ISearchConditions, inclusion?: (keyof IOwnershipInfoWithId)[]): Promise<IOwnershipInfoWithId[]>;
+    projectFields(params: IFindParams, inclusion?: (keyof IOwnershipInfoWithId)[]): Promise<IOwnershipInfoWithId[]>;
     /**
      * 識別子から所有期限を変更する
      * 存在しない場合undefinedを返す
@@ -35,51 +33,6 @@ export declare class OwnershipInfoRepo {
         identifier: string;
         ownedThrough: Date;
     }): Promise<Pick<IOwnershipInfoWithId, 'id' | 'identifier'> | undefined>;
-    /**
-     * 所有者の所有権を全て削除する
-     */
-    deleteByOwnedById(params: {
-        project: {
-            id: string;
-        };
-        ownedBy: {
-            id: string;
-        };
-    }): Promise<{
-        deletedCount?: number;
-    }>;
-    /**
-     * 特定所有者の特定所有権を削除する
-     */
-    deleteByIdAndOwnedById(params: {
-        project: {
-            id: string;
-        };
-        id: string;
-        ownedBy: {
-            id: string;
-        };
-    }): Promise<{
-        deletedCount?: number;
-    }>;
-    /**
-     * 識別子から所有期限切れの所有権を削除する
-     */
-    deleteExpiredByIdentifiers(params: {
-        project: {
-            id: string;
-        };
-        identifiers: string[];
-        ownedThrough: {
-            $lte: Date;
-        };
-    }): Promise<void>;
-    /**
-     * 所有期限切れの所有権を削除する
-     */
-    deleteExpiredOwnershipInfos(params: {
-        ownedThroughLte: Date;
-    }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>, "id"> & {
         _id: string;
     } & Required<{
@@ -93,30 +46,9 @@ export declare class OwnershipInfoRepo {
     }> & {
         __v: number;
     }) | null>;
-    /**
-     * 所有者を追加する
-     */
-    addOwnerIfNotExist(params: {
-        /**
-         * 所有権ID
-         */
-        id: string;
-        ownedBy: factory.ownershipInfo.IOwner;
-    }): Promise<void>;
-    /**
-     * 所有者を削除する
-     */
-    removeOwnerIfExist(params: {
-        /**
-         * 所有権ID
-         */
-        id: string;
-        ownedBy: {
-            id: string;
-        };
-    }): Promise<void>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
+export {};

package/lib/chevre/repo/ownershipInfo.js

@@ -15,169 +15,10 @@ class OwnershipInfoRepo {
         this.ownershipInfoModel = connection.model(ownershipInfo_1.modelName, (0, ownershipInfo_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        const andConditions = []; // eslint-disable-line @typescript-eslint/no-explicit-any
-        /* istanbul ignore else */
-        if (params.project !== undefined) {
-            if (params.project.id !== undefined && params.project.id !== null) {
-                if (typeof params.project.id.$eq === 'string') {
-                    andConditions.push({
-                        'project.id': {
-                            $eq: params.project.id.$eq
-                        }
-                    });
-                }
-            }
-        }
-        const typeOfGoodIdentifierEq = params.typeOfGood?.identifier?.$eq;
-        if (typeof typeOfGoodIdentifierEq === 'string') {
-            andConditions.push({
-                'typeOfGood.identifier': {
-                    $exists: true,
-                    $eq: typeOfGoodIdentifierEq
-                }
-            });
-        }
-        const typeOfGoodIssuedThroughIdEq = params.typeOfGood?.issuedThrough?.id?.$eq;
-        if (typeof typeOfGoodIssuedThroughIdEq === 'string') {
-            andConditions.push({
-                'typeOfGood.issuedThrough.id': {
-                    $exists: true,
-                    $eq: typeOfGoodIssuedThroughIdEq
-                }
-            });
-        }
-        const typeOfGoodIssuedThroughTypeOfEq = params.typeOfGood?.issuedThrough?.typeOf?.$eq;
-        if (typeof typeOfGoodIssuedThroughTypeOfEq === 'string') {
-            andConditions.push({
-                'typeOfGood.issuedThrough.typeOf': {
-                    $exists: true,
-                    $eq: typeOfGoodIssuedThroughTypeOfEq
-                }
-            });
-        }
-        const typeOfGoodTypeOf = params.typeOfGood?.typeOf;
-        if (typeof typeOfGoodTypeOf === 'string') {
-            andConditions.push({
-                'typeOfGood.typeOf': {
-                    $exists: true,
-                    $eq: typeOfGoodTypeOf
-                }
-            });
-        }
-        else {
-            const typeOfGoodTypeOfEq = typeOfGoodTypeOf?.$eq;
-            if (typeof typeOfGoodTypeOfEq === 'string') {
-                andConditions.push({
-                    'typeOfGood.typeOf': {
-                        $exists: true,
-                        $eq: typeOfGoodTypeOfEq
-                    }
-                });
-            }
-            const typeOfGoodTypeOfIn = typeOfGoodTypeOf?.$in;
-            if (Array.isArray(typeOfGoodTypeOfIn)) {
-                andConditions.push({
-                    'typeOfGood.typeOf': {
-                        $exists: true,
-                        $in: typeOfGoodTypeOfIn
-                    }
-                });
-            }
-        }
-        // 互換性維持対応
-        // if (params.typeOfGood === undefined || params.typeOfGood === null) {
-        //     params.typeOfGood = {};
-        // }
-        // if (typeof (<any>params.typeOfGood).id === 'string') {
-        //     params.typeOfGood.id = { $eq: (<any>params.typeOfGood).id };
-        // }
-        // if (Array.isArray((<any>params.typeOfGood).ids)) {
-        //     params.typeOfGood.id = { $in: (<any>params.typeOfGood).ids };
-        // }
-        const typeOfGoodIdEq = params.typeOfGood?.id?.$eq;
-        if (typeof typeOfGoodIdEq === 'string') {
-            andConditions.push({
-                'typeOfGood.id': {
-                    $exists: true,
-                    $eq: typeOfGoodIdEq
-                }
-            });
-        }
-        const typeOfGoodIdIn = params.typeOfGood?.id?.$in;
-        if (Array.isArray(typeOfGoodIdIn)) {
-            andConditions.push({
-                'typeOfGood.id': {
-                    $exists: true,
-                    $in: typeOfGoodIdIn
-                }
-            });
-        }
-        /* istanbul ignore else */
-        if (Array.isArray(params.ids)) {
-            andConditions.push({
-                _id: { $in: params.ids }
-            });
-        }
-        /* istanbul ignore else */
-        if (Array.isArray(params.identifiers)) {
-            andConditions.push({
-                identifier: {
-                    $exists: true,
-                    $in: params.identifiers
-                }
-            });
-        }
-        const ownedByTypeOfEq = params.ownedBy?.typeOf?.$eq;
-        if (typeof ownedByTypeOfEq === 'string') {
-            andConditions.push({
-                'ownedBy.typeOf': {
-                    $exists: true,
-                    $eq: ownedByTypeOfEq
-                }
-            });
-        }
-        /* istanbul ignore else */
-        const ownedById = params.ownedBy?.id;
-        if (typeof ownedById === 'string') {
-            andConditions.push({
-                'ownedBy.id': {
-                    $exists: true,
-                    $eq: ownedById
-                }
-            });
-        }
-        else {
-            const ownedByIdIn = ownedById?.$in;
-            if (Array.isArray(ownedByIdIn)) {
-                andConditions.push({
-                    'ownedBy.id': {
-                        $exists: true,
-                        $in: ownedByIdIn
-                    }
-                });
-            }
-        }
-        // discontinue(2024-12-26~)
-        // const ownedByMembershipNumberIn = params.ownedBy?.memberOf?.membershipNumber?.$in;
-        // if (Array.isArray(ownedByMembershipNumberIn)) {
-        //     andConditions.push({
-        //         'ownedBy.memberOf.membershipNumber': {
-        //             $exists: true,
-        //             $in: ownedByMembershipNumberIn
-        //         }
-        //     });
-        // }
-        /* istanbul ignore else */
-        if (params.ownedFrom instanceof Date) {
-            andConditions.push({
-                ownedThrough: { $gte: params.ownedFrom }
-            });
-        }
-        /* istanbul ignore else */
-        if (params.ownedThrough instanceof Date) {
-            andConditions.push({
-                ownedFrom: { $lte: params.ownedThrough }
-            });
+        const andConditions = [];
+        const projectIdEq = params.project?.id?.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
         const ownedFromGte = params.ownedFromGte;
         if (ownedFromGte instanceof Date) {
@@ -191,15 +32,6 @@ class OwnershipInfoRepo {
                 ownedFrom: { $lte: ownedFromLte }
             });
         }
-        const acquiredFromIdIn = params.acquiredFrom?.id?.$in;
-        if (Array.isArray(acquiredFromIdIn)) {
-            andConditions.push({
-                'acquiredFrom.id': {
-                    $exists: true,
-                    $in: acquiredFromIdIn
-                }
-            });
-        }
         return andConditions;
     }
     /**
@@ -221,9 +53,6 @@ class OwnershipInfoRepo {
                 projection: {
                     _id: 0,
                     id: { $toString: '$_id' }
-                    // __v: 0,
-                    // createdAt: 0,
-                    // updatedAt: 0
                 }
             })
                 .lean()
@@ -243,9 +72,6 @@ class OwnershipInfoRepo {
             doc = await this.ownershipInfoModel.findOne({ identifier: { $eq: ownershipInfo.identifier } }, {
                 _id: 0,
                 id: { $toString: '$_id' }
-                // __v: 0,
-                // createdAt: 0,
-                // updatedAt: 0
             })
                 .lean()
                 .exec();
@@ -255,37 +81,6 @@ class OwnershipInfoRepo {
         }
         return { id: doc.id };
     }
-    async projectFieldsById(params, inclusion) {
-        let projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            project: 1,
-            typeOf: 1,
-            identifier: 1,
-            ownedBy: 1,
-            acquiredFrom: 1,
-            ownedFrom: 1,
-            ownedThrough: 1,
-            typeOfGood: 1
-        };
-        const positiveProjectionFields = (Array.isArray(inclusion))
-            ? inclusion.filter((key) => key !== 'id' && String(key) !== '_id')
-            : undefined;
-        if (Array.isArray(positiveProjectionFields)) {
-            projection = {
-                _id: 0,
-                id: { $toString: '$_id' },
-                ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
-            };
-        }
-        const doc = await this.ownershipInfoModel.findOne({ _id: { $eq: params.id } }, projection)
-            .lean() // lean(2024-08-15~)
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.ownershipInfoModel.modelName);
-        }
-        return doc;
-    }
     /**
      * 所有権を検索する
      */
@@ -355,109 +150,84 @@ class OwnershipInfoRepo {
             }
         });
     }
-    /**
-     * 所有者の所有権を全て削除する
-     */
-    async deleteByOwnedById(params) {
-        return this.ownershipInfoModel.deleteMany({
-            'project.id': { $eq: params.project.id },
-            'ownedBy.id': { $exists: true, $eq: params.ownedBy.id }
-        })
-            .exec()
-            .then((deleteOneResult) => {
-            return {
-                // n: deleteOneResult?.n,
-                // ok: deleteOneResult?.ok,
-                deletedCount: deleteOneResult?.deletedCount
-            };
-        });
-    }
-    /**
-     * 特定所有者の特定所有権を削除する
-     */
-    async deleteByIdAndOwnedById(params) {
-        return this.ownershipInfoModel.deleteOne({
-            _id: { $eq: params.id },
-            'project.id': { $eq: params.project.id },
-            'ownedBy.id': { $exists: true, $eq: params.ownedBy.id }
-        })
-            .exec()
-            .then((deleteOneResult) => {
-            return {
-                // n: deleteOneResult?.n,
-                // ok: deleteOneResult?.ok,
-                deletedCount: deleteOneResult?.deletedCount
-            };
-        });
-    }
-    /**
-     * 識別子から所有期限切れの所有権を削除する
-     */
-    async deleteExpiredByIdentifiers(params) {
-        await this.ownershipInfoModel.deleteMany({
-            'project.id': { $eq: params.project.id },
-            identifier: { $in: params.identifiers },
-            // 所有期限切れのもの(ownedThroughは必ず存在する)
-            ownedThrough: { $lte: params.ownedThrough.$lte }
-        })
-            .exec();
-    }
-    /**
-     * 所有期限切れの所有権を削除する
-     */
-    async deleteExpiredOwnershipInfos(params) {
-        await this.ownershipInfoModel.deleteMany({
-            // 所有期限切れのもの(ownedThroughは必ず存在する)
-            ownedThrough: { $lte: params.ownedThroughLte }
-        })
-            .exec();
-    }
+    // /**
+    //  * 所有期限切れの所有権を削除する
+    //  */
+    // public async deleteExpiredOwnershipInfos(params: {
+    //     ownedThroughLte: Date;
+    // }) {
+    //     await this.ownershipInfoModel.deleteMany({
+    //         // 所有期限切れのもの(ownedThroughは必ず存在する)
+    //         ownedThrough: { $lte: params.ownedThroughLte }
+    //     })
+    //         .exec();
+    // }
+    // /**
+    //  * 所有者を追加する
+    //  */
+    // public async addOwnerIfNotExist(params: {
+    //     /**
+    //      * 所有権ID
+    //      */
+    //     id: string;
+    //     ownedBy: factory.ownershipInfo.IOwner;
+    // }): Promise<void> {
+    //     if (typeof params.ownedBy.id !== 'string' || params.ownedBy.id.length === 0) {
+    //         throw new factory.errors.ArgumentNull('ownedBy.id');
+    //     }
+    //     let newOwner: factory.ownershipInfo.IOwner | undefined;
+    //     if (params.ownedBy.typeOf === factory.personType.Person) {
+    //         newOwner = {
+    //             id: params.ownedBy.id,
+    //             typeOf: params.ownedBy.typeOf
+    //         };
+    //     }
+    //     if (newOwner !== undefined) {
+    //         const doc = await this.ownershipInfoModel.findOneAndUpdate(
+    //             { _id: { $eq: params.id } },
+    //             { $addToSet: { ownedBy: newOwner } },
+    //             {
+    //                 new: true,
+    //                 projection: { _id: 1 }
+    //             }
+    //         )
+    //             .exec();
+    //         if (doc === null) {
+    //             throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
+    //         }
+    //     }
+    // }
+    // /**
+    //  * 所有者を削除する
+    //  */
+    // public async removeOwnerIfExist(params: {
+    //     /**
+    //      * 所有権ID
+    //      */
+    //     id: string;
+    //     ownedBy: { id: string };
+    // }): Promise<void> {
+    //     if (typeof params.ownedBy.id !== 'string' || params.ownedBy.id.length === 0) {
+    //         throw new factory.errors.ArgumentNull('ownedBy.id');
+    //     }
+    //     const doc = await this.ownershipInfoModel.findOneAndUpdate(
+    //         { _id: { $eq: params.id } },
+    //         { $pull: { ownedBy: { id: params.ownedBy.id } } },
+    //         {
+    //             new: true,
+    //             projection: { _id: 1 }
+    //         }
+    //     )
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
+    //     }
+    // }
     getCursor(conditions, projection) {
         return this.ownershipInfoModel.find(conditions, projection)
             .sort({ ownedFrom: factory_1.factory.sortType.Ascending })
             .cursor();
     }
-    /**
-     * 所有者を追加する
-     */
-    async addOwnerIfNotExist(params) {
-        if (typeof params.ownedBy.id !== 'string' || params.ownedBy.id.length === 0) {
-            throw new factory_1.factory.errors.ArgumentNull('ownedBy.id');
-        }
-        let newOwner;
-        if (params.ownedBy.typeOf === factory_1.factory.personType.Person) {
-            newOwner = {
-                id: params.ownedBy.id,
-                typeOf: params.ownedBy.typeOf
-            };
-        }
-        if (newOwner !== undefined) {
-            const doc = await this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $addToSet: { ownedBy: newOwner } }, {
-                new: true,
-                projection: { _id: 1 }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory_1.factory.errors.NotFound(this.ownershipInfoModel.modelName);
-            }
-        }
-    }
-    /**
-     * 所有者を削除する
-     */
-    async removeOwnerIfExist(params) {
-        if (typeof params.ownedBy.id !== 'string' || params.ownedBy.id.length === 0) {
-            throw new factory_1.factory.errors.ArgumentNull('ownedBy.id');
-        }
-        const doc = await this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $pull: { ownedBy: { id: params.ownedBy.id } } }, {
-            new: true,
-            projection: { _id: 1 }
-        })
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.ownershipInfoModel.modelName);
-        }
-    }
     async unsetUnnecessaryFields(params) {
         return this.ownershipInfoModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
             .exec();

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

@@ -1,6 +1,5 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
-import { IDocType } from './mongoose/schemas/task';
 /**
  * リトライ可能なタスク作成属性
  */
@@ -39,9 +38,31 @@ export declare class TaskRepo {
         reservationFor: {
             id: string;
         };
-    }): Promise<(import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "name" | "description" | "project" | "identifier" | "data" | "status" | "runsAt" | "dateAborted" | "executionResults" | "executor" | "lastTriedAt" | "remainingNumberOfTries" | "numberOfTried"> & {
-        expires?: never;
-    } & {
+    }): Promise<(import("mongoose").FlattenMaps<{
+        name: factory.taskName;
+        description?: string | undefined;
+        project: {
+            id: string;
+            typeOf: factory.organizationType.Project;
+        };
+        identifier?: string | undefined;
+        data: import("@chevre/factory/lib/chevre/task").IData;
+        status: factory.taskStatus;
+        runsAt: Date;
+        dateAborted?: Date | undefined;
+        executionResults: {
+            executedAt: Date;
+            endDate: Date;
+            error: string | import("@chevre/factory/lib/chevre/task").IExecutionErrorAsObject;
+        }[];
+        executor?: {
+            name: string;
+        } | undefined;
+        lastTriedAt?: Date | undefined;
+        remainingNumberOfTries: number;
+        numberOfTried: number;
+        expires?: never | undefined;
+    }> & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;

package/lib/chevre/repo/task.js

@@ -71,6 +71,7 @@ class TaskRepo {
             status: { $eq: factory_1.factory.taskStatus.Ready },
             'data.id': { $exists: true, $eq: params.reservationFor.id }
         }, { _id: 1 })
+            .lean()
             .exec();
     }
     /**

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.3.0-alpha.1",
+    "@chevre/factory": "10.3.0-alpha.2",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.23"
+  "version": "26.0.0-alpha.24"
 }