Merge branch 'develop' into changelog_its

Author: deepikaSingh2711

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

@@ -225,25 +225,27 @@ public void processAttachment(
         dbQuery.getAttachmentForID(attachmentEntity.get(), persistenceService, id);
     SDMCredentials sdmCredentials = tokenHandler.getSDMCredentials();
 
-    // Fetch from SDM if not in DB
-    String descriptionInDB = null;
-    if (fileNameInDB == null) {
+    String fileNameInSDM = null;
+    String descriptionInSDM = null;
+
+    if (fileNameInDB == null || descriptionInRequest != null) {
       List<String> sdmAttachmentData =
           AttachmentsHandlerUtils.fetchAttachmentDataFromSDM(
               sdmService, objectId, sdmCredentials, context.getUserInfo().isSystemUser());
-      fileNameInDB = sdmAttachmentData.get(0);
-      descriptionInDB = sdmAttachmentData.get(1);
+
+      if (sdmAttachmentData != null && sdmAttachmentData.size() >= 2) {
+        fileNameInSDM = sdmAttachmentData.get(0);
+        descriptionInSDM = sdmAttachmentData.get(1);
+      }
+
+      if (fileNameInDB == null) {
+        fileNameInDB = fileNameInSDM;
+      }
     }
 
     Map<String, String> propertiesInDB =
         dbQuery.getPropertiesForID(
             attachmentEntity.get(), persistenceService, id, secondaryTypeProperties);
-
-    // Extract note (description) from DB if it exists
-    if (propertiesInDB != null && propertiesInDB.containsKey("note")) {
-      descriptionInDB = propertiesInDB.get("note");
-    }
-
     // Prepare document and updated properties
 
     Map<String, String> updatedSecondaryProperties =
@@ -260,10 +262,10 @@ public void processAttachment(
 
     // Update filename and description properties
     AttachmentsHandlerUtils.updateFilenameProperty(
-        fileNameInDB, filenameInRequest, null, updatedSecondaryProperties);
+        fileNameInDB, filenameInRequest, fileNameInSDM, updatedSecondaryProperties);
 
     AttachmentsHandlerUtils.updateDescriptionProperty(
-        descriptionInDB, descriptionInRequest, null, updatedSecondaryProperties, true);
+        null, descriptionInRequest, descriptionInSDM, updatedSecondaryProperties, true);
 
     // Send update to SDM only if there are changes
     if (updatedSecondaryProperties.isEmpty()) {
@@ -294,7 +296,7 @@ public void processAttachment(
           filenameInRequest,
           propertiesInDB,
           secondaryTypeProperties,
-          descriptionInDB,
+          descriptionInSDM,
           noSDMRoles,
           duplicateFileNameList,
           filesNotFound);
@@ -310,7 +312,7 @@ public void processAttachment(
           filenameInRequest,
           propertiesInDB,
           secondaryTypeProperties,
-          descriptionInDB,
+          descriptionInSDM,
           filesWithUnsupportedProperties,
           badRequest);
     }

sdm/src/main/java/com/sap/cds/sdm/utilities/SDMUtils.java

@@ -350,21 +350,15 @@ public static Map<String, String> getUpdatedSecondaryProperties(
     for (Map.Entry<String, String> entry : secondaryTypeProperties.entrySet()) {
       String property = entry.getKey();
       String value = entry.getValue();
-      String valueInDB = propertiesInDB.get(property);
+      String valueInDB = propertiesInDB.get(value);
       Object valueInMap = propertiesMap.get(property);
 
-      if ((valueInMap == null && valueInDB != null)
-          || (valueInMap != null && !valueInMap.equals(valueInDB))) {
-        logger.debug(
-            "Property '{}' changed - DB value: {}, Request value: {}",
-            property,
-            valueInDB,
-            valueInMap);
-        if (valueInMap != null) {
-          updatedSecondaryProperties.put(value, valueInMap.toString());
-        } else {
-          updatedSecondaryProperties.put(value, null);
-        }
+      // Convert valueInMap to String for proper comparison
+      String valueInMapAsString = valueInMap != null ? valueInMap.toString() : null;
+
+      if ((valueInMapAsString == null && valueInDB != null)
+          || (valueInMapAsString != null && !valueInMapAsString.equals(valueInDB))) {
+        updatedSecondaryProperties.put(value, valueInMapAsString);
       }
     }
 

sdm/src/test/java/unit/com/sap/cds/sdm/utilities/SDMUtilsTest.java

@@ -1485,9 +1485,9 @@ void testGetUpdatedSecondaryProperties_WithModifiedValues_ReturnsUpdated() {
     secondaryTypeProperties.put("prop3", "Property 3");
 
     Map<String, String> propertiesInDB = new HashMap<>();
-    propertiesInDB.put("prop1", "oldValue1");
-    propertiesInDB.put("prop2", "oldValue2");
-    propertiesInDB.put("prop3", "unchangedValue");
+    propertiesInDB.put("Property 1", "oldValue1");
+    propertiesInDB.put("Property 2", "oldValue2");
+    propertiesInDB.put("Property 3", "unchangedValue");
 
     Map<String, String> result =
         SDMUtils.getUpdatedSecondaryProperties(
@@ -1512,7 +1512,7 @@ void testGetUpdatedSecondaryProperties_WithNullValueInAttachment_ReturnsNullValu
     secondaryTypeProperties.put("prop1", "Property 1");
 
     Map<String, String> propertiesInDB = new HashMap<>();
-    propertiesInDB.put("prop1", "oldValue");
+    propertiesInDB.put("Property 1", "oldValue");
 
     Map<String, String> result =
         SDMUtils.getUpdatedSecondaryProperties(
@@ -1535,7 +1535,7 @@ void testGetUpdatedSecondaryProperties_WithValueInDBNull_ReturnsUpdated() {
     secondaryTypeProperties.put("prop1", "Property 1");
 
     Map<String, String> propertiesInDB = new HashMap<>();
-    propertiesInDB.put("prop1", null);
+    propertiesInDB.put("Property 1", null);
 
     Map<String, String> result =
         SDMUtils.getUpdatedSecondaryProperties(
@@ -1560,8 +1560,8 @@ void testGetUpdatedSecondaryProperties_WithNoChanges_ReturnsEmpty() {
     secondaryTypeProperties.put("prop2", "Property 2");
 
     Map<String, String> propertiesInDB = new HashMap<>();
-    propertiesInDB.put("prop1", "sameValue1");
-    propertiesInDB.put("prop2", "sameValue2");
+    propertiesInDB.put("Property 1", "sameValue1");
+    propertiesInDB.put("Property 2", "sameValue2");
 
     Map<String, String> result =
         SDMUtils.getUpdatedSecondaryProperties(
@@ -1631,10 +1631,10 @@ void testGetUpdatedSecondaryProperties_WithMultipleChanges_ReturnsAllUpdated() {
     secondaryTypeProperties.put("prop4", "Property 4");
 
     Map<String, String> propertiesInDB = new HashMap<>();
-    propertiesInDB.put("prop1", "old1");
-    propertiesInDB.put("prop2", "old2");
-    propertiesInDB.put("prop3", null);
-    propertiesInDB.put("prop4", "same4");
+    propertiesInDB.put("Property 1", "old1");
+    propertiesInDB.put("Property 2", "old2");
+    propertiesInDB.put("Property 3", null);
+    propertiesInDB.put("Property 4", "same4");
 
     Map<String, String> result =
         SDMUtils.getUpdatedSecondaryProperties(