fix copy attachment with invalid properties

deepikaSingh2711 · deepikaSingh2711 · commit 2fb5bf85a5ae · 2026-05-20T11:07:40.000+05:30
diff --git a/sdm/src/main/java/com/sap/cds/sdm/constants/SDMErrorMessages.java b/sdm/src/main/java/com/sap/cds/sdm/constants/SDMErrorMessages.java
@@ -142,6 +142,10 @@ private SDMErrorMessages() {
       "Invalid secondary properties detected: ";
   public static final String INVALID_SECONDARY_PROPERTIES_FOR_MOVE_SUFFIX =
       ". Attachment rolled back to source.";
+  public static final String INVALID_SECONDARY_PROPERTIES_FOR_COPY_PREFIX =
+      "Invalid secondary properties detected: ";
+  public static final String INVALID_SECONDARY_PROPERTIES_FOR_COPY_SUFFIX =
+      ". Attachment not copied.";
   public static final String SDM_MOVE_OPERATION_FAILED = "SDM move operation failed";
   public static final String FAILED_TO_ACCESS_ERROR_KEY_FIELDS =
       "Failed to access SDM error key fields";
diff --git a/sdm/src/main/java/com/sap/cds/sdm/constants/SDMUIErrorKeys.java b/sdm/src/main/java/com/sap/cds/sdm/constants/SDMUIErrorKeys.java
@@ -87,6 +87,10 @@ private SDMUIErrorKeys() {}
       "SDM.invalidSecondaryPropertiesForMovePrefix";
   public static final String INVALID_SECONDARY_PROPERTIES_FOR_MOVE_SUFFIX_KEY =
       "SDM.invalidSecondaryPropertiesForMoveSuffix";
+  public static final String INVALID_SECONDARY_PROPERTIES_FOR_COPY_PREFIX_KEY =
+      "SDM.invalidSecondaryPropertiesForCopyPrefix";
+  public static final String INVALID_SECONDARY_PROPERTIES_FOR_COPY_SUFFIX_KEY =
+      "SDM.invalidSecondaryPropertiesForCopySuffix";
   public static final String MAX_COUNT_ERROR_MESSAGE_KEY = "SDM.maxCountErrorMessage";
 
   public static Map<String, Object> getAllUIErrorKeys() {
diff --git a/sdm/src/main/java/com/sap/cds/sdm/model/CopyAttachmentsResult.java b/sdm/src/main/java/com/sap/cds/sdm/model/CopyAttachmentsResult.java
@@ -1,17 +1,27 @@
 package com.sap.cds.sdm.model;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 /** Result class for copyAttachmentsToSDM method. */
 public class CopyAttachmentsResult {
   private final List<Map<String, String>> attachmentsMetadata;
   private final List<CmisDocument> populatedDocuments;
+  private final List<Map<String, String>> failedAttachments;
 
   public CopyAttachmentsResult(
       List<Map<String, String>> attachmentsMetadata, List<CmisDocument> populatedDocuments) {
+    this(attachmentsMetadata, populatedDocuments, new ArrayList<>());
+  }
+
+  public CopyAttachmentsResult(
+      List<Map<String, String>> attachmentsMetadata,
+      List<CmisDocument> populatedDocuments,
+      List<Map<String, String>> failedAttachments) {
     this.attachmentsMetadata = attachmentsMetadata;
     this.populatedDocuments = populatedDocuments;
+    this.failedAttachments = failedAttachments;
   }
 
   public List<Map<String, String>> getAttachmentsMetadata() {
@@ -21,4 +31,8 @@ public List<Map<String, String>> getAttachmentsMetadata() {
   public List<CmisDocument> getPopulatedDocuments() {
     return populatedDocuments;
   }
+
+  public List<Map<String, String>> getFailedAttachments() {
+    return failedAttachments;
+  }
 }
diff --git a/sdm/src/main/java/com/sap/cds/sdm/service/handler/SDMCustomServiceHandler.java b/sdm/src/main/java/com/sap/cds/sdm/service/handler/SDMCustomServiceHandler.java
@@ -150,25 +150,55 @@ public void copyAttachments(AttachmentCopyEventContext context) throws IOExcepti
 
     List<Map<String, String>> attachmentsMetadata = copyResult.getAttachmentsMetadata();
     List<CmisDocument> populatedDocuments = copyResult.getPopulatedDocuments();
+    List<Map<String, String>> copyFailures = copyResult.getFailedAttachments();
 
-    String upIdKey = resolveUpIdKey(context, parentEntity, compositionName);
+    // Show warning if there are failures
+    if (!copyFailures.isEmpty()) {
+      StringBuilder warningMessage =
+          new StringBuilder("Failed to copy the following attachments:\n");
+      for (Map<String, String> failure : copyFailures) {
+        warningMessage
+            .append("  - ObjectId: ")
+            .append(failure.get(OBJECT_ID_KEY))
+            .append(", Reason: ")
+            .append(failure.get(FAILURE_REASON_KEY))
+            .append("\n");
+      }
+      context.getMessages().warn(warningMessage.toString());
+    }
 
-    CreateDraftEntriesRequest draftRequest =
-        CreateDraftEntriesRequest.builder()
-            .attachmentsMetadata(attachmentsMetadata)
-            .populatedDocuments(populatedDocuments)
-            .parentEntity(parentEntity)
-            .compositionName(compositionName)
-            .upID(upID)
-            .upIdKey(upIdKey)
-            .repositoryId(repositoryId)
-            .folderId(folderId)
-            .customPropertyValues(null)
-            .build();
+    String upIdKey = resolveUpIdKey(context, parentEntity, compositionName);
 
-    // Pass the entity for type conversion
-    CdsEntity targetEntity = entity.isPresent() ? entity.get() : null;
-    createDraftEntries(draftRequest, customPropertyDefinitions, targetEntity);
+    // Create draft entries if there are successful copies
+    if (!attachmentsMetadata.isEmpty()) {
+      CreateDraftEntriesRequest draftRequest =
+          CreateDraftEntriesRequest.builder()
+              .attachmentsMetadata(attachmentsMetadata)
+              .populatedDocuments(populatedDocuments)
+              .parentEntity(parentEntity)
+              .compositionName(compositionName)
+              .upID(upID)
+              .upIdKey(upIdKey)
+              .repositoryId(repositoryId)
+              .folderId(folderId)
+              .customPropertyValues(null)
+              .build();
+
+      // Pass the entity for type conversion
+      CdsEntity targetEntity = entity.isPresent() ? entity.get() : null;
+      createDraftEntries(draftRequest, customPropertyDefinitions, targetEntity);
+    } else if (!folderExists) {
+      // All copies failed but folder was newly created - delete the empty folder
+      logger.info(
+          "All attachments failed to copy. Deleting newly created empty folder: {}", folderId);
+      try {
+        sdmService.deleteDocument(
+            "deleteTree", folderId, context.getUserInfo().getName(), isSystemUser);
+        logger.info("Deleted empty folder: {}", folderId);
+      } catch (Exception e) {
+        logger.error("Failed to delete empty folder {}: {}", folderId, e.getMessage());
+      }
+    }
 
     logger.info(
         "Copy attachments completed - {} attachments copied for upID: {}",
@@ -570,6 +600,33 @@ private CopyAttachmentsResult copyAttachmentsToSDM(
     logger.debug("START: Copy {} attachments to SDM", request.getObjectIds().size());
     List<Map<String, String>> attachmentsMetadata = new ArrayList<>();
     List<CmisDocument> populatedDocuments = new ArrayList<>();
+    List<Map<String, String>> failedAttachments = new ArrayList<>();
+
+    // Fetch valid secondary properties for validation
+    List<String> validSecondaryProperties = new ArrayList<>();
+    boolean shouldValidateSecondaryProperties = false;
+    if (!customPropertiesInSDM.isEmpty()) {
+      try {
+        List<String> secondaryTypes =
+            sdmService.getSecondaryTypes(
+                request.getRepositoryId(), request.getSdmCredentials(), request.getIsSystemUser());
+        validSecondaryProperties =
+            sdmService.getValidSecondaryProperties(
+                secondaryTypes,
+                request.getSdmCredentials(),
+                request.getRepositoryId(),
+                request.getIsSystemUser());
+        shouldValidateSecondaryProperties = true;
+        logger.debug(
+            "Fetched {} valid secondary properties for copy validation",
+            validSecondaryProperties.size());
+      } catch (Exception e) {
+        logger.warn(
+            "Failed to fetch valid secondary properties for copy validation: {}. "
+                + "Proceeding without validation.",
+            e.getMessage());
+      }
+    }
 
     for (String objectId : request.getObjectIds()) {
       logger.debug("Processing copy for objectId: {}", objectId);
@@ -584,7 +641,6 @@ private CopyAttachmentsResult copyAttachmentsToSDM(
       populatedDocument.setType(cmisDocument.getType());
       populatedDocument.setUrl(cmisDocument.getUrl());
       populatedDocument.setUploadStatus(cmisDocument.getUploadStatus());
-      populatedDocuments.add(populatedDocument);
 
       try {
         Map<String, String> attachmentData =
@@ -594,6 +650,53 @@ private CopyAttachmentsResult copyAttachmentsToSDM(
                 request.getIsSystemUser(),
                 customPropertiesInSDM);
 
+        // Validate secondary properties after copy (similar to move validation)
+        // Only validate if we successfully fetched valid secondary properties
+        List<String> invalidProperties = new ArrayList<>();
+        if (shouldValidateSecondaryProperties) {
+          for (String customProp : customPropertiesInSDM) {
+            if (attachmentData.containsKey(customProp)
+                && !validSecondaryProperties.contains(customProp)) {
+              invalidProperties.add(customProp);
+            }
+          }
+        }
+
+        if (!invalidProperties.isEmpty()) {
+          // Validation failed - delete the copied attachment and record failure
+          String copiedObjectId = attachmentData.get("cmis:objectId");
+          logger.error(
+              "Attachment {} validation FAILED - Found {} invalid properties: {}. "
+                  + "Deleting copied attachment...",
+              objectId,
+              invalidProperties.size(),
+              invalidProperties);
+          try {
+            sdmService.deleteDocument(
+                "delete",
+                copiedObjectId,
+                request.getContext().getUserInfo().getName(),
+                request.getIsSystemUser());
+            logger.info("Deleted invalid copied attachment: {}", copiedObjectId);
+          } catch (Exception deleteEx) {
+            logger.error(
+                "Failed to delete invalid copied attachment {}: {}",
+                copiedObjectId,
+                deleteEx.getMessage());
+          }
+          // Add to failed attachments list instead of throwing exception
+          Map<String, String> failure = new HashMap<>();
+          failure.put(OBJECT_ID_KEY, objectId);
+          failure.put(
+              FAILURE_REASON_KEY,
+              SDMUtils.getErrorMessage("INVALID_SECONDARY_PROPERTIES_FOR_COPY_PREFIX")
+                  + String.join(", ", invalidProperties)
+                  + SDMUtils.getErrorMessage("INVALID_SECONDARY_PROPERTIES_FOR_COPY_SUFFIX"));
+          failedAttachments.add(failure);
+          continue;
+        }
+
+        populatedDocuments.add(populatedDocument);
         attachmentsMetadata.add(attachmentData);
         logger.debug("Successfully copied attachment: {}", objectId);
       } catch (ServiceException e) {
@@ -607,8 +710,11 @@ private CopyAttachmentsResult copyAttachmentsToSDM(
       }
     }
 
-    logger.debug("END: Copy attachments to SDM - {} successful", attachmentsMetadata.size());
-    return new CopyAttachmentsResult(attachmentsMetadata, populatedDocuments);
+    logger.debug(
+        "END: Copy attachments to SDM - {} successful, {} failed",
+        attachmentsMetadata.size(),
+        failedAttachments.size());
+    return new CopyAttachmentsResult(attachmentsMetadata, populatedDocuments, failedAttachments);
   }
 
   /**
