fix: Move order_expiry_time into settings model (#6083)

Author: kushthedude

app/api/helpers/order.py

@@ -3,6 +3,7 @@
 
 from flask import render_template
 
+from app.settings import get_settings
 from app.api.helpers import ticketing
 from app.api.helpers.db import save_to_db, safe_query_without_soft_deleted_entries, get_count
 from app.api.helpers.exceptions import UnprocessableEntity, ConflictException
@@ -37,9 +38,10 @@ def set_expiry_for_order(order, override=False):
     :param override: flag to force expiry.
     :return:
     """
+    order_expiry_time = get_settings()['order_expiry_time']
     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=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=False, 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 in Minutes
+    order_expiry_time = db.Column(db.Integer, default=15, nullable=False)
 
     #
     #  STORAGE
@@ -220,7 +222,8 @@ def __init__(self,
                  admin_billing_address=None,
                  admin_billing_city=None,
                  admin_billing_zip=None,
-                 admin_billing_additional_info=None):
+                 admin_billing_additional_info=None,
+                 order_expiry_time=None):
         self.app_environment = app_environment
         self.aws_key = aws_key
         self.aws_secret = aws_secret
@@ -302,6 +305,9 @@ def __init__(self,
         self.admin_billing_zip = admin_billing_zip
         self.admin_billing_additional_info = admin_billing_additional_info
 
+        # Order Expiry Time in Minutes
+        self.order_expiry_time = order_expiry_time
+
     @hybrid_property
     def is_paypal_activated(self):
         if self.paypal_mode == 'sandbox' and self.paypal_sandbox_client and self.paypal_sandbox_secret: