add ClientUser.name,default_avatar, GenEmail.custom column
This commit is contained in:
parent
432ca33d9e
commit
ddf188f146
|
@ -18,11 +18,13 @@ def get_abs_path(file_path: str):
|
||||||
|
|
||||||
config_file = os.environ.get("CONFIG")
|
config_file = os.environ.get("CONFIG")
|
||||||
if config_file:
|
if config_file:
|
||||||
|
config_file = get_abs_path(config_file)
|
||||||
print("load config file", config_file)
|
print("load config file", config_file)
|
||||||
load_dotenv(get_abs_path(config_file))
|
load_dotenv(get_abs_path(config_file))
|
||||||
else:
|
else:
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
|
|
||||||
|
|
||||||
# Constants
|
# Constants
|
||||||
PARTNER_CODES = ["SL2019"]
|
PARTNER_CODES = ["SL2019"]
|
||||||
|
|
||||||
|
@ -32,7 +34,7 @@ PROMO_CODE = "SIMPLEISBETTER"
|
||||||
|
|
||||||
# Server url
|
# Server url
|
||||||
URL = os.environ["URL"]
|
URL = os.environ["URL"]
|
||||||
print("URL:", URL)
|
print(">>> URL:", URL)
|
||||||
|
|
||||||
# Whether sentry is enabled
|
# Whether sentry is enabled
|
||||||
ENABLE_SENTRY = "ENABLE_SENTRY" in os.environ
|
ENABLE_SENTRY = "ENABLE_SENTRY" in os.environ
|
||||||
|
|
|
@ -7,6 +7,7 @@ import stripe
|
||||||
from arrow import Arrow
|
from arrow import Arrow
|
||||||
from flask import url_for
|
from flask import url_for
|
||||||
from flask_login import UserMixin
|
from flask_login import UserMixin
|
||||||
|
from sqlalchemy import text
|
||||||
from sqlalchemy_utils import ArrowType
|
from sqlalchemy_utils import ArrowType
|
||||||
|
|
||||||
from app import s3
|
from app import s3
|
||||||
|
@ -371,6 +372,9 @@ class GenEmail(db.Model, ModelMixin):
|
||||||
|
|
||||||
enabled = db.Column(db.Boolean(), default=True, nullable=False)
|
enabled = db.Column(db.Boolean(), default=True, nullable=False)
|
||||||
|
|
||||||
|
# this email has been customized by user, i.e. not generated randomly
|
||||||
|
custom = db.Column(db.Boolean(), default=False, nullable=False, server_default="0")
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def create_new_gen_email(cls, user_id):
|
def create_new_gen_email(cls, user_id):
|
||||||
random_email = generate_email()
|
random_email = generate_email()
|
||||||
|
@ -393,6 +397,16 @@ class ClientUser(db.Model, ModelMixin):
|
||||||
db.ForeignKey(GenEmail.id, ondelete="cascade"), nullable=True
|
db.ForeignKey(GenEmail.id, ondelete="cascade"), nullable=True
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# user can decide to send to client another name
|
||||||
|
name = db.Column(
|
||||||
|
db.String(128), nullable=True, default=None, server_default=text("NULL")
|
||||||
|
)
|
||||||
|
|
||||||
|
# user can decide to send to client a default avatar
|
||||||
|
default_avatar = db.Column(
|
||||||
|
db.Boolean, nullable=False, default=False, server_default="0"
|
||||||
|
)
|
||||||
|
|
||||||
gen_email = db.relationship(GenEmail, backref="client_users")
|
gen_email = db.relationship(GenEmail, backref="client_users")
|
||||||
|
|
||||||
user = db.relationship(User)
|
user = db.relationship(User)
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
"""empty message
|
||||||
|
|
||||||
|
Revision ID: c6e7fc37ad42
|
||||||
|
Revises: 551c4e6d4a8b
|
||||||
|
Create Date: 2019-07-22 19:54:23.039909
|
||||||
|
|
||||||
|
"""
|
||||||
|
import sqlalchemy_utils
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision = 'c6e7fc37ad42'
|
||||||
|
down_revision = '551c4e6d4a8b'
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.add_column('client_user', sa.Column('default_avatar', sa.Boolean(), server_default='0', nullable=False))
|
||||||
|
op.add_column('client_user', sa.Column('name', sa.String(length=128), server_default=sa.text('NULL'), nullable=True))
|
||||||
|
op.add_column('gen_email', sa.Column('custom', sa.Boolean(), server_default='0', nullable=False))
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_column('gen_email', 'custom')
|
||||||
|
op.drop_column('client_user', 'name')
|
||||||
|
op.drop_column('client_user', 'default_avatar')
|
||||||
|
# ### end Alembic commands ###
|
Loading…
Reference in New Issue