Resolved conflicts

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

@@ -28,4 +28,11 @@ public interface ApplicationEvaluationFormFieldRepository extends JpaRepository<
             @Param("fieldIds") List<String> fieldIds);
 
 
+    @Query("SELECT f FROM ApplicationEvaluationFormFieldEntity f " +
+            "WHERE f.applicationEvaluationForm.id = :applicationEvaluationFormId " +
+            "AND f.fieldId = :fieldId " +
+            "AND f.isDeleted = false")
+    ApplicationEvaluationFormFieldEntity findByFieldIdAndApplicationEvaluationFormId(
+            @Param("fieldId") String fieldId,
+            @Param("applicationEvaluationFormId") Long applicationEvaluationFormId);
 }

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

@@ -162,4 +162,6 @@ public interface ApplicationRepository extends JpaRepository<ApplicationEntity,
 	List<ApplicationEntity> findByUserIdAndUserWithCompany_IdAndCall_IdAndIsDeletedFalseAndStatusNot(
 			Long userId, Long userWithCompanyId, Long callId, String status
 	);
+
+	ApplicationEntity findByIdAndCompanyIdAndIsDeletedFalse(Long id,Long companyId);
 }

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

@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.repositories;
 
 import net.gepafin.tendermanagement.entities.UserEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -10,7 +11,7 @@ import java.util.List;
 import java.util.Optional;
 
 @Repository
-public interface UserRepository extends JpaRepository<UserEntity, Long> {
+public interface UserRepository extends JpaRepository<UserEntity, Long>, JpaSpecificationExecutor<UserEntity> {
 	
     UserEntity findByBeneficiaryId(Long beneficiaryId);