From 35470613d3ded23e8d50b852fc684af3be1860fc Mon Sep 17 00:00:00 2001
From: Son Nguyen Kim <nguyenkims@users.noreply.github.com>
Date: Sat, 15 Oct 2022 19:10:39 +0200
Subject: [PATCH] add DailyMetric and Metric as admin page, remove EmailLog
 admin page (#1352)

---
 app/admin_model.py | 12 ++++++++++++
 server.py          |  8 ++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/admin_model.py b/app/admin_model.py
index 3f1881ae..7d91ce01 100644
--- a/app/admin_model.py
+++ b/app/admin_model.py
@@ -579,3 +579,15 @@ class NewsletterUserAdmin(SLModelView):
 
     can_edit = False
     can_create = False
+
+
+class DailyMetricAdmin(SLModelView):
+    column_exclude_list = ["created_at", "updated_at", "id"]
+
+    can_export = True
+
+
+class MetricAdmin(SLModelView):
+    column_exclude_list = ["created_at", "updated_at", "id"]
+
+    can_export = True
diff --git a/server.py b/server.py
index f34e9f12..2300a661 100644
--- a/server.py
+++ b/server.py
@@ -33,7 +33,6 @@ from app import paddle_utils, config, paddle_callback
 from app.admin_model import (
     SLAdminIndexView,
     UserAdmin,
-    EmailLogAdmin,
     AliasAdmin,
     MailboxAdmin,
     ManualSubscriptionAdmin,
@@ -43,6 +42,8 @@ from app.admin_model import (
     ProviderComplaintAdmin,
     NewsletterAdmin,
     NewsletterUserAdmin,
+    DailyMetricAdmin,
+    MetricAdmin,
 )
 from app.api.base import api_bp
 from app.auth.base import auth_bp
@@ -102,6 +103,8 @@ from app.models import (
     ProviderComplaint,
     Newsletter,
     NewsletterUser,
+    DailyMetric,
+    Metric2,
 )
 from app.monitor.base import monitor_bp
 from app.newsletter_utils import send_newsletter_to_user
@@ -752,7 +755,6 @@ def init_admin(app):
     admin.add_view(UserAdmin(User, Session))
     admin.add_view(AliasAdmin(Alias, Session))
     admin.add_view(MailboxAdmin(Mailbox, Session))
-    admin.add_view(EmailLogAdmin(EmailLog, Session))
     admin.add_view(CouponAdmin(Coupon, Session))
     admin.add_view(ManualSubscriptionAdmin(ManualSubscription, Session))
     admin.add_view(CustomDomainAdmin(CustomDomain, Session))
@@ -760,6 +762,8 @@ def init_admin(app):
     admin.add_view(ProviderComplaintAdmin(ProviderComplaint, Session))
     admin.add_view(NewsletterAdmin(Newsletter, Session))
     admin.add_view(NewsletterUserAdmin(NewsletterUser, Session))
+    admin.add_view(DailyMetricAdmin(DailyMetric, Session))
+    admin.add_view(MetricAdmin(Metric2, Session))
 
 
 def register_custom_commands(app):