B-21094: Automatic Reweigh Based on Estimated Weight

pkg/models/move.go

@@ -694,7 +694,6 @@ func GetTotalNetWeightForMove(m Move) unit.Pound {
 		}
 	}
 	return totalNetWeight
-
 }
 
 // gets total weight from all ppm and hhg shipments within a move

pkg/services/move/move_weights.go

@@ -3,6 +3,7 @@ package move
 import (
 	"database/sql"
 	"errors"
+	"math"
 	"time"
 
 	"github.com/gobuffalo/validate/v3"
@@ -62,7 +63,7 @@ func shipmentHasReweighWeight(shipment models.MTOShipment) bool {
 }
 
 // return the lower weight of a shipment's actual weight and the reweighed weight
-func lowerShipmentWeight(shipment models.MTOShipment) int {
+func lowerShipmentActualWeight(shipment models.MTOShipment) int {
 	actualWeight := 0
 	if shipment.PrimeActualWeight != nil {
 		actualWeight = shipment.PrimeActualWeight.Int()
@@ -78,6 +79,23 @@ func lowerShipmentWeight(shipment models.MTOShipment) int {
 	return actualWeight
 }
 
+// return the lower weight of a shipment's estimated weight and the reweighed weight
+func lowerShipmentEstimatedWeight(shipment models.MTOShipment) int {
+	estimatedWeight := 0
+	if shipment.PrimeEstimatedWeight != nil {
+		estimatedWeight = shipment.PrimeEstimatedWeight.Int()
+	}
+
+	if shipmentHasReweighWeight(shipment) {
+		reweighWeight := shipment.Reweigh.Weight.Int()
+		if reweighWeight < estimatedWeight {
+			return reweighWeight
+		}
+	}
+
+	return estimatedWeight
+}
+
 func (w moveWeights) CheckExcessWeight(appCtx appcontext.AppContext, moveID uuid.UUID, updatedShipment models.MTOShipment) (*models.Move, *validate.Errors, error) {
 	db := appCtx.DB()
 	var move models.Move
@@ -244,17 +262,60 @@ func calculateSumOfWeights(move models.Move, updatedShipment *models.MTOShipment
 	return sumOfWeights
 }
 
+// GetAutoReweighShipments returns all shipments that need to be reweighed
+func GetAutoReweighShipments(move *models.Move, updatedShipment *models.MTOShipment) (models.MTOShipments, error) {
+	results := models.MTOShipments{}
+	weightLimit := 0
+
+	if move.Orders.Entitlement.DBAuthorizedWeight != nil {
+		weightLimit = *move.Orders.Entitlement.DBAuthorizedWeight
+	} else {
+		return nil, errors.New("No Authorized Weight could be found when checking for auto-reweigh on " + move.ID.String())
+	}
+
+	totalActualWeight := 0
+	totalEstimatedWeight := 0
+	for i := range move.MTOShipments {
+		if move.MTOShipments[i].ShipmentType != models.MTOShipmentTypePPM &&
+			availableShipmentStatus(move.MTOShipments[i].Status) &&
+			move.MTOShipments[i].DeletedAt == nil &&
+			updatedShipment.ID != move.MTOShipments[i].ID {
+			if move.MTOShipments[i].PrimeActualWeight != nil {
+				totalActualWeight += lowerShipmentActualWeight(move.MTOShipments[i])
+			}
+			if move.MTOShipments[i].PrimeEstimatedWeight != nil {
+				totalEstimatedWeight += lowerShipmentEstimatedWeight(move.MTOShipments[i])
+			}
+			results = append(results, move.MTOShipments[i])
+		} else if move.MTOShipments[i].ID == updatedShipment.ID {
+			if updatedShipment.PrimeActualWeight != nil {
+				totalActualWeight += lowerShipmentActualWeight(*updatedShipment)
+			}
+			if updatedShipment.PrimeEstimatedWeight != nil {
+				totalEstimatedWeight += lowerShipmentEstimatedWeight(*updatedShipment)
+			}
+			results = append(results, *updatedShipment)
+		}
+	}
+
+	// Check actual weight first
+	if int(totalActualWeight) >= int(math.Round(float64(weightLimit)*0.9)) {
+		return results, nil
+	}
+
+	// Check estimated weight second
+	if int(totalEstimatedWeight) >= int(math.Round(float64(weightLimit)*0.9)) {
+		return results, nil
+	}
+
+	return models.MTOShipments{}, nil
+}
+
 func (w moveWeights) CheckAutoReweigh(appCtx appcontext.AppContext, moveID uuid.UUID, updatedShipment *models.MTOShipment) (models.MTOShipments, error) {
-	db := appCtx.DB()
 	var move models.Move
-	err := db.Eager("MTOShipments", "MTOShipments.Reweigh", "Orders.Entitlement").Find(&move, moveID)
+	err := appCtx.DB().Eager("MTOShipments", "Orders", "Orders.Entitlement", "MTOShipments.ShipmentType", "MTOShipments.Status", "MTOShipments.DeletedAt", "MTOShipments.PrimeActualWeight", "MTOShipments.PrimeEstimatedWeight").Find(&move, moveID)
 	if err != nil {
-		switch err {
-		case sql.ErrNoRows:
-			return nil, apperror.NewNotFoundError(moveID, "looking for Move")
-		default:
-			return nil, apperror.NewQueryError("Move", err, "")
-		}
+		return nil, err
 	}
 
 	if move.Orders.Grade == nil {
@@ -265,48 +326,19 @@ func (w moveWeights) CheckAutoReweigh(appCtx appcontext.AppContext, moveID uuid.
 		return nil, errors.New("could not determine excess weight entitlement without dependents authorization value")
 	}
 
-	totalWeightAllowance, err := w.WeightAllotmentFetcher.GetWeightAllotment(appCtx, string(*move.Orders.Grade), move.Orders.OrdersType)
+	autoReweighShipments, err := GetAutoReweighShipments(&move, updatedShipment)
 	if err != nil {
 		return nil, err
 	}
 
-	overallWeightAllowance := totalWeightAllowance.TotalWeightSelf
-	if *move.Orders.Entitlement.DependentsAuthorized {
-		overallWeightAllowance = totalWeightAllowance.TotalWeightSelfPlusDependents
-	}
-
-	moveWeightTotal := 0
-	for _, shipment := range move.MTOShipments {
-		// We should avoid counting shipments that haven't been approved yet and will need to account for diversions
-		// and cancellations factoring into the weight total.
-		if availableShipmentStatus(shipment.Status) {
-			if shipment.ID != updatedShipment.ID {
-				moveWeightTotal += lowerShipmentWeight(shipment)
-			} else {
-				// the shipment being updated might have a reweigh that wasn't loaded
-				updatedShipment.Reweigh = shipment.Reweigh
-				moveWeightTotal += lowerShipmentWeight(*updatedShipment)
+	if len(autoReweighShipments) > 0 {
+		for _, shipment := range autoReweighShipments {
+			reweigh, err := w.ReweighRequestor.RequestShipmentReweigh(appCtx, shipment.ID, models.ReweighRequesterSystem)
+			if err != nil {
+				return nil, err
 			}
-		}
-	}
 
-	autoReweighShipments := models.MTOShipments{}
-	// may need to take into account floating point precision here but should be dealing with whole numbers
-	if int(float32(overallWeightAllowance)*AutoReweighRequestThreshold) <= moveWeightTotal {
-		for _, shipment := range move.MTOShipments {
-			// We should avoid counting shipments that haven't been approved yet and will need to account for diversions
-			// and cancellations factoring into the weight total.
-			if availableShipmentStatus(shipment.Status) && (shipment.Reweigh == nil || shipment.Reweigh.ID == uuid.Nil) {
-				reweigh, err := w.ReweighRequestor.RequestShipmentReweigh(appCtx, shipment.ID, models.ReweighRequesterSystem)
-				if err != nil {
-					return nil, err
-				}
-				autoReweighShipments = append(autoReweighShipments, shipment)
-				// this may not be necessary depending on how the shipment is being updated/refetched elsewhere
-				if shipment.ID == updatedShipment.ID {
-					updatedShipment.Reweigh = reweigh
-				}
-			}
+			shipment.Reweigh = reweigh
 		}
 	}