mirror of https://github.com/halo-dev/halo
feat: display unapproved comments created by the current user (#3102)
#### What type of PR is this? /kind improvement /area core /milestone 2.2.x #### What this PR does / why we need it: 主题端显示当前用户创建的未审核通过的评论/回复 在开启了评论审核功能的前提下： - 如果非匿名用户在主题端创建的评论或回复必须审核通过才能显示。 - 如果用户登录后评论或回复会被立即展示在列表，但仅限创建者可见，审核通过后对所有人可见。 #### Which issue(s) this PR fixes: Fixes #2731 #### Special notes for your reviewer: /cc @halo-dev/sig-halo #### Does this PR introduce a user-facing change? ```release-note 主题端支持显示当前用户创建的未审核的评论 ```pull/3130/head
guqing
GitHub
parent
64ed793efd
commit
92e57b056b
|
|
@ -1,12 +1,17 @@
|
||||||
package run.halo.app.theme.finders.impl;
|
package run.halo.app.theme.finders.impl;
|
||||||
|
|
||||||
|
import java.security.Principal;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
|
import org.apache.commons.lang3.BooleanUtils;
|
||||||
import org.apache.commons.lang3.ObjectUtils;
|
import org.apache.commons.lang3.ObjectUtils;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
|
||||||
|
import org.springframework.security.core.context.SecurityContext;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import reactor.core.publisher.Flux;
|
import reactor.core.publisher.Flux;
|
||||||
import reactor.core.publisher.Mono;
|
import reactor.core.publisher.Mono;
|
||||||
|
|
@ -17,6 +22,7 @@ import run.halo.app.core.extension.content.Reply;
|
||||||
import run.halo.app.extension.ListResult;
|
import run.halo.app.extension.ListResult;
|
||||||
import run.halo.app.extension.ReactiveExtensionClient;
|
import run.halo.app.extension.ReactiveExtensionClient;
|
||||||
import run.halo.app.extension.Ref;
|
import run.halo.app.extension.Ref;
|
||||||
|
import run.halo.app.infra.AnonymousUserConst;
|
||||||
import run.halo.app.theme.finders.CommentFinder;
|
import run.halo.app.theme.finders.CommentFinder;
|
||||||
import run.halo.app.theme.finders.Finder;
|
import run.halo.app.theme.finders.Finder;
|
||||||
import run.halo.app.theme.finders.vo.CommentVo;
|
import run.halo.app.theme.finders.vo.CommentVo;
|
||||||
|
|
@ -45,35 +51,40 @@ public class CommentFinderImpl implements CommentFinder {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Mono<ListResult<CommentVo>> list(Ref ref, Integer page, Integer size) {
|
public Mono<ListResult<CommentVo>> list(Ref ref, Integer page, Integer size) {
|
||||||
return client.list(Comment.class, fixedPredicate(ref),
|
return fixedCommentPredicate(ref)
|
||||||
defaultComparator(),
|
.flatMap(fixedPredicate ->
|
||||||
pageNullSafe(page), sizeNullSafe(size))
|
client.list(Comment.class, fixedPredicate,
|
||||||
.flatMap(list -> Flux.fromStream(list.get().map(this::toCommentVo))
|
defaultComparator(),
|
||||||
.concatMap(Function.identity())
|
pageNullSafe(page), sizeNullSafe(size))
|
||||||
.collectList()
|
.flatMap(list -> Flux.fromStream(list.get().map(this::toCommentVo))
|
||||||
.map(commentVos -> new ListResult<>(list.getPage(), list.getSize(), list.getTotal(),
|
.concatMap(Function.identity())
|
||||||
commentVos)
|
.collectList()
|
||||||
)
|
.map(commentVos -> new ListResult<>(list.getPage(), list.getSize(),
|
||||||
)
|
list.getTotal(),
|
||||||
.defaultIfEmpty(new ListResult<>(page, size, 0L, List.of()));
|
commentVos)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.defaultIfEmpty(new ListResult<>(page, size, 0L, List.of()))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Mono<ListResult<ReplyVo>> listReply(String commentName, Integer page, Integer size) {
|
public Mono<ListResult<ReplyVo>> listReply(String commentName, Integer page, Integer size) {
|
||||||
Comparator<Reply> comparator =
|
Comparator<Reply> comparator =
|
||||||
Comparator.comparing(reply -> reply.getMetadata().getCreationTimestamp());
|
Comparator.comparing(reply -> reply.getMetadata().getCreationTimestamp());
|
||||||
return client.list(Reply.class,
|
return fixedReplyPredicate(commentName)
|
||||||
reply -> reply.getSpec().getCommentName().equals(commentName)
|
.flatMap(fixedPredicate ->
|
||||||
&& Objects.equals(false, reply.getSpec().getHidden())
|
client.list(Reply.class, fixedPredicate,
|
||||||
&& Objects.equals(true, reply.getSpec().getApproved()),
|
comparator.reversed(), pageNullSafe(page), sizeNullSafe(size))
|
||||||
comparator.reversed(), pageNullSafe(page), sizeNullSafe(size))
|
.flatMap(list -> Flux.fromStream(list.get().map(this::toReplyVo))
|
||||||
.flatMap(list -> Flux.fromStream(list.get().map(this::toReplyVo))
|
.concatMap(Function.identity())
|
||||||
.concatMap(Function.identity())
|
.collectList()
|
||||||
.collectList()
|
.map(replyVos -> new ListResult<>(list.getPage(), list.getSize(),
|
||||||
.map(replyVos -> new ListResult<>(list.getPage(), list.getSize(), list.getTotal(),
|
list.getTotal(),
|
||||||
replyVos))
|
replyVos))
|
||||||
)
|
)
|
||||||
.defaultIfEmpty(new ListResult<>(page, size, 0L, List.of()));
|
.defaultIfEmpty(new ListResult<>(page, size, 0L, List.of()))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Mono<CommentVo> toCommentVo(Comment comment) {
|
private Mono<CommentVo> toCommentVo(Comment comment) {
|
||||||
|
|
@ -102,11 +113,56 @@ public class CommentFinderImpl implements CommentFinder {
|
||||||
.defaultIfEmpty(OwnerInfo.ghostUser());
|
.defaultIfEmpty(OwnerInfo.ghostUser());
|
||||||
}
|
}
|
||||||
|
|
||||||
private Predicate<Comment> fixedPredicate(Ref ref) {
|
private Mono<Predicate<Comment>> fixedCommentPredicate(Ref ref) {
|
||||||
Assert.notNull(ref, "Comment subject reference must not be null");
|
Assert.notNull(ref, "Comment subject reference must not be null");
|
||||||
return comment -> comment.getSpec().getSubjectRef().equals(ref)
|
// Ref must be equal to the comment subject
|
||||||
&& Objects.equals(false, comment.getSpec().getHidden())
|
Predicate<Comment> refPredicate = comment -> comment.getSpec().getSubjectRef().equals(ref)
|
||||||
&& Objects.equals(true, comment.getSpec().getApproved());
|
&& comment.getMetadata().getDeletionTimestamp() == null;
|
||||||
|
|
||||||
|
// is approved and not hidden
|
||||||
|
Predicate<Comment> approvedPredicate =
|
||||||
|
comment -> BooleanUtils.isFalse(comment.getSpec().getHidden())
|
||||||
|
&& BooleanUtils.isTrue(comment.getSpec().getApproved());
|
||||||
|
return getCurrentUserWithoutAnonymous()
|
||||||
|
.map(username -> {
|
||||||
|
Predicate<Comment> isOwner = comment -> {
|
||||||
|
Comment.CommentOwner owner = comment.getSpec().getOwner();
|
||||||
|
return owner != null && StringUtils.equals(username, owner.getName());
|
||||||
|
};
|
||||||
|
return approvedPredicate.or(isOwner);
|
||||||
|
})
|
||||||
|
.defaultIfEmpty(approvedPredicate)
|
||||||
|
.map(refPredicate::and);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Mono<Predicate<Reply>> fixedReplyPredicate(String commentName) {
|
||||||
|
Assert.notNull(commentName, "The commentName must not be null");
|
||||||
|
// The comment name must be equal to the comment name of the reply
|
||||||
|
Predicate<Reply> commentNamePredicate =
|
||||||
|
reply -> reply.getSpec().getCommentName().equals(commentName)
|
||||||
|
&& reply.getMetadata().getDeletionTimestamp() == null;
|
||||||
|
|
||||||
|
// is approved and not hidden
|
||||||
|
Predicate<Reply> approvedPredicate =
|
||||||
|
reply -> BooleanUtils.isFalse(reply.getSpec().getHidden())
|
||||||
|
&& BooleanUtils.isTrue(reply.getSpec().getApproved());
|
||||||
|
return getCurrentUserWithoutAnonymous()
|
||||||
|
.map(username -> {
|
||||||
|
Predicate<Reply> isOwner = reply -> {
|
||||||
|
Comment.CommentOwner owner = reply.getSpec().getOwner();
|
||||||
|
return owner != null && StringUtils.equals(username, owner.getName());
|
||||||
|
};
|
||||||
|
return approvedPredicate.or(isOwner);
|
||||||
|
})
|
||||||
|
.defaultIfEmpty(approvedPredicate)
|
||||||
|
.map(commentNamePredicate::and);
|
||||||
|
}
|
||||||
|
|
||||||
|
Mono<String> getCurrentUserWithoutAnonymous() {
|
||||||
|
return ReactiveSecurityContextHolder.getContext()
|
||||||
|
.mapNotNull(SecurityContext::getAuthentication)
|
||||||
|
.map(Principal::getName)
|
||||||
|
.filter(username -> !AnonymousUserConst.PRINCIPAL.equals(username));
|
||||||
}
|
}
|
||||||
|
|
||||||
static Comparator<Comment> defaultComparator() {
|
static Comparator<Comment> defaultComparator() {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,316 @@
|
||||||
|
package run.halo.app.theme.finders.impl;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Predicate;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
import org.junit.jupiter.api.Nested;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.extension.ExtendWith;
|
||||||
|
import org.mockito.InjectMocks;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.stubbing.Answer;
|
||||||
|
import org.springframework.security.test.context.support.WithMockUser;
|
||||||
|
import org.springframework.test.context.junit.jupiter.SpringExtension;
|
||||||
|
import reactor.core.publisher.Mono;
|
||||||
|
import reactor.test.StepVerifier;
|
||||||
|
import run.halo.app.core.extension.User;
|
||||||
|
import run.halo.app.core.extension.content.Comment;
|
||||||
|
import run.halo.app.core.extension.content.Post;
|
||||||
|
import run.halo.app.core.extension.content.Reply;
|
||||||
|
import run.halo.app.extension.GroupVersionKind;
|
||||||
|
import run.halo.app.extension.ListResult;
|
||||||
|
import run.halo.app.extension.Metadata;
|
||||||
|
import run.halo.app.extension.ReactiveExtensionClient;
|
||||||
|
import run.halo.app.extension.Ref;
|
||||||
|
import run.halo.app.infra.AnonymousUserConst;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests for {@link CommentFinderImpl}.
|
||||||
|
*
|
||||||
|
* @author guqing
|
||||||
|
* @since 2.0.0
|
||||||
|
*/
|
||||||
|
@ExtendWith(SpringExtension.class)
|
||||||
|
class CommentFinderImplTest {
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private ReactiveExtensionClient client;
|
||||||
|
|
||||||
|
@InjectMocks
|
||||||
|
private CommentFinderImpl commentFinder;
|
||||||
|
|
||||||
|
@Nested
|
||||||
|
class ListCommentTest {
|
||||||
|
@Test
|
||||||
|
void listWhenUserNotLogin() {
|
||||||
|
// Mock
|
||||||
|
mockWhenListComment();
|
||||||
|
|
||||||
|
Ref ref = Ref.of("fake-post", GroupVersionKind.fromExtension(Post.class));
|
||||||
|
commentFinder.list(ref, 1, 10)
|
||||||
|
.as(StepVerifier::create)
|
||||||
|
.consumeNextWith(listResult -> {
|
||||||
|
assertThat(listResult.getTotal()).isEqualTo(2);
|
||||||
|
assertThat(listResult.getItems().size()).isEqualTo(2);
|
||||||
|
assertThat(listResult.getItems().get(0).getMetadata().getName())
|
||||||
|
.isEqualTo("comment-approved");
|
||||||
|
})
|
||||||
|
.verifyComplete();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@WithMockUser(username = AnonymousUserConst.PRINCIPAL)
|
||||||
|
void listWhenUserIsAnonymous() {
|
||||||
|
// Mock
|
||||||
|
mockWhenListComment();
|
||||||
|
|
||||||
|
Ref ref = Ref.of("fake-post", GroupVersionKind.fromExtension(Post.class));
|
||||||
|
commentFinder.list(ref, 1, 10)
|
||||||
|
.as(StepVerifier::create)
|
||||||
|
.consumeNextWith(listResult -> {
|
||||||
|
assertThat(listResult.getTotal()).isEqualTo(2);
|
||||||
|
assertThat(listResult.getItems().size()).isEqualTo(2);
|
||||||
|
assertThat(listResult.getItems().get(0).getMetadata().getName())
|
||||||
|
.isEqualTo("comment-approved");
|
||||||
|
})
|
||||||
|
.verifyComplete();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@WithMockUser(username = "fake-user")
|
||||||
|
void listWhenUserLoggedIn() {
|
||||||
|
mockWhenListComment();
|
||||||
|
|
||||||
|
Ref ref = Ref.of("fake-post", GroupVersionKind.fromExtension(Post.class));
|
||||||
|
commentFinder.list(ref, 1, 10)
|
||||||
|
.as(StepVerifier::create)
|
||||||
|
.consumeNextWith(listResult -> {
|
||||||
|
assertThat(listResult.getTotal()).isEqualTo(3);
|
||||||
|
assertThat(listResult.getItems().size()).isEqualTo(3);
|
||||||
|
assertThat(listResult.getItems().get(0).getMetadata().getName())
|
||||||
|
.isEqualTo("comment-not-approved");
|
||||||
|
assertThat(listResult.getItems().get(1).getMetadata().getName())
|
||||||
|
.isEqualTo("comment-approved");
|
||||||
|
})
|
||||||
|
.verifyComplete();
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private void mockWhenListComment() {
|
||||||
|
// Mock
|
||||||
|
Comment commentNotApproved = createComment();
|
||||||
|
commentNotApproved.getMetadata().setName("comment-not-approved");
|
||||||
|
commentNotApproved.getSpec().setApproved(false);
|
||||||
|
|
||||||
|
Comment commentApproved = createComment();
|
||||||
|
commentApproved.getMetadata().setName("comment-approved");
|
||||||
|
commentApproved.getSpec().setApproved(true);
|
||||||
|
|
||||||
|
Comment notApprovedWithAnonymous = createComment();
|
||||||
|
notApprovedWithAnonymous.getMetadata().setName("comment-not-approved-anonymous");
|
||||||
|
notApprovedWithAnonymous.getSpec().setApproved(false);
|
||||||
|
notApprovedWithAnonymous.getSpec().getOwner().setName(AnonymousUserConst.PRINCIPAL);
|
||||||
|
|
||||||
|
Comment commentApprovedButAnotherOwner = createComment();
|
||||||
|
commentApprovedButAnotherOwner.getMetadata()
|
||||||
|
.setName("comment-approved-but-another-owner");
|
||||||
|
commentApprovedButAnotherOwner.getSpec().setApproved(true);
|
||||||
|
commentApprovedButAnotherOwner.getSpec().getOwner().setName("another");
|
||||||
|
|
||||||
|
Comment commentNotApprovedAndAnotherOwner = createComment();
|
||||||
|
commentNotApprovedAndAnotherOwner.getMetadata()
|
||||||
|
.setName("comment-not-approved-and-another");
|
||||||
|
commentNotApprovedAndAnotherOwner.getSpec().setApproved(false);
|
||||||
|
commentNotApprovedAndAnotherOwner.getSpec().getOwner().setName("another");
|
||||||
|
|
||||||
|
Comment notApprovedAndAnotherRef = createComment();
|
||||||
|
notApprovedAndAnotherRef.getMetadata()
|
||||||
|
.setName("comment-not-approved-and-another-ref");
|
||||||
|
notApprovedAndAnotherRef.getSpec().setApproved(false);
|
||||||
|
Ref anotherRef =
|
||||||
|
Ref.of("another-fake-post", GroupVersionKind.fromExtension(Post.class));
|
||||||
|
notApprovedAndAnotherRef.getSpec().setSubjectRef(anotherRef);
|
||||||
|
|
||||||
|
when(client.list(eq(Comment.class), any(),
|
||||||
|
any(),
|
||||||
|
eq(1),
|
||||||
|
eq(10))
|
||||||
|
).thenAnswer((Answer<Mono<ListResult<Comment>>>) invocation -> {
|
||||||
|
Predicate<Comment> predicate =
|
||||||
|
invocation.getArgument(1, Predicate.class);
|
||||||
|
List<Comment> comments = Stream.of(
|
||||||
|
commentNotApproved,
|
||||||
|
commentApproved,
|
||||||
|
commentApprovedButAnotherOwner,
|
||||||
|
commentNotApprovedAndAnotherOwner,
|
||||||
|
notApprovedWithAnonymous,
|
||||||
|
notApprovedAndAnotherRef
|
||||||
|
).filter(predicate).toList();
|
||||||
|
return Mono.just(new ListResult<>(1, 10, comments.size(), comments));
|
||||||
|
});
|
||||||
|
|
||||||
|
when(client.fetch(eq(User.class), any())).thenReturn(Mono.just(createUser()));
|
||||||
|
}
|
||||||
|
|
||||||
|
Comment createComment() {
|
||||||
|
Comment comment = new Comment();
|
||||||
|
comment.setMetadata(new Metadata());
|
||||||
|
comment.getMetadata().setName("fake-comment");
|
||||||
|
comment.setSpec(new Comment.CommentSpec());
|
||||||
|
comment.setStatus(new Comment.CommentStatus());
|
||||||
|
|
||||||
|
comment.getSpec().setRaw("fake-raw");
|
||||||
|
comment.getSpec().setContent("fake-content");
|
||||||
|
comment.getSpec().setHidden(false);
|
||||||
|
comment.getSpec()
|
||||||
|
.setSubjectRef(Ref.of("fake-post", GroupVersionKind.fromExtension(Post.class)));
|
||||||
|
Comment.CommentOwner commentOwner = new Comment.CommentOwner();
|
||||||
|
commentOwner.setKind(User.KIND);
|
||||||
|
commentOwner.setName("fake-user");
|
||||||
|
commentOwner.setDisplayName("fake-display-name");
|
||||||
|
comment.getSpec().setOwner(commentOwner);
|
||||||
|
return comment;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nested
|
||||||
|
class ListReplyTest {
|
||||||
|
@Test
|
||||||
|
void listWhenUserNotLogin() {
|
||||||
|
// Mock
|
||||||
|
mockWhenListRely();
|
||||||
|
|
||||||
|
commentFinder.listReply("fake-comment", 1, 10)
|
||||||
|
.as(StepVerifier::create)
|
||||||
|
.consumeNextWith(listResult -> {
|
||||||
|
assertThat(listResult.getTotal()).isEqualTo(2);
|
||||||
|
assertThat(listResult.getItems().size()).isEqualTo(2);
|
||||||
|
assertThat(listResult.getItems().get(0).getMetadata().getName())
|
||||||
|
.isEqualTo("reply-approved");
|
||||||
|
})
|
||||||
|
.verifyComplete();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@WithMockUser(username = AnonymousUserConst.PRINCIPAL)
|
||||||
|
void listWhenUserIsAnonymous() {
|
||||||
|
// Mock
|
||||||
|
mockWhenListRely();
|
||||||
|
|
||||||
|
commentFinder.listReply("fake-comment", 1, 10)
|
||||||
|
.as(StepVerifier::create)
|
||||||
|
.consumeNextWith(listResult -> {
|
||||||
|
assertThat(listResult.getTotal()).isEqualTo(2);
|
||||||
|
assertThat(listResult.getItems().size()).isEqualTo(2);
|
||||||
|
assertThat(listResult.getItems().get(0).getMetadata().getName())
|
||||||
|
.isEqualTo("reply-approved");
|
||||||
|
})
|
||||||
|
.verifyComplete();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@WithMockUser(username = "fake-user")
|
||||||
|
void listWhenUserLoggedIn() {
|
||||||
|
mockWhenListRely();
|
||||||
|
|
||||||
|
commentFinder.listReply("fake-comment", 1, 10)
|
||||||
|
.as(StepVerifier::create)
|
||||||
|
.consumeNextWith(listResult -> {
|
||||||
|
assertThat(listResult.getTotal()).isEqualTo(3);
|
||||||
|
assertThat(listResult.getItems().size()).isEqualTo(3);
|
||||||
|
assertThat(listResult.getItems().get(0).getMetadata().getName())
|
||||||
|
.isEqualTo("reply-not-approved");
|
||||||
|
assertThat(listResult.getItems().get(1).getMetadata().getName())
|
||||||
|
.isEqualTo("reply-approved");
|
||||||
|
})
|
||||||
|
.verifyComplete();
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private void mockWhenListRely() {
|
||||||
|
// Mock
|
||||||
|
Reply notApproved = createReply();
|
||||||
|
notApproved.getMetadata().setName("reply-not-approved");
|
||||||
|
notApproved.getSpec().setApproved(false);
|
||||||
|
|
||||||
|
Reply approved = createReply();
|
||||||
|
approved.getMetadata().setName("reply-approved");
|
||||||
|
approved.getSpec().setApproved(true);
|
||||||
|
|
||||||
|
Reply notApprovedWithAnonymous = createReply();
|
||||||
|
notApprovedWithAnonymous.getMetadata().setName("reply-not-approved-anonymous");
|
||||||
|
notApprovedWithAnonymous.getSpec().setApproved(false);
|
||||||
|
notApprovedWithAnonymous.getSpec().getOwner().setName(AnonymousUserConst.PRINCIPAL);
|
||||||
|
|
||||||
|
Reply approvedButAnotherOwner = createReply();
|
||||||
|
approvedButAnotherOwner.getMetadata()
|
||||||
|
.setName("reply-approved-but-another-owner");
|
||||||
|
approvedButAnotherOwner.getSpec().setApproved(true);
|
||||||
|
approvedButAnotherOwner.getSpec().getOwner().setName("another");
|
||||||
|
|
||||||
|
Reply notApprovedAndAnotherOwner = createReply();
|
||||||
|
notApprovedAndAnotherOwner.getMetadata()
|
||||||
|
.setName("reply-not-approved-and-another");
|
||||||
|
notApprovedAndAnotherOwner.getSpec().setApproved(false);
|
||||||
|
notApprovedAndAnotherOwner.getSpec().getOwner().setName("another");
|
||||||
|
|
||||||
|
Reply notApprovedAndAnotherCommentName = createReply();
|
||||||
|
notApprovedAndAnotherCommentName.getMetadata()
|
||||||
|
.setName("reply-approved-and-another-comment-name");
|
||||||
|
notApprovedAndAnotherCommentName.getSpec().setApproved(false);
|
||||||
|
notApprovedAndAnotherCommentName.getSpec().setCommentName("another-fake-comment");
|
||||||
|
|
||||||
|
when(client.list(eq(Reply.class), any(),
|
||||||
|
any(),
|
||||||
|
eq(1),
|
||||||
|
eq(10))
|
||||||
|
).thenAnswer((Answer<Mono<ListResult<Reply>>>) invocation -> {
|
||||||
|
Predicate<Reply> predicate =
|
||||||
|
invocation.getArgument(1, Predicate.class);
|
||||||
|
List<Reply> replies = Stream.of(
|
||||||
|
notApproved,
|
||||||
|
approved,
|
||||||
|
approvedButAnotherOwner,
|
||||||
|
notApprovedAndAnotherOwner,
|
||||||
|
notApprovedWithAnonymous,
|
||||||
|
notApprovedAndAnotherCommentName
|
||||||
|
).filter(predicate).toList();
|
||||||
|
return Mono.just(new ListResult<>(1, 10, replies.size(), replies));
|
||||||
|
});
|
||||||
|
|
||||||
|
when(client.fetch(eq(User.class), any())).thenReturn(Mono.just(createUser()));
|
||||||
|
}
|
||||||
|
|
||||||
|
Reply createReply() {
|
||||||
|
Reply reply = new Reply();
|
||||||
|
reply.setMetadata(new Metadata());
|
||||||
|
reply.getMetadata().setName("fake-reply");
|
||||||
|
reply.setSpec(new Reply.ReplySpec());
|
||||||
|
|
||||||
|
reply.getSpec().setRaw("fake-raw");
|
||||||
|
reply.getSpec().setContent("fake-content");
|
||||||
|
reply.getSpec().setHidden(false);
|
||||||
|
reply.getSpec().setCommentName("fake-comment");
|
||||||
|
Comment.CommentOwner commentOwner = new Comment.CommentOwner();
|
||||||
|
commentOwner.setKind(User.KIND);
|
||||||
|
commentOwner.setName("fake-user");
|
||||||
|
commentOwner.setDisplayName("fake-display-name");
|
||||||
|
reply.getSpec().setOwner(commentOwner);
|
||||||
|
return reply;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
User createUser() {
|
||||||
|
User user = new User();
|
||||||
|
user.setMetadata(new Metadata());
|
||||||
|
user.getMetadata().setName("fake-user");
|
||||||
|
user.setSpec(new User.UserSpec());
|
||||||
|
user.getSpec().setDisplayName("fake-display-name");
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue