feat: apply sorting by amount by sales in admin.sales page

app/api/admin_sales/events.py

@@ -2,8 +2,9 @@
 from marshmallow_jsonapi import fields
 from marshmallow_jsonapi.flask import Schema
 
-from app.api.admin_sales.utils import event_type, summary
+from app.api.admin_sales.utils import summary
 from app.api.bootstrap import api
+from app.api.helpers.db import save_to_db
 from app.api.helpers.utilities import dasherize
 from app.models import db
 from app.models.event import Event
@@ -33,27 +34,32 @@ class Meta:
     ends_at = fields.DateTime()
     payment_currency = fields.String()
     payment_country = fields.String()
-    type = fields.Method('e_type')
+    completed_order_sales = fields.Integer(dump_only=True)
+    placed_order_sales = fields.Integer(dump_only=True)
+    pending_order_sales = fields.Integer(dump_only=True)
+    completed_order_tickets = fields.Integer(dump_only=True)
+    placed_order_tickets = fields.Integer(dump_only=True)
+    pending_order_tickets = fields.Integer(dump_only=True)
+    type = fields.Method('event_type')
     owner = fields.Method('event_owner')
     owner_id = fields.Method('event_owner_id')
-    sales = fields.Method('calc_sales')
-
-    @staticmethod
-    def calc_sales(obj):
-        """
-        Returns sales (dictionary with total sales and ticket count) for
-        placed, completed and pending orders
-        """
-        return summary(obj)
 
     def event_owner(self, obj):
         return str(obj.owner.email)
 
     def event_owner_id(self, obj):
         return obj.owner.id
 
-    def e_type(self, obj):
-        return event_type(obj)
+    def event_type(self, obj):
+        t = 'To be announced'
+        if obj.online:
+            if obj.location_name:
+                t = 'Hybrid'
+            else:
+                t = 'Online'
+        elif obj.location_name:
+            t = 'Venue'
+        return str(t)
 
 
 class AdminSalesByEventsList(ResourceList):
@@ -65,7 +71,23 @@ class AdminSalesByEventsList(ResourceList):
     def query(self, _):
         return Event.query
 
+    def before_get(self, args, kwargs):
+        events = Event.query.all()
+        for event in events:
+            sales = summary(event)
+            event.completed_order_sales = sales['completed']['sales_total']
+            event.placed_order_sales = sales['placed']['sales_total']
+            event.pending_order_sales = sales['pending']['sales_total']
+            event.completed_order_tickets = sales['completed']['ticket_count']
+            event.placed_order_tickets = sales['placed']['ticket_count']
+            event.pending_order_tickets = sales['pending']['ticket_count']
+            save_to_db(event)
+
     methods = ['GET']
     decorators = (api.has_permission('is_admin'),)
     schema = AdminSalesByEventsSchema
-    data_layer = {'model': Event, 'session': db.session, 'methods': {'query': query}}
+    data_layer = {
+        'model': Event,
+        'session': db.session,
+        'methods': {'query': query, 'before_get': before_get},
+    }

app/api/schema/events.py

@@ -389,6 +389,12 @@ class Meta:
         self_view_many = 'v1.event_list'
         inflect = dasherize
 
+    completed_order_sales = fields.Integer(dump_only=True)
+    placed_order_sales = fields.Integer(dump_only=True)
+    pending_order_sales = fields.Integer(dump_only=True)
+    completed_order_tickets = fields.Integer(dump_only=True)
+    placed_order_tickets = fields.Integer(dump_only=True)
+    pending_order_tickets = fields.Integer(dump_only=True)
     event_invoices = Relationship(
         attribute='invoices',
         self_view='v1.event_event_invoice',

app/models/event.py

@@ -158,6 +158,12 @@ class Privacy:
     is_sponsors_enabled = db.Column(db.Boolean, default=False)
     refund_policy = db.Column(db.String)
     is_stripe_linked = db.Column(db.Boolean, default=False)
+    completed_order_sales = db.Column(db.Integer)
+    placed_order_sales = db.Column(db.Integer)
+    pending_order_sales = db.Column(db.Integer)
+    completed_order_tickets = db.Column(db.Integer)
+    placed_order_tickets = db.Column(db.Integer)
+    pending_order_tickets = db.Column(db.Integer)
     discount_code_id = db.Column(
         db.Integer, db.ForeignKey('discount_codes.id', ondelete='CASCADE')
     )

migrations/versions/rev-2021-08-09-10:27:38-528e99098827_.py

@@ -0,0 +1,50 @@
+"""empty message
+
+Revision ID: 528e99098827
+Revises: 78f3c24b41cf
+Create Date: 2021-08-09 10:27:38.676818
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+
+
+# revision identifiers, used by Alembic.
+revision = '528e99098827'
+down_revision = '78f3c24b41cf'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('events', sa.Column('completed_order_sales', sa.Integer(), nullable=True))
+    op.add_column('events', sa.Column('placed_order_sales', sa.Integer(), nullable=True))
+    op.add_column('events', sa.Column('pending_order_sales', sa.Integer(), nullable=True))
+    op.add_column('events', sa.Column('completed_order_tickets', sa.Integer(), nullable=True))
+    op.add_column('events', sa.Column('placed_order_tickets', sa.Integer(), nullable=True))
+    op.add_column('events', sa.Column('pending_order_tickets', sa.Integer(), nullable=True))
+    op.add_column('events_version', sa.Column('completed_order_sales', sa.Integer(), autoincrement=False, nullable=True))
+    op.add_column('events_version', sa.Column('placed_order_sales', sa.Integer(), autoincrement=False, nullable=True))
+    op.add_column('events_version', sa.Column('pending_order_sales', sa.Integer(), autoincrement=False, nullable=True))
+    op.add_column('events_version', sa.Column('completed_order_tickets', sa.Integer(), autoincrement=False, nullable=True))
+    op.add_column('events_version', sa.Column('placed_order_tickets', sa.Integer(), autoincrement=False, nullable=True))
+    op.add_column('events_version', sa.Column('pending_order_tickets', sa.Integer(), autoincrement=False, nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('events_version', 'pending_order_tickets')
+    op.drop_column('events_version', 'placed_order_tickets')
+    op.drop_column('events_version', 'completed_order_tickets')
+    op.drop_column('events_version', 'pending_order_sales')
+    op.drop_column('events_version', 'placed_order_sales')
+    op.drop_column('events_version', 'completed_order_sales')
+    op.drop_column('events', 'pending_order_tickets')
+    op.drop_column('events', 'placed_order_tickets')
+    op.drop_column('events', 'completed_order_tickets')
+    op.drop_column('events', 'pending_order_sales')
+    op.drop_column('events', 'placed_order_sales')
+    op.drop_column('events', 'completed_order_sales')
+    # ### end Alembic commands ###