picture_uid
This commit is contained in:
+9
-12
@@ -5,6 +5,7 @@ from sqlalchemy.exc import IntegrityError
|
|||||||
import uuid
|
import uuid
|
||||||
from app.utils.logger import logger
|
from app.utils.logger import logger
|
||||||
|
|
||||||
|
|
||||||
class Members(db.Model):
|
class Members(db.Model):
|
||||||
__tablename__ = 'members'
|
__tablename__ = 'members'
|
||||||
|
|
||||||
@@ -24,7 +25,7 @@ class Members(db.Model):
|
|||||||
profile_completed = db.Column(db.DateTime(timezone=False))
|
profile_completed = db.Column(db.DateTime(timezone=False))
|
||||||
stripe_customer_id = db.Column(db.String(100), nullable=True)
|
stripe_customer_id = db.Column(db.String(100), nullable=True)
|
||||||
option_name = db.Column(db.String(100), nullable=True)
|
option_name = db.Column(db.String(100), nullable=True)
|
||||||
next_billing= db.Column(db.DateTime(timezone=False))
|
next_billing = db.Column(db.DateTime(timezone=False))
|
||||||
trial_end = db.Column(db.DateTime(timezone=False))
|
trial_end = db.Column(db.DateTime(timezone=False))
|
||||||
last_login = db.Column(db.DateTime(timezone=False), server_default=func.now(), onupdate=func.now())
|
last_login = db.Column(db.DateTime(timezone=False), server_default=func.now(), onupdate=func.now())
|
||||||
phone = db.Column(db.String(25), nullable=True)
|
phone = db.Column(db.String(25), nullable=True)
|
||||||
@@ -47,7 +48,7 @@ class Members(db.Model):
|
|||||||
"status": self.status,
|
"status": self.status,
|
||||||
"added": self.added.isoformat() if self.added else None,
|
"added": self.added.isoformat() if self.added else None,
|
||||||
"updated": self.updated.isoformat() if self.updated else None,
|
"updated": self.updated.isoformat() if self.updated else None,
|
||||||
"last_login" : self.last_login.isoformat() if self.last_login else None,
|
"last_login": self.last_login.isoformat() if self.last_login else None,
|
||||||
"email": self.email,
|
"email": self.email,
|
||||||
"account_name": self.account_name,
|
"account_name": self.account_name,
|
||||||
"firstname": self.firstname,
|
"firstname": self.firstname,
|
||||||
@@ -97,7 +98,7 @@ class Members(db.Model):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def set_member_profile_picture(cls, uid, picture_uid):
|
def set_member_profile_picture(cls, uid, picture_uid):
|
||||||
logger.info(f"Set_Member_Profile_Picture UID = {uid} ")
|
logger.info(f"Set_Member_Profile_Picture UID = {uid} Picture_UID = {picture_uid} ")
|
||||||
member = cls.query.filter_by(uid=str(uid)).first()
|
member = cls.query.filter_by(uid=str(uid)).first()
|
||||||
|
|
||||||
if not member:
|
if not member:
|
||||||
@@ -134,9 +135,8 @@ class Members(db.Model):
|
|||||||
member.last_login = datetime.now(timezone.utc)
|
member.last_login = datetime.now(timezone.utc)
|
||||||
return member.last_login
|
return member.last_login
|
||||||
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def add_member(cls, firstname, lastname, email, username,password, country, trials_days = 90):
|
def add_member(cls, firstname, lastname, email, username, password, country, trials_days=90):
|
||||||
|
|
||||||
# Get the current date and time
|
# Get the current date and time
|
||||||
current_date = datetime.now()
|
current_date = datetime.now()
|
||||||
@@ -149,7 +149,7 @@ class Members(db.Model):
|
|||||||
uid=str(uuid.uuid4()),
|
uid=str(uuid.uuid4()),
|
||||||
firstname=firstname,
|
firstname=firstname,
|
||||||
lastname=lastname,
|
lastname=lastname,
|
||||||
username =username,
|
username=username,
|
||||||
email=email,
|
email=email,
|
||||||
country=country,
|
country=country,
|
||||||
password=password,
|
password=password,
|
||||||
@@ -164,10 +164,9 @@ class Members(db.Model):
|
|||||||
raise ValueError(f"Database integrity error: {err}")
|
raise ValueError(f"Database integrity error: {err}")
|
||||||
return member_data
|
return member_data
|
||||||
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def update_user_password(cls, reset_id, member_uid, member_id, new_passwprd_hash):
|
def update_user_password(cls, reset_id, member_uid, member_id, new_passwprd_hash):
|
||||||
member = cls.query.filter_by(uid=str(member_uid),id=member_id).first()
|
member = cls.query.filter_by(uid=str(member_uid), id=member_id).first()
|
||||||
if not member:
|
if not member:
|
||||||
raise ValueError(f"Reset with UID {member_uid} does not exist.")
|
raise ValueError(f"Reset with UID {member_uid} does not exist.")
|
||||||
|
|
||||||
@@ -176,7 +175,7 @@ class Members(db.Model):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def set_user_stripe_id(cls, member_uid, member_id, stripe_customer_id):
|
def set_user_stripe_id(cls, member_uid, member_id, stripe_customer_id):
|
||||||
member = cls.query.filter_by(uid=str(member_uid),id=member_id).first()
|
member = cls.query.filter_by(uid=str(member_uid), id=member_id).first()
|
||||||
if not member:
|
if not member:
|
||||||
raise ValueError(f"Member with UID {member_uid} does not exist.")
|
raise ValueError(f"Member with UID {member_uid} does not exist.")
|
||||||
# Update stripe_customer_id
|
# Update stripe_customer_id
|
||||||
@@ -204,8 +203,6 @@ class Members(db.Model):
|
|||||||
|
|
||||||
return next_billing
|
return next_billing
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def get_all_member(cls, email=None, username=None, page=1, limit=20):
|
def get_all_member(cls, email=None, username=None, page=1, limit=20):
|
||||||
|
|
||||||
@@ -240,4 +237,4 @@ class Members(db.Model):
|
|||||||
query = query.order_by(cls.last_login.desc())
|
query = query.order_by(cls.last_login.desc())
|
||||||
query = query.limit(limit).offset(0)
|
query = query.limit(limit).offset(0)
|
||||||
|
|
||||||
return query.all()
|
return query.all()
|
||||||
|
|||||||
Reference in New Issue
Block a user