rolling this rate stuff back.. please stop breaking erverything

transcom · Jan 15, 2025 · 39bf1c8 · 39bf1c8
1 parent f8baaa5
commit 39bf1c8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/pkg/models/re_rate_area.go b/pkg/models/re_rate_area.go
@@ -56,7 +56,7 @@ func FetchReRateAreaItem(tx *pop.Connection, contractID uuid.UUID, code string)
 }
 
 // a db stored proc that takes in an address id & a service code to get the rate area id for an address
-func FetchRateAreaID(db *pop.Connection, addressID uuid.UUID, serviceID uuid.UUID, contractID uuid.UUID) (uuid.UUID, error) {
+func FetchRateAreaID(db *pop.Connection, addressID uuid.UUID, serviceID *uuid.UUID, contractID uuid.UUID) (uuid.UUID, error) {
 	if addressID != uuid.Nil && contractID != uuid.Nil {
 		var rateAreaID uuid.UUID
 		err := db.RawQuery("SELECT get_rate_area_id($1, $2, $3)", addressID, serviceID, contractID).First(&rateAreaID)

diff --git a/pkg/models/re_rate_area_test.go b/pkg/models/re_rate_area_test.go
@@ -36,16 +36,14 @@ func (suite *ModelSuite) TestFetchRateAreaID() {
 		service := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeIHPK)
 		contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{})
 		address := factory.BuildAddress(suite.DB(), nil, nil)
-		rateAreaId, err := models.FetchRateAreaID(suite.DB(), address.ID, service.ID, contract.ID)
+		rateAreaId, err := models.FetchRateAreaID(suite.DB(), address.ID, &service.ID, contract.ID)
 		suite.NotNil(rateAreaId)
 		suite.NoError(err)
 	})
 
 	suite.Run("fail - receive error when not all values are provided", func() {
-		var nilUuid uuid.UUID
-		contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{})
 		address := factory.BuildAddress(suite.DB(), nil, nil)
-		rateAreaId, err := models.FetchRateAreaID(suite.DB(), address.ID, nilUuid, contract.ID)
+		rateAreaId, err := models.FetchRateAreaID(suite.DB(), address.ID, nil, uuid.Nil)
 		suite.Equal(uuid.Nil, rateAreaId)
 		suite.Error(err)
 	})

diff --git a/pkg/payment_request/service_param_value_lookups/per_unit_cents_lookup.go b/pkg/payment_request/service_param_value_lookups/per_unit_cents_lookup.go
@@ -24,7 +24,7 @@ func (p PerUnitCentsLookup) lookup(appCtx appcontext.AppContext, s *ServiceItemP
 	switch p.ServiceItem.ReService.Code {
 	case models.ReServiceCodeIHPK:
 		// IHPK: Need rate area ID for the pickup address
-		rateAreaID, err := models.FetchRateAreaID(appCtx.DB(), *p.MTOShipment.PickupAddressID, serviceID, contractID)
+		rateAreaID, err := models.FetchRateAreaID(appCtx.DB(), *p.MTOShipment.PickupAddressID, &serviceID, contractID)
 		if err != nil {
 			return "", fmt.Errorf("error fetching rate area id for shipment ID: %s and service ID %s: %s", p.MTOShipment.ID, serviceID, err)
 		}
@@ -43,7 +43,7 @@ func (p PerUnitCentsLookup) lookup(appCtx appcontext.AppContext, s *ServiceItemP
 
 	case models.ReServiceCodeIHUPK:
 		// IHUPK: Need rate area ID for the destination address
-		rateAreaID, err := models.FetchRateAreaID(appCtx.DB(), *p.MTOShipment.PickupAddressID, serviceID, contractID)
+		rateAreaID, err := models.FetchRateAreaID(appCtx.DB(), *p.MTOShipment.PickupAddressID, &serviceID, contractID)
 		if err != nil {
 			return "", fmt.Errorf("error fetching rate area id for shipment ID: %s and service ID %s: %s", p.MTOShipment.ID, serviceID, err)
 		}
@@ -62,11 +62,11 @@ func (p PerUnitCentsLookup) lookup(appCtx appcontext.AppContext, s *ServiceItemP
 
 	case models.ReServiceCodeISLH:
 		// ISLH: Need rate area IDs for origin and destination
-		originRateAreaID, err := models.FetchRateAreaID(appCtx.DB(), *p.MTOShipment.PickupAddressID, serviceID, contractID)
+		originRateAreaID, err := models.FetchRateAreaID(appCtx.DB(), *p.MTOShipment.PickupAddressID, &serviceID, contractID)
 		if err != nil {
 			return "", fmt.Errorf("error fetching rate area id for origin address for shipment ID: %s and service ID %s: %s", p.MTOShipment.ID, serviceID, err)
 		}
-		destRateAreaID, err := models.FetchRateAreaID(appCtx.DB(), *p.MTOShipment.DestinationAddressID, serviceID, contractID)
+		destRateAreaID, err := models.FetchRateAreaID(appCtx.DB(), *p.MTOShipment.DestinationAddressID, &serviceID, contractID)
 		if err != nil {
 			return "", fmt.Errorf("error fetching rate area id for destination address for shipment ID: %s and service ID %s: %s", p.MTOShipment.ID, serviceID, err)
 		}

diff --git a/pkg/services/shipment_address_update/shipment_address_update_requester.go b/pkg/services/shipment_address_update/shipment_address_update_requester.go
@@ -56,7 +56,7 @@ func (f *shipmentAddressUpdateRequester) doesDeliveryAddressUpdateChangeServiceO
 	// international shipments find their rate areas differently than domestic
 	if shipment.MarketCode == models.MarketCodeInternational {
 		// we already have the origin address in the db so we can check the rate area using the db func
-		originalRateArea, err := models.FetchRateAreaID(appCtx.DB(), originalDeliveryAddress.ID, uuid.Nil, contractID)
+		originalRateArea, err := models.FetchRateAreaID(appCtx.DB(), originalDeliveryAddress.ID, nil, contractID)
 		if err != nil || originalRateArea == uuid.Nil {
 			return false, err
 		}