Drop unused table and methods

4 files changed, 1 insertions, 13 deletions

diff --git a/src/main/java/com/juick/service/UserService.java b/src/main/java/com/juick/service/UserService.java
index 8d7f7e02..8e4067e9 100644
--- a/src/main/java/com/juick/service/UserService.java
+++ b/src/main/java/com/juick/service/UserService.java
@@ -125,8 +125,6 @@ public interface UserService {
 
     List<String> getEmails(User user);
 
-    String getEmailHash(User user);
-
     boolean deleteJID(int uid, String jid);
 
     boolean unauthJID(int uid, String jid);
diff --git a/src/main/java/com/juick/service/UserServiceImpl.java b/src/main/java/com/juick/service/UserServiceImpl.java
index 69ca7569..4bc28afa 100644
--- a/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/src/main/java/com/juick/service/UserServiceImpl.java
@@ -625,16 +625,6 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
         return getJdbcTemplate().queryForList("SELECT email FROM emails WHERE user_id=?", String.class, user.getUid());
     }
 
-    @Transactional(readOnly = true)
-    @Override
-    public String getEmailHash(final User user) {
-        List<String> list = getJdbcTemplate().queryForList(
-                "SELECT hash FROM mail WHERE user_id = ?",
-                String.class,
-                user.getUid());
-        return list.isEmpty() ? StringUtils.EMPTY : list.get(0) + "@mail.juick.com";
-    }
-
     @Transactional
     @Override
     public boolean deleteJID(int uid, String jid) {
diff --git a/src/main/java/com/juick/www/controllers/Settings.java b/src/main/java/com/juick/www/controllers/Settings.java
index bc6b6614..a6d036db 100644
--- a/src/main/java/com/juick/www/controllers/Settings.java
+++ b/src/main/java/com/juick/www/controllers/Settings.java
@@ -103,7 +103,6 @@ public class Settings {
         model.addAttribute("tags", tagService.getPopularTags());
         model.addAttribute("auths", userService.getAuthCodes(visitor));
         model.addAttribute("email_active", emailService.getNotificationsEmail(visitor.getUid()));
-        model.addAttribute("ehash", userService.getEmailHash(visitor));
         model.addAttribute("emails", userService.getEmails(visitor));
         model.addAttribute("jids", userService.getAllJIDs(visitor));
         List<String> hours = IntStream.rangeClosed(0, 23).boxed()
diff --git a/src/main/resources/db/migration/V1.33__drop_mail.sql b/src/main/resources/db/migration/V1.33__drop_mail.sql
new file mode 100644
index 00000000..ee4cab70
--- /dev/null
+++ b/src/main/resources/db/migration/V1.33__drop_mail.sql
@@ -0,0 +1 @@
+DROP TABLE mail