Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion paperless/api_mappers/quotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,18 @@ def map(cls, resource):
'customer',
'erp_code',
'send_from_facility',
'rfq_number'
'rfq_number',
'uuid',
'order_numbers',
'metadata'
]
for key in field_keys:
mapped_result[key] = resource.get(key, None)

# Handle special default values for new fields
if mapped_result.get('order_numbers') is None:
mapped_result['order_numbers'] = []

bool_keys = ['export_controlled', 'is_unviewed_drafted_rfq']
for key in bool_keys:
mapped_result[key] = resource.get(key, False)
Expand Down
12 changes: 12 additions & 0 deletions paperless/objects/quotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,18 @@ class Quote(
attr.validators.instance_of((int, float, object))
),
)
uuid: Optional[str] = attr.ib(
validator=attr.validators.optional(attr.validators.instance_of(str)),
default=None
)
order_numbers: List[str] = attr.ib(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be int @jeccles12

converter=lambda x: x if x is not None else [],
default=attr.Factory(list)
)
metadata: Optional[Dict[str, Union[str, int, float, bool]]] = attr.ib(
validator=attr.validators.optional(attr.validators.instance_of(dict)),
default=None
)

@classmethod
def construct_get_url(cls):
Expand Down
6 changes: 6 additions & 0 deletions tests/unit/mock_data/quote.json
Original file line number Diff line number Diff line change
Expand Up @@ -11199,9 +11199,15 @@
"authenticated_pdf_quote_url": null,
"is_unviewed_drafted_rfq": false,
"created": "2020-12-08T14:54:54+00:00",
"uuid": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
"order_numbers": [
179
],
"metadata": {
"source": "test",
"priority_level": 1,
"is_expedited": false
},
"revision_number": null,
"send_from_facility": {
"id": 1,
Expand Down
7 changes: 7 additions & 0 deletions tests/unit/test_quotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ def test_get_quote(self):
self.assertEqual(q.number, 339)
self.assertEqual(q.tax_rate, 0.0)
self.assertFalse(q.is_unviewed_drafted_rfq)
# test new fields
self.assertEqual(q.uuid, 'a1b2c3d4-e5f6-7890-abcd-ef1234567890')
self.assertEqual(q.order_numbers, [179])
self.assertIsNotNone(q.metadata)
self.assertEqual(q.metadata['source'], 'test')
self.assertEqual(q.metadata['priority_level'], 1)
self.assertFalse(q.metadata['is_expedited'])
# test customer
customer = q.customer
self.assertIsNone(customer.id)
Expand Down