Merge branch 'audience'

Author: MoralCode

Pipfile

@@ -23,7 +23,7 @@ apispec-webframeworks = "~=0.5.2"
 mysql-connector-python = "8.0.24"
 python-jose = "*"
 python-dotenv = "*"
-flask-migrate = "*"
+flask-migrate = "~=3.0.0"
 requests = "*"
 sentry-sdk = "*"
 psycopg2-binary = "*"

Pipfile.lock

@@ -355,7 +355,10 @@ def list_bellschedules(school_id):
 
     schedules = BellScheduleDB.query.filter_by(school_id=school_id, soft_deleted=False)
 
-    return respond(BellScheduleSchema(exclude=('school_id',)).dump(schedules, many=True))
+    excluded_fields = exclude_unless_logged_in(['internal_description'])
+    excluded_fields.extend(('school_id',))
+
+    return respond(BellScheduleSchema(exclude=excluded_fields).dump(schedules, many=True))
 
 @blueprint.route("/bellschedule/<string:bell_schedule_id>", strict_slashes=False, methods=['GET'])
 @check_headers
@@ -397,7 +400,10 @@ def get_bellschedule(bell_schedule_id):
         if schedule.last_modified == since:
             return respond(code=304) #Not Modified
 
-    return respond(BellScheduleSchema(exclude=('soft_deleted',)).dump(schedule))
+    excluded_fields = exclude_unless_logged_in(['internal_description'])
+    excluded_fields.extend(('soft_deleted',))
+
+    return respond(BellScheduleSchema(exclude=excluded_fields).dump(schedule))
 
 
 @blueprint.route("/bellschedule", strict_slashes=False, methods=['POST'])

blueprints/v0.py

@@ -44,6 +44,8 @@ class BellSchedule(db.Model):
 	full_name = db.Column('bell_schedule_name', db.VARCHAR(length=75))
 	meeting_times = db.relationship("BellScheduleMeetingTime", cascade="save-update, merge,delete, delete-orphan")
 	display_name = db.Column('bell_schedule_display_name', db.VARCHAR(length=75))
+	audience = db.Column('audience', db.VARCHAR(length=75), nullable=False, server_default="everyone")
+	internal_description = db.Column('internal_description', db.VARCHAR(length=250), nullable=False, server_default="")
 	creation_date = db.Column('creation_date', db.DateTime,
                            default=datetime.utcnow())
 	last_modified = db.Column('last_modified', db.DateTime,

common/db_schema.py

@@ -222,6 +222,13 @@ def get_api_user_id():
         return ""
 
 
+def exclude_unless_logged_in(fields: list):
+    is_admin = check_for_roles(["admin", "school admin"])
+    if is_admin:
+        return []
+    else:
+        return fields
+
 def get_token_auth_header():
     return get_valid_auth_header_of_type(AuthType.TOKEN)
 

common/helpers.py

@@ -0,0 +1,30 @@
+"""add audience and internal description to bell schedule
+
+Revision ID: 9c3dd7f95cdc
+Revises: 2399c50496f7
+Create Date: 2025-09-03 18:05:04.456307
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '9c3dd7f95cdc'
+down_revision = '2399c50496f7'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('bellschedules', sa.Column('audience', sa.VARCHAR(length=75), server_default='everyone', nullable=False))
+    op.add_column('bellschedules', sa.Column('internal_description', sa.VARCHAR(length=250), server_default='', nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('bellschedules', 'internal_description')
+    op.drop_column('bellschedules', 'audience')
+    # ### end Alembic commands ###