Merge pull request #844 from tidepool-org/BACK-3735-dosing-decision-extended-bolus

[BACK-3735] Update dosing decision recommended and requested bolus to allow extended boluses

Author: darinkrauss

data/types/bolus/combination/combination.go

@@ -2,23 +2,25 @@ package combination
 
 import (
 	"github.com/tidepool-org/platform/data"
-	"github.com/tidepool-org/platform/data/types/bolus"
+	dataTypesBolus "github.com/tidepool-org/platform/data/types/bolus"
+	dataTypesBolusExtended "github.com/tidepool-org/platform/data/types/bolus/extended"
+	dataTypesBolusNormal "github.com/tidepool-org/platform/data/types/bolus/normal"
 	"github.com/tidepool-org/platform/structure"
 )
 
 const (
 	SubType = "dual/square" // TODO: Rename Type to "bolus/combination"; remove SubType
 
-	DurationMaximum = 86400000
-	DurationMinimum = 0
-	ExtendedMaximum = 100.0
-	ExtendedMinimum = 0.0
-	NormalMaximum   = 100.0
-	NormalMinimum   = 0.0
+	DurationMaximum = dataTypesBolusExtended.DurationMaximum
+	DurationMinimum = dataTypesBolusExtended.DurationMinimum
+	ExtendedMaximum = dataTypesBolusExtended.ExtendedMaximum
+	ExtendedMinimum = dataTypesBolusExtended.ExtendedMinimum
+	NormalMaximum   = dataTypesBolusNormal.NormalMaximum
+	NormalMinimum   = dataTypesBolusNormal.NormalMinimum
 )
 
 type Combination struct {
-	bolus.Bolus `bson:",inline"`
+	dataTypesBolus.Bolus `bson:",inline"`
 
 	Duration         *int     `json:"duration,omitempty" bson:"duration,omitempty"`
 	DurationExpected *int     `json:"expectedDuration,omitempty" bson:"expectedDuration,omitempty"`
@@ -30,7 +32,7 @@ type Combination struct {
 
 func New() *Combination {
 	return &Combination{
-		Bolus: bolus.New(SubType),
+		Bolus: dataTypesBolus.New(SubType),
 	}
 }
 

data/types/dosingdecision/bolus.go

@@ -0,0 +1,66 @@
+package dosingdecision
+
+import (
+	dataTypesBolusCombination "github.com/tidepool-org/platform/data/types/bolus/combination"
+	"github.com/tidepool-org/platform/structure"
+	structureValidator "github.com/tidepool-org/platform/structure/validator"
+)
+
+const (
+	BolusAmountMaximum   = dataTypesBolusCombination.NormalMaximum
+	BolusAmountMinimum   = dataTypesBolusCombination.NormalMinimum
+	BolusDurationMaximum = dataTypesBolusCombination.DurationMaximum
+	BolusDurationMinimum = dataTypesBolusCombination.DurationMinimum
+	BolusExtendedMaximum = dataTypesBolusCombination.ExtendedMaximum
+	BolusExtendedMinimum = dataTypesBolusCombination.ExtendedMinimum
+	BolusNormalMaximum   = dataTypesBolusCombination.NormalMaximum
+	BolusNormalMinimum   = dataTypesBolusCombination.NormalMinimum
+)
+
+type Bolus struct {
+	Amount   *float64 `json:"amount,omitempty" bson:"amount,omitempty"`
+	Duration *int     `json:"duration,omitempty" bson:"duration,omitempty"`
+	Extended *float64 `json:"extended,omitempty" bson:"extended,omitempty"`
+	Normal   *float64 `json:"normal,omitempty" bson:"normal,omitempty"`
+}
+
+func ParseBolus(parser structure.ObjectParser) *Bolus {
+	if !parser.Exists() {
+		return nil
+	}
+	datum := NewBolus()
+	parser.Parse(datum)
+	return datum
+}
+
+func NewBolus() *Bolus {
+	return &Bolus{}
+}
+
+func (b *Bolus) Parse(parser structure.ObjectParser) {
+	b.Amount = parser.Float64("amount")
+	b.Duration = parser.Int("duration")
+	b.Extended = parser.Float64("extended")
+	b.Normal = parser.Float64("normal")
+}
+
+func (b *Bolus) Validate(validator structure.Validator) {
+	if b.Amount != nil {
+		validator.Float64("amount", b.Amount).InRange(BolusAmountMinimum, BolusAmountMaximum)
+		validator.Int("duration", b.Duration).NotExists()
+		validator.Float64("extended", b.Extended).NotExists()
+		validator.Float64("normal", b.Normal).NotExists()
+	} else {
+		if durationValidator := validator.Int("duration", b.Duration); b.Extended != nil {
+			durationValidator.Exists().InRange(BolusDurationMinimum, BolusDurationMaximum)
+		} else {
+			durationValidator.NotExists()
+		}
+		validator.Float64("extended", b.Extended).InRange(BolusExtendedMinimum, BolusExtendedMaximum)
+		validator.Float64("normal", b.Normal).InRange(BolusNormalMinimum, BolusNormalMaximum)
+	}
+
+	if b.Amount == nil && b.Extended == nil && b.Normal == nil {
+		validator.ReportError(structureValidator.ErrorValuesNotExistForAny("amount", "extended", "normal"))
+	}
+}