From 350f6942078e67b15e160ecffc913ba0cef624be Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 16 Apr 2018 14:14:27 +0300
Subject: server: do not make last read mark lower

---
 .../src/main/java/com/juick/service/MessagesServiceImpl.java            | 2 +-
 juick-server/src/test/java/com/juick/server/tests/ServerTests.java      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 996fb550..c0dccc6a 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
@@ -921,7 +921,7 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
     @Transactional
     @Override
     public void setLastReadComment(User user, Integer mid, Integer rid) {
-        jdbcTemplate.update("UPDATE subscr_messages SET last_read_rid=? WHERE message_id=? AND suser_id=?",
+        jdbcTemplate.update("UPDATE subscr_messages SET last_read_rid=GREATEST(?, last_read_rid) WHERE message_id=? AND suser_id=?",
                 rid, mid, user.getUid());
     }
 
diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
index d09a509d..046e0e7d 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
@@ -767,5 +767,7 @@ public class ServerTests {
         messagesService.getReplies(ugnich, mid);
         assertThat(lastRead.apply(ugnich, mid), is(1));
         assertThat(messagesService.getUnread(ugnich).size(), is(0));
+        messagesService.setLastReadComment(ugnich, mid, 0);
+        assertThat(lastRead.apply(ugnich, mid), is(1));
     }
 }
-- 
cgit v1.2.3