rationalize cached values

README.md

@@ -423,7 +423,7 @@ some fake data, so that more of the site is functional, run this command:
 API
 ===
 
-The Gratipay API is comprised of these six endpoints:
+The Gratipay API is comprised of these four endpoints:
 
 **[/about/charts.json](https://gratipay.com/about/charts.json)**
 ([source](https://github.com/gratipay/gratipay.com/tree/master/www/about/charts.json.spt))&mdash;<i>public</i>&mdash;Returns
@@ -440,28 +440,12 @@ charts page used to use this.
 an object giving a point-in-time snapshot of Gratipay. The
 [stats](https://gratipay.com/about/stats.html) page displays the same info.
 
-**/`%username`/charts.json**
-([example](https://gratipay.com/Gratipay/charts.json),
-[source](https://github.com/gratipay/gratipay.com/tree/master/www/%25username/charts.json.spt))&mdash;<i>public</i>&mdash;Returns
-an array of objects, one per week, showing aggregate numbers over time for the
-given user.
-
 **/`%username`/public.json**
 ([example](https://gratipay.com/Gratipay/public.json),
 [source](https://github.com/gratipay/gratipay.com/tree/master/www/%25username/public.json.spt))&mdash;<i>public</i>&mdash;Returns an object with these keys:
 
-  - "receiving"&mdash;an estimate of the amount the given participant will
-    receive this week
-
-  - "my_tip"&mdash;logged-in user's tip to the Gratipay participant in
-    question; possible values are:
-
-      - `undefined` (key not present)&mdash;there is no logged-in user
-      - "self"&mdash;logged-in user is the participant in question
-      - `null`&mdash;user has never tipped this participant
-      - "0.00"&mdash;user used to tip this participant
-      - "3.00"&mdash;user tips this participant the given amount
-      <br><br>
+  - "taking"&mdash;an estimate of the amount the given participant will
+    take from Teams this week
 
   - "elsewhere"&mdash;participant's connected accounts elsewhere; returns an object with these keys:
 
@@ -479,34 +463,6 @@ given user.
           - `http://www.openstreetmap.org/user/%openstreetmap_username`
 
 
-**/`%username`/tips.json**
-([source](https://github.com/gratipay/gratipay.com/tree/master/www/%25username/tips.json.spt))&mdash;<i>private</i>&mdash;Responds
-to `GET` with an array of objects representing your current tips. `POST` the
-same structure back in order to update tips in bulk (be sure to set
-`Content-Type` to `application/json` instead of
-`application/x-www-form-urlencoded`). You can `POST` a partial array to update
-a subset of your tips. The response to a `POST` will be only the subset you
-updated. If the `amount` is `"error"` then there will also be an `error`
-attribute with a one-word error code. If you include an `also_prune` key in the
-querystring (not the body!) with a value of `yes`, `true`, or `1`, then any
-tips not in the array you `POST` will be zeroed out.
-
-NOTE: The amounts must be encoded as a string (rather than a number).
-Additionally, currently, the only supported platform is 'gratipay' ('gittip'
-still works for backwards-compatibility).
-
-This endpoint requires authentication. Look for your user ID and API key on your
-[account page](https://gratipay.com/about/me/settings/), and pass them using basic
-auth. E.g.:
-
-```
-curl https://gratipay.com/foobar/tips.json \
-    -u $userid:$api_key \
-    -X POST \
-    -d'[{"username":"bazbuz", "platform":"gratipay", "amount": "1.00"}]' \
-    -H"Content-Type: application/json"
-```
-
 API Implementations
 -------------------
 

gratipay/billing/exchanges.py

@@ -311,6 +311,7 @@ def record_exchange_result(db, exchange_id, status, error, participant):
         """, locals())
         assert participant.username == username
         assert isinstance(route, ExchangeRoute)
+        route.set_attributes(participant=participant)  # XXX Red hot hack!
 
         if amount < 0:
             amount -= fee
@@ -325,7 +326,7 @@ def propagate_exchange(cursor, participant, route, error, amount):
     """Propagates an exchange's result to the participant's balance and the
     route's status.
     """
-    route.update_error(error or '', propagate=False)
+    route.update_error(error or '')
     new_balance = cursor.one("""
         UPDATE participants
            SET balance=(balance + %s)

gratipay/billing/payday.py

@@ -29,9 +29,6 @@
 with open('sql/payday.sql') as f:
     PAYDAY = f.read()
 
-with open('sql/fake_payday.sql') as f:
-    FAKE_PAYDAY = f.read()
-
 
 class ExceptionWrapped(Exception): pass
 
@@ -80,7 +77,6 @@ class Payday(object):
                 update_balances
                 take_over_balances
             update_stats
-            update_cached_amounts
             end
 
     """
@@ -137,7 +133,6 @@ def run(self):
             self.mark_stage_done()
         if self.stage < 2:
             self.update_stats()
-            self.update_cached_amounts()
             self.mark_stage_done()
 
         self.end()
@@ -462,12 +457,6 @@ def update_stats(self):
         log("Updated payday stats.")
 
 
-    def update_cached_amounts(self):
-        with self.db.get_cursor() as cursor:
-            cursor.execute(FAKE_PAYDAY)
-        log("Updated receiving amounts.")
-
-
     def end(self):
         self.ts_end = self.db.one("""\
 

gratipay/models/exchange_route.py

@@ -15,11 +15,15 @@ def __bool__(self):
 
     @classmethod
     def from_id(cls, id):
-        return cls.db.one("""
+        r = cls.db.one("""
             SELECT r.*::exchange_routes
               FROM exchange_routes r
              WHERE id = %(id)s
         """, locals())
+        if r:
+            from gratipay.models.participant import Participant  # XXX Red hot hack!
+            r.set_attributes(participant=Participant.from_id(r.participant))
+        return r
 
     @classmethod
     def from_network(cls, participant, network):
@@ -31,7 +35,7 @@ def from_network(cls, participant, network):
                AND network = %(network)s
         """, locals())
         if r:
-            r.__dict__['participant'] = participant
+            r.set_attributes(participant=participant)
         return r
 
     @classmethod
@@ -45,7 +49,7 @@ def from_address(cls, participant, network, address):
                AND address = %(address)s
         """, locals())
         if r:
-            r.__dict__['participant'] = participant
+            r.set_attributes(participant=participant)
         return r
 
     @classmethod
@@ -57,9 +61,9 @@ def insert(cls, participant, network, address, error='', fee_cap=None):
                  VALUES (%(participant_id)s, %(network)s, %(address)s, %(error)s, %(fee_cap)s)
               RETURNING exchange_routes.*::exchange_routes
         """, locals())
-        if network == 'balanced-cc':
+        if network == 'braintree-cc':
             participant.update_giving_and_teams()
-        r.__dict__['participant'] = participant
+        r.set_attributes(participant=participant)
         return r
 
     def invalidate(self):
@@ -69,11 +73,12 @@ def invalidate(self):
         # For Paypal, we remove the record entirely to prevent
         # an integrity error if the user tries to add the route again
         if self.network == 'paypal':
+            # XXX This doesn't sound right. Doesn't this corrupt history pages?
             self.db.run("DELETE FROM exchange_routes WHERE id=%s", (self.id,))
         else:
             self.update_error('invalidated')
 
-    def update_error(self, new_error, propagate=True):
+    def update_error(self, new_error):
         id = self.id
         old_error = self.error
         if old_error == 'invalidated':
@@ -85,9 +90,19 @@ def update_error(self, new_error, propagate=True):
         """, locals())
         self.set_attributes(error=new_error)
 
-        # Update the receiving amounts of tippees if requested and necessary
-        if not propagate or self.network != 'balanced-cc':
+        # Update cached amounts if requested and necessary
+        if self.network != 'braintree-cc':
             return
         if self.participant.is_suspicious or bool(new_error) == bool(old_error):
             return
-        self.participant.update_giving_and_teams()
+
+
+        # XXX *White* hot hack!
+        # =====================
+        # During payday, participant is a record from a select of
+        # payday_participants (or whatever), *not* an actual Participant
+        # object. We need the real deal so we can use a method on it ...
+
+        from gratipay.models.participant import Participant
+        participant = Participant.from_username(self.participant.username)
+        participant.update_giving_and_teams()