Merge pull request #14688 from transcom/MAIN-B-22264

transcom · Feb 7, 2025 · bdeb1c5 · bdeb1c5
2 parents 9976287 + 000fc92
commit bdeb1c5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/pkg/payment_request/service_param_value_lookups/weight_billed_lookup.go b/pkg/payment_request/service_param_value_lookups/weight_billed_lookup.go
@@ -200,8 +200,13 @@ func applyMinimum(code models.ReServiceCode, shipmentType models.MTOShipmentType
 	switch shipmentType {
 	case models.MTOShipmentTypeUnaccompaniedBaggage:
 		switch code {
-		case models.ReServiceCodeIOSHUT,
-			models.ReServiceCodeIDSHUT:
+		case models.ReServiceCodeUBP,
+			models.ReServiceCodeIUBPK,
+			models.ReServiceCodeIUBUPK,
+			models.ReServiceCodeIOSHUT,
+			models.ReServiceCodeIDSHUT,
+			models.ReServiceCodePODFSC,
+			models.ReServiceCodePOEFSC:
 			if weight < 300 {
 				result = 300
 			}
@@ -238,16 +243,12 @@ func applyMinimum(code models.ReServiceCode, shipmentType models.MTOShipmentType
 			models.ReServiceCodeIDDSIT,
 			models.ReServiceCodeIOSHUT,
 			models.ReServiceCodeIDSHUT,
-			models.ReServiceCodeFSC:
+			models.ReServiceCodeFSC,
+			models.ReServiceCodePODFSC,
+			models.ReServiceCodePOEFSC:
 			if weight < 500 {
 				result = 500
 			}
-		case models.ReServiceCodeUBP,
-			models.ReServiceCodeIUBPK,
-			models.ReServiceCodeIUBUPK:
-			if weight < 300 {
-				result = 300
-			}
 		}
 	}
 	return fmt.Sprintf("%d", result)

diff --git a/pkg/payment_request/service_param_value_lookups/weight_billed_lookup_test.go b/pkg/payment_request/service_param_value_lookups/weight_billed_lookup_test.go
@@ -95,15 +95,15 @@ func (suite *ServiceParamValueLookupsSuite) TestWeightBilledLookup() {
 		{models.ReServiceCodeDDDSIT, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
 		// International
 		{models.ReServiceCodeISLH, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
-		{models.ReServiceCodeUBP, unit.Pound(250), "300", models.MTOShipmentTypeHHG},
-		{models.ReServiceCodeISLH, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
-		{models.ReServiceCodeUBP, unit.Pound(250), "300", models.MTOShipmentTypeHHG},
-		{models.ReServiceCodeISLH, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
-		{models.ReServiceCodeUBP, unit.Pound(250), "300", models.MTOShipmentTypeHHG},
 		{models.ReServiceCodeIHPK, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
 		{models.ReServiceCodeIHUPK, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
-		{models.ReServiceCodeIUBPK, unit.Pound(250), "300", models.MTOShipmentTypeHHG},
-		{models.ReServiceCodeIUBUPK, unit.Pound(250), "300", models.MTOShipmentTypeHHG},
+		{models.ReServiceCodePOEFSC, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
+		{models.ReServiceCodePODFSC, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
+		{models.ReServiceCodeUBP, unit.Pound(250), "300", models.MTOShipmentTypeUnaccompaniedBaggage},
+		{models.ReServiceCodeIUBPK, unit.Pound(250), "300", models.MTOShipmentTypeUnaccompaniedBaggage},
+		{models.ReServiceCodeIUBUPK, unit.Pound(250), "300", models.MTOShipmentTypeUnaccompaniedBaggage},
+		{models.ReServiceCodePOEFSC, unit.Pound(250), "300", models.MTOShipmentTypeUnaccompaniedBaggage},
+		{models.ReServiceCodePODFSC, unit.Pound(250), "300", models.MTOShipmentTypeUnaccompaniedBaggage},
 		// International SIT
 		{models.ReServiceCodeIOFSIT, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
 		{models.ReServiceCodeIDFSIT, unit.Pound(450), "500", models.MTOShipmentTypeHHG},