diff --git a/alembic/versions/da9d1c911a52_remove_status_column_from_task_order.py b/alembic/versions/da9d1c911a52_remove_status_column_from_task_order.py new file mode 100644 index 00000000..2847546c --- /dev/null +++ b/alembic/versions/da9d1c911a52_remove_status_column_from_task_order.py @@ -0,0 +1,28 @@ +"""Remove status column from task order + +Revision ID: da9d1c911a52 +Revises: a6837632686c +Create Date: 2019-01-14 11:21:51.729134 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'da9d1c911a52' +down_revision = 'a6837632686c' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('task_orders', 'status') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task_orders', sa.Column('status', sa.VARCHAR(length=7), autoincrement=False, nullable=True)) + # ### end Alembic commands ### diff --git a/atst/models/task_order.py b/atst/models/task_order.py index 86e67443..502fd8f8 100644 --- a/atst/models/task_order.py +++ b/atst/models/task_order.py @@ -1,14 +1,6 @@ from enum import Enum -from sqlalchemy import ( - Column, - Enum as SQLAEnum, - Numeric, - String, - ForeignKey, - Date, - Integer, -) +from sqlalchemy import Column, Numeric, String, ForeignKey, Date, Integer from sqlalchemy.types import ARRAY from sqlalchemy.orm import relationship @@ -41,8 +33,6 @@ class TaskOrder(Base, mixins.TimestampsMixin): so_id = Column(ForeignKey("users.id")) security_officer = relationship("User", foreign_keys="TaskOrder.so_id") - status = Column(SQLAEnum(Status, native_enum=False)) - scope = Column(String) # Cloud Project Scope defense_component = Column(String) # Department of Defense Component app_migration = Column(String) # App Migration @@ -79,10 +69,9 @@ class TaskOrder(Base, mixins.TimestampsMixin): number = Column(String, unique=True) # Task Order Number loa = Column(ARRAY(String)) # Line of Accounting (LOA) - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - if "status" not in kwargs: - self.status = Status.PENDING + @property + def status(self): + return Status.PENDING @property def budget(self):