Merge branch 'development' into free-reg

Author: progmatic-99

app/api/groups.py

@@ -137,11 +137,6 @@ def before_get_object(self, view_kwargs):
             )
             view_kwargs['id'] = user_follow_group.group_id
 
-    def after_get_object(self, group, view_kwargs):
-        user = User.query.filter_by(id=current_user.id).one()
-        if not is_logged_in() or not is_owner_or_organizer(group, user):
-            raise ObjectNotFound({'parameter': '{id}'}, "Group: not found")
-
     def before_update_object(self, group, data, view_kwargs):
         """
         before update object method of group details
@@ -173,7 +168,6 @@ def before_update_object(self, group, data, view_kwargs):
         'methods': {
             'before_get_object': before_get_object,
             'before_update_object': before_update_object,
-            'after_get_object': after_get_object,
         },
     }
 

app/api/helpers/calendar/ical.py

@@ -72,7 +72,7 @@ def to_ical(event, include_sessions=False, my_schedule=False, user_id=None):
                 else ""
             )
             session_link_heading = (
-                "Join using link: " + session_video_url + "<br/>"
+                " Join using link: " + session_video_url + "<br/>"
                 if session_video_url
                 else ""
             )
@@ -82,7 +82,7 @@ def to_ical(event, include_sessions=False, my_schedule=False, user_id=None):
                 + session.microlocation.name
                 + "<br/>"
                 + session_link_heading
-                + "<br/>"
+                + " <br/> "
                 + session.short_abstract
             )
             session_component = Event()

app/api/schema/events.py

@@ -1,3 +1,4 @@
+from email.policy import default
 import pytz
 from flask_rest_jsonapi.exceptions import ObjectNotFound
 from marshmallow import validate, validates_schema
@@ -58,6 +59,8 @@ def validate_timezone(self, data, original_data):
     location_name = fields.Str(allow_none=True)
     searchable_location_name = fields.Str(allow_none=True)
     public_stream_link = fields.Str(allow_none=True)
+    stream_loop = fields.Boolean(default=False)
+    stream_autoplay = fields.Boolean(default=False)
     description = fields.Str(allow_none=True)
     after_order_message = fields.Str(allow_none=True)
     original_image_url = fields.Url(allow_none=True)

app/models/event.py

@@ -1,3 +1,4 @@
+from email.policy import default
 import re
 from argparse import Namespace
 from datetime import datetime
@@ -63,6 +64,8 @@ class Privacy:
     location_name = db.Column(db.String)
     searchable_location_name = db.Column(db.String)
     public_stream_link = db.Column(db.String)
+    stream_loop = db.Column(db.Boolean, default = False)
+    stream_autoplay = db.Column(db.Boolean, default=False)
     is_featured = db.Column(db.Boolean, default=False, nullable=False)
     is_promoted = db.Column(db.Boolean, default=False, nullable=False)
     is_demoted = db.Column(db.Boolean, default=False, nullable=False)

migrations/versions/rev-2022-04-04-17:35:59-a45167cdc102_.py

@@ -0,0 +1,34 @@
+"""empty message
+
+Revision ID: a45167cdc102
+Revises: 0dba0c2e0ba0
+Create Date: 2022-04-04 17:35:59.622520
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+
+
+# revision identifiers, used by Alembic.
+revision = 'a45167cdc102'
+down_revision = '0dba0c2e0ba0'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('events', sa.Column('stream_loop', sa.Boolean(), nullable=True))
+    op.add_column('events', sa.Column('stream_autoplay', sa.Boolean(), nullable=True))
+    op.add_column('events_version', sa.Column('stream_loop', sa.Boolean(), autoincrement=False, nullable=True))
+    op.add_column('events_version', sa.Column('stream_autoplay', sa.Boolean(), autoincrement=False, nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('events_version', 'stream_autoplay')
+    op.drop_column('events_version', 'stream_loop')
+    op.drop_column('events', 'stream_autoplay')
+    op.drop_column('events', 'stream_loop')
+    # ### end Alembic commands ###

poetry.lock

@@ -77,7 +77,7 @@ geoip2 = "4.5.0"
 SQLAlchemy-Continuum = "1.3.12"
 bleach = "4.1.0"
 stripe = "2.70.0"
-xhtml2pdf = "0.2.7"
+xhtml2pdf = "0.2.6"
 flask-caching = "1.10.1"
 forex-python = "1.8"
 pycryptodome = "3.14.1"
@@ -122,7 +122,7 @@ xmltodict = "0.12.0"
 graphene-sqlalchemy = "2.3.0"
 flask-graphql = "2.0.1"
 graphene-sqlalchemy-filter = "1.13.0"
-fastapi = "^0.75.0"
+fastapi = "^0.75.1"
 uvicorn = {extras = ["standard"], version = "^0.17.6"}
 broadcaster = {extras = ["redis"], version = "^0.2.0"}
 sqlalchemy-citext = "^1.8.0"