@chevre/domain 25.2.0-alpha.8 → 26.0.0-alpha.0

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

@@ -0,0 +1,69 @@
+import type { Connection, FilterQuery } from 'mongoose';
+import { factory } from '../factory';
+import { IModel, IDocType } from './mongoose/schemas/asyncAction';
+import type { IExecutableTask } from '../taskSettings';
+type ISavingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'executionResults' | 'name' | 'project' | 'runsAt' | 'status'> & {
+    expires: Date;
+};
+export type IExecutableAsyncAction = Pick<IExecutableTask<factory.taskName>, 'data' | 'expires' | 'id' | 'name' | 'project' | 'runsAt' | 'status'>;
+type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | 'expires';
+type IFindParams = Pick<factory.task.ISearchConditions, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status' | 'limit' | 'page' | 'sort'>;
+/**
+ * 非同期アクションリポジトリ
+ */
+export declare class AsyncActionRepo {
+    readonly asyncActionModel: IModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status'>): FilterQuery<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>[];
+    findAsyncActions(params: IFindParams, inclusion: IKeyOfProjection[]): Promise<(IDocType & {
+        id: string;
+    })[]>;
+    /**
+     * Readyタスクをひとつ追加する
+     */
+    addReadyAsyncAction(params: Pick<ISavingTask, 'data' | 'expires' | 'name' | 'project' | 'runsAt'> & {
+        alternateName?: never;
+        identifier?: never;
+    }): Promise<{
+        id: string;
+    }>;
+    /**
+     * Ready -> Running
+     */
+    executeAsyncActionById(params: {
+        id: string;
+        executor: {
+            name: string;
+        };
+    }): Promise<IExecutableAsyncAction | null>;
+    /**
+     * 非同期アクションの状態を参照する
+     */
+    findAsyncActionById(params: {
+        id: {
+            $eq: string;
+        };
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        name: factory.taskName;
+    }, inclusion: IKeyOfProjection[]): Promise<(IDocType & {
+        id: string;
+    } | undefined)>;
+    /**
+     * タスクIDから実行結果とステータスを保管する
+     * Abortedの場合、dateAbortedもセットする
+     */
+    setExecutionResultAndStatus(params: {
+        /**
+         * タスクID
+         */
+        id: string;
+    }, update: {
+        status: factory.taskStatus.Executed | factory.taskStatus.Aborted;
+        executionResult: factory.task.IExecutionResult;
+    }): Promise<void>;
+}
+export {};

package/lib/chevre/repo/asyncAction.js

@@ -0,0 +1,237 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AsyncActionRepo = void 0;
+const factory_1 = require("../factory");
+const settings_1 = require("../settings");
+const asyncAction_1 = require("./mongoose/schemas/asyncAction");
+const executableTaskProjection = {
+    _id: 0,
+    id: { $toString: '$_id' },
+    // 必要最低限にprojection(2024-04-23~)
+    data: 1,
+    name: 1,
+    status: 1,
+    project: 1,
+    runsAt: 1,
+    expires: 1
+};
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'name',
+    'status',
+    'runsAt',
+    'lastTriedAt',
+    'executionResults',
+    'executor',
+    'data',
+    'dateAborted',
+    'expires'
+];
+/**
+ * 非同期アクションリポジトリ
+ */
+class AsyncActionRepo {
+    asyncActionModel;
+    constructor(connection) {
+        this.asyncActionModel = connection.model(asyncAction_1.modelName, (0, asyncAction_1.createSchema)());
+    }
+    static CREATE_MONGO_CONDITIONS(params) {
+        const andConditions = [];
+        const idEq = params.id?.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const projectIdEq = params.project?.id?.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        if (typeof params.name === 'string') {
+            andConditions.push({ name: { $eq: params.name } });
+        }
+        else {
+            const nameIn = params.name?.$in;
+            if (Array.isArray(nameIn)) {
+                andConditions.push({ name: { $in: nameIn } });
+            }
+            const nameNin = params.name?.$nin;
+            if (Array.isArray(nameNin)) {
+                andConditions.push({ name: { $nin: nameNin } });
+            }
+        }
+        const statusEq = params.status?.$eq;
+        if (typeof statusEq === 'string') {
+            andConditions.push({ status: { $eq: statusEq } });
+        }
+        if (params.runsFrom instanceof Date) {
+            andConditions.push({ runsAt: { $gte: params.runsFrom } });
+        }
+        if (params.runsThrough instanceof Date) {
+            andConditions.push({ runsAt: { $lte: params.runsThrough } });
+        }
+        return andConditions;
+    }
+    async findAsyncActions(params, inclusion) {
+        const conditions = AsyncActionRepo.CREATE_MONGO_CONDITIONS(params);
+        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        if (Array.isArray(inclusion) && inclusion.length > 0) {
+            positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.asyncActionModel.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)
+                .skip(params.limit * (page - 1));
+        }
+        if (params.sort?.runsAt !== undefined) {
+            query.sort({ runsAt: params.sort.runsAt });
+        }
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
+    }
+    /**
+     * Readyタスクをひとつ追加する
+     */
+    async addReadyAsyncAction(params) {
+        const { expires } = params;
+        if (!(expires instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('expires', 'must be Date');
+        }
+        const savingTask = {
+            ...params,
+            status: factory_1.factory.taskStatus.Ready,
+            executionResults: []
+        };
+        const result = await this.asyncActionModel.insertMany(savingTask, { rawResult: true });
+        const id = result.insertedIds?.[0]?.toHexString();
+        if (typeof id !== 'string') {
+            throw new factory_1.factory.errors.Internal('task not saved');
+        }
+        return { id };
+    }
+    /**
+     * Ready -> Running
+     */
+    async executeAsyncActionById(params) {
+        const now = new Date();
+        const doc = await this.asyncActionModel.findOneAndUpdate({
+            _id: { $eq: params.id },
+            status: { $eq: factory_1.factory.taskStatus.Ready }, // Readyのものしか実行しない
+            runsAt: { $lt: now },
+            expires: { $gt: now }, // ワンタイムタスクなのでexpiresは必ず存在する
+        }, {
+            $set: {
+                status: factory_1.factory.taskStatus.Running, // 実行中に変更
+                lastTriedAt: now,
+                executor: params.executor
+            },
+        }, { new: true, projection: executableTaskProjection })
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean() // lean(2024-09-26~)
+            .exec();
+        if (doc === null) {
+            return null;
+        }
+        return doc;
+    }
+    /**
+     * 非同期アクションの状態を参照する
+     */
+    async findAsyncActionById(params, inclusion) {
+        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        if (Array.isArray(inclusion) && inclusion.length > 0) {
+            positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+        }
+        else {
+            // no op
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.asyncActionModel.findOne({
+            _id: { $eq: params.id.$eq },
+            'project.id': { $eq: params.project.id.$eq },
+            name: { $eq: params.name }
+        }, projection);
+        const doc = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
+        if (doc === null) {
+            return;
+        }
+        return doc;
+    }
+    // /**
+    //  * Readyのままで期限切れのタスクをExpiredに変更する
+    //  */
+    // public async makeExpiredMany(params: {
+    //     expiresLt: Date;
+    // }): Promise<UpdateWriteOpResult> {
+    //     const { expiresLt } = params;
+    //     if (!(expiresLt instanceof Date)) {
+    //         throw new factory.errors.Argument('expiresLt', 'must be Date');
+    //     }
+    //     return this.asyncActionModel.updateMany(
+    //         {
+    //             status: { $eq: factory.taskStatus.Ready },
+    //             expires: { $lt: expiresLt }
+    //         },
+    //         {
+    //             $set: {
+    //                 status: factory.taskStatus.Expired
+    //             }
+    //         }
+    //     )
+    //         .exec();
+    // }
+    // /**
+    //  * taskNameに関わらず、Runningのまま放置された非同期アクションをAbortedに変更する
+    //  */
+    // public async abortMany(params: {
+    //     intervalInMinutes: number;
+    // }): Promise<UpdateWriteOpResult> {
+    //     const lastTriedAtShoudBeLessThan = moment()
+    //         .add(-params.intervalInMinutes, 'minutes')
+    //         .toDate();
+    //     return this.asyncActionModel.updateMany(
+    //         {
+    //             status: { $eq: factory.taskStatus.Running },
+    //             lastTriedAt: {
+    //                 $exists: true,
+    //                 $lt: lastTriedAtShoudBeLessThan
+    //             }
+    //         },
+    //         {
+    //             $set: {
+    //                 status: factory.taskStatus.Aborted,
+    //                 dateAborted: new Date()
+    //             }
+    //         }
+    //     )
+    //         .exec();
+    // }
+    /**
+     * タスクIDから実行結果とステータスを保管する
+     * Abortedの場合、dateAbortedもセットする
+     */
+    async setExecutionResultAndStatus(params, update) {
+        const { id } = params;
+        const { status, executionResult } = update;
+        await this.asyncActionModel.updateOne({ _id: { $eq: id } }, {
+            $set: {
+                status,
+                ...(status === factory_1.factory.taskStatus.Aborted) ? { dateAborted: executionResult.endDate } : undefined // 2025-08-04~
+            },
+            $push: { executionResults: executionResult }
+        })
+            .exec();
+    }
+}
+exports.AsyncActionRepo = AsyncActionRepo;

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

@@ -1,5 +1,6 @@
-import type { RedisClientType } from 'redis';
+import type { createClient } from 'redis';
 import { AbstractConcurrentLockRepo, ILockParams, IUnlockParams } from './concurrentLockAbstract';
+type RedisClientType = ReturnType<typeof createClient>;
 /**
  * 同時実行ロックリポジトリ
  */
@@ -12,3 +13,4 @@ export declare class ConcurrentLockRepo implements AbstractConcurrentLockRepo {
     lock(params: ILockParams): Promise<void>;
     unlock(params: IUnlockParams): Promise<void>;
 }
+export {};

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import { Connection, FilterQuery, Types } from 'mongoose';
+import { Connection, FilterQuery, Types, mongo } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/creativeWork';
 type IKeyOfProjection = keyof factory.creativeWork.movie.ICreativeWork;
@@ -32,7 +31,7 @@ export declare class CreativeWorkRepo {
             [key in keyof factory.creativeWork.movie.ICreativeWork]?: 1;
         };
     }[]): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
     }>;
     /**
      * コンテンツを検索する

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

@@ -1,9 +1,10 @@
 import type { COA } from '@motionpicture/coa-service';
-import type { RedisClientType } from 'redis';
+import type { createClient } from 'redis';
 interface IOptions {
     scope: string;
     expireInSeconds: number;
 }
+type RedisClientType = ReturnType<typeof createClient>;
 /**
  * 認証情報リポジトリ
  */

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import { Connection, FilterQuery } from 'mongoose';
+import type { Connection, FilterQuery, mongo } from 'mongoose';
 import { ICustomerType } from './mongoose/schemas/customerType';
 import { factory } from '../factory';
 type IKeyOfProjection = keyof ICustomerType;
@@ -17,6 +16,6 @@ export declare class CustomerTypeRepo {
     saveManyByCodeValue(params: {
         attributes: ICustomerType;
         upsert?: boolean;
-    }[]): Promise<BulkWriteResult | undefined>;
+    }[]): Promise<mongo.BulkWriteResult | undefined>;
 }
 export {};

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection, FilterQuery, mongo } from 'mongoose';
 import { factory } from '../factory';
 import * as EventFactory from '../factory/event';
 export interface IAttributes4patchUpdate {
@@ -83,7 +82,7 @@ export declare class EventRepo {
          */
         update: boolean;
     }): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
         modifiedEvents: {
             id: string;
         }[];
@@ -202,7 +201,7 @@ export declare class EventRepo {
         organizer: {
             id: string;
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     deleteManyEventsByScreeningRoom(params: {
         project: {
             id: string;
@@ -219,7 +218,7 @@ export declare class EventRepo {
                 id: string;
             };
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     deleteManyBySuperEventId(params: {
         project: {
             id: string;
@@ -227,7 +226,7 @@ export declare class EventRepo {
         superEvent: {
             id: string;
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     deleteManyBySuperEventLocationId(params: {
         project: {
             id: string;
@@ -237,7 +236,7 @@ export declare class EventRepo {
                 id: string;
             };
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     /**
      * 興行(プロダクト)から削除する
      */
@@ -252,7 +251,7 @@ export declare class EventRepo {
                 };
             };
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     deleteManyEventsEndedByProject(params: {
         typeOf: {
             $in: factory.eventType.ScreeningEvent[];
@@ -263,7 +262,7 @@ export declare class EventRepo {
         endDate: {
             $lte: Date;
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     deleteManyEventsEnded(params: {
         typeOf: {
             $eq: factory.eventType.ScreeningEvent;
@@ -271,7 +270,7 @@ export declare class EventRepo {
         endDate: {
             $lte: Date;
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     deleteByProject(params: {
         project: {
             id: string;
@@ -283,7 +282,7 @@ export declare class EventRepo {
     updateAggregationById(params: {
         id: string;
     }, update: IUpdateAggregateReservationParams): Promise<void>;
-    bulkWrite(bulkWriteOps: any[]): Promise<BulkWriteResult & {
+    bulkWrite(bulkWriteOps: any[]): Promise<mongo.BulkWriteResult & {
         mongoose?: {
             validationErrors: import("mongoose").Error[];
         } | undefined;

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult, DeleteResult } from 'mongodb';
-import { Connection, FilterQuery } from 'mongoose';
+import type { Connection, FilterQuery, mongo } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/eventOffer';
 type IUnset = {
@@ -32,7 +31,7 @@ export declare class EventOfferRepo {
          */
         update: boolean;
     }): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
         modifiedProductOffers?: {
             id: string;
         }[];
@@ -47,7 +46,7 @@ export declare class EventOfferRepo {
         seller: {
             id: string;
         };
-    }): Promise<DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     /**
      * 有効期間を過ぎたイベントオファーを削除する
      */
@@ -55,6 +54,6 @@ export declare class EventOfferRepo {
         validThrough: {
             $lte: Date;
         };
-    }): Promise<DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
 }
 export {};

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import type { Connection } from 'mongoose';
+import type { Connection, mongo } from 'mongoose';
 import { factory } from '../factory';
 /**
  * イベントのアプリケーションオファーリポジトリ
@@ -31,7 +30,7 @@ export declare class EventSellerMakesOfferRepo {
             };
         };
     }[]): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
         modifiedEvents?: {
             id: string;
         }[];

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection, FilterQuery, mongo } from 'mongoose';
 import { factory } from '../factory';
 type ISearchConditions = factory.eventSeries.ISearchConditions;
 type IKeyOfProjection = Exclude<keyof factory.eventSeries.IEvent, 'id' | 'videoFormat'>;
@@ -26,7 +25,7 @@ export declare class EventSeriesRepo {
          */
         upsert: boolean;
     }): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
         modifiedEvents: {
             id: string;
         }[];
@@ -55,7 +54,7 @@ export declare class EventSeriesRepo {
         organizer: {
             id: string;
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     deleteManyByLocationId(params: {
         project: {
             id: string;
@@ -63,7 +62,7 @@ export declare class EventSeriesRepo {
         location: {
             id: string;
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     /**
      * 既存施設コンテンツの最大バージョンを集計する
      */

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

@@ -43,7 +43,7 @@ export declare class MessageRepo {
     /**
      * 検索
      */
-    projectFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(IEmailMessage & {
+    findMessages(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(IEmailMessage & {
         id: string;
     })[]>;
     /**

package/lib/chevre/repo/message.js

@@ -53,7 +53,7 @@ class MessageRepo {
     /**
      * 検索
      */
-    async projectFields(params, inclusion) {
+    async findMessages(params, inclusion) {
         const conditions = MessageRepo.CREATE_MONGO_CONDITIONS(params);
         let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {