Model fixes

Author: DerAndereAndi

spine/model/loadcontrol.go

@@ -1,6 +1,6 @@
 package model
 
-type LoadControlEventIdType string
+type LoadControlEventIdType uint
 
 type LoadControlEventActionType string
 
@@ -51,7 +51,7 @@ type LoadControlNodeDataElementsType struct {
 
 type LoadControlEventDataType struct {
 	Timestamp          *string                     `json:"timestamp,omitempty"`
-	EventId            *LoadControlEventIdType     `json:"eventId,omitempty"`
+	EventId            *LoadControlEventIdType     `json:"eventId,omitempty" eebus:"key"`
 	EventActionConsume *LoadControlEventActionType `json:"eventActionConsume,omitempty"`
 	EventActionProduce *LoadControlEventActionType `json:"eventActionProduce,omitempty"`
 	TimePeriod         *TimePeriodType             `json:"timePeriod,omitempty"`
@@ -76,7 +76,7 @@ type LoadControlEventListDataSelectorsType struct {
 
 type LoadControlStateDataType struct {
 	Timestamp                 *string                     `json:"timestamp"`
-	EventId                   *LoadControlEventIdType     `json:"eventId,omitempty"`
+	EventId                   *LoadControlEventIdType     `json:"eventId,omitempty" eebus:"key"`
 	EventStateConsume         *LoadControlEventStateType  `json:"eventStateConsume"`
 	AppliedEventActionConsume *LoadControlEventActionType `json:"appliedEventActionConsume"`
 	EventStateProduce         *LoadControlEventStateType  `json:"eventStateProduce"`

spine/model/operatingconstraints.go

@@ -1,7 +1,7 @@
 package model
 
 type OperatingConstraintsInterruptDataType struct {
-	SequenceId                  *PowerSequenceIdType `json:"sequenceId,omitempty"`
+	SequenceId                  *PowerSequenceIdType `json:"sequenceId,omitempty" eebus:"key"`
 	IsPausable                  *bool                `json:"isPausable,omitempty"`
 	IsStoppable                 *bool                `json:"isStoppable,omitempty"`
 	NotInterruptibleAtHighPower *bool                `json:"notInterruptibleAtHighPower,omitempty"`

spine/model/powersequences.go

@@ -88,7 +88,7 @@ type PowerTimeSlotValueDataElementsType struct {
 }
 
 type PowerTimeSlotValueListDataType struct {
-	PowerTimeSlotValueListDataType []PowerTimeSlotValueDataType `json:"powerTimeSlotValueListData,omitempty"`
+	PowerTimeSlotValueData []PowerTimeSlotValueDataType `json:"powerTimeSlotValueListData,omitempty"`
 }
 
 type PowerTimeSlotValueListDataSelectorsType struct {

spine/model/tariffinformation.go

@@ -250,7 +250,7 @@ type CommodityListDataSelectorsType struct {
 type TierDataType struct {
 	TierId            *TierIdType       `json:"tierId,omitempty" eebus:"key"`
 	TimePeriod        *TimePeriodType   `json:"timePeriod,omitempty"`
-	TimeTableId       *TimeTableIdType  `json:"timeTableId,omitempty"`
+	TimeTableId       *TimeTableIdType  `json:"timeTableId,omitempty" eebus:"key"`
 	ActiveIncentiveId []IncentiveIdType `json:"activeIncentiveId,omitempty"`
 }
 

spine/model/threshold.go

@@ -18,7 +18,7 @@ const (
 )
 
 type ThresholdDataType struct {
-	ThresholdId    *ThresholdIdType  `json:"thresholdId,omitempty"`
+	ThresholdId    *ThresholdIdType  `json:"thresholdId,omitempty" eebus:"key"`
 	ThresholdValue *ScaledNumberType `json:"thresholdValue,omitempty"`
 }
 
@@ -36,7 +36,7 @@ type ThresholdListDataSelectorsType struct {
 }
 
 type ThresholdConstraintsDataType struct {
-	ThresholdId       *ThresholdIdType  `json:"thresholdId,omitempty"`
+	ThresholdId       *ThresholdIdType  `json:"thresholdId,omitempty" eebus:"key"`
 	ThresholdRangeMin *ScaledNumberType `json:"thresholdRangeMin,omitempty"`
 	ThresholdRangeMax *ScaledNumberType `json:"thresholdRangeMax,omitempty"`
 	ThresholdStepSize *ScaledNumberType `json:"thresholdStepSize,omitempty"`

spine/model/timetable.go

@@ -15,8 +15,8 @@ const (
 )
 
 type TimeTableDataType struct {
-	TimeTableId           *TimeTableIdType             `json:"timeTableId,omitempty"`
-	TimeSlotId            *TimeSlotIdType              `json:"timeSlotId,omitempty"`
+	TimeTableId           *TimeTableIdType             `json:"timeTableId,omitempty" eebus:"key"`
+	TimeSlotId            *TimeSlotIdType              `json:"timeSlotId,omitempty" eebus:"key"`
 	RecurrenceInformation *RecurrenceInformationType   `json:"recurrenceInformation,omitempty"`
 	StartTime             *AbsoluteOrRecurringTimeType `json:"startTime,omitempty"`
 	EndTime               *AbsoluteOrRecurringTimeType `json:"endTime,omitempty"`
@@ -40,7 +40,7 @@ type TimeTableListDataSelectorsType struct {
 }
 
 type TimeTableConstraintsDataType struct {
-	TimeTableId          *uint              `json:"timeTableId,omitempty"`
+	TimeTableId          *TimeTableIdType   `json:"timeTableId,omitempty" eebus:"key"`
 	SlotCountMin         *TimeSlotCountType `json:"slotCountMin,omitempty"`
 	SlotCountMax         *TimeSlotCountType `json:"slotCountMax,omitempty"`
 	SlotDurationMin      *DurationType      `json:"slotDurationMin,omitempty"`
@@ -70,7 +70,7 @@ type TimeTableConstraintsListDataSelectorsType struct {
 }
 
 type TimeTableDescriptionDataType struct {
-	TimeTableId             *uint                 `json:"timeTableId,omitempty"`
+	TimeTableId             *TimeTableIdType      `json:"timeTableId,omitempty" eebus:"key"`
 	TimeSlotCountChangeable *bool                 `json:"timeSlotCountChangeable,omitempty"`
 	TimeSlotTimesChangeable *bool                 `json:"timeSlotTimesChangeable,omitempty"`
 	TimeSlotTimeMode        *TimeSlotTimeModeType `json:"timeSlotTimeMode,omitempty"`