UserInfo -> User

1 files changed, 19 insertions, 18 deletions

diff --git a/src/main/java/com/juick/service/UserServiceImpl.java b/src/main/java/com/juick/service/UserServiceImpl.java
index 93904139..95a13f65 100644
--- a/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/src/main/java/com/juick/service/UserServiceImpl.java
@@ -21,7 +21,6 @@ import com.juick.Message;
 import com.juick.User;
 import com.juick.model.AnonymousUser;
 import com.juick.model.Auth;
-import com.juick.model.UserInfo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -375,29 +374,31 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
 
     @Transactional(readOnly = true)
     @Override
-    public UserInfo getUserInfo(final User user) {
-        List<UserInfo> list = getJdbcTemplate().query(
-                "SELECT fullname, country, url, descr FROM usersinfo WHERE user_id = ?",
-                ((rs, rowNum) -> {
-                    UserInfo info = new UserInfo();
-                    info.setFullName(rs.getString(1));
-                    info.setCountry(rs.getString(2));
-                    info.setUrl(rs.getString(3));
-                    info.setDescription(rs.getString(4));
-                    return info;
-                }),
-                user.getUid());
-
-        return list.isEmpty() ? new UserInfo() : list.get(0);
+    public User getUserInfo(final User user) {
+        try {
+            getJdbcTemplate().queryForObject(
+                    "SELECT fullname, country, url, descr FROM usersinfo WHERE user_id = ?",
+                    ((rs, rowNum) -> {
+                        user.setFullName(rs.getString(1));
+                        user.setCountry(rs.getString(2));
+                        user.setUrl(rs.getString(3));
+                        user.setDescription(rs.getString(4));
+                        return user;
+                    }),
+                    user.getUid());
+        } catch (EmptyResultDataAccessException e) {
+            return user;
+        }
+        return user;
     }
 
     @Transactional
     @Override
-    public boolean updateUserInfo(final User user, final UserInfo info) {
+    public boolean updateUserInfo(final User info) {
         try {
             return getJdbcTemplate().update(
                     "INSERT INTO usersinfo(user_id, fullname, country, url, descr) VALUES (?, ?, ?, ?, ?)",
-                    user.getUid(),
+                    info.getUid(),
                     info.getFullName(),
                     info.getCountry(),
                     info.getUrl(),
@@ -408,7 +409,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
                     info.getCountry(),
                     info.getUrl(),
                     info.getDescription(),
-                    user.getUid()) > 0;
+                    info.getUid()) > 0;
         }
     }