@dative-gpi/foundation-core-domain 1.0.27 → 1.0.28-remove-deprecated2

package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationInfos.ts

@@ -1,53 +1,75 @@
+import type { ScenarioParameterOverrideDTO } from "../scenarios/scenarioParameterOverride";
+import { ScenarioParameterOverride } from "../scenarios/scenarioParameterOverride";
+import { ScenarioParameter } from "../scenarios/scenarioParameter";
+import type { ScenarioParameterDTO } from "../scenarios/scenarioParameter";
 import type { TimeRangeDTO } from "../shared/timeRange";
 import { TimeRange } from "../shared/timeRange";
+import type { ApplicationScope } from "@/shared/foundation-shared-domain/enums";
 
 export class ScenarioDeviceOrganisationInfos {
   id: string;
-  scenarioId: string;
   scenarioLabel: string;
   deviceOrganisationId: string;
   deviceOrganisationImageId: string | null;
   deviceOrganisationCode: string;
   deviceOrganisationLabel: string;
-  overrideConditions: boolean;
-  triggerCondition: string | null;
-  autoResolveCondition: string | null;
   overrideTimeRanges: boolean;
   timeRanges: TimeRange[] | null;
+  delay: number | null;
+  scenarioIcon: string;
+  warnDeviceManager: boolean;
+  userOrganisationsIds: string[];
+  modelId: string;
+  overrideParameters: ScenarioParameterOverride[];
+  defaultParameters: ScenarioParameter[];
+  scenarioId: string;
+  scenarioScope: ApplicationScope;
 
   constructor(params: ScenarioDeviceOrganisationInfosDTO) {
     this.id = params.id;
-    this.scenarioId = params.scenarioId;
     this.scenarioLabel = params.scenarioLabel;
     this.deviceOrganisationId = params.deviceOrganisationId;
     this.deviceOrganisationImageId = params.deviceOrganisationImageId;
     this.deviceOrganisationCode = params.deviceOrganisationCode;
     this.deviceOrganisationLabel = params.deviceOrganisationLabel;
-    this.overrideConditions = params.overrideConditions;
-    this.triggerCondition = params.triggerCondition;
-    this.autoResolveCondition = params.autoResolveCondition;
     this.overrideTimeRanges = params.overrideTimeRanges;
-    this.timeRanges = params.timeRanges ? 
+    this.timeRanges = params.timeRanges ?
       params.timeRanges.map(dto => new TimeRange(dto)) : null;
+    this.warnDeviceManager = params.warnDeviceManager;
+    this.delay = params.delay;
+    this.scenarioIcon = params.scenarioIcon;
+    this.userOrganisationsIds = params.userOrganisationsIds;
+    this.modelId = params.modelId;
+    this.overrideParameters = params.overrideParameters.map(dto => new ScenarioParameterOverride(dto));
+    this.defaultParameters = params.defaultParameters.map(dto => new ScenarioParameter(dto));
+    this.scenarioId = params.scenarioId;
+    this.scenarioScope = params.scenarioScope;
   }
 }
 
 export interface ScenarioDeviceOrganisationInfosDTO {
   id: string;
-  scenarioId: string;
   scenarioLabel: string;
   deviceOrganisationId: string;
   deviceOrganisationImageId: string | null;
   deviceOrganisationCode: string;
   deviceOrganisationLabel: string;
-  overrideConditions: boolean;
-  triggerCondition: string | null;
-  autoResolveCondition: string | null;
   overrideTimeRanges: boolean;
   timeRanges: TimeRangeDTO[] | null;
+  delay: number | null;
+  scenarioIcon: string;
+  modelId: string;
+  warnDeviceManager: boolean;
+  userOrganisationsIds: string[];
+  overrideParameters: ScenarioParameterOverrideDTO[];
+  defaultParameters: ScenarioParameterDTO[];
+  scenarioId: string;
+  scenarioScope: ApplicationScope;
 }
 
 export interface ScenarioDeviceOrganisationFilters {
   scenarioId?: string | null;
+  scenarioScope?: ApplicationScope | null;
   deviceOrganisationId?: string | null;
+  deviceOrganisationsIds?: string[] | null;
 }

package/models/scenarioOrganisationTypes/scenarioOrganisationTypeDetails.ts

@@ -1,11 +1,18 @@
-import type { ResolveOn, TriggerOn } from "@dative-gpi/foundation-shared-domain/models";
+import type { PlotPer, ResolveOn, TriggerOn } from "@dative-gpi/foundation-shared-domain/enums";
 
 import type { ScenarioOrganisationTypeInfosDTO } from "./scenarioOrganisationTypeInfos";
 import { ScenarioOrganisationTypeInfos } from "./scenarioOrganisationTypeInfos";
 import type { CreateTimeRangeDTO, TimeRangeDTO } from "../shared/timeRange";
 import { TimeRange } from "../shared/timeRange";
-import type { ScenarioTranslationDTO } from "../scenarios";
-import { ScenarioTranslation } from "../scenarios";
+import {
+  ScenarioParameter,
+  ScenarioTranslation,
+  type CreateScenarioChartDTO,
+  type CreateScenarioParameterDTO,
+  type ScenarioParameterDTO,
+  type ScenarioTranslationDTO
+} from "../scenarios";
+import type { CreateChartTimeStepDTO } from "../charts/chartTimeStep";
 
 export class ScenarioOrganisationTypeDetails extends ScenarioOrganisationTypeInfos {
   groupByIds: string[];
@@ -30,6 +37,7 @@ export class ScenarioOrganisationTypeDetails extends ScenarioOrganisationTypeInf
   timeout: number | null;
   lock: number | null;
   waitResolved: boolean;
+  parameters: ScenarioParameter[];
   translations: ScenarioTranslation[];
 
   constructor(params: ScenarioOrganisationTypeDetailsDTO) {
@@ -58,6 +66,7 @@ export class ScenarioOrganisationTypeDetails extends ScenarioOrganisationTypeInf
     this.timeout = params.timeout;
     this.lock = params.lock;
     this.waitResolved = params.waitResolved;
+    this.parameters = params.parameters.map(p => new ScenarioParameter(p));
     this.translations = params.translations.map(t => new ScenarioTranslation(t));
   }
 }
@@ -85,6 +94,7 @@ export interface ScenarioOrganisationTypeDetailsDTO extends ScenarioOrganisation
   timeout: number | null;
   lock: number | null;
   waitResolved: boolean;
+  parameters: ScenarioParameterDTO[];
   translations: ScenarioTranslationDTO[];
 }
 
@@ -105,6 +115,10 @@ export interface UpdateScenarioOrganisationTypeDTO {
   code: string;
   icon: string;
   tags: string[];
+  chartStartDate: string;
+  chartEndDate: string;
+  chartPlotPer: PlotPer | null;
+  chartStep: CreateChartTimeStepDTO | null;
   alertLabelDefault: string;
   alertDescriptionDefault: string;
   alertCode: string;
@@ -120,5 +134,7 @@ export interface UpdateScenarioOrganisationTypeDTO {
   timeout: number | null;
   lock: number | null;
   waitResolved: boolean;
+  charts: CreateScenarioChartDTO[];
+  parameters: CreateScenarioParameterDTO[];
   translations: ScenarioTranslationDTO[];
 }

package/models/scenarioOrganisationTypes/scenarioOrganisationTypeInfos.ts

@@ -1,6 +1,7 @@
-import type { Criticity } from "@dative-gpi/foundation-shared-domain/models";
+import type { Criticity, ApplicationScope, PlotPer } from "@dative-gpi/foundation-shared-domain/enums";
 
-import type { ApplicationScope } from "../enums/applicationEnums";
+import { ScenarioChart, ScenarioParameter, type ScenarioChartDTO, type ScenarioParameterDTO } from "../scenarios";
+import { ChartTimeStep, type ChartTimeStepDTO } from "../charts/chartTimeStep";
 
 export class ScenarioOrganisationTypeInfos {
   id: string;
@@ -8,17 +9,24 @@ export class ScenarioOrganisationTypeInfos {
   organisationTypeId: string | null;
   organisationTypeLabel: string | null;
   scope: ApplicationScope;
-  modelId: string;
+  modelId: string | null;
   modelLabel: string;
-  dataCategoryId: string;
+  dataCategoryId: string | null;
   dataCategoryLabel: string;
-  dataDefinitionId: string;
+  dataDefinitionId: string | null;
   dataDefinitionLabel: string;
   criticity: Criticity;
   label: string;
   code: string;
   icon: string;
+  draft: boolean;
   tags: string[];
+  chartStartDate: string;
+  chartEndDate: string;
+  chartPlotPer: PlotPer | null;
+  chartStep: ChartTimeStep | null;
+  charts: ScenarioChart[];
+  parameters: ScenarioParameter[];
 
   constructor(params: ScenarioOrganisationTypeInfosDTO) {
     this.id = params.id;
@@ -36,7 +44,14 @@ export class ScenarioOrganisationTypeInfos {
     this.label = params.label;
     this.code = params.code;
     this.icon = params.icon;
+    this.draft = params.draft;
+    this.chartStartDate = params.chartStartDate;
+    this.chartEndDate = params.chartEndDate;
+    this.chartPlotPer = params.chartPlotPer;
+    this.chartStep = params.chartStep != null ? new ChartTimeStep(params.chartStep) : null;
     this.tags = params.tags.slice();
+    this.charts = params.charts.map(p => new ScenarioChart(p))
+    this.parameters = params.parameters.map(p => new ScenarioParameter(p));
   }
 }
 
@@ -46,19 +61,27 @@ export interface ScenarioOrganisationTypeInfosDTO {
   organisationTypeId: string | null;
   organisationTypeLabel: string | null;
   scope: number;
-  modelId: string;
+  modelId: string | null;
   modelLabel: string;
-  dataCategoryId: string;
+  dataCategoryId: string | null;
   dataCategoryLabel: string;
-  dataDefinitionId: string;
+  dataDefinitionId: string | null;
   dataDefinitionLabel: string;
   criticity: number;
   label: string;
   code: string;
   icon: string;
+  draft: boolean;
   tags: string[];
+  chartStartDate: string;
+  chartEndDate: string;
+  chartPlotPer: PlotPer | null;
+  chartStep: ChartTimeStepDTO | null;
+  charts: ScenarioChartDTO[];
+  parameters: ScenarioParameterDTO[];
 }
 
 export interface ScenarioOrganisationTypeFilters {
   modelId?: string | null;
+  draft?: boolean | null;
 }

package/models/scenarioOrganisations/scenarioOrganisationDetails.ts

@@ -1,11 +1,18 @@
-import type { ResolveOn, TriggerOn } from "@dative-gpi/foundation-shared-domain/models";
+import type { PlotPer, ResolveOn, TriggerOn } from "@dative-gpi/foundation-shared-domain/enums";
 
 import type { ScenarioOrganisationInfosDTO } from "./scenarioOrganisationInfos";
 import { ScenarioOrganisationInfos } from "./scenarioOrganisationInfos";
 import type { CreateTimeRangeDTO, TimeRangeDTO } from "../shared/timeRange";
 import { TimeRange } from "../shared/timeRange";
-import type { ScenarioTranslationDTO } from "../scenarios";
-import { ScenarioTranslation } from "../scenarios";
+import {
+  ScenarioParameter,
+  ScenarioTranslation,
+  type CreateScenarioChartDTO,
+  type CreateScenarioParameterDTO,
+  type ScenarioParameterDTO,
+  type ScenarioTranslationDTO
+} from "../scenarios";
+import type { CreateChartTimeStepDTO } from "../charts/chartTimeStep";
 
 export class ScenarioOrganisationDetails extends ScenarioOrganisationInfos {
   groupByIds: string[];
@@ -30,6 +37,7 @@ export class ScenarioOrganisationDetails extends ScenarioOrganisationInfos {
   timeout: number | null;
   lock: number | null;
   waitResolved: boolean;
+  parameters: ScenarioParameter[];
   translations: ScenarioTranslation[];
 
   constructor(params: ScenarioOrganisationDetailsDTO) {
@@ -57,6 +65,7 @@ export class ScenarioOrganisationDetails extends ScenarioOrganisationInfos {
     this.timeout = params.timeout;
     this.lock = params.lock;
     this.waitResolved = params.waitResolved;
+    this.parameters = params.parameters.map(p => new ScenarioParameter(p));
     this.translations = params.translations.map(t => new ScenarioTranslation(t));
   }
 }
@@ -84,12 +93,13 @@ export interface ScenarioOrganisationDetailsDTO extends ScenarioOrganisationInfo
   timeout: number | null;
   lock: number | null;
   waitResolved: boolean;
+  parameters: ScenarioParameterDTO[];
   translations: ScenarioTranslationDTO[];
 }
 
 export interface CreateScenarioOrganisationDTO {
-  modelId: string;
-  dataCategoryId: string;
+  modelId: string | null;
+  dataCategoryId: string | null;
   dataDefinitionId: string | null;
   groupByIds: string[];
   metadataIds: string[];
@@ -104,6 +114,10 @@ export interface CreateScenarioOrganisationDTO {
   alertCode: string;
   alertIcon: string;
   alertTags: string[];
+  chartStartDate: string;
+  chartEndDate: string;
+  chartPlotPer: PlotPer | null;
+  chartStep: CreateChartTimeStepDTO | null;
   timeRanges: CreateTimeRangeDTO[];
   triggerOn: number;
   triggerCondition: string;
@@ -114,6 +128,8 @@ export interface CreateScenarioOrganisationDTO {
   timeout: number | null;
   lock: number | null;
   waitResolved: boolean;
+  charts: CreateScenarioChartDTO[];
+  parameters: CreateScenarioParameterDTO[];
   translations: ScenarioTranslationDTO[];
 }
 
@@ -129,6 +145,10 @@ export interface UpdateScenarioOrganisationDTO {
   code: string;
   icon: string;
   tags: string[];
+  chartStartDate: string;
+  chartEndDate: string;
+  chartPlotPer: PlotPer | null;
+  chartStep: CreateChartTimeStepDTO | null;
   alertLabelDefault: string;
   alertDescriptionDefault: string;
   alertCode: string;
@@ -144,5 +164,7 @@ export interface UpdateScenarioOrganisationDTO {
   timeout: number | null;
   lock: number | null;
   waitResolved: boolean;
+  charts: CreateScenarioChartDTO[];
+  parameters: CreateScenarioParameterDTO[];
   translations: ScenarioTranslationDTO[];
 }

package/models/scenarioOrganisations/scenarioOrganisationInfos.ts

@@ -1,23 +1,31 @@
-import type { Criticity } from "@dative-gpi/foundation-shared-domain/models";
+import type { Criticity, ApplicationScope, PlotPer } from "@dative-gpi/foundation-shared-domain/enums";
 
-import type { ApplicationScope } from "../enums/applicationEnums";
+import { ScenarioParameter, type ScenarioChartDTO, type ScenarioParameterDTO, ScenarioChart } from "../scenarios";
+import { ChartTimeStep, type ChartTimeStepDTO } from "../charts/chartTimeStep";
 
 export class ScenarioOrganisationInfos {
   id: string;
   scenarioId: string;
   organisationId: string;
   scope: ApplicationScope;
-  modelId: string;
+  modelId: string | null;
   modelLabel: string;
-  dataCategoryId: string;
+  dataCategoryId: string | null;
   dataCategoryLabel: string;
-  dataDefinitionId: string;
+  dataDefinitionId: string | null;
   dataDefinitionLabel: string;
   criticity: Criticity;
   label: string;
   code: string;
   icon: string;
+  draft: boolean;
   tags: string[];
+  chartStartDate: string;
+  chartEndDate: string;
+  chartPlotPer: PlotPer | null;
+  chartStep: ChartTimeStep | null;
+  charts: ScenarioChart[];
+  parameters: ScenarioParameter[];
 
   constructor(params: ScenarioOrganisationInfosDTO) {
     this.id = params.id;
@@ -34,7 +42,14 @@ export class ScenarioOrganisationInfos {
     this.label = params.label;
     this.code = params.code;
     this.icon = params.icon;
+    this.draft = params.draft;
+    this.chartStartDate = params.chartStartDate;
+    this.chartEndDate = params.chartEndDate;
+    this.chartPlotPer = params.chartPlotPer;
+    this.chartStep = params.chartStep != null ? new ChartTimeStep(params.chartStep) : null;
     this.tags = params.tags.slice();
+    this.charts = params.charts.map(p => new ScenarioChart(p))
+    this.parameters = params.parameters.map(p => new ScenarioParameter(p));
   }
 }
 
@@ -43,19 +58,27 @@ export interface ScenarioOrganisationInfosDTO {
   scenarioId: string;
   organisationId: string;
   scope: number;
-  modelId: string;
+  modelId: string | null;
   modelLabel: string;
-  dataCategoryId: string;
+  dataCategoryId: string | null;
   dataCategoryLabel: string;
-  dataDefinitionId: string;
+  dataDefinitionId: string | null;
   dataDefinitionLabel: string;
   criticity: number;
   label: string;
   code: string;
   icon: string;
+  draft: boolean;
   tags: string[];
+  chartStartDate: string;
+  chartEndDate: string;
+  chartPlotPer: PlotPer | null;
+  chartStep: ChartTimeStepDTO | null;
+  charts: ScenarioChartDTO[];
+  parameters: ScenarioParameterDTO[];
 }
 
 export interface ScenarioOrganisationFilters {
   modelId?: string | null;
+  draft?: boolean | null;
 }

package/models/scenarioParameterDeviceOrganisations/index.ts

@@ -0,0 +1,2 @@
+export * from "./scenarioParameterDeviceOrganisationDetails";
+export * from "./scenarioParameterDeviceOrganisationInfos";

package/models/scenarioParameterDeviceOrganisations/scenarioParameterDeviceOrganisationDetails.ts

@@ -0,0 +1,24 @@
+import type { ScenarioParameterDeviceOrganisationInfosDTO } from "./scenarioParameterDeviceOrganisationInfos";
+import { ScenarioParameterDeviceOrganisationInfos } from "./scenarioParameterDeviceOrganisationInfos";
+
+
+export class ScenarioParameterDeviceOrganisationDetails extends ScenarioParameterDeviceOrganisationInfos {
+
+  constructor(params: ScenarioParameterDeviceOrganisationDetailsDTO) {
+    super(params);
+  }
+}
+
+export interface ScenarioParameterDeviceOrganisationDetailsDTO extends ScenarioParameterDeviceOrganisationInfosDTO {
+
+}
+
+export interface CreateScenarioParameterDeviceOrganisationDTO {
+  scenarioParameterId: string;
+  deviceOrganisationId: string;
+  overrideValue: string;
+}
+
+export interface UpdateScenarioParameterDeviceOrganisationDTO {
+  overrideValue: string | null;
+}

package/models/scenarioParameterDeviceOrganisations/scenarioParameterDeviceOrganisationInfos.ts

@@ -0,0 +1,45 @@
+
+export class ScenarioParameterDeviceOrganisationInfos {
+  id: string;
+  scenarioParameterId: string;
+  scenarioParameterLabel: string;
+  deviceOrganisationId: string;
+  deviceOrganisationImageId: string | null;
+  deviceOrganisationLabel: string;
+  parameterType: number;
+  overrideValue: string | null;
+  parameterValueDefault: string;
+  parameterDataDefinitionId: string | null;
+
+  constructor(params: ScenarioParameterDeviceOrganisationInfosDTO) {
+    this.id = params.id;
+    this.scenarioParameterId = params.scenarioParameterId;
+    this.deviceOrganisationId = params.deviceOrganisationId;
+    this.scenarioParameterLabel = params.scenarioParameterLabel;
+    this.deviceOrganisationImageId = params.deviceOrganisationImageId;
+    this.deviceOrganisationLabel = params.deviceOrganisationLabel;
+    this.parameterType = params.parameterType;
+    this.parameterDataDefinitionId = params.parameterDataDefinitionId;
+    this.overrideValue = params.overrideValue;
+    this.parameterValueDefault = params.parameterValueDefault;
+
+  }
+}
+
+export interface ScenarioParameterDeviceOrganisationInfosDTO {
+  id: string;
+  scenarioParameterId: string;
+  scenarioParameterLabel: string;
+  deviceOrganisationId: string;
+  deviceOrganisationImageId: string | null;
+  deviceOrganisationLabel: string;
+  parameterType: number;
+  overrideValue: string | null;
+  parameterValueDefault: string;
+  parameterDataDefinitionId: string | null;
+}
+
+export interface ScenarioParameterDeviceOrganisationFilters {
+  scenarioParameterId?: string | null;
+  deviceOrganisationId?: string | null;
+}

package/models/scenarios/index.ts

@@ -1 +1,5 @@
-export * from "./scenarioTranslation";
+export * from "./scenarioTranslation";
+export * from "./scenarioParameter";
+export * from "./scenarioChart";
+export * from "./translationScenarioParameter";
+export * from "./scenarioParameterOverride";

package/models/scenarios/scenarioChart.ts

@@ -0,0 +1,30 @@
+import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
+
+export class ScenarioChart {
+  id: string;
+  chartId: string;
+  scope: ApplicationScope;
+  index: number;
+
+
+  constructor(params: ScenarioChartDTO) {
+    this.id = params.id;
+    this.chartId = params.chartId;
+    this.scope = params.scope;
+    this.index = params.index;
+  }
+}
+
+export interface ScenarioChartDTO {
+  id: string;
+  chartId: string;
+  scope: ApplicationScope;
+  index: number;
+}
+
+export interface CreateScenarioChartDTO {
+  id: string;
+  chartId: string;
+  scope: ApplicationScope;
+  index: number;
+}

package/models/scenarios/scenarioParameter.ts

@@ -0,0 +1,52 @@
+
+import { TranslationScenarioParameter, type TranslationScenarioParameterDTO } from './translationScenarioParameter';
+
+export class ScenarioParameter {
+  id: string;
+  scenarioId: string;
+  hiddenCode: string;
+  dataDefinitionId: string | null;
+  valueType: number;
+  labelDefault: string;
+  valueDefault: string;
+  editable: boolean;
+  label: string;
+  translations: TranslationScenarioParameter[];
+
+  constructor(params: ScenarioParameterDTO) {
+    this.id = params.id;
+    this.scenarioId = params.scenarioId;
+    this.hiddenCode = params.hiddenCode;
+    this.dataDefinitionId = params.dataDefinitionId;
+    this.valueType = params.valueType;
+    this.labelDefault = params.labelDefault;
+    this.valueDefault = params.valueDefault;
+    this.editable = params.editable;
+    this.label = params.label;
+    this.translations = params.translations.map(t => new TranslationScenarioParameter(t));
+  }
+}
+
+export interface ScenarioParameterDTO {
+  id: string;
+  scenarioId: string;
+  hiddenCode: string;
+  dataDefinitionId: string | null;
+  valueType: number;
+  labelDefault: string;
+  valueDefault: string;
+  editable: boolean;
+  label: string;
+  translations: TranslationScenarioParameterDTO[];
+}
+
+export interface CreateScenarioParameterDTO {
+  id: string
+  hiddenCode: string;
+  labelDefault: string;
+  dataDefinitionId: string | null;
+  valueType: number;
+  valueDefault: string;
+  editable: boolean;
+  translations: TranslationScenarioParameterDTO[];
+}

package/models/scenarios/scenarioParameterOverride.ts

@@ -0,0 +1,20 @@
+
+export class ScenarioParameterOverride {
+  scenarioParameterId: string;
+  overrideValue: string | null;
+
+  constructor(params: ScenarioParameterOverrideDTO) {
+    this.scenarioParameterId = params.scenarioParameterId;
+    this.overrideValue = params.overrideValue;
+
+  }
+}
+
+export interface ScenarioParameterOverrideDTO {
+  scenarioParameterId: string;
+  overrideValue: string | null;
+}
+export interface CreateScenarioParameterOverrideDTO {
+  scenarioParameterId: string;
+  overrideValue: string | null;
+}

package/models/scenarios/translationScenarioParameter.ts

@@ -0,0 +1,14 @@
+export class TranslationScenarioParameter {
+  languageCode: string;
+  label: string;
+
+  constructor(params: TranslationScenarioParameterDTO) {
+    this.languageCode = params.languageCode;
+    this.label = params.label;
+  }
+}
+
+export interface TranslationScenarioParameterDTO {
+  languageCode: string;
+  label: string;
+}

package/models/serviceAccountOrganisationAuthTokens/serviceAccountOrganisationAuthTokenInfos.ts

@@ -1,4 +1,4 @@
-import { utcToEpoch } from "@dative-gpi/foundation-shared-domain/tools";
+import { isoToEpoch } from "@dative-gpi/foundation-shared-domain/tools";
 
 export class ServiceAccountOrganisationAuthTokenInfos {
   id: string;
@@ -12,8 +12,8 @@ export class ServiceAccountOrganisationAuthTokenInfos {
     this.id = params.id;
     this.serviceAccountOrganisationId = params.serviceAccountOrganisationId;
     this.label = params.label;
-    this.creationDate = utcToEpoch(params.creationDate);
-    this.dateMax = utcToEpoch(params.dateMax);
+    this.creationDate = isoToEpoch(params.creationDate);
+    this.dateMax = isoToEpoch(params.dateMax);
     this.token = params.token;
   }
 }

package/models/serviceAccountOrganisations/serviceAccountOrganisationDetails.ts

@@ -1,9 +1,6 @@
-import type { PermissionInfosDTO } from "@dative-gpi/foundation-shared-domain/models";
-import { PermissionInfos } from "@dative-gpi/foundation-shared-domain/models";
+import { PermissionInfos, type PermissionInfosDTO } from "@dative-gpi/foundation-shared-domain/models";
 
-import type { ServiceAccountOrganisationInfosDTO } from "./serviceAccountOrganisationInfos";
-import { ServiceAccountOrganisationInfos } from "./serviceAccountOrganisationInfos";
-import type { RoleType } from "../enums/roleEnums";
+import { ServiceAccountOrganisationInfos, type ServiceAccountOrganisationInfosDTO } from "./serviceAccountOrganisationInfos";
 
 export class ServiceAccountOrganisationDetails extends ServiceAccountOrganisationInfos {
   languageCode: string;
@@ -26,7 +23,6 @@ export interface ServiceAccountOrganisationDetailsDTO extends ServiceAccountOrga
 }
 
 export interface CreateServiceAccountOrganisationDTO {
-  roleType: RoleType;
   roleId: string | null;
   languageCode: string;
   timeZoneId: string;
@@ -37,7 +33,6 @@ export interface CreateServiceAccountOrganisationDTO {
 }
 
 export interface UpdateServiceAccountOrganisationDTO {
-  roleType: RoleType;
   roleId: string | null;
   languageCode: string;
   timeZoneId: string;