Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public void restoreAttachment(Instant restoreTimestamp) {
private DeletionUserInfo fillDeletionUserInfo(UserInfo userInfo) {
var deletionUserInfo = DeletionUserInfo.create();
deletionUserInfo.setName(userInfo.getName());
deletionUserInfo.setIsSystemUser(userInfo.isSystemUser());
return deletionUserInfo;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
public interface DeletionUserInfo extends CdsData {

String NAME = "name";
String IS_SYSTEM_USER = "isSystemUser";

static DeletionUserInfo create() {
return Struct.create(DeletionUserInfo.class);
Expand All @@ -21,4 +22,8 @@ static DeletionUserInfo create() {
String getName();

void setName(String id);

Boolean getIsSystemUser();

void setIsSystemUser(Boolean isSystemUser);
}
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,14 @@ void restoreAttachmentAttachmentInsertsData() {
private ModifiableUserInfo mockUserInfo() {
var userInfo = UserInfo.create();
userInfo.setName("some name");
userInfo.setIsSystemUser(true);
return userInfo;
}

private void validateUerInfo(
AttachmentMarkAsDeletedEventContext deleteEventContext, ModifiableUserInfo userInfo) {
var deletionUserInfo = deleteEventContext.getDeletionUserInfo();
assertThat(deletionUserInfo.getName()).isEqualTo(userInfo.getName());
assertThat(deletionUserInfo.getIsSystemUser()).isEqualTo(userInfo.isSystemUser());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,20 @@ void dataCanBeRead() {
var name = "some name";

cut.setName(name);
cut.setIsSystemUser(true);

assertThat(cut.getName()).isEqualTo(name);
assertThat(cut.getIsSystemUser()).isTrue();
}

@Test
void dataCanBeReadWithConstant() {
var name = "some_name";

cut.setName(name);
cut.setIsSystemUser(false);

assertThat(cut).containsEntry(DeletionUserInfo.NAME, name);
assertThat(cut).containsEntry(DeletionUserInfo.IS_SYSTEM_USER, false);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ protected void verifySingleDeletionEvent(String contentId) {
assertThat(event.context()).isInstanceOf(AttachmentMarkAsDeletedEventContext.class);
var deleteContext = (AttachmentMarkAsDeletedEventContext) event.context();
assertThat(deleteContext.getContentId()).isEqualTo(contentId);
assertThat(deleteContext.getDeletionUserInfo().getName()).isEqualTo("anonymous");
assertThat(deleteContext.getDeletionUserInfo().getIsSystemUser()).isFalse();
});
}

Expand Down Expand Up @@ -203,7 +205,11 @@ private Predicate<EventContextHolder> verifyContentIdAndUserInfo(
&& ((AttachmentMarkAsDeletedEventContext) event.context())
.getDeletionUserInfo()
.getName()
.equals("anonymous");
.equals("anonymous")
&& Boolean.FALSE.equals(
((AttachmentMarkAsDeletedEventContext) event.context())
.getDeletionUserInfo()
.getIsSystemUser());
}

private void verifyCreateEventsContainsContentId(
Expand Down
Loading