Merge pull request #1377 from zwn/master

Show number of active weekly users and $ transferred in the headline of each page.

branch.sql

@@ -0,0 +1,13 @@
+-------------------------------------------------------------------------------
+-- https://github.com/gittip/www.gittip.com/issues/703
+
+ALTER TABLE paydays
+   ADD COLUMN nactive bigint DEFAULT 0;
+
+UPDATE paydays SET nactive=(
+    SELECT count(DISTINCT foo.*) FROM (
+        SELECT tipper FROM transfers WHERE "timestamp" >= ts_start AND "timestamp" < ts_end
+            UNION
+        SELECT tippee FROM transfers WHERE "timestamp" >= ts_start AND "timestamp" < ts_end
+        ) AS foo
+);

configure-aspen.py

@@ -1,3 +1,4 @@
+import locale
 import os
 import threading
 import time
@@ -88,6 +89,9 @@ def add_stuff(request):
     request.context['github'] = github
     request.context['twitter'] = twitter
     request.context['bountysource'] = bountysource
+    stats = gittip.db.one('SELECT nactive, transfer_volume FROM paydays ORDER BY ts_end DESC LIMIT 1', default=(0, 0.0))
+    request.context['gnactive'] = locale.format("%d", stats[0], grouping=True)
+    request.context['gtransfer_volume'] = locale.format("%d", round(stats[1], -2), grouping=True)
 
 website.hooks.inbound_early += [add_stuff]
 

gittip/billing/payday.py

@@ -137,6 +137,7 @@ def run(self):
         self.pachinko(ts_start, self.genparticipants(ts_start, ts_start))
         self.clear_pending_to_balance()
         self.payout(ts_start, self.genparticipants(ts_start, False))
+        self.set_nactive(ts_start)
 
         self.end()
 
@@ -349,6 +350,21 @@ def clear_pending_to_balance(self):
         log("Cleared pending to balance. Ready for payouts.")
 
 
+    def set_nactive(self, ts_start):
+        self.db.run("""\
+
+            UPDATE paydays
+               SET nactive=(
+                    SELECT count(DISTINCT foo.*) FROM (
+                        SELECT tipper FROM transfers WHERE "timestamp" >= %(ts_start)s
+                            UNION
+                        SELECT tippee FROM transfers WHERE "timestamp" >= %(ts_start)s
+                    ) AS foo
+                )
+             WHERE ts_end='1970-01-01T00:00:00+00'::timestamptz
+
+        """, {'ts_start': ts_start})
+
     def end(self):
         self.db.one("""\
 

templates/base.html

@@ -58,7 +58,7 @@ <h1>
                 </a>
             </h1>
             </td><td class="motto luxury">
-            Distributed Genius Grants
+            {{ gnactive }} users exchanging ${{ gtransfer_volume }} per week
         </td></tr></table>
         {% if user.ANON %}
           {% include sign-in-using.html %}

tests/test_billing_payday.py

@@ -30,10 +30,11 @@ def setUp(self):
         self.payday = Payday(self.db)
 
     def get_numbers(self):
-        """Return a list of 9 ints:
+        """Return a list of 10 ints:
 
             nachs
             nach_failing
+            nactive
             ncc_failing
             ncc_missing
             ncharges
@@ -59,7 +60,7 @@ def test_charge_without_cc_marked_as_failure(self):
         self.payday.start()
         self.payday.charge(alice, Decimal('1.00'))
         actual = self.get_numbers()
-        assert_equals(actual, [0, 0, 0, 1, 0, 0, 0, 0, 0, 0])
+        assert_equals(actual, [0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0])
 
     @mock.patch('gittip.billing.payday.Payday.charge_on_balanced')
     def test_charge_failure_returns_None(self, cob):