Merge branch 'development' into custom-placeholder-seed-data

Author: prabhupant

app/api/admin_sales/events.py

@@ -2,6 +2,7 @@
 from marshmallow_jsonapi.flask import Schema
 from flask_rest_jsonapi import ResourceList
 
+from app.api.helpers.utilities import dasherize
 from app.api.bootstrap import api
 from app.models import db
 from app.models.event import Event
@@ -23,6 +24,7 @@ class AdminSalesByEventsSchema(Schema):
     class Meta:
         type_ = 'admin-sales-by-events'
         self_view = 'v1.admin_sales_by_events'
+        inflect = dasherize
 
     id = fields.String()
     name = fields.String()

app/api/admin_sales/locations.py

@@ -2,6 +2,7 @@
 from marshmallow_jsonapi.flask import Schema
 from flask_rest_jsonapi import ResourceList
 from sqlalchemy import func
+from app.api.helpers.utilities import dasherize
 
 from app.api.bootstrap import api
 from app.models import db
@@ -34,6 +35,7 @@ class AdminSalesByLocationSchema(Schema):
     class Meta:
         type_ = 'admin-sales-by-location'
         self_view = 'v1.admin_sales_by_location'
+        inflect = dasherize
 
     id = fields.String()
     location_name = fields.String()
@@ -63,9 +65,12 @@ class AdminSalesByLocationList(ResourceList):
     """
 
     def query(self, _):
-        locations = self.session.query(Event.location_name) \
-                                .group_by(Event.location_name) \
-                                .cte()
+        locations = self.session.query(
+            Event.location_name,
+            Event.location_name.label('id')) \
+                .group_by(Event.location_name) \
+                .filter(Event.location_name.isnot(None)) \
+                .cte()
 
         pending = sales_per_location_by_status('pending')
         completed = sales_per_location_by_status('completed')

app/api/admin_sales/organizer.py

@@ -2,6 +2,7 @@
 from marshmallow_jsonapi.flask import Schema
 from flask_rest_jsonapi import ResourceList
 
+from app.api.helpers.utilities import dasherize
 from app.api.bootstrap import api
 from app.models import db
 from app.models.event import Event
@@ -25,6 +26,7 @@ class AdminSalesByOrganizersSchema(Schema):
     class Meta:
         type_ = 'admin-sales-by-organizers'
         self_view = 'v1.admin_sales_by_organizers'
+        inflect = dasherize
 
     id = fields.String()
     first_name = fields.String()

app/api/admin_sales/utils.py

@@ -11,7 +11,7 @@ def status_summary(orders, status):
     """
     return {
         'sales_total': sum([o.amount for o in orders if o.status == status]),
-        'ticket_count': sum([o.tickets_count for o in orders])
+        'ticket_count': sum([o.tickets_count for o in orders if o.status == status])
     }
 
 

tests/hook_main.py

@@ -4387,3 +4387,83 @@ def favourite_event_delete(transaction):
         user_fav_event = UserFavouriteEventFactory()
         db.session.add(user_fav_event)
         db.session.commit()
+
+
+# ------------------------- Admin Statistics -------------------------
+
+@hooks.before("Admin Statistics > Event Statistics Details > Show Event Statistics")
+def event_statistics_get(transaction):
+    """
+    GET /admin/statistics/events
+    :param transaction:
+    :return:
+    """
+    with stash['app'].app_context():
+        event = EventFactoryBasic()
+        db.session.add(event)
+        db.session.commit()
+
+
+@hooks.before("Admin Statistics > Event Types Statistics Details > Show Event Types Statistics")
+def event_type_statistics_get(transaction):
+    """
+    GET /admin/statistics/event-types
+    :param transaction:
+    :return:
+    """
+    with stash['app'].app_context():
+        event_type = EventTypeFactory()
+        db.session.add(event_type)
+        db.session.commit()
+
+
+@hooks.before("Admin Statistics > Event Topics Statistics Details > Show Event Topics Statistics")
+def event_topic_statistics_get(transaction):
+    """
+    GET /admin/statistics/event-topics
+    :param transaction:
+    :return:
+    """
+    with stash['app'].app_context():
+        event_topic = EventTopicFactory()
+        db.session.add(event_topic)
+        db.session.commit()
+
+
+@hooks.before("Admin Statistics > User Statistics Details > Show User Statistics")
+def user_statistics_get(transaction):
+    """
+    GET /admin/statistics/users
+    :param transaction:
+    :return:
+    """
+    with stash['app'].app_context():
+        user = UserFactory()
+        db.session.add(user)
+        db.session.commit()
+
+
+@hooks.before("Admin Statistics > Session Statistics Details > Show Session Statistics")
+def session_statistics_get(transaction):
+    """
+    GET /admin/statistics/sessions
+    :param transaction:
+    :return:
+    """
+    with stash['app'].app_context():
+        session = SessionFactory()
+        db.session.add(session)
+        db.session.commit()
+
+
+@hooks.before("Admin Statistics > Mail Statistics Details > Show Mail Statistics")
+def mail_statistics_get(transaction):
+    """
+    GET /admin/statistics/mails
+    :param transaction:
+    :return:
+    """
+    with stash['app'].app_context():
+        mail = MailFactory()
+        db.session.add(mail)
+        db.session.commit()