From bee7f57d6cb58f937959c4838a71c2b34620e29c Mon Sep 17 00:00:00 2001
From: Dan Mihaila <danmihaila@gmail.com>
Date: Tue, 3 Dec 2024 12:53:33 +0200
Subject: [PATCH 1/2] HDX-10375 track org stats download

---
 .../ckanext/hdx_org_group/helpers/analytics.py | 18 ++++++++++++++++++
 .../hdx_org_group/views/organization.py        |  7 ++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ckanext-hdx_org_group/ckanext/hdx_org_group/helpers/analytics.py b/ckanext-hdx_org_group/ckanext/hdx_org_group/helpers/analytics.py
index db656d02fb..c3862f3ce3 100644
--- a/ckanext-hdx_org_group/ckanext/hdx_org_group/helpers/analytics.py
+++ b/ckanext-hdx_org_group/ckanext/hdx_org_group/helpers/analytics.py
@@ -85,3 +85,21 @@ def __init__(self, org_name, org_type):
                 'cd2': org_type
             }
         }
+
+class OrganizationStatsDownloadAnalyticsSender(AbstractAnalyticsSender):
+
+    def __init__(self, org_name, org_id):
+        super(OrganizationStatsDownloadAnalyticsSender, self).__init__()
+        event_name = 'org stats download'
+        self.analytics_dict = {
+            'event_name': event_name,
+            'mixpanel_meta': {
+                'org name': org_name,
+                'org id': org_id
+            },
+            'ga_meta': {
+                'ec': 'organization',  # event category
+                'ea': event_name,  # event action
+                'el': org_name,  # event label
+            }
+        }
diff --git a/ckanext-hdx_org_group/ckanext/hdx_org_group/views/organization.py b/ckanext-hdx_org_group/ckanext/hdx_org_group/views/organization.py
index e45f6d3ad7..158c5860d9 100644
--- a/ckanext-hdx_org_group/ckanext/hdx_org_group/views/organization.py
+++ b/ckanext-hdx_org_group/ckanext/hdx_org_group/views/organization.py
@@ -2,14 +2,16 @@
 
 from flask import Blueprint
 from six.moves.urllib.parse import urlencode
-from ckan.types import Context
+
 import ckan.lib.plugins as lib_plugins
 import ckan.model as model
 import ckan.plugins.toolkit as tk
+import ckanext.hdx_org_group.helpers.analytics as org_analytics
 import ckanext.hdx_org_group.helpers.org_meta_dao as org_meta_dao
 import ckanext.hdx_org_group.helpers.organization_helper as helper
 import ckanext.hdx_org_group.helpers.static_lists as static_lists
 import ckanext.hdx_theme.helpers.helpers as hdx_helpers
+from ckan.types import Context
 from ckan.views.group import CreateGroupView, EditGroupView, _get_group_template
 from ckanext.hdx_org_group.controller_logic.organization_read_logic import OrgReadLogic
 from ckanext.hdx_org_group.controller_logic.organization_stats_logic import (
@@ -390,6 +392,8 @@ def download_organization_stats(id):
     try:
         org_dict = get_action('organization_show')(context, {'id': id})
         output = helper.hdx_generate_organization_stats(org_dict)
+        org_analytics.OrganizationStatsDownloadAnalyticsSender(org_dict.get('name', ''), org_dict.get('id', '')) \
+            .send_to_queue()
         return output
 
     except NotFound:
@@ -397,6 +401,7 @@ def download_organization_stats(id):
     except NotAuthorized:
         return abort(404, _('Organization not found'))
     except Exception as e:
+        log.error(e)
         return abort(404, _('Something went wrong, please contact us'))
 
 

From 0931cd8125213ee55e36f8371fd12225628d0262 Mon Sep 17 00:00:00 2001
From: Dan Mihaila <danmihaila@gmail.com>
Date: Tue, 3 Dec 2024 16:07:36 +0200
Subject: [PATCH 2/2] Update version.py

---
 ckanext-hdx_theme/ckanext/hdx_theme/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
index 18647be0a4..332d5e8d1d 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
@@ -1 +1 @@
-hdx_version = 'v1.85.6'
+hdx_version = 'v1.85.7'