Resolved conflict

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

@@ -76,5 +76,14 @@ public interface ApplicationEvaluationRepository extends JpaRepository<Applicati
             @Param("assignedApplicationId") Long assignedApplicationId
     );
 
+    Optional<ApplicationEvaluationEntity> findByAssignedApplicationsEntity_IdAndStatusAndIsDeletedFalse(
+           Long assignedApplicationId,
+           String status
+    );
+    @Query("SELECT ae FROM ApplicationEvaluationEntity ae WHERE ae.applicationId = :applicationId AND ae.isDeleted = false")
+    ApplicationEvaluationEntity findByApplicationId(@Param("applicationId") Long applicationId);
+
+
+
 
 }

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

@@ -178,4 +178,7 @@ public interface ApplicationRepository extends JpaRepository<ApplicationEntity,
 	void resetNdgStatusForInProgress(@Param("status") String status);
 
 	boolean existsByCallId(Long callId);
+
+	ApplicationEntity findByIdAndStatusAndIsDeletedFalse( Long id, String status);
+
 }

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

@@ -110,4 +110,8 @@ public interface AssignedApplicationsRepository extends JpaRepository<AssignedAp
                                                                  @Param("sevenDaysAgo") LocalDateTime sevenDaysAgo);
 
 
+    Optional<AssignedApplicationsEntity> findByApplicationIdAndStatusAndIsDeletedFalse( Long applicationId, String status);
+
+
+
 }

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

@@ -1,11 +1,28 @@
 package net.gepafin.tendermanagement.repositories;
 
 import net.gepafin.tendermanagement.entities.EmailLogEntity;
+import net.gepafin.tendermanagement.entities.UserEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface EmailLogRepository extends JpaRepository<EmailLogEntity,Long> {
 
     List<EmailLogEntity> findByUserIdAndAmendmentIdAndIsDeletedFalse(Long userId,Long amendmentId);
+    List<EmailLogEntity> findByUserActionId(Long userActionId);
+    List<EmailLogEntity> findByUserActionIdAndEmailServiceTypeAndSendStatus(
+            Long userActionId, String emailServiceType, String sendStatus);
+    Optional<EmailLogEntity> findTopByUserIdAndEmailTypeAndIsDeletedFalseOrderByCreatedDateDesc(Long userId, String emailType);
+    List<EmailLogEntity> findByUserActionIdAndEmailServiceType(
+            Long userActionId, String emailServiceType);
+
+    EmailLogEntity findTopByUserActionIdAndEmailServiceTypeAndSendStatusOrderByIdDesc(
+            Long userActionId,
+            String emailServiceType,
+            String sendStatus
+    );
+
+
+
 }