Fix model
This commit is contained in:
@@ -25,7 +25,7 @@ class Members(db.Model):
|
||||
def to_dict(self):
|
||||
return {
|
||||
"id": self.id,
|
||||
"uid": self.uid,
|
||||
"uid": str(self.uid),
|
||||
"username": self.account_id,
|
||||
"account_id": self.username,
|
||||
"password": self.password,
|
||||
|
||||
@@ -49,6 +49,13 @@ class MembersProducts(db.Model):
|
||||
return None
|
||||
return member_products
|
||||
|
||||
@classmethod
|
||||
def get_dash_recent_subscription(cls, limit):
|
||||
member_product = cls.query.limit(limit).all()
|
||||
if not member_product:
|
||||
return None
|
||||
return member_product
|
||||
|
||||
@classmethod
|
||||
def get_member_product_by_product_member_id(cls, member_id, product_id):
|
||||
member_product = cls.query.filter_by(member_id=str(member_id), product_id=str(product_id)).first()
|
||||
|
||||
@@ -10,7 +10,7 @@ from app.utils.logger import logger
|
||||
class PasswordReset(db.Model):
|
||||
__tablename__ = 'password_reset'
|
||||
|
||||
id = db.Column(db.String, primary_key=True)
|
||||
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
|
||||
uid = db.Column(db.String(150), nullable=False)
|
||||
username = db.Column(db.String(35), nullable=False)
|
||||
status = db.Column(db.Integer, nullable=True, default=0)
|
||||
@@ -30,11 +30,21 @@ class PasswordReset(db.Model):
|
||||
@classmethod
|
||||
def create_reset(cls, username):
|
||||
logger.info(f"Enter to reset the password********** "+username)
|
||||
|
||||
uid_val = str(uuid.uuid4())
|
||||
logger.info(f"Enter to reset the password UID ***** "+uid_val)
|
||||
data1 ={
|
||||
'uid' :uid_val,
|
||||
'username' : username,
|
||||
'status' : 0,
|
||||
'added' : datetime.now(timezone.utc),
|
||||
'updated' : datetime.now(timezone.utc)
|
||||
}
|
||||
logger.info(f"Enter to reset the password DATA ***** {data1}")
|
||||
|
||||
pass_reset = cls(
|
||||
uid=str(uuid.uuid4()),
|
||||
uid=uid_val,
|
||||
username=username,
|
||||
status=0,
|
||||
added=datetime.now(timezone.utc),
|
||||
updated=datetime.now(timezone.utc)
|
||||
)
|
||||
@@ -42,7 +52,7 @@ class PasswordReset(db.Model):
|
||||
logger.info(f"About to reset the password**********")
|
||||
try:
|
||||
db.session.add(pass_reset)
|
||||
# db.session.flush()
|
||||
db.session.flush()
|
||||
logger.info(f"After Insert to reset the password**********")
|
||||
except IntegrityError as err:
|
||||
raise ValueError(f"****** ERROR Database integrity error: {err}")
|
||||
|
||||
Reference in New Issue
Block a user