1 files changed, 30 insertions, 3 deletions
diff --git a/src/mailman/model/user.py b/src/mailman/model/user.py
index f2a7c9d18..f0048c5f4 100644
--- a/src/mailman/model/user.py
+++ b/src/mailman/model/user.py
@@ -24,7 +24,8 @@ __all__ = [
     'User',
     ]
 
-from storm.locals import Int, Reference, ReferenceSet, Unicode
+from storm.locals import (
+    DateTime, Int, RawStr, Reference, ReferenceSet, Unicode)
 from zope.interface import implements
 
 from mailman.config import config
@@ -35,6 +36,8 @@ from mailman.interfaces.user import IUser
 from mailman.model.address import Address
 from mailman.model.preferences import Preferences
 from mailman.model.roster import Memberships
+from mailman.utilities.datetime import factory as date_factory
+from mailman.utilities.uid import factory as uid_factory
 
 
 
@@ -45,14 +48,38 @@ class User(Model):
 
     id = Int(primary=True)
     real_name = Unicode()
-    password = Unicode()
+    password = RawStr()
+    _user_id = Unicode()
+    _created_on = DateTime()
 
     addresses = ReferenceSet(id, 'Address.user_id')
     preferences_id = Int()
     preferences = Reference(preferences_id, 'Preferences.id')
 
+    def __init__(self, real_name=None, preferences=None):
+        super(User, self).__init__()
+        self._created_on = date_factory.now()
+        user_id = uid_factory.new_uid()
+        assert config.db.store.find(User, _user_id=user_id).count() == 0, (
+            'Duplicate user id {0}'.format(user_id))
+        self._user_id = user_id
+        self.real_name = ('' if real_name is None else real_name)
+        self.preferences = preferences
+        config.db.store.add(self)
+
     def __repr__(self):
-        return '<User "{0}" at {1:#x}>'.format(self.real_name, id(self))
+        return '<User "{0.real_name}" ({0.user_id}) at {1:#x}>'.format(
+            self, id(self))
+
+    @property
+    def user_id(self):
+        """See `IUser`."""
+        return self._user_id
+
+    @property
+    def created_on(self):
+        """See `IUser`."""
+        return self._created_on
 
     def link(self, address):
         """See `IUser`."""