Changeset 2cf43b4 in indico

Timestamp:

05/11/11 15:27:20 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

fb6f28

Parents:

65a469

git-author:

Alexis Castilla Hernandez <alexis.castilla.hernandez@…> (05/02/11 15:21:51)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (05/11/11 15:27:20)

Message:

[IMP] Registration form performance improvement

• Added new attribute _registrantsByEmail, it is a dictionary where the keys are the email of the registrants. It allows to check if there is a registrant with the same email that we are trying to add.
• In ObjectHolders?.py only one line has been changed (Removed .strip() because of the performance)
• Added check the email in the data modification methods in order to avoid an email address repeated
• Ticket #620

Location:

indico/MaKaC

Files:

• common/ObjectHolders.py (modified) (15 diffs)
• conference.py (modified) (2 diffs)
• registration.py (modified) (1 diff)
• webinterface/rh/registrantsModif.py (modified) (1 diff)
• webinterface/rh/registrationFormDisplay.py (modified) (1 diff)

indico/MaKaC/common/ObjectHolders.py

@@ -19 +19 @@
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-"""This file contain the definition of those classes which implement the root 
-access to the objects in the DB. The system will fetch and add objects to the 
-collections (or holders) through these classes that interact directly with the 
-persistence layer and do the necessary operations behind to ensure the 
+"""This file contain the definition of those classes which implement the root
+access to the objects in the DB. The system will fetch and add objects to the
+collections (or holders) through these classes that interact directly with the
+persistence layer and do the necessary operations behind to ensure the
 persistence.
 """
@@ -33 +33 @@
 
 class ObjectHolder:
-    """This class provides a common entry point for accessing conferences and 
-       other objects of the business layer encapsulating the access to the DB 
+    """This class provides a common entry point for accessing conferences and
+       other objects of the business layer encapsulating the access to the DB
        so it's transparent for other objects to deal with it.
-       "Clients" will just instantiate this class and will retrieve the objects 
-       they are interested in through one of its methods. The object will have 
-       to manage to connect to the DB in the correct way and return the object 
+       "Clients" will just instantiate this class and will retrieve the objects
+       they are interested in through one of its methods. The object will have
+       to manage to connect to the DB in the correct way and return the object
        the client asks for.
-       This class is actually only a wrapper for the containers of objects, 
-       therefore it doesn't need to be persistent; it encapsulates the 
-       recovering and storing of those containers in the DB in a transparent 
+       This class is actually only a wrapper for the containers of objects,
+       therefore it doesn't need to be persistent; it encapsulates the
+       recovering and storing of those containers in the DB in a transparent
        way.
        Attributes:
@@ -48 +48 @@
             created in the DB
         idxName -- (string) Contains the name of the current index being wrapped
-        counterName -- (string) Name of the counter which will be used to 
+        counterName -- (string) Name of the counter which will be used to
             generate unique identifiers for the objects stored on the current
             index.
@@ -62 +62 @@
 
     def __init__(self):
-        """Class constructor. Gets an opened DB storage and initializes the 
+        """Class constructor. Gets an opened DB storage and initializes the
            DB connection so it's available for later requests.
         """
@@ -82 +82 @@
            If the key doesn't exist if creates a new tree and inserts it into the
            DB root.
-           BTree objects act as a dictionary but due to their data structure 
+           BTree objects act as a dictionary but due to their data structure
            properties allow to increase the concurrency (don't need to load all
            the mapping on memory) and improves performance.
@@ -89 +89 @@
         """
         root = DBMgr.getInstance().getDBConnection().root()
-        name =  name.strip().lower()
+        name =  name.lower()
         if not (name in self.__allowedIdxs):
             raise Exception( _("index name not allowed %s")%name)
@@ -95 +95 @@
             root[ name ] = OOBTree.OOBTree()
         return root[ name ]
-    
+
     def _newId( self ):
         """
@@ -105 +105 @@
             idxs[self.counterName] = Counter()
         return idxs[self.counterName].newCount()
-    
+
     def getLastId(self):
         if self.counterName == None:
@@ -113 +113 @@
             idxs[self.counterName] = Counter()
         return idxs[self.counterName]._getCount()
-    
+
     def add( self, newItem ):
         """adds an object to the index and assings it a new unique id.
@@ -134 +134 @@
             return
         del tree[item.getId()]
-    
+
     def removeById( self, itemid ):
         """removes the specified object from the index.
@@ -142 +142 @@
             return
         del tree[itemid]
-        
+
     def getById( self, id ):
         """returns an object from the index which id corresponds to the one
@@ -156 +156 @@
         """
         return self._getIdx().values()
-    
+
     def getValuesToList( self ):
         l = []
@@ -166 +166 @@
 class IndexHolder( ObjectHolder ):
     """Specialised ObjectHolder class which provides a wrapper for collections
-        based in a Catalog for indexing the objects. It allows to index some 
+        based in a Catalog for indexing the objects. It allows to index some
         declared attributes of the stored objects and then perform SQL-like
         queries
@@ -189 +189 @@
         #    self._idx = Catalog( self.idxClass )
         #    shelf.add_catalog(self._idx)
-    
+
     def add( self, newItem):
         #XXX: this makes the perfomance decrease dramatically. Operations like
-        #   this should be avoided and the clients should now take care of 
+        #   this should be avoided and the clients should now take care of
         #   not inserting the same user twice
         #if newItem in self.getList():
-        #    return 
+        #    return
         if newItem.getId() != None and  newItem.getId() != "":
             raise MaKaCError( _("Object %s has already an id it is probably already inserted in the holder %s")%(newItem, self.__class__))
@@ -213 +213 @@
     def getList( self ):
         return self._getIdx().dump()
-    
+
     def hasKey( self, id ):
         #XXX: verify how to implement it
         return False
-    
-
-
+
+
+

indico/MaKaC/conference.py

@@ -4570 +4570 @@
         return self._registrants
 
+    def getRegistrantsByEmail(self):
+        try:
+            if self._registrantsByEmail:
+                pass
+        except AttributeError, e:
+            self._registrantsByEmail = self._createRegistrantsByEmail()
+            self.notifyModification()
+        return self._registrantsByEmail
+
+    def _createRegistrantsByEmail(self):
+        dicByEmail = {}
+        for r in self.getRegistrantsList():
+            dicByEmail[r.getEmail()] = r
+        return dicByEmail
+
     def getRegistrantsList(self, sort = False):
         rl = self.getRegistrants().values()
@@ -4589 +4604 @@
         self.notifyModification()
 
+    def updateRegistrantIndexByEmail(self, rp, newEmail):
+        oldEmail = rp.getEmail()
+        if oldEmail != newEmail:
+            if self.getRegistrantsByEmail().has_key(oldEmail):
+                del self.getRegistrantsByEmail()[oldEmail]
+            self.getRegistrantsByEmail()[newEmail] = rp
+            self.notifyModification()
+
     def hasRegistrant(self,rp):
         return rp.getConference()==self and \
                 self.getRegistrants().has_key(rp.getId())
 
-    def hasRegistrantByEmail(self, email, registrant=None):
-        # Return true if there is someone with the email of the param "email" but
-        # the email has to be different to the one of the "registrant" (just in case we
-        # try to modify the data of the registrant)
-        for r in self.getRegistrantsList():
-            if r.getEmail().strip().lower() == email.strip().lower():
-                if registrant is not None and registrant.getEmail().strip().lower() == email.strip().lower():
-                    continue
-                return True
-        return False
+    def hasRegistrantByEmail(self, email):
+        # Return true if there is someone with the email of the param "email"
+        return self.getRegistrantsByEmail().has_key(email)
 
     def removeRegistrant(self, id):
         part = self.getRegistrants()[id]
         self._registrationForm.notifyRegistrantRemoval(self.getRegistrants()[id])
+        del self.getRegistrantsByEmail()[self.getRegistrantById(id).getEmail()]
         del self.getRegistrants()[id]
         if part.getAvatar() is not None:

indico/MaKaC/registration.py

@@ -4147 +4147 @@
 
     def setPersonalData(self, data):
+
+        self.getConference().updateRegistrantIndexByEmail(self, data.get("email",""))
+
         self.setTitle(data.get("title",""))
         self.setFirstName(data.get("firstName",""))

indico/MaKaC/webinterface/rh/registrantsModif.py

@@ -514 +514 @@
         for key in keys:
             if key not in params.keys() or params.get(key,"").strip() == "":
-                raise FormValuesError("The field \"%s\" is mandatory and you must fill it in order to modify the registrant"%(pd.getData()[key].getName()))
-        self._cancel = params.has_key("cancel")
-
-    def _process( self ):
-        if not self._cancel:
-            if self._conf.hasRegistrantByEmail(self._getRequestParams().get("email",""), self._registrant):
-                raise FormValuesError("There is already a user with the email \"%s\". Please choose another one"%self._getRequestParams().get("email","--no email--"))
+                raise FormValuesError(_("The field \"%s\" is mandatory and you must fill it in order to modify the registrant")%(pd.getData()[key].getName()))
+        self._cancel = params.has_key("cancel")
+
+    def _process( self ):
+        if not self._cancel:
+            if self._getRequestParams().get("email","") != self._registrant.getEmail() and self._conf.hasRegistrantByEmail(self._getRequestParams().get("email","")):
+                raise FormValuesError(_("There is already a user with the email \"%s\". Please choose another one")%self._getRequestParams().get("email","--no email--"))
             self._registrant.setPersonalData(self._getRequestParams())
         self._redirect(urlHandlers.UHRegistrantModification.getURL(self._registrant))

indico/MaKaC/webinterface/rh/registrationFormDisplay.py

@@ -281 +281 @@
             else:
                 rp = self._getUser().getRegistrantById(self._conf.getId())
+                # check if the email is being changed by another one that already exists
+                if self._getRequestParams().get("email","") != rp.getEmail() and self._conf.hasRegistrantByEmail(self._getRequestParams().get("email","")):
+                    raise FormValuesError(_("There is already a user with the email \"%s\". Please choose another one")%self._getRequestParams().get("email","--no email--"))
                 rp.setValues(self._getRequestParams(), self._getUser())
                 # avoid multiple sending in case of db conflict