juick-www: Home controller uses Pebble, drop ads

wip

3 files changed, 0 insertions, 66 deletions

diff --git a/juick-server/src/main/java/com/juick/service/AdsService.java b/juick-server/src/main/java/com/juick/service/AdsService.java
deleted file mode 100644
index f8a0f5cf..00000000
--- a/juick-server/src/main/java/com/juick/service/AdsService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.juick.service;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public interface AdsService {
-
-    int getAdMid(int uid);
-
-    int logAdMid(int uid, int mid);
-}
diff --git a/juick-server/src/main/java/com/juick/service/AdsServiceImpl.java b/juick-server/src/main/java/com/juick/service/AdsServiceImpl.java
deleted file mode 100644
index f515e437..00000000
--- a/juick-server/src/main/java/com/juick/service/AdsServiceImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.juick.service;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.inject.Inject;
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-@Repository
-public class AdsServiceImpl extends BaseJdbcService implements AdsService {
-
-    @Inject
-    public AdsServiceImpl(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate, null);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int getAdMid(final int uid) {
-        List<Integer> list;
-
-        if (uid > 0)
-            list = getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM ads_messages " +
-                            "WHERE message_id NOT IN (SELECT message_id FROM ads_messages_log WHERE user_id = ? " +
-                            "AND ts > UNIX_TIMESTAMP() - 60*60*24 GROUP BY message_id HAVING COUNT(*) > 2) ORDER BY RAND() LIMIT 1",
-                    Integer.class,
-                    uid);
-
-        else
-            list = getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM ads_messages ORDER BY RAND() LIMIT 1",
-                    Integer.class);
-
-        return list.isEmpty() ?
-                0 : list.get(0);
-    }
-
-    @Transactional
-    @Override
-    public int logAdMid(final int uid, final int mid) {
-        return getJdbcTemplate().update(
-                "INSERT INTO ads_messages_log(user_id, message_id, ts) VALUES (?, ?, UNIX_TIMESTAMP())",
-                uid, mid);
-    }
-}
diff --git a/juick-server/src/test/java/com/juick/configuration/MockDataConfiguration.java b/juick-server/src/test/java/com/juick/configuration/MockDataConfiguration.java
index be72f6ca..bd2f3f50 100644
--- a/juick-server/src/test/java/com/juick/configuration/MockDataConfiguration.java
+++ b/juick-server/src/test/java/com/juick/configuration/MockDataConfiguration.java
@@ -37,10 +37,6 @@ public class MockDataConfiguration {
         return Mockito.mock(TelegramService.class);
     }
     @Bean
-    AdsService adsService() {
-        return Mockito.mock(AdsService.class);
-    }
-    @Bean
     CrosspostService crosspostService() {
         return Mockito.mock(CrosspostService.class);
     }