visibility for home feed (#168)

- This PR implement the visibility feature for home feed. The home feed
will contain all of the public status, quite public status and follower
status.
- [x] Implement Visibility.homefeedViewable to check if a status can be
displayed on given user homefeed.
- [x] replace manual LOG definition with lombok's CommonLog in
StatusService and VisibilityService.
- [x] integration test.

Author: thinh2

server/src/main/java/edu/sjsu/moth/server/service/StatusService.java

@@ -19,6 +19,7 @@
 import edu.sjsu.moth.server.db.StatusHistoryRepository;
 import edu.sjsu.moth.server.db.StatusMention;
 import edu.sjsu.moth.server.db.StatusRepository;
+import lombok.extern.apachecommons.CommonsLog;
 import org.bson.types.ObjectId;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,9 +32,9 @@
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Logger;
 
 @Configuration
+@CommonsLog
 public class StatusService {
 
     @Autowired
@@ -57,8 +58,6 @@ public class StatusService {
     @Autowired
     VisibilityService visibilityService;
 
-    Logger LOG = Logger.getLogger(StatusService.class.getName());
-
     public Mono<ArrayList<StatusEdit>> findHistory(String id) {
         return statusHistoryRepository.findById(id).map(edits -> edits.collection);
     }
@@ -97,13 +96,13 @@ public Mono<Status> save(Status status) {
         for (String s : accountsmentioned) {
             String[] tokens = s.split("@");
             if (tokens.length > 2) {
-                LOG.warning("Does not store remote user mention: " + s);
+                log.warn("Does not store remote user mention: " + s);
                 continue;
             }
             String username = tokens[1];
             mono = mono.then(accountService.getAccountById(username).switchIfEmpty(
                     Mono.error(new UsernameNotFoundException("Mentioned account not found: " + username))).map(acc -> {
-                LOG.finest("Adding mention: " + acc.username);
+                log.debug("Adding mention: " + acc.username);
                 status.mentions.add(new StatusMention(acc.id, acc.username, acc.url, acc.acct));
                 return Mono.empty();
             }));
@@ -167,9 +166,9 @@ public Mono<List<Status>> getHomeTimeline(Principal user, String max_id, String
         var predicate = qStatus.content.isNotNull();
         predicate = addRangeQueries(predicate, max_id, since_id, max_id);
         var external = externalStatusRepository.findAll(predicate, Sort.by(Sort.Direction.DESC, "id"))
-                .flatMap(statuses -> filterStatusByViewable(user, statuses, isFollowingTimeline)).take(limit);
+                .flatMap(statuses -> visibilityService.homefeedViewable(user, statuses)).take(limit);
         var internal = statusRepository.findAll(predicate, Sort.by(Sort.Direction.DESC, "id"))
-                .flatMap(statuses -> filterStatusByViewable(user, statuses, isFollowingTimeline)).take(limit);
+                .flatMap(statuses -> visibilityService.homefeedViewable(user, statuses)).take(limit);
 
         //TODO: we may want to merge sort them, unsure if merge does that
         return Flux.merge(external, internal).collectList();
@@ -264,4 +263,4 @@ private String convertToHex(String payload) {
         return String.format("%1$24s", payload).replace(' ', '0');
     }
 
-}
+}

server/src/main/java/edu/sjsu/moth/server/service/VisibilityService.java

@@ -11,19 +11,47 @@
 import reactor.core.publisher.Mono;
 
 import java.security.Principal;
-import java.util.logging.Logger;
 
 @Service
 @CommonsLog
 public class VisibilityService {
+    @Autowired
+    AccountService accountService;
+
+    @Autowired
+    FollowRepository followRepository;
+
     final String PUBLIC_VISIBILITY = "public";
     final String QUITE_PUBLIC = "unlisted";
     final String DIRECT_VISIBILITY = "direct";
+    final String PRIVATE_VISIBILITY = "private";
 
 
     public Flux<Status> publicTimelinesViewable(Status status) {
         if (status.visibility.equals(PUBLIC_VISIBILITY)) return Flux.just(status);
         return Flux.empty();
     }
 
+    public Flux<Status> homefeedViewable(Principal user, Status status) {
+        return accountService
+                .getAccount(user.getName())
+                .switchIfEmpty(Mono.error(new UsernameNotFoundException("User not found")))
+                .flatMapMany(account -> followRepository.findAllByFollowerId(account.id).flatMap(
+                        follow -> {
+                                if (follow.id.followed_id.equals(status.account.id)
+                                        && validHomeFeedVisibility(status.visibility)) {
+                                    return Flux.just(status);
+                                }
+                                return Flux.empty();
+                            }
+                        )
+                );
+    }
+
+    private boolean validHomeFeedVisibility(String visibility) {
+        return switch (visibility) {
+            case PUBLIC_VISIBILITY, PRIVATE_VISIBILITY, QUITE_PUBLIC -> true;
+            default -> false;
+        };
+    }
 }

server/src/test/java/edu/sjsu/moth/controllers/StatusControllerTest.java

@@ -14,6 +14,8 @@
 import edu.sjsu.moth.server.controller.StatusController;
 import edu.sjsu.moth.server.db.Account;
 import edu.sjsu.moth.server.db.AccountRepository;
+import edu.sjsu.moth.server.db.Follow;
+import edu.sjsu.moth.server.db.FollowRepository;
 import edu.sjsu.moth.server.db.StatusRepository;
 import edu.sjsu.moth.server.db.TokenRepository;
 import edu.sjsu.moth.server.service.StatusService;
@@ -54,7 +56,7 @@ public class StatusControllerTest {
     final AccountRepository accountRepository;
     final StatusService statusService;
     final StatusRepository statusRepository;
-
+    final FollowRepository followRepository;
     static {
         try {
             var fullname = IntegrationTest.class.getResource("/test.cfg").getFile();
@@ -70,12 +72,13 @@ public class StatusControllerTest {
     @Autowired
     public StatusControllerTest(WebTestClient webTestClient, TokenRepository tokenRepository,
                                 AccountRepository accountRepository, StatusService statusService,
-                                StatusRepository statusRepository) {
+                                StatusRepository statusRepository, FollowRepository followRepository) {
         this.webTestClient = webTestClient;
         this.tokenRepository = tokenRepository;
         this.accountRepository = accountRepository;
         this.statusService = statusService;
         this.statusRepository = statusRepository;
+        this.followRepository = followRepository;
     }
 
     @AfterAll
@@ -151,4 +154,38 @@ public void testPostStatusWithRemoteMentions() {
         Assertions.assertEquals(1, status.mentions.size());
         Assertions.assertEquals("test-mention", status.mentions.get(0).acct);
     }
+
+    @Test
+    public void testHomeFeedVisibility() {
+        String HOME_FEED_END_POINT = "/api/v1/timelines/home";
+        prepareStatusForHomeFeedVisibility();
+        accountRepository.save(new Account("test-fetch")).block();
+        followRepository.save(new Follow("test-fetch", "test-creator")).block();
+        // Mock the authentication
+        webTestClient
+                .mutateWith(mockJwt().jwt(jwt -> jwt.claim("sub", "test-fetch")))
+                .get()
+                .uri(HOME_FEED_END_POINT)
+                .exchange().expectStatus().isOk()
+                .expectBody()
+                .jsonPath("$.length()").isEqualTo(3);
+    }
+
+    private void prepareStatusForHomeFeedVisibility() {
+        String statusCreator = "test-creator";
+        accountRepository.save(new Account(statusCreator)).block();
+
+        StatusController.V1PostStatus request;
+        String[] visibilities = { "public", "unlisted", "private", "direct" };
+        for (String visibility : visibilities) {
+            request = new StatusController.V1PostStatus();
+            request.status = String.format("This is a %s status", visibility);
+            request.visibility = visibility;
+
+            webTestClient.mutateWith(mockJwt().jwt(jwt -> jwt.claim("sub", statusCreator))).post()
+                    .uri(POST_STATUS_ENDPOINT).contentType(MediaType.APPLICATION_JSON).bodyValue(request).exchange()
+                    .expectStatus().isOk();
+        }
+    }
+
 }