jadowyne/pantry-track
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

items_API.paginateBrands updated to new schema

Browse Source
This commit is contained in:
Jadowyne Ulve 2025-04-27 17:41:57 -05:00
parent 6dd33c2922
commit 7f48c0c08c
5 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
application/items/__pycache__/database_items.cpython-312.pyc
View File

Binary file not shown.

BIN
application/items/__pycache__/items_API.cpython-312.pyc
View File

Binary file not shown.

18
application/items/database_items.py
View File

@ -173,3 +173,21 @@ def paginateLocationsBySkuZone(site: str, payload: tuple, convert=True):
except Exception as error:
raise postsqldb.DatabaseError(error, payload, sql)
def paginateBrands(site:str, payload:tuple, convert:bool=True):
database_config = config.config()
recordset, count = [], 0
sql = f"SELECT brand.id, brand.name FROM {site}_brands brand LIMIT %s OFFSET %s;"
try:
with psycopg2.connect(**database_config) as conn:
with conn.cursor() as cur:
cur.execute(sql, payload)
rows = cur.fetchall()
if rows and convert:
recordset = [postsqldb.tupleDictionaryFactory(cur.description, row) for row in rows]
if rows and not convert:
recordset = rows
cur.execute(f"SELECT COUNT(*) FROM {site}_brands")
count = cur.fetchone()[0]
return recordset, count
except Exception as error:
raise postsqldb.DatabaseError(error, payload, sql)

65
application/items/items_API.py
View File

@ -265,7 +265,7 @@ def getZonesbySku():
return jsonify({'zones': zones, 'endpage': math.ceil(count/limit), 'error':False, 'message': f''})
return jsonify({'zones': zones, 'endpage': math.ceil(count/limit), 'error':False, 'message': f'method {request.method} not allowed.'})
@items_api.route('/item/getLocationsBySkuZone', methods=['get'])
@items_api.route('/item/getLocationsBySkuZone', methods=['GET'])
@login_required
def getLocationsBySkuZone():
""" GET locations by sku by passing page, limit, item_id, zone_id
@ -301,7 +301,7 @@ def getLocationsBySkuZone():
description: zone_id to pull locations for item_id
responses:
200:
description: Zones received successfully.
description: Locations received successfully.
"""
locations, count = [], 0
if request.method == "GET":
@ -315,38 +315,39 @@ def getLocationsBySkuZone():
return jsonify({'locations': locations, 'endpage': math.ceil(count/limit), 'error': False, 'message': f''})
return jsonify({'locations': locations, 'endpage': math.ceil(count/limit), 'error': True, 'message': f'method {request.method} is not allowed.'})
@items_api.route('/item/getLocations', methods=['get'])
def getLocationsByZone():
zone_id = int(request.args.get('zone_id', 1))
part_id = int(request.args.get('part_id', 1))
page = int(request.args.get('page', 1))
limit = int(request.args.get('limit', 1))
offset = (page-1)*limit
database_config = config()
site_name = session['selected_site']
locations = []
count=0
with psycopg2.connect(**database_config) as conn:
sql = f"SELECT * FROM {site_name}_locations WHERE zone_id=%s LIMIT %s OFFSET %s;"
locations = database.queryTuples(conn, sql, (zone_id, limit, offset), convert=True)
sql = f"SELECT COUNT(*) FROM {site_name}_locations WHERE zone_id=%s;"
count = database.queryTuple(conn, sql, (zone_id, ))
return jsonify(locations=locations, endpage=math.ceil(count[0]/limit))
@items_api.route('/item/getBrands', methods=['GET'])
def getBrands():
page = int(request.args.get('page', 1))
limit = int(request.args.get('limit', 1))
offset = (page-1)*limit
database_config = config()
site_name = session['selected_site']
brands = []
count = 0
with psycopg2.connect(**database_config) as conn:
brands, count = database._paginateTableTuples(conn, site_name, f"{site_name}_brands", (limit, offset), convert=True)
return jsonify(brands=brands, endpage=math.ceil(count['count']/limit))
""" GET brands from the system by passing page, limit
---
parameters:
- in: query
name: page
schema:
type: integer
minimum: 1
default: 1
description: page of the records to GET
- in: query
name: limit
schema:
type: integer
minimum: 1
default: 10
description: number of records to grab from the system
responses:
200:
description: Brands received successfully.
"""
brands, count = [], 0
if request.method == "GET":
page = int(request.args.get('page', 1))
limit = int(request.args.get('limit', 1))
offset = (page-1)*limit
site_name = session['selected_site']
brands, count = database_items.paginateBrands(site_name, (limit, offset))
return jsonify({'brands': brands, 'endpage': math.ceil(count/limit), 'error': False, 'message': f''})
return jsonify({'brands': brands, 'endpage': math.ceil(count/limit), 'error': True, 'message': f'method {request.method} is not allowed.'})
@items_api.route('/item/updateItem', methods=['POST'])
def updateItem():

5
database.log
View File

@ -1901,4 +1901,7 @@
sql='WITH sum_cte AS ( SELECT mi.id, SUM(mil.quantity_on_hand)::FLOAT8 AS total_sum FROM main_item_locations mil JOIN main_items mi ON mil.part_id = mi.id GROUP BY mi.id )SELECT item.id, item.description, item.item_name, sum_cte.total_sum as total_qoh, u.fullnameFROM main_items itemLEFT JOIN sum_cte ON item.id = sum_cte.idLEFT JOIN main_item_info item_info ON item.item_info_id = item_info.idLEFT JOIN units u ON item_info.uom = u.idWHERE item.search_string LIKE '%%' || %s || '%%'ORDER BY item. LIMIT %s OFFSET %s;')
2025-04-27 16:28:48.252706 --- ERROR --- DatabaseError(message='tuple index out of range',
payload=(2, 0),
sql='SELECT item.id, item.barcode, item.item_name FROM test_items itemWHERE item.search_string LIKE '%%' || %s || '%%'LIMIT %s OFFSET %s;')
sql='SELECT item.id, item.barcode, item.item_name FROM test_items itemWHERE item.search_string LIKE '%%' || %s || '%%'LIMIT %s OFFSET %s;')
2025-04-27 17:37:09.434012 --- ERROR --- DatabaseError(message='tupleDictionaryFactory() missing 1 required positional argument: 'row'',
payload=(25, 0),
sql='SELECT * FROM test_brands LIMIT %s OFFSET %s;')