Resolved conflicts

src/main/java/net/gepafin/tendermanagement/repositories/ApplicationSignedDocumentRepository.java

@@ -0,0 +1,13 @@
+package net.gepafin.tendermanagement.repositories;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import net.gepafin.tendermanagement.entities.ApplicationSignedDocumentEntity;
+
+@Repository
+public interface ApplicationSignedDocumentRepository extends JpaRepository<ApplicationSignedDocumentEntity, Long> {
+
+	ApplicationSignedDocumentEntity findByApplicationIdAndStatus(Long applicationId, String status);
+
+}

src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java

@@ -20,6 +20,7 @@ public interface DocumentRepository extends JpaRepository<DocumentEntity, Long>
 	Optional<DocumentEntity> findByIdAndSourceIdAndIsDeletedFalse(Long id, Long sourceId);
 
 	List<DocumentEntity> findBySource(String source);
+	List<DocumentEntity> findBySourceIdAndSourceAndTypeAndIsDeletedFalse(Long sourceId, String source, String type);
 
 }