Show external followers in stats

4 files changed, 15 insertions, 17 deletions

diff --git a/src/main/java/com/juick/service/UserService.java b/src/main/java/com/juick/service/UserService.java
index db02c34e..8fe8bc1f 100644
--- a/src/main/java/com/juick/service/UserService.java
+++ b/src/main/java/com/juick/service/UserService.java
@@ -113,8 +113,6 @@ public interface UserService {
 
     boolean linkTwitterAccount(User user, String accessToken, String accessTokenSecret, String screenName);
 
-    int getStatsMyReaders(int uid);
-
     int getStatsMessages(int uid);
 
     int getStatsReplies(int uid);
diff --git a/src/main/java/com/juick/service/UserServiceImpl.java b/src/main/java/com/juick/service/UserServiceImpl.java
index b5581b76..b15a18e5 100644
--- a/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/src/main/java/com/juick/service/UserServiceImpl.java
@@ -42,6 +42,7 @@ import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Nonnull;
+import java.net.URI;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -519,17 +520,23 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
     @Transactional(readOnly = true)
     @Override
     public List<User> getUserReaders(final int uid) {
-        return getJdbcTemplate().query(
-                "SELECT users.id, users.nick FROM subscr_users " +
-                        "INNER JOIN users ON subscr_users.suser_id=users.id " +
-                        "WHERE subscr_users.user_id=? ORDER BY users.nick",
+        return getNamedParameterJdbcTemplate().query(
+                """
+                        SELECT users.id, users.nick nick, '' user_uri FROM subscr_users
+                        INNER JOIN users ON subscr_users.suser_id=users.id
+                        WHERE subscr_users.user_id=:user_id
+                        UNION ALL SELECT 0, '', acct user_uri from followers WHERE user_id=:user_id
+                        ORDER BY nick
+                        """,
+                new MapSqlParameterSource()
+                        .addValue("user_id", uid),
                 (rs, num) -> {
                     User u = new User();
                     u.setUid(rs.getInt(1));
                     u.setName(rs.getString(2));
+                    u.setUri(URI.create(rs.getString(3)));
                     return u;
-                },
-                uid);
+                });
     }
 
     @Transactional(readOnly = true)
@@ -584,13 +591,6 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
 
     @Transactional(readOnly = true)
     @Override
-    public int getStatsMyReaders(final int uid) {
-        List<Integer> list = getJdbcTemplate().queryForList("SELECT COUNT(*) FROM subscr_users WHERE user_id = ?", Integer.class, uid);
-        return list.isEmpty() ? 0 : list.get(0);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
     public int getStatsMessages(final int uid) {
         List<Integer> list = getJdbcTemplate().queryForList("SELECT COUNT(*) FROM messages WHERE user_id = ?", Integer.class, uid);
         return list.isEmpty() ? 0 : list.get(0);
diff --git a/src/main/java/com/juick/www/api/activity/Profile.java b/src/main/java/com/juick/www/api/activity/Profile.java
index 5deba2cf..c87d6118 100644
--- a/src/main/java/com/juick/www/api/activity/Profile.java
+++ b/src/main/java/com/juick/www/api/activity/Profile.java
@@ -174,7 +174,7 @@ public class Profile {
             UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(baseUri);
             OrderedCollection followers = new OrderedCollection();
             followers.setId(ServletUriComponentsBuilder.fromCurrentRequestUri().toUriString());
-            followers.setTotalItems(userService.getStatsMyReaders(user.getUid()));
+            followers.setTotalItems(userService.getUserReaders(user.getUid()).size());
             followers.setFirst(uriComponentsBuilder.path(String.format("/u/%s/followers", userName)).toUriString());
             return (OrderedCollection) Context.build(followers);
         }
diff --git a/src/main/java/com/juick/www/controllers/Site.java b/src/main/java/com/juick/www/controllers/Site.java
index 2484c8fa..dcb89718 100644
--- a/src/main/java/com/juick/www/controllers/Site.java
+++ b/src/main/java/com/juick/www/controllers/Site.java
@@ -87,7 +87,7 @@ public class Site {
         model.addAttribute("isInBL", userService.isInBL(visitor.getUid(), user.getUid()));
         model.addAttribute("isInBLAny", userService.isInBLAny(user.getUid(), visitor.getUid()));
         model.addAttribute("statsIRead", userService.getUserFriends(user.getUid()).size());
-        model.addAttribute("statsMyReaders", userService.getStatsMyReaders(user.getUid()));
+        model.addAttribute("statsMyReaders", userService.getUserReaders(user.getUid()).size());
         model.addAttribute("statsMyBL", userService.getUserBLUsers(user.getUid()).size());
         model.addAttribute("statsMessages", userService.getStatsMessages(user.getUid()));
         model.addAttribute("statsReplies", userService.getStatsReplies(user.getUid()));