From 8eec7ba71df90e696bded92470e7341065054d77 Mon Sep 17 00:00:00 2001 From: Midhun Jisha Manoj Date: Thu, 19 Dec 2024 16:55:14 +0000 Subject: [PATCH] Adding new columns to provided service table --- api/app/admin/service.py | 10 ++++-- api/app/models/theq/service.py | 3 ++ api/app/schemas/theq/service_schema.py | 3 ++ .../versions/50f3691868ed_sbcq_302.py | 33 +++++++++++++++++++ 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 api/migrations/versions/50f3691868ed_sbcq_302.py diff --git a/api/app/admin/service.py b/api/app/admin/service.py index 89cd2a842..2b21f2217 100644 --- a/api/app/admin/service.py +++ b/api/app/admin/service.py @@ -42,7 +42,10 @@ def is_accessible(self): 'online_link', 'online_availability', 'timeslot_duration', - 'is_dlkt' + 'is_dlkt', + 'partner', + 'program', + 'recoverable' ] column_labels = { 'service_desc': 'Description', @@ -85,7 +88,10 @@ def is_accessible(self): 'timeslot_duration', 'is_dlkt', 'email_paragraph', - 'css_colour' + 'css_colour', + 'partner', + 'program', + 'recoverable' ) form_choices = { 'actual_service_ind': [ diff --git a/api/app/models/theq/service.py b/api/app/models/theq/service.py index 759fec83d..b9a1656f8 100644 --- a/api/app/models/theq/service.py +++ b/api/app/models/theq/service.py @@ -48,6 +48,9 @@ class Service(Base): is_dlkt = db.Column(Enum(YesNo)) email_paragraph = db.Column(db.String(2000), nullable=True) css_colour = db.Column(db.String(50), nullable=True) + partner = db.Column(db.String(), nullable=True) + program = db.Column(db.String(), nullable=True) + recoverable = db.Column(db.String(), nullable=True) offices = db.relationship("Office", secondary='office_service') parent = db.relationship("Service", remote_side=[service_id]) diff --git a/api/app/schemas/theq/service_schema.py b/api/app/schemas/theq/service_schema.py index d29c5b8ea..1c45ff800 100644 --- a/api/app/schemas/theq/service_schema.py +++ b/api/app/schemas/theq/service_schema.py @@ -42,3 +42,6 @@ class Meta(BaseSchema.Meta): email_paragraph = fields.Str(dump_only=True) css_colour = fields.Str(dump_only=True) is_dlkt = fields.Boolean() + partner = fields.Str() + program = fields.Str() + recoverable = fields.Str() diff --git a/api/migrations/versions/50f3691868ed_sbcq_302.py b/api/migrations/versions/50f3691868ed_sbcq_302.py new file mode 100644 index 000000000..60f431d55 --- /dev/null +++ b/api/migrations/versions/50f3691868ed_sbcq_302.py @@ -0,0 +1,33 @@ +"""SBCQ-302 + +Revision ID: 50f3691868ed +Revises: 8b6c67545310 +Create Date: 2024-12-18 17:18:48.088463 + +""" +from alembic import op +import sqlalchemy as sa +import sqlalchemy_utc + + +# revision identifiers, used by Alembic. +revision = '50f3691868ed' +down_revision = '8b6c67545310' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('service', sa.Column('partner', sa.String(), nullable=True)) + op.add_column('service', sa.Column('program', sa.String(), nullable=True)) + op.add_column('service', sa.Column('recoverable', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('service', 'recoverable') + op.drop_column('service', 'program') + op.drop_column('service', 'partner') + # ### end Alembic commands ###