feed follow fix, shortened comment id

elastic · Jan 30, 2024 · 06eafeb · 06eafeb
1 parent 7c53b86
commit 06eafeb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/examples/realworld-app/rw-database/src/main/java/realworld/db/ArticleService.java b/examples/realworld-app/rw-database/src/main/java/realworld/db/ArticleService.java
@@ -400,6 +400,12 @@ public ArticlesDTO generateArticleFeed(User user) throws IOException {
             .stream()
             .map(Hit::source)
             .map(ArticleForListDTO::new)
+            // Filling the "following" field of "Author" accordingly
+            .map(a -> {
+                boolean following = user.following().contains(a.author().username());
+                return new ArticleForListDTO(a, new Author(a.author().username(),
+                    a.author().email(), a.author().bio(), following));
+            })
             .collect(Collectors.toList()), articlesByAuthors.hits().hits().size());
     }
 

diff --git a/examples/realworld-app/rw-database/src/main/java/realworld/db/CommentService.java b/examples/realworld-app/rw-database/src/main/java/realworld/db/CommentService.java
@@ -66,7 +66,7 @@ public Comment newComment(CommentCreationDTO commentDTO, String slug, User user)
         Instant now = Instant.now();
 
         // pre-generating id since it's a field in the comment class
-        Long commentId = new SecureRandom().nextLong();
+        Long commentId = Long.valueOf(String.valueOf(new SecureRandom().nextLong()).substring(0, 15));
         Comment comment = new Comment(commentId, now, now, commentDTO.body(), commentAuthor,
             slug);
 

diff --git a/examples/realworld-app/rw-rest/src/main/java/realworld/rest/ArticleController.java b/examples/realworld-app/rw-rest/src/main/java/realworld/rest/ArticleController.java
@@ -42,7 +42,7 @@
 
 import static realworld.utils.Utility.isNullOrBlank;
 
-@CrossOrigin()
+@CrossOrigin
 @RestController
 @RequestMapping("/articles")
 public class ArticleController {

diff --git a/examples/realworld-app/rw-rest/src/main/java/realworld/rest/ProfileController.java b/examples/realworld-app/rw-rest/src/main/java/realworld/rest/ProfileController.java
@@ -29,7 +29,7 @@
 
 import java.io.IOException;
 
-@CrossOrigin()
+@CrossOrigin
 @RestController
 @RequestMapping("/profiles")
 public class ProfileController {

diff --git a/examples/realworld-app/rw-rest/src/main/java/realworld/rest/TagsController.java b/examples/realworld-app/rw-rest/src/main/java/realworld/rest/TagsController.java
@@ -32,7 +32,7 @@
 
 import java.io.IOException;
 
-@CrossOrigin()
+@CrossOrigin
 @RestController
 @RequestMapping("/tags")
 public class TagsController {

diff --git a/examples/realworld-app/rw-rest/src/main/java/realworld/rest/UserController.java b/examples/realworld-app/rw-rest/src/main/java/realworld/rest/UserController.java
@@ -32,7 +32,7 @@
 
 import java.io.IOException;
 
-@CrossOrigin()
+@CrossOrigin
 @RestController
 @RequestMapping()
 public class UserController {