filename + description update check

Author: rishikunnath2747

sdm/src/main/java/com/sap/cds/sdm/handler/applicationservice/SDMCreateAttachmentsHandler.java

@@ -235,9 +235,9 @@ private void processAttachment(
 
     // Update filename and description properties
     AttachmentsHandlerUtils.updateFilenameProperty(
-        fileNameInDB, filenameInRequest, updatedSecondaryProperties);
+        fileNameInDB, filenameInRequest, fileNameInSDM, updatedSecondaryProperties);
     AttachmentsHandlerUtils.updateDescriptionProperty(
-        descriptionInSDM, descriptionInRequest, updatedSecondaryProperties);
+        descriptionInSDM, descriptionInRequest, descriptionInSDM, updatedSecondaryProperties, false);
 
     // Send update to SDM and handle response
     try {

sdm/src/main/java/com/sap/cds/sdm/handler/applicationservice/SDMUpdateAttachmentsHandler.java

@@ -254,9 +254,9 @@ public void processAttachment(
 
     // Update filename and description properties
     AttachmentsHandlerUtils.updateFilenameProperty(
-        fileNameInDB, filenameInRequest, updatedSecondaryProperties);
+        fileNameInDB, filenameInRequest, null, updatedSecondaryProperties);
     AttachmentsHandlerUtils.updateDescriptionProperty(
-        descriptionInDB, descriptionInRequest, updatedSecondaryProperties);
+        descriptionInDB, descriptionInRequest, null, updatedSecondaryProperties, true);
 
     // Send update to SDM only if there are changes
     if (updatedSecondaryProperties.isEmpty()) {

sdm/src/main/java/com/sap/cds/sdm/handler/applicationservice/helper/AttachmentsHandlerUtils.java

@@ -618,10 +618,10 @@ public static List<String> fetchAttachmentDataFromSDM(
    * @throws ServiceException if filename validation fails
    */
   public static void updateFilenameProperty(
-      String fileNameInDB, String filenameInRequest, Map<String, String> updatedSecondaryProperties)
+      String fileNameInDB, String filenameInRequest, String fileNameInSDM, Map<String, String> updatedSecondaryProperties)
       throws ServiceException {
     if (fileNameInDB == null) {
-      if (filenameInRequest != null) {
+      if (filenameInRequest != null && (filenameInRequest != fileNameInSDM)) {
         updatedSecondaryProperties.put("filename", filenameInRequest);
       } else {
         throw new ServiceException("Filename cannot be empty");
@@ -635,25 +635,19 @@ public static void updateFilenameProperty(
     }
   }
 
-  /**
-   * Updates the description property in the secondary properties map if needed.
-   *
-   * @param descriptionInDB the description currently in the database
-   * @param descriptionInRequest the description from the request
-   * @param updatedSecondaryProperties the map to update
-   */
   public static void updateDescriptionProperty(
-      String descriptionInDB,
-      String descriptionInRequest,
-      Map<String, String> updatedSecondaryProperties) {
-    if (descriptionInDB == null) {
+      String descriptionInDB, String descriptionInRequest, String descriptionInSDM, Map<String, String> updatedSecondaryProperties, Boolean isUpdate)
+      throws ServiceException {
+    if (descriptionInDB == null && isUpdate) { // Attachment did not contain description and is being updated now
       if (descriptionInRequest != null) {
         updatedSecondaryProperties.put("description", descriptionInRequest);
       }
-    } else {
-      if (descriptionInRequest != null && !descriptionInDB.equals(descriptionInRequest)) {
+    } else if (descriptionInDB == null && !isUpdate) { // Attachment contained description during upload and it was changed before saving or description was added before save handler (create) was called
+      if ((descriptionInRequest != descriptionInSDM)) {
         updatedSecondaryProperties.put("description", descriptionInRequest);
       }
+    } else if ((descriptionInDB != null) && (descriptionInDB != descriptionInRequest)) { // Attachment contained description and is being updated now
+        updatedSecondaryProperties.put("description", descriptionInRequest);
     }
   }