cc-py-commons 0.5.18__tar.gz → 0.5.20__tar.gz

{cc_py_commons-0.5.18 → cc_py_commons-0.5.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cc_py_commons
-Version: 0.5.18
+Version: 0.5.20
 Summary: Common code for microservices
 Home-page: https://github.com/Cargo-Chief/py-commons
 Author: CargoChief

{cc_py_commons-0.5.18 → cc_py_commons-0.5.20}/cc_py_commons/bids/bid_schema.py

@@ -13,23 +13,23 @@ class BidSchema(CamelCaseSchema):
   receipt_id = fields.String(allow_none=True)
   amount = fields.Integer()
   estimated_days = fields.Integer()
-  notes = fields.String(allow_none=True)
+  notes = fields.String(allow_none=True, missing=None)
   match_score = fields.Float(allow_none=True)
   status_id = fields.UUID()
   pickup_date = fields.Date()
   delivery_date = fields.Date()
-  decline_reason = fields.String(allow_none=True)
+  decline_reason = fields.String(allow_none=True, missing=None)
   bid_histories = fields.List(fields.Nested(BidHistorySchema), allow_none=True)
   origin_deadhead = fields.Float(allow_none=True)
-  porus_truck_id = fields.UUID(allow_none=True)
-  truck_lane_id = fields.UUID(allow_none=True)
-  distance = fields.Float(allow_none=True)
-  origin_city = fields.String()
-  origin_state = fields.String()
-  origin_zip = fields.String(allow_none=True)
-  dest_city = fields.String()
-  dest_state = fields.String()
-  dest_zip = fields.String(allow_none=True)
+  porus_truck_id = fields.UUID(allow_none=True, missing=None)
+  truck_lane_id = fields.UUID(allow_none=True, missing=None)
+  distance = fields.Float(allow_none=True, missing=None)
+  origin_city = fields.String(missing=None)
+  origin_state = fields.String(missing=None)
+  origin_zip = fields.String(allow_none=True, missing=None)
+  dest_city = fields.String(missing=None)
+  dest_state = fields.String(missing=None)
+  dest_zip = fields.String(allow_none=True, missing=None)
   invite_emailed_at = fields.DateTime(allow_none=True)
   
   @post_load

cc_py_commons-0.5.20/cc_py_commons/carriers/account_carrier_map.py

@@ -0,0 +1,12 @@
+import datetime
+import uuid
+from dataclasses import dataclass, field
+
+@dataclass
+class AccountCarrierMap:
+  account_id: int
+  carrier_id: uuid.UUID
+  status: str
+  customer_code: str = field(default=None)
+  warmup_email_sent_at: datetime.date = field(default=None)
+  no_dispatch: bool = field(default=False)

{cc_py_commons-0.5.18 → cc_py_commons-0.5.20}/cc_py_commons/carriers/account_carrier_map_schema.py

@@ -1,18 +1,17 @@
 from marshmallow import fields, EXCLUDE, post_load
 from cc_py_commons.schemas.camel_case_schema import CamelCaseSchema
-from cc_py_commons.carriers.contact_schema import ContactSchema
 from cc_py_commons.carriers.account_carrier_map import AccountCarrierMap
 class AccountCarrierMapSchema(CamelCaseSchema):
   class Meta:
     unknown = EXCLUDE
 
   account_id = fields.Integer()
-  customer_code = fields.String(allow_none=True)
   carrier_id = fields.UUID()
-  status = fields.String(allow_none=True)
-  warmup_email_sent_at = fields.Date(allow_none=True)
-  no_dispatch = fields.Boolean(allow_none=True)
-
+  status = fields.String()
+  customer_code = fields.String(allow_none=True, missing=None)
+  warmup_email_sent_at = fields.Date(allow_none=True, missing=None)
+  no_dispatch = fields.Boolean(allow_none=True, missing=None)
+  
   @post_load
-  def make_bid(self, data, **kwargs):
+  def make_account_carrier_map(self, data, **kwargs):
       return AccountCarrierMap(**data)  

{cc_py_commons-0.5.18 → cc_py_commons-0.5.20}/cc_py_commons/carriers/carrier_schema.py

@@ -63,7 +63,7 @@ class CarrierSchema(CamelCaseSchema):
   vetting_overall_display = fields.String(allow_none=True)
   last_vetting_time = fields.Date(allow_none=True)
   vetting_remarks = fields.String(allow_none=True)
-
+  
   @post_load
-  def make_bid(self, data, **kwargs):
+  def make_carrier(self, data, **kwargs):
       return Carrier(**data)

cc_py_commons-0.5.20/cc_py_commons/services/booking_agent/list_bids.py

@@ -0,0 +1,33 @@
+import os
+
+import requests
+from dateutil.parser import parse
+
+from cc_py_commons.bids.bid_schema import BidSchema
+from cc_py_commons.utils import json_logger
+
+BOOKING_AGENT_URL = os.environ.get('BOOKING_AGENT_URL')
+BOOKING_AGENT_TOKEN = os.environ.get("BOOKING_AGENT_TOKEN")
+
+
+def execute(account_id, filters_dict):
+	url = f"{BOOKING_AGENT_URL}/bid/match"
+	token = f"Bearer {BOOKING_AGENT_TOKEN}"
+	headers = {
+		"Authorization": token
+	}
+	json_logger.debug(account_id, f"Requesting bids from booking-agent", url=url, filters=filters_dict)
+	response = requests.get(url, headers=headers, params=filters_dict)
+	bids = []
+	if response.status_code == 200:
+		bids = response.json()['content']
+		for bid in bids:
+			bid['pickupDate'] = parse(bid['pickupDate']).strftime('%Y-%m-%d')
+			bid['deliveryDate'] = parse(bid['deliveryDate']).strftime('%Y-%m-%d')
+			if bid.get('inviteEmailedAt'):
+				bid['inviteEmailedAt'] = parse(bid['inviteEmailedAt']).isoformat()
+			for bid_history in bid.get('bidHistories', []):
+				bid_history['pickupDate'] = parse(bid_history['pickupDate']).strftime('%Y-%m-%d')
+				bid_history['deliveryDate'] = parse(bid_history['deliveryDate']).strftime('%Y-%m-%d')
+		bids = BidSchema().load(bids, many=True)
+	return bids

cc_py_commons-0.5.20/cc_py_commons/services/booking_agent/list_quotes.py

@@ -0,0 +1,27 @@
+import requests
+import os
+from dateutil.parser import parse
+
+from cc_py_commons.utils import json_logger
+from cc_py_commons.quotes.quote_schema import QuoteSchema
+
+BOOKING_AGENT_URL = os.environ.get('BOOKING_AGENT_URL')
+BOOKING_AGENT_TOKEN = os.environ.get("BOOKING_AGENT_TOKEN")
+
+
+def execute(account_id, filters_dict):
+	url = f"{BOOKING_AGENT_URL}/quote"
+	token = f"Bearer {BOOKING_AGENT_TOKEN}"
+	headers = {
+		"Authorization": token
+	}
+	json_logger.debug(account_id, f"Requesting quotes from booking-agent", url=url, filters=filters_dict)
+	response = requests.get(url, headers=headers, params=filters_dict)
+	quotes = []
+	if response.status_code == 200:
+		quotes = response.json()['content']
+		for quote in quotes:
+			quote['pickupDate'] = parse(quote['pickupDate']).strftime('%Y-%m-%d')
+			quote['deliveryDate'] = parse(quote['deliveryDate']).strftime('%Y-%m-%d')
+		quotes = QuoteSchema().load(quotes, many=True)
+	return quotes

{cc_py_commons-0.5.18 → cc_py_commons-0.5.20}/cc_py_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cc-py-commons
-Version: 0.5.18
+Version: 0.5.20
 Summary: Common code for microservices
 Home-page: https://github.com/Cargo-Chief/py-commons
 Author: CargoChief

{cc_py_commons-0.5.18 → cc_py_commons-0.5.20}/cc_py_commons.egg-info/SOURCES.txt

@@ -65,6 +65,8 @@ cc_py_commons/services/booking_agent/decline_bid.py
 cc_py_commons/services/booking_agent/get_bid_by_amazon_order_id.py
 cc_py_commons/services/booking_agent/get_quote.py
 cc_py_commons/services/booking_agent/get_quote_by_load_id.py
+cc_py_commons/services/booking_agent/list_bids.py
+cc_py_commons/services/booking_agent/list_quotes.py
 cc_py_commons/services/booking_agent/update_bid.py
 cc_py_commons/services/c4/__init__.py
 cc_py_commons/services/c4/amazon_session_token.py

{cc_py_commons-0.5.18 → cc_py_commons-0.5.20}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 setup(
     name='cc_py_commons',
     description='Common code for microservices',
-    version='0.5.18',
+    version='0.5.20',
     url='https://github.com/Cargo-Chief/py-commons',
     author='CargoChief',
     author_email='engineering@cargochief.com',

cc_py_commons-0.5.18/cc_py_commons/carriers/account_carrier_map.py

@@ -1,12 +0,0 @@
-import datetime
-import uuid
-from dataclasses import dataclass
-
-@dataclass
-class AccountCarrierMap:
-  account_id: int
-  customer_code: str
-  carrier_id: uuid.UUID
-  status: str
-  warmup_email_sent_at: datetime.date
-  no_dispatch: bool