@chevre/domain 22.7.0-alpha.2 → 22.7.0-alpha.3

package/example/src/chevre/findSetting.ts

@@ -25,7 +25,7 @@ async function main() {
 
     const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
 
-    const result = await settingRepo.findOne({}, ['storage']);
+    const result = await settingRepo.findOne({}, ['quota']);
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });
 
@@ -53,14 +53,11 @@ async function main() {
         const updateResult = await settingRepo.updateByProject(
             { project: { id: { $eq: '*' } } },
             {
-                storage: {
-                    transactionCanceledInDays: 7,
-                    transactionConfirmedInDays: 7,
-                    authorizationInDays: 1,
-                    actionInDays: 31,
-                    assetTransactionInDays: 7,
-                    taskInDays: 180,
-                    eventInDays: 365
+                quota: {
+                    codeExpiresInSecondsDefault: 600,
+                    codeExpiresInSecondsMax: 8035200,
+                    placeOrderExpiresInSecondsMax: 3600,
+                    placeOrderExpiresInSecondsMin: 60
                 }
             }
         );

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

@@ -8,7 +8,7 @@ const modelName = 'Order';
 exports.modelName = modelName;
 const schemaDefinition = {
     broker: mongoose_1.SchemaTypes.Mixed,
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     typeOf: { type: String, required: true },
     identifier: [mongoose_1.SchemaTypes.Mixed],
     name: String,
@@ -16,7 +16,7 @@ const schemaDefinition = {
     customer: mongoose_1.SchemaTypes.Mixed,
     returner: mongoose_1.SchemaTypes.Mixed,
     confirmationNumber: String,
-    orderNumber: String,
+    orderNumber: { type: String, required: true },
     price: Number,
     priceCurrency: String,
     acceptedOffers: [mongoose_1.SchemaTypes.Mixed],
@@ -24,7 +24,7 @@ const schemaDefinition = {
     url: String,
     orderStatus: String,
     previousOrderStatus: String,
-    orderDate: Date,
+    orderDate: { type: Date, required: true },
     isGift: Boolean,
     dateReturned: Date,
     orderedItem: [mongoose_1.SchemaTypes.Mixed] // 追加(2022-04-15~)

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

@@ -38,6 +38,12 @@ interface IStorageSettings {
     taskInDays?: number;
     eventInDays?: number;
 }
+interface IQuotaSettings {
+    codeExpiresInSecondsDefault?: number;
+    codeExpiresInSecondsMax?: number;
+    placeOrderExpiresInSecondsMax?: number;
+    placeOrderExpiresInSecondsMin?: number;
+}
 export interface ISetting {
     defaultSenderEmail?: string;
     onEventChanged?: IOnEventChanged;
@@ -51,6 +57,7 @@ export interface ISetting {
         id: string;
         typeOf: factory.organizationType.Project;
     };
+    quota?: IQuotaSettings;
     storage?: IStorageSettings;
     useInformResourceTypes?: string[];
     userPoolIdOld?: string;

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

@@ -14,6 +14,7 @@ const schemaDefinition = {
     onReservationStatusChanged: mongoose_1.SchemaTypes.Mixed,
     onResourceUpdated: mongoose_1.SchemaTypes.Mixed,
     onTransactionStatusChanged: mongoose_1.SchemaTypes.Mixed,
+    quota: mongoose_1.SchemaTypes.Mixed,
     storage: mongoose_1.SchemaTypes.Mixed,
     useInformResourceTypes: [String],
     userPoolIdOld: String,

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

@@ -46,5 +46,5 @@ export declare class SettingRepo {
                 $eq: string;
             };
         };
-    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota'>): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/setting.js

@@ -49,9 +49,9 @@ class SettingRepo {
     }
     updateByProject(filter, update) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { onEventChanged, onReservationStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage } = update;
+            const { onEventChanged, onReservationStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota } = update;
             return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
-                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : 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)
+                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : 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)
             })
                 .exec();
         });

package/package.json

@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.2"
+  "version": "22.7.0-alpha.3"
 }