- no need to filter out None anymore

[plcapi.git] / PLC / Persons.py

diff --git a/PLC/Persons.py b/PLC/Persons.py
index 6b811b8..a3c38b4 100644 (file)
--- a/PLC/Persons.py
+++ b/PLC/Persons.py
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Persons.py,v 1.4 2006/09/25 15:10:00 mlhuang Exp $
+# $Id: Persons.py,v 1.7 2006/10/02 18:32:31 mlhuang Exp $
 #
 
 from types import StringTypes
@@ -31,6 +31,8 @@ class Person(Row):
     dict. Commit to the database with sync().
     """
 
+    table_name = 'persons'
+    primary_key = 'person_id'
     fields = {
         'person_id': Parameter(int, "Account identifier"),
         'first_name': Parameter(str, "Given name", max = 128),
@@ -41,18 +43,17 @@ class Person(Row):
         'url': Parameter(str, "Home page", max = 254),
         'bio': Parameter(str, "Biography", max = 254),
         'enabled': Parameter(bool, "Has been enabled"),
-        'deleted': Parameter(bool, "Has been deleted"),
         'password': Parameter(str, "Account password in crypt() form", max = 254),
-        'last_updated': Parameter(str, "Date and time of last update"),
-        'date_created': Parameter(str, "Date and time when account was created"),
-        'role_ids': Parameter([int], "List of role identifiers"),
-        'roles': Parameter([str], "List of roles"),
-        'site_ids': Parameter([int], "List of site identifiers"),
-        'key_ids': Parameter([int], "List of key identifiers"),
-        'slice_ids': Parameter([int], "List of slice identifiers"),
+        'last_updated': Parameter(str, "Date and time of last update", ro = True),
+        'date_created': Parameter(str, "Date and time when account was created", ro = True),
+        'role_ids': Parameter([int], "List of role identifiers", ro = True),
+        'roles': Parameter([str], "List of roles", ro = True),
+        'site_ids': Parameter([int], "List of site identifiers", ro = True),
+        'key_ids': Parameter([int], "List of key identifiers", ro = True),
+        'slice_ids': Parameter([int], "List of slice identifiers", ro = True),
         }
 
-    def __init__(self, api, fields):
+    def __init__(self, api, fields = {}):
         Row.__init__(self, fields)
         self.api = api
 
@@ -86,7 +87,7 @@ class Person(Row):
 
         conflicts = Persons(self.api, [email])
         for person_id, person in conflicts.iteritems():
-            if not person['deleted'] and ('person_id' not in self or self['person_id'] != person_id):
+            if 'person_id' not in self or self['person_id'] != person_id:
                 raise PLCInvalidArgument, "E-mail address already in use"
 
         return email
@@ -224,51 +225,6 @@ class Person(Row):
         self['site_ids'].remove(site_id)
         self['site_ids'].insert(0, site_id)
 
-    def sync(self, commit = True):
-        """
-        Commit changes back to the database.
-        """
-
-        self.validate()
-
-        # Fetch a new person_id if necessary
-        if 'person_id' not in self:
-            rows = self.api.db.selectall("SELECT NEXTVAL('persons_person_id_seq') AS person_id")
-            if not rows:
-                raise PLCDBError, "Unable to fetch new person_id"
-            self['person_id'] = rows[0]['person_id']
-            insert = True
-        else:
-            insert = False
-
-        # Filter out fields that cannot be set or updated directly
-        persons_fields = self.api.db.fields('persons')
-        fields = dict(filter(lambda (key, value): key in persons_fields,
-                             self.items()))
-        for ro_field in 'date_created', 'last_updated':
-            if ro_field in fields:
-                del fields[ro_field]
-
-        # Parameterize for safety
-        keys = fields.keys()
-        values = [self.api.db.param(key, value) for (key, value) in fields.items()]
-
-        if insert:
-            # Insert new row in persons table
-            sql = "INSERT INTO persons (%s) VALUES (%s)" % \
-                  (", ".join(keys), ", ".join(values))
-        else:
-            # Update existing row in persons table
-            columns = ["%s = %s" % (key, value) for (key, value) in zip(keys, values)]
-            sql = "UPDATE persons SET " + \
-                  ", ".join(columns) + \
-                  " WHERE person_id = %(person_id)d"
-
-        self.api.db.do(sql, fields)
-
-        if commit:
-            self.api.db.commit()
-
     def delete(self, commit = True):
         """
         Delete existing account.
@@ -297,14 +253,11 @@ class Persons(Table):
     non-deleted accounts.
     """
 
-    def __init__(self, api, person_id_or_email_list = None, fields = Person.fields, deleted = False, enabled = None):
+    def __init__(self, api, person_id_or_email_list = None, enabled = None):
         self.api = api
 
-        sql = "SELECT %s FROM view_persons WHERE TRUE" % \
-              ", ".join(fields)
-
-        if deleted is not None:
-            sql += " AND deleted IS %(deleted)s"
+        sql = "SELECT %s FROM view_persons WHERE deleted IS False" % \
+              ", ".join(Person.fields)
 
         if enabled is not None:
             sql += " AND enabled IS %(enabled)s"