Resolved conflicts

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

@@ -1,14 +1,20 @@
 package net.gepafin.tendermanagement.repositories;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import net.gepafin.tendermanagement.entities.CallTargetAudienceChecklistEntity;
 
 @Repository
 public interface CallTargetAudienceChecklistRepository extends JpaRepository<CallTargetAudienceChecklistEntity,Long> {
+	
+	@Query("SELECT c FROM CallTargetAudienceChecklistEntity c WHERE c.id = :id AND c.isDeleted = false")
+	Optional<CallTargetAudienceChecklistEntity> findById(@Param("id") Long id);
 
-	List<CallTargetAudienceChecklistEntity> findByCallIdAndLookupDataType(Long id, String value);
+	List<CallTargetAudienceChecklistEntity> findByCallIdAndLookupDataTypeAndIsDeletedFalse(Long id, String type);
 }

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

@@ -1,10 +1,23 @@
 package net.gepafin.tendermanagement.repositories;
 import net.gepafin.tendermanagement.entities.DocumentEntity;
+
+import java.util.List;
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
 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> findByCallIdAndTypeAndIsDeletedFalse(Long callId, String type);
+
+	Optional<DocumentEntity> findByIdAndCallIdAndIsDeletedFalse(Long id, Long callId);
 
 }
 

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

@@ -1,7 +1,19 @@
 package net.gepafin.tendermanagement.repositories;
 
 import net.gepafin.tendermanagement.entities.EvaluationCriteriaEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface EvaluationCriteriaRepository extends JpaRepository<EvaluationCriteriaEntity, Integer> {
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface EvaluationCriteriaRepository extends JpaRepository<EvaluationCriteriaEntity, Long> {
+	@Query("SELECT ec FROM EvaluationCriteriaEntity ec WHERE ec.id = :id AND ec.isDeleted = false")
+	Optional<EvaluationCriteriaEntity> findById(@Param("id") Long id);
+
+	List<EvaluationCriteriaEntity> findByCallIdAndLookupDataTypeAndIsDeletedFalse(Long callId, String type);
 }

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

@@ -3,12 +3,18 @@ package net.gepafin.tendermanagement.repositories;
 import net.gepafin.tendermanagement.entities.FaqEntity;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface FaqRepository extends JpaRepository<FaqEntity, Integer> {
+public interface FaqRepository extends JpaRepository<FaqEntity, Long> {
+	
+	@Query("SELECT f FROM FaqEntity f WHERE f.id = :id AND f.isDeleted = false")
+	Optional<FaqEntity> findById(@Param("id") Long id);
 
-	List<FaqEntity> findByCallId(Long callId);
+	List<FaqEntity> findByCallIdAndIsDeletedFalse(Long callId);
 }

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

@@ -2,6 +2,12 @@ package net.gepafin.tendermanagement.repositories;
 
 import net.gepafin.tendermanagement.entities.LookUpDataEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Optional;
+
+@Repository
 public interface LookUpDataRepository extends JpaRepository<LookUpDataEntity,Long> {
+    List<LookUpDataEntity> findByType(String type);
 }

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

@@ -8,4 +8,5 @@ import java.util.Optional;
 public interface UserRepository extends JpaRepository<UserEntity, Long> {
     Optional<UserEntity> findByEmailIgnoreCase(String email);
     boolean existsByEmailIgnoreCase(String email);
+    UserEntity findByEmail(String email);
 }