Merge branch 'develop' into disableUploadButton

Author: yashmeet29

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 1.9.0
+
+### Added
+- Support attachment creation in active entities
+
+### Fixed
+- Separate UI and backend error keys for localization
+- Fix upload status when attachments are copied
+
 ## Version 1.8.1
 
 ### Fixed

sdm/pom.xml

@@ -34,7 +34,7 @@
         <test-generation-folder>src/test/gen</test-generation-folder>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <attachments_version>1.3.1</attachments_version>
+        <attachments_version>1.5.0</attachments_version>
         <lombok.version>1.18.36</lombok.version>
         <jacoco.version>0.8.7</jacoco.version>
         <ehcache-version>3.10.8</ehcache-version>

sdm/src/main/java/com/sap/cds/sdm/handler/TokenHandler.java

@@ -71,7 +71,7 @@ public Map<String, Object> getUaaCredentials() {
         DefaultServiceBindingAccessor.getInstance().getServiceBindings();
     ServiceBinding sdmBinding =
         allServiceBindings.stream()
-            .filter(binding -> "sdm".equalsIgnoreCase(binding.getServiceName().orElse(null)))
+            .filter(binding -> binding.getTags().contains("sdm"))
             .findFirst()
             .orElseThrow(() -> new IllegalStateException("SDM binding not found"));
     return sdmBinding.getCredentials();

sdm/src/main/java/com/sap/cds/sdm/persistence/DBQuery.java

@@ -20,6 +20,7 @@
 import com.sap.cds.sdm.utilities.SDMUtils;
 import com.sap.cds.services.ServiceException;
 import com.sap.cds.services.persistence.PersistenceService;
+import java.time.Instant;
 import java.util.*;
 import java.util.ArrayList;
 import org.slf4j.Logger;
@@ -426,6 +427,7 @@ public void addAttachmentToDraft(
     updatedFields.put("repositoryId", repositoryId);
     updatedFields.put("folderId", cmisDocument.getFolderId());
     updatedFields.put("status", "Clean");
+    updatedFields.put("scannedAt", Instant.now());
     updatedFields.put("type", "sap-icon://document");
     updatedFields.put("mimeType", cmisDocument.getMimeType());
     updatedFields.put("uploadStatus", cmisDocument.getUploadStatus());

sdm/src/main/java/com/sap/cds/sdm/service/SDMAttachmentsService.java

@@ -181,7 +181,8 @@ public AttachmentModificationResult createAttachment(CreateAttachmentInput input
     return new AttachmentModificationResult(
         Boolean.TRUE.equals(createContext.getIsInternalStored()),
         createContext.getContentId(),
-        createContext.getData().getStatus());
+        createContext.getData().getStatus(),
+        Instant.now());
   }
 
   @Override

sdm/src/main/java/com/sap/cds/sdm/service/SDMService.java

@@ -33,7 +33,8 @@ public String getFolderIdByPath(
 
   public JSONObject getRepositoryInfo(SDMCredentials sdmCredentials) throws IOException;
 
-  public int deleteDocument(String cmisaction, String objectId, String user) throws IOException;
+  public int deleteDocument(String cmisaction, String objectId, String user, Boolean isSystemUser)
+      throws IOException;
 
   public void readDocument(
       String objectId, SDMCredentials sdmCredentials, AttachmentReadEventContext context)

sdm/src/main/java/com/sap/cds/sdm/service/SDMServiceImpl.java

@@ -660,13 +660,17 @@ public Map<String, RepoValue> fetchRepositoryData(JSONObject repoInfo, String re
   }
 
   @Override
-  public int deleteDocument(String cmisaction, String objectId, String user) {
+  public int deleteDocument(String cmisaction, String objectId, String user, Boolean isSytemUser) {
     logger.info(
-        "Deleting document - action: {}, objectId: {}, user: {}", cmisaction, objectId, user);
+        "Deleting document - action: {}, objectId: {}, user: {},isSystemUser :{}",
+        cmisaction,
+        objectId,
+        user,
+        isSytemUser);
     long startTime = System.currentTimeMillis();
     SDMCredentials sdmCredentials = tokenHandler.getSDMCredentials();
     HttpClient httpClient;
-    if (user.equals(SDMConstants.SYSTEM_USER)) {
+    if (isSytemUser) {
       logger.debug("Using TECHNICAL_USER_FLOW for deletion");
       httpClient = tokenHandler.getHttpClient(binding, connectionPool, null, TECHNICAL_USER_FLOW);
     } else {

sdm/src/main/java/com/sap/cds/sdm/service/handler/SDMAttachmentsServiceHandler.java

@@ -25,6 +25,7 @@
 import com.sap.cds.services.utils.StringUtils;
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 import org.json.JSONObject;
@@ -108,12 +109,20 @@ public void markAttachmentAsDeleted(AttachmentMarkAsDeletedEventContext context)
       if (cmisDocuments.isEmpty()) {
         // deleteFolder API
         logger.info("Deleting folder: {} for entity: {}", folderId, entity);
-        sdmService.deleteDocument("deleteTree", folderId, context.getDeletionUserInfo().getName());
+        sdmService.deleteDocument(
+            "deleteTree",
+            folderId,
+            context.getDeletionUserInfo().getName(),
+            context.getDeletionUserInfo().getIsSystemUser());
         logger.info("Folder deleted successfully: {}", folderId);
       } else {
         if (!isObjectIdPresent(cmisDocuments, objectId)) {
           logger.info("Deleting document: {} from repository", objectId);
-          sdmService.deleteDocument("delete", objectId, context.getDeletionUserInfo().getName());
+          sdmService.deleteDocument(
+              "delete",
+              objectId,
+              context.getDeletionUserInfo().getName(),
+              context.getDeletionUserInfo().getIsSystemUser());
           logger.info("Document deleted successfully: {}", objectId);
         } else {
           logger.debug("ObjectId {} is still referenced, not deleting", objectId);
@@ -527,6 +536,7 @@ private void handleCreateDocumentResult(
                       + ":"
                       + parentIdForContentId);
               eventContext.getData().setStatus("Clean");
+              eventContext.getData().setScannedAt(Instant.now());
               eventContext.getData().setContent(null);
               eventContext.setCompleted();
               return;
@@ -824,6 +834,7 @@ private void finalizeContext(
             + ":"
             + upIdSegment);
     eventContext.getData().setStatus("Clean");
+    eventContext.getData().setScannedAt(Instant.now());
     eventContext.getData().setContent(null);
     eventContext.setCompleted();
     logger.debug("Attachment context finalized and marked as completed");

sdm/src/main/java/com/sap/cds/sdm/service/handler/SDMCustomServiceHandler.java

@@ -1525,13 +1525,20 @@ private void handleCopyFailure(
     logger.error("Copy failure detected, initiating cleanup. Error: {}", e.getMessage());
     if (!folderExists) {
       logger.debug("Deleting newly created folder: {}", folderId);
-      sdmService.deleteDocument("deleteTree", folderId, context.getUserInfo().getName());
+      sdmService.deleteDocument(
+          "deleteTree",
+          folderId,
+          context.getUserInfo().getName(),
+          context.getUserInfo().isSystemUser());
     } else {
       logger.debug(
           "Deleting {} copied attachments from existing folder", attachmentsMetadata.size());
       for (Map<String, String> attachmentMetadata : attachmentsMetadata) {
         sdmService.deleteDocument(
-            "delete", attachmentMetadata.get("cmis:objectId"), context.getUserInfo().getName());
+            "delete",
+            attachmentMetadata.get("cmis:objectId"),
+            context.getUserInfo().getName(),
+            context.getUserInfo().isSystemUser());
       }
     }
     throw new ServiceException(e.getMessage());

sdm/src/test/java/unit/com/sap/cds/sdm/handler/TokenHandlerTest.java

@@ -140,7 +140,7 @@ public void testGetSDMCredentials() {
       mockCredentials.put("uaa", mockUaa);
       mockCredentials.put("uri", "https://mock.service.url");
 
-      Mockito.when(mockServiceBinding.getServiceName()).thenReturn(Optional.of("sdm"));
+      Mockito.when(mockServiceBinding.getTags()).thenReturn(Collections.singletonList("sdm"));
       Mockito.when(mockServiceBinding.getCredentials()).thenReturn(mockCredentials);
 
       List<ServiceBinding> mockServiceBindings = Collections.singletonList(mockServiceBinding);
@@ -202,7 +202,7 @@ public void testGetHttpClientForOnboardFlow() {
       mockCredentials.put("uaa", mockUaa);
       mockCredentials.put("uri", "https://mock.service.url");
 
-      Mockito.when(mockServiceBinding.getServiceName()).thenReturn(Optional.of("sdm"));
+      Mockito.when(mockServiceBinding.getTags()).thenReturn(Collections.singletonList("sdm"));
       Mockito.when(mockServiceBinding.getCredentials()).thenReturn(mockCredentials);
 
       List<ServiceBinding> mockServiceBindings = Collections.singletonList(mockServiceBinding);