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

recipe_api.postSkuItem updated to new schema

Browse Source
This commit is contained in:
Jadowyne Ulve 2025-04-26 19:22:41 -05:00
parent e964bb7bd5
commit 3407273959
6 changed files with 92 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
scripts/recipes/__pycache__/database_recipes.cpython-312.pyc
View File

Binary file not shown.

BIN
scripts/recipes/__pycache__/recipes_api.cpython-312.pyc
View File

Binary file not shown.

36
scripts/recipes/database_recipes.py
View File

@ -24,6 +24,24 @@ def getModalSKUs(site, payload, convert=True):
return rows, count
return [], 0
def getItemData(site:str, payload:tuple, convert:bool=True):
database_config = config.config()
record = ()
try:
with psycopg2.connect(**database_config) as conn:
with conn.cursor() as cur:
with open("scripts/recipes/sql/getItemData.sql") as file:
sql = file.read().replace("%%site_name%%", site)
cur.execute(sql, payload)
rows = cur.fetchone()
if rows and convert:
record = postsqldb.tupleDictionaryFactory(cur.description, rows)
if rows and not convert:
record = rows
return record
except (Exception, psycopg2.DatabaseError) as error:
raise postsqldb.DatabaseError(error, payload, sql)
def getRecipes(site:str, payload:tuple, convert=True):
recordset = []
count = 0
@ -81,6 +99,24 @@ def postRecipe(site:str, payload:tuple, convert=True):
return record
except (Exception, psycopg2.DatabaseError) as error:
raise postsqldb.DatabaseError(error, payload, sql)
def postRecipeItem(site:str, payload:tuple, convert=True):
database_config = config.config()
record = ()
with open("scripts/recipes/sql/postRecipeItem.sql") as file:
sql = file.read().replace("%%site_name%%", site)
try:
with psycopg2.connect(**database_config) as conn:
with conn.cursor() as cur:
cur.execute(sql, payload)
rows = cur.fetchone()
if rows and convert:
record = postsqldb.tupleDictionaryFactory(cur.description, rows)
elif rows and not convert:
record = rows
return record
except (Exception, psycopg2.DatabaseError) as error:
raise postsqldb.DatabaseError(error, payload, sql)
def postRecipeUpdate(site, payload, convert=True):
database_config = config.config()

82
scripts/recipes/recipes_api.py
View File

@ -57,6 +57,7 @@ def recipe(id, mode='view'):
return render_template("recipes/recipe_view.html", recipe_id=id, current_site=session['selected_site'])
@recipes_api.route('/recipes/getRecipes', methods=["GET"])
@login_required
def getRecipes():
""" Get a subquery of recipes from the database by passing a page, limit
---
@ -76,6 +77,7 @@ def getRecipes():
return jsonify({'recipes': recipes, 'end': math.ceil(count/limit), 'error': True, 'message': f'method is not allowed: {request.method}'})
@recipes_api.route('/recipe/getRecipe', methods=["GET"])
@login_required
def getRecipe():
""" Get a query for recipe id from database by passing an id
---
@ -93,6 +95,7 @@ def getRecipe():
return jsonify({'recipe': recipe, 'error': True, 'message': f'method {request.method} not allowed'})
@recipes_api.route('/recipes/addRecipe', methods=["POST"])
@login_required
def addRecipe():
""" post a new recipe into the database by passing a recipe_name and recipe description
---
@ -118,6 +121,7 @@ def addRecipe():
return jsonify({'recipe': recipe, 'error': True, 'message': f'method {request.method}'})
@recipes_api.route('/recipe/getItems', methods=["GET"])
@login_required
def getItems():
""" Pass along a page, limit, and search strings to get a pagination of items from the system
---
@ -130,21 +134,20 @@ def getItems():
if request.method == "GET":
page = int(request.args.get('page', 1))
limit = int(request.args.get('limit', 10))
search_string = request.args.get('search_string', 10)
search_string = request.args.get('search_string', "")
site_name = session['selected_site']
offset = (page - 1) * limit
recordset, count = database_recipes.getModalSKUs(site_name, (search_string, limit, offset))
print(recordset)
return jsonify({"items":recordset, "end":math.ceil(count/limit), "error":False, "message":"items fetched succesfully!"})
return jsonify({"items":recordset, "end":math.ceil(count/limit), "error":True, "message":"There was an error with this GET statement"})
update_model = model_api.model('model', {
'id': fields.Integer(min=1),
'update': fields.Raw(required=True, description="all the data to be updated!")
})
@recipes_api.route('/recipe/postUpdate', methods=["POST"])
@login_required
@model_api.expect(update_model)
def postUpdate():
""" This is an endpoint for updating an RecipeTuple in the sites recipes table
@ -166,51 +169,62 @@ def postUpdate():
return jsonify({'recipe': recipe, 'error': True, 'message': 'Update of Recipe unsuccessful!'})
@recipes_api.route('/recipe/postCustomItem', methods=["POST"])
@login_required
def postCustomItem():
""" post a recipe item to the database by passing a uuid, recipe_id, item_type, item_name, uom, qty, and link
---
responses:
200:
description: Recipe Item posted successfully!
"""
recipe = {}
if request.method == "POST":
database_config = config()
site_name = session['selected_site']
with psycopg2.connect(**database_config) as conn:
recipe_item = postsqldb.RecipesTable.ItemPayload(
uuid=f"%{int(request.get_json()['rp_id'])}{database.getUUID(6)}%",
rp_id=int(request.get_json()['rp_id']),
item_type=request.get_json()['item_type'],
item_name=request.get_json()['item_name'],
uom=request.get_json()['uom'],
qty=float(request.get_json()['qty']),
links=request.get_json()['links']
)
postsqldb.RecipesTable.insert_item_tuple(conn, site_name, recipe_item.payload(), convert=True)
recipe = postsqldb.RecipesTable.getRecipe(conn, site_name, (int(request.get_json()['rp_id']), ), convert=True)
rp_id = int(request.get_json()['rp_id'])
recipe_item = db.RecipesTable.ItemPayload(
uuid=f"%{int(request.get_json()['rp_id'])}{database.getUUID(6)}%",
rp_id=rp_id,
item_type=request.get_json()['item_type'],
item_name=request.get_json()['item_name'],
uom=request.get_json()['uom'],
qty=float(request.get_json()['qty']),
links=request.get_json()['links']
)
database_recipes.postRecipeItem(site_name, recipe_item.payload())
recipe = database_recipes.getRecipe(site_name, (rp_id, ))
return jsonify({'recipe': recipe, 'error': False, 'message': 'Recipe Item was added successful!'})
return jsonify({'recipe': recipe, 'error': True, 'message': 'Recipe Item was not added unsuccessful!'})
return jsonify({'recipe': recipe, 'error': True, 'message': f'method {request.method} not allowed!'})
@recipes_api.route('/recipe/postSKUItem', methods=["POST"])
@login_required
def postSKUItem():
""" post a recipe item to the database by passing a recipe_id and item_id
---
responses:
200:
description: recipe item was posted successfully!
"""
recipe = {}
if request.method == "POST":
recipe_id = int(request.get_json()['recipe_id'])
item_id = int(request.get_json()['item_id'])
database_config = config()
site_name = session['selected_site']
with psycopg2.connect(**database_config) as conn:
item = database.getItemAllByID(conn, site_name, (item_id, ), convert=True)
recipe_item = postsqldb.RecipesTable.ItemPayload(
uuid=item['barcode'],
rp_id=recipe_id,
item_type='sku',
item_name=item['item_name'],
uom=item['item_info']['uom']['id'],
qty=float(item['item_info']['uom_quantity']),
item_id=item['id'],
links=item['links']
)
postsqldb.RecipesTable.insert_item_tuple(conn, site_name, recipe_item.payload(), convert=True)
recipe = postsqldb.RecipesTable.getRecipe(conn, site_name, (recipe_id, ), convert=True)
item = database_recipes.getItemData(site_name, (item_id, ))
print(item)
recipe_item = db.RecipesTable.ItemPayload(
uuid=item['barcode'],
rp_id=recipe_id,
item_type='sku',
item_name=item['item_name'],
uom=item['uom'],
qty=float(item['uom_quantity']),
item_id=item['id'],
links=item['links']
)
database_recipes.postRecipeItem(site_name, recipe_item.payload())
recipe = database_recipes.getRecipe(site_name, (recipe_id, ))
return jsonify({'recipe': recipe, 'error': False, 'message': 'Recipe Item was added successful!'})
return jsonify({'recipe': recipe, 'error': True, 'message': 'Recipe Item was not added unsuccessful!'})
return jsonify({'recipe': recipe, 'error': True, 'message': f'method {request.method} is not allowed!'})
@recipes_api.route('/recipe/postImage/<recipe_id>', methods=["POST"])
def uploadImage(recipe_id):

4
scripts/recipes/sql/getItemData.sql Normal file
View File

@ -0,0 +1,4 @@
SELECT item.id, item.barcode, item.item_name, item.links, item_info.uom_quantity, item_info.uom
FROM %%site_name%%_items item
LEFT JOIN %%site_name%%_item_info item_info ON item_info.id = item.item_info_id
WHERE item.id = %s;

4
scripts/recipes/sql/postRecipeItem.sql Normal file
View File

@ -0,0 +1,4 @@
INSERT INTO %%site_name%%_recipe_items
(uuid, rp_id, item_type, item_name, uom, qty, item_id, links)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
RETURNING *;