pedro/nats-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better models and improve validation

Browse Source
This commit is contained in:
Pedro Pérez 2025-10-09 15:46:43 +02:00
parent 5b281bb295
commit 15b1e9c82f
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
internal/domains/sensors/domain.go
View File

@ -12,28 +12,31 @@ func (s *Sensor) Validate() error {
if s.SensorType == "" {
return ErrInvalidSensorType
}
return nil
}
func (d *SensorData) Validate() error {
if d.SensorID == "" {
return ErrInvalidSensorIdentifier
if s.SamplingInterval == nil {
defaultInterval := time.Second * 3600
s.SamplingInterval = &defaultInterval
}
if d.Value == nil {
return ErrMissingValue
if s.ThresholdAbove == nil {
defaultAbove := 100.0
s.ThresholdAbove = &defaultAbove
}
if d.Timestamp.IsZero() {
d.Timestamp = time.Now()
if s.ThresholdBelow == nil {
defaultBelow := 0.0
s.ThresholdBelow = &defaultBelow
}
return nil
}
func (d *SensorData) IsOutOfRangeAbove(sensor Sensor) bool {
return *d.Value > sensor.ThresholdAbove
return d.Value > *sensor.ThresholdAbove
}
func (d *SensorData) IsOutOfRangeBelow(sensor Sensor) bool {
return *d.Value < sensor.ThresholdBelow
return d.Value < *sensor.ThresholdBelow
}
func (r *SensorRequest) Validate() error {
@ -48,19 +51,23 @@ func (r *SensorDataRequest) Validate() error {
return ErrInvalidSensorIdentifier
}
if r.To == "" {
r.To = time.Now().Format(time.RFC3339)
if r.To == nil || *r.To == "" {
defaultTo := time.Now().Format(time.RFC3339)
r.To = &defaultTo
} else {
if _, err := time.Parse(time.RFC3339, r.To); err != nil {
r.To = time.Now().Format(time.RFC3339)
if _, err := time.Parse(time.RFC3339, *r.To); err != nil {
defaultTo := time.Now().Format(time.RFC3339)
r.To = &defaultTo
}
}
if r.From == "" {
r.From = time.Now().AddDate(0, 0, -7).Format(time.RFC3339)
if r.From == nil || *r.From == "" {
defaultFrom := time.Now().AddDate(0, 0, -7).Format(time.RFC3339)
r.From = &defaultFrom
} else {
if _, err := time.Parse(time.RFC3339, r.From); err != nil {
r.From = time.Now().AddDate(0, 0, -7).Format(time.RFC3339)
if _, err := time.Parse(time.RFC3339, *r.From); err != nil {
defaultFrom := time.Now().AddDate(0, 0, -7).Format(time.RFC3339)
r.From = &defaultFrom
}
}
@ -72,4 +79,5 @@ var (
ErrInvalidSensorType = errors.New("sensor type is required")
ErrSensorNotFound = errors.New("sensor not found")
ErrMissingValue = errors.New("sensor value no provided")
ErrSensorAlreadyExists = errors.New("sensor already exists")
)

12
internal/domains/sensors/models.go
View File

@ -17,15 +17,15 @@ const (
type Sensor struct {
SensorID string `json:"sensor_id"`
SensorType SType `json:"sensor_type"`
SamplingInterval time.Duration `json:"sampling"`
ThresholdAbove float64 `json:"thresoldabove"`
ThresholdBelow float64 `json:"thresoldbelow"`
SamplingInterval *time.Duration `json:"sampling"`
ThresholdAbove *float64 `json:"thresoldabove"`
ThresholdBelow *float64 `json:"thresoldbelow"`
SensorData *[]SensorData `json:"sensor_data,omitempty"`
}
type SensorData struct {
SensorID string `json:"sensor_id"`
Value *float64 `json:"value"`
Value float64 `json:"value"`
Timestamp time.Time `json:"timestamp"`
}
@ -35,6 +35,6 @@ type SensorRequest struct {
type SensorDataRequest struct {
SensorID string `json:"sensor_id"`
From string `json:"from"`
To string `json:"to"`
From *string `json:"from"`
To *string `json:"to"`
}