From 0717e15345d5adad9193fedf3224f51c49037d9c Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Tue, 22 Oct 2024 17:18:49 +0530
Subject: [PATCH] Fixed prod  Document issue

---
 .../net/gepafin/tendermanagement/dao/CallDao.java    | 12 ++++++------
 .../repositories/DocumentRepository.java             |  7 +++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
index c4fc17ad..1bdf51d2 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
@@ -246,7 +246,7 @@ public class CallDao {
 		}
 
 		List<DocumentEntity> existingDocuments = documentRepository
-				.findBySourceIdAndTypeAndIsDeletedFalse(sourceId, documentType.getValue());
+				.findBySourceIdAndSourceAndTypeAndIsDeletedFalse(sourceId, DocumentSourceTypeEnum.CALL.getValue(), documentType.getValue());
 
 		List<Long> incomingIds = documentReqList.stream().map(DocumentReq::getId).filter(id -> id != null && id > 0)
 				.collect(Collectors.toList());
@@ -267,7 +267,7 @@ public class CallDao {
 
 	private DocumentEntity convertToDocumentEntity(DocumentReq documentReq,Long sourceId) {
 		validateDocumentEntity(documentReq.getId());
-		DocumentEntity documentEntity = documentRepository.findByIdAndSourceIdAndIsDeletedFalse(documentReq.getId(),sourceId)
+		DocumentEntity documentEntity = documentRepository.findByIdAndSourceIdAndAndSourceAndIsDeletedFalse(documentReq.getId(),sourceId, DocumentSourceTypeEnum.CALL.getValue())
 				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
 						Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND)));
 		return documentEntity;
@@ -622,10 +622,10 @@ public class CallDao {
 	}
 
 	private CallResponse getCallResponseBean(CallEntity callEntity) {
-		List<DocumentEntity> documentEntities = documentRepository.findBySourceIdAndTypeAndIsDeletedFalse(callEntity.getId(),
-				DocumentTypeEnum.DOCUMENT.getValue());
-		List<DocumentEntity> imageEntities = documentRepository.findBySourceIdAndTypeAndIsDeletedFalse(callEntity.getId(),
-				DocumentTypeEnum.IMAGES.getValue());
+		List<DocumentEntity> documentEntities = documentRepository.findBySourceIdAndSourceAndTypeAndIsDeletedFalse(callEntity.getId(),DocumentSourceTypeEnum.CALL.getValue()
+				, DocumentTypeEnum.DOCUMENT.getValue());
+		List<DocumentEntity> imageEntities = documentRepository.findBySourceIdAndSourceAndTypeAndIsDeletedFalse(callEntity.getId(), DocumentSourceTypeEnum.CALL.getValue()
+				, DocumentTypeEnum.IMAGES.getValue());
 		List<LookUpDataResponse> amiedTo = callTargetAudienceChecklistRepository
 				.findByCallIdAndLookupDataTypeAndIsDeletedFalse(callEntity.getId(), LookUpDataTypeEnum.AIMED_TO.getValue()).stream()
 				.map(this::convertToLookUpDataResponseBean).toList();
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java
index 1543def3..a86ef8fd 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java
@@ -15,12 +15,15 @@ public interface DocumentRepository extends JpaRepository<DocumentEntity, Long>
 	@Query("SELECT d FROM DocumentEntity d WHERE d.id = :id AND d.isDeleted = false")
 	Optional<DocumentEntity> findById(@Param("id") Long id);
 
-	List<DocumentEntity> findBySourceIdAndTypeAndIsDeletedFalse(Long sourceId, String type);
+//	List<DocumentEntity> findBySourceIdAndTypeAndIsDeletedFalse(Long sourceId, String type);
 
-	Optional<DocumentEntity> findByIdAndSourceIdAndIsDeletedFalse(Long id, Long sourceId);
+//	Optional<DocumentEntity> findByIdAndSourceIdAndIsDeletedFalse(Long id, Long sourceId);
 
 	List<DocumentEntity> findBySource(String source);
+	
 	List<DocumentEntity> findBySourceIdAndSourceAndTypeAndIsDeletedFalse(Long sourceId, String source, String type);
 
+	Optional<DocumentEntity> findByIdAndSourceIdAndAndSourceAndIsDeletedFalse(Long id, Long sourceId, String source);
+
 }