From: Alex Sadleir <alex.sadleir@linkdigital.com.au>
Date: Mon, 09 Dec 2013 07:36:41 +0000
Subject: Fix bug where private deleted datasets were included in calculation of total datasets
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=ckanext-dga-stats.git&a=commitdiff&h=d09e35aecc55c15e1283e3d39fc2510a363ae960
---
Fix bug where private deleted datasets were included in calculation of total datasets
---


--- a/ckanext/dga_stats/stats.py
+++ b/ckanext/dga_stats/stats.py
@@ -250,8 +250,10 @@
             # be 'for all time' else you get first revision in the time period.
             package_revision = table('package_revision')
             revision = table('revision')
-            s = select([package_revision.c.id, func.min(revision.c.timestamp)], from_obj=[package_revision.join(revision)]).\
+            package = table('package')
+            s = select([package_revision.c.id, func.min(revision.c.timestamp)], from_obj=[package_revision.join(revision).join(package)]).\
                 where(package_revision.c.state==model.State.DELETED).\
+                where(package.c.private == 'f').\
                 group_by(package_revision.c.id).\
                 order_by(func.min(revision.c.timestamp))
             res = model.Session.execute(s).fetchall() # [(id, datetime), ...]