Skip to content

Fix: NoSuchElementException on Discard Draft #551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PujaDeshmukh17 wants to merge 2 commits into
base: develop
Choose a base branch
from
+16 −6
Open

Fix: NoSuchElementException on Discard Draft #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1527ee6
Validation for no such element error
PujaDeshmukh17 Jul 22, 2026
e82df22
UTs and removing download action from attachment.cds
PujaDeshmukh17 Jul 23, 2026
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
14 changes: 12 additions & 2 deletions sdm/src/main/java/com/sap/cds/sdm/service/handler/SDMServiceGenericHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,15 @@ private void revertLinksForComposition(

CdsModel model = context.getModel();
String draftEntityName = attachmentCompositionDefinition + "_drafts";
CdsEntity draftEntity = model.findEntity(draftEntityName).get();
CdsEntity activeEntity = model.findEntity(attachmentCompositionDefinition).get();
Optional<CdsEntity> draftEntityOpt = model.findEntity(draftEntityName);
Optional<CdsEntity> activeEntityOpt = model.findEntity(attachmentCompositionDefinition);
if (!draftEntityOpt.isPresent() || !activeEntityOpt.isPresent()) {
logger.debug(
"Entity not found in model, skipping revert for: {}", attachmentCompositionDefinition);
return;
}
CdsEntity draftEntity = draftEntityOpt.get();
CdsEntity activeEntity = activeEntityOpt.get();

final String upIdKey = SDMUtils.getUpIdKey(draftEntity);
if (upIdKey == null || upIdKey.isEmpty()) {
Expand All @@ -299,6 +306,9 @@ private void revertLinksForComposition(

Result draftLinks = persistenceService.run(selectDraftLinks);
logger.debug("Found {} draft links to process", draftLinks.rowCount());
if (draftLinks.rowCount() == 0) {
return;
}
SDMCredentials sdmCredentials = tokenHandler.getSDMCredentials();
Boolean isSystemUser = context.getUserInfo().isSystemUser();

Expand Down
2 changes: 0 additions & 2 deletions sdm/src/main/resources/cds/com.sap.cds/sdm/attachments.cds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ extend aspect Attachments with {
type : String @(UI: {IsImageURL: true}) default 'sap-icon://document';
uploadStatus : UploadStatusCode default 'uploading' @readonly ;
uploadStatusNav : Association to one UploadScanStates on uploadStatusNav.code = uploadStatus;
} actions {
action downloadSelectedAttachments(ids: String) returns String;
}
entity UploadScanStates : CodeList {
key code : UploadStatusCode @Common.Text: name @Common.TextArrangement: #TextOnly;
Expand Down
6 changes: 4 additions & 2 deletions sdm/src/test/java/unit/com/sap/cds/sdm/service/handler/SDMServiceGenericHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2149,6 +2149,7 @@ void testRevertLinksForComposition() throws Exception {

Result draftLinksResult = mock(Result.class);
Row draftLinkRow = mock(Row.class);
when(draftLinksResult.rowCount()).thenReturn(1L);
when(draftLinksResult.iterator()).thenReturn(Arrays.asList(draftLinkRow).iterator());
when(persistenceService.run(any(CqnSelect.class))).thenReturn(draftLinksResult);

Expand Down Expand Up @@ -2244,8 +2245,8 @@ void testRevertLinksForComposition_NoLinksToRevert() throws Exception {
});

verify(persistenceService, times(1)).run(any(CqnSelect.class));
verify(tokenHandler, times(1)).getSDMCredentials();
verify(context, times(1)).getUserInfo();
verify(tokenHandler, never()).getSDMCredentials();
verify(context, never()).getUserInfo();
}

@Test
Expand All @@ -2266,6 +2267,7 @@ void testRevertLinksForComposition_SameUrls() throws Exception {

Result draftLinksResult = mock(Result.class);
Row draftLinkRow = mock(Row.class);
when(draftLinksResult.rowCount()).thenReturn(1L);
when(draftLinksResult.iterator()).thenReturn(Arrays.asList(draftLinkRow).iterator());

when(draftLinkRow.get("ID")).thenReturn("attachment123");
Expand Down
Loading