diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CommunicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CommunicationDao.java
index 75926512..b752a755 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/CommunicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/CommunicationDao.java
@@ -58,7 +58,7 @@ public class CommunicationDao {
     public ApplicationAmendmentResponse getAmendmentComments(Long amendmentId) {
 
         ApplicationAmendmentRequestEntity amendmentData = applicationAmendmentRequestService.validateApplicationAmendmentRequest(amendmentId);
-        List<CommunicationResponseBean> commentsList = communicationRepository.findCommentDetailsByAmendmentId(amendmentId);
+        List<CommunicationResponseBean> commentsList = communicationRepository.findCommentListDetailsByAmendmentId(amendmentId);
         if (commentsList == null) {
             throw new CustomValidationException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.COMMENT_NOT_FOUND));
         }
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java
index f6eb8192..9ff9fd49 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java
@@ -59,7 +59,7 @@ public class DocumentDao {
 
 	@Autowired
 	private HttpServletRequest request;
-	
+
 //    @Value("${aws.s3.url.folder}")
 //    private String s3Folder;
 
@@ -144,22 +144,27 @@ public class DocumentDao {
 		}
 	}
 	private Long resolveSourceId(Long sourceId, DocumentSourceTypeEnum sourceType) {
+
 		if (sourceType == DocumentSourceTypeEnum.CALL) {
 			CallEntity callEntity = callService.validateCall(sourceId);
-//			callDao.validateUpdate(callEntity);
+			//			callDao.validateUpdate(callEntity);
 			return callEntity.getId();
 		}
-//		else if (sourceType == SourceTypeEnum.APPLICATION) {
-//			ApplicationEntity applicationEntity = applicationService.validateApplication(sourceId);
-//			return applicationEntity.getId(); // Assuming ApplicationEntity has getId()
-//		}
-//
+		//		else if (sourceType == SourceTypeEnum.APPLICATION) {
+		//			ApplicationEntity applicationEntity = applicationService.validateApplication(sourceId);
+		//			return applicationEntity.getId(); // Assuming ApplicationEntity has getId()
+		//		}
+		//
 		return sourceId;
 	}
 
 	public void deleteFile(Long documentId) {
 
-		DocumentEntity documentEntity = validateDocument(documentId);
+		DocumentEntity documentEntity = documentRepository.findById(documentId)
+				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND)));
+		//        String fileName= Utils.extractFileName(documentEntity.getFilePath());
+		//        deleteFileOnAmazonS3(fileName);
+
 		//cloned for old data
 		DocumentEntity oldDocumentEntity = Utils.getClonedEntityForData(documentEntity);
 
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CommunicationResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/CommunicationResponseBean.java
index 13afde4b..4593db84 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/CommunicationResponseBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/CommunicationResponseBean.java
@@ -31,6 +31,18 @@ public class CommunicationResponseBean {
         this.amendmentId = amendmentId;
     }
 
+    public CommunicationResponseBean(LocalDateTime commentedDate, String comment, String title, LocalDateTime createdDate, LocalDateTime updatedDate, Long amendmentId,Long senderUserId,Long receiverUserId) {
+
+        this.commentedDate = commentedDate;
+        this.comment = comment;
+        this.title = title;
+        this.createdDate = createdDate;
+        this.updatedDate = updatedDate;
+        this.amendmentId = amendmentId;
+        this.senderUserId = senderUserId;
+        this.receiverUserId = receiverUserId;
+    }
+
     public CommunicationResponseBean() {
 
     }
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/CommunicationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/CommunicationRepository.java
index 0e9d8d9c..f92b9a06 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/CommunicationRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/CommunicationRepository.java
@@ -15,7 +15,8 @@ public interface CommunicationRepository extends JpaRepository<CommunicationEnti
     List<CommunicationResponseBean> findCommentsByApplicationAmendmentRequestId(@Param("applicationAmendmentRequestId") Long amendmentRequestId);
 
     @Query("SELECT new net.gepafin.tendermanagement.model.response.CommunicationResponseBean( " + "c.commentedDate, c.communicationComment, c.communicationTitle, c.createdDate, c" +
-            ".updatedDate, c.applicationAmendmentRequest.id) " + "FROM CommunicationEntity c " + "WHERE c.applicationAmendmentRequest.id = :amendmentId AND c.isDeleted = false")
-    List<CommunicationResponseBean> findCommentDetailsByAmendmentId(@Param("amendmentId") Long amendmentId);
+            ".updatedDate, c.applicationAmendmentRequest.id,c.senderUserId, c.receiverUserId) " + "FROM CommunicationEntity c " + "WHERE c.applicationAmendmentRequest.id = :amendmentId AND c.isDeleted = false")
+    List<CommunicationResponseBean> findCommentListDetailsByAmendmentId(@Param("amendmentId") Long amendmentId);
+
 
 }