From: Roland Haeder <roland@mxchange.org>
Date: Tue, 6 Oct 2015 13:39:45 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=351f5a49188546b31e1d27cb2fdbdf9c2c08c60e;p=juser-login-core.git

Continued:
- renamed exception + added new one
- updated jar
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index 5fd68dc..ceeaa29 100644
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ
diff --git a/src/org/mxchange/jusercore/exceptions/EmailAddressAlreadyRegisteredException.java b/src/org/mxchange/jusercore/exceptions/EmailAddressAlreadyRegisteredException.java
new file mode 100644
index 0000000..13a783b
--- /dev/null
+++ b/src/org/mxchange/jusercore/exceptions/EmailAddressAlreadyRegisteredException.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 Roland Haeder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jusercore.exceptions;
+
+import java.text.MessageFormat;
+import org.mxchange.jusercore.model.user.User;
+
+/**
+ * An exception thrown when the user's email address is already registered.
+ * <p>
+ * @author Roland Haeder
+ */
+public class EmailAddressAlreadyRegisteredException extends Exception {
+
+	/**
+	 * Serial number
+	 */
+	private static final long serialVersionUID = 16_435_892_878_271L;
+
+	/**
+	 * Constructor with already registered user instance
+	 * <p>
+	 * @param user User instance
+	 */
+	public EmailAddressAlreadyRegisteredException (final User user) {
+		// Call super contructor
+		super(MessageFormat.format("User {0} already registered with number {1} at record id {2}. Maybe forgot to call isRegistered(user) ?", user, user.getUserName(), user.getUserId()));
+	}
+}
diff --git a/src/org/mxchange/jusercore/exceptions/UserAlreadyRegisteredException.java b/src/org/mxchange/jusercore/exceptions/UserAlreadyRegisteredException.java
deleted file mode 100644
index 453fd69..0000000
--- a/src/org/mxchange/jusercore/exceptions/UserAlreadyRegisteredException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2015 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.exceptions;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An exception thrown when the customer is already registered
- * <p>
- * @author Roland Haeder
- */
-public class UserAlreadyRegisteredException extends Exception {
-
-	/**
-	 * Serial number
-	 */
-	private static final long serialVersionUID = 16_435_892_878_271L;
-
-	/**
-	 * Constructor with already registered user instance
-	 * <p>
-	 * @param user User instance
-	 */
-	public UserAlreadyRegisteredException (final User user) {
-		// Call super contructor
-		super(MessageFormat.format("User {0} already registered with number {1} at record id {2}. Maybe forgot to call isRegistered(user) ?", user, user.getUserName(), user.getUserId()));
-	}
-}
diff --git a/src/org/mxchange/jusercore/exceptions/UserNameAlreadyRegisteredException.java b/src/org/mxchange/jusercore/exceptions/UserNameAlreadyRegisteredException.java
new file mode 100644
index 0000000..7e356aa
--- /dev/null
+++ b/src/org/mxchange/jusercore/exceptions/UserNameAlreadyRegisteredException.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 Roland Haeder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jusercore.exceptions;
+
+import java.text.MessageFormat;
+import org.mxchange.jusercore.model.user.User;
+
+/**
+ * An exception thrown when the user name is already registered
+ * <p>
+ * @author Roland Haeder
+ */
+public class UserNameAlreadyRegisteredException extends Exception {
+
+	/**
+	 * Serial number
+	 */
+	private static final long serialVersionUID = 16_435_892_878_271L;
+
+	/**
+	 * Constructor with already registered user instance
+	 * <p>
+	 * @param user User instance
+	 */
+	public UserNameAlreadyRegisteredException (final User user) {
+		// Call super contructor
+		super(MessageFormat.format("User name {0} already registered at record id {2}. Maybe forgot to call isRegistered(user) ?", user.getUserName(), user.getUserId()));
+	}
+}
diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java
index c592e6e..f066460 100644
--- a/src/org/mxchange/jusercore/model/user/LoginUser.java
+++ b/src/org/mxchange/jusercore/model/user/LoginUser.java
@@ -26,6 +26,8 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
@@ -41,6 +43,14 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus;
  */
 @Entity (name = "users")
 @Table (name = "users")
+@NamedQueries(
+	{
+		@NamedQuery(name = "AllUserNames", query = "SELECT DISTINCT u.userName FROM users AS u ORDER BY u.userId ASC"),
+		@NamedQuery(name = "AllEmailAddresses", query = "SELECT DISTINCT c.emailAddress FROM contacts AS c ORDER BY c.contactId ASC"),
+		@NamedQuery(name = "SearchUserName", query = "SELECT u FROM users AS u WHERE LOWER(u.userName) LIKE LOWER(:param)"),
+		@NamedQuery(name = "SearchEmailAddress", query = "SELECT u FROM users AS u INNER JOIN contacts AS c ON u.userContact = c WHERE LOWER(c.emailAddress) LIKE LOWER(:param)")
+	}
+)
 public class LoginUser implements User {
 
 	/**