admin/demo_partsERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(web): Store Product UI created and hooked up for viewing, editing, and saving.

Browse Source
This commit is contained in:
teddy
2024-10-05 21:16:42 +01:00
parent 9c2cfac948
commit 651a404ba3
72 changed files with 873 additions and 992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
datastores/__pycache__/datastore_store_base.cpython-312.pyc
View File

Binary file not shown.

BIN
datastores/__pycache__/datastore_store_product_category.cpython-312.pyc
View File

Binary file not shown.

BIN
datastores/__pycache__/datastore_store_product_permutation.cpython-312.pyc
View File

Binary file not shown.

BIN
datastores/__pycache__/datastore_store_stock_item.cpython-312.pyc
View File

Binary file not shown.

80
datastores/datastore_store_base.py
View File

@@ -20,7 +20,7 @@ from business_objects.store.delivery_option import Delivery_Option
from business_objects.store.delivery_region import Delivery_Region
from business_objects.store.discount import Discount
from business_objects.store.order import Order
from business_objects.store.product import Product, Product_Permutation, Product_Price, Parameters_Product
from business_objects.store.product import Product, Product_Permutation, Parameters_Product
from business_objects.sql_error import SQL_Error
from business_objects.store.stock_item import Stock_Item
from business_objects.user import User, User_Filters, User_Permission_Evaluation
@@ -61,8 +61,15 @@ class DataStore_Store_Base(DataStore_Base):
av.val_instance(product_filters, 'product_filters', _m, Parameters_Product)
argument_dict = product_filters.to_json()
user = cls.get_user_session()
"""
argument_dict['a_id_user'] = user.id_user # 'auth0|6582b95c895d09a70ba10fef' # id_user
argument_dict['a_debug'] = 0
"""
argument_dict = {
'a_id_user': user.id_user
, **argument_dict
, 'a_debug': 0
}
print(f'argument_dict: {argument_dict}')
print('executing p_shop_get_many_product')
result = cls.db_procedure_execute('p_shop_get_many_product', argument_dict)
@@ -71,77 +78,57 @@ class DataStore_Store_Base(DataStore_Base):
category_list = Product_Category_Container()
print(f'initial category_list: {category_list}')
# Categories
result_set_1 = cursor.fetchall()
print(f'raw categories: {result_set_1}')
# categories = [Product_Category(row[0], row[1], row[2], row[3]) for row in result_set_1]
# categories = []
# category_index = {}
for row in result_set_1:
new_category = Product_Category.from_DB_get_many_product_catalogue(row) # Product_Category(row[0], row[1], row[2], row[3])
# category_index[new_category.id_category] = len(categories)
# categories.append(new_category)
new_category = Product_Category.from_DB_get_many_product_catalogue(row)
print(f'new_category: {new_category}')
category_list.add_product_category(new_category)
# print(f'categories: {[c.id_category for c in categories]}')
print(f'category-loaded category_list: {category_list}')
# Products
cursor.nextset()
result_set_2 = cursor.fetchall()
# print(f'products: {result_set_2}')
# products = [] # [Product(**row) for row in result_set_2]
# product_index = {}
print(f'raw products: {result_set_2}')
for row in result_set_2:
new_product = Product.from_DB_get_many_product_catalogue(row) # (row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9], row[10], row[11], row[12], row[13], row[14], row[15], row[16], row[17], row[18], row[19])
index_category = category_list.get_index_category_from_id(new_product.id_category)
category = category_list.categories[index_category]
category_list.add_product(new_product)
# products.append(new_product)
print(f'category_list: {category_list}')
print(f'row: {row}')
new_product = Product.from_DB_get_many_product_catalogue(row)
print(f'new_product: {new_product}')
try:
category_list.add_product(new_product)
except Exception as e:
print(f'Error adding product: {e}')
# Permutations
cursor.nextset()
result_set_3 = cursor.fetchall()
# print(f'Permutations: {result_set_3}')
permutations = [] # [Product(**row) for row in result_set_2]
# permutation_index = {}
for row in result_set_3:
new_permutation = Product_Permutation.from_DB_get_many_product_catalogue(row) # (row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9], row[10], row[11], row[12], row[13], row[14], row[15], row[16], row[17], row[18], row[19])
index_category = category_list.get_index_category_from_id(new_permutation.id_category)
category = category_list.categories[index_category]
category_list.add_product_permutation(new_permutation)
print(f'category_list: {category_list}')
new_permutation = Product_Permutation.from_DB_get_many_product_catalogue(row)
try:
category_list.add_product_permutation(new_permutation)
except Exception as e:
print(f'Error adding permutation: {e}')
# Product_Variations
cursor.nextset()
result_set_4 = cursor.fetchall()
# print(f'variations: {result_set_4}')
# variations = [Product_Variation(**row) for row in result_set_4]
variations = []
for row in result_set_4:
new_variation = Product_Variation.from_DB_get_many_product_catalogue(row)
variations.append(new_variation)
category_list.add_product_variation(new_variation)
# print(f'variations: {variations}')
# print(f'products: {[p.id_product for p in products]}')
try:
category_list.add_product_variation(new_variation)
except Exception as e:
print(f'Error adding variation: {e}')
# Images
cursor.nextset()
result_set_5 = cursor.fetchall()
# print(f'images: {result_set_5}')
# images = [Image(**row) for row in result_set_5]
images = []
for row in result_set_5:
new_image = Image.from_DB_get_many_product_catalogue(row) # (row[0], row[1], row[2], row[3], row[4])
images.append(new_image)
# products[product_index[new_image.id_product]].images.append(new_image)
"""
index_category = category_index[new_image.id_category]
index_product = categories[index_category].index_product_from_ids_product_permutation(new_image.id_product, new_image.id_permutation)
categories[index_category].products[index_product].images.append(new_image)
"""
new_image = Image.from_DB_get_many_product_catalogue(row)
category_list.add_product_image(new_image)
# print(f'images: {images}')
# print(f'products: {[p.id_product for p in products]}')
# Errors
cursor.nextset()
@@ -181,6 +168,7 @@ class DataStore_Store_Base(DataStore_Base):
DataStore_Store_Base.db_cursor_clear(cursor)
cursor.close()
print(f'get many category_list: {category_list}')
return category_list, errors # categories, category_index
"""
@@ -283,8 +271,8 @@ class DataStore_Store_Base(DataStore_Base):
argument_dict_list = {
# 'a_guid': guid
'a_id_user': user.id_user
, 'a_debug': 0
, **variation_filters.to_json()
, 'a_debug': 0
}
# argument_dict_list['a_guid'] = guid
result = cls.db_procedure_execute('p_shop_get_many_product_variation', argument_dict_list)

69
datastores/datastore_store_product.py
View File

@@ -12,20 +12,8 @@ Datastore for Store Products
# internal
import lib.argument_validation as av
from business_objects.store.basket import Basket, Basket_Item
from business_objects.store.product_category import Product_Category_Container, Product_Category
from business_objects.store.currency import Currency
from business_objects.store.image import Image
from business_objects.store.delivery_option import Delivery_Option
from business_objects.store.delivery_region import Delivery_Region
from business_objects.store.discount import Discount
from business_objects.store.order import Order
from business_objects.store.product import Product, Product_Permutation, Product_Price, Parameters_Product
from business_objects.sql_error import SQL_Error
from business_objects.store.stock_item import Stock_Item
from business_objects.user import User, User_Filters, User_Permission_Evaluation
from business_objects.store.product_variation import Product_Variation, Product_Variation_Filters, Product_Variation_Container
# from datastores.datastore_base import Table_Shop_Product_Category, Table_Shop_Product_Category_Temp
from business_objects.store.product import Product, Product_Permutation, Product_Price, Parameters_Product, Product_Temp
from datastores.datastore_store_base import DataStore_Store_Base
from helpers.helper_db_mysql import Helper_DB_MySQL
# from models.model_view_store_checkout import Model_View_Store_Checkout # circular!
@@ -56,6 +44,7 @@ class Table_Shop_Product_Category(db.Model):
created_by: int = db.Column(db.Integer)
id_change_set: int = db.Column(db.Integer)
"""
"""
class Row_Shop_Product_Temp(db.Model):
__tablename__ = 'Shop_Product_Temp'
__table_args__ = { 'extend_existing': True }
@@ -80,50 +69,70 @@ class Row_Shop_Product_Temp(db.Model):
return row
def to_json(self):
return {
'id_product': self.id_product,
'id_category': self.id_category,
'name': self.name,
'has_variations': self.has_variations,
'id_access_level_required': self.id_access_level_required,
'active': av.input_bool(self.active, self.FLAG_ACTIVE, f'{self.__class__.__name__}.to_json'),
'display_order': self.display_order,
'guid': self.guid,
}
"""
class DataStore_Store_Product(DataStore_Store_Base):
def __init__(self):
super().__init__()
@classmethod
def save_categories(cls, comment, categories):
_m = 'DataStore_Store_Product_Category.save_categories'
def save_products(cls, comment, products):
_m = 'DataStore_Store_Product.save_products'
print(f'{_m}\nstarting...')
print(f'comment: {comment}\ncategories: {categories}')
# av.val_str(comment, 'comment', _m)
# av.val_list_instances(categories, 'categories', _m, Product_Category, 1)
print(f'comment: {comment}\nproducts: {products}')
guid = Helper_DB_MySQL.create_guid()
user = cls.get_user_session()
rows = []
id_category_new = 0
for category in categories:
row = Row_Shop_Product_Temp.from_product(category)
if row.id_category == '':
id_category_new -= 1
row.id_category = id_category_new
id_product_new = 0
for product in products:
row = Product_Temp.from_product(product)
if row.id_product == '':
id_product_new -= 1
row.id_product = id_product_new
else:
print(f'row.id_category: {row.id_category}')
print(f'row.id_product: {row.id_product}')
row.guid = guid
rows.append(row)
print(f'rows: {rows}')
DataStore_Store_Base.upload_bulk(rows, Row_Shop_Product_Temp, 1000)
DataStore_Store_Base.upload_bulk(Product_Temp.__tablename__, rows, 1000)
argument_dict_list = {
'a_id_user': user.id_user,
'a_guid': guid,
'a_comment': comment,
'a_guid': guid,
'a_id_user': user.id_user,
'a_debug': 0,
}
save_result = cls.db_procedure_execute('p_shop_save_product', argument_dict_list)
cursor = save_result # .cursor
print('data received')
# Errors
# cursor.nextset()
result_set_e = cursor.fetchall()
print(f'raw errors: {result_set_e}')
errors = []
if len(result_set_e) > 0:
errors = [SQL_Error.from_DB_record(row) for row in result_set_e] # (row[0], row[1])
for error in errors:
print(f"Error [{error.code}]: {error.msg}")
try:
DataStore_Store_Base.db_cursor_clear(cursor)
except Exception as e:
print(f'Error clearing cursor: {e}')
cursor.close()
save_result.close()
print('save procedure executed')
return errors

4
datastores/datastore_store_product_category.py
View File

@@ -89,9 +89,9 @@ class DataStore_Store_Product_Category(DataStore_Store_Base):
DataStore_Store_Base.upload_bulk(Product_Category_Temp.__tablename__, rows, 1000)
argument_dict_list = {
'a_id_user': user.id_user,
'a_guid': guid,
'a_comment': comment,
'a_guid': guid,
'a_id_user': user.id_user,
}
save_result = cls.db_procedure_execute('p_shop_save_product_category', argument_dict_list)
save_result.close()

4
datastores/datastore_store_product_permutation.py
View File

@@ -95,9 +95,9 @@ class DataStore_Store_Product_Permutation(DataStore_Store_Base):
print('bulk uploaded')
argument_dict_list = {
'a_id_user': user.id_user,
'a_comment': comment,
'a_guid': guid
'a_guid': guid,
'a_id_user': user.id_user,
}
cls.db_procedure_execute('p_shop_save_product_permutation', argument_dict_list)
print('saved product permutations')

54
datastores/datastore_store_product_variation.py
View File

@@ -27,7 +27,7 @@ from business_objects.store.stock_item import Stock_Item
from business_objects.user import User, User_Filters, User_Permission_Evaluation
from business_objects.store.product_variation import Product_Variation, Product_Variation_Filters, Product_Variation_Container
from datastores.datastore_store_base import DataStore_Store_Base
# from helpers.helper_db_mysql import Helper_DB_MySQL
from helpers.helper_db_mysql import Helper_DB_MySQL
# from models.model_view_store_checkout import Model_View_Store_Checkout # circular!
from extensions import db
# external
@@ -41,59 +41,9 @@ from pydantic import BaseModel, ConfigDict
from typing import ClassVar
from datetime import datetime
# db = SQLAlchemy()
class DataStore_Store_Product_Variation(DataStore_Store_Base):
# Global constants
# Attributes
def __init__(self, **kwargs):
super().__init__(**kwargs)
def get_many_product_variation(self, variation_filters):
_m = 'DataStore_Store_Product_Variation.get_many_product_variation'
print(_m)
av.val_instance(variation_filters, 'variation_filters', _m, Product_Variation_Filters)
guid = Helper_DB_MySQL.create_guid()
# now = datetime.now()
# user = self.get_user_session()
"""
argument_dict_list = {
'a_id_user': id_user,
'a_comment': comment,
'a_guid': guid
}
"""
user = self.get_user_session()
argument_dict_list = {
# 'a_guid': guid
'a_id_user': user.id_user
, **variation_filters.to_json()
}
# argument_dict_list['a_guid'] = guid
result = self.db_procedure_execute('p_shop_get_many_product_variation', argument_dict_list)
cursor = result.cursor
result_set = cursor.fetchall()
# Product_Variations
variations = Product_Variation_Container()
for row in result_set:
new_variation = Product_Variation.from_DB_variation(row)
variations.add_product_variation(new_variation)
errors = []
cursor.nextset()
result_set_e = cursor.fetchall()
print(f'raw errors: {result_set_e}')
if len(result_set_e) > 0:
errors = [SQL_Error.from_DB_record(row) for row in result_set_e] # [SQL_Error(row[0], row[1]) for row in result_set_e]
for error in errors:
print(f"Error [{error.code}]: {error.msg}")
DataStore_Store_Product_Variation.db_cursor_clear(cursor)
return variations, errors
super().__init__(**kwargs)

9
datastores/datastore_store_stock_item.py
View File

@@ -58,8 +58,15 @@ class DataStore_Store_Stock_Item(DataStore_Store_Base):
av.val_instance(Parameters_Stock_Item, 'Parameters_Stock_Item', _m, Parameters_Stock_Item)
argument_dict = Parameters_Stock_Item.to_json()
user = self.get_user_session()
argument_dict['a_id_user'] = user.id_user # 1 # 'auth0|6582b95c895d09a70ba10fef' # id_user
"""
argument_dict['a_id_user'] = user.id_user # 'auth0|6582b95c895d09a70ba10fef' # id_user
argument_dict['a_debug'] = 0
"""
argument_dict = {
'a_id_user': user.id_user
, **argument_dict
, 'a_debug': 0
}
print(f'argument_dict: {argument_dict}')
print('executing p_shop_get_many_stock_item')
result = self.db_procedure_execute('p_shop_get_many_stock_item', argument_dict)