pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add lots of NOT NULL constraints

Browse Source
This commit is contained in:
richard-dds 2018-09-21 13:54:34 -04:00
parent 311fb34ac9
commit de338f675f
9 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
alembic/versions/359caaf8c5f1_initial.py
View File

@ -25,8 +25,8 @@ def upgrade():
sa.Column('time_created', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('time_created', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False), sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False),
sa.Column('filename', sa.String(), nullable=True), sa.Column('filename', sa.String(), nullable=False),
sa.Column('object_name', sa.String(), nullable=True), sa.Column('object_name', sa.String(), nullable=False),
sa.PrimaryKeyConstraint('id'), sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('object_name') sa.UniqueConstraint('object_name')
) )
@ -39,9 +39,9 @@ def upgrade():
sa.Column('time_created', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('time_created', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False), sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False),
sa.Column('name', sa.String(), nullable=True), sa.Column('name', sa.String(), nullable=False),
sa.Column('description', sa.String(), nullable=True), sa.Column('description', sa.String(), nullable=False),
sa.Column('permissions', postgresql.ARRAY(sa.String()), server_default='{}', nullable=True), sa.Column('permissions', postgresql.ARRAY(sa.String()), server_default='{}', nullable=False),
sa.PrimaryKeyConstraint('id') sa.PrimaryKeyConstraint('id')
) )
op.create_index(op.f('ix_roles_name'), 'roles', ['name'], unique=True) op.create_index(op.f('ix_roles_name'), 'roles', ['name'], unique=True)
@ -73,7 +73,7 @@ def upgrade():
sa.Column('username', sa.String(), nullable=True), sa.Column('username', sa.String(), nullable=True),
sa.Column('atat_role_id', postgresql.UUID(as_uuid=True), nullable=True), sa.Column('atat_role_id', postgresql.UUID(as_uuid=True), nullable=True),
sa.Column('email', sa.String(), nullable=True), sa.Column('email', sa.String(), nullable=True),
sa.Column('dod_id', sa.String(), nullable=True), sa.Column('dod_id', sa.String(), nullable=False),
sa.Column('first_name', sa.String(), nullable=True), sa.Column('first_name', sa.String(), nullable=True),
sa.Column('last_name', sa.String(), nullable=True), sa.Column('last_name', sa.String(), nullable=True),
sa.ForeignKeyConstraint(['atat_role_id'], ['roles.id'], ), sa.ForeignKeyConstraint(['atat_role_id'], ['roles.id'], ),
@ -110,9 +110,9 @@ def upgrade():
sa.Column('time_created', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('time_created', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False), sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False),
sa.Column('text', sa.String(), nullable=True), sa.Column('text', sa.String(), nullable=False),
sa.Column('user_id', postgresql.UUID(as_uuid=True), nullable=False), sa.Column('user_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('request_id', postgresql.UUID(as_uuid=True), nullable=True), sa.Column('request_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.ForeignKeyConstraint(['request_id'], ['requests.id'], ondelete='CASCADE'), sa.ForeignKeyConstraint(['request_id'], ['requests.id'], ondelete='CASCADE'),
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ), sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
sa.PrimaryKeyConstraint('id') sa.PrimaryKeyConstraint('id')
@ -195,7 +195,7 @@ def upgrade():
sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False), sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False),
sa.Column('new_status', sa.Enum('STARTED', 'SUBMITTED', 'PENDING_FINANCIAL_VERIFICATION', 'PENDING_CCPO_ACCEPTANCE', 'PENDING_CCPO_APPROVAL', 'CHANGES_REQUESTED', 'CHANGES_REQUESTED_TO_FINVER', 'APPROVED', 'EXPIRED', 'DELETED', name='requeststatus', native_enum=False), nullable=True), sa.Column('new_status', sa.Enum('STARTED', 'SUBMITTED', 'PENDING_FINANCIAL_VERIFICATION', 'PENDING_CCPO_ACCEPTANCE', 'PENDING_CCPO_APPROVAL', 'CHANGES_REQUESTED', 'CHANGES_REQUESTED_TO_FINVER', 'APPROVED', 'EXPIRED', 'DELETED', name='requeststatus', native_enum=False), nullable=True),
sa.Column('time_created', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True), sa.Column('time_created', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
sa.Column('request_id', postgresql.UUID(as_uuid=True), nullable=True), sa.Column('request_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('sequence', sa.BigInteger(), nullable=False), sa.Column('sequence', sa.BigInteger(), nullable=False),
sa.Column('request_revision_id', postgresql.UUID(as_uuid=True), nullable=False), sa.Column('request_revision_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('request_review_id', postgresql.UUID(as_uuid=True), nullable=True), sa.Column('request_review_id', postgresql.UUID(as_uuid=True), nullable=True),
@ -208,9 +208,9 @@ def upgrade():
sa.Column('time_created', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('time_created', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False), sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False),
sa.Column('workspace_id', postgresql.UUID(as_uuid=True), nullable=True), sa.Column('workspace_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('role_id', postgresql.UUID(as_uuid=True), nullable=True), sa.Column('role_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('user_id', postgresql.UUID(as_uuid=True), nullable=True), sa.Column('user_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.ForeignKeyConstraint(['role_id'], ['roles.id'], ), sa.ForeignKeyConstraint(['role_id'], ['roles.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ), sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
sa.ForeignKeyConstraint(['workspace_id'], ['workspaces.id'], ), sa.ForeignKeyConstraint(['workspace_id'], ['workspaces.id'], ),
@ -224,7 +224,7 @@ def upgrade():
sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False), sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False),
sa.Column('name', sa.String(), nullable=False), sa.Column('name', sa.String(), nullable=False),
sa.Column('project_id', postgresql.UUID(as_uuid=True), nullable=True), sa.Column('project_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.ForeignKeyConstraint(['project_id'], ['projects.id'], ), sa.ForeignKeyConstraint(['project_id'], ['projects.id'], ),
sa.PrimaryKeyConstraint('id') sa.PrimaryKeyConstraint('id')
) )
@ -232,9 +232,9 @@ def upgrade():
sa.Column('time_created', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('time_created', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False), sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False),
sa.Column('environment_id', postgresql.UUID(as_uuid=True), nullable=True), sa.Column('environment_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('role', sa.String(), nullable=True), sa.Column('role', sa.String(), nullable=True),
sa.Column('user_id', postgresql.UUID(as_uuid=True), nullable=True), sa.Column('user_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.ForeignKeyConstraint(['environment_id'], ['environments.id'], ), sa.ForeignKeyConstraint(['environment_id'], ['environments.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ), sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
sa.PrimaryKeyConstraint('id') sa.PrimaryKeyConstraint('id')

4
atst/models/attachment.py
View File

@ -14,8 +14,8 @@ class Attachment(Base, mixins.TimestampsMixin):
__tablename__ = "attachments" __tablename__ = "attachments"
id = types.Id() id = types.Id()
filename = Column(String) filename = Column(String, nullable=False)
object_name = Column(String, unique=True) object_name = Column(String, unique=True, nullable=False)
@classmethod @classmethod
def attach(cls, fyle): def attach(cls, fyle):

2
atst/models/environment.py
View File

@ -12,7 +12,7 @@ class Environment(Base, TimestampsMixin):
id = Id() id = Id()
name = Column(String, nullable=False) name = Column(String, nullable=False)
project_id = Column(ForeignKey("projects.id")) project_id = Column(ForeignKey("projects.id"), nullable=False)
project = relationship("Project") project = relationship("Project")
@property @property

6
atst/models/environment_role.py
View File

@ -14,12 +14,14 @@ class EnvironmentRole(Base, mixins.TimestampsMixin):
__tablename__ = "environment_roles" __tablename__ = "environment_roles"
id = types.Id() id = types.Id()
environment_id = Column(UUID(as_uuid=True), ForeignKey("environments.id")) environment_id = Column(
UUID(as_uuid=True), ForeignKey("environments.id"), nullable=False
)
environment = relationship("Environment", backref="roles") environment = relationship("Environment", backref="roles")
role = Column(String()) role = Column(String())
user_id = Column(UUID(as_uuid=True), ForeignKey("users.id")) user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
user = relationship("User", backref="environment_roles") user = relationship("User", backref="environment_roles")

4
atst/models/request_internal_comment.py
View File

@ -8,9 +8,9 @@ class RequestInternalComment(Base, mixins.TimestampsMixin):
__tablename__ = "request_internal_comments" __tablename__ = "request_internal_comments"
id = types.Id() id = types.Id()
text = Column(String()) text = Column(String(), nullable=False)
user_id = Column(ForeignKey("users.id"), nullable=False) user_id = Column(ForeignKey("users.id"), nullable=False)
user = relationship("User") user = relationship("User")
request_id = Column(ForeignKey("requests.id", ondelete="CASCADE")) request_id = Column(ForeignKey("requests.id", ondelete="CASCADE"), nullable=False)

4
atst/models/request_status_event.py
View File

@ -29,7 +29,9 @@ class RequestStatusEvent(Base, mixins.TimestampsMixin):
new_status = Column(SQLAEnum(RequestStatus, native_enum=False)) new_status = Column(SQLAEnum(RequestStatus, native_enum=False))
time_created = Column(DateTime(timezone=True), server_default=func.now()) time_created = Column(DateTime(timezone=True), server_default=func.now())
request_id = Column( request_id = Column(
UUID(as_uuid=True), ForeignKey("requests.id", ondelete="CASCADE") UUID(as_uuid=True),
ForeignKey("requests.id", ondelete="CASCADE"),
nullable=False,
) )
sequence = Column( sequence = Column(
BigInteger, Sequence("request_status_events_sequence_seq"), nullable=False BigInteger, Sequence("request_status_events_sequence_seq"), nullable=False

6
atst/models/role.py
View File

@ -9,9 +9,9 @@ class Role(Base, mixins.TimestampsMixin):
__tablename__ = "roles" __tablename__ = "roles"
id = types.Id() id = types.Id()
name = Column(String, index=True, unique=True) name = Column(String, index=True, unique=True, nullable=False)
description = Column(String) description = Column(String, nullable=False)
permissions = Column(ARRAY(String), index=True, server_default="{}") permissions = Column(ARRAY(String), index=True, server_default="{}", nullable=False)
def add_permission(self, permission): def add_permission(self, permission):
perms_set = set(self.permissions) perms_set = set(self.permissions)

2
atst/models/user.py
View File

@ -17,7 +17,7 @@ class User(Base, mixins.TimestampsMixin):
workspace_roles = relationship("WorkspaceRole", backref="user") workspace_roles = relationship("WorkspaceRole", backref="user")
email = Column(String, unique=True) email = Column(String, unique=True)
dod_id = Column(String, unique=True) dod_id = Column(String, unique=True, nullable=False)
first_name = Column(String) first_name = Column(String)
last_name = Column(String) last_name = Column(String)

6
atst/models/workspace_role.py
View File

@ -10,13 +10,13 @@ class WorkspaceRole(Base, mixins.TimestampsMixin):
__tablename__ = "workspace_roles" __tablename__ = "workspace_roles"
id = Id() id = Id()
workspace_id = Column(UUID(as_uuid=True), ForeignKey("workspaces.id"), index=True) workspace_id = Column(UUID(as_uuid=True), ForeignKey("workspaces.id"), index=True, nullable=False)
workspace = relationship("Workspace", back_populates="roles") workspace = relationship("Workspace", back_populates="roles")
role_id = Column(UUID(as_uuid=True), ForeignKey("roles.id")) role_id = Column(UUID(as_uuid=True), ForeignKey("roles.id"), nullable=False)
role = relationship("Role") role = relationship("Role")
user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), index=True) user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), index=True, nullable=False)
Index( Index(