separate freight request creation from package

Author: danh91

purplship/mappers/ups/ups_mapper/__init__.py

@@ -26,11 +26,12 @@ class UPSMapper(
     def create_quote_request(
         self, payload: T.shipment_request
     ) -> Union[PRate.RateRequest, Rate.FreightRateRequest]:
-        return (
-            self.create_freight_rate_request
-            if _is_freight(payload)
-            else self.create_package_rate_request
-        )(payload)
+        return self.create_package_rate_request(payload)
+
+    def create_freight_quote_request(
+        self, payload: T.shipment_request
+    ) -> Union[PRate.RateRequest, Rate.FreightRateRequest]:
+        return self.create_freight_rate_request(payload)
 
     def create_tracking_request(
         self, payload: T.tracking_request
@@ -81,23 +82,3 @@ def parse_shipment_response(
             shipment if len(details) > 0 else None,
             self.parse_error_response(response),
         )
-
-
-def _is_freight(payload: T.shipment_request) -> bool:
-    total_weight = Weight(
-        payload.shipment.total_weight
-        or reduce(lambda t, i: t + i.weight, payload.shipment.items, 0.0),
-        WeightUnit[payload.shipment.weight_unit],
-    ).LB
-    any_item_size_over_165 = any(
-        [
-            (
-                Dimension(
-                    item.length or 0, DimensionUnit[payload.shipment.dimension_unit]
-                ).IN
-                > 165
-            )
-            for item in payload.shipment.items
-        ]
-    )
-    return total_weight > 150 or any_item_size_over_165

tests/ups/quote.py

@@ -52,7 +52,7 @@ def test_create_freight_quote_request(self):
         }
         payload = Quote.create(shipper=shipper, recipient=recipient, shipment=shipment)
 
-        FreightRateRequest_ = proxy.mapper.create_quote_request(payload)
+        FreightRateRequest_ = proxy.mapper.create_freight_quote_request(payload)
         self.assertEqual(export(FreightRateRequest_), export(self.FreightRateRequest))
 
     @patch("purplship.mappers.ups.ups_proxy.http", return_value="<a></a>")

tests/ups/shipment.py

@@ -23,7 +23,7 @@ def setUp(self):
 
     def test_create_freight_shipment_request(self):
         payload = Shipment.create(**freight_shipment_data)
-        Shipment_ = proxy.mapper.create_shipment_request(payload)
+        Shipment_ = proxy.mapper.create_freight_shipment_request(payload)
         self.assertEqual(export(Shipment_), export(self.FreightShipRequest))
 
     def test_create_package_shipment_request(self):