@chevre/domain 25.0.0-alpha.21 → 25.0.0-alpha.23

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

@@ -46,9 +46,6 @@ export declare class MessageRepo {
     projectFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(IEmailMessage & {
         id: string;
     })[]>;
-    /**
-     * コードをキーにしてなければ作成する(複数対応)
-     */
     /**
      * コードをキーにしてひとつ更新(なければ作成する)
      */
@@ -62,6 +59,13 @@ export declare class MessageRepo {
             id: string;
         };
     }): Promise<IFindByIdentifierResult>;
+    /**
+     * 発行日時を基準に複数削除
+     * 2026-06-28~
+     */
+    deleteDatePublishedPassedCertainPeriod(params: {
+        $lt: Date;
+    }): Promise<void>;
     deleteByMainEntityOrderNumber(params: {
         project: {
             id: string;

package/lib/chevre/repo/message.js

@@ -80,65 +80,6 @@ class MessageRepo {
             .lean() // 2024-09-19~
             .exec();
     }
-    // 重複エラーをハンドルするためにupsertOneByIdentifierへ移行(2025-05-11~)
-    /**
-     * コードをキーにしてなければ作成する(複数対応)
-     */
-    // public async upsertByIdentifier(
-    //     params: Pick<
-    //         IEmailMessage,
-    //         'about' | 'identifier' | 'mainEntity' | 'name' | 'project' | 'sender' | 'text' | 'toRecipient' | 'provider'
-    //     >[]
-    // ): Promise<BulkWriteResult | void> {
-    //     const now = new Date();
-    //     const bulkWriteOps: AnyBulkWriteOperation<IEmailMessage>[] = [];
-    //     if (Array.isArray(params)) {
-    //         params.forEach((creatingNoteParams) => {
-    //             const { about, identifier, project, text, mainEntity, name, sender, toRecipient, provider } = creatingNoteParams;
-    //             if (typeof identifier !== 'string' || identifier.length === 0) {
-    //                 throw new factory.errors.ArgumentNull('identifier');
-    //             }
-    //             if (typeof text !== 'string') {
-    //                 throw new factory.errors.ArgumentNull('text');
-    //             }
-    //             // リソースのユニークネスを保証するfilter
-    //             const filter: RootFilterQuery<IEmailMessage> = {
-    //                 // typeOf: { $eq: factory.creativeWorkType.EmailMessage },
-    //                 'project.id': { $eq: project.id },
-    //                 identifier: { $eq: identifier }
-    //             };
-    //             const setOnInsert: MatchKeysAndValues<IEmailMessage> = {
-    //                 identifier,
-    //                 project,
-    //                 datePublished: now,
-    //                 typeOf: factory.creativeWorkType.EmailMessage
-    //             };
-    //             // 変更可能な属性のみ上書き
-    //             const setFields: MatchKeysAndValues<IEmailMessage> = {
-    //                 provider,
-    //                 mainEntity,
-    //                 about,
-    //                 sender,
-    //                 text,
-    //                 toRecipient,
-    //                 ...(typeof name === 'string') ? { name } : undefined
-    //             };
-    //             const updateFilter: UpdateFilter<IEmailMessage> = {
-    //                 $setOnInsert: setOnInsert,
-    //                 $set: setFields
-    //             };
-    //             const updateOne: UpdateOneModel<IEmailMessage> = {
-    //                 filter,
-    //                 update: updateFilter,
-    //                 upsert: true
-    //             };
-    //             bulkWriteOps.push({ updateOne });
-    //         });
-    //     }
-    //     if (bulkWriteOps.length > 0) {
-    //         return this.messageModel.bulkWrite(bulkWriteOps, { ordered: false });
-    //     }
-    // }
     /**
      * コードをキーにしてひとつ更新(なければ作成する)
      */
@@ -219,6 +160,19 @@ class MessageRepo {
         }
         return doc;
     }
+    /**
+     * 発行日時を基準に複数削除
+     * 2026-06-28~
+     */
+    async deleteDatePublishedPassedCertainPeriod(params) {
+        const { $lt } = params;
+        if ($lt instanceof Date) {
+            await this.messageModel.deleteMany({
+                datePublished: { $lt }
+            })
+                .exec();
+        }
+    }
     async deleteByMainEntityOrderNumber(params) {
         return this.messageModel.deleteMany({
             'project.id': { $eq: params.project.id },

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

@@ -16,7 +16,7 @@ export type IEmailMessage = factory.creativeWork.message.email.ICreativeWork & {
         typeOf: factory.organizationType.Corporation;
     };
 };
-type IDocType = Omit<IEmailMessage, 'id'>;
+type IDocType = Pick<IEmailMessage, 'about' | 'identifier' | 'name' | 'project' | 'sender' | 'text' | 'toRecipient' | 'typeOf' | 'datePublished' | 'mainEntity' | 'provider'>;
 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/setting.d.ts

@@ -37,7 +37,7 @@ interface IOnTransactionStatusChanged {
      */
     informTransaction?: factory.project.IInformParams[];
 }
-interface IStorageSettings {
+export interface IStorageSettings {
     /**
      * 取引保管期間(Confirmed)
      * default:365
@@ -53,6 +53,11 @@ interface IStorageSettings {
     assetTransactionInDays?: number;
     taskInDays?: number;
     eventInDays?: number;
+    /**
+     * メッセージ保管日数
+     * 2026-06-28~
+     */
+    messageInDays?: number;
     /**
      * イベント終了日時からn日後まで座席をロックする
      */
@@ -80,7 +85,7 @@ interface ITriggerWebhookSettings {
     retryCountMax?: number;
     retryIntervalInMS?: number;
 }
-interface IWaiterSettings {
+export interface IWaiterSettings {
     disabled?: boolean;
     passportUnavailable?: boolean;
     passportIssuers: string[];

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

@@ -22,8 +22,6 @@ const schemaDefinition = {
     startDate: Date,
     endDate: Date,
     tasksExportAction: mongoose_1.SchemaTypes.Mixed,
-    // tasksExportedAt: Date, // discontinue(2024-06-19~)
-    // tasksExportationStatus: String, // discontinue(2024-06-19~)
     potentialActions: mongoose_1.SchemaTypes.Mixed,
     instrument: mongoose_1.SchemaTypes.Mixed
 };
@@ -81,24 +79,6 @@ const indexes = [
         { expires: 1, startDate: -1 },
         { name: 'searchByExpiresAndStartDate' }
     ],
-    [
-        { 'result.order.confirmationNumber': 1, startDate: -1 },
-        {
-            name: 'searchByResultOrderConfirmationNumber',
-            partialFilterExpression: {
-                'result.order.confirmationNumber': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'result.order.orderNumber': 1, startDate: -1 },
-        {
-            name: 'searchByResultOrderNumberAndStartDate',
-            partialFilterExpression: {
-                'result.order.orderNumber': { $exists: true }
-            }
-        }
-    ],
     [
         { 'object.confirmationNumber': 1, startDate: -1 },
         {
@@ -126,36 +106,6 @@ const indexes = [
             }
         }
     ],
-    [
-        // 結果の注文番号はユニークなはず
-        {
-            typeOf: 1,
-            'result.order.orderNumber': 1
-        },
-        {
-            name: 'searchPlaceOrderByOrderNumber',
-            unique: true,
-            partialFilterExpression: {
-                'result.order.orderNumber': { $exists: true }
-            }
-        }
-    ],
-    [
-        // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
-        {
-            typeOf: 1,
-            'object.orderNumber': 1
-        },
-        {
-            name: 'uniquePlacingOrderNumber20260221',
-            unique: true,
-            partialFilterExpression: {
-                typeOf: factory_1.factory.transactionType.PlaceOrder,
-                'object.orderNumber': { $exists: true },
-                startDate: { $gte: new Date('2026-02-21T11:00:00Z') }
-            }
-        }
-    ],
     [
         // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
         {
@@ -261,6 +211,57 @@ const indexes = [
             }
         }
     ]
+    // result.order廃止につきインデックス廃止(2026-06-28~)
+    // [
+    //     { 'result.order.confirmationNumber': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByResultOrderConfirmationNumber',
+    //         partialFilterExpression: {
+    //             'result.order.confirmationNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'result.order.orderNumber': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByResultOrderNumberAndStartDate',
+    //         partialFilterExpression: {
+    //             'result.order.orderNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // result.order廃止につきインデックス廃止(2026-06-28~)
+    // [
+    //     // 結果の注文番号はユニークなはず
+    //     {
+    //         typeOf: 1,
+    //         'result.order.orderNumber': 1
+    //     },
+    //     {
+    //         name: 'searchPlaceOrderByOrderNumber',
+    //         unique: true,
+    //         partialFilterExpression: {
+    //             'result.order.orderNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // uniquePlacingOrderNumberと重複しているので廃止(2026-06-28~)
+    // [
+    //     // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
+    //     {
+    //         typeOf: 1,
+    //         'object.orderNumber': 1
+    //     },
+    //     {
+    //         name: 'uniquePlacingOrderNumber20260221',
+    //         unique: true,
+    //         partialFilterExpression: {
+    //             typeOf: factory.transactionType.PlaceOrder,
+    //             'object.orderNumber': { $exists: true },
+    //             startDate: { $gte: new Date('2026-02-21T11:00:00Z') }
+    //         }
+    //     }
+    // ],
 ];
 exports.indexes = indexes;
 /**

package/lib/chevre/repo/setting/waiter.d.ts

@@ -0,0 +1,17 @@
+import type { Connection } from 'mongoose';
+import { IWaiterSettings } from '../mongoose/schemas/setting';
+interface IDBOptions {
+    connection: Connection;
+}
+/**
+ * 流入制限設定リポジトリ
+ */
+export declare class WaiterSettingRepo {
+    private readonly settingModel;
+    private static cachedSettings;
+    private static cacheExpiry;
+    private static readonly CACHE_TTL_MS;
+    constructor(options: IDBOptions);
+    findWaiterSetting(): Promise<IWaiterSettings | undefined>;
+}
+export {};

package/lib/chevre/repo/setting/waiter.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WaiterSettingRepo = void 0;
+const setting_1 = require("../mongoose/schemas/setting");
+/**
+ * 流入制限設定リポジトリ
+ */
+class WaiterSettingRepo {
+    settingModel;
+    // static にすることで、クラスが何回 new されてもメモリ上で1つだけ保持される
+    static cachedSettings;
+    static cacheExpiry = 0;
+    static CACHE_TTL_MS = 10 * 60 * 1000; // 10分
+    constructor(options) {
+        const { connection } = options;
+        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+    }
+    async findWaiterSetting() {
+        const now = Date.now();
+        // キャッシュ参照
+        if (WaiterSettingRepo.cachedSettings !== undefined && now < WaiterSettingRepo.cacheExpiry) {
+            return WaiterSettingRepo.cachedSettings;
+        }
+        const settingDoc = await this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
+            _id: 0,
+            waiter: 1
+        })
+            .lean()
+            .exec();
+        // キャッシュを更新
+        if (settingDoc?.waiter !== undefined) {
+            console.log('document exist!', settingDoc);
+            WaiterSettingRepo.cachedSettings = settingDoc.waiter;
+            WaiterSettingRepo.cacheExpiry = now + WaiterSettingRepo.CACHE_TTL_MS;
+        }
+        return WaiterSettingRepo.cachedSettings;
+    }
+}
+exports.WaiterSettingRepo = WaiterSettingRepo;

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

@@ -1,7 +1,8 @@
 import type { Connection, FilterQuery } from 'mongoose';
-import { ISetting } from './mongoose/schemas/setting';
-type IKeyOfProjection = keyof ISetting;
-export { ISetting };
+import { ISetting, IStorageSettings } from './mongoose/schemas/setting';
+type IKeyOfProjection = Exclude<keyof ISetting, 'jwt' | 'project' | 'waiter' | 'integration'>;
+type IGlobalSetting = Pick<ISetting, 'defaultSenderEmail' | 'onEventChanged' | 'onOrderStatusChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'onTaskStatusChanged' | 'onTransactionStatusChanged' | 'orderNumber' | 'quota' | 'serviceOutputIdentifier' | 'storage' | 'transactionNumber' | 'triggerWebhook' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
+export { IGlobalSetting as ISetting };
 /**
  * 設定リポジトリ
  */
@@ -15,14 +16,14 @@ export declare class SettingRepo {
                 $eq?: string;
             };
         };
-    }, inclusion: IKeyOfProjection[]): Promise<ISetting | null>;
-    updateByProject(filter: {
-        project: {
-            id: {
-                $eq: string;
-            };
-        };
-    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onTaskStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter' | 'orderNumber' | 'transactionNumber'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, inclusion: IKeyOfProjection[]): Promise<IGlobalSetting | null>;
+    /**
+     * 初期設定追加専用
+     */
+    addGlobalStorageSettings(params: {
+        key: keyof IStorageSettings;
+        value: number;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<ISetting>;
         $unset: any;

package/lib/chevre/repo/setting.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettingRepo = void 0;
-// import { factory } from '../factory';
 const setting_1 = require("./mongoose/schemas/setting");
 /**
  * 設定リポジトリ
@@ -36,24 +35,13 @@ class SettingRepo {
             .lean()
             .exec();
     }
-    async updateByProject(filter, update) {
-        const { onEventChanged, onReservationStatusChanged, onTaskStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter, orderNumber, transactionNumber } = update;
-        return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
+    /**
+     * 初期設定追加専用
+     */
+    async addGlobalStorageSettings(params) {
+        return this.settingModel.updateOne({ 'project.id': { $eq: '*' } }, {
             $set: {
-                ...(onEventChanged !== undefined) ? { onEventChanged } : undefined,
-                ...(onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined,
-                ...(onTaskStatusChanged !== undefined) ? { onTaskStatusChanged } : undefined,
-                ...(onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined,
-                ...(defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined,
-                ...(useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined,
-                ...(userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined,
-                ...(userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined,
-                ...(storage !== undefined) ? { storage } : undefined,
-                ...(quota !== undefined) ? { quota } : undefined,
-                ...(triggerWebhook !== undefined) ? { triggerWebhook } : undefined,
-                ...(waiter !== undefined) ? { waiter } : undefined,
-                ...(orderNumber !== undefined) ? { orderNumber } : undefined,
-                ...(transactionNumber !== undefined) ? { transactionNumber } : undefined
+                [`storage.${params.key}`]: params.value
             }
         })
             .exec();

package/lib/chevre/repository.d.ts

@@ -81,6 +81,7 @@ import type { ServiceAvailableHourRepo } from './repo/service/availableHour';
 import type { SettingRepo } from './repo/setting';
 import type { IntegrationSettingRepo } from './repo/setting/integration';
 import type { JWTSettingRepo } from './repo/setting/jwt';
+import type { WaiterSettingRepo } from './repo/setting/waiter';
 import type { StockHolderRepo } from './repo/stockHolder';
 import type { TaskRepo } from './repo/task';
 import type { TicketRepo } from './repo/ticket';
@@ -446,6 +447,10 @@ export declare namespace setting {
     namespace JWT {
         function createInstance(...params: ConstructorParameters<typeof JWTSettingRepo>): Promise<JWTSettingRepo>;
     }
+    type Waiter = WaiterSettingRepo;
+    namespace Waiter {
+        function createInstance(...params: ConstructorParameters<typeof WaiterSettingRepo>): Promise<WaiterSettingRepo>;
+    }
 }
 export type StockHolder = StockHolderRepo;
 export declare namespace StockHolder {

package/lib/chevre/repository.js

@@ -933,6 +933,17 @@ var setting;
         }
         JWT.createInstance = createInstance;
     })(JWT = setting.JWT || (setting.JWT = {}));
+    let Waiter;
+    (function (Waiter) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await import('./repo/setting/waiter.js')).WaiterSettingRepo;
+            }
+            return new repo(...params);
+        }
+        Waiter.createInstance = createInstance;
+    })(Waiter = setting.Waiter || (setting.Waiter = {}));
 })(setting || (exports.setting = setting = {}));
 var StockHolder;
 (function (StockHolder) {

package/package.json

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