From db14962b7171eb0e713da54eecb032331d551d66 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 20 Apr 2018 11:22:21 +0300
Subject: server: /reactions list

---
 juick-server/src/main/java/com/juick/server/api/Post.java     | 11 ++++++++---
 .../src/test/java/com/juick/server/tests/ServerTests.java     |  9 +++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'juick-server')

diff --git a/juick-server/src/main/java/com/juick/server/api/Post.java b/juick-server/src/main/java/com/juick/server/api/Post.java
index 5a027ece..2e1ca6d7 100644
--- a/juick-server/src/main/java/com/juick/server/api/Post.java
+++ b/juick-server/src/main/java/com/juick/server/api/Post.java
@@ -17,6 +17,7 @@
 
 package com.juick.server.api;
 
+import com.juick.Reaction;
 import com.juick.Status;
 import com.juick.User;
 import com.juick.server.CommandsManager;
@@ -52,9 +53,7 @@ import java.net.URI;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
-import java.util.Properties;
-import java.util.Scanner;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * Created by vt on 24/11/2016.
@@ -256,6 +255,12 @@ public class Post {
         return Status.getStatus(status.getText());
     }
 
+    @GetMapping("/reactions")
+    @ResponseStatus(value = HttpStatus.OK)
+    public List<Reaction> reactionsList() {
+        return messagesService.listReactions();
+    }
+
     @PostMapping("/react")
     @ResponseStatus(value = HttpStatus.OK)
     public Status doPostReact(@RequestParam Integer mid,@RequestParam @NotNull int reactionId){
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 6b31906d..575bc7d1 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
@@ -444,9 +444,14 @@ public class ServerTests {
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
                 .andExpect((jsonPath("$[0].reactions[?(@.id == 3)].count",
-                        Matchers.is(Collections.singletonList(1)))))
+                        is(Collections.singletonList(1)))))
                 .andExpect((jsonPath("$[0].reactions[?(@.id == 2)].count",
-                        Matchers.is(Collections.singletonList(2)))));
+                        is(Collections.singletonList(2)))));
+
+        mockMvc.perform(get("/reactions?hash=" + userIdHash))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+                .andExpect(jsonPath("$.length()", is(7)));
     }
 
     @Test
-- 
cgit v1.2.3