AMP-31085 : Multiple Internal IDs, failing Trubudget import failing delete

Author: brianbrix

amp/src/main/java/org/digijava/module/aim/action/dataimporter/util/ImporterUtil.java

@@ -1168,12 +1168,22 @@ private static void ensureCreatedBySet(Map<String, Object> map, AmpActivityVersi
         }
     }
 
+    private static String normalizeSingleLineText(String value) {
+        if (value == null) {
+            return "";
+        }
+        // The activity API rejects CR/LF in displayName; normalize all line breaks to spaces.
+        return value.replaceAll("[\\r\\n]+", " ").trim();
+    }
+
     /** @return activity ID on success, null on skip or failure */
     public static Long importTheData(ImportDataModel importDataModel, Session session, ImportedProject importedProject, String componentName, String componentCode, Long responsibleOrgId, List<Funding> fundings, Long existingActivityId, boolean validateActivities, boolean replaceExistingTransactions, boolean replaceExistingLocations) throws JsonProcessingException {
         if (session == null || !session.isOpen()) {
             session = PersistenceManager.getRequestDBSession();
         }
 
+        importDataModel.setProject_title(normalizeSingleLineText(importDataModel.getProject_title()));
+
         // Re-fetch existing activity in this transaction if ID is provided to avoid detached entity issues
         AmpActivityVersion existing = null;
         if (existingActivityId != null) {

amp/src/main/java/org/digijava/module/aim/util/ActivityUtil.java

@@ -1725,11 +1725,9 @@ public static void deleteDuplicateContent(AmpActivityVersion ampActivityVersion,
             SQLUtils.executeQuery(connection, deleteActivityProgram);
         });
 
-        String deleteActivityOrgRole = "DELETE FROM amp_org_role" +
-                " WHERE activity = " + ampActivityVersion.getAmpActivityId();
-        session.doWork(connection -> {
-            SQLUtils.executeQuery(connection, deleteActivityOrgRole);
-        });
+        // amp_org_role is already handled through the Hibernate-managed association cleanup
+        // in deleteAmpActivityWithVersions (ampActivityVersion.getOrgrole().clear()).
+        // Deleting it again via raw SQL here can cause stale-state exceptions during flush.
     }
 
     public static void  deleteFullActivityContent(AmpActivityVersion ampAct, Session session) throws Exception{