Merge pull request #1685 from gittip/new-team-payday-bug

New team payday bug

gittip/billing/payday.py

@@ -319,7 +319,8 @@ def move_pending_to_balance_for_teams(self):
  UPDATE participants
  SET balance = (balance + pending)
  , pending = 0
- WHERE number='plural'
+ WHERE pending IS NOT NULL
+ AND number='plural'
 
  """)
  # "Moved" instead of "cleared" because we don't also set to null.

tests/test_billing_payday.py

@@ -343,6 +343,19 @@ def setUp(self):
  super(TestBillingPayday, self).setUp()
  self.payday = Payday(self.db)
 
+ def test_move_pending_to_balance_for_teams_does_so(self):
+ self.make_participant('A', number='plural', balance=2, pending=3)
+ self.payday.move_pending_to_balance_for_teams()
+ actual = self.db.one("SELECT balance FROM participants WHERE username='A'")
+ assert actual == 5
+
+ def test_move_pending_to_balance_for_teams_ignores_new_teams(self):
+ # See https://github.com/gittip/www.gittip.com/issues/1684
+ self.make_participant('A', number='plural', balance=0, pending=None)
+ self.payday.move_pending_to_balance_for_teams()
+ actual = self.db.one("SELECT balance FROM participants WHERE username='A'")
+ assert actual == 0
+
  @mock.patch('gittip.models.participant.Participant.get_tips_and_total')
  def test_charge_and_or_transfer_no_tips(self, get_tips_and_total):
  self.db.run("""