Merge pull request #13951 from transcom/B-21367-B-Block-third-address…

…-if-no-second-address-is-present B-21367 Added validation rules for adding third address without a second address
transcom · Dec 4, 2024 · ccc0cb2 · ccc0cb2
2 parents 56fe5ab + 9d19547
commit ccc0cb2
Show file tree

Hide file tree

Showing 24 changed files with 1,074 additions and 67 deletions.
diff --git a/pkg/factory/move_factory.go b/pkg/factory/move_factory.go
@@ -167,7 +167,7 @@ func BuildMoveWithShipment(db *pop.Connection, customs []Customization, traits [
 func BuildMoveWithPPMShipment(db *pop.Connection, customs []Customization, traits []Trait) models.Move {
 	move := BuildMove(db, customs, traits)
 
-	mtoShipment := buildMTOShipmentWithBuildType(db, customs, traits, mtoShipmentBuildBasic)
+	mtoShipment := buildMTOShipmentWithBuildType(db, customs, traits, mtoShipmentPPM)
 	mtoShipment.MoveTaskOrder = move
 	mtoShipment.MoveTaskOrderID = move.ID
 

diff --git a/pkg/factory/mto_shipment_factory.go b/pkg/factory/mto_shipment_factory.go
@@ -21,6 +21,7 @@ const (
 	mtoShipmentBuildBasic mtoShipmentBuildType = iota
 	mtoShipmentBuild
 	mtoShipmentNTS
+	mtoShipmentPPM
 	mtoShipmentNTSR
 )
 
@@ -66,6 +67,9 @@ func buildMTOShipmentWithBuildType(db *pop.Connection, customs []Customization,
 		shipmentHasDeliveryDetails = true
 	case mtoShipmentBuildBasic:
 		setupPickupAndDelivery = false
+	case mtoShipmentPPM:
+		defaultShipmentType = models.MTOShipmentTypePPM
+		setupPickupAndDelivery = false
 	default:
 		defaultShipmentType = models.MTOShipmentTypeHHG
 		setupPickupAndDelivery = true

diff --git a/pkg/gen/primev3api/embedded_spec.go b/pkg/gen/primev3api/embedded_spec.go
diff --git a/pkg/gen/primev3messages/create_m_t_o_shipment.go b/pkg/gen/primev3messages/create_m_t_o_shipment.go