aboutsummaryrefslogtreecommitdiff
path: root/juick-server-jdbc
diff options
context:
space:
mode:
Diffstat (limited to 'juick-server-jdbc')
-rw-r--r--juick-server-jdbc/build.gradle1
-rw-r--r--juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java24
-rw-r--r--juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java17
3 files changed, 29 insertions, 13 deletions
diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle
index 17ca88a9..9b19bcb4 100644
--- a/juick-server-jdbc/build.gradle
+++ b/juick-server-jdbc/build.gradle
@@ -41,6 +41,7 @@ dependencies {
providedRuntime "commons-fileupload:commons-fileupload:1.3.3"
+ testCompile project(path: ':juick-core', configuration: 'testArtifacts')
testCompile "ch.vorburger.mariaDB4j:mariaDB4j:2.2.3"
testCompile "junit:junit:${rootProject.junitVersion}"
testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
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 225845fe..caffda14 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
@@ -214,15 +214,11 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
@Transactional
@Override
public boolean recommendMessage(final int mid, final int vuid) {
- boolean res = getJdbcTemplate().update(
- "INSERT IGNORE INTO favorites(user_id, message_id, ts) VALUES (?, ?, NOW())",
- vuid, mid) == 1;
-
- if (res)
- getJdbcTemplate().update(
- "UPDATE messages SET likes = likes + 1 WHERE message_id = ?",
- mid);
- return res;
+ int wasDeleted = getJdbcTemplate()
+ .update("DELETE FROM favorites WHERE user_id=? AND message_id=?", vuid, mid);
+ return wasDeleted == 0
+ && getJdbcTemplate()
+ .update("INSERT INTO favorites(user_id, message_id, ts) VALUES (?, ?, NOW())", vuid, mid) == 1;
}
@Transactional(readOnly = true)
@@ -292,11 +288,13 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
+ "messages.ts,"
+ "messages.readonly, messages.privacy, messages.replies,"
+ "messages.attach, messages.place_id, messages.lat,"
- + "messages.lon, messages.likes, messages.hidden,"
+ + "messages.lon, COUNT(favorites.user_id) as likes, messages.hidden,"
+ "txt.tags, txt.repliesby, txt.txt, '' as q FROM messages "
+ "INNER JOIN users ON messages.user_id = users.id "
+ "INNER JOIN messages_txt AS txt "
+ "ON messages.message_id = txt.message_id "
+ + "LEFT JOIN favorites "
+ + "ON messages.message_id = favorites.message_id "
+ "WHERE messages.message_id = ?",
new MessageMapper(),
mid);
@@ -709,12 +707,14 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
+ "messages.ts,"
+ "messages.readonly,messages.privacy,messages.replies,"
+ "messages.attach,messages.place_id,messages.lat,"
- + "messages.lon,messages.likes,messages.hidden,"
+ + "messages.lon,COUNT(favorites.user_id) AS likes,messages.hidden,"
+ "messages_txt.tags,messages_txt.repliesby, messages_txt.txt, '' as q "
+ "FROM (messages INNER JOIN messages_txt "
+ "ON messages.message_id=messages_txt.message_id) "
+ "INNER JOIN users ON messages.user_id=users.id "
- + "WHERE messages.message_id IN (:ids) ORDER BY messages.message_id DESC",
+ + "LEFT JOIN favorites "
+ + "ON messages.message_id = favorites.message_id "
+ + "WHERE messages.message_id IN (:ids) GROUP BY messages.message_id ORDER BY messages.message_id DESC",
new MapSqlParameterSource("ids", mids),
new MessageMapper());
}
diff --git a/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java b/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java
index fed5dad8..fae938cc 100644
--- a/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java
+++ b/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java
@@ -24,6 +24,9 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import javax.inject.Inject;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
/**
* Created by aalexeev on 11/25/16.
*/
@@ -31,10 +34,22 @@ import javax.inject.Inject;
public class MessageServiceTest extends AbstractJUnit4SpringContextTests {
@Inject
private MessagesService messagesService;
-
+ @Inject
+ private UserService userService;
@Test
public void getMyFeed() {
messagesService.getMyFeed(1, 1000000);
}
+ @Test
+ public void likesCountShouldMatch() {
+ int uid = userService.createUser("ugnich", "secret");
+ int mid = messagesService.createMessage(uid, "test", null, null);
+ int mid2 = messagesService.createMessage(uid, "test2", null, null);
+ assertThat(messagesService.recommendMessage(mid, uid), equalTo(true));
+ assertThat(messagesService.getMessage(mid).getLikes(), equalTo(1));
+ assertThat(messagesService.recommendMessage(mid, uid), equalTo(false));
+ assertThat(messagesService.getMessage(mid).getLikes(), equalTo(0));
+ assertThat(messagesService.getAll(uid, 0).size(), equalTo(2));
+ }
}