1 files changed, 8 insertions, 6 deletions
diff --git a/juick-server/src/main/java/com/juick/service/TelegramServiceImpl.java b/juick-server/src/main/java/com/juick/service/TelegramServiceImpl.java
index 4e37bfac..dd6ab8cf 100644
--- a/juick-server/src/main/java/com/juick/service/TelegramServiceImpl.java
+++ b/juick-server/src/main/java/com/juick/service/TelegramServiceImpl.java
@@ -18,13 +18,17 @@
 package com.juick.service;
 
 import com.juick.User;
+import com.juick.server.helpers.AnonymousUser;
+import com.juick.service.data.UsersRepository;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.inject.Inject;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -33,6 +37,8 @@ import java.util.stream.Collectors;
  */
 @Repository
 public class TelegramServiceImpl extends BaseJdbcService implements TelegramService {
+    @Inject
+    UsersRepository usersRepository;
 
     @Transactional
     @Override
@@ -58,12 +64,8 @@ public class TelegramServiceImpl extends BaseJdbcService implements TelegramServ
 
     @Transactional(readOnly = true)
     @Override
-    public int getUser(final long tgId) {
-        List<Integer> list = getJdbcTemplate().queryForList(
-                "SELECT id FROM users INNER JOIN telegram " +
-                        "ON telegram.user_id = users.id WHERE telegram.tg_id=?", Integer.class, tgId);
-
-        return list.isEmpty() ? 0 : list.get(0);
+    public User getUser(final long tgId) {
+        return usersRepository.findByTgIds_Identifier(tgId).map(EntityUtils::entityToUser).orElse(AnonymousUser.INSTANCE);
     }
 
     @Transactional