rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Refactor Query.get() => Session.get() per SQLAlchemy 1.4

Browse source
This commit is contained in:
Lance Edgar 2023-02-11 22:05:45 -06:00
parent 81aa0ae109
commit f611a5a521
38 changed files with 169 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tailbone/views/purchasing/receiving.py
View file

@ -280,7 +280,7 @@ class ReceivingBatchView(PurchasingBatchView):
# someone e.g. navigates to a URL by accident etc. we want
# to gracefully handle and redirect
uuid = self.request.matchdict['vendor_uuid']
vendor = self.Session.query(model.Vendor).get(uuid)
vendor = self.Session.get(model.Vendor, uuid)
if not vendor:
self.request.session.flash("Invalid vendor selection. "
"Please choose an existing vendor.",
@ -337,7 +337,7 @@ class ReceivingBatchView(PurchasingBatchView):
vendor_display = ""
if self.request.method == 'POST':
if self.request.POST.get('vendor'):
vendor = self.Session.query(model.Vendor).get(self.request.POST['vendor'])
vendor = self.Session.get(model.Vendor, self.request.POST['vendor'])
if vendor:
vendor_display = str(vendor)
vendors_url = self.request.route_url('vendors.autocomplete')
@ -417,8 +417,8 @@ class ReceivingBatchView(PurchasingBatchView):
if self.creating and workflow:
# display vendor but do not allow changing
vendor = self.Session.query(model.Vendor).get(
self.request.matchdict['vendor_uuid'])
vendor = self.Session.get(model.Vendor,
self.request.matchdict['vendor_uuid'])
assert vendor
f.set_readonly('vendor_uuid')
f.set_default('vendor_uuid', str(vendor))
@ -944,7 +944,7 @@ class ReceivingBatchView(PurchasingBatchView):
def validate_purchase(node, kw):
session = kw['session']
def validate(node, value):
purchase = session.query(model.Purchase).get(value)
purchase = session.get(model.Purchase, value)
if not purchase:
raise colander.Invalid(node, "Purchase not found")
return purchase.uuid
@ -1439,7 +1439,7 @@ class ReceivingBatchView(PurchasingBatchView):
credit = None
uuid = data.get('uuid')
if uuid:
credit = self.Session.query(model.PurchaseBatchCredit).get(uuid)
credit = self.Session.get(model.PurchaseBatchCredit, uuid)
if not credit:
return {'error': "Credit not found"}
@ -1479,7 +1479,7 @@ class ReceivingBatchView(PurchasingBatchView):
batch = self.get_instance()
row_uuid = self.request.params.get('row_uuid')
row = self.Session.query(model.PurchaseBatchRow).get(row_uuid) if row_uuid else None
row = self.Session.get(model.PurchaseBatchRow, row_uuid) if row_uuid else None
if row and row.batch is batch and not row.removed:
pass # we're good
else:
@ -1841,7 +1841,7 @@ class ReceivingBatchView(PurchasingBatchView):
# validate row
uuid = data.get('row_uuid')
row = self.Session.query(model.PurchaseBatchRow).get(uuid) if uuid else None
row = self.Session.get(model.PurchaseBatchRow, uuid) if uuid else None
if not row or row.batch is not batch:
return {'error': "Row not found"}
@ -1910,7 +1910,7 @@ class ReceivingBatchView(PurchasingBatchView):
Thread target for receiving all items on the given batch.
"""
session = RattailSession()
batch = session.query(model.PurchaseBatch).get(uuid)
batch = session.get(model.PurchaseBatch, uuid)
# user = session.query(model.User).get(user_uuid)
try:
self.handler.auto_receive_all_items(batch, progress=progress)