Add isSystemUser to DeletionUserInfo (#769)

Schmarvinius · web-flow · commit 14a1703fcc03 · 2026-03-30T16:29:46.000+02:00
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/AttachmentsServiceImpl.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/AttachmentsServiceImpl.java
@@ -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;
   }
 }
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/model/servicehandler/DeletionUserInfo.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/model/servicehandler/DeletionUserInfo.java
@@ -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);
@@ -21,4 +22,8 @@ static DeletionUserInfo create() {
   String getName();
 
   void setName(String id);
+
+  Boolean getIsSystemUser();
+
+  void setIsSystemUser(Boolean isSystemUser);
 }
diff --git a/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/service/AttachmentsServiceImplTest.java b/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/service/AttachmentsServiceImplTest.java
@@ -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());
   }
 }
diff --git a/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/service/model/servicehandler/DeletionUserInfoTest.java b/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/service/model/servicehandler/DeletionUserInfoTest.java
@@ -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);
   }
 }
diff --git a/integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/nondraftservice/OdataRequestValidationWithTestHandlerTest.java b/integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/nondraftservice/OdataRequestValidationWithTestHandlerTest.java
@@ -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();
             });
   }
 
@@ -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(

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ public void restoreAttachment(Instant restoreTimestamp) {`
`81`	`81`	`private DeletionUserInfo fillDeletionUserInfo(UserInfo userInfo) {`
`82`	`82`	`var deletionUserInfo = DeletionUserInfo.create();`
`83`	`83`	`deletionUserInfo.setName(userInfo.getName());`
	`84`	`+ deletionUserInfo.setIsSystemUser(userInfo.isSystemUser());`
`84`	`85`	`return deletionUserInfo;`
`85`	`86`	`}`
`86`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,12 +180,14 @@ void restoreAttachmentAttachmentInsertsData() {`
`180`	`180`	`private ModifiableUserInfo mockUserInfo() {`
`181`	`181`	`var userInfo = UserInfo.create();`
`182`	`182`	`userInfo.setName("some name");`
	`183`	`+ userInfo.setIsSystemUser(true);`
`183`	`184`	`return userInfo;`
`184`	`185`	`}`
`185`	`186`
`186`	`187`	`private void validateUerInfo(`
`187`	`188`	`AttachmentMarkAsDeletedEventContext deleteEventContext, ModifiableUserInfo userInfo) {`
`188`	`189`	`var deletionUserInfo = deleteEventContext.getDeletionUserInfo();`
`189`	`190`	`assertThat(deletionUserInfo.getName()).isEqualTo(userInfo.getName());`
	`191`	`+ assertThat(deletionUserInfo.getIsSystemUser()).isEqualTo(userInfo.isSystemUser());`
`190`	`192`	`}`
`191`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,16 +22,20 @@ void dataCanBeRead() {`
`22`	`22`	`var name = "some name";`
`23`	`23`
`24`	`24`	`cut.setName(name);`
	`25`	`+ cut.setIsSystemUser(true);`
`25`	`26`
`26`	`27`	`assertThat(cut.getName()).isEqualTo(name);`
	`28`	`+ assertThat(cut.getIsSystemUser()).isTrue();`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`@Test`
`30`	`32`	`void dataCanBeReadWithConstant() {`
`31`	`33`	`var name = "some_name";`
`32`	`34`
`33`	`35`	`cut.setName(name);`
	`36`	`+ cut.setIsSystemUser(false);`
`34`	`37`
`35`	`38`	`assertThat(cut).containsEntry(DeletionUserInfo.NAME, name);`
	`39`	`+ assertThat(cut).containsEntry(DeletionUserInfo.IS_SYSTEM_USER, false);`
`36`	`40`	`}`
`37`	`41`	`}`