notifications: moved top service from cron

9 files changed, 317 insertions, 4 deletions

diff --git a/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java b/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java
index df091d51..828f8cbd 100644
--- a/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java
+++ b/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java
@@ -45,7 +45,7 @@ import java.util.Collections;
 @EnableWebMvc
 @EnableSwagger2
 @PropertySource("classpath:juick.conf")
-@ComponentScan(basePackages = "com.juick.api")
+@ComponentScan(basePackages = "com.juick")
 public class ApiAppConfiguration extends BaseWebConfiguration {
     @Bean
     public JuickServerComponent juickServerComponent() {
diff --git a/juick-api/src/main/java/com/juick/api/controllers/Messages.java b/juick-api/src/main/java/com/juick/api/controllers/Messages.java
index 322effa3..5f00ee68 100644
--- a/juick-api/src/main/java/com/juick/api/controllers/Messages.java
+++ b/juick-api/src/main/java/com/juick/api/controllers/Messages.java
@@ -178,6 +178,15 @@ public class Messages {
         }
         throw new HttpForbiddenException();
     }
+    @ApiIgnore
+    @RequestMapping("/messages/top_candidates")
+    public List<Integer> topCandidates() {
+        User visitor = UserUtils.getCurrentUser();
+        if ((visitor.getUid() == 0) || !(visitor.getName().equals("juick"))) {
+            throw new HttpForbiddenException();
+        }
+        return messagesService.getPopularCandidates();
+    }
 
     @ApiIgnore
     @RequestMapping("/messages/set_popular")
diff --git a/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java b/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
index 13d399ca..35f09314 100644
--- a/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
+++ b/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
@@ -24,6 +24,7 @@ import com.juick.Message;
 import com.juick.Tag;
 import com.juick.User;
 import com.juick.api.configuration.ApiAppConfiguration;
+import com.juick.api.configuration.ApiSecurityConfig;
 import com.juick.api.tests.configuration.MockStorageConfiguration;
 import com.juick.configuration.RepositoryConfiguration;
 import com.juick.service.ImagesService;
@@ -51,6 +52,7 @@ import javax.inject.Inject;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.IntStream;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
@@ -62,7 +64,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  * Created by vitalyster on 25.11.2016.
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {RepositoryConfiguration.class, ApiAppConfiguration.class, MockStorageConfiguration.class})
+@ContextConfiguration(classes = {ApiAppConfiguration.class, ApiSecurityConfig.class, RepositoryConfiguration.class, MockStorageConfiguration.class})
 @WebAppConfiguration
 public class MessagesTests extends AbstractJUnit4SpringContextTests {
 
@@ -84,6 +86,7 @@ public class MessagesTests extends AbstractJUnit4SpringContextTests {
     private static User ugnich, freefd, juick;
     static String ugnichName, ugnichPassword, freefdName, freefdPassword, juickName, juickPassword;
     static Message msg;
+    static int juickTagId;
 
     private static boolean isSetUp = false;
 
@@ -112,6 +115,8 @@ public class MessagesTests extends AbstractJUnit4SpringContextTests {
 
             int mid = messagesService.createMessage(ugnich.getUid(), msgText, "png", null);
             msg = messagesService.getMessage(mid);
+            tagService.createTag("тест");
+            juickTagId = tagService.createTag("juick");
             isSetUp = true;
         }
     }
@@ -281,4 +286,22 @@ public class MessagesTests extends AbstractJUnit4SpringContextTests {
                 .contentType(MediaType.APPLICATION_JSON_UTF8)
                 .content(jsonMapper.writeValueAsBytes(tokens))).andExpect(status().isOk());
     }
+    @Test
+    public void topTest() throws Exception {
+        int topmid = messagesService.createMessage(ugnich.getUid(), "top message", null, null);
+        IntStream.rangeClosed(6, 12).forEach(i -> {
+            messagesService.createReply(topmid, 0, i, "yo", null);
+        });
+        mockMvc.perform(get("/messages/top_candidates").with(httpBasic(juickName, juickPassword))
+                .contentType(MediaType.APPLICATION_JSON_UTF8))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$[0]", is(topmid)));
+        Tag juickTag = tagService.getTag(juickTagId);
+        assertThat(juickTag.TID, is(2));
+        tagService.updateTags(topmid, Collections.singletonList(juickTag));
+        mockMvc.perform(get("/messages/top_candidates").with(httpBasic(juickName, juickPassword))
+                .contentType(MediaType.APPLICATION_JSON_UTF8))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", hasSize(0)));
+    }
 }
diff --git a/juick-notifications/src/main/java/com/juick/components/Top.java b/juick-notifications/src/main/java/com/juick/components/Top.java
new file mode 100644
index 00000000..e09dad18
--- /dev/null
+++ b/juick-notifications/src/main/java/com/juick/components/Top.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.components;
+
+import com.juick.service.MessagesService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
+
+@Component
+public class Top {
+    private static Logger logger = LoggerFactory.getLogger(Top.class);
+    @Inject
+    MessagesService messagesService;
+
+    @Scheduled(fixedRate = 120000)
+    public void updateTop() {
+        messagesService.getPopularCandidates().stream().forEach(m -> {
+            logger.info("added {} to popular", m);
+            messagesService.setMessagePopular(m, 1);
+        });
+    }
+}
diff --git a/juick-notifications/src/main/java/com/juick/components/service/ApiMessagesService.java b/juick-notifications/src/main/java/com/juick/components/service/ApiMessagesService.java
new file mode 100644
index 00000000..1ee9c3f1
--- /dev/null
+++ b/juick-notifications/src/main/java/com/juick/components/service/ApiMessagesService.java
@@ -0,0 +1,222 @@
+package com.juick.components.service;
+
+import com.juick.Message;
+import com.juick.Tag;
+import com.juick.User;
+import com.juick.server.helpers.ResponseReply;
+import com.juick.service.BaseRestService;
+import com.juick.service.MessagesService;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.web.client.RestTemplate;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+
+public class ApiMessagesService extends BaseRestService implements MessagesService {
+    public ApiMessagesService(RestTemplate rest) {
+        super(rest);
+    }
+
+    @Override
+    public int createMessage(int uid, String txt, String attachment, Collection<Tag> tags) {
+        return 0;
+    }
+
+    @Override
+    public int createReply(int mid, int rid, int uid, String txt, String attachment) {
+        return 0;
+    }
+
+    @Override
+    public int getReplyIDIncrement(int mid) {
+        return 0;
+    }
+
+    @Override
+    public boolean recommendMessage(int mid, int vuid) {
+        return false;
+    }
+
+    @Override
+    public boolean canViewThread(int mid, int uid) {
+        return false;
+    }
+
+    @Override
+    public boolean isReadOnly(int mid) {
+        return false;
+    }
+
+    @Override
+    public boolean isSubscribed(int uid, int mid) {
+        return false;
+    }
+
+    @Override
+    public int getMessagePrivacy(int mid) {
+        return 0;
+    }
+
+    @Override
+    public Message getMessage(int mid) {
+        return null;
+    }
+
+    @Override
+    public Message getReply(int mid, int rid) {
+        return null;
+    }
+
+    @Override
+    public User getMessageAuthor(int mid) {
+        return null;
+    }
+
+    @Override
+    public List<String> getMessageRecommendations(int mid) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getAll(int visitorUid, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getTag(int tid, int visitorUid, int before, int cnt) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getTags(String tids, int visitorUid, int before, int cnt) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getPlace(int placeId, int visitorUid, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getMyFeed(int uid, int before, boolean recommended) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getPrivate(int uid, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getDiscussions(int uid, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getRecommended(int uid, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getPopular(int visitorUid, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getPhotos(int visitorUid, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getSearch(String search, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getUserBlog(int uid, int privacy, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getUserTag(int uid, int tid, int privacy, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getUserBlogAtDay(int uid, int privacy, int daysback) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getUserBlogWithRecommendations(int uid, int privacy, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getUserRecommendations(int uid, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getUserPhotos(int uid, int privacy, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getUserSearch(int UID, String search, int privacy, int before) {
+        return null;
+    }
+
+    @Override
+    public List<Message> getMessages(Collection<Integer> mids) {
+        return null;
+    }
+
+    @Override
+    public List<Message> getReplies(int mid) {
+        return null;
+    }
+
+    @Override
+    public boolean setMessagePopular(int mid, int popular) {
+        return false;
+    }
+
+    @Override
+    public boolean setMessagePrivacy(int mid) {
+        return false;
+    }
+
+    @Override
+    public boolean deleteMessage(int uid, int mid) {
+        return false;
+    }
+
+    @Override
+    public List<Integer> getLastMessages(int hours) {
+        return null;
+    }
+
+    @Override
+    public List<ResponseReply> getLastReplies(int hours) {
+        return null;
+    }
+
+    @Override
+    public List<Message> getNotifications(User user, LocalDateTime before) {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getPopularCandidates() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+        return getRest().exchange("/messages/top_candidates", HttpMethod.GET, new HttpEntity<>(headers), new ParameterizedTypeReference<List<Integer>>() {
+        }).getBody();
+    }
+}
diff --git a/juick-server-core/src/main/java/com/juick/service/MessagesService.java b/juick-server-core/src/main/java/com/juick/service/MessagesService.java
index 870a7249..c5ef13e0 100644
--- a/juick-server-core/src/main/java/com/juick/service/MessagesService.java
+++ b/juick-server-core/src/main/java/com/juick/service/MessagesService.java
@@ -103,4 +103,6 @@ public interface MessagesService {
     List<ResponseReply> getLastReplies(int hours);
 
     List<com.juick.Message> getNotifications(User user, LocalDateTime before);
+
+    List<Integer> getPopularCandidates();
 }
diff --git a/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java b/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
index 27e60e9b..c728b527 100644
--- a/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
+++ b/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
@@ -28,6 +28,7 @@ import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.TransactionManagementConfigurer;
 
+import javax.sql.DataSource;
 import java.util.Collections;
 import java.util.List;
 
@@ -51,7 +52,7 @@ public class DataConfiguration implements TransactionManagementConfigurer {
     // NOTE: The close() method will be called automatically with default @Bean settings
     // But Datasource interface has no close() method
     @Bean
-    public BasicDataSource dataSource() {
+    public DataSource dataSource() {
         BasicDataSource dataSource = new BasicDataSource();
 
         dataSource.setDriverClassName(datasourceDriver);
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
index f71837a7..751b7fc3 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -870,4 +870,18 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
                 .addValue("before", before),
                 new MessageMapper());
     }
+    @Transactional(readOnly = true)
+    @Override
+    public List<Integer> getPopularCandidates() {
+        return getJdbcTemplate().queryForList("SELECT replies.message_id FROM replies " +
+                "INNER JOIN messages ON replies.message_id = messages.message_id " +
+                "LEFT JOIN messages_tags ON messages_tags.message_id = messages.message_id " +
+                "WHERE COALESCE(messages_tags.tag_id, 0) != 2 AND replies.ts > DATE_ADD(now(), INTERVAL -2 HOUR) " +
+                "AND messages.popular=0 GROUP BY message_id having COUNT(DISTINCT(replies.user_id)) > 5 " +
+                "UNION ALL SELECT favorites.message_id FROM favorites " +
+                "INNER JOIN messages ON messages.message_id = favorites.message_id " +
+                "LEFT JOIN messages_tags ON messages_tags.message_id = messages.message_id " +
+                "WHERE COALESCE(messages_tags.tag_id, 0) != 2 AND favorites.ts > DATE_ADD(NOW(), INTERVAL -2 HOUR) " +
+                "GROUP BY message_id HAVING COUNT(DISTINCT favorites.user_id) > 1;", Integer.class);
+    }
 }
diff --git a/juick-server-jdbc/src/test/java/com/juick/configuration/RepositoryConfiguration.java b/juick-server-jdbc/src/test/java/com/juick/configuration/RepositoryConfiguration.java
index dbd13098..94031944 100644
--- a/juick-server-jdbc/src/test/java/com/juick/configuration/RepositoryConfiguration.java
+++ b/juick-server-jdbc/src/test/java/com/juick/configuration/RepositoryConfiguration.java
@@ -28,6 +28,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 
+import javax.sql.DataSource;
 import java.util.Collections;
 import java.util.List;
 
@@ -50,7 +51,7 @@ public class RepositoryConfiguration {
     }
 
     @Bean
-    public DriverManagerDataSource dataSource() {
+    public DataSource dataSource() {
         DriverManagerDataSource dataSource = new DriverManagerDataSource();
         dataSource.setDriverClassName("net.sf.log4jdbc.DriverSpy");
         dataSource.setUrl("jdbc:log4jdbc:mysql://localhost:33306/juick?autoReconnect=true&user=root");