@likewatt/models 1.0.49 → 1.0.56

package/dist/core/CollectiveSite.js

@@ -53,7 +53,7 @@ __decorate([
 ], CollectiveSite.prototype, "type", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)(),
-    (0, mongoose_1.Prop)({ required: false }),
+    (0, mongoose_1.Prop)({ type: String, required: false }),
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String)
@@ -90,14 +90,14 @@ __decorate([
 ], CollectiveSite.prototype, "currency", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)(),
-    (0, mongoose_1.Prop)({ required: false, default: null }),
+    (0, mongoose_1.Prop)({ type: Boolean, required: false, default: null }),
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsBoolean)(),
     __metadata("design:type", Boolean)
 ], CollectiveSite.prototype, "autoCO2", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)(),
-    (0, mongoose_1.Prop)({ required: false, default: null }),
+    (0, mongoose_1.Prop)({ type: Number, required: false, default: null }),
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsNumber)(),
     __metadata("design:type", Number)

package/dist/core/Scenario.js

@@ -246,19 +246,19 @@ let ConfigSite = class ConfigSite {
 exports.ConfigSite = ConfigSite;
 __decorate([
     (0, swagger_1.ApiProperty)({ example: 'REFERENCE' }),
-    (0, mongoose_1.Prop)({ required: true }),
+    (0, mongoose_1.Prop)({ required: false }),
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String)
 ], ConfigSite.prototype, "consumptionReference", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({ type: [DemandMultiplierSlot] }),
-    (0, mongoose_1.Prop)({ type: [exports.DemandMultiplierSlotSchema], required: true }),
+    (0, mongoose_1.Prop)({ type: [exports.DemandMultiplierSlotSchema], required: false }),
     (0, class_validator_1.IsArray)(),
     __metadata("design:type", Array)
 ], ConfigSite.prototype, "demandMultiplierSlots", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({ type: [RateOfGrowth] }),
-    (0, mongoose_1.Prop)({ type: [exports.RateOfGrowthSchema], required: true }),
+    (0, mongoose_1.Prop)({ type: [exports.RateOfGrowthSchema], required: false }),
     (0, class_validator_1.IsArray)(),
     __metadata("design:type", Array)
 ], ConfigSite.prototype, "rateOfGrowth", void 0);

package/dist/core/ScenarioDefaultValue.d.ts

@@ -13,7 +13,7 @@ import { WindTurbineParams } from './internal/wind-turbine-params';
 import { ElectrolyseParams } from './internal/electrolyse-params';
 import { ECSParams } from './internal/ecs-params';
 import { H2StorageParams } from './internal/h2-storage-params';
-import { RateOfGrowth } from './Scenario';
+import { ConfigSite } from './Scenario';
 import { ScenarioParams } from './internal/scenario-params';
 import { StationParams } from './internal/station-params';
 import { ThermalStorageParams } from './internal/thermal-storage-params';
@@ -42,20 +42,7 @@ export declare class ScenarioDefaultValue {
     paramsStation: StationParams;
     paramsScenario: ScenarioParams;
     financingType: FinancingType;
-    scenarioConfigSite?: {
-        rateOfGrowth: RateOfGrowth[];
-        demandMultiplierSlots: Array<{
-            months: Array<{
-                month: number;
-                year: number;
-            }>;
-            id: string;
-            days: number[];
-            startHour: number;
-            endHour: number;
-            demandMultiplier: number;
-        }>;
-    };
+    configSite?: ConfigSite;
     name?: string;
     description?: string;
     isActive?: boolean;

package/dist/core/ScenarioDefaultValue.js

@@ -28,6 +28,7 @@ const wind_turbine_params_1 = require("./internal/wind-turbine-params");
 const electrolyse_params_1 = require("./internal/electrolyse-params");
 const ecs_params_1 = require("./internal/ecs-params");
 const h2_storage_params_1 = require("./internal/h2-storage-params");
+const Scenario_1 = require("./Scenario");
 const scenario_params_1 = require("./internal/scenario-params");
 const station_params_1 = require("./internal/station-params");
 const thermal_storage_params_1 = require("./internal/thermal-storage-params");
@@ -168,11 +169,11 @@ __decorate([
 ], ScenarioDefaultValue.prototype, "financingType", void 0);
 __decorate([
     (0, swagger_1.ApiPropertyOptional)(),
-    (0, mongoose_1.Prop)({ type: mongoose_2.Schema.Types.Mixed }),
+    (0, mongoose_1.Prop)({ type: mongoose_2.Schema.Types.Mixed, required: false }),
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsObject)(),
-    __metadata("design:type", Object)
-], ScenarioDefaultValue.prototype, "scenarioConfigSite", void 0);
+    __metadata("design:type", Scenario_1.ConfigSite)
+], ScenarioDefaultValue.prototype, "configSite", void 0);
 __decorate([
     (0, swagger_1.ApiPropertyOptional)(),
     (0, mongoose_1.Prop)(),

package/dist/core/Site.d.ts

@@ -12,6 +12,7 @@ import { ConsumptionIndexes } from './internal/consumption-indexes';
 import { EnergyPriceTempo } from './internal/energy-price-tempo.model';
 export declare class Site {
     readonly _id: Types.ObjectId;
+    id: string;
     country: string;
     energyPrices: EnergyPrice[];
     purchaseAreaOfTension: string;
@@ -21,7 +22,7 @@ export declare class Site {
     type: SiteType;
     purchaseMeterOwner: string;
     purchaseContractType: string;
-    description?: string | undefined;
+    description?: string;
     subscriptionRates: number;
     address: string;
     ratesOption: string;
@@ -56,9 +57,9 @@ export declare class Site {
     _step3At: Date;
     analysisId: string;
     analysisYear: number;
-    autoCO2?: boolean | null;
     buildingData: BuildingData;
-    co2rate?: number | null;
+    autoCO2?: boolean;
+    co2rate?: number;
     connectingPower: string;
     consentFileUrl: string;
     consumptionIndexes: ConsumptionIndexes;

package/dist/core/Site.js

@@ -37,6 +37,15 @@ __decorate([
     }),
     __metadata("design:type", mongoose_2.Types.ObjectId)
 ], Site.prototype, "_id", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: 'Identifiant dupliqué pour lapi python',
+        example: '2M61PGSm7lRpqXeaDacbAYOLTYG3',
+        type: String,
+        readOnly: false,
+    }),
+    __metadata("design:type", String)
+], Site.prototype, "id", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)(),
     (0, mongoose_1.Prop)({ required: true }),
@@ -92,11 +101,11 @@ __decorate([
     __metadata("design:type", String)
 ], Site.prototype, "purchaseContractType", void 0);
 __decorate([
-    (0, swagger_1.ApiProperty)({ required: false }),
-    (0, mongoose_1.Prop)({ required: false }),
+    (0, swagger_1.ApiProperty)(),
+    (0, mongoose_1.Prop)({ type: String, required: false }),
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)(),
-    __metadata("design:type", Object)
+    __metadata("design:type", String)
 ], Site.prototype, "description", void 0);
 __decorate([
     (0, mongoose_1.Prop)({ required: true }),
@@ -304,24 +313,24 @@ __decorate([
     (0, class_validator_1.IsNumber)(),
     __metadata("design:type", Number)
 ], Site.prototype, "analysisYear", void 0);
-__decorate([
-    (0, swagger_1.ApiProperty)({ required: false, nullable: true }),
-    (0, mongoose_1.Prop)({ required: false, default: null }),
-    (0, class_validator_1.IsOptional)(),
-    (0, class_validator_1.IsBoolean)(),
-    __metadata("design:type", Object)
-], Site.prototype, "autoCO2", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({ type: building_data_1.BuildingData }),
     (0, mongoose_1.Prop)({ type: building_data_1.BuildingData, required: true }),
     __metadata("design:type", building_data_1.BuildingData)
 ], Site.prototype, "buildingData", void 0);
 __decorate([
-    (0, swagger_1.ApiProperty)({ required: false, nullable: true }),
-    (0, mongoose_1.Prop)({ required: false, default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, mongoose_1.Prop)({ type: Boolean, required: false, default: null }),
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsBoolean)(),
+    __metadata("design:type", Boolean)
+], Site.prototype, "autoCO2", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)(),
+    (0, mongoose_1.Prop)({ type: Number, required: false, default: null }),
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsNumber)(),
-    __metadata("design:type", Object)
+    __metadata("design:type", Number)
 ], Site.prototype, "co2rate", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likewatt/models",
-  "version": "1.0.49",
+  "version": "1.0.56",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {