CKAN-Extensions
/
ckanext-googleanalytics_v2.0.7_GA4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added new CKAN configurable value for recent view days 'googleanalytics.recent_view_days' 

Default value is still 14 days
This will allow modifying the packages recent view date day delta
This commit is contained in:
Mark Calvert 2021-03-19 14:02:20 -07:00
parent 7859e01b12
commit 8a5c9c2cbf
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ckanext/googleanalytics/cli.py
View File

@ -15,6 +15,7 @@ import ckan.plugins.toolkit as tk
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
PACKAGE_URL = "/dataset/" # XXX get from routes... PACKAGE_URL = "/dataset/" # XXX get from routes...
DEFAULT_RESOURCE_URL_TAG = "/downloads/" DEFAULT_RESOURCE_URL_TAG = "/downloads/"
DEFAULT_RECENT_VIEW_DAYS = 14
RESOURCE_URL_REGEX = re.compile("/dataset/[a-z0-9-_]+/resource/([a-z0-9-_]+)") RESOURCE_URL_REGEX = re.compile("/dataset/[a-z0-9-_]+/resource/([a-z0-9-_]+)")
DATASET_EDIT_REGEX = re.compile("/dataset/edit/([a-z0-9-_]+)") DATASET_EDIT_REGEX = re.compile("/dataset/edit/([a-z0-9-_]+)")
@ -73,6 +74,12 @@ def _resource_url_tag():
) )
def _recent_view_days():
return tk.asint(tk.config.get(
"googleanalytics.recent_view_days", DEFAULT_RECENT_VIEW_DAYS
))
############################################################################### ###############################################################################
# xxx # # xxx #
############################################################################### ###############################################################################
@ -129,10 +136,10 @@ def internal_save(packages_data, summary_date):
SELECT sum(count) SELECT sum(count)
FROM tracking_summary t2 FROM tracking_summary t2
WHERE t1.url = t2.url WHERE t1.url = t2.url
AND t2.tracking_date <= t1.tracking_date AND t2.tracking_date >= t1.tracking_date - 14 AND t2.tracking_date <= t1.tracking_date AND t2.tracking_date >= t1.tracking_date - %s
) + t1.count ) + t1.count
WHERE t1.running_total = 0 AND tracking_type = 'resource';""" WHERE t1.running_total = 0 AND tracking_type = 'resource';"""
engine.execute(sql) engine.execute(sql, self.recent_view_days)
# update summary totals for pages # update summary totals for pages
sql = """UPDATE tracking_summary t1 sql = """UPDATE tracking_summary t1
@ -146,12 +153,12 @@ def internal_save(packages_data, summary_date):
SELECT sum(count) SELECT sum(count)
FROM tracking_summary t2 FROM tracking_summary t2
WHERE t1.package_id = t2.package_id WHERE t1.package_id = t2.package_id
AND t2.tracking_date <= t1.tracking_date AND t2.tracking_date >= t1.tracking_date - 14 AND t2.tracking_date <= t1.tracking_date AND t2.tracking_date >= t1.tracking_date - %s
) + t1.count ) + t1.count
WHERE t1.running_total = 0 AND tracking_type = 'page' WHERE t1.running_total = 0 AND tracking_type = 'page'
AND t1.package_id IS NOT NULL AND t1.package_id IS NOT NULL
AND t1.package_id != '~~not~found~~';""" AND t1.package_id != '~~not~found~~';"""
engine.execute(sql) engine.execute(sql, self.recent_view_days)
def bulk_import(service, profile_id, start_date=None): def bulk_import(service, profile_id, start_date=None):
@ -322,7 +329,7 @@ def get_ga_data(service, profile_id, query_filter):
{'identifier': {'recent':3, 'ever':6}} {'identifier': {'recent':3, 'ever':6}}
""" """
now = datetime.datetime.now() now = datetime.datetime.now()
recent_date = now - datetime.timedelta(14) recent_date = now - datetime.timedelta(self.recent_view_days)
recent_date = recent_date.strftime("%Y-%m-%d") recent_date = recent_date.strftime("%Y-%m-%d")
floor_date = datetime.date(2005, 1, 1) floor_date = datetime.date(2005, 1, 1)
packages = {} packages = {}

15
ckanext/googleanalytics/commands.py
View File

@ -9,12 +9,14 @@ import time
from pylons import config as pylonsconfig from pylons import config as pylonsconfig
from ckan.lib.cli import CkanCommand from ckan.lib.cli import CkanCommand
import ckan.model as model import ckan.model as model
from ckan.plugins.toolkit import asint
from . import dbutil from . import dbutil
log = logging.getLogger("ckanext.googleanalytics") log = logging.getLogger("ckanext.googleanalytics")
PACKAGE_URL = "/dataset/" # XXX get from routes... PACKAGE_URL = "/dataset/" # XXX get from routes...
DEFAULT_RESOURCE_URL_TAG = "/downloads/" DEFAULT_RESOURCE_URL_TAG = "/downloads/"
DEFAULT_RECENT_VIEW_DAYS = 14
RESOURCE_URL_REGEX = re.compile("/dataset/[a-z0-9-_]+/resource/([a-z0-9-_]+)") RESOURCE_URL_REGEX = re.compile("/dataset/[a-z0-9-_]+/resource/([a-z0-9-_]+)")
DATASET_EDIT_REGEX = re.compile("/dataset/edit/([a-z0-9-_]+)") DATASET_EDIT_REGEX = re.compile("/dataset/edit/([a-z0-9-_]+)")
@ -63,6 +65,9 @@ class LoadAnalytics(CkanCommand):
self.resource_url_tag = self.CONFIG.get( self.resource_url_tag = self.CONFIG.get(
"googleanalytics_resource_prefix", DEFAULT_RESOURCE_URL_TAG "googleanalytics_resource_prefix", DEFAULT_RESOURCE_URL_TAG
) )
self.recent_view_days = asint(self.CONFIG.get(
"googleanalytics.recent_view_days", DEFAULT_RECENT_VIEW_DAYS
))
# funny dance we need to do to make sure we've got a # funny dance we need to do to make sure we've got a
# configured session # configured session
@ -121,10 +126,10 @@ class LoadAnalytics(CkanCommand):
SELECT sum(count) SELECT sum(count)
FROM tracking_summary t2 FROM tracking_summary t2
WHERE t1.url = t2.url WHERE t1.url = t2.url
AND t2.tracking_date <= t1.tracking_date AND t2.tracking_date >= t1.tracking_date - 14 AND t2.tracking_date <= t1.tracking_date AND t2.tracking_date >= t1.tracking_date - %s
) + t1.count ) + t1.count
WHERE t1.running_total = 0 AND tracking_type = 'resource';""" WHERE t1.running_total = 0 AND tracking_type = 'resource';"""
engine.execute(sql) engine.execute(sql, self.recent_view_days)
# update summary totals for pages # update summary totals for pages
sql = """UPDATE tracking_summary t1 sql = """UPDATE tracking_summary t1
@ -138,12 +143,12 @@ class LoadAnalytics(CkanCommand):
SELECT sum(count) SELECT sum(count)
FROM tracking_summary t2 FROM tracking_summary t2
WHERE t1.package_id = t2.package_id WHERE t1.package_id = t2.package_id
AND t2.tracking_date <= t1.tracking_date AND t2.tracking_date >= t1.tracking_date - 14 AND t2.tracking_date <= t1.tracking_date AND t2.tracking_date >= t1.tracking_date - %s
) + t1.count ) + t1.count
WHERE t1.running_total = 0 AND tracking_type = 'page' WHERE t1.running_total = 0 AND tracking_type = 'page'
AND t1.package_id IS NOT NULL AND t1.package_id IS NOT NULL
AND t1.package_id != '~~not~found~~';""" AND t1.package_id != '~~not~found~~';"""
engine.execute(sql) engine.execute(sql, self.recent_view_days)
def bulk_import(self): def bulk_import(self):
if len(self.args) == 3: if len(self.args) == 3:
@ -345,7 +350,7 @@ class LoadAnalytics(CkanCommand):
{'identifier': {'recent':3, 'ever':6}} {'identifier': {'recent':3, 'ever':6}}
""" """
now = datetime.datetime.now() now = datetime.datetime.now()
recent_date = now - datetime.timedelta(14) recent_date = now - datetime.timedelta(self.recent_view_days)
recent_date = recent_date.strftime("%Y-%m-%d") recent_date = recent_date.strftime("%Y-%m-%d")
floor_date = datetime.date(2005, 1, 1) floor_date = datetime.date(2005, 1, 1)
packages = {} packages = {}