From 890521ae91df06c90101c56c085b367a42b4e7b8 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 13 Jul 2025 15:05:09 -0400 Subject: [PATCH] Fix tables --- SQL/site_data.sql | 3 +++ app/api/services/base_service.py | 3 ++- app/api/services/myproduct.py | 2 +- app/models/password_reset.py | 32 +++++++++++++++++--------------- app/models/products.py | 2 +- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/SQL/site_data.sql b/SQL/site_data.sql index 3622057..9108f52 100644 --- a/SQL/site_data.sql +++ b/SQL/site_data.sql @@ -149,6 +149,9 @@ ALTER TABLE members_products ADD CONSTRAINT members_products_unique_member_key UNIQUE (member_id, product_id); +ALTER TABLE members_products ADD provision_port INT DEFAULT 0; +ALTER TABLE members_products ADD primary_server VARCHAR(100); + INSERT INTO merms_products (name,description,status,product_id, banner) VALUES ('Personal Website','Your personal professional web presence',1,'A000001', 'banner.jpg'); diff --git a/app/api/services/base_service.py b/app/api/services/base_service.py index 50bbc08..35415ac 100644 --- a/app/api/services/base_service.py +++ b/app/api/services/base_service.py @@ -11,7 +11,8 @@ from flask_mail import Mail, Message import smtplib from email.mime.text import MIMEText from email.mime.multipart import MIMEMultipart - +import datetime +import jwt class BaseService: TRANSACTION_TYPE = None diff --git a/app/api/services/myproduct.py b/app/api/services/myproduct.py index afa71cf..f234516 100644 --- a/app/api/services/myproduct.py +++ b/app/api/services/myproduct.py @@ -92,7 +92,7 @@ class MyProductsService(BaseService): logger.info(f"GET HERE ******************************** : {data}", exc_info=True) mumberSub = MembersProducts.get_member_product_by_product_member_id(member_id, product_id) - if not mumberSub: + if mumberSub: logger.error(f"Ready to add data to tables") response_data = { "subscription": mumberSub, diff --git a/app/models/password_reset.py b/app/models/password_reset.py index c8df651..cbb8f5c 100644 --- a/app/models/password_reset.py +++ b/app/models/password_reset.py @@ -27,21 +27,23 @@ class PasswordReset(db.Model): "updated": self.updated.isoformat() if self.updated else None, } + @classmethod + def create_reset(cls, username): + pass_reset = cls( + uid=str(uuid.uuid4()), + username=username, + added=datetime.now(timezone.utc), + updated=datetime.now(timezone.utc) + ) + logger.info(f"About to reset the password**********") + try: + db.session.add(pass_reset) + except IntegrityError as err: + raise ValueError(f"Database integrity error: {err}") + return pass_reset + + def __repr__(self): - return f'' + return f'' -@classmethod -def create_reset(cls, username): - pass_reset = cls( - uid=str(uuid.uuid4()), - username=username, - created_at=datetime.now(timezone.utc), - updated_at=datetime.now(timezone.utc) - ) - - try: - db.session.add(pass_reset) - except IntegrityError as err: - raise ValueError(f"Database integrity error: {err}") - return pass_reset diff --git a/app/models/products.py b/app/models/products.py index 551cb5b..08f737d 100644 --- a/app/models/products.py +++ b/app/models/products.py @@ -57,7 +57,7 @@ class Products(db.Model): # product_list = cls.query.all() json_output = product_list # json.dumps(product_list) - print(json_output) + # print(json_output) logger.info(json_output) return json_output