From 1217922b9081b8d4b8f491cecbc575f1a58deb67 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Wed, 15 Oct 2025 09:46:06 +0200
Subject: [PATCH] =?UTF-8?q?Refactor=20activity=20file=20attachment=20e=20a?=
 =?UTF-8?q?ggiunta=20la=20possibilit=C3=A0=20di=20rimuovere=20gli=20allega?=
 =?UTF-8?q?ti?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/controller/ActivityController.java | 17 ++++++++++-------
 .../ems/activity/service/ActivityService.java   | 17 ++++++++++++-----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ems-engine/src/main/java/it/integry/ems/activity/controller/ActivityController.java b/ems-engine/src/main/java/it/integry/ems/activity/controller/ActivityController.java
index 7178f12890..27cad946b6 100644
--- a/ems-engine/src/main/java/it/integry/ems/activity/controller/ActivityController.java
+++ b/ems-engine/src/main/java/it/integry/ems/activity/controller/ActivityController.java
@@ -131,20 +131,23 @@ public class ActivityController {
     }
 
 
-    @RequestMapping(value = EmsRestConstants.PATH_UPLOAD_STB_ACTIVITY_FILE_ATTACHMENT, method = RequestMethod.POST)
+    @PostMapping(value = "uploadStbActivityFileAttachment")
     public ServiceRestResponse uploadStbActivityFileAttachment(@RequestParam(CommonConstants.PROFILE_DB) String config,
                                                                @RequestParam() String activityId,
                                                                @RequestPart() MultipartFile[] files) throws Exception {
-        if (files == null || files.length == 0) {
+        if (files == null || files.length == 0)
             throw new Exception("Nessun file è stato rilevato");
-        }
 
-        StbActivity stbActivity = activityService.uploadAttachment(activityId, files);
+        return ServiceRestResponse.createPositiveResponse(activityService.uploadAttachment(activityId, files));
+    }
 
-        ServiceRestResponse serviceRestResponse = ServiceRestResponse.createPositiveResponse();
-        serviceRestResponse.setEntityList(stbActivity.getStbActivityFile());
+    @GetMapping(value = "activity/removeAttachment")
+    public ServiceRestResponse removeAttachment(@RequestParam(CommonConstants.PROFILE_DB) String config,
+                                                @RequestParam() String activityId,
+                                                @RequestParam() String fileName) throws Exception {
 
-        return serviceRestResponse;
+        activityService.removeAttachment(activityId, fileName);
+        return ServiceRestResponse.createPositiveResponse();
     }
 
     @RequestMapping(value = EmsRestConstants.PATH_ACTIVITY_GET_ACTIVITY, method = RequestMethod.GET)
diff --git a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java
index d106efb19a..fc793fa3ad 100644
--- a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java
+++ b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java
@@ -127,12 +127,19 @@ public class ActivityService {
     }
 
     public void removeAttachment(String activityId, String fileName) throws Exception {
-        StbActivityFile activityFile = new StbActivityFile();
+        if (activityId == null || fileName == null)
+            throw new Exception("activityId e fileName sono obbligatori");
+
+        StbActivityFile activityFile = new StbActivityFile()
+                .setId(activityId)
+                .setFileName(fileName);
         activityFile.setOperation(OperationType.DELETE);
-        activityFile.setId(activityId);
-        activityFile.setFileName(fileName);
-        entityProcessor.processEntity(activityFile, multiDBTransactionManager);
-        multiDBTransactionManager.commitAll();
+
+        StbActivity stbActivity = new StbActivity().setActivityId(activityId);
+        stbActivity.getStbActivityFile().add(activityFile);
+        stbActivity.setOperation(OperationType.NO_OP);
+
+        entityProcessor.processEntity(stbActivity, multiDBTransactionManager);
     }
 
     public List<AttivitaDTO> save(List<AttivitaDTO> listAttivita) throws Exception {