bring back takes/membership UI

bin/rekey.py

@@ -1,10 +1,14 @@
 #!/usr/bin/env python2
+"""See gratipay.models.participant.mixins.identity.rekey for documentation.
+"""
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 from gratipay import wireup
+from gratipay.models.participant.mixins import identity as participant_identities
 
 env = wireup.env()
 db = wireup.db(env)
-wireup.crypto(env)
+packer = wireup.crypto(env)
 
-print("{} record(s) rekeyed.".format(0))  # stubbed until we have something to rekey
+n = participant_identities.rekey(db, packer)
+print("Rekeyed {} participant identity record(s).".format(n))

gratipay/models/country.py

@@ -0,0 +1,22 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+from postgres.orm import Model
+
+
+class Country(Model):
+    """Represent country records from our database (read-only).
+
+    :var int id: the record's primary key in our ``countries`` table
+    :var unicode name: the name of the country
+    :var unicode code2: the country's `ISO 3166-1 alpha-2`_ code
+    :var unicode code3: the country's `ISO 3166-1 alpha-3`_ code
+
+    .. _ISO 3166-1 alpha-2 : https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+    .. _ISO 3166-1 alpha-3 : https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3
+
+    """
+    typname = 'countries'
+
+    @classmethod
+    def from_code2(cls, code2):
+        return cls.db.one("SELECT countries.*::countries FROM countries WHERE code2=%s", (code2,))

gratipay/models/participant/__init__.py

@@ -38,6 +38,7 @@
 from gratipay.models.account_elsewhere import AccountElsewhere
 from gratipay.models.exchange_route import ExchangeRoute
 from gratipay.models.team import Team
+from gratipay.models.participant import mixins
 from gratipay.security.crypto import constant_time_compare
 from gratipay.utils import (
     i18n,
@@ -60,7 +61,7 @@
 
 USERNAME_MAX_SIZE = 32
 
-class Participant(Model):
+class Participant(Model, mixins.Identity):
     """Represent a Gratipay participant.
     """
 
@@ -333,14 +334,6 @@ def clear_payment_instructions(self, cursor):
             self.set_payment_instruction(team, '0.00', update_self=False, cursor=cursor)
 
 
-    def clear_takes(self, cursor):
-        """Leave all teams by zeroing all takes.
-        """
-        for team, nmembers in self.get_old_teams():
-            t = Participant.from_username(team)
-            t.set_take_for(self, Decimal(0), self, cursor)
-
-
     def clear_personal_information(self, cursor):
         """Clear personal information such as statements.
         """
@@ -355,6 +348,7 @@ def clear_personal_information(self, cursor):
 
             DELETE FROM emails WHERE participant_id = %(participant_id)s;
             DELETE FROM statements WHERE participant=%(participant_id)s;
+            DELETE FROM participant_identities WHERE participant_id=%(participant_id)s;
 
             UPDATE participants
                SET anonymous_giving=False
@@ -1093,22 +1087,6 @@ def get_teams(self, only_approved=False, cursor=None):
         return teams
 
 
-    def get_old_teams(self):
-        """Return a list of old-style teams this user was a member of.
-        """
-        return self.db.all("""
-
-            SELECT team AS name
-                 , ( SELECT count(*)
-                       FROM current_takes
-                      WHERE team=x.team
-                    ) AS nmembers
-              FROM current_takes x
-             WHERE member=%s;
-
-        """, (self.username,))
-
-
     def insert_into_communities(self, is_member, name, slug):
         participant_id = self.id
         self.db.run("""
@@ -1517,8 +1495,6 @@ def take_over(self, account, have_confirmation=False):
 
             if this_is_others_last_login_account:
 
-                other.clear_takes(cursor)
-
                 # Take over tips.
                 # ===============
 

gratipay/models/participant/mixins/__init__.py

@@ -0,0 +1,3 @@
+from .identity import IdentityMixin as Identity
+
+__all__ = ['Identity']