Finished error checking.

lombar40 · Apr 22, 2012 · 3512084 · 3512084
1 parent f7fde6a
commit 3512084
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 4 deletions.
diff --git a/gwt-unitCache/gwt-unitCache-00000136D73FB49F b/gwt-unitCache/gwt-unitCache-00000136D73FB49F
diff --git a/gwt-unitCache/gwt-unitCache-00000136D742C83E b/gwt-unitCache/gwt-unitCache-00000136D742C83E
diff --git a/gwt-unitCache/gwt-unitCache-00000136D749D07C b/gwt-unitCache/gwt-unitCache-00000136D749D07C
diff --git a/gwt-unitCache/gwt-unitCache-00000136D74D13B3 b/gwt-unitCache/gwt-unitCache-00000136D74D13B3
diff --git a/src/edu/unlv/cs/whoseturn/server/UsersServiceImpl.java b/src/edu/unlv/cs/whoseturn/server/UsersServiceImpl.java
@@ -110,7 +110,7 @@ public String addNewUser(String username, String email, Boolean admin)
 		{
 			return errorMessage;
 		}
-		
+
 		// A Valid username will return "Valid"
 		// An invalid username will return "Invalid username"
 		// A duplicate username will return "Username already exists"

diff --git a/src/edu/unlv/cs/whoseturn/shared/FieldVerifier.java b/src/edu/unlv/cs/whoseturn/shared/FieldVerifier.java
@@ -43,18 +43,19 @@ public static String isEmailValid(String email)
 			return errorMessage;
 		}
 
+
+		// The following checks for a duplicate email address in the database of current users
 		PersistenceManager pm = PMF.get().getPersistenceManager();
 		Query query = pm.newQuery(edu.unlv.cs.whoseturn.domain.User.class);
 
-	    //List<String[]> resultStringList = new ArrayList<String[]>();
 	    List<edu.unlv.cs.whoseturn.domain.User> results;
 
 	    results = (List<edu.unlv.cs.whoseturn.domain.User>) query.execute();
 	   	if (!results.isEmpty()) 
 	   	{
 	            for (edu.unlv.cs.whoseturn.domain.User e : results) 
 	            {
-	                if (email == e.getEmail())
+	                if (email.equals(e.getEmail()))
 	                {
 	                	errorMessage = "Email already exists";
 	                	return errorMessage;
@@ -72,6 +73,7 @@ public static String isEmailValid(String email)
 	 * @param username the username to validate
 	 * @return true if valid, false if invalid
 	 */
+	@SuppressWarnings("unchecked")
 	public static String isUsernameValid(String username)
 	{
 		// The username can't be less than 3 characters
@@ -87,6 +89,25 @@ public static String isUsernameValid(String username)
 			errorMessage = "Username must be under 30 characters";
 			return errorMessage;
 		}
+
+		// The following checks for a duplicate username in the database of current users
+		PersistenceManager pm = PMF.get().getPersistenceManager();
+		Query query = pm.newQuery(edu.unlv.cs.whoseturn.domain.User.class);
+
+		List<edu.unlv.cs.whoseturn.domain.User> results;
+
+		results = (List<edu.unlv.cs.whoseturn.domain.User>) query.execute();
+		if (!results.isEmpty()) 
+		{
+			for (edu.unlv.cs.whoseturn.domain.User e : results) 
+			{
+				if (username.equals(e.getUsername()))
+				{
+					errorMessage = "Username already exists";
+					return errorMessage;
+				}
+			}
+		}
 
 		// If we're here, the username is new and within the specified bounds
 		errorMessage = "Valid";

diff --git a/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml b/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
@@ -1,4 +1,4 @@
-<!-- Indices written at Sat, 21 Apr 2012 22:26:15 UTC -->
+<!-- Indices written at Sat, 21 Apr 2012 16:47:51 PDT -->
 
 <datastore-indexes/>
 
diff --git a/war/WEB-INF/appengine-generated/local_db.bin b/war/WEB-INF/appengine-generated/local_db.bin
diff --git a/war/WEB-INF/classes/edu/unlv/cs/whoseturn/shared/FieldVerifier.class b/war/WEB-INF/classes/edu/unlv/cs/whoseturn/shared/FieldVerifier.class