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

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
@@ -85,7 +85,7 @@ interface ITriggerWebhookSettings {
     retryCountMax?: number;
     retryIntervalInMS?: number;
 }
-interface IWaiterSettings {
+export interface IWaiterSettings {
     disabled?: boolean;
     passportUnavailable?: boolean;
     passportIssuers: string[];

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.22"
+  "version": "25.0.0-alpha.23"
 }