diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ApprovalVerificationService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ApprovalVerificationService.java
index a924a2a8a..ac6c63d8c 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ApprovalVerificationService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ApprovalVerificationService.java
@@ -1,5 +1,8 @@
 package com.iqser.red.service.persistence.management.v1.processor.service;
 
+import static com.iqser.red.service.persistence.service.v1.api.shared.model.warning.WarningsComparatorUtils.WARNING_MODEL_COMPARATOR;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -21,10 +24,12 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.warning.War
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
 
 @Service
 @RequiredArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+@Slf4j
 public class ApprovalVerificationService {
 
     EntityLogService entityLogService;
@@ -34,7 +39,8 @@ public class ApprovalVerificationService {
 
     public ApproveResponse verifyApprovalOfFile(String dossierId, String fileId) {
 
-        ApproveResponse approveResponse = new ApproveResponse(fileId);
+        ApproveResponse approveResponse = new ApproveResponse();
+        approveResponse.setFileId(fileId);
         EntityLog entityLog = entityLogService.getEntityLog(dossierId, fileId, true);
         List<EntityLogEntry> entityLogEntries = entityLog.getEntityLogEntry();
         List<LegalBasisEntity> legalBasisMappings = legalBasisMappingPersistenceService.getLegalBasisMapping(dossierRepository.findDossierTemplateId(dossierId));
@@ -64,16 +70,21 @@ public class ApprovalVerificationService {
 
     private void addWarning(EntityLogEntry entry, WarningType warningType, ApproveResponse approveResponse) {
 
-        approveResponse.addFileWarning(WarningModel.builder()
-                                               .id(entry.getId())
-                                               .pages(entry.getPositions()
-                                                              .stream()
-                                                              .map(Position::getPageNumber)
-                                                              .collect(Collectors.toSet()))
-                                               .value(shortenValue(entry.getValue()))
-                                               .warningType(warningType)
-                                               .type(entry.getType())
-                                               .build());
+        ArrayList<WarningModel> fileWarnings = approveResponse.getFileWarnings();
+        WarningModel newFileWarning = WarningModel.builder()
+                .id(entry.getId())
+                .pages(entry.getPositions()
+                               .stream()
+                               .map(Position::getPageNumber)
+                               .collect(Collectors.toSet()))
+                .value(shortenValue(entry.getValue()))
+                .warningType(warningType)
+                .type(entry.getType())
+                .build();
+        fileWarnings.add(newFileWarning);
+        fileWarnings.sort(WARNING_MODEL_COMPARATOR);
+        approveResponse.setFileWarnings(fileWarnings);
+        log.info("fileWarnigns: {}", approveResponse.getFileWarnings());
     }
 
 
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ApprovalTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ApprovalTest.java
index d888cf6ad..6b5d5edca 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ApprovalTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ApprovalTest.java
@@ -12,7 +12,6 @@ import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.FileClient;
@@ -117,12 +116,10 @@ public class ApprovalTest extends AbstractPersistenceServerServiceTest {
         assertTrue(approveResponse.isHasWarnings());
         assertFalse(approveResponse.getFileWarnings().isEmpty());
         assertEquals(approveResponse.getFileWarnings()
-                             .get(file.getFileId())
                              .stream()
                              .filter(c -> c.getWarningType().equals(WarningType.PENDING_CHANGE))
                              .count(), 1);
         assertEquals(approveResponse.getFileWarnings()
-                             .get(file.getFileId())
                              .stream()
                              .filter(c -> c.getWarningType().equals(WarningType.LEGAL_BASIS_MISSING))
                              .count(), 1);
@@ -153,10 +150,8 @@ public class ApprovalTest extends AbstractPersistenceServerServiceTest {
         assertTrue(approveResponse.isHasWarnings());
         assertFalse(approveResponse.getFileWarnings().isEmpty());
         assertEquals(approveResponse.getFileWarnings()
-                             .get(file.getFileId())
                              .get(0).getValue().length(), 100);
         assertEquals(approveResponse.getFileWarnings()
-                             .get(file.getFileId())
                              .get(0).getWarningType(), WarningType.PENDING_CHANGE);
     }
 
diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/warning/ApproveResponse.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/warning/ApproveResponse.java
index 9e803d49e..83a19d68b 100644
--- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/warning/ApproveResponse.java
+++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/warning/ApproveResponse.java
@@ -1,17 +1,15 @@
 package com.iqser.red.service.persistence.service.v1.api.shared.model.warning;
 
-import static com.iqser.red.service.persistence.service.v1.api.shared.model.warning.WarningsComparatorUtils.WARNING_MODEL_COMPARATOR;
-
 import java.util.ArrayList;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 
 @AllArgsConstructor
-@RequiredArgsConstructor
+@NoArgsConstructor
 @Data
 @Builder
 public class ApproveResponse {
@@ -23,12 +21,4 @@ public class ApproveResponse {
 
     private ArrayList<WarningModel> fileWarnings = new ArrayList<>();
 
-
-    public void addFileWarning(WarningModel warningModel) {
-
-        fileWarnings.add(warningModel);
-
-        fileWarnings.sort(WARNING_MODEL_COMPARATOR);
-    }
-
 }