Remove duplicates from user queries

1 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/com/juick/service/UserServiceImpl.java b/src/main/java/com/juick/service/UserServiceImpl.java
index 95a13f65..59f1a7e1 100644
--- a/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/src/main/java/com/juick/service/UserServiceImpl.java
@@ -132,7 +132,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
     @Override
     public Optional<User> getUserByUID(final int uid) {
         List<User> list = getJdbcTemplate().query(
-                "SELECT u.id, u.nick, u.passw, u.banned, u.last_seen, " +
+                "SELECT DISTINCT u.id, u.nick, u.passw, u.banned, u.last_seen, " +
                         "COALESCE(f.fb_id, vk.vk_id, t.tg_id, e.user_id, 0) AS verified " +
                         "FROM users u LEFT JOIN facebook f ON f.user_id = u.id " +
                         "LEFT JOIN vk ON u.id = vk.user_id LEFT JOIN telegram t ON u.id = t.user_id " +
@@ -147,7 +147,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
     public User getUserByName(final String username) {
         if (StringUtils.isNotBlank(username)) {
             List<User> list = getJdbcTemplate().query(
-                    "SELECT u.id, u.nick, u.passw, u.banned, u.last_seen, " +
+                    "SELECT DISTINCT u.id, u.nick, u.passw, u.banned, u.last_seen, " +
                             "COALESCE(f.fb_id, vk.vk_id, t.tg_id, e.user_id, 0) AS verified " +
                             "FROM users u LEFT JOIN facebook f ON f.user_id = u.id " +
                             "LEFT JOIN vk ON u.id = vk.user_id LEFT JOIN telegram t ON u.id = t.user_id " +
@@ -166,7 +166,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
     public User getUserByEmail(String email) {
         if (StringUtils.isNotBlank(email)) {
             List<User> list = getJdbcTemplate().query(
-                    "SELECT u.id, u.nick, u.passw, u.banned, u.last_seen, " +
+                    "SELECT DISTINCT u.id, u.nick, u.passw, u.banned, u.last_seen, " +
                             "COALESCE(f.fb_id, vk.vk_id, t.tg_id, e.user_id, 0) AS verified " +
                             "FROM users u LEFT JOIN facebook f ON f.user_id = u.id " +
                             "LEFT JOIN vk ON u.id = vk.user_id LEFT JOIN telegram t ON u.id = t.user_id " +
@@ -188,7 +188,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
 
         if (StringUtils.isNotBlank(jid)) {
             List<User> list = getJdbcTemplate().query(
-                    "SELECT u.id, u.nick, u.passw, u.banned, u.last_seen," +
+                    "SELECT DISTINCT u.id, u.nick, u.passw, u.banned, u.last_seen," +
                             "COALESCE(f.fb_id, vk.vk_id, t.tg_id, e.user_id, 0) AS verified " +
                             "FROM users u LEFT JOIN facebook f ON f.user_id = u.id " +
                             "LEFT JOIN vk ON u.id = vk.user_id LEFT JOIN telegram t ON u.id = t.user_id " +
@@ -210,7 +210,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
             return Collections.emptyList();
 
         return getNamedParameterJdbcTemplate().query(
-                "SELECT u.id, u.nick, u.passw, u.banned, u.last_seen," +
+                "SELECT DISTINCT u.id, u.nick, u.passw, u.banned, u.last_seen," +
                         "COALESCE(f.fb_id, vk.vk_id, t.tg_id, e.user_id, 0) AS verified " +
                         "FROM users u LEFT JOIN facebook f ON f.user_id = u.id " +
                         "LEFT JOIN vk ON u.id = vk.user_id LEFT JOIN telegram t ON u.id = t.user_id " +
@@ -227,7 +227,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
             return Collections.emptyList();
 
         return getNamedParameterJdbcTemplate().query(
-                "SELECT u.id, u.nick, u.passw, u.banned, u.last_seen," +
+                "SELECT DISTINCT u.id, u.nick, u.passw, u.banned, u.last_seen," +
                         "COALESCE(f.fb_id, vk.vk_id, t.tg_id, e.user_id, 0) AS verified " +
                         "FROM users u LEFT JOIN facebook f ON f.user_id = u.id " +
                         "LEFT JOIN vk ON u.id = vk.user_id LEFT JOIN telegram t ON u.id = t.user_id " +
@@ -287,7 +287,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
     public com.juick.User getUserByHash(final String hash) {
         if (StringUtils.isNotBlank(hash)) {
             List<User> list = getJdbcTemplate().query(
-                    "SELECT logins.user_id, u.nick, u.passw, u.banned, u.last_seen," +
+                    "SELECT DISTINCT logins.user_id, u.nick, u.passw, u.banned, u.last_seen," +
                             "COALESCE(f.fb_id, vk.vk_id, t.tg_id, e.user_id, 0) AS verified " +
                             "FROM logins INNER JOIN users u ON logins.user_id = u.id " +
                             "LEFT JOIN facebook f ON f.user_id = u.id " +
@@ -325,7 +325,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
     public int checkPassword(final String username, final String password) {
         if (StringUtils.isNotBlank(username)) {
             List<User> list = getJdbcTemplate().query(
-                    "SELECT u.id, u.nick, u.passw, u.banned, u.last_seen," +
+                    "SELECT DISTINCT u.id, u.nick, u.passw, u.banned, u.last_seen," +
                             "COALESCE(f.fb_id, vk.vk_id, t.tg_id, e.user_id, 0) AS verified " +
                             "FROM users u LEFT JOIN facebook f ON f.user_id = u.id " +
                             "LEFT JOIN vk ON u.id = vk.user_id LEFT JOIN telegram t ON u.id = t.user_id " +