Changeset 2211

Timestamp:

May 3, 2006, 5:02:47 PM (17 years ago)

Author:

Martin Svensson

Message:

Fixes #37 New/Edit? user - Handling of duplicate login

Location:

trunk

Files:

• src/core/net/sf/basedb/core/User.java (modified) (2 diffs)
• www/admin/users/index.jsp (modified) (3 diffs)

trunk/src/core/net/sf/basedb/core/User.java

@@ -3 +3 @@
 
   BioArray Software Environment (BASE) - http://base.thep.lu.se/
-  Copyright (C) 2002-2004 Lao Saal, Carl Troein,
-  Johan Vallon-Christersson, Jari H�kkinen, Nicklas Nordborg
+  Copyright (C) 2002-2006 Lao Saal, Carl Troein,
+  Johan Vallon-Christersson, Jari Häkkinen, 
+  Nicklas Nordborg, Martin Svensson
 
   This file is part of BASE.
@@ -798 +799 @@
   {
     return Message.getQuery(this);
+  }
+  
+  
+  /**
+    Check if a login name already exists in the database
+      @param login The login name to look for
+    @return TRUE if an user has the login. FALSE if the login is not in use.
+  */
+  public boolean loginIsUsed(DbControl dc, String login)
+  {
+    org.hibernate.Session session = dc.getHibernateSession();
+    org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_USER_FOR_LOGIN");
+    /*
+      SELECT usr
+      FROM UserData usr
+      WHERE usr.login = :login
+    */
+    query.setString("login", login);
+    UserData userData = HibernateUtil.loadData(UserData.class, query);
+    return userData != null;
+  }
+  
+  /**
+      Check if an external ID already exists in the database
+      @param externalid The externalID to look for
+      @return TRUE if an user has the external ID. FALSE if the externalID is not in use.
+  */  
+  public boolean externalIdIsUsed(DbControl dc, String externalid)
+  {
+    org.hibernate.Session session = dc.getHibernateSession();
+    org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_USER_FOR_EXTERNAL_ID");
+    /*
+      SELECT usr 
+      FROM UserData usr
+      WHERE usr.externalId = :externalId
+    */
+    query.setParameter("externalId", externalid);
+    UserData userData = HibernateUtil.loadData(UserData.class, query);
+    return userData != null;
   }
   

trunk/www/admin/users/index.jsp

@@ -2 +2 @@
   ------------------------------------------------------------------
   BioArray Software Environment (BASE) - http://base.thep.lu.se/
-  Copyright (C) 2002-2004 Lao Saal, Carl Troein,
-  Johan Vallon-Christersson, Jari Häkkinen, Nicklas Nordborg
+  Copyright (C) 2002-2006 Lao Saal, Carl Troein,
+  Johan Vallon-Christersson, Jari Häkkinen,
+  Nicklas Nordborg, Martin Svensson
 
   This file is part of BASE.
@@ -42 +43 @@
   import="net.sf.basedb.core.PermissionDeniedException"
   import="net.sf.basedb.core.ItemAlreadyExistsException"
+  import="net.sf.basedb.core.DatabaseException"
   import="net.sf.basedb.util.RemovableUtil"
   import="net.sf.basedb.clients.web.Base"
@@ -227 +229 @@
       if (roleId != -1) Role.getById(dc, roleId).addUser(user);
     }
-    dc.commit();
+    try
+    {
+      dc.commit();
+    }
+    catch(DatabaseException dbex)
+    {
+      dc = sc.newDbControl();
+      if(user.loginIsUsed(dc, login))
+      {
+        throw new ItemAlreadyExistsException("Login [" + login + "] is taken");
+      }
+      String externalid = Values.getStringOrNull(request.getParameter("external_id"));
+      if(user.externalIdIsUsed(dc, externalid))
+      {
+        throw new ItemAlreadyExistsException("ExternalID [" + externalid + "] is taken.");
+      }
+      throw new DatabaseException(dbex.getMessage());
+    }
     cc.removeObject("item");
   }