fix: Move order_expiry_time into settings model

app/api/helpers/order.py

@@ -29,7 +29,7 @@ def delete_related_attendees_for_order(order):
             db.session.rollback()
 
 
-def set_expiry_for_order(order, override=False):
+def set_expiry_for_order(order,setting, override=False):
     """
     Expire the order after the time slot(10 minutes) if the order is initializing.
     Also expires the order if we want to expire an order regardless of the state and time.
@@ -39,7 +39,7 @@ def set_expiry_for_order(order, override=False):
     """
     if order and not order.paid_via and (override or (order.status == 'initializing' and (
                 order.created_at +
-                timedelta(minutes=order.event.order_expiry_time)) < datetime.now(timezone.utc))):
+                timedelta(minutes=setting.order_expiry_time)) < datetime.now(timezone.utc))):
             order.status = 'expired'
             delete_related_attendees_for_order(order)
             save_to_db(order)

app/api/schema/events.py

@@ -125,7 +125,6 @@ def validate_timezone(self, data, original_data):
     ical_url = fields.Url(dump_only=True)
     xcal_url = fields.Url(dump_only=True)
     average_rating = fields.Float(dump_only=True)
-    order_expiry_time = fields.Integer(allow_none=True, default=10, validate=lambda n: 1 <= n <= 60)
     refund_policy = fields.String(dump_only=True,
                                   default='All sales are final. No refunds shall be issued in any case.')
     is_stripe_linked = fields.Boolean(dump_only=True, allow_none=True, default=False)

app/api/schema/settings.py

@@ -27,6 +27,9 @@ class Meta:
     # Tagline for the application. (Eg. Event Management and Ticketing, Home)
     tagline = fields.Str(allow_none=True)
 
+    # Order Expiry Time
+    order_expiry_time = fields.Integer(allow_none=True, default=15, validate=lambda n: 1 <= n <= 60)
+
     # Google Analytics
     analytics_key = fields.Str(allow_none=True)
 

app/factories/event.py

@@ -50,6 +50,5 @@ class Meta:
     event_topic_id = None
     event_sub_topic_id = None
     discount_code_id = None
-    order_expiry_time = 10
     refund_policy = 'All sales are final. No refunds shall be issued in any case.'
     is_stripe_linked = False

app/factories/setting.py

@@ -19,6 +19,8 @@ class Meta:
     secret = common.secret_
     # Static domain
     static_domain = common.url_
+    # Order Expiry Time
+    order_expiry_time = 15  #min
 
     #
     #  STORAGE

app/models/event.py

@@ -114,7 +114,6 @@ class Event(SoftDeletionModel):
     xcal_url = db.Column(db.String)
     is_sponsors_enabled = db.Column(db.Boolean, default=False)
     refund_policy = db.Column(db.String, default='All sales are final. No refunds shall be issued in any case.')
-    order_expiry_time = db.Column(db.Integer, default=10)
     is_stripe_linked = db.Column(db.Boolean, default=False)
     discount_code_id = db.Column(db.Integer, db.ForeignKey(
         'discount_codes.id', ondelete='CASCADE'))
@@ -231,7 +230,6 @@ def __init__(self,
                  is_sponsors_enabled=None,
                  stripe_authorization=None,
                  tax=None,
-                 order_expiry_time=None,
                  refund_policy='All sales are final. No refunds shall be issued in any case.',
                  is_stripe_linked=False):
 
@@ -298,7 +296,6 @@ def __init__(self,
         self.is_sponsors_enabled = is_sponsors_enabled
         self.stripe_authorization = stripe_authorization
         self.tax = tax
-        self.order_expiry_time = order_expiry_time
         self.refund_policy = refund_policy
         self.is_stripe_linked = is_stripe_linked
 

app/models/setting.py

@@ -30,6 +30,8 @@ class Setting(db.Model):
     secret = db.Column(db.String)
     # Static domain
     static_domain = db.Column(db.String)
+    # Order Expiry Time
+    order_expiry_time = db.Column(db.Integer, default=15)
 
     #
     #  STORAGE
@@ -150,6 +152,7 @@ class Setting(db.Model):
 
     def __init__(self,
                  app_environment=Environment.PRODUCTION,
+                 order_expiry_time=None,
                  aws_key=None,
                  aws_secret=None,
                  aws_bucket_name=None,
@@ -199,6 +202,7 @@ def __init__(self,
                  alipay_publishable_key=None,
                  alipay_secret_key=None):
         self.app_environment = app_environment
+        self.order_expiry_time = order_expiry_time
         self.aws_key = aws_key
         self.aws_secret = aws_secret
         self.aws_bucket_name = aws_bucket_name

migrations/versions/2c7ff9781032_.py

@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: 2c7ff9781032
+Revises: 43e8c59337ae
+Create Date: 2019-06-21 04:33:59.021835
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+
+
+# revision identifiers, used by Alembic.
+revision = '2c7ff9781032'
+down_revision = '43e8c59337ae'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('events', 'order_expiry_time')
+    op.drop_column('events_version', 'order_expiry_time')
+    op.add_column('settings', sa.Column('order_expiry_time', sa.Integer(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('settings', 'order_expiry_time')
+    op.add_column('events_version', sa.Column('order_expiry_time', sa.INTEGER(), autoincrement=False, nullable=True))
+    op.add_column('events', sa.Column('order_expiry_time', sa.INTEGER(), autoincrement=False, nullable=True))
+    # ### end Alembic commands ###

tests/all/integration/api/helpers/test_order.py

@@ -7,6 +7,7 @@
 from app.factories.attendee import AttendeeFactory
 from app.factories.event import EventFactoryBasic
 from app.factories.order import OrderFactory
+from app.factories.setting import SettingFactory
 from app.models.order import Order
 from app.api.helpers.db import save_to_db
 from tests.all.integration.setup_database import Setup
@@ -23,10 +24,11 @@ def test_should_expire_outdated_order(self):
         with app.test_request_context():
             obj = OrderFactory()
             event = EventFactoryBasic()
+            setting = SettingFactory()
             obj.event = event
             obj.created_at = datetime.now(timezone.utc) - timedelta(
-                minutes=obj.event.order_expiry_time)
-            set_expiry_for_order(obj)
+                minutes=setting.order_expiry_time)
+            set_expiry_for_order(obj, setting)
             self.assertEqual(obj.status, 'expired')
 
     def test_should_not_expire_valid_orders(self):
@@ -35,8 +37,9 @@ def test_should_not_expire_valid_orders(self):
         with app.test_request_context():
             obj = OrderFactory()
             event = EventFactoryBasic()
+            setting = SettingFactory()
             obj.event = event
-            set_expiry_for_order(obj)
+            set_expiry_for_order(obj, setting)
             self.assertEqual(obj.status, 'initializing')
 
     def test_should_delete_related_attendees(self):