From d0641950f98605155b7a17d24e5ebf8ff0026912 Mon Sep 17 00:00:00 2001 From: Edwin Eames Date: Mon, 7 Oct 2024 22:58:17 -0400 Subject: [PATCH] dynamic database --- app/classes/admin.py | 1 - app/classes/auth.py | 1 - app/classes/auto.py | 2 -- app/classes/cards.py | 1 - app/classes/company.py | 1 - app/classes/customer.py | 4 ---- app/classes/delivery.py | 2 -- app/classes/employee.py | 3 --- app/classes/money.py | 2 -- app/classes/pricing.py | 1 - app/classes/printing.py | 25 ------------------------- app/classes/promo.py | 1 - app/classes/query.py | 5 ----- app/classes/stats_company.py | 1 - app/classes/stats_customer.py | 1 - app/classes/stats_employee.py | 2 -- app/classes/stripe.py | 27 --------------------------- app/classes/taxes.py | 16 ---------------- app/promo/views.py | 2 +- prod_settings.py | 2 +- 20 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 app/classes/printing.py delete mode 100755 app/classes/stripe.py delete mode 100644 app/classes/taxes.py diff --git a/app/classes/admin.py b/app/classes/admin.py index dbf5b75..05aeded 100755 --- a/app/classes/admin.py +++ b/app/classes/admin.py @@ -4,7 +4,6 @@ from datetime import datetime class Admin_Company(db.Model): __tablename__ = 'admin_company' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/auth.py b/app/classes/auth.py index 756cf02..d362188 100755 --- a/app/classes/auth.py +++ b/app/classes/auth.py @@ -10,7 +10,6 @@ def get_uuid(): class Auth_User(UserMixin, db.Model): __tablename__ = 'auth_users' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/auto.py b/app/classes/auto.py index 124a5ce..958d43e 100755 --- a/app/classes/auto.py +++ b/app/classes/auto.py @@ -5,7 +5,6 @@ from datetime import datetime class Auto_Temp(db.Model): __tablename__ = 'auto_temp' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, @@ -27,7 +26,6 @@ class Auto_Temp_schema(ma.SQLAlchemyAutoSchema): class Auto_Delivery(db.Model): __tablename__ = 'auto_delivery' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/cards.py b/app/classes/cards.py index 8b0197c..90db789 100755 --- a/app/classes/cards.py +++ b/app/classes/cards.py @@ -5,7 +5,6 @@ from datetime import datetime class Card_Card(db.Model): __tablename__ = 'card_card' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/company.py b/app/classes/company.py index c0a398b..b8adb83 100755 --- a/app/classes/company.py +++ b/app/classes/company.py @@ -4,7 +4,6 @@ from app import db, ma class Company_Company(db.Model): __tablename__ = 'company_company' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/customer.py b/app/classes/customer.py index 2adc7be..a03ae95 100755 --- a/app/classes/customer.py +++ b/app/classes/customer.py @@ -5,7 +5,6 @@ from datetime import datetime class Customer_Customer(db.Model): __tablename__ = 'customer_customer' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, @@ -35,7 +34,6 @@ class Customer_Customer_schema(ma.SQLAlchemyAutoSchema): class Customer_Property(db.Model): __tablename__ = 'customer_property' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, @@ -61,7 +59,6 @@ class Customer_Property_schema(ma.SQLAlchemyAutoSchema): class Customer_Payment_Credit(db.Model): __tablename__ = 'customer_payment' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, @@ -86,7 +83,6 @@ class Customer_Payment_Credit_schema(ma.SQLAlchemyAutoSchema): class Customer_Description(db.Model): __tablename__ = 'customer_description' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/delivery.py b/app/classes/delivery.py index 762eb00..6bb219b 100755 --- a/app/classes/delivery.py +++ b/app/classes/delivery.py @@ -5,7 +5,6 @@ from datetime import datetime class Delivery_Delivery(db.Model): __tablename__ = 'delivery_delivery' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, @@ -91,7 +90,6 @@ class Delivery_Delivery_schema(ma.SQLAlchemyAutoSchema): class Delivery_Notes_Driver(db.Model): __tablename__ = 'delivery_notes' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/employee.py b/app/classes/employee.py index 132b8b4..5ebbfab 100755 --- a/app/classes/employee.py +++ b/app/classes/employee.py @@ -4,7 +4,6 @@ from datetime import datetime class Employee_Employee(db.Model): __tablename__ = 'employee_employee' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, @@ -34,7 +33,6 @@ class Employee_Employee_schema(ma.SQLAlchemyAutoSchema): class Employee_Credentials(db.Model): __tablename__ = 'employee_credentials' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, @@ -54,7 +52,6 @@ class Employee_Credentials_schema(ma.SQLAlchemyAutoSchema): class Employee_Vacation(db.Model): __tablename__ = 'employee_vacation' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/money.py b/app/classes/money.py index f0842ba..22e613e 100644 --- a/app/classes/money.py +++ b/app/classes/money.py @@ -3,7 +3,6 @@ from app import db, ma class Money_delivery(db.Model): __tablename__ = 'money_delivery' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, @@ -35,7 +34,6 @@ class Money_delivery_schema(ma.SQLAlchemyAutoSchema): class Pricing_Taxes(db.Model): __tablename__ = 'pricing_taxes' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/pricing.py b/app/classes/pricing.py index 322bb39..ea3dd76 100755 --- a/app/classes/pricing.py +++ b/app/classes/pricing.py @@ -7,7 +7,6 @@ from datetime import datetime class Pricing_Oil_Oil(db.Model): __tablename__ = 'pricing_oil_oil' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/printing.py b/app/classes/printing.py deleted file mode 100644 index 602bf02..0000000 --- a/app/classes/printing.py +++ /dev/null @@ -1,25 +0,0 @@ -from app import db, ma, login_manager -from datetime import datetime - - - - -class Printer_jobs(db.Model): - __tablename__ = "printer_jobs" - - id = db.Column(db.Integer, - primary_key=True, - autoincrement=True, - unique=False) - - delivery_id = db.Column(db.Integer) - date_added = db.Column(db.Date(), default=datetime.utcnow()) - date_completed = db.Column(db.Date(), default=datetime.utcnow()) - employee_id = db.Column(db.Integer) - #0 = waiting - #1 = printing - #2 = printed - #3 = error - status = db.Column(db.Integer) - - \ No newline at end of file diff --git a/app/classes/promo.py b/app/classes/promo.py index 68f318b..6e9933e 100644 --- a/app/classes/promo.py +++ b/app/classes/promo.py @@ -6,7 +6,6 @@ from app import db, ma class Promo_Promo(db.Model): __tablename__ = 'promo_Promo' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/query.py b/app/classes/query.py index d25021d..d06c394 100755 --- a/app/classes/query.py +++ b/app/classes/query.py @@ -4,7 +4,6 @@ from app import db, ma class Query_EmployeeTypeList(db.Model): __tablename__ = 'query_employee_type_list' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, primary_key=True, autoincrement=True) value = db.Column(db.INTEGER) @@ -20,7 +19,6 @@ class Query_EmployeeTypeList_Schema(ma.SQLAlchemyAutoSchema): class Query_StateList(db.Model): __tablename__ = 'query_state_list' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, primary_key=True, autoincrement=True) value = db.Column(db.INTEGER) @@ -37,7 +35,6 @@ class Query_StateList_Schema(ma.SQLAlchemyAutoSchema): class Query_CustomerTypeList(db.Model): __tablename__ = 'query_customer_type_list' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, primary_key=True, autoincrement=True) value = db.Column(db.INTEGER) @@ -55,7 +52,6 @@ class Query_CustomerTypeList_Schema(ma.SQLAlchemyAutoSchema): class Query_ServiceTypeList(db.Model): __tablename__ = 'query_service_type_list' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, primary_key=True, autoincrement=True) value = db.Column(db.INTEGER) @@ -73,7 +69,6 @@ class Query_ServiceTypeList_Schema(ma.SQLAlchemyAutoSchema): class Query_DeliveryStatusList(db.Model): __tablename__ = 'query_delivery_type_list' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, primary_key=True, autoincrement=True) value = db.Column(db.INTEGER) diff --git a/app/classes/stats_company.py b/app/classes/stats_company.py index ce46c92..098de98 100644 --- a/app/classes/stats_company.py +++ b/app/classes/stats_company.py @@ -5,7 +5,6 @@ from datetime import datetime class Stats_Company(db.Model): __tablename__ = 'stats_company' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/stats_customer.py b/app/classes/stats_customer.py index 5013174..e763ecf 100755 --- a/app/classes/stats_customer.py +++ b/app/classes/stats_customer.py @@ -5,7 +5,6 @@ from datetime import datetime class Stats_Customer(db.Model): __tablename__ = 'stats_customer' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/stats_employee.py b/app/classes/stats_employee.py index f336c49..6e50ecd 100755 --- a/app/classes/stats_employee.py +++ b/app/classes/stats_employee.py @@ -5,7 +5,6 @@ from datetime import datetime class Stats_Employee_Oil(db.Model): __tablename__ = 'stats_employee_oil' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, @@ -30,7 +29,6 @@ class Stats_Employee_Oil_schema(ma.SQLAlchemyAutoSchema): class Stats_Employee_Office(db.Model): __tablename__ = 'stats_employee_office' - __bind_key__ = 'eamco' __table_args__ = {"schema": "public"} id = db.Column(db.Integer, diff --git a/app/classes/stripe.py b/app/classes/stripe.py deleted file mode 100755 index c97d3f9..0000000 --- a/app/classes/stripe.py +++ /dev/null @@ -1,27 +0,0 @@ -from app import db, ma -from datetime import datetime - - - -class Delivery_Payment(db.Model): - __tablename__ = 'delivery_payment' - __bind_key__ = 'eamco' - __table_args__ = {"schema": "public"} - - id = db.Column(db.Integer, - primary_key=True, - autoincrement=True, - unique=False) - - delivery_id = db.Column(db.INTEGER) - time_added = db.Column(db.TIMESTAMP(), default=datetime.utcnow()) - total_amount_oil = db.Column(db.DECIMAL(6, 2)) - total_amount_emergency = db.Column(db.DECIMAL(6, 2)) - total_amount_prime = db.Column(db.DECIMAL(6, 2)) - total_amount_fee = db.Column(db.DECIMAL(6, 2)) - total_amount = db.Column(db.DECIMAL(6, 2)) - -class Delivery_Payment_schema(ma.SQLAlchemyAutoSchema): - class Meta: - model = Delivery_Payment - diff --git a/app/classes/taxes.py b/app/classes/taxes.py deleted file mode 100644 index 25a20ec..0000000 --- a/app/classes/taxes.py +++ /dev/null @@ -1,16 +0,0 @@ -from app import db, ma -from datetime import datetime - - -class Pricing_Taxes(db.Model): - __tablename__ = 'taxes_pricing' - __bind_key__ = 'eamco' - __table_args__ = {"schema": "public"} - - id = db.Column(db.Integer, - primary_key=True, - autoincrement=True, - unique=False) - state_id = db.Column(db.Integer) - taxes_oil = db.Column(db.DECIMAL(6, 2)) - taxes_other = db.Column(db.DECIMAL(6, 2)) diff --git a/app/promo/views.py b/app/promo/views.py index 1148a46..4d27336 100644 --- a/app/promo/views.py +++ b/app/promo/views.py @@ -36,7 +36,7 @@ def delete_a_promo(promo_id): """ get_promo_data = (db.session .query(Promo_Promo) - .first(Promo_Promo.id == promo_id) + .filter(Promo_Promo.id == promo_id) .first()) db.session.delete(get_promo_data) diff --git a/prod_settings.py b/prod_settings.py index c66e4ec..ba76ae8 100644 --- a/prod_settings.py +++ b/prod_settings.py @@ -10,7 +10,7 @@ class ApplicationConfig: POSTGRES_USERNAME = 'postgres' POSTGRES_PW = 'password' POSTGRES_SERVER = '192.168.1.204:5432' - POSTGRES_DBNAME00 = 'eamco' + POSTGRES_DBNAME00 = 'auburnoil' SQLALCHEMY_DATABASE_URI = "postgresql+psycopg2://{}:{}@{}/{}".format(POSTGRES_USERNAME, POSTGRES_PW, POSTGRES_SERVER,